A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

cnss2: Update qdss config file name

Browse source 
Update qdss config file name based on device
type and build type.

Change-Id: I74a9a858707828e3ad9ec5678de4ff2ba56e64ea
Signed-off-by: Sandeep Singh <sandsing@codeaurora.org>
This commit is contained in:
Sandeep Singh 2020-12-21 23:13:54 +05:30
commit ab67dcd025
3 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/cnss2/main.h
View file

@ -37,7 +37,8 @@
#define TIME_CLOCK_FREQ_HZ 19200000
#define CNSS_RAMDUMP_MAGIC 0x574C414E
#define CNSS_RAMDUMP_VERSION 0
#define MAX_FIRMWARE_NAME_LEN 20
#define MAX_FIRMWARE_NAME_LEN 40
#define FW_V2_NUMBER 2
#define CNSS_EVENT_SYNC BIT(0)
#define CNSS_EVENT_UNINTERRUPTIBLE BIT(1)

1
drivers/net/wireless/cnss2/pci.c
View file

@ -44,7 +44,6 @@
#define DEFAULT_M3_FILE_NAME "m3.bin"
#define DEFAULT_FW_FILE_NAME "amss.bin"
#define FW_V2_FILE_NAME "amss20.bin"
#define FW_V2_NUMBER 2
#define WAKE_MSI_NAME "WAKE"

45
drivers/net/wireless/cnss2/qmi.c
View file

@ -21,7 +21,10 @@
#define REGDB_FILE_NAME "regdb.bin"
#define DUMMY_BDF_FILE_NAME "bdwlan.dmy"
#define QDSS_TRACE_CONFIG_FILE "qdss_trace_config.cfg"
#define QDSS_TRACE_CONFIG_FILE "qdss_trace_config"
#define DEBUG_STR "debug"
#define HW_V1_NUMBER "v1"
#define HW_V2_NUMBER "v2"
#define QMI_WLFW_TIMEOUT_MS (plat_priv->ctrl_params.qmi_timeout)
#define QMI_WLFW_TIMEOUT_JF msecs_to_jiffies(QMI_WLFW_TIMEOUT_MS)
@ -921,6 +924,38 @@ end:
return ret;
}
#ifdef CONFIG_CNSS2_DEBUG
static void cnss_get_qdss_cfg_filename(struct cnss_plat_data *plat_priv,
char *filename, u32 filename_len)
{
char filename_tmp[MAX_FIRMWARE_NAME_LEN];
if (plat_priv->device_version.major_version == FW_V2_NUMBER)
snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE
"_%s_%s.cfg", DEBUG_STR, HW_V2_NUMBER);
else
snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE
"_%s_%s.cfg", DEBUG_STR, HW_V1_NUMBER);
cnss_bus_add_fw_prefix_name(plat_priv, filename, filename_tmp);
}
#else
static void cnss_get_qdss_cfg_filename(struct cnss_plat_data *plat_priv,
char *filename, u32 filename_len)
{
char filename_tmp[MAX_FIRMWARE_NAME_LEN];
if (plat_priv->device_version.major_version == FW_V2_NUMBER)
snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE
"_%s.cfg", HW_V2_NUMBER);
else
snprintf(filename_tmp, filename_len, QDSS_TRACE_CONFIG_FILE
"_%s.cfg", HW_V1_NUMBER);
cnss_bus_add_fw_prefix_name(plat_priv, filename, filename_tmp);
}
#endif
int cnss_wlfw_qdss_dnld_send_sync(struct cnss_plat_data *plat_priv)
{
struct wlfw_qdss_trace_config_download_req_msg_v01 *req;
@ -928,6 +963,7 @@ int cnss_wlfw_qdss_dnld_send_sync(struct cnss_plat_data *plat_priv)
struct qmi_txn txn;
const struct firmware *fw_entry = NULL;
const u8 *temp;
char qdss_cfg_filename[MAX_FIRMWARE_NAME_LEN];
unsigned int remaining;
int ret = 0;
@ -944,11 +980,12 @@ int cnss_wlfw_qdss_dnld_send_sync(struct cnss_plat_data *plat_priv)
return -ENOMEM;
}
ret = request_firmware(&fw_entry, QDSS_TRACE_CONFIG_FILE,
cnss_get_qdss_cfg_filename(plat_priv, qdss_cfg_filename, sizeof(qdss_cfg_filename));
ret = request_firmware(&fw_entry, qdss_cfg_filename,
&plat_priv->plat_dev->dev);
if (ret) {
cnss_pr_err("Failed to load QDSS: %s\n",
QDSS_TRACE_CONFIG_FILE);
qdss_cfg_filename);
goto err_req_fw;
}
@ -956,7 +993,7 @@ int cnss_wlfw_qdss_dnld_send_sync(struct cnss_plat_data *plat_priv)
remaining = fw_entry->size;
cnss_pr_dbg("Downloading QDSS: %s, size: %u\n",
QDSS_TRACE_CONFIG_FILE, remaining);
qdss_cfg_filename, remaining);
while (remaining) {
req->total_size_valid = 1;