Merge "icnss: Update ICNSS platform driver" into msm-4.8 (ea0e2b67) · Commits · e / devices / android_kernel_fairphone_FP3

Documentation/devicetree/bindings/cnss/icnss.txt

+0 −12

Original line number	Diff line number	Diff line
		@@ -12,17 +12,9 @@ Required properties:
		- reg-names: Names of the memory regions defined in reg entry
		- interrupts: Copy engine interrupt table
		- qcom,wlan-msa-memory: MSA memory size
		- clocks: List of clock phandles
		- clock-names: List of clock names corresponding to the "clocks" property
		- iommus: SMMUs and corresponding Stream IDs needed by WLAN
		- qcom,wlan-smmu-iova-address: I/O virtual address range as <start length>
		format to be used for allocations associated between WLAN and SMMU
		- <supply-name>-supply: phandle to the regulator device tree node
		Required "supply-name" is "vdd-0.8-cx-mx".
		- qcom,<supply>-config - specifies voltage levels for supply. Should be
		specified in pairs (min, max), units uV. There can
		be optional load in uA and Regulator settle delay in
		uS.

		Optional properties:
		- qcom,icnss-vadc: VADC handle for vph_pwr read APIs.
		@@ -34,8 +26,6 @@ Example:
		compatible = "qcom,icnss";
		reg = <0x0a000000 0x1000000>;
		reg-names = "membase";
		clocks = <&clock_gcc clk_aggre2_noc_clk>;
		clock-names = "smmu_aggre2_noc_clk";
		iommus = <&anoc2_smmu 0x1900>,
		<&anoc2_smmu 0x1901>;
		qcom,wlan-smmu-iova-address = <0 0x10000000>;
		@@ -53,6 +43,4 @@ Example:
		<0 140 0 /* CE10 */ >,
		<0 141 0 /* CE11 */ >;
		qcom,wlan-msa-memory = <0x200000>;
		vdd-0.8-cx-mx-supply = <&pm8998_l5>;
		qcom,vdd-0.8-cx-mx-config = <800000 800000 2400 1000>;
		};

drivers/soc/qcom/icnss.c

+427 −1190

File changed.

Preview size limit exceeded, changes collapsed.

drivers/soc/qcom/wlan_firmware_service_v01.c

