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 X-Spam-Level: X-Spam-Status: No, score=-13.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,URIBL_BLOCKED autolearn=unavailable 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 03334C4338F for ; Wed, 18 Aug 2021 07:38:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFEF9606A5 for ; Wed, 18 Aug 2021 07:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238962AbhHRHio (ORCPT ); Wed, 18 Aug 2021 03:38:44 -0400 Received: from so254-9.mailgun.net ([198.61.254.9]:43840 "EHLO so254-9.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238924AbhHRHim (ORCPT ); Wed, 18 Aug 2021 03:38:42 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1629272288; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=d0yXr/T2VW4S7hBEk5V/ACcxbZ3MzyH062yZu9AHnlE=; b=LwJvtFyybNgtV/fa325OdaJSdCrerjOjaIs1pbLIohVAEmq8wUqVCpjOVoyCyURruyGbeRna aEuZUeaA2cGumubh4BSk5k//mLoMxG3q0vHlMvBACZY9Xy7ucqWu2bXjQAuajDYKeM855gOW t2KtSp08WJtY4LLQExTtfIdAV3g= X-Mailgun-Sending-Ip: 198.61.254.9 X-Mailgun-Sid: WyI0MWYwYSIsICJsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n01.prod.us-west-2.postgun.com with SMTP id 611cb8d2454b7a558fc7fa5d (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Wed, 18 Aug 2021 07:37:54 GMT Sender: tjiang=codeaurora.org@mg.codeaurora.org Received: by smtp.codeaurora.org (Postfix, from userid 1001) id D9588C43616; Wed, 18 Aug 2021 07:37:53 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: tjiang) by smtp.codeaurora.org (Postfix) with ESMTPSA id A7317C43460; Wed, 18 Aug 2021 07:37:51 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 18 Aug 2021 15:37:51 +0800 From: tjiang@codeaurora.org To: Zijun Hu Cc: marcel@holtmann.org, johan.hedberg@gmail.com, luiz.dentz@gmail.com, 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 Subject: Re: [PATCH v3] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller In-Reply-To: <1628758216-3201-1-git-send-email-zijuhu@codeaurora.org> References: <1628758216-3201-1-git-send-email-zijuhu@codeaurora.org> Message-ID: X-Sender: tjiang@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org marcel: could you help review this patch ? thank you. tjiang On 2021-08-12 16:50, Zijun Hu wrote: > 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 > --- > drivers/bluetooth/btusb.c | 60 > ++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 51 insertions(+), 9 deletions(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index b1a05bb9f4bf..d7b4e0f1c3e3 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,39 @@ 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 boardid equal 0, use default nvm without suffix */ > + switch (le16_to_cpu(ver->board_id)) { > + case 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)); > + } > + break; > + default: > + 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)); > + } > + break; > + } > +} > + > static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, > struct qca_version *ver, > const struct qca_device_info *info) > @@ -4206,19 +4243,24 @@ 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) { > + switch (ver->ram_version) { > + case WCN6855_2_0_RAM_VERSION_GF: > + case WCN6855_2_1_RAM_VERSION_GF: > + if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { > + btusb_setup_qca_form_nvm_name(&fwname, sizeof(fwname), ver, "gf"); > + } else { > snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", > le32_to_cpu(ver->rom_version)); > + } > + break; > + default: > + if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { > + btusb_setup_qca_form_nvm_name(&fwname, sizeof(fwname), ver, NULL); > } else { > - snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin", > - le32_to_cpu(ver->rom_version), > - le16_to_cpu(ver->board_id)); > + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", > + le32_to_cpu(ver->rom_version)); > } > - } else { > - snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", > - le32_to_cpu(ver->rom_version)); > + break; > } > > err = request_firmware(&fw, fwname, &hdev->dev);