Commit c161f29b authored by Arend van Spriel's avatar Arend van Spriel Committed by Kalle Valo
Browse files

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: default avatarHante Meuleman <>
Reviewed-by: default avatarDaniel (Deognyoun) Kim <>
Reviewed-by: default avatarFranky (Zhenhui) Lin <>
Reviewed-by: default avatarPieter-Paul Giesberts <>
Signed-off-by: default avatarArend van Spriel <>
Signed-off-by: default avatarKalle Valo <>
parent dbf96753
...@@ -1629,20 +1629,7 @@ static void brcmf_pcie_buscore_write32(void *ctx, u32 addr, u32 value) ...@@ -1629,20 +1629,7 @@ static void brcmf_pcie_buscore_write32(void *ctx, u32 addr, u32 value)
static int brcmf_pcie_buscoreprep(void *ctx) static int brcmf_pcie_buscoreprep(void *ctx)
{ {
struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx; return brcmf_pcie_get_resource(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);
return err;
} }
...@@ -1824,6 +1811,7 @@ brcmf_pcie_remove(struct pci_dev *pdev) ...@@ -1824,6 +1811,7 @@ brcmf_pcie_remove(struct pci_dev *pdev)
brcmf_pcie_intr_disable(devinfo); brcmf_pcie_intr_disable(devinfo);
brcmf_detach(&pdev->dev); brcmf_detach(&pdev->dev);
kfree(bus->bus_priv.pcie); kfree(bus->bus_priv.pcie);
kfree(bus->msgbuf->flowrings); kfree(bus->msgbuf->flowrings);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment