Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30917b5c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "icnss: Update QMI header file for PCIE gen switch and bdf data"

parents 6e2cb5da 9940366f

drivers/soc/qcom/wlan_firmware_service_v01.c

+76 −1
Original line number Diff line number Diff line
@@ -1431,6 +1431,24 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = { 
		.elem_size      = sizeof(u8),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1A,

		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,

					   fw_caps_valid),

	},

	{

		.data_type      = QMI_UNSIGNED_8_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u64),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1A,

		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,

					   fw_caps),

	},

	{

		.data_type      = QMI_OPT_FLAG,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1B,

		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,

					   rd_card_chain_cap_valid),

	},
@@ -1439,7 +1457,7 @@ struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[] = { 
		.elem_len       = 1,

		.elem_size      = sizeof(enum wlfw_rd_card_chain_cap_v01),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x1A,

		.tlv_type       = 0x1B,

		.offset         = offsetof(struct wlfw_cap_resp_msg_v01,

					   rd_card_chain_cap),

	},
@@ -1596,6 +1614,26 @@ struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[] = { 
					   resp),

		.ei_array      = qmi_response_type_v01_ei,

	},

	{

		.data_type      = QMI_OPT_FLAG,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x10,

		.offset         = offsetof(struct

				  wlfw_bdf_download_resp_msg_v01,

				  host_bdf_data_valid),

	},

	{

		.data_type      = QMI_UNSIGNED_8_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u64),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x10,

		.offset         = offsetof(struct

				  wlfw_bdf_download_resp_msg_v01,

				  host_bdf_data),

	},

	{

		.data_type      = QMI_EOTI,

		.array_type       = NO_ARRAY,
@@ -4486,3 +4524,40 @@ struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[] = { 
	},

};



struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[] = {

	{

		.data_type      = QMI_SIGNED_4_BYTE_ENUM,

		.elem_len       = 1,

		.elem_size      = sizeof(enum wlfw_pcie_gen_speed_v01),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x01,

		.offset         = offsetof(struct

				  wlfw_pcie_gen_switch_req_msg_v01,

				  pcie_speed),

	},

	{

		.data_type      = QMI_EOTI,

		.array_type       = NO_ARRAY,

		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};



struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[] = {

	{

		.data_type      = QMI_STRUCT,

		.elem_len       = 1,

		.elem_size      = sizeof(struct qmi_response_type_v01),

		.array_type       = NO_ARRAY,

		.tlv_type       = 0x02,

		.offset         = offsetof(struct

				  wlfw_pcie_gen_switch_resp_msg_v01,

				  resp),

		.ei_array      = qmi_response_type_v01_ei,

	},

	{

		.data_type      = QMI_EOTI,

		.array_type       = NO_ARRAY,

		.tlv_type       = QMI_COMMON_TLV_TYPE,

	},

};

drivers/soc/qcom/wlan_firmware_service_v01.h

+92 −60
Original line number Diff line number Diff line
@@ -9,90 +9,92 @@ 
#define WLFW_SERVICE_ID_V01 0x45

#define WLFW_SERVICE_VERS_V01 0x01



#define QMI_WLFW_WFC_CALL_STATUS_REQ_V01 0x0049

#define QMI_WLFW_DEVICE_INFO_RESP_V01 0x004C

#define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025

#define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037

#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_V01 0x0044

#define QMI_WLFW_GET_INFO_REQ_V01 0x004A

#define QMI_WLFW_INITIATE_CAL_UPDATE_IND_V01 0x002A

#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_HOST_CAP_REQ_V01 0x0034

#define QMI_WLFW_QDSS_MEM_READY_IND_V01 0x0052

#define QMI_WLFW_DYNAMIC_FEATURE_MASK_RESP_V01 0x003B

#define QMI_WLFW_M3_INFO_REQ_V01 0x003C

#define QMI_WLFW_CAL_UPDATE_REQ_V01 0x0029

#define QMI_WLFW_CAP_REQ_V01 0x0024

#define QMI_WLFW_FW_INIT_DONE_IND_V01 0x0038

#define QMI_WLFW_ANTENNA_GRANT_RESP_V01 0x0048

#define QMI_WLFW_CAL_REPORT_REQ_V01 0x0026

#define QMI_WLFW_RESPOND_GET_INFO_IND_V01 0x004B

#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_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_EXIT_POWER_SAVE_RESP_V01 0x0050

#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_XO_CAL_IND_V01 0x003D

#define QMI_WLFW_INI_RESP_V01 0x002F

#define QMI_WLFW_CAL_REPORT_RESP_V01 0x0026

#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_SHUTDOWN_RESP_V01 0x0043

#define QMI_WLFW_MAC_ADDR_RESP_V01 0x0033

#define QMI_WLFW_INITIATE_CAL_DOWNLOAD_IND_V01 0x0028

#define QMI_WLFW_HOST_CAP_RESP_V01 0x0034

#define QMI_WLFW_MSA_READY_IND_V01 0x002B

#define QMI_WLFW_ATHDIAG_WRITE_RESP_V01 0x0031

#define QMI_WLFW_EXIT_POWER_SAVE_REQ_V01 0x0050

#define QMI_WLFW_WLAN_MODE_REQ_V01 0x0022

#define QMI_WLFW_IND_REGISTER_REQ_V01 0x0020

#define QMI_WLFW_WLAN_CFG_RESP_V01 0x0023

#define QMI_WLFW_QDSS_TRACE_MODE_REQ_V01 0x0045

#define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035

#define QMI_WLFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_V01 0x0044

#define QMI_WLFW_SOC_WAKE_RESP_V01 0x004F

#define QMI_WLFW_REJUVENATE_IND_V01 0x0039

#define QMI_WLFW_DYNAMIC_FEATURE_MASK_REQ_V01 0x003B

#define QMI_WLFW_ATHDIAG_WRITE_REQ_V01 0x0031

#define QMI_WLFW_WLAN_MODE_RESP_V01 0x0022

#define QMI_WLFW_RESPOND_MEM_REQ_V01 0x0036

#define QMI_WLFW_GET_INFO_RESP_V01 0x004A

#define QMI_WLFW_QDSS_TRACE_MODE_RESP_V01 0x0045

#define QMI_WLFW_PIN_CONNECT_RESULT_IND_V01 0x002C

#define QMI_WLFW_FW_READY_IND_V01 0x0021

#define QMI_WLFW_QDSS_TRACE_SAVE_IND_V01 0x0041

#define QMI_WLFW_QDSS_TRACE_MEM_INFO_RESP_V01 0x0040

#define QMI_WLFW_ANTENNA_GRANT_REQ_V01 0x0048

#define QMI_WLFW_MSA_READY_RESP_V01 0x002E

#define QMI_WLFW_QDSS_TRACE_DATA_REQ_V01 0x0042

#define QMI_WLFW_CAL_UPDATE_REQ_V01 0x0029

#define QMI_WLFW_PCIE_GEN_SWITCH_RESP_V01 0x0053

#define QMI_WLFW_INI_REQ_V01 0x002F

#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_MSA_READY_REQ_V01 0x002E

#define QMI_WLFW_QDSS_TRACE_DATA_RESP_V01 0x0042

#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_REQ_V01 0x004E

#define QMI_WLFW_CAP_RESP_V01 0x0024

#define QMI_WLFW_SOC_WAKE_REQ_V01 0x004F

#define QMI_WLFW_REJUVENATE_ACK_REQ_V01 0x003A

#define QMI_WLFW_ATHDIAG_READ_RESP_V01 0x0030

#define QMI_WLFW_SHUTDOWN_REQ_V01 0x0043

#define QMI_WLFW_VBATT_REQ_V01 0x0032

#define QMI_WLFW_ANTENNA_SWITCH_RESP_V01 0x0047

#define QMI_WLFW_DEVICE_INFO_REQ_V01 0x004C

#define QMI_WLFW_MAC_ADDR_REQ_V01 0x0033

#define QMI_WLFW_EXIT_POWER_SAVE_RESP_V01 0x0050

#define QMI_WLFW_RESPOND_MEM_RESP_V01 0x0036

#define QMI_WLFW_WFC_CALL_TWT_CONFIG_IND_V01 0x0051

#define QMI_WLFW_VBATT_RESP_V01 0x0032

#define QMI_WLFW_MSA_INFO_REQ_V01 0x002D

#define QMI_WLFW_QDSS_TRACE_FREE_IND_V01 0x0046

#define QMI_WLFW_CAL_DOWNLOAD_REQ_V01 0x0027

#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_XO_CAL_IND_V01 0x003D

#define QMI_WLFW_SHUTDOWN_RESP_V01 0x0043

#define QMI_WLFW_ATHDIAG_READ_REQ_V01 0x0030

#define QMI_WLFW_WLAN_CFG_REQ_V01 0x0023

#define QMI_WLFW_IND_REGISTER_RESP_V01 0x0020

#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_MEMORY_REGIONS_V01 2

#define QMI_WLFW_MAX_NUM_MEM_SEG_V01 32
@@ -207,6 +209,15 @@ enum wlfw_rd_card_chain_cap_v01 { 
	WLFW_RD_CARD_CHAIN_CAP_MAX_VAL_V01 = INT_MAX,

};



enum wlfw_pcie_gen_speed_v01 {

	WLFW_PCIE_GEN_SPEED_MIN_VAL_V01 = INT_MIN,

	QMI_PCIE_GEN_SPEED_INVALID_V01 = 0,

	QMI_PCIE_GEN_SPEED_1_V01 = 1,

	QMI_PCIE_GEN_SPEED_2_V01 = 2,

	QMI_PCIE_GEN_SPEED_3_V01 = 3,

	WLFW_PCIE_GEN_SPEED_MAX_VAL_V01 = INT_MAX,

};



#define QMI_WLFW_CE_ATTR_FLAGS_V01 ((u32)0x00)

#define QMI_WLFW_CE_ATTR_NO_SNOOP_V01 ((u32)0x01)

#define QMI_WLFW_CE_ATTR_BYTE_SWAP_DATA_V01 ((u32)0x02)
@@ -222,6 +233,11 @@ enum wlfw_rd_card_chain_cap_v01 { 


#define QMI_WLFW_FW_REJUVENATE_V01 ((u64)0x01ULL)



#define QMI_WLFW_HW_XPA_V01 ((u64)0x01ULL)

#define QMI_WLFW_CBC_FILE_DOWNLOAD_V01 ((u64)0x02ULL)



#define QMI_WLFW_HOST_PCIE_GEN_SWITCH_V01 ((u64)0x01ULL)



struct wlfw_ce_tgt_pipe_cfg_s_v01 {

	u32 pipe_num;

	enum wlfw_pipedir_enum_v01 pipe_dir;
@@ -455,10 +471,12 @@ struct wlfw_cap_resp_msg_v01 { 
	u32 otp_version;

	u8 eeprom_caldata_read_timeout_valid;

	u32 eeprom_caldata_read_timeout;

	u8 fw_caps_valid;

	u64 fw_caps;

	u8 rd_card_chain_cap_valid;

	enum wlfw_rd_card_chain_cap_v01 rd_card_chain_cap;

};

#define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 242

#define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 253

extern struct qmi_elem_info wlfw_cap_resp_msg_v01_ei[];



struct wlfw_bdf_download_req_msg_v01 {
@@ -482,8 +500,10 @@ extern struct qmi_elem_info wlfw_bdf_download_req_msg_v01_ei[]; 


struct wlfw_bdf_download_resp_msg_v01 {

	struct qmi_response_type_v01 resp;

	u8 host_bdf_data_valid;

	u64 host_bdf_data;

};

#define WLFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 7

#define WLFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 18

extern struct qmi_elem_info wlfw_bdf_download_resp_msg_v01_ei[];



struct wlfw_cal_report_req_msg_v01 {
@@ -1092,4 +1112,16 @@ struct wlfw_qdss_mem_ready_ind_msg_v01 { 
#define WLFW_QDSS_MEM_READY_IND_MSG_V01_MAX_MSG_LEN 0

extern struct qmi_elem_info wlfw_qdss_mem_ready_ind_msg_v01_ei[];



struct wlfw_pcie_gen_switch_req_msg_v01 {

	enum wlfw_pcie_gen_speed_v01 pcie_speed;

};

#define WLFW_PCIE_GEN_SWITCH_REQ_MSG_V01_MAX_MSG_LEN 7

extern struct qmi_elem_info wlfw_pcie_gen_switch_req_msg_v01_ei[];



struct wlfw_pcie_gen_switch_resp_msg_v01 {

	struct qmi_response_type_v01 resp;

};

#define WLFW_PCIE_GEN_SWITCH_RESP_MSG_V01_MAX_MSG_LEN 7

extern struct qmi_elem_info wlfw_pcie_gen_switch_resp_msg_v01_ei[];



#endif