On Fri, Sep 03, 2021 at 12:02:38PM +0800, Zijun Hu wrote:
> From: Tim Jiang <tjiang@xxxxxxxxxxxxxx>
>
> the RF perfermance of wcn6855 soc chip from different foundries will be
as Marcel commented on a previous version: 'perfermence' => 'performance'
> difference, so we should use different nvm to configure them.
>
> Signed-off-by: Tim Jiang <tjiang@xxxxxxxxxxxxxx>
For the third time, you should also add your own 'Signed-off-by' tag, i.e.
'Signed-off-by: Zijun Hu <zijuhu@xxxxxxxxxxxxxx>'
If you have any doubts about comments you receive ask for clarification,
just ignoring them generally won't satisfy your reviewers.
> ---
> 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..0f5d2222d624 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)
The variant parameter should probably be removed (see coment below), if it is
kept it should be 'const char *'.
> +{
> + 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 */
This comment isn't useful, please remove it.
Ok, it was already in btusb_setup_qca_load_nvm(), but still it's a
good opportunity to remove it.
> + if (board_id == 0x0) {
Just use '0' instead of the single digit hex number.
> + 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);
> + }
> +
delete empty line
> +}
> +
> 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;
Actually it would make more sense to have the above switch statement in
btusb_generate_qca_nvm_name(), rather than passing the variant string.
