From patchwork Tue Jan 31 11:28:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 4759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2698602wrn; Tue, 31 Jan 2023 03:36:46 -0800 (PST) X-Google-Smtp-Source: AMrXdXu+UvjHk05LBBKfmqqtWmfjZ4hGUoupdv2hZFGg26uxmzBkht5Uypk4FOZdtkZeDdBh//sn X-Received: by 2002:a17:906:8d0f:b0:870:b950:18d4 with SMTP id rv15-20020a1709068d0f00b00870b95018d4mr60889657ejc.5.1675165006680; Tue, 31 Jan 2023 03:36:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675165006; cv=none; d=google.com; s=arc-20160816; b=p8AfW/ElB6qdY8jDOmwzRsPox/uth3f3CrZQauoPibJ4j4RkUe2JcdDQap4moLI1iL nICiKkSSG+st2c+MKidW4zQCopLufum26v61SgPMeoyafMEqhmzSFDTeuWiLwopjfQqm iR/A6a/FHb/BmYD1UjclCWxORX8zNMLKsgrs8xbeQB+Po3VcGfDGQReqGnFq+ycODx9U KA1QJiDvRIgwkkU0yKbkb5LUfYu4mPxwkjI8sdpIofnVamle8wSVYXilg8GfPypNRS/W zJLfvb/mLbBZyZg41Qtenxx8l+5PwmXHiQrxdRVv9PlFEj+ZuZ9bNsc03eygo6URdKi8 ucfg== 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=/YdaEMRdeAyBIoUHbwi9dEuVOuMIMBBVDshstr6TJAM=; b=xUSMLxSH18XWNsxhNXY2SNUpAYz28rMq1ad68OE06chUB3BmIJDwOVbk8anJx2Tqhm /IqB3e/58aDI0TADWHiFg8amBPTah6fJHz0NX9KHHrP52eIwKrtweJ4CyQf0FCelgdeb EV6ps63vpW0c58TqkpF8RXFt1GjqDayxQTOtKVFv7QN7IAOIXaw4CGDj/UsnKmz7aYxc +VG28ta7x89c2BGwkLfedTWkSiDQdgpJ7oq0feqlqOnn6Eeo+xS2SwIaEgtqvpGxMpIq ZBmpjSQGOmg99LsJVAHiBDYbQIWVNkIuLcYs3PfTvGhwr4cnB4j1xtugAudWgTIecrsT /XMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=WcaKAOgN; 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 20-20020a170906101400b008840b97dce8si12376712ejm.883.2023.01.31.03.36.22; Tue, 31 Jan 2023 03:36:46 -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=WcaKAOgN; 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 S231429AbjAaLaN (ORCPT + 99 others); Tue, 31 Jan 2023 06:30:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229828AbjAaLaM (ORCPT ); Tue, 31 Jan 2023 06:30:12 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1379C4A1F9; Tue, 31 Jan 2023 03:30:09 -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 9270A3FA55; Tue, 31 Jan 2023 11:30:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1675164607; bh=ZjWEGCtKMs+iCP880alfcD+T5+jOm8zzDU2+Ng2uQDc=; h=From:To:Cc:Subject:Date; b=WcaKAOgN3oaceGqpcVsb1yX2pGRculvKRUZWCnbe/PpLmIWvlY1o1Hvp53xWYZfmM raarxdAEsmjelXWKX0loX5ApCs0sInyv6/r8u2Hge7qn/cbEnyASZToyQl5liYKhhr KRAa2UsGb/n8ciXCI8zcbDXBz1h3EpO6xFCTa+zTMEda0FC534eCuWPGYM8IxPxD9c tWlizT+zPY1texIAm9/qu/IXneE9te2VzK+6rIcS9pd+BFbAz1TJBChf0JrufUt1Xe dsJ8w904TL6+3ie7kZW2RXT61QWP2AKgLHiR1gfA6g63SYJJgBjpIoaVWPbyzO/BG+ czrmHM0hhiU8g== 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 , Chi-Hsien Lin , Wright Feng , Ian Lin , Soontak Lee , Joseph chuang , Sven Peter , Alyssa Rosenzweig , Aditya Garg , 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 v2 0/5] BCM4355/4364/4377 support & identification fixes Date: Tue, 31 Jan 2023 20:28:35 +0900 Message-Id: <20230131112840.14017-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?1756537821854155606?= X-GMAIL-MSGID: =?utf-8?q?1756537821854155606?= 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 drops the RAW device IDs, as discussed in the v1 thread. The second 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. 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. Hector Martin (5): brcmfmac: Drop all the RAW device IDs 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 | 36 +++++++++++++------ .../broadcom/brcm80211/include/brcm_hw_ids.h | 11 +++--- 3 files changed, 34 insertions(+), 19 deletions(-)