From patchwork Thu Aug 5 08:37:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zijun Hu X-Patchwork-Id: 12420647 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2F680C4338F for ; Thu, 5 Aug 2021 08:38:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1808D610CC for ; Thu, 5 Aug 2021 08:38:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238372AbhHEIiN (ORCPT ); Thu, 5 Aug 2021 04:38:13 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:32954 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237036AbhHEIiN (ORCPT ); Thu, 5 Aug 2021 04:38:13 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1628152679; h=Message-Id: Date: Subject: Cc: To: From: Sender; bh=9j1i6zdq9v3q2hjc8uHb73v5+kXQdYw3WRLqtppFkG0=; b=YnDzGuW3dG5ip1o+H8mOI5NX5IY4LASldf723o0SCzevTbulnXl2CnE144Akv1kRaRUmwkR1 aT7aTfYFfBKMZ9hNp2zrM5l3cgG9zCAm1HyeMQfHqJBDT61ZdXACwVok8M8ZWaJzajhdCC8n kx7/hGx9VcqRHg96VysvCS/Jido= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI2MTA3ZSIsICJsaW51eC1ibHVldG9vdGhAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n03.prod.us-west-2.postgun.com with SMTP id 610ba35d8caa8fb7f5bc88d0 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Thu, 05 Aug 2021 08:37:49 GMT Sender: zijuhu=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id C1D5DC4323A; Thu, 5 Aug 2021 08:37:49 +0000 (UTC) Received: from zijuhu-gv.qualcomm.com (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zijuhu) by smtp.codeaurora.org (Postfix) with ESMTPSA id DC29EC433D3; Thu, 5 Aug 2021 08:37:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DC29EC433D3 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=fail smtp.mailfrom=zijuhu@codeaurora.org From: Zijun Hu To: marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com Cc: linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-arm-msm@vger.kernel.org, bgodavar@codeaurora.org, c-hbandi@codeaurora.org, hemantg@codeaurora.org, mka@chromium.org, rjliao@codeaurora.org, zijuhu@codeaurora.org, tjiang@codeaurora.org Subject: [PATCH v2] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller Date: Thu, 5 Aug 2021 16:37:41 +0800 Message-Id: <1628152661-5669-1-git-send-email-zijuhu@codeaurora.org> X-Mailer: git-send-email 2.7.4 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tim Jiang we have different factory to produce wcn6855 soc chip, so we should use different nvm file with suffix to distinguish them. Signed-off-by: Tim Jiang Reported-by: kernel test robot Reported-by: kernel test robot --- drivers/bluetooth/btusb.c | 60 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 47 insertions(+), 13 deletions(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index b1a05bb9f4bf..18b1ef2497ec 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -4013,6 +4013,9 @@ static int btusb_set_bdaddr_wcn6855(struct hci_dev *hdev, #define QCA_DFU_TIMEOUT 3000 #define QCA_FLAG_MULTI_NVM 0x80 +#define WCN6855_2_0_RAM_VERSION_GF 0x400c1200 +#define WCN6855_2_1_RAM_VERSION_GF 0x400c1211 + struct qca_version { __le32 rom_version; __le32 patch_version; @@ -4044,6 +4047,7 @@ static const struct qca_device_info qca_devices_table[] = { { 0x00000302, 28, 4, 16 }, /* Rome 3.2 */ { 0x00130100, 40, 4, 16 }, /* WCN6855 1.0 */ { 0x00130200, 40, 4, 16 }, /* WCN6855 2.0 */ + { 0x00130201, 40, 4, 16 }, /* WCN6855 2.1 */ }; static int btusb_qca_send_vendor_req(struct usb_device *udev, u8 request, @@ -4198,6 +4202,42 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev, return err; } +static int btusb_setup_qca_form_nvm_name(char **fwname, + int max_size, + struct qca_version *ver, + char *factory) +{ + if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { + /* if boardid equal 0, use default nvm without suffix */ + if (le16_to_cpu(ver->board_id) == 0x0) { + /* we add suffix factory to distinguish with different factory. */ + if (factory != NULL) { + snprintf(*fwname, max_size, "qca/nvm_usb_%08x_%s.bin", + le32_to_cpu(ver->rom_version), + factory); + } else { + snprintf(*fwname, max_size, "qca/nvm_usb_%08x.bin", + le32_to_cpu(ver->rom_version)); + } + } else { + if (factory != NULL) { + snprintf(*fwname, max_size, "qca/nvm_usb_%08x_%s_%04x.bin", + le32_to_cpu(ver->rom_version), + factory, + le16_to_cpu(ver->board_id)); + } else { + snprintf(*fwname, max_size, "qca/nvm_usb_%08x_%04x.bin", + le32_to_cpu(ver->rom_version), + le16_to_cpu(ver->board_id)); + } + } + } else { + snprintf(*fwname, max_size, "qca/nvm_usb_%08x.bin", + le32_to_cpu(ver->rom_version)); + } + +} + static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, struct qca_version *ver, const struct qca_device_info *info) @@ -4206,19 +4246,13 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, char fwname[64]; int err; - if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { - /* if boardid equal 0, use default nvm without surfix */ - if (le16_to_cpu(ver->board_id) == 0x0) { - snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", - le32_to_cpu(ver->rom_version)); - } else { - snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin", - le32_to_cpu(ver->rom_version), - le16_to_cpu(ver->board_id)); - } - } else { - snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", - le32_to_cpu(ver->rom_version)); + switch (ver->ram_version) { + case WCN6855_2_0_RAM_VERSION_GF: + case WCN6855_2_1_RAM_VERSION_GF: + btusb_setup_qca_form_nvm_name(&fwname, sizeof(fwname), ver, "gf"); + break; + default: + btusb_setup_qca_form_nvm_name(&fwname, sizeof(fwname), ver, NULL); } err = request_firmware(&fw, fwname, &hdev->dev);