| Message ID | 1629876694-8303-1-git-send-email-zijuhu@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v6] Bluetooth: btusb: Add support using different nvm for variant WCN6855 controller | expand |
Hi Zijun,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on bluetooth-next/master]
[also build test ERROR on linus/master v5.14-rc7 next-20210827]
[cannot apply to linux/master bluetooth/master]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Zijun-Hu/Bluetooth-btusb-Add-support-using-different-nvm-for-variant-WCN6855-controller/20210825-153318
base: https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git master
config: i386-randconfig-a004-20210829 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project 510e106fa8635e7f9c51c896180b971de6309b2f)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/6dc7c5e14de241feb009e81855680e2471c99ab3
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Zijun-Hu/Bluetooth-btusb-Add-support-using-different-nvm-for-variant-WCN6855-controller/20210825-153318
git checkout 6dc7c5e14de241feb009e81855680e2471c99ab3
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All errors (new ones prefixed by >>):
drivers/bluetooth/btusb.c:3345:13: error: incompatible pointer types passing 'char **' to parameter of type 'char *'; dereference with * [-Werror,-Wincompatible-pointer-types]
snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s.bin",
^~~~~~
*
include/linux/kernel.h:204:20: note: passing argument to parameter 'buf' here
int snprintf(char *buf, size_t size, const char *fmt, ...);
^
drivers/bluetooth/btusb.c:3348:13: error: incompatible pointer types passing 'char **' to parameter of type 'char *'; dereference with * [-Werror,-Wincompatible-pointer-types]
snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s%04x.bin",
^~~~~~
*
include/linux/kernel.h:204:20: note: passing argument to parameter 'buf' here
int snprintf(char *buf, size_t size, const char *fmt, ...);
^
drivers/bluetooth/btusb.c:3352:12: error: incompatible pointer types passing 'char **' to parameter of type 'char *'; dereference with * [-Werror,-Wincompatible-pointer-types]
snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
^~~~~~
*
include/linux/kernel.h:204:20: note: passing argument to parameter 'buf' here
int snprintf(char *buf, size_t size, const char *fmt, ...);
^
>> drivers/bluetooth/btusb.c:3369:32: error: incompatible pointer types passing 'char (*)[64]' to parameter of type 'char **' [-Werror,-Wincompatible-pointer-types]
btusb_generate_qca_nvm_name(&fwname, sizeof(fwname), ver, "gf");
^~~~~~~
drivers/bluetooth/btusb.c:3333:48: note: passing argument to parameter 'fwname' here
static void btusb_generate_qca_nvm_name(char **fwname,
^
drivers/bluetooth/btusb.c:3372:32: error: incompatible pointer types passing 'char (*)[64]' to parameter of type 'char **' [-Werror,-Wincompatible-pointer-types]
btusb_generate_qca_nvm_name(&fwname, sizeof(fwname), ver, NULL);
^~~~~~~
drivers/bluetooth/btusb.c:3333:48: note: passing argument to parameter 'fwname' here
static void btusb_generate_qca_nvm_name(char **fwname,
^
5 errors generated.
vim +3369 drivers/bluetooth/btusb.c
3332
3333 static void btusb_generate_qca_nvm_name(char **fwname,
3334 int max_size,
3335 struct qca_version *ver,
3336 char *foundry)
3337 {
3338 char *separator = (foundry == NULL) ? "" : "_";
3339 u16 board_id = le16_to_cpu(ver->board_id);
3340 u32 rom_version = le32_to_cpu(ver->rom_version);
3341
3342 if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
3343 /* if boardid equal 0, use default nvm without surfix */
3344 if (le16_to_cpu(ver->board_id) == 0x0) {
3345 snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s.bin",
3346 rom_version, separator, foundry);
3347 } else {
3348 snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s%04x.bin",
3349 rom_version, separator, foundry, board_id);
3350 }
3351 } else {
> 3352 snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",
3353 rom_version);
3354 }
3355
3356 }
3357
3358 static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
3359 struct qca_version *ver,
3360 const struct qca_device_info *info)
3361 {
3362 const struct firmware *fw;
3363 char fwname[64];
3364 int err;
3365
3366 switch (ver->ram_version) {
3367 case WCN6855_2_0_RAM_VERSION_GF:
3368 case WCN6855_2_1_RAM_VERSION_GF:
> 3369 btusb_generate_qca_nvm_name(&fwname, sizeof(fwname), ver, "gf");
3370 break;
3371 default:
3372 btusb_generate_qca_nvm_name(&fwname, sizeof(fwname), ver, NULL);
3373 break;
3374 }
3375
3376 err = request_firmware(&fw, fwname, &hdev->dev);
3377 if (err) {
3378 bt_dev_err(hdev, "failed to request NVM file: %s (%d)",
3379 fwname, err);
3380 return err;
3381 }
3382
3383 bt_dev_info(hdev, "using NVM file: %s", fwname);
3384
3385 err = btusb_setup_qca_download_fw(hdev, fw, info->nvm_hdr);
3386
3387 release_firmware(fw);
3388
3389 return err;
3390 }
3391
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 60d2fce59a71..ed01b966ccd4 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3141,6 +3141,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; @@ -3172,6 +3175,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, @@ -3326,27 +3330,47 @@ static int btusb_setup_qca_load_rampatch(struct hci_dev *hdev, return err; } -static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, - struct qca_version *ver, - const struct qca_device_info *info) +static void btusb_generate_qca_nvm_name(char **fwname, + int max_size, + struct qca_version *ver, + char *foundry) { - const struct firmware *fw; - char fwname[64]; - int err; + char *separator = (foundry == NULL) ? "" : "_"; + 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 surfix */ if (le16_to_cpu(ver->board_id) == 0x0) { - snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", - le32_to_cpu(ver->rom_version)); + snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x%s%s.bin", + rom_version, separator, foundry); } 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%s%s%04x.bin", + rom_version, separator, foundry, board_id); } } else { snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin", - le32_to_cpu(ver->rom_version)); + rom_version); + } + +} + +static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, + struct qca_version *ver, + const struct qca_device_info *info) +{ + const struct firmware *fw; + char fwname[64]; + int err; + + 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, NULL); + break; } err = request_firmware(&fw, fwname, &hdev->dev);