mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-07-16 22:56:59 +08:00
79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
From 042f6e70e7e365ff921edd13060a638bc7c8ef77 Mon Sep 17 00:00:00 2001
|
|
From: Hector Martin <marcan@marcan.st>
|
|
Date: Tue, 21 Dec 2021 17:51:52 +0900
|
|
Subject: [PATCH 101/171] brcmfmac: pcie: Perform correct BCM4364 firmware
|
|
selection
|
|
|
|
This chip exists in two revisions (B2=r3 and B3=r4) on different
|
|
platforms, and was added without regard to doing proper firmware
|
|
selection or differentiating between them. Fix this to have proper
|
|
per-revision firmwares and support Apple NVRAM selection.
|
|
|
|
Revision B2 is present on at least these Apple T2 Macs:
|
|
|
|
kauai: MacBook Pro 15" (Touch/2018-2019)
|
|
maui: MacBook Pro 13" (Touch/2018-2019)
|
|
lanai: Mac mini (Late 2018)
|
|
ekans: iMac Pro 27" (5K, Late 2017)
|
|
|
|
And these non-T2 Macs:
|
|
|
|
nihau: iMac 27" (5K, 2019)
|
|
|
|
Revision B3 is present on at least these Apple T2 Macs:
|
|
|
|
bali: MacBook Pro 16" (2019)
|
|
trinidad: MacBook Pro 13" (2020, 4 TB3)
|
|
borneo: MacBook Pro 16" (2019, 5600M)
|
|
kahana: Mac Pro (2019)
|
|
kahana: Mac Pro (2019, Rack)
|
|
hanauma: iMac 27" (5K, 2020)
|
|
kure: iMac 27" (5K, 2020, 5700/XT)
|
|
|
|
Fixes: 24f0bd136264 ("brcmfmac: add the BRCM 4364 found in MacBook Pro 15,2")
|
|
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
|
|
Signed-off-by: Hector Martin <marcan@marcan.st>
|
|
---
|
|
.../net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 11 +++++++++--
|
|
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
index d33919fd1db9..4e5964dd6c47 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
|
|
@@ -55,7 +55,8 @@ BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-pcie");
|
|
BRCMF_FW_CLM_DEF(43570, "brcmfmac43570-pcie");
|
|
BRCMF_FW_DEF(4358, "brcmfmac4358-pcie");
|
|
BRCMF_FW_DEF(4359, "brcmfmac4359-pcie");
|
|
-BRCMF_FW_DEF(4364, "brcmfmac4364-pcie");
|
|
+BRCMF_FW_CLM_DEF(4364B2, "brcmfmac4364b2-pcie");
|
|
+BRCMF_FW_CLM_DEF(4364B3, "brcmfmac4364b3-pcie");
|
|
BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");
|
|
BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");
|
|
BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
|
|
@@ -85,7 +86,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
|
|
BRCMF_FW_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
|
|
- BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFFF, 4364),
|
|
+ BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0x0000000F, 4364B2), /* 3 */
|
|
+ BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFF0, 4364B3), /* 4 */
|
|
BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFF0, 4365C),
|
|
BRCMF_FW_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
|
|
@@ -2010,6 +2012,11 @@ static int brcmf_pcie_read_otp(struct brcmf_pciedev_info *devinfo)
|
|
base = 0x8c0;
|
|
words = 0xb2;
|
|
break;
|
|
+ case BRCM_CC_4364_CHIP_ID:
|
|
+ coreid = BCMA_CORE_CHIPCOMMON;
|
|
+ base = 0x8c0;
|
|
+ words = 0x1a0;
|
|
+ break;
|
|
case BRCM_CC_4377_CHIP_ID:
|
|
case BRCM_CC_4378_CHIP_ID:
|
|
coreid = BCMA_CORE_GCI;
|
|
--
|
|
2.34.1
|
|
|