Merge "soc: qcom: pil: Update service notifier with new QMI interface" (6197e1c3) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/service-locator-private.h

+23 −23

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ struct qmi_elem_info qmi_servreg_loc_database_updated_ind_msg_v01_ei[];
		.data_type = QMI_EOTI, \
		.elem_len = 0, \
		.elem_size = 0, \
		.is_array = NO_ARRAY, \
		.array_type = NO_ARRAY, \
		.tlv_type = 0x00, \
		.offset = 0, \
		.ei_array = NULL, \
		@@ -100,7 +100,7 @@ static struct qmi_elem_info servreg_loc_entry_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_LOC_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0,
		.offset = offsetof(struct servreg_loc_entry_v01,
		name),
		@@ -109,7 +109,7 @@ static struct qmi_elem_info servreg_loc_entry_v01_ei[] = {
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0,
		.offset = offsetof(struct servreg_loc_entry_v01,
		instance_id),
		@@ -118,7 +118,7 @@ static struct qmi_elem_info servreg_loc_entry_v01_ei[] = {
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0,
		.offset = offsetof(struct servreg_loc_entry_v01,
		service_data_valid),
		@@ -127,7 +127,7 @@ static struct qmi_elem_info servreg_loc_entry_v01_ei[] = {
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0,
		.offset = offsetof(struct servreg_loc_entry_v01,
		service_data),
		@@ -140,7 +140,7 @@ struct qmi_elem_info qmi_servreg_loc_indication_register_req_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_loc_indication_register_req_msg_v01,
		@@ -150,7 +150,7 @@ struct qmi_elem_info qmi_servreg_loc_indication_register_req_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_loc_indication_register_req_msg_v01,
		@@ -164,7 +164,7 @@ struct qmi_elem_info qmi_servreg_loc_indication_register_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_loc_indication_register_resp_msg_v01,
		@@ -179,7 +179,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_req_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_LOC_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_req_msg_v01,
		@@ -189,7 +189,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_req_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_req_msg_v01,
		@@ -199,7 +199,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_req_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_4_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint32_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_req_msg_v01,
		@@ -213,7 +213,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -224,7 +224,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -234,7 +234,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_2_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint16_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -244,7 +244,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x11,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -254,7 +254,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_2_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint16_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x11,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -264,7 +264,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x12,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -274,7 +274,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_DATA_LEN,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x12,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -284,7 +284,7 @@ struct qmi_elem_info qmi_servreg_loc_get_domain_list_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = QMI_SERVREG_LOC_LIST_LENGTH_V01,
		.elem_size = sizeof(struct servreg_loc_entry_v01),
		.is_array = VAR_LEN_ARRAY,
		.array_type = VAR_LEN_ARRAY,
		.tlv_type = 0x12,
		.offset = offsetof(struct
		qmi_servreg_loc_get_domain_list_resp_msg_v01,
		@@ -299,7 +299,7 @@ struct qmi_elem_info qmi_servreg_loc_register_service_list_req_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_LOC_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_loc_register_service_list_req_msg_v01,
		@@ -309,7 +309,7 @@ struct qmi_elem_info qmi_servreg_loc_register_service_list_req_msg_v01_ei[] = {
		.data_type = QMI_DATA_LEN,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_loc_register_service_list_req_msg_v01,
		@@ -319,7 +319,7 @@ struct qmi_elem_info qmi_servreg_loc_register_service_list_req_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = QMI_SERVREG_LOC_LIST_LENGTH_V01,
		.elem_size = sizeof(struct servreg_loc_entry_v01),
		.is_array = VAR_LEN_ARRAY,
		.array_type = VAR_LEN_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_loc_register_service_list_req_msg_v01,
		@@ -334,7 +334,7 @@ struct qmi_elem_info qmi_servreg_loc_register_service_list_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_loc_register_service_list_resp_msg_v01,

drivers/soc/qcom/service-notifier-private.h

+35 −35

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_req_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_1_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_notif_register_listener_req_msg_v01,
		@@ -99,7 +99,7 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_req_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_NOTIF_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_register_listener_req_msg_v01,
		@@ -107,8 +107,8 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_req_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -117,7 +117,7 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_register_listener_resp_msg_v01,
		@@ -128,7 +128,7 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_resp_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_notif_register_listener_resp_msg_v01,
		@@ -139,7 +139,7 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_resp_msg_v01_ei[] = {
		.elem_len = 1,
		.elem_size = sizeof(
		enum qmi_servreg_notif_service_state_enum_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_notif_register_listener_resp_msg_v01,
		@@ -147,8 +147,8 @@ struct qmi_elem_info qmi_servreg_notif_register_listener_resp_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -157,7 +157,7 @@ struct qmi_elem_info qmi_servreg_notif_query_state_req_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_NOTIF_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_notif_query_state_req_msg_v01,
		@@ -165,8 +165,8 @@ struct qmi_elem_info qmi_servreg_notif_query_state_req_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -175,7 +175,7 @@ struct qmi_elem_info qmi_servreg_notif_query_state_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_query_state_resp_msg_v01,
		@@ -186,7 +186,7 @@ struct qmi_elem_info qmi_servreg_notif_query_state_resp_msg_v01_ei[] = {
		.data_type = QMI_OPT_FLAG,
		.elem_len = 1,
		.elem_size = sizeof(uint8_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_notif_query_state_resp_msg_v01,
		@@ -197,7 +197,7 @@ struct qmi_elem_info qmi_servreg_notif_query_state_resp_msg_v01_ei[] = {
		.elem_len = 1,
		.elem_size = sizeof(enum
		qmi_servreg_notif_service_state_enum_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x10,
		.offset = offsetof(struct
		qmi_servreg_notif_query_state_resp_msg_v01,
		@@ -205,8 +205,8 @@ struct qmi_elem_info qmi_servreg_notif_query_state_resp_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -216,7 +216,7 @@ struct qmi_elem_info qmi_servreg_notif_state_updated_ind_msg_v01_ei[] = {
		.elem_len = 1,
		.elem_size = sizeof(enum
		qmi_servreg_notif_service_state_enum_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_notif_state_updated_ind_msg_v01,
		@@ -226,7 +226,7 @@ struct qmi_elem_info qmi_servreg_notif_state_updated_ind_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_NOTIF_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_state_updated_ind_msg_v01,
		@@ -236,7 +236,7 @@ struct qmi_elem_info qmi_servreg_notif_state_updated_ind_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_2_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint16_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x03,
		.offset = offsetof(struct
		qmi_servreg_notif_state_updated_ind_msg_v01,
		@@ -244,8 +244,8 @@ struct qmi_elem_info qmi_servreg_notif_state_updated_ind_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -254,7 +254,7 @@ struct qmi_elem_info qmi_servreg_notif_set_ack_req_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_NOTIF_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_notif_set_ack_req_msg_v01,
		@@ -264,7 +264,7 @@ struct qmi_elem_info qmi_servreg_notif_set_ack_req_msg_v01_ei[] = {
		.data_type = QMI_UNSIGNED_2_BYTE,
		.elem_len = 1,
		.elem_size = sizeof(uint16_t),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_set_ack_req_msg_v01,
		@@ -272,8 +272,8 @@ struct qmi_elem_info qmi_servreg_notif_set_ack_req_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -282,7 +282,7 @@ struct qmi_elem_info qmi_servreg_notif_set_ack_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_set_ack_resp_msg_v01,
		@@ -291,8 +291,8 @@ struct qmi_elem_info qmi_servreg_notif_set_ack_resp_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -301,7 +301,7 @@ struct qmi_elem_info qmi_servreg_notif_restart_pd_req_msg_v01_ei[] = {
		.data_type = QMI_STRING,
		.elem_len = QMI_SERVREG_NOTIF_NAME_LENGTH_V01 + 1,
		.elem_size = sizeof(char),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x01,
		.offset = offsetof(struct
		qmi_servreg_notif_restart_pd_req_msg_v01,
		@@ -309,8 +309,8 @@ struct qmi_elem_info qmi_servreg_notif_restart_pd_req_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};

		@@ -319,7 +319,7 @@ struct qmi_elem_info qmi_servreg_notif_restart_pd_resp_msg_v01_ei[] = {
		.data_type = QMI_STRUCT,
		.elem_len = 1,
		.elem_size = sizeof(struct qmi_response_type_v01),
		.is_array = NO_ARRAY,
		.array_type = NO_ARRAY,
		.tlv_type = 0x02,
		.offset = offsetof(struct
		qmi_servreg_notif_restart_pd_resp_msg_v01,
		@@ -328,8 +328,8 @@ struct qmi_elem_info qmi_servreg_notif_restart_pd_resp_msg_v01_ei[] = {
		},
		{
		.data_type = QMI_EOTI,
		.is_array = NO_ARRAY,
		.is_array = QMI_COMMON_TLV_TYPE,
		.array_type = NO_ARRAY,
		.array_type = QMI_COMMON_TLV_TYPE,
		},
		};
		#endif

include/linux/soc/qcom/qmi.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ struct qmi_elem_info {
		#define QMI_ERR_CLIENT_IDS_EXHAUSTED_V01 5
		#define QMI_ERR_INVALID_ID_V01 41
		#define QMI_ERR_ENCODING_V01 58
		#define QMI_ERR_DISABLED_V01 69
		#define QMI_ERR_INCOMPATIBLE_STATE_V01 90
		#define QMI_ERR_NOT_SUPPORTED_V01 94