* [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS
@ 2022-03-15 10:47 Wen Gong
2022-03-15 10:47 ` [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin Wen Gong
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Wen Gong @ 2022-03-15 10:47 UTC (permalink / raw)
To: ath11k; +Cc: linux-wireless, quic_wgong
v6:
1. rebased to ath.git ath-202203101556
2. add error message if could not find any board data at last.
3. change "ath11k: add read variant from SMBIOS for download board data" for
add struct ath11k_smbios_bdf, strlen(), not mix defines and function declarations.
v5:
1. rebased to ath.git ath-202112161538
2. fix warning "failed to fetch board data for bus=pci,qmi-chip-id=0,qmi-board-id=255,variant=DE_1901 from ath11k/QCA6390/hw2.0/board-2.bin"
v4:
1. add helper function ath11k_core_create_fallback_board_name()
2. rebased to ath.git ath-202112071521
v3:
1. add patch "ath11k: add fallback board name without variant while searching board-2.bin"
2. reabsed to latest ath.git master ath-202111221436
v2: rebased to latest ath.git master ath-202111170737
When it does not have matched board name with variant in board-2.bin,
ath11k will fallback to search without variant.
Also read the variant from SMBIOS.
Wen Gong (2):
ath11k: add fallback board name without variant while searching
board-2.bin
ath11k: add read variant from SMBIOS for download board data
drivers/net/wireless/ath/ath11k/core.c | 116 +++++++++++++++++++++++--
drivers/net/wireless/ath/ath11k/core.h | 20 ++++-
drivers/net/wireless/ath/ath11k/qmi.c | 4 +
3 files changed, 132 insertions(+), 8 deletions(-)
base-commit: d845cf007bdf8b2bf41522e1ecd0eb804e553d57
--
2.31.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin 2022-03-15 10:47 [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Wen Gong @ 2022-03-15 10:47 ` Wen Gong 2022-03-25 10:30 ` Kalle Valo 2022-03-15 10:47 ` [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data Wen Gong 2022-03-21 10:31 ` [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Kalle Valo 2 siblings, 1 reply; 9+ messages in thread From: Wen Gong @ 2022-03-15 10:47 UTC (permalink / raw) To: ath11k; +Cc: linux-wireless, quic_wgong Sometimes it has a variant value which read from DT or SMBIOS by ath11k, and meanwhile it does not have the matched board name in board-2.bin, then it will failed at boot up phase. Add fallback board name which removed variant value and search again in board-2.bin when failed with variant and try to load the board data again to increase boot up success rate. dmesg log after this patch: [169547.248472] ath11k_pci 0000:05:00.0: boot using board name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262,variant=test' [169547.248565] ath11k_pci 0000:05:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 180324 [169547.248568] ath11k_pci 0000:05:00.0: board name [169547.248570] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 [169547.248571] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, [169547.248572] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor [169547.248574] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- [169547.248575] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- [169547.248576] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo [169547.248577] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 32 ard-id=262 [169547.248578] ath11k_pci 0000:05:00.0: board name [169547.248579] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 [169547.248581] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, [169547.248582] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor [169547.248583] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- [169547.248584] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- [169547.248585] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo [169547.248587] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 36 ard-id=266 [169547.248588] ath11k_pci 0000:05:00.0: board name [169547.248589] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 [169547.248590] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, [169547.248591] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor [169547.248592] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- [169547.248594] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- [169547.248595] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 31 38 2c 71 6d 69 2d 62 chip-id=18,qmi-b [169547.248596] ath11k_pci 0000:05:00.0: 00000060: 6f 61 72 64 2d 69 64 3d 32 36 36 oard-id=266 [169547.248597] ath11k_pci 0000:05:00.0: failed to fetch board data for bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262,variant=test from ath11k/WCN6855/hw2.0/board-2.bin [169547.248476] ath11k_pci 0000:05:00.0: boot using board name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' [169547.248634] ath11k_pci 0000:05:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 180324 [169547.248636] ath11k_pci 0000:05:00.0: board name [169547.248637] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 [169547.248638] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, [169547.248639] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor [169547.248641] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- [169547.248642] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- [169547.248643] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo [169547.248645] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 32 ard-id=262 [169547.248646] ath11k_pci 0000:05:00.0: boot found match for name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' [169547.248647] ath11k_pci 0000:05:00.0: boot found board data for 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' [169547.248649] ath11k_pci 0000:05:00.0: using board api 2 Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 Signed-off-by: Wen Gong <quic_wgong@quicinc.com> --- drivers/net/wireless/ath/ath11k/core.c | 48 ++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index 71eb7d04c3bf..7711bdb36170 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -532,13 +532,13 @@ int ath11k_core_check_dt(struct ath11k_base *ab) return 0; } -static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name, - size_t name_len) +static int __ath11k_core_create_board_name(struct ath11k_base *ab, char *name, + size_t name_len, bool with_variant) { /* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */ char variant[9 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = { 0 }; - if (ab->qmi.target.bdf_ext[0] != '\0') + if (with_variant && ab->qmi.target.bdf_ext[0] != '\0') scnprintf(variant, sizeof(variant), ",variant=%s", ab->qmi.target.bdf_ext); @@ -568,6 +568,18 @@ static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name, return 0; } +static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name, + size_t name_len) +{ + return __ath11k_core_create_board_name(ab, name, name_len, true); +} + +static int ath11k_core_create_fallback_board_name(struct ath11k_base *ab, char *name, + size_t name_len) +{ + return __ath11k_core_create_board_name(ab, name, name_len, false); +} + const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab, const char *file) { @@ -771,7 +783,7 @@ static int ath11k_core_fetch_board_data_api_n(struct ath11k_base *ab, out: if (!bd->data || !bd->len) { - ath11k_err(ab, + ath11k_dbg(ab, ATH11K_DBG_BOOT, "failed to fetch board data for %s from %s\n", boardname, filepath); ret = -ENODATA; @@ -803,10 +815,13 @@ int ath11k_core_fetch_board_data_api_1(struct ath11k_base *ab, #define BOARD_NAME_SIZE 200 int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd) { - char boardname[BOARD_NAME_SIZE]; + char boardname[BOARD_NAME_SIZE], fallback_boardname[BOARD_NAME_SIZE]; + char *filename, filepath[100]; int ret; - ret = ath11k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE); + filename = ATH11K_BOARD_API2_FILE; + + ret = ath11k_core_create_board_name(ab, boardname, sizeof(boardname)); if (ret) { ath11k_err(ab, "failed to create board name: %d", ret); return ret; @@ -817,10 +832,29 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd) if (!ret) goto success; + ret = ath11k_core_create_fallback_board_name(ab, fallback_boardname, + sizeof(fallback_boardname)); + if (ret) { + ath11k_err(ab, "failed to create fallback board name: %d", ret); + return ret; + } + + ret = ath11k_core_fetch_board_data_api_n(ab, bd, fallback_boardname); + if (!ret) + goto success; + ab->bd_api = 1; ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_DEFAULT_BOARD_FILE); if (ret) { - ath11k_err(ab, "failed to fetch board-2.bin or board.bin from %s\n", + ath11k_core_create_firmware_path(ab, filename, + filepath, sizeof(filepath)); + ath11k_err(ab, "failed to fetch board data for %s from %s\n", + boardname, filepath); + if (memcmp(boardname, fallback_boardname, strlen(boardname))) + ath11k_err(ab, "failed to fetch board data for %s from %s\n", + fallback_boardname, filepath); + + ath11k_err(ab, "failed to fetch board.bin from %s\n", ab->hw_params.fw.dir); return ret; } -- 2.31.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin 2022-03-15 10:47 ` [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin Wen Gong @ 2022-03-25 10:30 ` Kalle Valo 0 siblings, 0 replies; 9+ messages in thread From: Kalle Valo @ 2022-03-25 10:30 UTC (permalink / raw) To: Wen Gong; +Cc: ath11k, linux-wireless, quic_wgong Wen Gong <quic_wgong@quicinc.com> wrote: > Sometimes it has a variant value which read from DT or SMBIOS by > ath11k, and meanwhile it does not have the matched board name in > board-2.bin, then it will failed at boot up phase. > > Add fallback board name which removed variant value and search again > in board-2.bin when failed with variant and try to load the board > data again to increase boot up success rate. > > dmesg log after this patch: > [169547.248472] ath11k_pci 0000:05:00.0: boot using board name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262,variant=test' > [169547.248565] ath11k_pci 0000:05:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 180324 > [169547.248568] ath11k_pci 0000:05:00.0: board name > [169547.248570] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248571] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248572] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248574] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248575] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248576] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo > [169547.248577] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 32 ard-id=262 > [169547.248578] ath11k_pci 0000:05:00.0: board name > [169547.248579] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248581] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248582] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248583] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248584] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248585] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo > [169547.248587] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 36 ard-id=266 > [169547.248588] ath11k_pci 0000:05:00.0: board name > [169547.248589] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248590] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248591] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248592] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248594] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248595] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 31 38 2c 71 6d 69 2d 62 chip-id=18,qmi-b > [169547.248596] ath11k_pci 0000:05:00.0: 00000060: 6f 61 72 64 2d 69 64 3d 32 36 36 oard-id=266 > [169547.248597] ath11k_pci 0000:05:00.0: failed to fetch board data for bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262,variant=test from ath11k/WCN6855/hw2.0/board-2.bin > [169547.248476] ath11k_pci 0000:05:00.0: boot using board name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' > [169547.248634] ath11k_pci 0000:05:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 180324 > [169547.248636] ath11k_pci 0000:05:00.0: board name > [169547.248637] ath11k_pci 0000:05:00.0: 00000000: 62 75 73 3d 70 63 69 2c 76 65 6e 64 6f 72 3d 31 bus=pci,vendor=1 > [169547.248638] ath11k_pci 0000:05:00.0: 00000010: 37 63 62 2c 64 65 76 69 63 65 3d 31 31 30 33 2c 7cb,device=1103, > [169547.248639] ath11k_pci 0000:05:00.0: 00000020: 73 75 62 73 79 73 74 65 6d 2d 76 65 6e 64 6f 72 subsystem-vendor > [169547.248641] ath11k_pci 0000:05:00.0: 00000030: 3d 31 37 63 62 2c 73 75 62 73 79 73 74 65 6d 2d =17cb,subsystem- > [169547.248642] ath11k_pci 0000:05:00.0: 00000040: 64 65 76 69 63 65 3d 33 33 37 34 2c 71 6d 69 2d device=3374,qmi- > [169547.248643] ath11k_pci 0000:05:00.0: 00000050: 63 68 69 70 2d 69 64 3d 32 2c 71 6d 69 2d 62 6f chip-id=2,qmi-bo > [169547.248645] ath11k_pci 0000:05:00.0: 00000060: 61 72 64 2d 69 64 3d 32 36 32 ard-id=262 > [169547.248646] ath11k_pci 0000:05:00.0: boot found match for name 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' > [169547.248647] ath11k_pci 0000:05:00.0: boot found board data for 'bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262' > [169547.248649] ath11k_pci 0000:05:00.0: using board api 2 > > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 > > Signed-off-by: Wen Gong <quic_wgong@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 2 patches applied to ath-next branch of ath.git, thanks. 62abdc06c50e ath11k: add fallback board name without variant while searching board-2.bin 9d97114d2220 ath11k: add read variant from SMBIOS for download board data -- https://patchwork.kernel.org/project/linux-wireless/patch/20220315104721.26649-2-quic_wgong@quicinc.com/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data 2022-03-15 10:47 [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Wen Gong 2022-03-15 10:47 ` [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin Wen Gong @ 2022-03-15 10:47 ` Wen Gong 2022-03-21 10:33 ` Kalle Valo 2022-03-23 8:47 ` Kalle Valo 2022-03-21 10:31 ` [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Kalle Valo 2 siblings, 2 replies; 9+ messages in thread From: Wen Gong @ 2022-03-15 10:47 UTC (permalink / raw) To: ath11k; +Cc: linux-wireless, quic_wgong This is to read variant from SMBIOS such as read from DT, the variant string will be used to one part of string which used to search board data from board-2.bin. Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 Signed-off-by: Wen Gong <quic_wgong@quicinc.com> --- drivers/net/wireless/ath/ath11k/core.c | 68 ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/core.h | 20 +++++++- drivers/net/wireless/ath/ath11k/qmi.c | 4 ++ 3 files changed, 91 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c index 7711bdb36170..6a2cbd07525d 100644 --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c @@ -9,6 +9,7 @@ #include <linux/remoteproc.h> #include <linux/firmware.h> #include <linux/of.h> + #include "core.h" #include "dp_tx.h" #include "dp_rx.h" @@ -509,6 +510,73 @@ int ath11k_core_resume(struct ath11k_base *ab) } EXPORT_SYMBOL(ath11k_core_resume); +static void ath11k_core_check_bdfext(const struct dmi_header *hdr, void *data) +{ + struct ath11k_base *ab = data; + const char *magic = ATH11K_SMBIOS_BDF_EXT_MAGIC; + struct ath11k_smbios_bdf *smbios = (struct ath11k_smbios_bdf *)hdr; + int i; + size_t len; + + if (ab->qmi.target.bdf_ext[0] != '\0') + return; + + if (hdr->type != ATH11K_SMBIOS_BDF_EXT_TYPE) + return; + + if (hdr->length != ATH11K_SMBIOS_BDF_EXT_LENGTH) { + ath11k_dbg(ab, ATH11K_DBG_BOOT, + "wrong smbios bdf ext type length (%d).\n", + hdr->length); + return; + } + + if (!smbios->bdf_enabled) { + ath11k_dbg(ab, ATH11K_DBG_BOOT, "bdf variant name not found.\n"); + return; + } + + /* Only one string exists (per spec) */ + if (memcmp(smbios->bdf_ext, magic, strlen(magic)) != 0) { + ath11k_dbg(ab, ATH11K_DBG_BOOT, + "bdf variant magic does not match.\n"); + return; + } + + len = min_t(size_t, + strlen(smbios->bdf_ext), sizeof(ab->qmi.target.bdf_ext)); + for (i = 0; i < len; i++) { + if (!isascii(smbios->bdf_ext[i]) || !isprint(smbios->bdf_ext[i])) { + ath11k_dbg(ab, ATH11K_DBG_BOOT, + "bdf variant name contains non ascii chars.\n"); + return; + } + } + + /* Copy extension name without magic prefix */ + if (strscpy(ab->qmi.target.bdf_ext, smbios->bdf_ext + strlen(magic), + sizeof(ab->qmi.target.bdf_ext)) < 0) { + ath11k_dbg(ab, ATH11K_DBG_BOOT, + "bdf variant string is longer than the buffer can accommodate\n"); + return; + } + + ath11k_dbg(ab, ATH11K_DBG_BOOT, + "found and validated bdf variant smbios_type 0x%x bdf %s\n", + ATH11K_SMBIOS_BDF_EXT_TYPE, ab->qmi.target.bdf_ext); +} + +int ath11k_core_check_smbios(struct ath11k_base *ab) +{ + ab->qmi.target.bdf_ext[0] = '\0'; + dmi_walk(ath11k_core_check_bdfext, ab); + + if (ab->qmi.target.bdf_ext[0] == '\0') + return -ENODATA; + + return 0; +} + int ath11k_core_check_dt(struct ath11k_base *ab) { size_t max_len = sizeof(ab->qmi.target.bdf_ext); diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h index c0228e91a596..891507dbccc7 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -10,6 +10,8 @@ #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/bitfield.h> +#include <linux/dmi.h> +#include <linux/ctype.h> #include "qmi.h" #include "htc.h" #include "wmi.h" @@ -36,6 +38,15 @@ #define ATH11K_INVALID_HW_MAC_ID 0xFF #define ATH11K_CONNECTION_LOSS_HZ (3 * HZ) +/* SMBIOS type containing Board Data File Name Extension */ +#define ATH11K_SMBIOS_BDF_EXT_TYPE 0xF8 + +/* SMBIOS type structure length (excluding strings-set) */ +#define ATH11K_SMBIOS_BDF_EXT_LENGTH 0x9 + +/* The magic used by QCA spec */ +#define ATH11K_SMBIOS_BDF_EXT_MAGIC "BDF_" + extern unsigned int ath11k_frame_mode; #define ATH11K_MON_TIMER_INTERVAL 10 @@ -147,6 +158,13 @@ struct ath11k_ext_irq_grp { struct net_device napi_ndev; }; +struct ath11k_smbios_bdf { + struct dmi_header hdr; + u32 padding; + u8 bdf_enabled; + u8 bdf_ext[1]; +}; + #define HEHANDLE_CAP_PHYINFO_SIZE 3 #define HECAP_PHYINFO_SIZE 9 #define HECAP_MACINFO_SIZE 5 @@ -996,7 +1014,7 @@ int ath11k_core_fetch_board_data_api_1(struct ath11k_base *ab, const char *name); void ath11k_core_free_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd); int ath11k_core_check_dt(struct ath11k_base *ath11k); - +int ath11k_core_check_smbios(struct ath11k_base *ab); void ath11k_core_halt(struct ath11k *ar); int ath11k_core_resume(struct ath11k_base *ab); int ath11k_core_suspend(struct ath11k_base *ab); diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c index 04e966830c18..14d7dfa788cd 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c @@ -2082,6 +2082,10 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab) ab->qmi.target.fw_build_timestamp, ab->qmi.target.fw_build_id); + r = ath11k_core_check_smbios(ab); + if (r) + ath11k_dbg(ab, ATH11K_DBG_QMI, "SMBIOS bdf variant name not set.\n"); + r = ath11k_core_check_dt(ab); if (r) ath11k_dbg(ab, ATH11K_DBG_QMI, "DT bdf variant name not set.\n"); -- 2.31.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data 2022-03-15 10:47 ` [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data Wen Gong @ 2022-03-21 10:33 ` Kalle Valo 2022-03-23 8:47 ` Kalle Valo 1 sibling, 0 replies; 9+ messages in thread From: Kalle Valo @ 2022-03-21 10:33 UTC (permalink / raw) To: Wen Gong; +Cc: ath11k, linux-wireless Wen Gong <quic_wgong@quicinc.com> writes: > This is to read variant from SMBIOS such as read from DT, the variant > string will be used to one part of string which used to search board > data from board-2.bin. > > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 > > Signed-off-by: Wen Gong <quic_wgong@quicinc.com> [...] > + /* Copy extension name without magic prefix */ > + if (strscpy(ab->qmi.target.bdf_ext, smbios->bdf_ext + strlen(magic), > + sizeof(ab->qmi.target.bdf_ext)) < 0) { > + ath11k_dbg(ab, ATH11K_DBG_BOOT, > + "bdf variant string is longer than the buffer can accommodate\n"); > + return; > + } In the pending branch I changed this a bit to follow the style used in ath11k: @@ -548,8 +548,9 @@ static void ath11k_core_check_bdfext(const struct dmi_header *hdr, void *data) struct ath11k_base *ab = data; const char *magic = ATH11K_SMBIOS_BDF_EXT_MAGIC; struct ath11k_smbios_bdf *smbios = (struct ath11k_smbios_bdf *)hdr; - int i; + ssize_t copied; size_t len; + int i; if (ab->qmi.target.bdf_ext[0] != '\0') return; @@ -587,8 +588,9 @@ static void ath11k_core_check_bdfext(const struct dmi_header *hdr, void *data) } /* Copy extension name without magic prefix */ - if (strscpy(ab->qmi.target.bdf_ext, smbios->bdf_ext + strlen(magic), - sizeof(ab->qmi.target.bdf_ext)) < 0) { + copied = strscpy(ab->qmi.target.bdf_ext, smbios->bdf_ext + strlen(magic), + sizeof(ab->qmi.target.bdf_ext)); + if (copied < 0) { ath11k_dbg(ab, ATH11K_DBG_BOOT, "bdf variant string is longer than the buffer can accommodate\n"); return; -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data 2022-03-15 10:47 ` [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data Wen Gong 2022-03-21 10:33 ` Kalle Valo @ 2022-03-23 8:47 ` Kalle Valo 2022-03-23 8:52 ` Wen Gong 1 sibling, 1 reply; 9+ messages in thread From: Kalle Valo @ 2022-03-23 8:47 UTC (permalink / raw) To: Wen Gong; +Cc: ath11k, linux-wireless Wen Gong <quic_wgong@quicinc.com> writes: > This is to read variant from SMBIOS such as read from DT, the variant > string will be used to one part of string which used to search board > data from board-2.bin. > > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 > > Signed-off-by: Wen Gong <quic_wgong@quicinc.com> [...] > +struct ath11k_smbios_bdf { > + struct dmi_header hdr; > + u32 padding; > + u8 bdf_enabled; > + u8 bdf_ext[1]; > +}; I was about to commit this but noticed bdf_ext[1], is there a reason for that? Use of [1] in arrays is deprecated nowadays: https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data 2022-03-23 8:47 ` Kalle Valo @ 2022-03-23 8:52 ` Wen Gong 2022-03-23 13:05 ` Kalle Valo 0 siblings, 1 reply; 9+ messages in thread From: Wen Gong @ 2022-03-23 8:52 UTC (permalink / raw) To: Kalle Valo; +Cc: ath11k, linux-wireless On 3/23/2022 4:47 PM, Kalle Valo wrote: > Wen Gong <quic_wgong@quicinc.com> writes: > >> This is to read variant from SMBIOS such as read from DT, the variant >> string will be used to one part of string which used to search board >> data from board-2.bin. >> >> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 >> >> Signed-off-by: Wen Gong <quic_wgong@quicinc.com> > [...] > >> +struct ath11k_smbios_bdf { >> + struct dmi_header hdr; >> + u32 padding; >> + u8 bdf_enabled; >> + u8 bdf_ext[1]; >> +}; > I was about to commit this but noticed bdf_ext[1], is there a reason for > that? Use of [1] in arrays is deprecated nowadays: Kalle, no reason for it, please change bdf_ext[1] to bdf_ext[0] or bdf_ext[]. It will also work well. thanks. > > https://www.kernel.org/doc/html/v5.16/process/deprecated.html#zero-length-and-one-element-arrays > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data 2022-03-23 8:52 ` Wen Gong @ 2022-03-23 13:05 ` Kalle Valo 0 siblings, 0 replies; 9+ messages in thread From: Kalle Valo @ 2022-03-23 13:05 UTC (permalink / raw) To: Wen Gong; +Cc: ath11k, linux-wireless Wen Gong <quic_wgong@quicinc.com> writes: > On 3/23/2022 4:47 PM, Kalle Valo wrote: >> Wen Gong <quic_wgong@quicinc.com> writes: >> >>> This is to read variant from SMBIOS such as read from DT, the variant >>> string will be used to one part of string which used to search board >>> data from board-2.bin. >>> >>> Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3 >>> >>> Signed-off-by: Wen Gong <quic_wgong@quicinc.com> >> [...] >> >>> +struct ath11k_smbios_bdf { >>> + struct dmi_header hdr; >>> + u32 padding; >>> + u8 bdf_enabled; >>> + u8 bdf_ext[1]; >>> +}; >> I was about to commit this but noticed bdf_ext[1], is there a reason for >> that? Use of [1] in arrays is deprecated nowadays: > > Kalle, > > no reason for it, please change bdf_ext[1] to bdf_ext[0] or bdf_ext[]. > It will also work well. [0] is deprecated as well so I changed it to []. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS 2022-03-15 10:47 [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Wen Gong 2022-03-15 10:47 ` [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin Wen Gong 2022-03-15 10:47 ` [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data Wen Gong @ 2022-03-21 10:31 ` Kalle Valo 2 siblings, 0 replies; 9+ messages in thread From: Kalle Valo @ 2022-03-21 10:31 UTC (permalink / raw) To: Wen Gong; +Cc: ath11k, linux-wireless Wen Gong <quic_wgong@quicinc.com> writes: > v6: > 1. rebased to ath.git ath-202203101556 > 2. add error message if could not find any board data at last. > 3. change "ath11k: add read variant from SMBIOS for download board data" for > add struct ath11k_smbios_bdf, strlen(), not mix defines and function declarations. > > v5: > 1. rebased to ath.git ath-202112161538 > 2. fix warning "failed to fetch board data for bus=pci,qmi-chip-id=0,qmi-board-id=255,variant=DE_1901 from ath11k/QCA6390/hw2.0/board-2.bin" > > v4: > 1. add helper function ath11k_core_create_fallback_board_name() > 2. rebased to ath.git ath-202112071521 > > v3: > 1. add patch "ath11k: add fallback board name without variant while searching board-2.bin" > 2. reabsed to latest ath.git master ath-202111221436 > > v2: rebased to latest ath.git master ath-202111170737 > > When it does not have matched board name with variant in board-2.bin, > ath11k will fallback to search without variant. > > Also read the variant from SMBIOS. Thanks, I now tested this patchset and looks to work perfectly now. BTW, please add the change log here, that is after the description but before the patch list below. In other words, the cover letter needs to have the desription as the first thing. > Wen Gong (2): > ath11k: add fallback board name without variant while searching > board-2.bin > ath11k: add read variant from SMBIOS for download board data > > drivers/net/wireless/ath/ath11k/core.c | 116 +++++++++++++++++++++++-- > drivers/net/wireless/ath/ath11k/core.h | 20 ++++- > drivers/net/wireless/ath/ath11k/qmi.c | 4 + > 3 files changed, 132 insertions(+), 8 deletions(-) > > > base-commit: d845cf007bdf8b2bf41522e1ecd0eb804e553d57 > -- > 2.31.1 -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-03-25 10:30 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-03-15 10:47 [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Wen Gong 2022-03-15 10:47 ` [PATCH v6 1/2] ath11k: add fallback board name without variant while searching board-2.bin Wen Gong 2022-03-25 10:30 ` Kalle Valo 2022-03-15 10:47 ` [PATCH v6 2/2] ath11k: add read variant from SMBIOS for download board data Wen Gong 2022-03-21 10:33 ` Kalle Valo 2022-03-23 8:47 ` Kalle Valo 2022-03-23 8:52 ` Wen Gong 2022-03-23 13:05 ` Kalle Valo 2022-03-21 10:31 ` [PATCH v6 0/2] ath11k: add handler for board-2.bin without variant and read SMBIOS Kalle Valo
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).