From patchwork Wed Jan 4 10:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hector Martin X-Patchwork-Id: 3547 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp5062737wrt; Wed, 4 Jan 2023 02:06:57 -0800 (PST) X-Google-Smtp-Source: AMrXdXvwiTU6oyyVxEuUrfNhXauMam7NVx4iu6OQ8ZoQWlmqsnM8d7hD8/uqOYCRnFXzRDKEVJU5 X-Received: by 2002:a05:6402:408:b0:482:74a:c3d9 with SMTP id q8-20020a056402040800b00482074ac3d9mr34512982edv.23.1672826817091; Wed, 04 Jan 2023 02:06:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672826817; cv=none; d=google.com; s=arc-20160816; b=M04x5a0DbebFK5GgS5TWye/sz0IfkbmhOQ02hcHhfNF6l8wiD3xJzaSRnmiRp6Mi3k DWmGOpO+AEa2UWVHoAJVEnFbhMWgx7TdWiD6cKzKpWnfTgExLcVaEe72ZvIDEzwljB48 6K6xuwhJl5mEdF+deFDZq9ny+ZbE9E6pvyKLtByBrubHv/kBl2NFxzLMarXdPLrxvOpT d/SKqNdLd6MKe4vOWgl0bSW/IGwYZ5Dk9Sft9zAwQxE8TEAYqiZoiCKpe8sU8+MwUMjD epqF8z56oUDtvdDb/BN9qfta519TXOYWrJ0vIOyIPdK/kWUdnHoxaEblRWam4hAe6FDq feCQ== 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=kJTwiPumdbx67XGhlOBc+QK2n6tg37Q820UMo1CrFI8=; b=IIJTrWIgD+GXaZeOnoRscgBx2XErUaZojIHPrLPumV474blFKj+3+lFxiyDbcnsSDf AIIFt39hDu4ArhDpEj/CIY7GK1zvroVxYXeEoU7ukkv5aOMJ/gGwf8RsU0zq3FKt5Y9p zufqxlPIkmws4yEQP1E0Lv7CVTRn/qCO0opQO0r13gxe8Hdez5mNjxZuETliNqlx3eei XrLxuxMgZDvDxWzQKm+N7BGA8/diIsVaSoIWm0ykXt4kitvddZJaxCp9EkbbTsHnzfdG gRvEpIwROZWI5N8fCHKIjABMvH0A5E/xeDjJ3iImbMboqC4IEa27OenEMb1PpH0A1yyO hKkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marcan.st header.s=default header.b=QmV3K0wj; 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 qb24-20020a1709077e9800b0073d71124609si30574404ejc.182.2023.01.04.02.06.33; Wed, 04 Jan 2023 02:06:57 -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=QmV3K0wj; 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 S234334AbjADKDm (ORCPT + 99 others); Wed, 4 Jan 2023 05:03:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233067AbjADKDj (ORCPT ); Wed, 4 Jan 2023 05:03:39 -0500 Received: from mail.marcansoft.com (marcansoft.com [212.63.210.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FF3F1B1D4; Wed, 4 Jan 2023 02:03:38 -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 C9E433FB17; Wed, 4 Jan 2023 10:03:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=marcan.st; s=default; t=1672826616; bh=uvTIZXmlp9F4KsvUKwHHPKv5C7NMYiaYAHYUkqRYJ5A=; h=From:To:Cc:Subject:Date; b=QmV3K0wjhKqdCpGRzPEdPCjHTcInnR3KEHeQVpafGtpHjEYXNSlfwgAGHBDeageT3 VMuN/bmKq3cwmS1TrODh85GyF/eBnZ6CZVudCRosUVMHZq0BBUVQiVp+CCUUVzcH3g eP+z8h06VvXl0sEucungsxWAcEpiAaTuK2k0ENo/mUnTOpAq8niUzlW73T6iXGxR7R dShRfylXECekCR/p3fZ4kxcSepJnNwWu8Lh/Zoz7b5rD8gU0r6jVhrABo+hP39BGAs CTH2XpUSpdAC+4P7UF2Va9RHmXHSL0D+DxqTzOPTifvkctWppIklFv+gWWufys5PNB ja4bEOsB/mIhA== 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 , 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 v1 0/4] BCM4355/4364/4377 support & identification fixes Date: Wed, 4 Jan 2023 19:01:12 +0900 Message-Id: <20230104100116.729-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?1754086052861688939?= X-GMAIL-MSGID: =?utf-8?q?1754086052861688939?= 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. 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. 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 | 32 +++++++++++++++---- .../broadcom/brcm80211/include/brcm_hw_ids.h | 9 ++++-- 3 files changed, 35 insertions(+), 12 deletions(-)