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

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

[Mikhail Rudenko]

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.

Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
---
 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),
 	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),
-- 
2.31.1

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

That is bad naming. There already is a 43436 USB device.

> id 43430, so requested firmware file name is
> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.

As always there is the question about who will be publishing this 
particular firmware file to linux-firmware.

Regards,
Arend

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

[Mikhail Rudenko]

On 2021-05-10 at 11:06 MSK, Arend van Spriel <arend.vanspriel@broadcom.com> wrote:
> 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
>
> That is bad naming. There already is a 43436 USB device.
>
>> id 43430, so requested firmware file name is
>> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.
>
> As always there is the question about who will be publishing this
> particular firmware file to linux-firmware.

The above mentioned file can be easily found by web search. Also, the
corresponding patch for the bluetooth part has just been accepted
[1]. Is it strictly necessary to have firmware file in linux-firmware in
order to have this patch accepted?

--
Regards,
Mikhail

[1] https://lore.kernel.org/linux-bluetooth/E8A21908-1D48-4B89-8A88-7E82A71E0DA4@holtmann.org/

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

[Mikhail Rudenko]

On 2021-05-14 at 12:41 MSK, Mikhail Rudenko <mike.rudenko@gmail.com> wrote:
> On 2021-05-10 at 11:06 MSK, Arend van Spriel <arend.vanspriel@broadcom.com> wrote:
>> 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
>>
>> That is bad naming. There already is a 43436 USB device.
>>
>>> id 43430, so requested firmware file name is
>>> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.
>>
>> As always there is the question about who will be publishing this
>> particular firmware file to linux-firmware.
>
> The above mentioned file can be easily found by web search. Also, the
> corresponding patch for the bluetooth part has just been accepted
> [1]. Is it strictly necessary to have firmware file in linux-firmware in
> order to have this patch accepted?

Ping. Is this definitely no-go?

--
Regards,
Mikhail

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

[Kalle Valo]

Mikhail Rudenko <mike.rudenko@gmail.com> writes:

> On 2021-05-10 at 11:06 MSK, Arend van Spriel <arend.vanspriel@broadcom.com> wrote:
>> 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
>>
>> That is bad naming. There already is a 43436 USB device.
>>
>>> id 43430, so requested firmware file name is
>>> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.
>>
>> As always there is the question about who will be publishing this
>> particular firmware file to linux-firmware.
>
> The above mentioned file can be easily found by web search. Also, the
> corresponding patch for the bluetooth part has just been accepted
> [1]. Is it strictly necessary to have firmware file in linux-firmware in
> order to have this patch accepted?

This patch is a bit in the gray area. We have a rule that firmware
images should be in linux-firmware, but as the vendor won't submit one
and I assume the license doesn't approve the community submit it either,
there is not really any solution for the firmware problem.

On the other hand some community members have access to the firmware
somehow so this patch is useful to the community, and I think taking an
exception to the rule in this case is justified. So I am inclined
towards applying the patch.

Thoughts? I also have another similar patch in the queue:

https://patchwork.kernel.org/project/linux-wireless/patch/20210307113550.7720-1-konrad.dybcio@somainline.org/

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

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

[Arend van Spriel]

On 6/24/2021 6:39 PM, Kalle Valo wrote:
> Mikhail Rudenko <mike.rudenko@gmail.com> writes:
> 
>> On 2021-05-10 at 11:06 MSK, Arend van Spriel <arend.vanspriel@broadcom.com> wrote:
>>> 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
>>>
>>> That is bad naming. There already is a 43436 USB device.
>>>
>>>> id 43430, so requested firmware file name is
>>>> 'brcmfmac43430b0-sdio.bin' in line with other 43430 revisions.
>>>
>>> As always there is the question about who will be publishing this
>>> particular firmware file to linux-firmware.
>>
>> The above mentioned file can be easily found by web search. Also, the
>> corresponding patch for the bluetooth part has just been accepted
>> [1]. Is it strictly necessary to have firmware file in linux-firmware in
>> order to have this patch accepted?
> 
> This patch is a bit in the gray area. We have a rule that firmware
> images should be in linux-firmware, but as the vendor won't submit one
> and I assume the license doesn't approve the community submit it either,
> there is not really any solution for the firmware problem.

