From patchwork Mon Jan 2 14:40:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 38129 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4187428wrt; Mon, 2 Jan 2023 06:44:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXsA0RkpwMQJFDNZOMLJjs+8k4c3pjsEFeveWtDUDCnxNX+G2Qrn/5rQUVjawaCDGQJcLHHd X-Received: by 2002:a05:6a21:164a:b0:b2:44dc:407d with SMTP id no10-20020a056a21164a00b000b244dc407dmr12028037pzb.4.1672670674359; Mon, 02 Jan 2023 06:44:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672670674; cv=pass; d=google.com; s=arc-20160816; b=UQAH4o14wjMAf4kyljhTGzVn09B6ToyLZbOLWrPD/Luyy84FBR3jNlzrxyxKETs5ra 4FuZRgYhkBtDY0wno/sO2ObSZ3iJi/6flgx++CuW1Ab/5izsgXCs2s78E6IQkqslMgft 6gItpFDENjzLHgqwZsopdUwbrcAlExvJSFMK9UVf0hKKgSD5ufzJiDDav0x0qv46CKZw AaE9arSiwQUWZYbtUAHyPtGAnc8v5v5BfTgNtPdJx3gWobPah3Qs4jEdx+9qsHZFMStC 3c+ykyQc6hjnN9narjmqLVeMQjeATKSNKohPFlFJ62nt32GGmZQ7rzM/DpZYGI+Y1oEQ AkqA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-id:content-language:accept-language:in-reply-to:references :message-id:date:thread-index:thread-topic:subject:cc:to:from :dkim-signature; bh=QQUbrmMNNYrvHRXeGi9a9FXrDhRZ4NV7kKsuKyXQTAQ=; b=PlNadQscMEAJVZZUUOXC7unqm+a8Pn2fT8MBKHf6HdwT9WbRuCLOvf9veyT5Xg3hSJ x6GP4cZOlWDS7SLqhJ4gQh72MKu7zf3O8W4038YgWV/qfUSJBJq6ciDrBYV2MJQwkfEu daD0vWYSMfkPFqEPIRXbqjqSpmX5zv+YpM2CgnDrd3ZbEINyCp3hyfGErln4VT6iZb4I BSI21IeFm8jsF4PnIX5nVPNYbugT8p78e/VytZEwtM/mI0DGAvH7ksYBXPbbwwr7Mb4J j7ofi7IZID6z/GkgbYJqX8pwxBE7M2iTDogFM8JFMQB7/dEg8KmDvZ25mjc1TfEROkFd Gpkg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@live.com header.s=selector1 header.b=sGVFXaMQ; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=live.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a21-20020a63e855000000b00478d123065bsi31083298pgk.402.2023.01.02.06.44.21; Mon, 02 Jan 2023 06:44:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@live.com header.s=selector1 header.b=sGVFXaMQ; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=live.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232479AbjABOkO (ORCPT + 99 others); Mon, 2 Jan 2023 09:40:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229632AbjABOkM (ORCPT ); Mon, 2 Jan 2023 09:40:12 -0500 Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01olkn2068.outbound.protection.outlook.com [40.92.103.68]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1AA9D300; Mon, 2 Jan 2023 06:40:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nffK1i+fHIvyLsJuQYpcuB+AyUK7cwaxAlbbkI1B0UuSdjf3LqynRIuOVUXECmdSL0JjYZot9kD2bNUmmUI7HzB4QATNVTattRKRuzR3c37+jAFIKtYP/TLTCLFNr/vSNj6/oktPmSQQApD/fRYvXN3PRNebmIOlyGb4xQYtJUsAVeia7Owk0mdtPBZauW/JVI//j0Ojn0zchXzY5B5JgssDIAtjzp+DvnLVGs/9+tjB+4W5ehsrUOiKjjjQ1hGrXJQryOE3lxBMAYBB3RSFHshdqHIWTma5wO7oOVbdW/oHbnH58VRTpXkWQhLHj3graBQLmrciyajWuHAClWW1IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QQUbrmMNNYrvHRXeGi9a9FXrDhRZ4NV7kKsuKyXQTAQ=; b=HkiWp1Ju7AER7fBtE7UozeObxCLEsCpmtOAug8GdNQW6UhGhnicE5jxrcsswqEEZ7ITM0WluHFqeygJ/zN13uyMyI2SPBrx/vffT0L4CqwjO7IAHvikkrOh2S09y+OCRYkssLzwjMBXis+lYxVx1t5kgr6ioXaHQN0H73jKT+XrvMPFvK6JvITgsNbl6K3yFz7rbNoRLErfQHXnCUcD7tPt+1sKa9XyxT/5X3wG0VGVs6HftaXeb6S+YH7EaYbwQYJP7rGGv+ygmSbwUiVHt32qMT7DmC2hDSRv+FBYLTdiWqS5svNYFwxoOuXPGl16d+kvMJg8z0np0Q3luVkFyBA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QQUbrmMNNYrvHRXeGi9a9FXrDhRZ4NV7kKsuKyXQTAQ=; b=sGVFXaMQ+GC91FEuxLp2+toI2fopZhNBmWGbxEPFdSmF+rr0++hOaYAxF/PBBYSEMb5I2mDLZhJvzQFGAkQMJ7rtn6wuYuCJVV4Z6WkMedAqgOdpq3NobdEWSrJYuRzahT1WyvQg8WNklfOqbfkR4Zh5AEorli40E5zi01b79sSLqKX+37Pi1VQGbmguBM2qR5TST88+6XMyr8bzrV/fRatCiAv5iq0mzZ+JDehXTvJhTeiRmwKBXrSL8R7t2C/SgNMpCBv1x4sL9S65UiINEFwuB32pUIGs5Uu2Cc20zvILTPZJ2l2myPtEDzGQOQb6kD3Bb4ERZghIfmEHWeGQog== Received: from BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:2::9) by PN2PR01MB9277.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:117::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Mon, 2 Jan 2023 14:40:03 +0000 Received: from BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM ([fe80::f90e:46bc:7a0f:23bc]) by BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM ([fe80::f90e:46bc:7a0f:23bc%7]) with mapi id 15.20.5944.019; Mon, 2 Jan 2023 14:40:03 +0000 From: Aditya Garg To: Hector Martin , "aspriel@gmail.com" , "hante.meuleman@broadcom.com" , "kvalo@kernel.org" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "lina@asahilina.net" , "franky.lin@broadcom.com" , Arend van Spriel CC: Orlando Chamberlain , "brcm80211-dev-list@broadcom.com" , "brcm80211-dev-list.pdl@broadcom.com" , "linux-wireless@vger.kernel.org" , LKML , Asahi Linux Subject: [PATCH 1/2] brcmfmac: Use separate struct to declare firmware names for Apple OTP chips Thread-Topic: [PATCH 1/2] brcmfmac: Use separate struct to declare firmware names for Apple OTP chips Thread-Index: AQHZHrgZDnaanKJG6k6Y1zElujNaAQ== Date: Mon, 2 Jan 2023 14:40:02 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [/xxa1By3errEM3v4mna0krMW7j3tH3EX/bIjP5/cXzFzt4cAe5imbucn5S+tO96O] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BM1PR01MB0931:EE_|PN2PR01MB9277:EE_ x-ms-office365-filtering-correlation-id: a39661f7-856f-434f-0470-08daeccf3bb7 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: r+pUXhuBEfdRc4r0zzY4dwxTPwDXCIkULou9NNxz62gr852viBV0pTLZfj6/1YZ+9VayoWYDew5zS9BfQUxP8w7+cquRJUgRXLeaLS5jP1eHECUkULAINHhBkwaOXBaL4mzdON/SPaT5WU2H1IwNaWql0+BR/UfrvgVdAMGfxQk3iTbxKhPpdYSvedqUNgyjxk5lDG9iKRgw9xEAGk8lu9IaHSt6gBO+Gv5dRJh3Crxe8opJfT3kuF8eFOxSybDwbEOZ6f5HA5qXxaPztneUQIpxK/uF4zdQ/tuP7THTS8UKYiKtP/sL1FCIbnlNgaMXPYvS3NSOcVhpWjQ5eYnC8nPLMN94Z8EkEVvY8C4vxhpLM6AgJfKC2WrS1UHOqcSy6OmHmPt0owBJeLp6UTRpU4A3Qz/R0INdJDrj2WhteWaEGvqvWZkHKOfOqwQwM4YZY3m1lPPYG76ICgicJWzBYjZHmjHhoafmp8ZTYgWqTEE/PbnRY2oAZ8FCKZ7WKUa9pow+13FVxjps2G4ZOyurEAsFuBvbo0Eq3qybSiptOScpSUB7Ks+mS2VkPE9EPBUOvmSFtK9z+ikrCvRNyPWe7vDJfvL3Nd+W4+N2A/O7wu0= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: Vh/Pp3B2gGcTEw+fpN8IqyzIkwtt9Lk2sdGPEWAI3jU9xxYykeA6UPsEUE6jUrb+hNt1Tx9R2wkqk7bLGDIb+/nSyL45sxOBbiuH6s/lAgKg2x1egI2t1Ik7cEB1YRLLrRjiI2PsN4rpLkCtQ1piycYlX/L0WOYPXYvheuClUc5JTa/F8GUqYca5CW4oEvIPlJW84n+3KoecglHvI1h3E+yIm647m60dOYZj65TIQ6sLOj51PpiVarM0zG+z1KPxJqaPZwiwucmcNfLx83j6flHpxsrwJX3TwNJZduI4qQQx3pSAsoZOolG9QexwikRoYp99PeX59As29lGfGOb5EGfx+rimFA0HOCFzfWwbH24CgAHsdusaRB9gYphZYWDI6fJFJ5//YbAGjf9lJ2ntYNj5U8qVmCtmJpXoDZVOUWTfkXh9310rpt8huVkeENRVlDpwO3TGhnSQVGYhhm9iqCNz2pl035aAM8WIy8Ntky+NVasKyYFQwOhyd1sXcg3/9m+M3YfQjfHJrpAW74KvuDQHydi8Pb2VbRrPIKY1yK6FU6Lk2fUBK1lYf9Aa0PHRCPy4FK/CKsFI1RLNNDEdkKGtY24geLVunuFv2SDQwfo0ESBQ6QChfq3Do6KKX/MPFyqPwvAtFcOJi812aNeYBkTWNFKG3S+o788Xlai3ToWd0wuY1nGDbRpyYsz7WLp1BN7/Y0HqWpCtMzkd7Zeqr3Geio8tct0mEJ1diiMIWNPXnUSTxZ+ftHHT3wNlh4RRBpxCIfkPBhtttuOQ6c8XRIi/gHf3FvxXV8nHD1PJHSQT7sNDgms1F49MK5BjASZeiUFC5zXXTkHXSu2rqZJ9c7dO90IlyMDUt0euDHfhlEvRoLkuTC+aPMMUTnukZVahyLXwxJOXcMvWlgtYFHfkmpUISS+Hv1t2i/IYQ++hmxbFA3zAB5mJ+scaK8f1MXAeZJOzbZf1//1GTn80zztY4fWIy6NdP1owXo2m+tQtwiSm3xQcwQe4XNQS7ApFgn3VGD41bNdw+P5yDe0imFKR/uy3L1UwgyWsWJsQvLZQYox73C8qNv42p4iHh8qHLn2n8G/io+bLmxtiT6il0lNZLxkfhTBBjNY5yzaeB/W7CY9J0sG4dfD+d1oN47cO7kJsdDV4avbSqKvLcE5cBhVgbdz+GwfHUWl2SL1c/LLH+zQxZ8eF0px0ElPXpr22ypcehZ5lTazV5ghQjyAgg/bJy50Vqt/+1HG1tL3E0Q4heVe2J0LZ8kbrUhb7K0EM9KGrh3OJjxUtjxS3w7ydpjtPERL8ADCROISoWxUwcobTu3Sk87R7SONRJ9NIVMpTtyZzVv00k7cIcRj1mpDea9tOxQ== Content-ID: <479D565AC9470C46B41E26623076DDA2@INDPRD01.PROD.OUTLOOK.COM> MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-42ed3.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a39661f7-856f-434f-0470-08daeccf3bb7 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2023 14:40:03.0113 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2PR01MB9277 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753922324856020691?= X-GMAIL-MSGID: =?utf-8?q?1753922324856020691?= From: Aditya Garg Commit 'dce45ded7619' added support for 89459 chip pcie device. It uses the BRCM4355 chip which is also found in Apple hardware. However this commit causes conflicts in the firmware naming between Apple hardware, which supports OTP and other non-Apple hardwares. So, this patch makes these Apple chips use their own firmware table so as to avoid possible conflicts like these in the future. Signed-off-by: Aditya Garg --- .../broadcom/brcm80211/brcmfmac/pcie.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index ae57a9a3a..ad7a780cd 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -92,10 +92,13 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C), 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_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */ BRCMF_FW_ENTRY(CY_CC_89459_CHIP_ID, 0xFFFFFFFF, 4355), }; +static const struct brcmf_firmware_mapping brcmf_pcie_otp_fwnames[] = { + BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */ +}; + #define BRCMF_PCIE_FW_UP_TIMEOUT 5000 /* msec */ #define BRCMF_PCIE_REG_MAP_SIZE (32 * 1024) @@ -2165,10 +2168,16 @@ brcmf_pcie_prepare_fw_request(struct brcmf_pciedev_info *devinfo) { ".clm_blob", devinfo->clm_name }, }; - fwreq = brcmf_fw_alloc_request(devinfo->ci->chip, devinfo->ci->chiprev, - brcmf_pcie_fwnames, - ARRAY_SIZE(brcmf_pcie_fwnames), - fwnames, ARRAY_SIZE(fwnames)); + if (devinfo->otp.valid) + fwreq = brcmf_fw_alloc_request(devinfo->ci->chip, devinfo->ci->chiprev, + brcmf_pcie_otp_fwnames, + ARRAY_SIZE(brcmf_pcie_otp_fwnames), + fwnames, ARRAY_SIZE(fwnames)); + else + fwreq = brcmf_fw_alloc_request(devinfo->ci->chip, devinfo->ci->chiprev, + brcmf_pcie_fwnames, + ARRAY_SIZE(brcmf_pcie_fwnames), + fwnames, ARRAY_SIZE(fwnames)); if (!fwreq) return NULL; From patchwork Mon Jan 2 14:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 38130 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4187533wrt; Mon, 2 Jan 2023 06:44:53 -0800 (PST) X-Google-Smtp-Source: AMrXdXtSIoF3Miyeva2Quybqf8zQqAwCLt8TS2gjNHyTgH0uY23VH0jaNIK7Caycw3lsibZFQcZ5 X-Received: by 2002:a05:6a20:93a1:b0:ad:f140:79a3 with SMTP id x33-20020a056a2093a100b000adf14079a3mr12540167pzh.6.1672670692979; Mon, 02 Jan 2023 06:44:52 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1672670692; cv=pass; d=google.com; s=arc-20160816; b=h7Z9t3sHf05umc/uDrcKeFW6PeYslGzJyiLLZTD4yZrmCLaUGEAXOr0yGDYknacvhn 22s1KzWKR18F/K8lZG/9Y23/rSB0xBP69DK6j5d/eAurk08dSx6lUMeqr8+II9ld7gvA D+Swgom5AtZhQ0m6+p6mwKHJeXQRkYEwHTtiNqrjKt8UiSiF1/vv4E7Dol0B6TxxXXjd CTAoA5Docf8XPZjQLrhljX0sqvG5fXgsubOrO1XwTa5/K1mS9jqtEm0xlQMAcwq0Z73F E9ouCbuZbgyTigHJcF8QAwzvp8GsjIBh121eR3lAty/HNxsJJAvhIYABPme95Du3aEeG NayQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :content-id:content-language:accept-language:in-reply-to:references :message-id:date:thread-index:thread-topic:subject:cc:to:from :dkim-signature; bh=sW3/Kw8QHWc2ywFMsT9T7eZ/+DR4ICnrc4EyrsasRIc=; b=sdaeKIYOXbCa2BPG/kW+o12YhjwGVFdjmuN1wcT5P6kvXMixhzwhc4f0LCTn+n/91V Re/AP88f/THrjU8NU9DD9/012x2Emqt/GkU6XBQsYfhQrJJioscGUXyVAClGIv6Lzn8q Rzy49EAWU9p+W7j83Uu4h7YD/YOSjl7auhHBi6blb1FLpMU3CtnpgcxYxBLyQq1uq90M 1velqInkUyEVdxY01Beobbu354ZKD/DnrXqZ1u4JlknpxXOxezGm89DConResxv8nPw9 s2KKIjoBLnOPqdva6d4xh8K9/4CCt2XrMYwU96LHH8blMe4Zo5CSfdTOwh9Gf0USFrE6 mAvg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@live.com header.s=selector1 header.b=S+MUeDw2; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=live.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c21-20020a63da15000000b0046b0e168af0si29262000pgh.597.2023.01.02.06.44.40; Mon, 02 Jan 2023 06:44:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@live.com header.s=selector1 header.b=S+MUeDw2; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=live.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232771AbjABOlN (ORCPT + 99 others); Mon, 2 Jan 2023 09:41:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230420AbjABOlK (ORCPT ); Mon, 2 Jan 2023 09:41:10 -0500 Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01olkn2039.outbound.protection.outlook.com [40.92.103.39]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 707C610AF; Mon, 2 Jan 2023 06:41:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n6A1CT0WMIY4f1oAujysoCV9M7QOF9zP695f7OOM5tRVYTNs/63xX5audfgpaGD3Gki/YnA4BTT2bpU/xadE7i5zr7AczdWRKNBfuSMJJy2+hJwIojiNZQXzGjaaD3peOCmA7T54q/N07mI8Tc5+SJ0RRR7sQbSxRfgj384G1S1uXR6DsNFiRx44PrMPOwCojHRiujkhQhcKhNtjzwvVQiNm1TmNtG4K8iz+PISoZmO69+Xb7Gs2pIgP8gP/bI+dKFDw6p0mCGJptn4bDuPTaFGkwDgzVyyb3pvooqZwO9GyfuP+rfyAYcnjqyIthuCk0xEevPAJr29X/K0ewCfB6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sW3/Kw8QHWc2ywFMsT9T7eZ/+DR4ICnrc4EyrsasRIc=; b=Pp0xCYDOyzj/4ngpwwtpjLC8QkSetJpZNkmXIVdhJZZh/fmBR389cJQL5Vum82Gbxo/57ZE3NOOA3B0U4cD+rYzZJdptL7SLTV2mX8CefBfe0KKCJgA22EeSlFlKWsZoytLuMbE+m1zM1W2125jBa4TUQcec8xh4wB5PE7cI+zFSzeOyMsnfBIThlVVMD9LISdpLI1Zu/x8nzbvVUBz2WTE36aOhVnlvgZFseRWocHBvJ/gSksrwiQP9UIWAVdlAqSwwCDhSrBUHVfwwIY5qs9m/Lk7Eqi/tOgH/N3HOp5qZ+Yma6j+A2xRIzjwJQWlm8E9csrhZ4sSKBweAquXDOA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sW3/Kw8QHWc2ywFMsT9T7eZ/+DR4ICnrc4EyrsasRIc=; b=S+MUeDw2tkY2hEtv/ZwG3W5FwCrfLFo+bE/G85bnsEUCgUHvU/Au06/F7zQimr7Re7Vx0hMO/ackYV50XwgIQLAoTs0B9oDHfWnsrQcX4YQs1JGmnP0PzoS5Xs4Lz+sOMhSzs/Auxi46n6gAbptcTvGVZZpz7x//KRTXKzJyI2wjiYErjPc0lyl+IqbkQSIf+3FWPmmTqSVpAU6va1/QjOnA0ll+S2WAJESgnIBNQ6brTfJwWI6pZOkODn3NLZu+SdlYU2Jvlpl1jFHMcH5Ru1T4q+m/dY5n+x9BR+FqTL8ORTMLW9hBoKbCDLxzzi9r3+AVPFzWJzGlf1ygG70hzw== Received: from BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:2::9) by PN2PR01MB9277.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:117::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.19; Mon, 2 Jan 2023 14:41:01 +0000 Received: from BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM ([fe80::f90e:46bc:7a0f:23bc]) by BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM ([fe80::f90e:46bc:7a0f:23bc%7]) with mapi id 15.20.5944.019; Mon, 2 Jan 2023 14:41:01 +0000 From: Aditya Garg To: Hector Martin , "aspriel@gmail.com" , "hante.meuleman@broadcom.com" , "kvalo@kernel.org" , "davem@davemloft.net" , "edumazet@google.com" , "kuba@kernel.org" , "pabeni@redhat.com" , "lina@asahilina.net" , "franky.lin@broadcom.com" , Arend van Spriel CC: Orlando Chamberlain , "brcm80211-dev-list@broadcom.com" , "brcm80211-dev-list.pdl@broadcom.com" , "linux-wireless@vger.kernel.org" , LKML , Asahi Linux Subject: [PATCH 2/2] brcmfmac: Add PCIe ID of BCM4355 chip found on T2 Macs Thread-Topic: [PATCH 2/2] brcmfmac: Add PCIe ID of BCM4355 chip found on T2 Macs Thread-Index: AQHZHrg8x1kT5HSHkE2GsL/urEyCtg== Date: Mon, 2 Jan 2023 14:41:01 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [6kIr0GQZxgep4qQw6YJIlW8+YaR3s7HGleoaVYbKqGJQYchN3kB7UPTPYHAzqhsC] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BM1PR01MB0931:EE_|PN2PR01MB9277:EE_ x-ms-office365-filtering-correlation-id: 6ac702d4-58ca-47a8-3554-08daeccf5e9e x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Y0DTF3ke3cBskdwdIRND6FIWH6foOHMMA8XbiHUsOW14s3+w2xw2euP/ZYvXKTCqS9CiE/kybUk+QPhmhBvbp2aabYYuGtYR5KBB701Vpea3hfR8pRI9EV9k+OwDam3Kp1tLhNhsYMcxswFIDpCAs5R6Oj4otjJk64cOKVlWyYOAFTg2lqgevpZEb6hCRUxeQC20ByEgHYXplPi+lyGVA5gfSUUDfuULHnBkin/uK6poEghZp1OAq62poZoBCjvz1sHx/cNSAGow2gTGuz4MaZ5plSuJg+2/gueQBqbkhg1cBo6xDbW8fDSRyXesUahdr12TOhPwX9dmCR9EMCtpzwg/aiir7aY4/fAxdeqvjhJHh9/FRehE3wfIa3rziS3P/wz7R/gx0DQc65FL7Pab4Op+t0citli7sWnq/COaVREGWGaknzC6AVSv00QEc0rMOaOltieaCBWmM86WkEH8I4vesu7kRguq/bTJj6+7laQnqOasBt/oSMTE4HgJB8URNFI1eSRWOX/w/r1RYGweaO2jW11r382fbvGXmwnDOXbps5nfa1aPBAtDJ6JjjA1OmMaCO1EZMioH3ZwEu+nfFGgYfAUKKun0dGIsg7+Fxi4= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: +xzfGgIT54gy6fk8e5vX/QZ84ZAqELKLz9RjZeIVRW67DQoa5BfpDG4IynfwQfzD0cY/7FAF8xivk1V2RM3ohK0sFotKGmux7htrjzObmMTwpUA8r1TrgTTIRayjwiwLqtU+1P2roh8qvNUj/0QXqLo0OpfiGW7cbAFNTURSDQmDsNgYUOMty2EBVvBvi43LsPeuU9Hc9mPerAB/guyZ3kGWK8gBxKPesgS9JfeSOp7vHqOrhx38eHLNyGEDAKKnNB+yj++MnzBp+DfCUtX/oD/x6byM8XPZDMafT64/S78ybZorpon/qeka1sjnLhNd/VbD8L31Ex409Ypm/TcveUEPgrWCuP62izA4X7BlON1CjZ+QA3ksLnKXvDLhnbJAgtqd+52Zxgmjr9AtKILyrz7DbST7Asq0aqngpB8Xnq4uA/2sUmZ7O7BjTk0L1NHudvLzuZ/bwO3/fk7EVfXe7rAADCfcyLOmy/wAlswzRUKvhzb208Wt7dc8NR5mhmrSSF3Mbe9k8YdcTM0i3zAzYbo5Rp7cwj8sBEga93D0t1V/PqLSrAKTpxIvfzSOTfpzEAKqJ7Erpywbbu1Rc8f+qgbNAZxvVEDuMHqVGqZT4Cy4gLkEDnJ1519fWJ5jEKrrvc63o2P6F+PVHkyuoal5WL9s57FBxd9qUg/JSmMQpZHD3Shw0nVwPwykDH3knQxkmut6DMtVDeHeP060opuKPNprCGu4tkT2qHqk1RpvI4Cy9h1qgSH5caVh34rHbdIrzQUGfUIQ4S0gYy8T6esuE6LggX3QGO8NJV5iueoCwZDUj3c2IiCKsuYbuQbrA04P/z5lczi2cuChH1Ad/JPLRzf9N6kRk20srWYewfMjpRIRNOzmWMy6UlN5Gl7ze536LVYvrjQzqX5RyzCAOh9ESi7OVOyR8GRVE1Hh9GiPOYaHoXxJarAv5riBhk21p7CRlcjGWqi0hBwPzcH8rPcMYNdsLM7S7Ti7jsoj+6VcsfpaDB+B7BWgdTEZ5DAHv1XGBSj8Oz8CFbSyei64+QookwBnzH+izGaNIBrmm+VrhthYOqMeqiEEzBsFL23OIad5DIhLoMQ2F1gTwbJ/VXU1bNyDeZ8XUYq0FHiw5HqAZiWTwBQ7rilgbhxk6cyYyXw8ZEYtRS5ob5OyIRW9WUsva6SJPRuGf7A/49Ax3fdknRhKphsuxcNHVoE4fJofOdMrXgy5EDt5t/YYPyTCjgUKsNtM+5vbdQGJ7Zbi+y4SnVZyBunO6FXpX+P58jgis9fJWEhU4ezBrn/IqAT/7bbRjOj4m7rEyogx8HJUt+pIwBs01JbISLgIqZjQY8uN62Re/Y4mqg8Fl6EVjJewcishEA== Content-ID: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-42ed3.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 6ac702d4-58ca-47a8-3554-08daeccf5e9e X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jan 2023 14:41:01.5533 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2PR01MB9277 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1753922344929317904?= X-GMAIL-MSGID: =?utf-8?q?1753922344929317904?= From: Aditya Garg Commit 'dce45ded7619' added the BCM4355 chip support. This chip is also found in MacBookAir8,1 and MacBookAir8,2. This patch adds necessary pcie IDs to add support for the same. Signed-off-by: Aditya Garg --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 4 ++-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 3 ++- drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index 121893bba..2f338c5d9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -735,7 +735,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) return 0x170000; case BRCM_CC_4378_CHIP_ID: return 0x352000; - case CY_CC_89459_CHIP_ID: + case BRCM_CC_4355_CHIP_ID: return ((ci->pub.chiprev < 9) ? 0x180000 : 0x160000); default: brcmf_err("unknown chip: %s\n", ci->pub.name); @@ -1427,7 +1427,7 @@ bool brcmf_chip_sr_capable(struct brcmf_chip *pub) reg = chip->ops->read32(chip->ctx, addr); return reg != 0; case CY_CC_4373_CHIP_ID: - case CY_CC_89459_CHIP_ID: + case BRCM_CC_4355_CHIP_ID: /* explicitly check SR engine enable bit */ addr = CORE_CC_REG(base, sr_control0); reg = chip->ops->read32(chip->ctx, addr); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index ad7a780cd..0a7410196 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -78,6 +78,7 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0x000000FF, 4350C), BRCMF_FW_ENTRY(BRCM_CC_4350_CHIP_ID, 0xFFFFFF00, 4350), BRCMF_FW_ENTRY(BRCM_CC_43525_CHIP_ID, 0xFFFFFFF0, 4365C), + BRCMF_FW_ENTRY(BRCM_CC_4355_CHIP_ID, 0xFFFFFFFF, 4355) BRCMF_FW_ENTRY(BRCM_CC_4356_CHIP_ID, 0xFFFFFFFF, 4356), BRCMF_FW_ENTRY(BRCM_CC_43567_CHIP_ID, 0xFFFFFFFF, 43570), BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570), @@ -92,7 +93,6 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_43664_CHIP_ID, 0xFFFFFFF0, 4366C), BRCMF_FW_ENTRY(BRCM_CC_43666_CHIP_ID, 0xFFFFFFF0, 4366C), BRCMF_FW_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371), - BRCMF_FW_ENTRY(CY_CC_89459_CHIP_ID, 0xFFFFFFFF, 4355), }; static const struct brcmf_firmware_mapping brcmf_pcie_otp_fwnames[] = { @@ -2599,6 +2599,7 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE_SUB(0x4355, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4355, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4354_RAW_DEVICE_ID, WCC), + BRCMF_PCIE_DEVICE(BRCM_PCIE_4355_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_4356_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_43567_DEVICE_ID, WCC), BRCMF_PCIE_DEVICE(BRCM_PCIE_43570_DEVICE_ID, WCC), diff --git a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h index f4939cf62..fee1ff526 100644 --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h @@ -37,6 +37,7 @@ #define BRCM_CC_4350_CHIP_ID 0x4350 #define BRCM_CC_43525_CHIP_ID 43525 #define BRCM_CC_4354_CHIP_ID 0x4354 +#define BRCM_CC_4355_CHIP_ID 0x4355 #define BRCM_CC_4356_CHIP_ID 0x4356 #define BRCM_CC_43566_CHIP_ID 43566 #define BRCM_CC_43567_CHIP_ID 43567 @@ -56,7 +57,6 @@ #define CY_CC_43012_CHIP_ID 43012 #define CY_CC_43439_CHIP_ID 43439 #define CY_CC_43752_CHIP_ID 43752 -#define CY_CC_89459_CHIP_ID 0x4355 /* USB Device IDs */ #define BRCM_USB_43143_DEVICE_ID 0xbd1e @@ -72,6 +72,7 @@ #define BRCM_PCIE_4350_DEVICE_ID 0x43a3 #define BRCM_PCIE_4354_DEVICE_ID 0x43df #define BRCM_PCIE_4354_RAW_DEVICE_ID 0x4354 +#define BRCM_PCIE_4355_DEVICE_ID 0x43dc #define BRCM_PCIE_4356_DEVICE_ID 0x43ec #define BRCM_PCIE_43567_DEVICE_ID 0x43d3 #define BRCM_PCIE_43570_DEVICE_ID 0x43d9