From patchwork Sun Feb 12 06:38:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 5285 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1793064wrn; Sat, 11 Feb 2023 22:39:15 -0800 (PST) X-Google-Smtp-Source: AK7set/d3vYWAKfBqz/ChBZu/vwfl5MHS7cMYnUGVfsvZjjhnC46UVpKxalfrvV5w35bjIh9vsbw X-Received: by 2002:a17:902:e74a:b0:19a:6275:587b with SMTP id p10-20020a170902e74a00b0019a6275587bmr12961575plf.63.1676183955424; Sat, 11 Feb 2023 22:39:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676183955; cv=none; d=google.com; s=arc-20160816; b=DJHx4yTxiOaQ2kUSTokos4/0x2tFJl7+o62bD5o4OsqXgnfPsn0Bfpq6W9bZIXJ339 Ff47cK6kwuhqPD0KSAWlyDZUZTZB2u9TZzEVzR53zXIJYv+TPBP2JJTLfsC//o4oyiNx hJVJuGV+5NKKA1Rvn5iUww1F7hOZrXcX7Kj/f2qmBWQBuWEQTCaokkWMeXQAV9e86Hrw Qxy+e3mGEM/BwFjJMMKiORZOg2L/wGjuNIIFvW+XrBcQv5k6gXMzEpAGd19koe7RxIB5 clweGJTadvB28i3v3yltuT/G4QtbE9MaCRVEHAPzYLDe+Z1M+oSehWeJQO97ODZT4qCg NWtg== 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=D3Iq+G9vPz9KSCwYk+/DwQ2fGGOiuavFPBeDQ24INSI=; b=zKUVnueMOnrgWzBYEXDj0Qx3tlZ8bUI3Cx2nLmjrojpFlHyFuekqDmH6d32u2UNJYv Bjjsh4rcNSAM4bb9S5h5IwkeMmK0NVnkFqjVpDrbX2kird9I21m7+CmDJ+pVx3m/GMN+ CdY17WqFPOoayN8oRuqdqy06fc3cNbPDt0Mw50CxQyeEg4mmRoJYsKDp3yaoZ6o/k65Z pjOpxdSWjFanOCoaemcddGelJBzn19A7Zu10a+sF25c11GOPzA1/G9DxWAAhsyD4W5Ma a1OcMN3UMN1qVZ+vxZmhqDKYHerYoSpJiEqjQBraDppXdWpj+0XRi6j5+3E5hcQQb//6 ETMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=RIhD3JSn; 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 q12-20020a17090311cc00b00194a1f665b5si9382964plh.570.2023.02.11.22.38.53; Sat, 11 Feb 2023 22:39:15 -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=RIhD3JSn; 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 S229484AbjBLGiq (ORCPT + 99 others); Sun, 12 Feb 2023 01:38:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbjBLGip (ORCPT ); Sun, 12 Feb 2023 01:38:45 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7812213D7C; Sat, 11 Feb 2023 22:38:42 -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 15A5F425AB; Sun, 12 Feb 2023 06:38:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1676183919; bh=UuZurNk9zhY1jxoEx2xHRndSkiGfgY+vAAycuZiOwnk=; h=From:To:Cc:Subject:Date; b=RIhD3JSnY7vyqo9dQeqCmnng0EcbcqTPv2A7JVDwG8RQAf0ro7Hum3HJ0wlzhvaFK gSAti8wEaGOcx55rAU05QAoMyewuhzDrZtXbtqnCQV8fHVyxz8ZqOvKGi49fPOxCTo MtxvxRhO3lfW+jJ1tNCvswg4/OJ0pNgMhN1wqR/SyVwJCRRV+TOeN0gSuxJCkoJJ4q 5Upn/jWx1VUysYbsxWDzgpA+NWB/68l/sHPhPpX3aZFCsegHYztrnIdDSYlfuEzcUx htEl0HM7Gzci2RC3g8eB+d44H69Cxg6sPnn/11tenPqo4wM9q68HMuVcZQosZGZSXx wz8yOvELoVlAQ== From: Hector Martin To: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Alexander Prutskov , Ian Lin , Joseph chuang , Sven Peter , Alyssa Rosenzweig , Aditya Garg , Jonas Gorski , 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 v4 0/4] BCM4355/4364/4377 support & identification fixes Date: Sun, 12 Feb 2023 15:38:09 +0900 Message-Id: <20230212063813.27622-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?1757606266844806676?= X-GMAIL-MSGID: =?utf-8?q?1757606266844806676?= Hi all, This series adds support for the BCM4355, BCM4364, and BCM4377 variants found on Intel Apple Macs of the T2 era (and a few pre-T2 ones). The first patch fixes a bunch of confusion introduced when adding support for the Cypress 89459 chip, which is, as far as I can tell, just a BCM4355. This also drops the RAW device ID (just for this one chip), as there's no reason to add it unless we find actual hardware in the wild that uses it, and besides the raw device ID is already there twice (with a subvendor match), which was added by 2fef681a4cf7 ("brcmfmac: add CYW89342 mini-PCIe device"). The subsequent patches add the firmware names and remaining missing device IDs, including splitting the BCM4364 firmware name by revision (since it was previously added without giving thought to the existence of more than one revision in the wild with different firmwares, resulting in different users manually copying different incompatible firmwares as the same firmware name). None of these devices have firmware in linux-firmware, so we should still be able to tweak firmware filenames without breaking anyone that matters. Apple T2 users these days are mostly using downstream trees with the Asahi Linux WLAN patches merged anyway, so they already know about this. Note that these devices aren't fully usable as far as firmware selection on these platforms without some extra patches to add support for fetching the required info from ACPI, but I want to get the device ID stuff out of the way first to move forward. v2: Added a commit in front to drop all the RAW device IDs as discussed, and also fixed the 4364 firmware interface from BCA to WCC, as pointed out in the v1 thread. v3: Dropped the raw cleanup commit because apparently some platforms rely on those. Still removing the redundant raw ID for CYW89459, though. It seems highly unlikely that will break anything, as it'd have to be a device with no proper ID programmed *and* a custom subvendor programmed. v4: Removed a total of 12 characters from the commit descriptions, because the nitpicking must go on even though this practice is widespread with more than 17000 examples in the kernel's Git history, and over 500 in networking alone. Earned a gratuitous insult to my intelligence in the process of discussing this. Apple already have new chips shipping on new machines now, beyond the ones I submitted a year ago as part of a larger series that this series is only part of, as Kalle refused to merge it back then for having too many patches. Plus there's more patches queued downstream for suspend support now. I wonder if we'll ever catch up with upstreaming brcmfmac changes at this rate? I'm starting to lose hope. Hector Martin (4): wifi: brcmfmac: Rename Cypress 89459 to BCM4355 brcmfmac: pcie: Add IDs/properties for BCM4355 brcmfmac: pcie: Add IDs/properties for BCM4377 brcmfmac: pcie: Perform correct BCM4364 firmware selection .../broadcom/brcm80211/brcmfmac/chip.c | 6 ++-- .../broadcom/brcm80211/brcmfmac/pcie.c | 33 +++++++++++++++---- .../broadcom/brcm80211/include/brcm_hw_ids.h | 8 +++-- 3 files changed, 34 insertions(+), 13 deletions(-)