Re: [PATCH] brcmfmac: use separate firmware for 43430 revision 2

[Arend van Spriel]

On 5/10/2021 1:30 AM, Mikhail Rudenko wrote:
> A separate firmware is needed for Broadcom 43430 revision 2.  This
> chip can be found in e.g. certain revisions of Ampak AP6212 wireless
> IC. Original firmware file from IC vendor is named
> 'fw_bcm43436b0.bin', but brcmfmac and also btbcm drivers report chip
> id 43430, so requested firmware file name is
> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

Reviewed-by: Arend van Spriel <arend.vanspriel@xxxxxxxxxxxx>
> Signed-off-by: Mikhail Rudenko <mike.rudenko@xxxxxxxxx>
> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index 16ed325795a8..f0c22b5bb57c 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -617,6 +617,7 @@ BRCMF_FW_DEF(4339, "brcmfmac4339-sdio");
>   BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio");
>   /* Note the names are not postfixed with a1 for backward compatibility */
>   BRCMF_FW_DEF(43430A1, "brcmfmac43430-sdio");
> +BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
>   BRCMF_FW_DEF(43455, "brcmfmac43455-sdio");
>   BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
>   BRCMF_FW_DEF(4354, "brcmfmac4354-sdio");
> @@ -643,7 +644,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = {
>   	BRCMF_FW_ENTRY(BRCM_CC_43362_CHIP_ID, 0xFFFFFFFE, 43362),
>   	BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339),
>   	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0),
> -	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFE, 43430A1),
> +	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1),
> +	BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43430B0),

Please follow the existing strategy, ie. support higher chip revisions 
unless proven otherwise. So 0xFFFFFFFC iso 0x00000004.

>   	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456),
>   	BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455),
>   	BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),