On 12/10/2019 6:38, Soeren Moch wrote:
> From: Chung-Hsien Hsu <stanley.hsu@xxxxxxxxxxx>
>
> Set F2 blocksize to 256 bytes and watermark to 0x40 for 4359. Also
> enable and configure F1 MesBusyCtrl. It fixes DMA error while having
> UDP bi-directional traffic.
>
> Signed-off-by: Chung-Hsien Hsu <stanley.hsu@xxxxxxxxxxx>
> [slightly adapted for rebase on mainline linux]
> Signed-off-by: Soeren Moch <smoch@xxxxxx>
Reviewed-by: Chi-Hsien Lin <chi-hsien.lin@xxxxxxxxxxx>
> ---
> Cc: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
> Cc: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx>
> Cc: Franky Lin <franky.lin@xxxxxxxxxxxx>
> Cc: Hante Meuleman <hante.meuleman@xxxxxxxxxxxx>
> Cc: Chi-Hsien Lin <chi-hsien.lin@xxxxxxxxxxx>
> Cc: Wright Feng <wright.feng@xxxxxxxxxxx>
> Cc: linux-wireless@xxxxxxxxxxxxxxx
> Cc: brcm80211-dev-list.pdl@xxxxxxxxxxxx
> Cc: brcm80211-dev-list@xxxxxxxxxxx
> Cc: netdev@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> ---
> .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +++++-
> .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 15 +++++++++++++++
> 2 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> index 96fd8e2bf773..68baf0189305 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> @@ -43,6 +43,7 @@
>
> #define SDIO_FUNC1_BLOCKSIZE 64
> #define SDIO_FUNC2_BLOCKSIZE 512
> +#define SDIO_4359_FUNC2_BLOCKSIZE 256
> /* Maximum milliseconds to wait for F2 to come up */
> #define SDIO_WAIT_F2RDY 3000
>
> @@ -903,6 +904,7 @@ static void brcmf_sdiod_host_fixup(struct mmc_host *host)
> static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
> {
> int ret = 0;
> + unsigned int f2_blksz = SDIO_FUNC2_BLOCKSIZE;
>
> sdio_claim_host(sdiodev->func1);
>
> @@ -912,7 +914,9 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
> sdio_release_host(sdiodev->func1);
> goto out;
> }
> - ret = sdio_set_block_size(sdiodev->func2, SDIO_FUNC2_BLOCKSIZE);
> + if (sdiodev->func2->device == SDIO_DEVICE_ID_BROADCOM_4359)
> + f2_blksz = SDIO_4359_FUNC2_BLOCKSIZE;
> + ret = sdio_set_block_size(sdiodev->func2, f2_blksz);
> if (ret) {
> brcmf_err("Failed to set F2 blocksize\n");
> sdio_release_host(sdiodev->func1);
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index 264ad63232f8..21e535072f3f 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -42,6 +42,8 @@
> #define DEFAULT_F2_WATERMARK 0x8
> #define CY_4373_F2_WATERMARK 0x40
> #define CY_43012_F2_WATERMARK 0x60
> +#define CY_4359_F2_WATERMARK 0x40
> +#define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
>
> #ifdef DEBUG
>
> @@ -4205,6 +4207,19 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
> brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
> &err);
> break;
> + case SDIO_DEVICE_ID_BROADCOM_4359:
> + brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
> + CY_4359_F2_WATERMARK);
> + brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
> + CY_4359_F2_WATERMARK, &err);
> + devctl = brcmf_sdiod_readb(sdiod, SBSDIO_DEVICE_CTL,
> + &err);
> + devctl |= SBSDIO_DEVCTL_F2WM_ENAB;
> + brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
> + &err);
> + brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,
> + CY_4359_F1_MESBUSYCTRL, &err);
> + break;
> default:
> brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
> DEFAULT_F2_WATERMARK, &err);
> --
> 2.17.1
>
> .
>
