diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-23 20:10:15 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-05-23 20:10:15 +0000 |
| commit | 2f0af4f98909842970a9a1ad5b34aec1decdf359 (patch) | |
| tree | b6f26ec3631697731307be70b74665fd71745dc4 | |
| parent | d761686e790df00573d77d8456dc38e3efd72818 (diff) | |
| parent | 43d7af1cff8eeafdc0a1369edfbb671225b4f574 (diff) | |
| download | cnss2-android-gs-pantah-5.10-u-beta3.tar.gz | |
Snap for 10128799 from 43d7af1cff8eeafdc0a1369edfbb671225b4f574 to android13-gs-pixel-5.10-releaseandroid-u-beta-3_r0.5android-u-beta-3_r0.4android-gs-pantah-5.10-u-beta3android-gs-lynx-5.10-u-beta3
Change-Id: Ic4090e2cf84cee4da6583dc1af8407b44761362d
| -rw-r--r-- | cnss2/main.h | 5 | ||||
| -rw-r--r-- | cnss2/qmi.c | 3 | ||||
| -rw-r--r-- | mhi/core/boot.c | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cnss2/main.h b/cnss2/main.h index 0125237..0d45829 100644 --- a/cnss2/main.h +++ b/cnss2/main.h @@ -51,7 +51,6 @@ #define MAX_NO_OF_MAC_ADDR 4 #define QMI_WLFW_MAX_TIMESTAMP_LEN 32 -#define QMI_WLFW_MAX_NUM_MEM_SEG 32 #define QMI_WLFW_MAX_BUILD_ID_LEN 128 #define CNSS_RDDM_TIMEOUT_MS 20000 #define RECOVERY_TIMEOUT 60000 @@ -487,7 +486,7 @@ struct cnss_plat_data { char fw_build_id[QMI_WLFW_MAX_BUILD_ID_LEN + 1]; u32 otp_version; u32 fw_mem_seg_len; - struct cnss_fw_mem fw_mem[QMI_WLFW_MAX_NUM_MEM_SEG]; + struct cnss_fw_mem fw_mem[QMI_WLFW_MAX_NUM_MEM_SEG_V01]; struct cnss_fw_mem m3_mem; struct cnss_fw_mem *cal_mem; u64 cal_time; @@ -495,7 +494,7 @@ struct cnss_plat_data { u32 cal_file_size; struct completion daemon_connected; u32 qdss_mem_seg_len; - struct cnss_fw_mem qdss_mem[QMI_WLFW_MAX_NUM_MEM_SEG]; + struct cnss_fw_mem qdss_mem[QMI_WLFW_MAX_NUM_MEM_SEG_V01]; u32 *qdss_reg; struct cnss_pin_connect_result pin_result; struct dentry *root_dentry; diff --git a/cnss2/qmi.c b/cnss2/qmi.c index 1b9f388..dba4215 100644 --- a/cnss2/qmi.c +++ b/cnss2/qmi.c @@ -1143,7 +1143,8 @@ int cnss_wlfw_qdss_data_send_sync(struct cnss_plat_data *plat_priv, char *file_n resp->total_size == total_size) && (resp->seg_id_valid == 1 && resp->seg_id == req->seg_id) && (resp->data_valid == 1 && - resp->data_len <= QMI_WLFW_MAX_DATA_SIZE_V01)) { + resp->data_len <= QMI_WLFW_MAX_DATA_SIZE_V01) && + resp->data_len <= remaining) { memcpy(p_qdss_trace_data_temp, resp->data, resp->data_len); } else { diff --git a/mhi/core/boot.c b/mhi/core/boot.c index 83d989e..e7f8292 100644 --- a/mhi/core/boot.c +++ b/mhi/core/boot.c @@ -501,6 +501,9 @@ void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) goto error_fw_load; } +#ifdef CONFIG_WCN_GOOGLE + MHI_LOG("request_firmware: %s", fw_name); +#endif ret = request_firmware(&firmware, fw_name, dev->parent); if (ret) { if (!mhi_cntrl->fallback_fw_image) { |