Re: [PATCH 6.0 0506/1073] wifi: brcmfmac: Fix error return code in brcmf_sdio_download_firmware()

[Arend Van Spriel <arend.vanspriel@xxxxxxxxxxxx>]

Not sure why this patch is included in stable, but the criteria are unclear 
to me. With or without this patch the net result is the same, ie. device 
probe fails.

Regards,
Arend

On December 28, 2022 5:00:53 PM Greg Kroah-Hartman 
<gregkh@xxxxxxxxxxxxxxxxxxx> wrote:

> From: Wang Yufen <wangyufen@xxxxxxxxxx>
>
> [ Upstream commit c2f2924bc7f9ea75ef8d95863e710168f8196256 ]
>
> Fix to return a negative error code instead of 0 when
> brcmf_chip_set_active() fails. In addition, change the return
> value for brcmf_pcie_exit_download_state() to keep consistent.
>
> Fixes: d380ebc9b6fb ("brcmfmac: rename chip download functions")
> Signed-off-by: Wang Yufen <wangyufen@xxxxxxxxxx>
> Reviewed-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx>
> Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxx>
> Link: 
> https://lore.kernel.org/r/1669959342-27144-1-git-send-email-wangyufen@xxxxxxxxxx
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> ---
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +-
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 
> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> index 97f0f13dfe50..7fc8d47f2281 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> @@ -626,7 +626,7 @@ static int brcmf_pcie_exit_download_state(struct 
> brcmf_pciedev_info *devinfo,
> 	}
>
> 	if (!brcmf_chip_set_active(devinfo->ci, resetintr))
> -		return -EINVAL;
> +		return -EIO;
> 	return 0;
> }
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c 
> b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index 8968809399c7..2e4cd8096f03 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -3412,6 +3412,7 @@ static int brcmf_sdio_download_firmware(struct 
> brcmf_sdio *bus,
> 	/* Take arm out of reset */
> 	if (!brcmf_chip_set_active(bus->ci, rstvec)) {
> 		brcmf_err("error getting out of ARM core reset\n");
> +		bcmerror = -EIO;
> 		goto err;
> 	}
>
> --
> 2.35.1

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature