60 lines
2.6 KiB
Diff
60 lines
2.6 KiB
Diff
From 2fd3877b5bb7d39782c3205a1dcda02023b8514a Mon Sep 17 00:00:00 2001
|
|
From: Arend Van Spriel <arend.vanspriel@broadcom.com>
|
|
Date: Wed, 8 Nov 2017 14:36:31 +0100
|
|
Subject: [PATCH] brcmfmac: handle FWHALT mailbox indication
|
|
|
|
The firmware uses a mailbox to communicate to the host what is going
|
|
on. In the driver we validate the bit received. Various people seen
|
|
the following message:
|
|
|
|
brcmfmac: brcmf_sdio_hostmail: Unknown mailbox data content: 0x40012
|
|
|
|
Bit 4 is cause of this message, but this actually indicates the firmware
|
|
has halted. Handle this bit by giving a more meaningful error message.
|
|
|
|
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
|
|
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
|
|
@@ -260,10 +260,11 @@ struct rte_console {
|
|
#define I_HMB_HOST_INT I_HMB_SW3 /* Miscellaneous Interrupt */
|
|
|
|
/* tohostmailboxdata */
|
|
-#define HMB_DATA_NAKHANDLED 1 /* retransmit NAK'd frame */
|
|
-#define HMB_DATA_DEVREADY 2 /* talk to host after enable */
|
|
-#define HMB_DATA_FC 4 /* per prio flowcontrol update flag */
|
|
-#define HMB_DATA_FWREADY 8 /* fw ready for protocol activity */
|
|
+#define HMB_DATA_NAKHANDLED 0x0001 /* retransmit NAK'd frame */
|
|
+#define HMB_DATA_DEVREADY 0x0002 /* talk to host after enable */
|
|
+#define HMB_DATA_FC 0x0004 /* per prio flowcontrol update flag */
|
|
+#define HMB_DATA_FWREADY 0x0008 /* fw ready for protocol activity */
|
|
+#define HMB_DATA_FWHALT 0x0010 /* firmware halted */
|
|
|
|
#define HMB_DATA_FCDATA_MASK 0xff000000
|
|
#define HMB_DATA_FCDATA_SHIFT 24
|
|
@@ -1094,6 +1095,10 @@ static u32 brcmf_sdio_hostmail(struct br
|
|
offsetof(struct sdpcmd_regs, tosbmailbox));
|
|
bus->sdcnt.f1regdata += 2;
|
|
|
|
+ /* dongle indicates the firmware has halted/crashed */
|
|
+ if (hmb_data & HMB_DATA_FWHALT)
|
|
+ brcmf_err("mailbox indicates firmware halted\n");
|
|
+
|
|
/* Dongle recomposed rx frames, accept them again */
|
|
if (hmb_data & HMB_DATA_NAKHANDLED) {
|
|
brcmf_dbg(SDIO, "Dongle reports NAK handled, expect rtx of %d\n",
|
|
@@ -1151,6 +1156,7 @@ static u32 brcmf_sdio_hostmail(struct br
|
|
HMB_DATA_NAKHANDLED |
|
|
HMB_DATA_FC |
|
|
HMB_DATA_FWREADY |
|
|
+ HMB_DATA_FWHALT |
|
|
HMB_DATA_FCDATA_MASK | HMB_DATA_VERSION_MASK))
|
|
brcmf_err("Unknown mailbox data content: 0x%02x\n",
|
|
hmb_data);
|