Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BE220C636CC for ; Mon, 13 Feb 2023 16:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230476AbjBMQpm (ORCPT ); Mon, 13 Feb 2023 11:45:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230234AbjBMQpj (ORCPT ); Mon, 13 Feb 2023 11:45:39 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC74415C93 for ; Mon, 13 Feb 2023 08:44:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676306692; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=UiVeaxLirFDaFY10rNqkG8tSY2t/6xI0UAG3XTfGb3c=; b=UdB0bfo0eB9gqsvVamBol24qMJOYcJw3O19aee8bz5P/GbxMwUSb3GhJhNBOUxK/e51Sp6 LCokAgaSU+HsEo6T53DfFfaPlpmb6iCVjNqJlhSpZT0ayV5SIm8EOj8BpEwCp5mzqQeAYX mIzazcJ5dOQibGV5RxOF2mWVR+J8OPU= Received: from mail-vs1-f70.google.com (mail-vs1-f70.google.com [209.85.217.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-588-KOkzfdSeMnuh6e1Wj5V0WA-1; Mon, 13 Feb 2023 11:44:50 -0500 X-MC-Unique: KOkzfdSeMnuh6e1Wj5V0WA-1 Received: by mail-vs1-f70.google.com with SMTP id o4-20020a67b844000000b004120758a354so1128765vsh.22 for ; Mon, 13 Feb 2023 08:44:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676306690; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UiVeaxLirFDaFY10rNqkG8tSY2t/6xI0UAG3XTfGb3c=; b=p1j6gtdCoHxT2b++2DMjwPq4huGz2L+NwxHGl/6c+RiLC6CQj+kcpmbGXat+777wmT npuN2asXKRMwxd+56EhWzkaSu+3ugy+177qjfM4pSIGMy5MuxXWabE9TyOBb3YXDfGlE CA1njZxW7ycuGobjiiNFA1MvU1fiaFoZV5zqCSgV3Px2mG88X1S06eeuOL5FhUIsk/lI xIhALY/mS50mnTu7wCK0/jlZRT+FrdJPHUYHhwOUtUlEeQNqWzCoSNr8AVWWBVugem5s ZodhBYe1RNm5PfmfRfYoAzOeMDFcGloKdjoHi1imfjTZ6/OdkE+W8xtJ+LC5DwN7DQa4 xySg== X-Gm-Message-State: AO0yUKWPEolg+yPH7b1EJuoZmTtY4OeF4FKthD+Y+sm4GBaOr+X6xIrE pf5UA4BA4ltQrEQJEUJOHP2tw6gKqquT5S8vHzJ12TpnBOEhm1bdQT+qB/gBRg2fDzVcHDBhk3q Yst13muqBI44cD/admODclEv7n9K1kKO9skvLYJDI/iw= X-Received: by 2002:a1f:25c5:0:b0:3ea:1a72:aad6 with SMTP id l188-20020a1f25c5000000b003ea1a72aad6mr4103232vkl.15.1676306690098; Mon, 13 Feb 2023 08:44:50 -0800 (PST) X-Google-Smtp-Source: AK7set/4GRMKn1CaCe56OzUt9wS+c1AKpIyjFKqfb/QsXBhHQvaRBqw5jCAn8TR4Z814dEoB9KIkVWYMlsPu2zhs/b0= X-Received: by 2002:a1f:25c5:0:b0:3ea:1a72:aad6 with SMTP id l188-20020a1f25c5000000b003ea1a72aad6mr4103218vkl.15.1676306689880; Mon, 13 Feb 2023 08:44:49 -0800 (PST) MIME-Version: 1.0 References: <20230212063813.27622-1-marcan@marcan.st> <20230212063813.27622-4-marcan@marcan.st> In-Reply-To: <20230212063813.27622-4-marcan@marcan.st> From: Eric Curtin Date: Mon, 13 Feb 2023 16:44:34 +0000 Message-ID: Subject: Re: [PATCH v4 3/4] brcmfmac: pcie: Add IDs/properties for BCM4377 To: Hector Martin Cc: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , 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, Linus Walleij , Arend van Spriel Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Sun, 12 Feb 2023 at 06:45, Hector Martin wrote: > > This chip is present on at least these Apple T2 Macs: > > * tahiti: MacBook Pro 13" (2020, 2 TB3) > * formosa: MacBook Pro 13" (Touch/2019) > * fiji: MacBook Air 13" (Scissor, 2020) > > Reviewed-by: Linus Walleij > Reviewed-by: Arend van Spriel > Signed-off-by: Hector Martin Reviewed-by: Eric Curtin Is mise le meas/Regards, Eric Curtin > --- > drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + > drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 5 +++++ > .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 ++ > 3 files changed, 8 insertions(+) > > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c > index 3e42c2bd0d9a..8073f31be27d 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c > @@ -733,6 +733,7 @@ static u32 brcmf_chip_tcm_rambase(struct brcmf_chip_priv *ci) > case CY_CC_4373_CHIP_ID: > return 0x160000; > case CY_CC_43752_CHIP_ID: > + case BRCM_CC_4377_CHIP_ID: > return 0x170000; > case BRCM_CC_4378_CHIP_ID: > return 0x352000; > diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > index 7135f889907a..d54394885af7 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c > @@ -63,6 +63,7 @@ BRCMF_FW_DEF(4365C, "brcmfmac4365c-pcie"); > BRCMF_FW_DEF(4366B, "brcmfmac4366b-pcie"); > 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"); > > /* firmware config files */ > @@ -95,6 +96,7 @@ 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_4377_CHIP_ID, 0xFFFFFFFF, 4377B3), /* revision ID 4 */ > BRCMF_FW_ENTRY(BRCM_CC_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* revision ID 3 */ > }; > > @@ -2001,6 +2003,7 @@ static int brcmf_pcie_read_otp(struct brcmf_pciedev_info *devinfo) > base = 0x8c0; > words = 0xb2; > break; > + case BRCM_CC_4377_CHIP_ID: > case BRCM_CC_4378_CHIP_ID: > coreid = BCMA_CORE_GCI; > base = 0x1120; > @@ -2618,7 +2621,9 @@ static const struct pci_device_id brcmf_pcie_devid_table[] = { > BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID, BCA), > BRCMF_PCIE_DEVICE(BRCM_PCIE_4371_DEVICE_ID, WCC), > BRCMF_PCIE_DEVICE(BRCM_PCIE_43596_DEVICE_ID, CYW), > + BRCMF_PCIE_DEVICE(BRCM_PCIE_4377_DEVICE_ID, WCC), > BRCMF_PCIE_DEVICE(BRCM_PCIE_4378_DEVICE_ID, WCC), > + > { /* end: all zeroes */ } > }; > > 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 6e27e3966655..896615f57952 100644 > --- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h > +++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h > @@ -52,6 +52,7 @@ > #define BRCM_CC_43664_CHIP_ID 43664 > #define BRCM_CC_43666_CHIP_ID 43666 > #define BRCM_CC_4371_CHIP_ID 0x4371 > +#define BRCM_CC_4377_CHIP_ID 0x4377 > #define BRCM_CC_4378_CHIP_ID 0x4378 > #define CY_CC_4373_CHIP_ID 0x4373 > #define CY_CC_43012_CHIP_ID 43012 > @@ -92,6 +93,7 @@ > #define BRCM_PCIE_4366_5G_DEVICE_ID 0x43c5 > #define BRCM_PCIE_4371_DEVICE_ID 0x440d > #define BRCM_PCIE_43596_DEVICE_ID 0x4415 > +#define BRCM_PCIE_4377_DEVICE_ID 0x4488 > #define BRCM_PCIE_4378_DEVICE_ID 0x4425 > > /* brcmsmac IDs */ > -- > 2.35.1 > >