Message ID | 6953ba78cc31b7bc1a188b998f6c6b8c@codeaurora.org (mailing list archive) |
---|---|
State | Rejected |
Headers | show |
Series | [v1] Bluetooth: btusb: correct nvm file name for WCN6855 btsoc | expand |
Hi Tim, > As we name nvm file by using big-endian for boardID, so align host with it. > > Signed-off-by: Tim Jiang <tjiang@codeaurora.org> > --- > drivers/bluetooth/btusb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 46d892bbde62..572d64524cf3 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -3072,7 +3072,7 @@ static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size, > u16 flag = le16_to_cpu(ver->flag); > > if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { > - u16 board_id = le16_to_cpu(ver->board_id); > + u16 board_id = be16_to_cpu(ver->board_id); > const char *variant; this change is not matching the commit description. It makes no sense. This is about your ver data structure and not your filename. So inside your ver struct you have a mix of little-endian and bit-endian fields? Regards Marcel
thanks for your comments, marcel. I update one new version, thank you. regards. tim On 2021-11-03 16:31, Marcel Holtmann wrote: > Hi Tim, > >> As we name nvm file by using big-endian for boardID, so align host >> with it. >> >> Signed-off-by: Tim Jiang <tjiang@codeaurora.org> >> --- >> drivers/bluetooth/btusb.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c >> index 46d892bbde62..572d64524cf3 100644 >> --- a/drivers/bluetooth/btusb.c >> +++ b/drivers/bluetooth/btusb.c >> @@ -3072,7 +3072,7 @@ static void btusb_generate_qca_nvm_name(char >> *fwname, size_t max_size, >> u16 flag = le16_to_cpu(ver->flag); >> >> if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { >> - u16 board_id = le16_to_cpu(ver->board_id); >> + u16 board_id = be16_to_cpu(ver->board_id); >> const char *variant; > > this change is not matching the commit description. It makes no sense. > This is about your ver data structure and not your filename. > > So inside your ver struct you have a mix of little-endian and > bit-endian fields? > > Regards > > Marcel
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 46d892bbde62..572d64524cf3 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -3072,7 +3072,7 @@ static void btusb_generate_qca_nvm_name(char *fwname, size_t max_size, u16 flag = le16_to_cpu(ver->flag); if (((flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) { - u16 board_id = le16_to_cpu(ver->board_id); + u16 board_id = be16_to_cpu(ver->board_id); const char *variant;
As we name nvm file by using big-endian for boardID, so align host with it. Signed-off-by: Tim Jiang <tjiang@codeaurora.org> --- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) switch (le32_to_cpu(ver->ram_version)) {