Commit 2a7621de authored by Wright Feng's avatar Wright Feng Committed by Kalle Valo
Browse files

brcmfmac: set F2 blocksize for 4373 



Set F2 blocksize to 256 bytes for 4373. It fixes DMA error while having
UDP bi-directional traffic. Also use a defined F1 MesBusyCtrl value.

Signed-off-by: default avatarWright Feng <wright.feng@cypress.com>
Signed-off-by: default avatarChi-hsien Lin <chi-hsien.lin@cypress.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20200529034938.124533-2-chi-hsien.lin@cypress.com
parent da74b693

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c

+13 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 


#define SDIO_FUNC1_BLOCKSIZE		64

#define SDIO_FUNC2_BLOCKSIZE		512

#define SDIO_4373_FUNC2_BLOCKSIZE	256

#define SDIO_4359_FUNC2_BLOCKSIZE	256

/* Maximum milliseconds to wait for F2 to come up */

#define SDIO_WAIT_F2RDY	3000
@@ -910,13 +911,24 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev) 
		sdio_release_host(sdiodev->func1);

		goto out;

	}

	if (sdiodev->func2->device == SDIO_DEVICE_ID_BROADCOM_4359)

	switch (sdiodev->func2->device) {

	case SDIO_DEVICE_ID_CYPRESS_4373:

		f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;

		break;

	case SDIO_DEVICE_ID_BROADCOM_4359:

		f2_blksz = SDIO_4359_FUNC2_BLOCKSIZE;

		break;

	default:

		break;

	}



	ret = sdio_set_block_size(sdiodev->func2, f2_blksz);

	if (ret) {

		brcmf_err("Failed to set F2 blocksize\n");

		sdio_release_host(sdiodev->func1);

		goto out;

	} else {

		brcmf_dbg(SDIO, "set F2 blocksize to %d\n", f2_blksz);

	}



	/* increase F2 timeout */

drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

+2 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
/* watermark expressed in number of words */

#define DEFAULT_F2_WATERMARK    0x8

#define CY_4373_F2_WATERMARK    0x40

#define CY_4373_F1_MESBUSYCTRL  (CY_4373_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)

#define CY_43012_F2_WATERMARK    0x60

#define CY_4359_F2_WATERMARK	0x40

#define CY_4359_F1_MESBUSYCTRL	(CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
@@ -4195,8 +4196,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err, 
			brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,

					   &err);

			brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,

					   CY_4373_F2_WATERMARK |

					   SBSDIO_MESBUSYCTRL_ENAB, &err);

					   CY_4373_F1_MESBUSYCTRL, &err);

			break;

		case SDIO_DEVICE_ID_CYPRESS_43012:

			brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE