android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi: ath11k: add support default regdb while searching board-2.bin for WCN6855

Browse Source 
[ Upstream commit 88ca89202f8e8afb5225eb5244d79cd67c15d744 ]

Sometimes board-2.bin does not have the regdb data which matched the
parameters such as vendor, device, subsystem-vendor, subsystem-device
and etc. Add default regdb data with 'bus=%s' into board-2.bin for
WCN6855, then ath11k use 'bus=pci' to search regdb data in board-2.bin
for WCN6855.

kernel: [  122.515808] ath11k_pci 0000:03: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'
kernel: [  122.517240] ath11k_pci 0000:03:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 6179564
kernel: [  122.517280] ath11k_pci 0000:03:00.0: failed to fetch regdb data for bus=pci,vendor=17cb,device=1103,subsystem-vendor=17cb,subsystem-device=3374,qmi-chip-id=2,qmi-board-id=262 from ath11k/WCN6855/hw2.0/board-2.bin
kernel: [  122.517464] ath11k_pci 0000:03:00.0: boot using board name 'bus=pci'
kernel: [  122.518901] ath11k_pci 0000:03:00.0: boot firmware request ath11k/WCN6855/hw2.0/board-2.bin size 6179564
kernel: [  122.518915] ath11k_pci 0000:03:00.0: board name
kernel: [  122.518917] ath11k_pci 0000:03:00.0: 00000000: 62 75 73 3d 70 63 69                             bus=pci
kernel: [  122.518918] ath11k_pci 0000:03:00.0: boot found match regdb data for name 'bus=pci'
kernel: [  122.518920] ath11k_pci 0000:03:00.0: boot found regdb data for 'bus=pci'
kernel: [  122.518921] ath11k_pci 0000:03:00.0: fetched regdb

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>
Link: https://lore.kernel.org/r/20230517133959.8224-1-quic_wgong@quicinc.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Wen Gong 2023-05-26 12:41:06 +03:00 committed by Greg Kroah-Hartman
parent 4e291a07af
commit 8656b31d2e
1 changed files with 40 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/net/wireless/ath/ath11k/core.c
View File

@ -870,7 +870,8 @@ int ath11k_core_check_dt(struct ath11k_base *ab)
} }
static int __ath11k_core_create_board_name(struct ath11k_base *ab, char *name, static int __ath11k_core_create_board_name(struct ath11k_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 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = { 0 }; char variant[9 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = { 0 };
@ -881,15 +882,20 @@ static int __ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
switch (ab->id.bdf_search) { switch (ab->id.bdf_search) {
case ATH11K_BDF_SEARCH_BUS_AND_BOARD: case ATH11K_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,
ath11k_bus_str(ab->hif.bus), "bus=%s",
ab->id.vendor, ab->id.device, ath11k_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, ath11k_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,
@ -908,13 +914,19 @@ static int __ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name, static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
size_t name_len) size_t name_len)
{ {
return __ath11k_core_create_board_name(ab, name, name_len, true); return __ath11k_core_create_board_name(ab, name, name_len, true, false);
} }
static int ath11k_core_create_fallback_board_name(struct ath11k_base *ab, char *name, static int ath11k_core_create_fallback_board_name(struct ath11k_base *ab, char *name,
size_t name_len) size_t name_len)
{ {
return __ath11k_core_create_board_name(ab, name, name_len, false); return __ath11k_core_create_board_name(ab, name, name_len, false, false);
}
static int ath11k_core_create_bus_type_board_name(struct ath11k_base *ab, char *name,
size_t name_len)
{
return __ath11k_core_create_board_name(ab, name, name_len, false, true);
} }
const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab, const struct firmware *ath11k_core_firmware_request(struct ath11k_base *ab,
@ -1218,7 +1230,7 @@ int ath11k_core_fetch_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd)
int ath11k_core_fetch_regdb(struct ath11k_base *ab, struct ath11k_board_data *bd) int ath11k_core_fetch_regdb(struct ath11k_base *ab, struct ath11k_board_data *bd)
{ {
char boardname[BOARD_NAME_SIZE]; char boardname[BOARD_NAME_SIZE], default_boardname[BOARD_NAME_SIZE];
int ret; int ret;
ret = ath11k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE); ret = ath11k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE);
@ -1235,6 +1247,21 @@ int ath11k_core_fetch_regdb(struct ath11k_base *ab, struct ath11k_board_data *bd
if (!ret) if (!ret)
goto exit; goto exit;
ret = ath11k_core_create_bus_type_board_name(ab, default_boardname,
BOARD_NAME_SIZE);
if (ret) {
ath11k_dbg(ab, ATH11K_DBG_BOOT,
"failed to create default board name for regdb: %d", ret);
goto exit;
}
ret = ath11k_core_fetch_board_data_api_n(ab, bd, default_boardname,
ATH11K_BD_IE_REGDB,
ATH11K_BD_IE_REGDB_NAME,
ATH11K_BD_IE_REGDB_DATA);
if (!ret)
goto exit;
ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_REGDB_FILE_NAME); ret = ath11k_core_fetch_board_data_api_1(ab, bd, ATH11K_REGDB_FILE_NAME);
if (ret) if (ret)
ath11k_dbg(ab, ATH11K_DBG_BOOT, "failed to fetch %s from %s\n", ath11k_dbg(ab, ATH11K_DBG_BOOT, "failed to fetch %s from %s\n",