diff options
Diffstat (limited to 'package/kernel/mac80211/patches/brcm/360-v5.2-0002-brcmfmac-add-a-function-designated-for-handling-firm.patch')
-rw-r--r-- | package/kernel/mac80211/patches/brcm/360-v5.2-0002-brcmfmac-add-a-function-designated-for-handling-firm.patch | 79 |
1 files changed, 0 insertions, 79 deletions
diff --git a/package/kernel/mac80211/patches/brcm/360-v5.2-0002-brcmfmac-add-a-function-designated-for-handling-firm.patch b/package/kernel/mac80211/patches/brcm/360-v5.2-0002-brcmfmac-add-a-function-designated-for-handling-firm.patch deleted file mode 100644 index 595b8948c7..0000000000 --- a/package/kernel/mac80211/patches/brcm/360-v5.2-0002-brcmfmac-add-a-function-designated-for-handling-firm.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a2ec87ddbf1637f854ffcfff9d12d392fa30758b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> -Date: Tue, 26 Feb 2019 14:11:18 +0100 -Subject: [PATCH] brcmfmac: add a function designated for handling firmware - fails -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This improves handling PCIe firmware halts by printing a clear error -message and replaces a similar code in the SDIO bus support. - -It will also allow further improvements like trying to recover from a -firmware crash. - -Signed-off-by: Rafał Miłecki <rafal@milecki.pl> -Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com> -Signed-off-by: Kalle Valo <kvalo@codeaurora.org> ---- - drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 2 ++ - .../net/wireless/broadcom/brcm80211/brcmfmac/core.c | 10 ++++++++++ - .../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- - .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++-- - 4 files changed, 15 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h -@@ -262,6 +262,8 @@ void brcmf_detach(struct device *dev); - void brcmf_dev_reset(struct device *dev); - /* Request from bus module to initiate a coredump */ - void brcmf_dev_coredump(struct device *dev); -+/* Indication that firmware has halted or crashed */ -+void brcmf_fw_crashed(struct device *dev); - - /* Configure the "global" bus state used by upper layers */ - void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state); ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c -@@ -1294,6 +1294,16 @@ void brcmf_dev_coredump(struct device *d - brcmf_dbg(TRACE, "failed to create coredump\n"); - } - -+void brcmf_fw_crashed(struct device *dev) -+{ -+ struct brcmf_bus *bus_if = dev_get_drvdata(dev); -+ struct brcmf_pub *drvr = bus_if->drvr; -+ -+ bphy_err(drvr, "Firmware has halted or crashed\n"); -+ -+ brcmf_dev_coredump(dev); -+} -+ - void brcmf_detach(struct device *dev) - { - s32 i; ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c -@@ -730,7 +730,7 @@ static void brcmf_pcie_handle_mb_data(st - } - if (dtoh_mb_data & BRCMF_D2H_DEV_FWHALT) { - brcmf_dbg(PCIE, "D2H_MB_DATA: FW HALT\n"); -- brcmf_dev_coredump(&devinfo->pdev->dev); -+ brcmf_fw_crashed(&devinfo->pdev->dev); - } - } - ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -1090,8 +1090,8 @@ static u32 brcmf_sdio_hostmail(struct br - - /* dongle indicates the firmware has halted/crashed */ - if (hmb_data & HMB_DATA_FWHALT) { -- brcmf_err("mailbox indicates firmware halted\n"); -- brcmf_dev_coredump(&sdiod->func1->dev); -+ brcmf_dbg(SDIO, "mailbox indicates firmware halted\n"); -+ brcmf_fw_crashed(&sdiod->func1->dev); - } - - /* Dongle recomposed rx frames, accept them again */ |