Bluetooth: btusb: re-definition for board_id in struct qca_version
Subsystems (2)
PATCH v4 1/1 Bluetooth: btusb: re-definition for board_id in struct qca_version
The board ID should be split into two bytes.
The 1st byte is chip ID, and the 2nd byte is platform ID. For example, board ID 0x010A, 0x01 is platform ID. 0x0A is chip ID. we have several platforms, and platform IDs are continuously added. We would not distinguish different chips if we get these mixed up. Platform ID:0x00 is for Mobile0x01 is for X860x02 is for Automotive0x03 is for Consumer electronic
--- drivers/bluetooth/btusb.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
drivers/bluetooth/btusb.c +13 -2
@@ -2883,7 +2883,8 @@ struct qca_version {__le32 rom_version;__le32 patch_version;__le32 ram_version; -__le16 board_id; +__u8 chip_id; +__u8 platform_id;__le16 flag;__u8 reserved[4 ]; } __packed;
@@ -3072,7 +3073,17 @@ 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); +/* The board_id should be split into two bytes +* The 1st byte is chip ID, and the 2nd byte is platform ID +* For example, board ID 0x010A, 0x01 is platform ID. 0x0A is chip ID +* Currently we have several platforms, and platform IDs are continuously added. +* Platform ID: +* 0x00 is for Mobile +* 0x01 is for X86 +* 0x02 is for Automotive +* 0x03 is for Consumer electronic +*/ +u16 board_id = (ver->chip_id <<8 ) + ver->platform_id;const char *variant;switch (le32_to_cpu (ver->ram_version)) {
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Hi Marcel:
I modified the code as you required, could you help merge it ? thank
you.
regards.
tim
Quoted 52 lines · On 2021-11-16 12:48, [email protected] wrote:
The board ID should be split into two bytes.
The 1st byte is chip ID, and the 2nd byte is platform ID. For example, board ID0x010A,0x01is platform ID.0x0Ais chip ID. we have several platforms, and platform IDs are continuously added. We would not distinguish different chips if we get these mixed up. Platform ID:0x00is for Mobile0x01is for X860x02is for Automotive0x03is for Consumer electronicSigned-off-by Tim Jiang <[email protected]>--- drivers/bluetooth/btusb.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)drivers/bluetooth/btusb.c +5
-2@@ -2883,7 +2883,8 @@ struct qca_version {__le32 rom_version;__le32 patch_version;__le32 ram_version; -__le16 board_id; +__u8 chip_id; +__u8 platform_id;__le16 flag;__u8 reserved[4 ]; } __packed;@@ -3072,7 +3073,17 @@ 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); +/* The board_id should be split into two bytes +* The 1st byte is chip ID, and the 2nd byte is platform ID +* For example, board ID 0x010A, 0x01 is platform ID. 0x0A is chip ID
drivers/bluetooth/btusb.c +1
-0+* Currently we have several platforms, and platform IDs are continuously added.
drivers/bluetooth/btusb.c +7
-0+* Platform ID: +* 0x00 is for Mobile +* 0x01 is for X86 +* 0x02 is for Automotive +* 0x03 is for Consumer electronic +*/ +u16 board_id = (ver->chip_id <<8 ) + ver->platform_id;const char *variant;switch (le32_to_cpu (ver->ram_version)) {
Marcel Holtmann
maintainerHi Tim,
Quoted 11 lines
The board ID should be split into two bytes.
The 1st byte is chip ID, and the 2nd byte is platform ID. For example, board ID0x010A,0x01is platform ID.0x0Ais chip ID. we have several platforms, and platform IDs are continuously added. We would not distinguish different chips if we get these mixed up. Platform ID:0x00is for Mobile0x01is for X860x02is for Automotive0x03is for Consumer electronic
Quoted 4 lines
Signed-off-by Tim Jiang <[email protected]>---
drivers/bluetooth/btusb.c| 15 +++++++++++++--1 file changed, 13 insertions(+), 2 deletions(-)
Patch has been applied to bluetooth-next tree.
Regards
Marcel