Skip to content

Commit b4bb846

Browse files
marcanKalle Valo
authored andcommitted
brcmfmac: pcie: Read the console on init and shutdown
This allows us to get console messages if the firmware crashed during early init, or if an operation failed and we're about to shut down. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Hector Martin <marcan@marcan.st> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Kalle Valo <kvalo@kernel.org> Link: https://lore.kernel.org/r/20220131160713.245637-10-marcan@marcan.st
1 parent e719118 commit b4bb846

File tree

1 file changed

+4
-0
lines changed
  • drivers/net/wireless/broadcom/brcm80211/brcmfmac

1 file changed

+4
-0
lines changed

drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,8 @@ static void brcmf_pcie_bus_console_read(struct brcmf_pciedev_info *devinfo,
744744
return;
745745

746746
console = &devinfo->shared.console;
747+
if (!console->base_addr)
748+
return;
747749
addr = console->base_addr + BRCMF_CONSOLE_WRITEIDX_OFFSET;
748750
newidx = brcmf_pcie_read_tcm32(devinfo, addr);
749751
while (newidx != console->read_idx) {
@@ -1520,6 +1522,7 @@ brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
15201522
shared->max_rxbufpost, shared->rx_dataoffset);
15211523

15221524
brcmf_pcie_bus_console_init(devinfo);
1525+
brcmf_pcie_bus_console_read(devinfo, false);
15231526

15241527
return 0;
15251528
}
@@ -1959,6 +1962,7 @@ brcmf_pcie_remove(struct pci_dev *pdev)
19591962
return;
19601963

19611964
devinfo = bus->bus_priv.pcie->devinfo;
1965+
brcmf_pcie_bus_console_read(devinfo, false);
19621966

19631967
devinfo->state = BRCMFMAC_PCIE_STATE_DOWN;
19641968
if (devinfo->ci)

0 commit comments

Comments
 (0)