Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2ec87dd authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Kalle Valo
Browse files

brcmfmac: add a function designated for handling firmware fails 



This improves handling PCIe firmware halts by printing a clear error
message and replaces a similar code in the SDIO bus support.

It will also allow further improvements like trying to recover from a
firmware crash.

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c9692820

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,8 @@ void brcmf_detach(struct device *dev); 
void brcmf_dev_reset(struct device *dev);

/* Request from bus module to initiate a coredump */

void brcmf_dev_coredump(struct device *dev);

/* Indication that firmware has halted or crashed */

void brcmf_fw_crashed(struct device *dev);



/* Configure the "global" bus state used by upper layers */

void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);

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

+10 −0
Original line number Diff line number Diff line
@@ -1273,6 +1273,16 @@ void brcmf_dev_coredump(struct device *dev) 
		brcmf_dbg(TRACE, "failed to create coredump\n");

}



void brcmf_fw_crashed(struct device *dev)

{

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;



	bphy_err(drvr, "Firmware has halted or crashed\n");



	brcmf_dev_coredump(dev);

}



void brcmf_detach(struct device *dev)

{

	s32 i;

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

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ static void brcmf_pcie_handle_mb_data(struct brcmf_pciedev_info *devinfo) 
	}

	if (dtoh_mb_data & BRCMF_D2H_DEV_FWHALT) {

		brcmf_dbg(PCIE, "D2H_MB_DATA: FW HALT\n");

		brcmf_dev_coredump(&devinfo->pdev->dev);

		brcmf_fw_crashed(&devinfo->pdev->dev);

	}

}

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

+2 −2
Original line number Diff line number Diff line
@@ -1090,8 +1090,8 @@ static u32 brcmf_sdio_hostmail(struct brcmf_sdio *bus) 


	/* dongle indicates the firmware has halted/crashed */

	if (hmb_data & HMB_DATA_FWHALT) {

		brcmf_err("mailbox indicates firmware halted\n");

		brcmf_dev_coredump(&sdiod->func1->dev);

		brcmf_dbg(SDIO, "mailbox indicates firmware halted\n");

		brcmf_fw_crashed(&sdiod->func1->dev);

	}



	/* Dongle recomposed rx frames, accept them again */