From patchwork Sat Jan 1 20:26:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 12702155 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88DDDC4332F for ; Sat, 1 Jan 2022 20:29:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=y2iN10PY6cmX7QEWp46NmNrmfqObOhKQ4+avFQ2G3DU=; b=0QbF2tjd1pv+yn 40+lauhkas6Dmw/k3kUCbgjbkcveAQC1uWBCLPfJjaUTAs4rTi0TgiKafwGqG7ZwXIjX2P3vYwMSW QkUMBjT6H+grPfXNvJbY03UnAvFi3t6nHdhiRyWPQwjhJz5u/2K4C2QoCrBfUTjDodCyE8fAxEwnC tUxGxw4HGujbSyfjiqolh7JJQPVj26WTQfWuWMIo88CvIqJTfk/vjhQhLl5Ed2DwweGnkE9LTAEIS 6NymJtP67Ggvpp7VIguPiuO1K6WVqyKzQ5LR0mllCUqZT5d88kRa8E65hn0BCfDsw0QtFneR8rIvY U6AnWAPRNk44nkXAWuog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n3kyQ-007M36-A2; Sat, 01 Jan 2022 20:27:30 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n3kyK-007M1X-UR; Sat, 01 Jan 2022 20:27:26 +0000 Received: from localhost.localdomain ([37.4.249.169]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N4Q8u-1mNJUA3VhO-011R9z; Sat, 01 Jan 2022 21:27:16 +0100 From: Stefan Wahren To: Rob Herring , Florian Fainelli , Nicolas Saenz Julienne , Arend van Spriel , Franky Lin , Hante Meuleman , Chi-hsien Lin , Wright Feng , Chung-hsien Hsu , Kalle Valo Cc: Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com, Arnd Bergmann , Olof Johansson , Phil Elwell , devicetree@vger.kernel.org, soc@kernel.org, linux-arm-kernel@lists.infradead.org, linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, linux-rpi-kernel@lists.infradead.org, Stefan Wahren Subject: [PATCH RFC 1/4] brcmfmac: use separate firmware for 43430 revision 4 Date: Sat, 1 Jan 2022 21:26:49 +0100 Message-Id: <1641068812-5851-2-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1641068812-5851-1-git-send-email-stefan.wahren@i2se.com> References: <1641068812-5851-1-git-send-email-stefan.wahren@i2se.com> X-Provags-ID: V03:K1:gbP/sU8ZIGxy06v2ug+WXnZFZ7jofwY7iLEid7yG1YEy2peckqw blWo1Fu/bUb4yjxr0UDvV85nPuBNwfaP8gYYypSFkles0VjBmbU8FeavVJbo6SYyzopL62p WEFZ2zeTW9O0yMHcJZopr/E+gNa4rruTor2G3+1UQNH9g4mJDRAYVJfvk/LTX5QcR/iWzoH 7rTfMDofdb2q5eGF+EQtA== X-UI-Out-Filterresults: notjunk:1;V03:K0:8AXvqx+XFYo=:xpc3rhMdo1k55aT0TB8jar Z+b73VPGMgq8WivDZ/l85YinrI68a7dZ1mh8ayqp4J44nrdB+7NWjtcMjdXhArIi15qBPWtEb hYWt7Rl4NCMCSDc3J/8gB1cMFD6TEAw4B7sbEOS4dy4CNGTUQ+HeQ6lSjhy/ONZn8H+nCd4gN kV8ifov8ieZAaLiLYSnbox5Hedi4rzXU8VPnwhDcXL+zjjj8B6au7J978sX2czUhmbx5/QJ+z Ir7AyTJgcNiysXOiisrRCMzONCn6Ocg2IwED1Zjx64slEpZrdGB5Q4hTuc08fDXhAYiB0a1fX CkaqTVrvA5V1LRzmZpS+F0uB23/kQrlfb8tte2MFhF0l4AHtAnCPNY5J5c9lwbTXN0ydEU6eP mKB/XOUWRPlm8Ac4CwZT45aHngsDBbgUBYwVsHLI0gK0pgPGBjj71HoSyHBd+usTXNYgBEyfQ vaDIhH0DHwczdmpP2pKQjCSsGdP9SRy9N5fbaFDnVMOdJ2g5NBqQTfePbyFtZxATx/9Vd2LgG NIkAjJ73qvfqrEiwkoq3FJdIAyAcUsiYBw1ey+h1hdwoi228If9JZVAJVNm/TEmLe4JO7VOAX ItKkw5akvzRH2ReeQg27CLyYiqb4YTUXBzpdfF1hU1Zr4QAQaoIfhMHa76YDWtQqw9PdDTFLY 8ecV4KZnsbVTe8B/lF42ocBmC8ltEHeSvBL2ZOYOMypz8DKBLChNugBkhe9SGZJyhVTemlxqc kMoKLhfVcF8tKsdY X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220101_122725_336173_B64E49A0 X-CRM114-Status: GOOD ( 12.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A separate firmware is needed, for Broadcom 43430 revision 4. This chip can be found on e.g. certain revisions of Raspberry Pi Zero 2 W. Original firmware file from IC vendor is named 'brcmfmac43436-sdio.bin', but brcmfmac and also btbcm drivers report chip id 43430, so requested firmware file name is 'brcmfmac43430c0-sdio.bin' in line with other 43430 revisions. Signed-off-by: Stefan Wahren --- Hi, i'm not sure about all these mappings. All i can say is that the wifi interface of the RPi Zero 2 cames up with this patch. drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 8effeb7..c79bd47 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -618,6 +618,7 @@ BRCMF_FW_DEF(43430A0, "brcmfmac43430a0-sdio"); /* Note the names are not postfixed with a1 for backward compatibility */ BRCMF_FW_CLM_DEF(43430A1, "brcmfmac43430-sdio"); BRCMF_FW_DEF(43430B0, "brcmfmac43430b0-sdio"); +BRCMF_FW_CLM_DEF(43430C0, "brcmfmac43430c0-sdio"); BRCMF_FW_CLM_DEF(43455, "brcmfmac43455-sdio"); BRCMF_FW_DEF(43456, "brcmfmac43456-sdio"); BRCMF_FW_CLM_DEF(4354, "brcmfmac4354-sdio"); @@ -649,7 +650,8 @@ static const struct brcmf_firmware_mapping brcmf_sdio_fwnames[] = { BRCMF_FW_ENTRY(BRCM_CC_4339_CHIP_ID, 0xFFFFFFFF, 4339), BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000001, 43430A0), BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000002, 43430A1), - BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFFC, 43430B0), + BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0x00000004, 43430C0), + BRCMF_FW_ENTRY(BRCM_CC_43430_CHIP_ID, 0xFFFFFFF8, 43430B0), BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0x00000200, 43456), BRCMF_FW_ENTRY(BRCM_CC_4345_CHIP_ID, 0xFFFFFDC0, 43455), BRCMF_FW_ENTRY(BRCM_CC_4354_CHIP_ID, 0xFFFFFFFF, 4354),