Skip to content

Commit 528158a

Browse files
Double LoKalle Valo
authored andcommitted
brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode
This patch fixes 4339 CRC error while running Tput test with suspend/resume test script. The continuous failure messages before system crash: brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84 brcmfmac: brcmf_sdio_rxglom: glom read of 25600 bytes failed: -5 brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84 brcmfmac: brcmf_sdio_rxglom: glom read of 24576 bytes failed: -5 brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame Signed-off-by: Double Lo <[email protected]> Signed-off-by: Chi-hsien Lin <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 2a7621d commit 528158a

File tree

1 file changed

+17
-0
lines changed
  • drivers/net/wireless/broadcom/brcm80211/brcmfmac

1 file changed

+17
-0
lines changed

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
#define CY_4373_F2_WATERMARK 0x40
4444
#define CY_4373_F1_MESBUSYCTRL (CY_4373_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
4545
#define CY_43012_F2_WATERMARK 0x60
46+
#define CY_4339_F2_WATERMARK 48
47+
#define CY_4339_MES_WATERMARK 80
48+
#define CY_4339_MESBUSYCTRL (CY_4339_MES_WATERMARK | \
49+
SBSDIO_MESBUSYCTRL_ENAB)
4650
#define CY_4359_F2_WATERMARK 0x40
4751
#define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
4852

@@ -4209,6 +4213,19 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
42094213
brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
42104214
&err);
42114215
break;
4216+
case SDIO_DEVICE_ID_BROADCOM_4339:
4217+
brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes for 4339\n",
4218+
CY_4339_F2_WATERMARK);
4219+
brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
4220+
CY_4339_F2_WATERMARK, &err);
4221+
devctl = brcmf_sdiod_readb(sdiod, SBSDIO_DEVICE_CTL,
4222+
&err);
4223+
devctl |= SBSDIO_DEVCTL_F2WM_ENAB;
4224+
brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
4225+
&err);
4226+
brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,
4227+
CY_4339_MESBUSYCTRL, &err);
4228+
break;
42124229
case SDIO_DEVICE_ID_BROADCOM_4359:
42134230
brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
42144231
CY_4359_F2_WATERMARK);

0 commit comments

Comments
 (0)