Commit 52f8c45f authored by Baochen Qiang's avatar Baochen Qiang Committed by Kalle Valo

wifi: ath12k: support default regdb while searching board-2.bin for WCN7850

Sometimes board-2.bin does not have the regdb data which matches the
parameters such as vendor, device, subsystem-vendor, subsystem-device
etc. Add default regdb data with only 'bus=%s' into board-2.bin for
WCN7850, then ath12k uses 'bus=pci' to search regdb data in board-2.bin
for WCN7850.

[   46.114895] ath12k_pci 0000:03:00.0: boot using board name 'bus=pci,vendor=17cb,device=1107,subsystem-vendor=17cb,subsystem-device=3378,qmi-chip-id=2,qmi-board-id=260'
[   46.118167] ath12k_pci 0000:03:00.0: boot firmware request ath12k/WCN7850/hw2.0/board-2.bin size 380280
[   46.118173] ath12k_pci 0000:03:00.0: board name
[   46.118176] ath12k_pci 0000:03:00.0: 00000000: 62 75 73 3d 70 63 69                             bus=pci
[   46.118179] ath12k_pci 0000:03:00.0: failed to fetch regdb data for bus=pci,vendor=17cb,device=1107,subsystem-vendor=17cb,subsystem-device=3378,qmi-chip-id=2,qmi-board-id=260 from ath12k/WCN7850/hw2.0/board-2.bin
[   46.118239] ath12k_pci 0000:03:00.0: boot using board name 'bus=pci'
[   46.119842] ath12k_pci 0000:03:00.0: boot firmware request ath12k/WCN7850/hw2.0/board-2.bin size 380280
[   46.119847] ath12k_pci 0000:03:00.0: board name
[   46.119849] ath12k_pci 0000:03:00.0: 00000000: 62 75 73 3d 70 63 69                             bus=pci
[   46.119852] ath12k_pci 0000:03:00.0: boot found match regdb data for name 'bus=pci'
[   46.119855] ath12k_pci 0000:03:00.0: boot found regdb data for 'bus=pci'
[   46.119857] ath12k_pci 0000:03:00.0: fetched regdb

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
Signed-off-by: default avatarBaochen Qiang <quic_bqiang@quicinc.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20231216060140.30611-6-quic_bqiang@quicinc.com
parent 51120745
...@@ -105,7 +105,8 @@ int ath12k_core_resume(struct ath12k_base *ab) ...@@ -105,7 +105,8 @@ int ath12k_core_resume(struct ath12k_base *ab)
} }
static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name, static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name,
size_t name_len, bool with_variant) size_t name_len, bool with_variant,
bool bus_type_mode)
{ {
/* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */ /* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */
char variant[9 + ATH12K_QMI_BDF_EXT_STR_LENGTH] = { 0 }; char variant[9 + ATH12K_QMI_BDF_EXT_STR_LENGTH] = { 0 };
...@@ -116,15 +117,20 @@ static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name, ...@@ -116,15 +117,20 @@ static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name,
switch (ab->id.bdf_search) { switch (ab->id.bdf_search) {
case ATH12K_BDF_SEARCH_BUS_AND_BOARD: case ATH12K_BDF_SEARCH_BUS_AND_BOARD:
scnprintf(name, name_len, if (bus_type_mode)
"bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%d,qmi-board-id=%d%s", scnprintf(name, name_len,
ath12k_bus_str(ab->hif.bus), "bus=%s",
ab->id.vendor, ab->id.device, ath12k_bus_str(ab->hif.bus));
ab->id.subsystem_vendor, else
ab->id.subsystem_device, scnprintf(name, name_len,
ab->qmi.target.chip_id, "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x,qmi-chip-id=%d,qmi-board-id=%d%s",
ab->qmi.target.board_id, ath12k_bus_str(ab->hif.bus),
variant); ab->id.vendor, ab->id.device,
ab->id.subsystem_vendor,
ab->id.subsystem_device,
ab->qmi.target.chip_id,
ab->qmi.target.board_id,
variant);
break; break;
default: default:
scnprintf(name, name_len, scnprintf(name, name_len,
...@@ -143,13 +149,19 @@ static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name, ...@@ -143,13 +149,19 @@ static int __ath12k_core_create_board_name(struct ath12k_base *ab, char *name,
static int ath12k_core_create_board_name(struct ath12k_base *ab, char *name, static int ath12k_core_create_board_name(struct ath12k_base *ab, char *name,
size_t name_len) size_t name_len)
{ {
return __ath12k_core_create_board_name(ab, name, name_len, true); return __ath12k_core_create_board_name(ab, name, name_len, true, false);
} }
static int ath12k_core_create_fallback_board_name(struct ath12k_base *ab, char *name, static int ath12k_core_create_fallback_board_name(struct ath12k_base *ab, char *name,
size_t name_len) size_t name_len)
{ {
return __ath12k_core_create_board_name(ab, name, name_len, false); return __ath12k_core_create_board_name(ab, name, name_len, false, false);
}
static int ath12k_core_create_bus_type_board_name(struct ath12k_base *ab, char *name,
size_t name_len)
{
return __ath12k_core_create_board_name(ab, name, name_len, false, true);
} }
const struct firmware *ath12k_core_firmware_request(struct ath12k_base *ab, const struct firmware *ath12k_core_firmware_request(struct ath12k_base *ab,
...@@ -453,7 +465,7 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) ...@@ -453,7 +465,7 @@ int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd)
int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd) int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd)
{ {
char boardname[BOARD_NAME_SIZE]; char boardname[BOARD_NAME_SIZE], default_boardname[BOARD_NAME_SIZE];
int ret; int ret;
ret = ath12k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE); ret = ath12k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE);
...@@ -470,6 +482,21 @@ int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd ...@@ -470,6 +482,21 @@ int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd
if (!ret) if (!ret)
goto exit; goto exit;
ret = ath12k_core_create_bus_type_board_name(ab, default_boardname,
BOARD_NAME_SIZE);
if (ret) {
ath12k_dbg(ab, ATH12K_DBG_BOOT,
"failed to create default board name for regdb: %d", ret);
goto exit;
}
ret = ath12k_core_fetch_board_data_api_n(ab, bd, default_boardname,
ATH12K_BD_IE_REGDB,
ATH12K_BD_IE_REGDB_NAME,
ATH12K_BD_IE_REGDB_DATA);
if (!ret)
goto exit;
ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_REGDB_FILE_NAME); ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_REGDB_FILE_NAME);
if (ret) if (ret)
ath12k_dbg(ab, ATH12K_DBG_BOOT, "failed to fetch %s from %s\n", ath12k_dbg(ab, ATH12K_DBG_BOOT, "failed to fetch %s from %s\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment