You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
|
|
From caea8fe9c9524950fedd3b317a05556dca105403 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hector Martin <marcan@marcan.st>
|
||
|
|
Date: Tue, 21 Dec 2021 17:44:00 +0900
|
||
|
|
Subject: [PATCH 11/30] brcmfmac: pcie: Fix crashes due to early IRQs
|
||
|
|
|
||
|
|
The driver was enabling IRQs before the message processing was
|
||
|
|
initialized. This could cause IRQs to come in too early and crash the
|
||
|
|
driver. Instead, move the IRQ enable and hostready to a bus preinit
|
||
|
|
function, at which point everything is properly initialized.
|
||
|
|
|
||
|
|
Fixes: 9e37f045d5e7 ("brcmfmac: Adding PCIe bus layer support.")
|
||
|
|
Signed-off-by: Hector Martin <marcan@marcan.st>
|
||
|
|
---
|
||
|
|
.../broadcom/brcm80211/brcmfmac/pcie.c | 18 +++++++++++++++---
|
||
|
|
1 file changed, 15 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
index 42b3c17ba..a4b49d175 100644
|
||
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
||
|
|
@@ -1380,6 +1380,20 @@ static void brcmf_pcie_down(struct device *dev)
|
||
|
|
}
|
||
|
|
|
||
|
|
|
||
|
|
+static int brcmf_pcie_preinit(struct device *dev)
|
||
|
|
+{
|
||
|
|
+ struct brcmf_bus *bus_if = dev_get_drvdata(dev);
|
||
|
|
+ struct brcmf_pciedev *buspub = bus_if->bus_priv.pcie;
|
||
|
|
+
|
||
|
|
+ brcmf_dbg(PCIE, "Enter\n");
|
||
|
|
+
|
||
|
|
+ brcmf_pcie_intr_enable(buspub->devinfo);
|
||
|
|
+ brcmf_pcie_hostready(buspub->devinfo);
|
||
|
|
+
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+
|
||
|
|
static int brcmf_pcie_tx(struct device *dev, struct sk_buff *skb)
|
||
|
|
{
|
||
|
|
return 0;
|
||
|
|
@@ -1482,6 +1496,7 @@ static int brcmf_pcie_reset(struct device *dev)
|
||
|
|
}
|
||
|
|
|
||
|
|
static const struct brcmf_bus_ops brcmf_pcie_bus_ops = {
|
||
|
|
+ .preinit = brcmf_pcie_preinit,
|
||
|
|
.txdata = brcmf_pcie_tx,
|
||
|
|
.stop = brcmf_pcie_down,
|
||
|
|
.txctl = brcmf_pcie_tx_ctlpkt,
|
||
|
|
@@ -2048,9 +2063,6 @@ static void brcmf_pcie_setup(struct device *dev, int ret,
|
||
|
|
|
||
|
|
init_waitqueue_head(&devinfo->mbdata_resp_wait);
|
||
|
|
|
||
|
|
- brcmf_pcie_intr_enable(devinfo);
|
||
|
|
- brcmf_pcie_hostready(devinfo);
|
||
|
|
-
|
||
|
|
ret = brcmf_attach(&devinfo->pdev->dev);
|
||
|
|
if (ret)
|
||
|
|
goto fail;
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|