* [PATCH] brcmfmac: pcie: Add BCM4378B3 support
@ 2023-02-14 9:28 Hector Martin
2023-02-14 11:13 ` Julian Calaby
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Hector Martin @ 2023-02-14 9:28 UTC (permalink / raw)
To: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
Cc: Sven Peter, Alyssa Rosenzweig, Linus Walleij, Arend van Spriel,
asahi, linux-wireless, brcm80211-dev-list.pdl,
SHA-cyfmac-dev-list, netdev, linux-kernel, Hector Martin
BCM4378B3 is a new silicon revision of BCM4378 present on the Apple M2
13" MacBook Pro "kyushu". Its PCI revision number is 5.
Signed-off-by: Hector Martin <marcan@marcan.st>
---
Note: This applies cleanly on top of:
[PATCH 07/10] brcmfmac: pcie: Add IDs/properties for BCM4387
Though the conflict should be trivial to resolve if it is applied first.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
index 7ee532ab8e85..43d666e9038f 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -66,6 +66,7 @@ BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie");
BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie");
+BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie");
BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie");
/* firmware config files */
@@ -101,7 +102,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C),
BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377B3), /* revision ID 4 */
- BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */
+ BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0x0000000F, 4378B1), /* revision ID 3 */
+ BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFE0, 4378B3), /* revision ID 5 */
BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* revision ID 7 */
};
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] brcmfmac: pcie: Add BCM4378B3 support
2023-02-14 9:28 [PATCH] brcmfmac: pcie: Add BCM4378B3 support Hector Martin
@ 2023-02-14 11:13 ` Julian Calaby
2023-02-15 9:04 ` Linus Walleij
2023-02-27 15:13 ` wifi: " Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Julian Calaby @ 2023-02-14 11:13 UTC (permalink / raw)
To: Hector Martin
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Sven Peter, Alyssa Rosenzweig, Linus Walleij, Arend van Spriel,
asahi, linux-wireless, brcm80211-dev-list.pdl,
SHA-cyfmac-dev-list, netdev, linux-kernel
Hi,
On Tue, Feb 14, 2023 at 8:32 PM Hector Martin <marcan@marcan.st> wrote:
>
> BCM4378B3 is a new silicon revision of BCM4378 present on the Apple M2
> 13" MacBook Pro "kyushu". Its PCI revision number is 5.
>
> Signed-off-by: Hector Martin <marcan@marcan.st>
Assuming the numbers are correct, this looks like other patches that
add new cards, so this is:
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> index 7ee532ab8e85..43d666e9038f 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
> @@ -66,6 +66,7 @@ BRCMF_FW_DEF(4366C, "brcmfmac4366c-pcie");
> BRCMF_FW_DEF(4371, "brcmfmac4371-pcie");
> BRCMF_FW_CLM_DEF(4377B3, "brcmfmac4377b3-pcie");
> BRCMF_FW_CLM_DEF(4378B1, "brcmfmac4378b1-pcie");
> +BRCMF_FW_CLM_DEF(4378B3, "brcmfmac4378b3-pcie");
> BRCMF_FW_CLM_DEF(4387C2, "brcmfmac4387c2-pcie");
>
> /* firmware config files */
> @@ -101,7 +102,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
> BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C),
> BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
> BRCMF_FW_ENTRY(BRCM_CC_4377_CHIP_ID, 0xFFFFFFFF, 4377B3), /* revision ID 4 */
> - BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */
> + BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0x0000000F, 4378B1), /* revision ID 3 */
> + BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFE0, 4378B3), /* revision ID 5 */
> BRCMF_FW_ENTRY(BRCM_CC_4387_CHIP_ID, 0xFFFFFFFF, 4387C2), /* revision ID 7 */
> };
>
> --
> 2.35.1
>
--
Julian Calaby
Email: julian.calaby@gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] brcmfmac: pcie: Add BCM4378B3 support
2023-02-14 9:28 [PATCH] brcmfmac: pcie: Add BCM4378B3 support Hector Martin
2023-02-14 11:13 ` Julian Calaby
@ 2023-02-15 9:04 ` Linus Walleij
2023-02-27 15:13 ` wifi: " Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2023-02-15 9:04 UTC (permalink / raw)
To: Hector Martin
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, Kalle Valo,
David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Sven Peter, Alyssa Rosenzweig, Arend van Spriel, asahi,
linux-wireless, brcm80211-dev-list.pdl, SHA-cyfmac-dev-list,
netdev, linux-kernel
On Tue, Feb 14, 2023 at 10:29 AM Hector Martin <marcan@marcan.st> wrote:
> BCM4378B3 is a new silicon revision of BCM4378 present on the Apple M2
> 13" MacBook Pro "kyushu". Its PCI revision number is 5.
>
> Signed-off-by: Hector Martin <marcan@marcan.st>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: wifi: brcmfmac: pcie: Add BCM4378B3 support
2023-02-14 9:28 [PATCH] brcmfmac: pcie: Add BCM4378B3 support Hector Martin
2023-02-14 11:13 ` Julian Calaby
2023-02-15 9:04 ` Linus Walleij
@ 2023-02-27 15:13 ` Kalle Valo
2 siblings, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2023-02-27 15:13 UTC (permalink / raw)
To: Hector Martin
Cc: Arend van Spriel, Franky Lin, Hante Meuleman, David S. Miller,
Eric Dumazet, Jakub Kicinski, Paolo Abeni, Sven Peter,
Alyssa Rosenzweig, Linus Walleij, Arend van Spriel, asahi,
linux-wireless, brcm80211-dev-list.pdl, SHA-cyfmac-dev-list,
netdev, linux-kernel, Hector Martin
Hector Martin <marcan@marcan.st> wrote:
> BCM4378B3 is a new silicon revision of BCM4378 present on the Apple M2
> 13" MacBook Pro "kyushu". Its PCI revision number is 5.
>
> Signed-off-by: Hector Martin <marcan@marcan.st>
> Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Patch applied to wireless-next.git, thanks.
1d5003d05f98 wifi: brcmfmac: pcie: Add BCM4378B3 support
--
https://patchwork.kernel.org/project/linux-wireless/patch/20230214092838.17869-1-marcan@marcan.st/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-27 15:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-14 9:28 [PATCH] brcmfmac: pcie: Add BCM4378B3 support Hector Martin
2023-02-14 11:13 ` Julian Calaby
2023-02-15 9:04 ` Linus Walleij
2023-02-27 15:13 ` wifi: " Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).