From nobody Mon Sep 8 23:56:02 2025 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 E94FAC61DA3 for ; Fri, 24 Feb 2023 12:59:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230125AbjBXM7X (ORCPT ); Fri, 24 Feb 2023 07:59:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbjBXM7V (ORCPT ); Fri, 24 Feb 2023 07:59:21 -0500 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 36D1416AC6 for ; Fri, 24 Feb 2023 04:59:20 -0800 (PST) Received: by mail-lf1-x134.google.com with SMTP id s20so17514512lfb.11 for ; Fri, 24 Feb 2023 04:59:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677243558; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=wPG+Qu6q3RgNUlyYFOzyQce/Gn7mCKiLFXWosGD/Kpw=; b=Qd1lGW9KedyZEyAKTe4qdwitU0RlltalSkvez+gCBlMtrH6GE0qvZ6N9degexwDUt5 dNdu/oVOBfqfI/0nPxjkhgVxa7sXKwkS5f+FHxoKEOvRzW4q2klU98/or9Jw9EWhKccG YlvGp9/Q0lrEj0twzDQzqEMGDA64qhLB9g1sGJUN7fftCaDxxGZOQaLxvZrTeJfJN1Oa pg9hzsnoBOOHk6xywdhAXFvF705SK4k8DYMm5UWruhN0PuRAptn9DiRNmibfihWd+gcq Yc+2ZJ32i9cjW4mg1vJlTH7u5AFJlh9UQkZnMgjptUaUqJYLI7BbP6+tDP7E6gslVGpr 789A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677243558; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wPG+Qu6q3RgNUlyYFOzyQce/Gn7mCKiLFXWosGD/Kpw=; b=61b6Ot90eQCScXOad2CNZV81QWwb3MGZU8rqOMnxJCE9u7a0ci0Nbrmbmok578rgOs 56uVw8WDYaagDuojGzX9vSRv5H7p5fZS5AMy09+5rBNHM1UG+Z4c2wFUD0AI4rGkK7TY 4Lz02gmaJpy12JpC4rBS7K8t/9birBnioLu3BC/feCJwNAFmDNztm95sz/PPGZH1mT/y CNxvEPf+WWQH9MbLo7fLQVREGytao5ZUXJj1On1nXF7Rtr+41UW3f7HF/1gLg9eesMCM 8yKaAqNAsECir8/W8px3H4vFkMCZlNv8k15Gqb4F/zWYM901nP1YRxb+XTvad0KoKQSY u0Iw== X-Gm-Message-State: AO0yUKUbwgpS2EWbIyk6sRWSYkYiHAVs6lBIbOPYPd5QDpMd0jI3v1Y7 Ul/sE7hzGUxpUV/lDU5gIOAHGw== X-Google-Smtp-Source: AK7set8n74zszsjnxxtFsyIXECuG5SuVuGozOMkL0pV5tL1ZnT+NrhMVipNk0UIgPRZ9uO5w+srZGQ== X-Received: by 2002:a19:f514:0:b0:4d5:ae35:b220 with SMTP id j20-20020a19f514000000b004d5ae35b220mr5224038lfb.8.1677243558481; Fri, 24 Feb 2023 04:59:18 -0800 (PST) Received: from [192.168.1.101] (abym99.neoplus.adsl.tpnet.pl. [83.9.32.99]) by smtp.gmail.com with ESMTPSA id m28-20020a056512015c00b004d7d13387b5sm1705890lfo.116.2023.02.24.04.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Feb 2023 04:59:18 -0800 (PST) From: Konrad Dybcio Date: Fri, 24 Feb 2023 13:59:17 +0100 Subject: [PATCH] brcmfmac: pcie: Add 4359C0 firmware definition MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20230224-topic-brcm_tone-v1-1-333b0ac67934@linaro.org> X-B4-Tracking: v=1; b=H4sIAKS0+GMC/x2N0QqDMAxFf0XybCGrQtl+ZQyJNWrApdK6IYj/b vDxnMvhHlA4Cxd4VQdk/kuRpAaPuoI4k07sZDAGj75B71u3pVWi63P8dltSdhjaJ2IIhNSAVT0 Vtpk0ztbpb1lMrplH2e+b9+c8L/hAKNZ2AAAA To: Arend van Spriel , Franky Lin , Hante Meuleman , Kalle Valo , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: 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, Arend van Spriel , Konrad Dybcio X-Mailer: b4 0.12.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1677243557; l=2308; i=konrad.dybcio@linaro.org; s=20230215; h=from:subject:message-id; bh=7y7YEc5odYv03bixlDUyCS4eYv4iVkxtgs1PEzbckmE=; b=CMqJrDCCa6ffqZ9RJPFUNUfgU6DD7V/B3DBJHMVo81dr4UONMpGMvOsRpqcd3UGBlYKd+Y70fi3M nT9QnkaNCmr1xVBXfVXJSSLLIXuPlcmd9TesLNVc1B238uTl32Pz X-Developer-Key: i=konrad.dybcio@linaro.org; a=ed25519; pk=iclgkYvtl2w05SSXO5EjjSYlhFKsJ+5OSZBjOkQuEms= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Some phones from around 2016, as well as other random devices have this chip called 43956 or 4359C0 or 43596A0, which is more or less just a rev bump (v9) of the already-supported 4359. Add a corresponding firmware definition to allow for choosing the correct blob. Suggested-by: Arend van Spriel Signed-off-by: Konrad Dybcio --- Follow up on https://lore.kernel.org/netdev/20220921001630.56765-1-konrad.d= ybcio@somainline.org/ Other changes were dropped, as it turned out in the mailing thread that the chipid was 4359, which is already taken care of. Also, I'm sorry that my "soon" turned into months.. --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/driv= ers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index a9b9b2dc62d4..96c059377a2a 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c @@ -57,6 +57,7 @@ BRCMF_FW_CLM_DEF(4356, "brcmfmac4356-pcie"); BRCMF_FW_CLM_DEF(43570, "brcmfmac43570-pcie"); BRCMF_FW_DEF(4358, "brcmfmac4358-pcie"); BRCMF_FW_DEF(4359, "brcmfmac4359-pcie"); +BRCMF_FW_DEF(4359C, "brcmfmac4359c-pcie"); BRCMF_FW_CLM_DEF(4364B2, "brcmfmac4364b2-pcie"); BRCMF_FW_CLM_DEF(4364B3, "brcmfmac4364b3-pcie"); BRCMF_FW_DEF(4365B, "brcmfmac4365b-pcie"); @@ -88,7 +89,8 @@ static const struct brcmf_firmware_mapping brcmf_pcie_fwn= ames[] =3D { BRCMF_FW_ENTRY(BRCM_CC_43569_CHIP_ID, 0xFFFFFFFF, 43570), BRCMF_FW_ENTRY(BRCM_CC_43570_CHIP_ID, 0xFFFFFFFF, 43570), BRCMF_FW_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358), - BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359), + BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0x000001FF, 4359), + BRCMF_FW_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFE00, 4359C), BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0x0000000F, 4364B2), /* 3 */ BRCMF_FW_ENTRY(BRCM_CC_4364_CHIP_ID, 0xFFFFFFF0, 4364B3), /* 4 */ BRCMF_FW_ENTRY(BRCM_CC_4365_CHIP_ID, 0x0000000F, 4365B), --- base-commit: aaf70d5ad5e2b06a8050c51e278b0c3a14fabef5 change-id: 20230224-topic-brcm_tone-07490077a0a3 Best regards, --=20 Konrad Dybcio