From mboxrd@z Thu Jan 1 00:00:00 1970 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 7F42CC433F5 for ; Mon, 10 Jan 2022 11:04:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244383AbiAJLEm (ORCPT ); Mon, 10 Jan 2022 06:04:42 -0500 Received: from marcansoft.com ([212.63.210.85]:47138 "EHLO mail.marcansoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244377AbiAJLEl (ORCPT ); Mon, 10 Jan 2022 06:04:41 -0500 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: marcan@marcan.st) by mail.marcansoft.com (Postfix) with ESMTPSA id 9E6693FA5E; Mon, 10 Jan 2022 11:04:29 +0000 (UTC) Message-ID: <7f124c47-9bc8-0a5a-8590-bed352538453@marcan.st> Date: Mon, 10 Jan 2022 20:04:26 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.4.1 Subject: Re: [PATCH v2 14/35] brcmfmac: pcie: Add IDs/properties for BCM4378 Content-Language: en-US To: Arend van Spriel , Kalle Valo , "David S. Miller" , Jakub Kicinski , Rob Herring , "Rafael J. Wysocki" , Len Brown , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Dmitry Osipenko Cc: Sven Peter , Alyssa Rosenzweig , Mark Kettenis , =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= , Pieter-Paul Giesberts , Linus Walleij , Hans de Goede , "John W. Linville" , "brian m. carlson" , Andy Shevchenko , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, SHA-cyfmac-dev-list@infineon.com References: <20220104072658.69756-1-marcan@marcan.st> <20220104072658.69756-15-marcan@marcan.st> From: Hector Martin In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On 2022/01/10 18:10, Arend van Spriel wrote: > On 1/4/2022 8:26 AM, Hector Martin wrote: >> This chip is present on Apple M1 (t8103) platforms: >> >> * atlantisb (apple,j274): Mac mini (M1, 2020) >> * honshu (apple,j293): MacBook Pro (13-inch, M1, 2020) >> * shikoku (apple,j313): MacBook Air (M1, 2020) >> * capri (apple,j456): iMac (24-inch, 4x USB-C, M1, 2020) >> * santorini (apple,j457): iMac (24-inch, 2x USB-C, M1, 2020) > > Reviewed-by: Arend van Spriel >> Reviewed-by: Linus Walleij >> Signed-off-by: Hector Martin >> --- >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 ++ >> drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 8 ++++++++ >> .../net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 ++ >> 3 files changed, 12 insertions(+) > > [...] > >> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> index f3744e806157..cc76f00724e6 100644 >> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c >> @@ -58,6 +58,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(4378B1, "brcmfmac4378b1-pcie"); >> >> /* firmware config files */ >> MODULE_FIRMWARE(BRCMF_FW_DEFAULT_PATH "brcmfmac*-pcie.txt"); >> @@ -87,6 +88,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_4378_CHIP_ID, 0xFFFFFFFF, 4378B1), /* 3 */ > > what does the trailing comment reflect? PCI revision IDs seen in the wild. The mask currently accepts all of them, but B1 specifically seems to map to rev3. This is important for 4364 since there are two revisions in the wild, and so that one has more selective masks. I can change it to "rev3" to make it more obvious. I'm actually not sure what the best approach for the masks is. We could also only accept known exact revisions; that would be better if a newer revision is incompatible, but worse if it is and would otherwise just work. -- Hector Martin (marcan@marcan.st) Public Key: https://mrcn.st/pub