aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-12-19 08:40:12 +0100
committerRafał Miłecki <rafal@milecki.pl>2019-12-19 08:41:34 +0100
commitc3aa33bf705027751b344bc668541e5d08ed9495 (patch)
treebeddf5626ac29f666b54f70c2f9ba0bcb4954c49 /package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch
parent922b538cc955a0dd3a7a381a116fba3983c2bc9e (diff)
downloadupstream-c3aa33bf705027751b344bc668541e5d08ed9495.tar.gz
upstream-c3aa33bf705027751b344bc668541e5d08ed9495.tar.bz2
upstream-c3aa33bf705027751b344bc668541e5d08ed9495.zip
mac80211: brcm: backport 5.5 and 5.6 kernel patches
This update doesn't include: 3b1e0a7bdfee brcmfmac: add support for SAE authentication offload be898fed355e brcmfmac: send port authorized event for FT-802.1X due to nl80211 dependencies. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch')
-rw-r--r--package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch b/package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch
new file mode 100644
index 0000000000..a92118a19a
--- /dev/null
+++ b/package/kernel/mac80211/patches/brcm/104-v5.5-brcmfmac-disable-PCIe-interrupts-before-bus-reset.patch
@@ -0,0 +1,54 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Mon, 18 Nov 2019 11:52:41 +0100
+Subject: [PATCH FIX] brcmfmac: disable PCIe interrupts before bus reset
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Keeping interrupts on could result in brcmfmac freeing some resources
+and then IRQ handlers trying to use them. That was obviously a straight
+path for crashing a kernel.
+
+Example:
+CPU0 CPU1
+---- ----
+brcmf_pcie_reset
+ brcmf_pcie_bus_console_read
+ brcmf_detach
+ ...
+ brcmf_fweh_detach
+ brcmf_proto_detach
+ brcmf_pcie_isr_thread
+ ...
+ brcmf_proto_msgbuf_rx_trigger
+ ...
+ drvr->proto->pd
+ brcmf_pcie_release_irq
+
+[ 363.789218] Unable to handle kernel NULL pointer dereference at virtual address 00000038
+[ 363.797339] pgd = c0004000
+[ 363.800050] [00000038] *pgd=00000000
+[ 363.803635] Internal error: Oops: 17 [#1] SMP ARM
+(...)
+[ 364.029209] Backtrace:
+[ 364.031725] [<bf243838>] (brcmf_proto_msgbuf_rx_trigger [brcmfmac]) from [<bf2471dc>] (brcmf_pcie_isr_thread+0x228/0x274 [brcmfmac])
+[ 364.043662] r7:00000001 r6:c8ca0000 r5:00010000 r4:c7b4f800
+
+Fixes: 4684997d9eea ("brcmfmac: reset PCIe bus on a firmware crash")
+Cc: stable@vger.kernel.org # v5.2+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+---
+ drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+@@ -1427,6 +1427,8 @@ static int brcmf_pcie_reset(struct devic
+ struct brcmf_fw_request *fwreq;
+ int err;
+
++ brcmf_pcie_intr_disable(devinfo);
++
+ brcmf_pcie_bus_console_read(devinfo, true);
+
+ brcmf_detach(dev);