* [PATCH v10] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller
@ 2021-09-14 10:08 Zijun Hu
2021-09-24 10:10 ` Marcel Holtmann
0 siblings, 1 reply; 3+ messages in thread
From: Zijun Hu @ 2021-09-14 10:08 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
the RF performance of wcn6855 soc chip from different foundries will be
difference, so we should use different nvm to configure them.
Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
---
drivers/bluetooth/btusb.c | 50 +++++++++++++++++++++++++++++++++++------------
1 file changed, 37 insertions(+), 13 deletions(-)
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 928cbfa4c42d..6dc645698e30 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -3161,6 +3161,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;
@@ -3192,6 +3195,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,
@@ -3346,6 +3350,31 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
return err;
}
+static void btusb_generate_qca_nvm_name(char *fwname,
+ size_t max_size,
+ struct qca_version *ver,
+ char *variant)
+{
+ char *sep = (strlen(variant) == 0) ? "" : "_";
+ u16 board_id = le16_to_cpu(ver->board_id);
+ u32 rom_version = le32_to_cpu(ver->rom_version);
+
+ if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
+ /* if boardid equal 0, use default nvm without suffix */
+ if (board_id == 0x0) {
+ snprintf(fwname, max_size, "qca/nvm_usb_%08x%s%s.bin",
+ rom_version, sep, variant);
+ } else {
+ snprintf(fwname, max_size, "qca/nvm_usb_%08x%s%s_%04x.bin",
+ rom_version, sep, variant, board_id);
+ }
+ } else {
+ snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin",
+ rom_version);
+ }
+
+}
+
static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
struct qca_version *ver,
const struct qca_device_info *info)
@@ -3354,19 +3383,14 @@ 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_generate_qca_nvm_name(fwname, sizeof(fwname), ver, "gf");
+ break;
+ default:
+ btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver, "");
+ break;
}
err = request_firmware(&fw, fwname, &hdev->dev);
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v10] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller
2021-09-14 10:08 [PATCH v10] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller Zijun Hu
@ 2021-09-24 10:10 ` Marcel Holtmann
2021-09-24 13:54 ` Matthias Kaehlcke
0 siblings, 1 reply; 3+ messages in thread
From: Marcel Holtmann @ 2021-09-24 10:10 UTC (permalink / raw)
To: Zijun Hu
Cc: Johan Hedberg, Luiz Augusto von Dentz, open list,
linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi, hemantg, mka,
rjliao, tjiang
Hi Zijun,
> the RF performance of wcn6855 soc chip from different foundries will be
> difference, so we should use different nvm to configure them.
>
> Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
> ---
> drivers/bluetooth/btusb.c | 50 +++++++++++++++++++++++++++++++++++------------
> 1 file changed, 37 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> index 928cbfa4c42d..6dc645698e30 100644
> --- a/drivers/bluetooth/btusb.c
> +++ b/drivers/bluetooth/btusb.c
> @@ -3161,6 +3161,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;
> @@ -3192,6 +3195,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,
> @@ -3346,6 +3350,31 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
> return err;
> }
>
> +static void btusb_generate_qca_nvm_name(char *fwname,
> + size_t max_size,
> + struct qca_version *ver,
> + char *variant)
> +{
you are really not listening to review feedback. Use “const char *variant”.
> + char *sep = (strlen(variant) == 0) ? "" : "_";
This is crazy.
> + u16 board_id = le16_to_cpu(ver->board_id);
> + u32 rom_version = le32_to_cpu(ver->rom_version);
> +
> + if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
> + /* if boardid equal 0, use default nvm without suffix */
> + if (board_id == 0x0) {
> + snprintf(fwname, max_size, "qca/nvm_usb_%08x%s%s.bin",
> + rom_version, sep, variant);
“qca/nvm_usb_%08x%s.bin”
> + } else {
> + snprintf(fwname, max_size, "qca/nvm_usb_%08x%s%s_%04x.bin",
> + rom_version, sep, variant, board_id);
""qca/nvm_usb_%08x%s_%04x.bin"
> + }
> + } else {
> + snprintf(fwname, max_size, "qca/nvm_usb_%08x.bin",
> + rom_version);
> + }
> +
> +}
> +
> static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
> struct qca_version *ver,
> const struct qca_device_info *info)
> @@ -3354,19 +3383,14 @@ 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_generate_qca_nvm_name(fwname, sizeof(fwname), ver, "gf");
“_gf”
> + break;
> + default:
> + btusb_generate_qca_nvm_name(fwname, sizeof(fwname), ver, "");
“”
> + break;
> }
>
> err = request_firmware(&fw, fwname, &hdev->dev);
Regards
Marcel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v10] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller
2021-09-24 10:10 ` Marcel Holtmann
@ 2021-09-24 13:54 ` Matthias Kaehlcke
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Kaehlcke @ 2021-09-24 13:54 UTC (permalink / raw)
To: Marcel Holtmann
Cc: Zijun Hu, Johan Hedberg, Luiz Augusto von Dentz, open list,
linux-bluetooth, linux-arm-msm, bgodavar, c-hbandi, hemantg,
rjliao, tjiang
On Fri, Sep 24, 2021 at 12:10:41PM +0200, Marcel Holtmann wrote:
> Hi Zijun,
>
> > the RF performance of wcn6855 soc chip from different foundries will be
> > difference, so we should use different nvm to configure them.
> >
> > Signed-off-by: Zijun Hu <zijuhu@codeaurora.org>
> > ---
> > drivers/bluetooth/btusb.c | 50 +++++++++++++++++++++++++++++++++++------------
> > 1 file changed, 37 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
> > index 928cbfa4c42d..6dc645698e30 100644
> > --- a/drivers/bluetooth/btusb.c
> > +++ b/drivers/bluetooth/btusb.c
> > @@ -3161,6 +3161,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;
> > @@ -3192,6 +3195,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,
> > @@ -3346,6 +3350,31 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev,
> > return err;
> > }
> >
> > +static void btusb_generate_qca_nvm_name(char *fwname,
> > + size_t max_size,
> > + struct qca_version *ver,
> > + char *variant)
> > +{
>
> you are really not listening to review feedback. Use “const char *variant”.
Yeah, also as I mentioned earlier, this function has all the information
to determine the variant itself, there is no need to clutter
btusb_setup_qca_load_nvm() and the interface of this function with
variant stuff, it should be internal business of btusb_generate_qca_nvm_name().
>
> > + char *sep = (strlen(variant) == 0) ? "" : "_";
>
> This is crazy.
It can also go away if the function determines the variant itself.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-09-24 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-14 10:08 [PATCH v10] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller Zijun Hu
2021-09-24 10:10 ` Marcel Holtmann
2021-09-24 13:54 ` Matthias Kaehlcke
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).