From 7c5394f2c8e35277bf55e1055d17a36a9ccf5b0e Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Thu, 5 Aug 2021 17:36:39 +0530 Subject: [PATCH] icnss2: Send WLAN_EN delay value in Host Cap For low temperature (< -25 degrees) WLAN FW need to keep delay between WLAN EN low and HIGH. Read WLAN_EN delay set by "wlan_en_delay" sysfs file and send it through Host Cap request. Increase MODE_ON and TARGET_CAP QMI request timeout to WLAN_EN delay value to accommodate delay kept in FW for WCN6750. Change-Id: Ic52cc94183984200f4cc3d893756bf7abeddad6d Signed-off-by: Naman Padhiar --- .../cnss_utils/wlan_firmware_service_v01.c | 80 +++++++ .../cnss_utils/wlan_firmware_service_v01.h | 213 +++++++++--------- drivers/soc/qcom/icnss2/main.c | 23 ++ drivers/soc/qcom/icnss2/main.h | 1 + drivers/soc/qcom/icnss2/qmi.c | 15 +- 5 files changed, 228 insertions(+), 104 deletions(-) diff --git a/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c index a5360a0c0098..39ec3f397df7 100644 --- a/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c +++ b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.c @@ -3414,6 +3414,86 @@ struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[] = { wlfw_host_cap_req_msg_v01, feature_list), }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x28, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + num_wlan_clients_valid), + }, + { + .data_type = QMI_UNSIGNED_2_BYTE, + .elem_len = 1, + .elem_size = sizeof(u16), + .array_type = NO_ARRAY, + .tlv_type = 0x28, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + num_wlan_clients), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x29, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + num_wlan_vaps_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x29, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + num_wlan_vaps), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x2A, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + wake_msi_addr_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x2A, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + wake_msi_addr), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x2B, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + wlan_enable_delay_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x2B, + .offset = offsetof(struct + wlfw_host_cap_req_msg_v01, + wlan_enable_delay), + }, { .data_type = QMI_EOTI, .array_type = NO_ARRAY, diff --git a/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h index e54cbce85252..0cb3e604d7dd 100644 --- a/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h +++ b/drivers/net/wireless/cnss_utils/wlan_firmware_service_v01.h @@ -9,117 +9,117 @@ #define WLFW_SERVICE_ID_V01 0x45 #define WLFW_SERVICE_VERS_V01 0x01 -#define QMI_WLFW_IND_REGISTER_REQ_V01 0x0020 -#define QMI_WLFW_IND_REGISTER_RESP_V01 0x0020 -#define QMI_WLFW_FW_READY_IND_V01 0x0021 -#define QMI_WLFW_WLAN_MODE_REQ_V01 0x0022 -#define QMI_WLFW_WLAN_MODE_RESP_V01 0x0022 -#define QMI_WLFW_WLAN_CFG_REQ_V01 0x0023 -#define QMI_WLFW_WLAN_CFG_RESP_V01 0x0023 -#define QMI_WLFW_CAP_REQ_V01 0x0024 -#define QMI_WLFW_CAP_RESP_V01 0x0024 -#define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025 -#define QMI_WLFW_BDF_DOWNLOAD_RESP_V01 0x0025 -#define QMI_WLFW_CAL_REPORT_REQ_V01 0x0026 -#define QMI_WLFW_CAL_REPORT_RESP_V01 0x0026 -#define QMI_WLFW_CAL_DOWNLOAD_REQ_V01 0x0027 -#define QMI_WLFW_CAL_DOWNLOAD_RESP_V01 0x0027 -#define QMI_WLFW_INITIATE_CAL_DOWNLOAD_IND_V01 0x0028 -#define QMI_WLFW_CAL_UPDATE_REQ_V01 0x0029 -#define QMI_WLFW_CAL_UPDATE_RESP_V01 0x0029 -#define QMI_WLFW_INITIATE_CAL_UPDATE_IND_V01 0x002A -#define QMI_WLFW_MSA_READY_IND_V01 0x002B -#define QMI_WLFW_PIN_CONNECT_RESULT_IND_V01 0x002C -#define QMI_WLFW_MSA_INFO_REQ_V01 0x002D -#define QMI_WLFW_MSA_INFO_RESP_V01 0x002D -#define QMI_WLFW_MSA_READY_REQ_V01 0x002E -#define QMI_WLFW_MSA_READY_RESP_V01 0x002E -#define QMI_WLFW_INI_REQ_V01 0x002F -#define QMI_WLFW_INI_RESP_V01 0x002F -#define QMI_WLFW_ATHDIAG_READ_REQ_V01 0x0030 -#define QMI_WLFW_ATHDIAG_READ_RESP_V01 0x0030 -#define QMI_WLFW_ATHDIAG_WRITE_REQ_V01 0x0031 -#define QMI_WLFW_ATHDIAG_WRITE_RESP_V01 0x0031 -#define QMI_WLFW_VBATT_REQ_V01 0x0032 -#define QMI_WLFW_VBATT_RESP_V01 0x0032 -#define QMI_WLFW_MAC_ADDR_REQ_V01 0x0033 -#define QMI_WLFW_MAC_ADDR_RESP_V01 0x0033 -#define QMI_WLFW_HOST_CAP_REQ_V01 0x0034 -#define QMI_WLFW_HOST_CAP_RESP_V01 0x0034 -#define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035 -#define QMI_WLFW_RESPOND_MEM_REQ_V01 0x0036 -#define QMI_WLFW_RESPOND_MEM_RESP_V01 0x0036 -#define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037 -#define QMI_WLFW_FW_INIT_DONE_IND_V01 0x0038 -#define QMI_WLFW_REJUVENATE_IND_V01 0x0039 -#define QMI_WLFW_REJUVENATE_ACK_REQ_V01 0x003A -#define QMI_WLFW_REJUVENATE_ACK_RESP_V01 0x003A -#define QMI_WLFW_DYNAMIC_FEATURE_MASK_REQ_V01 0x003B -#define QMI_WLFW_DYNAMIC_FEATURE_MASK_RESP_V01 0x003B -#define QMI_WLFW_M3_INFO_REQ_V01 0x003C -#define QMI_WLFW_M3_INFO_RESP_V01 0x003C -#define QMI_WLFW_XO_CAL_IND_V01 0x003D -#define QMI_WLFW_CAL_DONE_IND_V01 0x003E -#define QMI_WLFW_QDSS_TRACE_REQ_MEM_IND_V01 0x003F -#define QMI_WLFW_QDSS_TRACE_MEM_INFO_REQ_V01 0x0040 -#define QMI_WLFW_QDSS_TRACE_MEM_INFO_RESP_V01 0x0040 -#define QMI_WLFW_QDSS_TRACE_SAVE_IND_V01 0x0041 -#define QMI_WLFW_QDSS_TRACE_DATA_REQ_V01 0x0042 -#define QMI_WLFW_QDSS_TRACE_DATA_RESP_V01 0x0042 -#define QMI_WLFW_SHUTDOWN_REQ_V01 0x0043 -#define QMI_WLFW_SHUTDOWN_RESP_V01 0x0043 -#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_V01 0x0044 -#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_V01 0x0044 -#define QMI_WLFW_QDSS_TRACE_MODE_REQ_V01 0x0045 -#define QMI_WLFW_QDSS_TRACE_MODE_RESP_V01 0x0045 -#define QMI_WLFW_QDSS_TRACE_FREE_IND_V01 0x0046 -#define QMI_WLFW_ANTENNA_SWITCH_REQ_V01 0x0047 -#define QMI_WLFW_ANTENNA_SWITCH_RESP_V01 0x0047 -#define QMI_WLFW_ANTENNA_GRANT_REQ_V01 0x0048 -#define QMI_WLFW_ANTENNA_GRANT_RESP_V01 0x0048 -#define QMI_WLFW_WFC_CALL_STATUS_REQ_V01 0x0049 -#define QMI_WLFW_WFC_CALL_STATUS_RESP_V01 0x0049 -#define QMI_WLFW_GET_INFO_REQ_V01 0x004A -#define QMI_WLFW_GET_INFO_RESP_V01 0x004A -#define QMI_WLFW_RESPOND_GET_INFO_IND_V01 0x004B -#define QMI_WLFW_DEVICE_INFO_REQ_V01 0x004C -#define QMI_WLFW_DEVICE_INFO_RESP_V01 0x004C -#define QMI_WLFW_M3_DUMP_UPLOAD_REQ_IND_V01 0x004D -#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_REQ_V01 0x004E -#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_RESP_V01 0x004E -#define QMI_WLFW_SOC_WAKE_REQ_V01 0x004F -#define QMI_WLFW_SOC_WAKE_RESP_V01 0x004F -#define QMI_WLFW_POWER_SAVE_REQ_V01 0x0050 #define QMI_WLFW_POWER_SAVE_RESP_V01 0x0050 -#define QMI_WLFW_WFC_CALL_TWT_CONFIG_IND_V01 0x0051 -#define QMI_WLFW_QDSS_MEM_READY_IND_V01 0x0052 +#define QMI_WLFW_CAP_REQ_V01 0x0024 +#define QMI_WLFW_CAL_REPORT_REQ_V01 0x0026 +#define QMI_WLFW_M3_INFO_RESP_V01 0x003C +#define QMI_WLFW_CAL_REPORT_RESP_V01 0x0026 +#define QMI_WLFW_MAC_ADDR_RESP_V01 0x0033 +#define QMI_WLFW_DYNAMIC_FEATURE_MASK_RESP_V01 0x003B +#define QMI_WLFW_IND_REGISTER_REQ_V01 0x0020 +#define QMI_WLFW_DYNAMIC_FEATURE_MASK_REQ_V01 0x003B +#define QMI_WLFW_QDSS_TRACE_MODE_RESP_V01 0x0045 +#define QMI_WLFW_FW_READY_IND_V01 0x0021 +#define QMI_WLFW_QDSS_TRACE_MEM_INFO_RESP_V01 0x0040 +#define QMI_WLFW_CAL_UPDATE_REQ_V01 0x0029 +#define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035 +#define QMI_WLFW_QDSS_TRACE_DATA_RESP_V01 0x0042 +#define QMI_WLFW_RESPOND_MEM_RESP_V01 0x0036 +#define QMI_WLFW_VBATT_RESP_V01 0x0032 +#define QMI_WLFW_QDSS_TRACE_MODE_REQ_V01 0x0045 +#define QMI_WLFW_CAL_DOWNLOAD_REQ_V01 0x0027 +#define QMI_WLFW_IND_REGISTER_RESP_V01 0x0020 +#define QMI_WLFW_CAL_UPDATE_RESP_V01 0x0029 +#define QMI_WLFW_M3_INFO_REQ_V01 0x003C #define QMI_WLFW_PCIE_GEN_SWITCH_REQ_V01 0x0053 +#define QMI_WLFW_ANTENNA_GRANT_RESP_V01 0x0048 +#define QMI_WLFW_INITIATE_CAL_UPDATE_IND_V01 0x002A +#define QMI_WLFW_RESPOND_MEM_REQ_V01 0x0036 +#define QMI_WLFW_HOST_CAP_RESP_V01 0x0034 +#define QMI_WLFW_MSA_READY_IND_V01 0x002B +#define QMI_WLFW_WLAN_MODE_REQ_V01 0x0022 +#define QMI_WLFW_WLAN_CFG_RESP_V01 0x0023 +#define QMI_WLFW_REJUVENATE_IND_V01 0x0039 +#define QMI_WLFW_ATHDIAG_WRITE_REQ_V01 0x0031 +#define QMI_WLFW_SOC_WAKE_REQ_V01 0x004F +#define QMI_WLFW_PIN_CONNECT_RESULT_IND_V01 0x002C +#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_RESP_V01 0x004E +#define QMI_WLFW_QDSS_TRACE_SAVE_IND_V01 0x0041 +#define QMI_WLFW_BDF_DOWNLOAD_RESP_V01 0x0025 +#define QMI_WLFW_REJUVENATE_ACK_RESP_V01 0x003A +#define QMI_WLFW_MSA_INFO_RESP_V01 0x002D +#define QMI_WLFW_SHUTDOWN_REQ_V01 0x0043 +#define QMI_WLFW_VBATT_REQ_V01 0x0032 +#define QMI_WLFW_MAC_ADDR_REQ_V01 0x0033 +#define QMI_WLFW_WLAN_CFG_REQ_V01 0x0023 +#define QMI_WLFW_ANTENNA_GRANT_REQ_V01 0x0048 +#define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025 +#define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037 +#define QMI_WLFW_RESPOND_GET_INFO_IND_V01 0x004B +#define QMI_WLFW_QDSS_TRACE_DATA_REQ_V01 0x0042 +#define QMI_WLFW_CAL_DOWNLOAD_RESP_V01 0x0027 +#define QMI_WLFW_INI_RESP_V01 0x002F +#define QMI_WLFW_QDSS_TRACE_MEM_INFO_REQ_V01 0x0040 +#define QMI_WLFW_ANTENNA_SWITCH_REQ_V01 0x0047 +#define QMI_WLFW_QDSS_TRACE_REQ_MEM_IND_V01 0x003F +#define QMI_WLFW_INITIATE_CAL_DOWNLOAD_IND_V01 0x0028 +#define QMI_WLFW_ATHDIAG_WRITE_RESP_V01 0x0031 +#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_V01 0x0044 +#define QMI_WLFW_SOC_WAKE_RESP_V01 0x004F +#define QMI_WLFW_GET_INFO_RESP_V01 0x004A #define QMI_WLFW_PCIE_GEN_SWITCH_RESP_V01 0x0053 +#define QMI_WLFW_INI_REQ_V01 0x002F #define QMI_WLFW_M3_DUMP_UPLOAD_SEGMENTS_REQ_IND_V01 0x0054 +#define QMI_WLFW_MSA_READY_REQ_V01 0x002E +#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_REQ_V01 0x004E +#define QMI_WLFW_CAP_RESP_V01 0x0024 +#define QMI_WLFW_REJUVENATE_ACK_REQ_V01 0x003A +#define QMI_WLFW_ATHDIAG_READ_RESP_V01 0x0030 +#define QMI_WLFW_ANTENNA_SWITCH_RESP_V01 0x0047 +#define QMI_WLFW_DEVICE_INFO_REQ_V01 0x004C +#define QMI_WLFW_MSA_INFO_REQ_V01 0x002D +#define QMI_WLFW_HOST_CAP_REQ_V01 0x0034 +#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_V01 0x0044 +#define QMI_WLFW_GET_INFO_REQ_V01 0x004A +#define QMI_WLFW_CAL_DONE_IND_V01 0x003E +#define QMI_WLFW_M3_DUMP_UPLOAD_REQ_IND_V01 0x004D +#define QMI_WLFW_WFC_CALL_STATUS_RESP_V01 0x0049 +#define QMI_WLFW_FW_INIT_DONE_IND_V01 0x0038 +#define QMI_WLFW_POWER_SAVE_REQ_V01 0x0050 +#define QMI_WLFW_XO_CAL_IND_V01 0x003D +#define QMI_WLFW_SHUTDOWN_RESP_V01 0x0043 +#define QMI_WLFW_ATHDIAG_READ_REQ_V01 0x0030 +#define QMI_WLFW_WFC_CALL_TWT_CONFIG_IND_V01 0x0051 +#define QMI_WLFW_WLAN_MODE_RESP_V01 0x0022 +#define QMI_WLFW_WFC_CALL_STATUS_REQ_V01 0x0049 +#define QMI_WLFW_DEVICE_INFO_RESP_V01 0x004C +#define QMI_WLFW_MSA_READY_RESP_V01 0x002E +#define QMI_WLFW_QDSS_TRACE_FREE_IND_V01 0x0046 +#define QMI_WLFW_QDSS_MEM_READY_IND_V01 0x0052 -#define QMI_WLFW_MAX_NUM_CE_V01 12 -#define QMI_WLFW_MAX_NUM_SVC_V01 24 -#define QMI_WLFW_MAX_DATA_SIZE_V01 6144 #define QMI_WLFW_MAX_NUM_CAL_V01 5 -#define QMI_WLFW_MAX_STR_LEN_V01 16 -#define QMI_WLFW_MAX_NUM_SHADOW_REG_V01 24 -#define QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01 36 -#define QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01 2 -#define QMI_WLFW_MAX_NUM_MEM_CFG_V01 2 -#define QMI_WLFW_MAX_NUM_MEM_SEG_V01 52 -#define QMI_WLFW_MAX_TIMESTAMP_LEN_V01 32 -#define QMI_WLFW_MAC_ADDR_SIZE_V01 6 -#define QMI_WLFW_MAX_BUILD_ID_LEN_V01 128 -#define QMI_WLFW_FUNCTION_NAME_LEN_V01 128 -#define QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01 6144 -#define QMI_WLFW_MAX_NUM_GPIO_V01 32 -#define QMI_WLFW_MAX_WFC_CALL_STATUS_DATA_SIZE_V01 256 #define QMI_WLFW_MAX_PLATFORM_NAME_LEN_V01 64 #define QMI_WLFW_MAX_HOST_DDR_RANGE_SIZE_V01 3 -#define QMI_WLFW_MAX_M3_SEGMENTS_SIZE_V01 10 +#define QMI_WLFW_MAX_NUM_SHADOW_REG_V01 24 +#define QMI_WLFW_MAX_BUILD_ID_LEN_V01 128 #define QMI_WLFW_MAX_DEV_MEM_NUM_V01 4 -#define QMI_WLFW_MAX_NUM_MLO_CHIPS_V01 3 #define QMI_WLFW_MAX_NUM_MLO_LINKS_PER_CHIP_V01 2 +#define QMI_WLFW_MAX_NUM_SVC_V01 24 +#define QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01 2 +#define QMI_WLFW_MAC_ADDR_SIZE_V01 6 +#define QMI_WLFW_MAX_NUM_MEM_CFG_V01 2 +#define QMI_WLFW_MAX_NUM_MEM_SEG_V01 52 +#define QMI_WLFW_MAX_WFC_CALL_STATUS_DATA_SIZE_V01 256 +#define QMI_WLFW_MAX_DATA_SIZE_V01 6144 +#define QMI_WLFW_FUNCTION_NAME_LEN_V01 128 +#define QMI_WLFW_MAX_NUM_CE_V01 12 +#define QMI_WLFW_MAX_TIMESTAMP_LEN_V01 32 +#define QMI_WLFW_MAX_M3_SEGMENTS_SIZE_V01 10 +#define QMI_WLFW_MAX_STR_LEN_V01 16 +#define QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01 36 +#define QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01 6144 +#define QMI_WLFW_MAX_NUM_GPIO_V01 32 +#define QMI_WLFW_MAX_NUM_MLO_CHIPS_V01 3 enum wlfw_driver_mode_enum_v01 { WLFW_DRIVER_MODE_ENUM_MIN_VAL_V01 = INT_MIN, @@ -165,6 +165,7 @@ enum wlfw_mem_type_enum_v01 { QMI_WLFW_MEM_QDSS_V01 = 6, QMI_WLFW_MEM_HANG_DATA_V01 = 7, QMI_WLFW_MLO_GLOBAL_MEM_V01 = 8, + QMI_WLFW_PAGEABLE_MEM_V01 = 9, WLFW_MEM_TYPE_ENUM_MAX_VAL_V01 = INT_MAX, }; @@ -795,9 +796,17 @@ struct wlfw_host_cap_req_msg_v01 { struct wlfw_host_mlo_chip_info_s_v01 mlo_chip_info[QMI_WLFW_MAX_NUM_MLO_CHIPS_V01]; u8 feature_list_valid; u64 feature_list; + u8 num_wlan_clients_valid; + u16 num_wlan_clients; + u8 num_wlan_vaps_valid; + u8 num_wlan_vaps; + u8 wake_msi_addr_valid; + u32 wake_msi_addr; + u8 wlan_enable_delay_valid; + u32 wlan_enable_delay; }; -#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 373 +#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 396 extern struct qmi_elem_info wlfw_host_cap_req_msg_v01_ei[]; struct wlfw_host_cap_resp_msg_v01 { diff --git a/drivers/soc/qcom/icnss2/main.c b/drivers/soc/qcom/icnss2/main.c index 9e75f1244d08..fe065d2333b2 100644 --- a/drivers/soc/qcom/icnss2/main.c +++ b/drivers/soc/qcom/icnss2/main.c @@ -3390,11 +3390,33 @@ static ssize_t wpss_boot_store(struct device *dev, return count; } +static ssize_t wlan_en_delay_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct icnss_priv *priv = dev_get_drvdata(dev); + uint32_t wlan_en_delay = 0; + + if (priv->device_id != WCN6750_DEVICE_ID) + return count; + + if (sscanf(buf, "%du", &wlan_en_delay) != 1) { + icnss_pr_err("Failed to read wlan_en_delay"); + return -EINVAL; + } + + icnss_pr_dbg("WLAN_EN delay: %dms", wlan_en_delay); + priv->wlan_en_delay_ms = wlan_en_delay; + + return count; +} + static DEVICE_ATTR_WO(qdss_tr_start); static DEVICE_ATTR_WO(qdss_tr_stop); static DEVICE_ATTR_WO(qdss_conf_download); static DEVICE_ATTR_WO(hw_trc_override); static DEVICE_ATTR_WO(wpss_boot); +static DEVICE_ATTR_WO(wlan_en_delay); static struct attribute *icnss_attrs[] = { &dev_attr_qdss_tr_start.attr, @@ -3402,6 +3424,7 @@ static struct attribute *icnss_attrs[] = { &dev_attr_qdss_conf_download.attr, &dev_attr_hw_trc_override.attr, &dev_attr_wpss_boot.attr, + &dev_attr_wlan_en_delay.attr, NULL, }; diff --git a/drivers/soc/qcom/icnss2/main.h b/drivers/soc/qcom/icnss2/main.h index f23d45d09d12..0615d9a53896 100644 --- a/drivers/soc/qcom/icnss2/main.h +++ b/drivers/soc/qcom/icnss2/main.h @@ -454,6 +454,7 @@ struct icnss_priv { u32 hw_trc_override; struct icnss_dms_data dms; u8 use_nv_mac; + u32 wlan_en_delay_ms; }; struct icnss_reg_info { diff --git a/drivers/soc/qcom/icnss2/qmi.c b/drivers/soc/qcom/icnss2/qmi.c index d9b99c2c485a..b1b0de53ce51 100644 --- a/drivers/soc/qcom/icnss2/qmi.c +++ b/drivers/soc/qcom/icnss2/qmi.c @@ -656,7 +656,9 @@ int wlfw_cap_send_sync_msg(struct icnss_priv *priv) goto out; } - ret = qmi_txn_wait(&txn, priv->ctrl_params.qmi_timeout); + ret = qmi_txn_wait(&txn, + priv->ctrl_params.qmi_timeout + + msecs_to_jiffies(priv->wlan_en_delay_ms)); if (ret < 0) { icnss_qmi_fatal_err("Capability resp wait failed with ret %d\n", ret); @@ -1409,7 +1411,9 @@ int wlfw_wlan_mode_send_sync_msg(struct icnss_priv *priv, goto out; } - ret = qmi_txn_wait(&txn, priv->ctrl_params.qmi_timeout); + ret = qmi_txn_wait(&txn, + priv->ctrl_params.qmi_timeout + + msecs_to_jiffies(priv->wlan_en_delay_ms)); if (ret < 0) { icnss_qmi_fatal_err("Mode resp wait failed with ret %d\n", ret); goto out; @@ -3132,6 +3136,13 @@ int wlfw_host_cap_send_sync(struct icnss_priv *priv) req->host_build_type_valid = 1; req->host_build_type = icnss_get_host_build_type(); + if (priv->wlan_en_delay_ms >= 100) { + icnss_pr_dbg("Setting WLAN_EN delay: %d ms\n", + priv->wlan_en_delay_ms); + req->wlan_enable_delay_valid = 1; + req->wlan_enable_delay = priv->wlan_en_delay_ms; + } + ret = qmi_txn_init(&priv->qmi, &txn, wlfw_host_cap_resp_msg_v01_ei, resp); if (ret < 0) {