Merge "cnss2: Update QMI WLFW header files" (51a743a3) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/cnss2/wlan_firmware_service_v01.c

+38 −2

Original line number	Diff line number	Diff line
		@@ -899,6 +899,24 @@ struct elem_info wlfw_cap_resp_msg_v01_ei[] = {
		.offset = offsetof(struct wlfw_cap_resp_msg_v01,
		fw_build_id),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x15,
		.offset = offsetof(struct wlfw_cap_resp_msg_v01,
		num_macs_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x15,
		.offset = offsetof(struct wlfw_cap_resp_msg_v01,
		num_macs),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		@@ -1015,6 +1033,24 @@ struct elem_info wlfw_bdf_download_req_msg_v01_ei[] = {
		.offset = offsetof(struct wlfw_bdf_download_req_msg_v01,
		end),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x15,
		.offset = offsetof(struct wlfw_bdf_download_req_msg_v01,
		bdf_type_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x15,
		.offset = offsetof(struct wlfw_bdf_download_req_msg_v01,
		bdf_type),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		@@ -1611,7 +1647,7 @@ struct elem_info wlfw_athdiag_read_resp_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = QMI_WLFW_MAX_DATA_SIZE_V01,
		.elem_len = QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01,
		.elem_size = sizeof(uint8_t),
		.is_array = VAR_LEN_ARRAY,
		.tlv_type = 0x10,
		@@ -1659,7 +1695,7 @@ struct elem_info wlfw_athdiag_write_req_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = QMI_WLFW_MAX_DATA_SIZE_V01,
		.elem_len = QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01,
		.elem_size = sizeof(uint8_t),
		.is_array = VAR_LEN_ARRAY,
		.tlv_type = 0x03,

drivers/net/wireless/cnss2/wlan_firmware_service_v01.h

+11 −6

Original line number	Diff line number	Diff line
		@@ -76,6 +76,7 @@
		#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_ATHDIAG_DATA_SIZE_V01 512
		#define QMI_WLFW_MAX_BUILD_ID_LEN_V01 128
		#define QMI_WLFW_MAX_STR_LEN_V01 16
		#define QMI_WLFW_MAX_NUM_SHADOW_REG_V01 24
		@@ -301,9 +302,11 @@ struct wlfw_cap_resp_msg_v01 {
		struct wlfw_fw_version_info_s_v01 fw_version_info;
		uint8_t fw_build_id_valid;
		char fw_build_id[QMI_WLFW_MAX_BUILD_ID_LEN_V01 + 1];
		uint8_t num_macs_valid;
		uint8_t num_macs;
		};

		#define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 203
		#define WLFW_CAP_RESP_MSG_V01_MAX_MSG_LEN 207
		extern struct elem_info wlfw_cap_resp_msg_v01_ei[];

		struct wlfw_bdf_download_req_msg_v01 {
		@@ -319,9 +322,11 @@ struct wlfw_bdf_download_req_msg_v01 {
		uint8_t data[QMI_WLFW_MAX_DATA_SIZE_V01];
		uint8_t end_valid;
		uint8_t end;
		uint8_t bdf_type_valid;
		uint8_t bdf_type;
		};

		#define WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6178
		#define WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6182
		extern struct elem_info wlfw_bdf_download_req_msg_v01_ei[];

		struct wlfw_bdf_download_resp_msg_v01 {
		@@ -472,20 +477,20 @@ struct wlfw_athdiag_read_resp_msg_v01 {
		struct qmi_response_type_v01 resp;
		uint8_t data_valid;
		uint32_t data_len;
		uint8_t data[QMI_WLFW_MAX_DATA_SIZE_V01];
		uint8_t data[QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01];
		};

		#define WLFW_ATHDIAG_READ_RESP_MSG_V01_MAX_MSG_LEN 6156
		#define WLFW_ATHDIAG_READ_RESP_MSG_V01_MAX_MSG_LEN 524
		extern struct elem_info wlfw_athdiag_read_resp_msg_v01_ei[];

		struct wlfw_athdiag_write_req_msg_v01 {
		uint32_t offset;
		uint32_t mem_type;
		uint32_t data_len;
		uint8_t data[QMI_WLFW_MAX_DATA_SIZE_V01];
		uint8_t data[QMI_WLFW_MAX_ATHDIAG_DATA_SIZE_V01];
		};

		#define WLFW_ATHDIAG_WRITE_REQ_MSG_V01_MAX_MSG_LEN 6163
		#define WLFW_ATHDIAG_WRITE_REQ_MSG_V01_MAX_MSG_LEN 531
		extern struct elem_info wlfw_athdiag_write_req_msg_v01_ei[];

		struct wlfw_athdiag_write_resp_msg_v01 {