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, 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 106D6C4338F for ; Wed, 4 Aug 2021 14:45:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9A3560F94 for ; Wed, 4 Aug 2021 14:45:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237625AbhHDOqF convert rfc822-to-8bit (ORCPT ); Wed, 4 Aug 2021 10:46:05 -0400 Received: from coyote.holtmann.net ([212.227.132.17]:60335 "EHLO mail.holtmann.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237576AbhHDOqF (ORCPT ); Wed, 4 Aug 2021 10:46:05 -0400 Received: from smtpclient.apple (p5b3d23f8.dip0.t-ipconnect.de [91.61.35.248]) by mail.holtmann.org (Postfix) with ESMTPSA id 25D74CECD5; Wed, 4 Aug 2021 16:45:51 +0200 (CEST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.100.0.2.22\)) Subject: Re: [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller From: Marcel Holtmann In-Reply-To: <1628071467-27190-1-git-send-email-zijuhu@codeaurora.org> Date: Wed, 4 Aug 2021 16:45:50 +0200 Cc: Johan Hedberg , Luiz Augusto von Dentz , open list , BlueZ , MSM , Balakrishna Godavarthi , c-hbandi@codeaurora.org, Hemantg , Matthias Kaehlcke , Rocky Liao , tjiang@codeaurora.org Content-Transfer-Encoding: 8BIT Message-Id: References: <1628071467-27190-1-git-send-email-zijuhu@codeaurora.org> To: Zijun Hu X-Mailer: Apple Mail (2.3654.100.0.2.22) Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Hi Zijun, > we have different factory to produce wcn6855 soc chip, so we should use > different nvm file with surfix to distinguish them. I think you mean suffix and not surfix. > > Signed-off-by: Tim Jiang > --- > drivers/bluetooth/btusb.c | 30 +++++++++++++++++++++++++----- > 1 file changed, 25 insertions(+), 5 deletions(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index b1a05bb9f4bf..cc9618575ab4 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, > @@ -4209,12 +4213,28 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, > 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)); > + /* if ram version is for gf factory, we should add surfix gf to > + * distinguish with default one . > + */ > + if (ver->ram_version == WCN6855_2_0_RAM_VERSION_GF || > + ver->ram_version == WCN6855_2_1_RAM_VERSION_GF) { You need fix the coding style for multi-line if-clauses. > + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_gf.bin", > + le32_to_cpu(ver->rom_version)); > + } else { > + 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)); > + if (ver->ram_version == WCN6855_2_0_RAM_VERSION_GF || > + ver->ram_version == WCN6855_2_1_RAM_VERSION_GF) { > + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_gf_%04x.bin", > + le32_to_cpu(ver->rom_version), > + le16_to_cpu(ver->board_id)); > + } else { > + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin", > + le32_to_cpu(ver->rom_version), > + le16_to_cpu(ver->board_id)); > + } > } That said, can you just sit down and re-think this code. I am pretty sure there will be another factory at some point and then this code becomes too complex. Check if you could use a table for this. Regards Marcel