At the moment I am not sure which company/division is shipping the 43430 
rev 2 or 43436. Having it in linux-firmware is still preferred.

> On the other hand some community members have access to the firmware
> somehow so this patch is useful to the community, and I think taking an
> exception to the rule in this case is justified. So I am inclined
> towards applying the patch.

As an end-user community members using the device are allowed to use the 
firmware to run on that device. So I tend to agree with you.

> Thoughts? I also have another similar patch in the queue:
> 
> https://patchwork.kernel.org/project/linux-wireless/patch/20210307113550.7720-1-konrad.dybcio@somainline.org/

I will review both and comment/ack them.

Regards,
Arend

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@broadcom.com>
> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
> ---
>   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),
> 

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

[Mikhail Rudenko]

On 2021-06-28 at 15:16 MSK, Arend van Spriel <arend.vanspriel@broadcom.com> wrote:

> 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@broadcom.com>
>> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
>> ---
>>   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.

Will fix in v2, thanks.

>>   	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),
>>

--
Regards,
Mikhail

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

[Mikhail Rudenko]

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@broadcom.com>
Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
---
Changes in v2:
- use 43430B0 firmware for all 43430 revisions above 1
- add Reviewed-by tag
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 16ed325795a8..97fda7e0be7c 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, 0xFFFFFFFC, 43430B0),
 	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),
@@ -4617,4 +4619,3 @@ int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)

 	return ret;
 }
-
--
2.32.0

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

[Kalle Valo]

Mikhail Rudenko <mike.rudenko@gmail.com> 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@broadcom.com>
> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>

Failed to apply to wireless-drivers-next, please rebase.

Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c'
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Applying: brcmfmac: use separate firmware for 43430 revision 2
Using index info to reconstruct a base tree...
M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2

Patch set to Changes Requested.

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210628145412.26046-1-mike.rudenko@gmail.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

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

[Mikhail Rudenko]

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@broadcom.com>
Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>
---
Changes in v3:
- rebase against wireless-drivers-next
Changes in v2:
- use 43430B0 firmware for all 43430 revisions above 1
- add Reviewed-by tag
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 97ee9e2e2e35..baabd3bc9fb1 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_CLM_DEF(43430A1, "brcmfmac43430-sdio");
+BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio");
 BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio");
 BRCMF_FW_DEF(43456, "brcmfmac43456-sdio");
 BRCMF_FW_CLM_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, 0xFFFFFFFC, 43430B0),
 	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),
@@ -4616,4 +4618,3 @@ int brcmf_sdio_sleep(struct brcmf_sdio *bus, bool sleep)

 	return ret;
 }
-
--
2.32.0

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

[Mikhail Rudenko]

Hi, Kalle!

On 2021-08-01 at 10:25 GMT, Kalle Valo <kvalo@codeaurora.org> wrote:
>
> Failed to apply to wireless-drivers-next, please rebase.
>
> Recorded preimage for 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c'
> error: Failed to merge in the changes.
> hint: Use 'git am --show-current-patch' to see the failed patch
> Applying: brcmfmac: use separate firmware for 43430 revision 2
> Using index info to reconstruct a base tree...
> M	drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> Patch failed at 0001 brcmfmac: use separate firmware for 43430 revision 2
>
> Patch set to Changes Requested.

I've posted a rebased v3 [1]. Anything else to do for this patch?

[1] https://lore.kernel.org/linux-wireless/20210804231308.576071-1-mike.rudenko@gmail.com/

--
Kind regards,
Mikhail

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

[Kalle Valo]

Mikhail Rudenko <mike.rudenko@gmail.com> 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@broadcom.com>
> Signed-off-by: Mikhail Rudenko <mike.rudenko@gmail.com>

Patch applied to wireless-drivers-next.git, thanks.

f8d6523891cf brcmfmac: use separate firmware for 43430 revision 2

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20210804231308.576071-1-mike.rudenko@gmail.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches