linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855.
@ 2021-04-21  9:16 Zijun Hu
  2021-05-24  7:59 ` tjiang
  2021-05-26 15:14 ` Marcel Holtmann
  0 siblings, 2 replies; 3+ messages in thread
From: Zijun Hu @ 2021-04-21  9:16 UTC (permalink / raw)
  To: marcel, johan.hedberg, luiz.dentz
  Cc: linux-kernel, linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi,
	hemantg, mka, rjliao, zijuhu, tjiang

From: Tim Jiang <tjiang@codeaurora.org>

if boardID is 0, will use the default nvm file without surfix.

Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
---
 drivers/bluetooth/btusb.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 6f25337..61afea9 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4138,9 +4138,14 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
 	int err;
 
 	if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
-		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
-			 le32_to_cpu(ver->rom_version),
-			 le16_to_cpu(ver->board_id));
+		if (le16_to_cpu(ver->board_id) == 0x0) { //if boardid equal 0, use default nvm.
+			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));
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855.
  2021-04-21  9:16 [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855 Zijun Hu
@ 2021-05-24  7:59 ` tjiang
  2021-05-26 15:14 ` Marcel Holtmann
  1 sibling, 0 replies; 3+ messages in thread
From: tjiang @ 2021-05-24  7:59 UTC (permalink / raw)
  To: marcel
  Cc: marcel, johan.hedberg, luiz.dentz, linux-kernel, linux-bluetooth,
	linux-arm-msm, bgodavar, c-hbandi, hemantg, mka, rjliao

marcel:
   could you help mainline this change ?

regards.
tjiang

On 2021-04-21 17:16, Zijun Hu wrote:
> From: Tim Jiang <tjiang@codeaurora.org>
> 
> if boardID is 0, will use the default nvm file without surfix.
> 
> Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
> ---
>  drivers/bluetooth/btusb.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 6f25337..61afea9 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -4138,9 +4138,14 @@ static int btusb_setup_qca_load_nvm(struct 
> hci_dev *hdev,
>  	int err;
> 
>  	if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
> -		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
> -			 le32_to_cpu(ver->rom_version),
> -			 le16_to_cpu(ver->board_id));
> +		if (le16_to_cpu(ver->board_id) == 0x0) { //if boardid equal 0, use
> default nvm.
> +			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));

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855.
  2021-04-21  9:16 [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855 Zijun Hu
  2021-05-24  7:59 ` tjiang
@ 2021-05-26 15:14 ` Marcel Holtmann
  1 sibling, 0 replies; 3+ messages in thread
From: Marcel Holtmann @ 2021-05-26 15:14 UTC (permalink / raw)
  To: Zijun Hu
  Cc: Johan Hedberg, Luiz Augusto von Dentz, linux-kernel,
	linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi, hemantg, mka,
	rjliao, tjiang

Hi Zijun,

> if boardID is 0, will use the default nvm file without surfix.
> 
> Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
> ---
> drivers/bluetooth/btusb.c | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 6f25337..61afea9 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -4138,9 +4138,14 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
> 	int err;
> 
> 	if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
> -		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
> -			 le32_to_cpu(ver->rom_version),
> -			 le16_to_cpu(ver->board_id));
> +		if (le16_to_cpu(ver->board_id) == 0x0) { //if boardid equal 0, use default nvm.

this comment style is not acceptable.

> +			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));

Regards

Marcel


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-05-26 15:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-21  9:16 [PATCH v1] Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855 Zijun Hu
2021-05-24  7:59 ` tjiang
2021-05-26 15:14 ` Marcel Holtmann

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).