From patchwork Tue Feb 14 09:28:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 56804 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2864584wrn; Tue, 14 Feb 2023 01:33:04 -0800 (PST) X-Google-Smtp-Source: AK7set9JTiQxX1hfCxICmqViLKTLuAveAQBuiMDeMBLjw2U5OIF9fbJ1dS4hL74maHmuH3tuW5VJ X-Received: by 2002:a05:6a20:728b:b0:c6:5d8b:494b with SMTP id o11-20020a056a20728b00b000c65d8b494bmr1912699pzk.33.1676367184658; Tue, 14 Feb 2023 01:33:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676367184; cv=none; d=google.com; s=arc-20160816; b=h4w+S9NjcyZxaLD9ETbDtUDIrIEGWP9QcmF6I53nOGYkbBDYsmQ1/tZ7kst9sjwlZe aJG0t7xSkg5MKMzA7n+mPFEMrzLjLSvp68ECVBYyafW1icZAOzi7j767RYBN9tT7qBCL zasIMYq5cgYNik72wbfsf2ZYDhs0+5xHxsiegT6AgdMJJ3SYI16gXqyB21RcLoyDxEKR fhTcItqyxwHRxBRO+7uXewLedXfpa0WmWf0lJJBvDm3U9Y7S4XNNLi2UBOSItWzgP/11 AE18DEy1VBqCfkDKoNNK/JnzDRC4A6f3IV3r3yzm2ocPhxGpPI+2w5SHm0xCT7ZxeX3n cm4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=QGi3708n9Lm5dq0tC6hC5EmqMTswSGL1ybejRh9EQkI=; b=e1VEnK0AXTNGo+XkKLi0hJqGG+FALXIUClp6awSlMx3luwSoJhFd3EuyNJC+EfEcMR 9W++Cm1cteZwqCqFupnqqYZTSk9t1OrME9ToORgjcryaO/EtwY0izmmeWZ5KkGUhbk6R 9lKmRGXA2wDFy3B9i7H5moTIn0R32mAqJKcZ3gFv90X8ARdwQJAWzUg1vQ9Dp/krnKny NGnEHCQF1beC28Yibz2qa3kAQak8E9aZ95/jX1A8YWWSObNixeFor2EA5RYlFgI/bu4n d0LzmFd1Bqym2D+Bj7PJMLWrTe/+QBKXkWe69rQPaRDVVI4XKWmIvCnP6fc9h8TtNnsj XJ6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=JXrDwxsX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l13-20020a63be0d000000b004e6adc2a8ddsi14425327pgf.705.2023.02.14.01.32.52; Tue, 14 Feb 2023 01:33:04 -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=@marcan.st header.s=default header.b=JXrDwxsX; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=marcan.st Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232007AbjBNJaO (ORCPT + 99 others); Tue, 14 Feb 2023 04:30:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231964AbjBNJ3q (ORCPT ); Tue, 14 Feb 2023 04:29:46 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0A5AD13D52; Tue, 14 Feb 2023 01:29:28 -0800 (PST) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sendonly@marcansoft.com) by mail.marcansoft.com (Postfix) with ESMTPSA id 416A841EF0; Tue, 14 Feb 2023 09:28:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1676366941; bh=AdhmYWfljCcE2txv2eI6D+3+X4JkvmsCqoAX0cB3tE0=; h=From:To:Cc:Subject:Date; b=JXrDwxsXKNRBghl87ApLzK0C109ntBzTCq/sJurbi2VEtUXRZXXt6N3EeRzisuwS1 KEGIxkBX64ec3i8RrKhGZ+RpBouXeMcaWsubxZUrUY79474yYFhAngc/e7UTuSrG53 Fd0RIscSmBntBzNpxUYxKdITTZvpaQCAk9922fkkz+vZ/YiHkybmkXr+pdWXLAXv9Y jlGqSosEnwX+erQhqRpNVxOnDYfJswrqYWGZxU+UrOmCZE61ZDw4aicf1OR8g7bCUa 1apO2k0rQZFMKr7dTog7CgWv640q1jzv7hhGwf+U4QKZPAqrAsVzS7LsZqsWDmKUVQ 4r4gwfgaH/Z1g== From: Hector Martin 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@lists.linux.dev, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Hector Martin Subject: [PATCH] brcmfmac: pcie: Add BCM4378B3 support Date: Tue, 14 Feb 2023 18:28:38 +0900 Message-Id: <20230214092838.17869-1-marcan@marcan.st> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,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?1757798396896891056?= X-GMAIL-MSGID: =?utf-8?q?1757798396896891056?= 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 Reviewed-by: Julian Calaby Reviewed-by: Linus Walleij --- 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 */ };