linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcel Holtmann <marcel@holtmann.org>
To: Zijun Hu <zijuhu@codeaurora.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>,
	Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
	open list <linux-kernel@vger.kernel.org>,
	BlueZ <linux-bluetooth@vger.kernel.org>,
	MSM <linux-arm-msm@vger.kernel.org>,
	Balakrishna Godavarthi <bgodavar@codeaurora.org>,
	c-hbandi@codeaurora.org, Hemantg <hemantg@codeaurora.org>,
	Matthias Kaehlcke <mka@chromium.org>,
	Rocky Liao <rjliao@codeaurora.org>,
	tjiang@codeaurora.org
Subject: Re: [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller
Date: Wed, 4 Aug 2021 16:45:50 +0200	[thread overview]
Message-ID: <E0AC7312-A8BD-4950-9589-E5E2A1B45A8E@holtmann.org> (raw)
In-Reply-To: <1628071467-27190-1-git-send-email-zijuhu@codeaurora.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 <tjiang@codeaurora.org>
> ---
> 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


      reply	other threads:[~2021-08-04 14:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-04 10:04 Zijun Hu
2021-08-04 14:45 ` Marcel Holtmann [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E0AC7312-A8BD-4950-9589-E5E2A1B45A8E@holtmann.org \
    --to=marcel@holtmann.org \
    --cc=bgodavar@codeaurora.org \
    --cc=c-hbandi@codeaurora.org \
    --cc=hemantg@codeaurora.org \
    --cc=johan.hedberg@gmail.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luiz.dentz@gmail.com \
    --cc=mka@chromium.org \
    --cc=rjliao@codeaurora.org \
    --cc=tjiang@codeaurora.org \
    --cc=zijuhu@codeaurora.org \
    --subject='Re: [PATCH v1] Bluetooth: btusb: Add support different nvm to distinguish different factory for WCN6855 controller' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).