+435 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -130,6 +130,23 @@ static struct elem_info wlfw_shadow_reg_cfg_s_v01_ei[] = {
		},
		};

		static struct elem_info wlfw_shadow_reg_v2_cfg_s_v01_ei[] = {
		{
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0,
		.offset = offsetof(struct wlfw_shadow_reg_v2_cfg_s_v01,
		addr),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		static struct elem_info wlfw_memory_region_info_s_v01_ei[] = {
		{
		.data_type = QMI_UNSIGNED_8_BYTE,
		@@ -360,6 +377,78 @@ struct elem_info wlfw_ind_register_req_msg_v01_ei[] = {
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		client_id),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x16,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		request_mem_enable_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x16,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		request_mem_enable),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x17,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		fw_mem_ready_enable_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x17,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		fw_mem_ready_enable),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x18,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		cold_boot_cal_done_enable_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x18,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		cold_boot_cal_done_enable),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x19,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		rejuvenate_enable_valid),
		},
		{
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x19,
		.offset = offsetof(struct wlfw_ind_register_req_msg_v01,
		rejuvenate_enable),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		@@ -646,6 +735,34 @@ struct elem_info wlfw_wlan_cfg_req_msg_v01_ei[] = {
		shadow_reg),
		.ei_array = wlfw_shadow_reg_cfg_s_v01_ei,
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x14,
		.offset = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
		shadow_reg_v2_valid),
		},
		{
		.data_type = QMI_DATA_LEN,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x14,
		.offset = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
		shadow_reg_v2_len),
		},
		{
		.data_type = QMI_STRUCT,
		.elem_len = QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01,
		.elem_size = sizeof(struct wlfw_shadow_reg_v2_cfg_s_v01),
		.is_array = VAR_LEN_ARRAY,
		.tlv_type = 0x14,
		.offset = offsetof(struct wlfw_wlan_cfg_req_msg_v01,
		shadow_reg_v2),
		.ei_array = wlfw_shadow_reg_v2_cfg_s_v01_ei,
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		@@ -978,8 +1095,7 @@ struct elem_info wlfw_initiate_cal_download_ind_msg_v01_ei[] = {
		.is_array = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(
		struct
		wlfw_initiate_cal_download_ind_msg_v01,
		struct wlfw_initiate_cal_download_ind_msg_v01,
		cal_id),
		},
		{
		@@ -1657,3 +1773,318 @@ struct elem_info wlfw_mac_addr_resp_msg_v01_ei[] = {
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_host_cap_req_msg_v01_ei[] = {
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct wlfw_host_cap_req_msg_v01,
		daemon_support_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct wlfw_host_cap_req_msg_v01,
		daemon_support),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_host_cap_resp_msg_v01_ei[] = {
		{
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct wlfw_host_cap_resp_msg_v01,
		resp),
		.ei_array = get_qmi_response_type_v01_ei(),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_request_mem_ind_msg_v01_ei[] = {
		{
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct wlfw_request_mem_ind_msg_v01,
		size),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_respond_mem_req_msg_v01_ei[] = {
		{
		.data_type = QMI_UNSIGNED_8_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint64_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct wlfw_respond_mem_req_msg_v01,
		addr),
		},
		{
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct wlfw_respond_mem_req_msg_v01,
		size),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_respond_mem_resp_msg_v01_ei[] = {
		{
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct wlfw_respond_mem_resp_msg_v01,
		resp),
		.ei_array = get_qmi_response_type_v01_ei(),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_fw_mem_ready_ind_msg_v01_ei[] = {
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_cold_boot_cal_done_ind_msg_v01_ei[] = {
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_rejuvenate_ind_msg_v01_ei[] = {
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		cause_for_rejuvenation_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		cause_for_rejuvenation),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x11,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		requesting_sub_system_valid),
		},
		{
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x11,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		requesting_sub_system),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x12,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		line_number_valid),
		},
		{
		.data_type = QMI_UNSIGNED_2_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint16_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x12,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		line_number),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x13,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		function_name_valid),
		},
		{
		.data_type = QMI_STRING,
		.elem_len = QMI_WLFW_FUNCTION_NAME_LEN_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.tlv_type = 0x13,
		.offset = offsetof(struct wlfw_rejuvenate_ind_msg_v01,
		function_name),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[] = {
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[] = {
		{
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(
		struct wlfw_rejuvenate_ack_resp_msg_v01,
		resp),
		.ei_array = get_qmi_response_type_v01_ei(),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[] = {
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		wlfw_dynamic_feature_mask_req_msg_v01,
		mask_valid),
		},
		{
		.data_type = QMI_UNSIGNED_8_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint64_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(
		struct wlfw_dynamic_feature_mask_req_msg_v01,
		mask),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

		struct elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[] = {
		{
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(
		struct wlfw_dynamic_feature_mask_resp_msg_v01,
		resp),
		.ei_array = get_qmi_response_type_v01_ei(),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(
		struct wlfw_dynamic_feature_mask_resp_msg_v01,
		prev_mask_valid),
		},
		{
		.data_type = QMI_UNSIGNED_8_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint64_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(
		struct wlfw_dynamic_feature_mask_resp_msg_v01,
		prev_mask),
		},
		{
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x11,
		.offset = offsetof(
		struct wlfw_dynamic_feature_mask_resp_msg_v01,
		curr_mask_valid),
		},
		{
		.data_type = QMI_UNSIGNED_8_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint64_t),
		.is_array = NO_ARRAY,
		.tlv_type = 0x11,
		.offset = offsetof(
		struct wlfw_dynamic_feature_mask_resp_msg_v01,
		curr_mask),
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		},
		};

drivers/soc/qcom/wlan_firmware_service_v01.h

+125 −5

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -17,7 +17,10 @@
		#define WLFW_SERVICE_VERS_V01 0x01

		#define QMI_WLFW_BDF_DOWNLOAD_REQ_V01 0x0025
		#define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037
		#define QMI_WLFW_INITIATE_CAL_UPDATE_IND_V01 0x002A
		#define QMI_WLFW_HOST_CAP_REQ_V01 0x0034
		#define QMI_WLFW_DYNAMIC_FEATURE_MASK_RESP_V01 0x003B
		#define QMI_WLFW_CAP_REQ_V01 0x0024
		#define QMI_WLFW_CAL_REPORT_REQ_V01 0x0026
		#define QMI_WLFW_CAL_UPDATE_RESP_V01 0x0029
		@@ -26,25 +29,34 @@
		#define QMI_WLFW_CAL_REPORT_RESP_V01 0x0026
		#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_WLAN_MODE_REQ_V01 0x0022
		#define QMI_WLFW_IND_REGISTER_REQ_V01 0x0020
		#define QMI_WLFW_WLAN_CFG_RESP_V01 0x0023
		#define QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01 0x0038
		#define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035
		#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_PIN_CONNECT_RESULT_IND_V01 0x002C
		#define QMI_WLFW_FW_READY_IND_V01 0x0021
		#define QMI_WLFW_MSA_READY_RESP_V01 0x002E
		#define QMI_WLFW_CAL_UPDATE_REQ_V01 0x0029
		#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_CAP_RESP_V01 0x0024
		#define QMI_WLFW_REJUVENATE_ACK_REQ_V01 0x003A
		#define QMI_WLFW_ATHDIAG_READ_RESP_V01 0x0030
		#define QMI_WLFW_VBATT_REQ_V01 0x0032
		#define QMI_WLFW_MAC_ADDR_REQ_V01 0x0033
		#define QMI_WLFW_RESPOND_MEM_RESP_V01 0x0036
		#define QMI_WLFW_VBATT_RESP_V01 0x0032
		#define QMI_WLFW_MSA_INFO_REQ_V01 0x002D
		#define QMI_WLFW_CAL_DOWNLOAD_REQ_V01 0x0027
		@@ -55,12 +67,14 @@
		#define QMI_WLFW_MAX_NUM_MEMORY_REGIONS_V01 2
		#define QMI_WLFW_MAX_NUM_CAL_V01 5
		#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_BUILD_ID_LEN_V01 128
		#define QMI_WLFW_MAX_STR_LEN_V01 16
		#define QMI_WLFW_MAX_NUM_SHADOW_REG_V01 24
		#define QMI_WLFW_MAC_ADDR_SIZE_V01 6
		#define QMI_WLFW_MAX_BUILD_ID_LEN_V01 128
		#define QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01 36
		#define QMI_WLFW_MAX_NUM_SVC_V01 24

		enum wlfw_driver_mode_enum_v01 {
		@@ -72,6 +86,7 @@ enum wlfw_driver_mode_enum_v01 {
		QMI_WLFW_OFF_V01 = 4,
		QMI_WLFW_CCPM_V01 = 5,
		QMI_WLFW_QVIT_V01 = 6,
		QMI_WLFW_CALIBRATION_V01 = 7,
		WLFW_DRIVER_MODE_ENUM_MAX_VAL_V01 = INT_MAX,
		};

		@@ -104,6 +119,9 @@ enum wlfw_pipedir_enum_v01 {
		#define QMI_WLFW_ALREADY_REGISTERED_V01 ((uint64_t)0x01ULL)
		#define QMI_WLFW_FW_READY_V01 ((uint64_t)0x02ULL)
		#define QMI_WLFW_MSA_READY_V01 ((uint64_t)0x04ULL)
		#define QMI_WLFW_FW_MEM_READY_V01 ((uint64_t)0x08ULL)

		#define QMI_WLFW_FW_REJUVENATE_V01 ((uint64_t)0x01ULL)

		struct wlfw_ce_tgt_pipe_cfg_s_v01 {
		uint32_t pipe_num;
		@@ -124,6 +142,10 @@ struct wlfw_shadow_reg_cfg_s_v01 {
		uint16_t offset;
		};

		struct wlfw_shadow_reg_v2_cfg_s_v01 {
		uint32_t addr;
		};

		struct wlfw_memory_region_info_s_v01 {
		uint64_t region_addr;
		uint32_t size;
		@@ -161,8 +183,16 @@ struct wlfw_ind_register_req_msg_v01 {
		uint8_t pin_connect_result_enable;
		uint8_t client_id_valid;
		uint32_t client_id;
		};
		#define WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN 27
		uint8_t request_mem_enable_valid;
		uint8_t request_mem_enable;
		uint8_t fw_mem_ready_enable_valid;
		uint8_t fw_mem_ready_enable;
		uint8_t cold_boot_cal_done_enable_valid;
		uint8_t cold_boot_cal_done_enable;
		uint8_t rejuvenate_enable_valid;
		uint32_t rejuvenate_enable;
		};
		#define WLFW_IND_REGISTER_REQ_MSG_V01_MAX_MSG_LEN 46
		extern struct elem_info wlfw_ind_register_req_msg_v01_ei[];

		struct wlfw_ind_register_resp_msg_v01 {
		@@ -223,8 +253,12 @@ struct wlfw_wlan_cfg_req_msg_v01 {
		uint32_t shadow_reg_len;
		struct wlfw_shadow_reg_cfg_s_v01
		shadow_reg[QMI_WLFW_MAX_NUM_SHADOW_REG_V01];
		uint8_t shadow_reg_v2_valid;
		uint32_t shadow_reg_v2_len;
		struct wlfw_shadow_reg_v2_cfg_s_v01
		shadow_reg_v2[QMI_WLFW_MAX_NUM_SHADOW_REG_V2_V01];
		};
		#define WLFW_WLAN_CFG_REQ_MSG_V01_MAX_MSG_LEN 655
		#define WLFW_WLAN_CFG_REQ_MSG_V01_MAX_MSG_LEN 803
		extern struct elem_info wlfw_wlan_cfg_req_msg_v01_ei[];

		struct wlfw_wlan_cfg_resp_msg_v01 {
		@@ -449,4 +483,90 @@ struct wlfw_mac_addr_resp_msg_v01 {
		#define WLFW_MAC_ADDR_RESP_MSG_V01_MAX_MSG_LEN 7
		extern struct elem_info wlfw_mac_addr_resp_msg_v01_ei[];

		struct wlfw_host_cap_req_msg_v01 {
		uint8_t daemon_support_valid;
		uint8_t daemon_support;
		};
		#define WLFW_HOST_CAP_REQ_MSG_V01_MAX_MSG_LEN 4
		extern struct elem_info wlfw_host_cap_req_msg_v01_ei[];

		struct wlfw_host_cap_resp_msg_v01 {
		struct qmi_response_type_v01 resp;
		};
		#define WLFW_HOST_CAP_RESP_MSG_V01_MAX_MSG_LEN 7
		extern struct elem_info wlfw_host_cap_resp_msg_v01_ei[];

		struct wlfw_request_mem_ind_msg_v01 {
		uint32_t size;
		};
		#define WLFW_REQUEST_MEM_IND_MSG_V01_MAX_MSG_LEN 7
		extern struct elem_info wlfw_request_mem_ind_msg_v01_ei[];

		struct wlfw_respond_mem_req_msg_v01 {
		uint64_t addr;
		uint32_t size;
		};
		#define WLFW_RESPOND_MEM_REQ_MSG_V01_MAX_MSG_LEN 18
		extern struct elem_info wlfw_respond_mem_req_msg_v01_ei[];

		struct wlfw_respond_mem_resp_msg_v01 {
		struct qmi_response_type_v01 resp;
		};
		#define WLFW_RESPOND_MEM_RESP_MSG_V01_MAX_MSG_LEN 7
		extern struct elem_info wlfw_respond_mem_resp_msg_v01_ei[];

		struct wlfw_fw_mem_ready_ind_msg_v01 {
		char placeholder;
		};
		#define WLFW_FW_MEM_READY_IND_MSG_V01_MAX_MSG_LEN 0
		extern struct elem_info wlfw_fw_mem_ready_ind_msg_v01_ei[];

		struct wlfw_cold_boot_cal_done_ind_msg_v01 {
		char placeholder;
		};
		#define WLFW_COLD_BOOT_CAL_DONE_IND_MSG_V01_MAX_MSG_LEN 0
		extern struct elem_info wlfw_cold_boot_cal_done_ind_msg_v01_ei[];

		struct wlfw_rejuvenate_ind_msg_v01 {
		uint8_t cause_for_rejuvenation_valid;
		uint8_t cause_for_rejuvenation;
		uint8_t requesting_sub_system_valid;
		uint8_t requesting_sub_system;
		uint8_t line_number_valid;
		uint16_t line_number;
		uint8_t function_name_valid;
		char function_name[QMI_WLFW_FUNCTION_NAME_LEN_V01 + 1];
		};
		#define WLFW_REJUVENATE_IND_MSG_V01_MAX_MSG_LEN 144
		extern struct elem_info wlfw_rejuvenate_ind_msg_v01_ei[];

		struct wlfw_rejuvenate_ack_req_msg_v01 {
		char placeholder;
		};
		#define WLFW_REJUVENATE_ACK_REQ_MSG_V01_MAX_MSG_LEN 0
		extern struct elem_info wlfw_rejuvenate_ack_req_msg_v01_ei[];

		struct wlfw_rejuvenate_ack_resp_msg_v01 {
		struct qmi_response_type_v01 resp;
		};
		#define WLFW_REJUVENATE_ACK_RESP_MSG_V01_MAX_MSG_LEN 7
		extern struct elem_info wlfw_rejuvenate_ack_resp_msg_v01_ei[];

		struct wlfw_dynamic_feature_mask_req_msg_v01 {
		uint8_t mask_valid;
		uint64_t mask;
		};
		#define WLFW_DYNAMIC_FEATURE_MASK_REQ_MSG_V01_MAX_MSG_LEN 11
		extern struct elem_info wlfw_dynamic_feature_mask_req_msg_v01_ei[];

		struct wlfw_dynamic_feature_mask_resp_msg_v01 {
		struct qmi_response_type_v01 resp;
		uint8_t prev_mask_valid;
		uint64_t prev_mask;
		uint8_t curr_mask_valid;
		uint64_t curr_mask;
		};
		#define WLFW_DYNAMIC_FEATURE_MASK_RESP_MSG_V01_MAX_MSG_LEN 29
		extern struct elem_info wlfw_dynamic_feature_mask_resp_msg_v01_ei[];

		#endif

include/soc/qcom/icnss.h

+6 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -104,7 +104,7 @@ extern int icnss_ce_request_irq(unsigned int ce_id,
		irqreturn_t (handler)(int, void ),
		unsigned long flags, const char name, void ctx);
		extern int icnss_get_ce_id(int irq);
		extern int icnss_set_fw_debug_mode(bool enable_fw_log);
		extern int icnss_set_fw_log_mode(uint8_t fw_log_mode);
		extern int icnss_athdiag_read(struct device *dev, uint32_t offset,
		uint32_t mem_type, uint32_t data_len,
		uint8_t *output);
		@@ -124,5 +124,9 @@ extern int icnss_get_wlan_unsafe_channel(u16 unsafe_ch_list, u16 ch_count,
		extern int icnss_wlan_set_dfs_nol(const void *info, u16 info_len);
		extern int icnss_wlan_get_dfs_nol(void *info, u16 info_len);
		extern bool icnss_is_qmi_disable(void);
		extern bool icnss_is_fw_ready(void);
		extern int icnss_set_wlan_mac_address(const u8 *in, const uint32_t len);
		extern u8 icnss_get_wlan_mac_address(struct device dev, uint32_t *num);
		extern int icnss_trigger_recovery(struct device *dev);

		#endif /* _ICNSS_WLAN_H_ */