lkml.org 
[lkml]   [2022]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 20/35] brcmfmac: pcie: Perform correct BCM4364 firmware selection
    On 1/4/2022 8:26 AM, Hector Martin wrote:
    > 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 87daabb15cd0..e4f2aff3c0d5 100644
    > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
    > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
    > @@ -54,7 +54,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");

    would this break things for people. Maybe better to keep the old name
    for the B2 variant.

    > BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie");
    > BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie");
    > BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie");
    > @@ -84,7 +85,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 */

    okay. so it is the numerical chip revision. If so, please drop that comment.

    > 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),
    [unhandled content-type:application/pkcs7-signature]
    \
     
     \ /
      Last update: 2022-01-10 10:15    [W:4.285 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site