samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cnss2: Download QDSS config file based on build type

Browse Source 
Add build type string to file name. "qdss_trace_config_debug_v<n>.cfg"
for debug build and "qdss_trace_config_perf_v<n>.cfg" for perf build.

Change-Id: I349a6524c7040d88d69ac329604ade9b9ba07318
CRs-Fixed: 3548322
This commit is contained in:
Naman Padhiar
2023-07-02 10:40:56 +05:30
committed by Rahul Choudhary
parent 02c2d4f750
commit 4d274cd5af
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
cnss2/qmi.c
View File

@@ -33,10 +33,15 @@
#define INI_FILE_NAME_LEN 100 #define INI_FILE_NAME_LEN 100
#define QDSS_TRACE_CONFIG_FILE "qdss_trace_config" #define QDSS_TRACE_CONFIG_FILE "qdss_trace_config"
/*
* Download QDSS config file based on build type. Add build type string to
* file name. Download "qdss_trace_config_debug_v<n>.cfg" for debug build
* and "qdss_trace_config_perf_v<n>.cfg" for perf build.
*/
#ifdef CONFIG_CNSS2_DEBUG #ifdef CONFIG_CNSS2_DEBUG
#define QDSS_DEBUG_FILE_STR "debug_" #define QDSS_FILE_BUILD_STR "debug_"
#else #else
#define QDSS_DEBUG_FILE_STR "" #define QDSS_FILE_BUILD_STR "perf_"
#endif #endif
#define HW_V1_NUMBER "v1" #define HW_V1_NUMBER "v1"
#define HW_V2_NUMBER "v2" #define HW_V2_NUMBER "v2"
@@ -1436,22 +1441,21 @@ end:
} }
void cnss_get_qdss_cfg_filename(struct cnss_plat_data *plat_priv, void cnss_get_qdss_cfg_filename(struct cnss_plat_data *plat_priv,
char *filename, u32 filename_len) char *filename, u32 filename_len,
bool fallback_file)
{ {
char filename_tmp[MAX_FIRMWARE_NAME_LEN]; char filename_tmp[MAX_FIRMWARE_NAME_LEN];
char *debug_str = QDSS_DEBUG_FILE_STR; char *build_str = QDSS_FILE_BUILD_STR;
if (plat_priv->device_id == KIWI_DEVICE_ID || if (fallback_file)
plat_priv->device_id == MANGO_DEVICE_ID || build_str = "";
plat_priv->device_id == PEACH_DEVICE_ID)
debug_str = "";
if (plat_priv->device_version.major_version == FW_V2_NUMBER) if (plat_priv->device_version.major_version == FW_V2_NUMBER)
snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE
"_%s%s.cfg", debug_str, HW_V2_NUMBER); "_%s%s.cfg", build_str, HW_V2_NUMBER);
else else
snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE
"_%s%s.cfg", debug_str, HW_V1_NUMBER); "_%s%s.cfg", build_str, HW_V1_NUMBER);
cnss_bus_add_fw_prefix_name(plat_priv, filename, filename_tmp); cnss_bus_add_fw_prefix_name(plat_priv, filename, filename_tmp);
} }
@@ -1480,14 +1484,24 @@ int cnss_wlfw_qdss_dnld_send_sync(struct cnss_plat_data *plat_priv)
return -ENOMEM; return -ENOMEM;
} }
cnss_get_qdss_cfg_filename(plat_priv, qdss_cfg_filename, sizeof(qdss_cfg_filename)); cnss_get_qdss_cfg_filename(plat_priv, qdss_cfg_filename,
sizeof(qdss_cfg_filename), false);
ret = cnss_request_firmware_direct(plat_priv, &fw_entry, ret = cnss_request_firmware_direct(plat_priv, &fw_entry,
qdss_cfg_filename); qdss_cfg_filename);
if (ret) { if (ret) {
cnss_pr_dbg("Unable to load %s\n", cnss_pr_dbg("Unable to load %s ret %d, try default file\n",
qdss_cfg_filename, ret);
cnss_get_qdss_cfg_filename(plat_priv, qdss_cfg_filename,
sizeof(qdss_cfg_filename),
true);
ret = cnss_request_firmware_direct(plat_priv, &fw_entry,
qdss_cfg_filename); qdss_cfg_filename);
if (ret) {
cnss_pr_err("Unable to load %s ret %d\n",
qdss_cfg_filename, ret);
goto err_req_fw; goto err_req_fw;
} }
}
temp = fw_entry->data; temp = fw_entry->data;
remaining = fw_entry->size; remaining = fw_entry->size;