You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From: Arend van Spriel <arend@broadcom.com>
|
|
Date: Mon, 8 Jun 2015 14:38:34 +0200
|
|
Subject: [PATCH] brcmfmac: remove watchdog reset from
|
|
brcmf_pcie_buscoreprep()
|
|
|
|
The watchdog reset as done in brcmf_pcie_buscoreprep() is not
|
|
sufficient. It needs to modify PCIe core registers as well
|
|
which is properly done by brcmf_pcie_reset_device() after the
|
|
chip recognition is done. So the faulty watchdog reset can be
|
|
removed as it was causing driver reload to fail and hang the
|
|
system requiring a power-cycle. Instead the call to to the
|
|
brcmf_pcie_reset_device() function is done twice in the unload.
|
|
|
|
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
|
|
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
|
|
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
|
|
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
|
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c
|
|
@@ -1629,20 +1629,7 @@ static void brcmf_pcie_buscore_write32(v
|
|
|
|
static int brcmf_pcie_buscoreprep(void *ctx)
|
|
{
|
|
- struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx;
|
|
- int err;
|
|
-
|
|
- err = brcmf_pcie_get_resource(devinfo);
|
|
- if (err == 0) {
|
|
- /* Set CC watchdog to reset all the cores on the chip to bring
|
|
- * back dongle to a sane state.
|
|
- */
|
|
- brcmf_pcie_buscore_write32(ctx, CORE_CC_REG(SI_ENUM_BASE,
|
|
- watchdog), 4);
|
|
- msleep(100);
|
|
- }
|
|
-
|
|
- return err;
|
|
+ return brcmf_pcie_get_resource(ctx);
|
|
}
|
|
|
|
|
|
@@ -1824,6 +1811,7 @@ brcmf_pcie_remove(struct pci_dev *pdev)
|
|
brcmf_pcie_intr_disable(devinfo);
|
|
|
|
brcmf_detach(&pdev->dev);
|
|
+ brcmf_pcie_reset_device(devinfo);
|
|
|
|
kfree(bus->bus_priv.pcie);
|
|
kfree(bus->msgbuf->flowrings);
|