Commit fb57b027 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

Merge branch '20240622-qcom-pd-mapper-v9-0-a84ee3591c8e@linaro.org' into drivers-for-6.11 

Merge the in-kernel protection-domain mapper implementation through a
feature branch, to allow sharing with the remoteproc tree.
parents dcf5bd88 1ebcde04

drivers/soc/qcom/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -72,11 +72,26 @@ config QCOM_OCMEM 
	  requirements. This is typically used by the GPU, camera/video, and

	  audio components on some Snapdragon SoCs.



config QCOM_PD_MAPPER

	tristate "Qualcomm Protection Domain Mapper"

	select QCOM_QMI_HELPERS

	depends on NET && QRTR

	default QCOM_RPROC_COMMON

	help

	  The Protection Domain Mapper maps registered services to the domains

	  and instances handled by the remote DSPs. This is a kernel-space

	  implementation of the service. It is a simpler alternative to the

	  userspace daemon.



config QCOM_PDR_HELPERS

	tristate

	select QCOM_QMI_HELPERS

	select QCOM_PDR_MSG

	depends on NET



config QCOM_PDR_MSG

	tristate



config QCOM_PMIC_PDCHARGER_ULOG

	tristate "Qualcomm PMIC PDCharger ULOG driver"

	depends on RPMSG

drivers/soc/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ obj-$(CONFIG_QCOM_COMMAND_DB) += cmd-db.o 
obj-$(CONFIG_QCOM_GSBI)	+=	qcom_gsbi.o

obj-$(CONFIG_QCOM_MDT_LOADER)	+= mdt_loader.o

obj-$(CONFIG_QCOM_OCMEM)	+= ocmem.o

obj-$(CONFIG_QCOM_PD_MAPPER)	+= qcom_pd_mapper.o

obj-$(CONFIG_QCOM_PDR_HELPERS)	+= pdr_interface.o

obj-$(CONFIG_QCOM_PDR_MSG)	+= qcom_pdr_msg.o

obj-$(CONFIG_QCOM_PMIC_GLINK)	+= pmic_glink.o

obj-$(CONFIG_QCOM_PMIC_GLINK)	+= pmic_glink_altmode.o

obj-$(CONFIG_QCOM_PMIC_PDCHARGER_ULOG)	+= pmic_pdcharger_ulog.o

drivers/soc/qcom/pdr_interface.c

+5 −3
Original line number Diff line number Diff line
@@ -76,12 +76,12 @@ static int pdr_locator_new_server(struct qmi_handle *qmi, 
					      locator_hdl);

	struct pdr_service *pds;



	mutex_lock(&pdr->lock);

	/* Create a local client port for QMI communication */

	pdr->locator_addr.sq_family = AF_QIPCRTR;

	pdr->locator_addr.sq_node = svc->node;

	pdr->locator_addr.sq_port = svc->port;



	mutex_lock(&pdr->lock);

	pdr->locator_init_complete = true;

	mutex_unlock(&pdr->lock);
@@ -104,10 +104,10 @@ static void pdr_locator_del_server(struct qmi_handle *qmi, 


	mutex_lock(&pdr->lock);

	pdr->locator_init_complete = false;

	mutex_unlock(&pdr->lock);



	pdr->locator_addr.sq_node = 0;

	pdr->locator_addr.sq_port = 0;

	mutex_unlock(&pdr->lock);

}



static const struct qmi_ops pdr_locator_ops = {
@@ -365,12 +365,14 @@ static int pdr_get_domain_list(struct servreg_get_domain_list_req *req, 
	if (ret < 0)

		return ret;



	mutex_lock(&pdr->lock);

	ret = qmi_send_request(&pdr->locator_hdl,

			       &pdr->locator_addr,

			       &txn, SERVREG_GET_DOMAIN_LIST_REQ,

			       SERVREG_GET_DOMAIN_LIST_REQ_MAX_LEN,

			       servreg_get_domain_list_req_ei,

			       req);

	mutex_unlock(&pdr->lock);

	if (ret < 0) {

		qmi_txn_cancel(&txn);

		return ret;
@@ -415,7 +417,7 @@ static int pdr_locate_service(struct pdr_handle *pdr, struct pdr_service *pds) 
		if (ret < 0)

			goto out;



		for (i = domains_read; i < resp->domain_list_len; i++) {

		for (i = 0; i < resp->domain_list_len; i++) {

			entry = &resp->domain_list[i];



			if (strnlen(entry->name, sizeof(entry->name)) == sizeof(entry->name))

drivers/soc/qcom/pdr_internal.h

+23 −295
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
#define SERVREG_SET_ACK_REQ				0x23

#define SERVREG_RESTART_PD_REQ				0x24



#define SERVREG_LOC_PFR_REQ				0x24



#define SERVREG_DOMAIN_LIST_LENGTH			32

#define SERVREG_RESTART_PD_REQ_MAX_LEN			67

#define SERVREG_REGISTER_LISTENER_REQ_LEN		71
@@ -20,6 +22,7 @@ 
#define SERVREG_GET_DOMAIN_LIST_REQ_MAX_LEN		74

#define SERVREG_STATE_UPDATED_IND_MAX_LEN		79

#define SERVREG_GET_DOMAIN_LIST_RESP_MAX_LEN		2389

#define SERVREG_LOC_PFR_RESP_MAX_LEN			10



struct servreg_location_entry {

	char name[SERVREG_NAME_LENGTH + 1];
@@ -28,83 +31,12 @@ struct servreg_location_entry { 
	u32 instance;

};



static const struct qmi_elem_info servreg_location_entry_ei[] = {

	{

		.data_type      = QMI_STRING,

		.elem_len       = SERVREG_NAME_LENGTH + 1,

		.elem_size      = sizeof(char),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0,

		.offset         = offsetof(struct servreg_location_entry,

					   name),

	},

	{

		.data_type      = QMI_UNSIGNED_4_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u32),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0,

		.offset         = offsetof(struct servreg_location_entry,

					   instance),

	},

	{

		.data_type      = QMI_UNSIGNED_1_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0,

		.offset         = offsetof(struct servreg_location_entry,

					   service_data_valid),

	},

	{

		.data_type      = QMI_UNSIGNED_4_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u32),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0,

		.offset         = offsetof(struct servreg_location_entry,

					   service_data),

	},

	{}

};



struct servreg_get_domain_list_req {

	char service_name[SERVREG_NAME_LENGTH + 1];

	u8 domain_offset_valid;

	u32 domain_offset;

};



static const struct qmi_elem_info servreg_get_domain_list_req_ei[] = {

	{

		.data_type      = QMI_STRING,

		.elem_len       = SERVREG_NAME_LENGTH + 1,

		.elem_size      = sizeof(char),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x01,

		.offset         = offsetof(struct servreg_get_domain_list_req,

					   service_name),

	},

	{

		.data_type      = QMI_OPT_FLAG,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x10,

		.offset         = offsetof(struct servreg_get_domain_list_req,

					   domain_offset_valid),

	},

	{

		.data_type      = QMI_UNSIGNED_4_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u32),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x10,

		.offset         = offsetof(struct servreg_get_domain_list_req,

					   domain_offset),

	},

	{}

};



struct servreg_get_domain_list_resp {

	struct qmi_response_type_v01 resp;

	u8 total_domains_valid;
@@ -116,264 +48,60 @@ struct servreg_get_domain_list_resp { 
	struct servreg_location_entry domain_list[SERVREG_DOMAIN_LIST_LENGTH];

};



static const struct qmi_elem_info servreg_get_domain_list_resp_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 servreg_get_domain_list_resp,

					   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 servreg_get_domain_list_resp,

					   total_domains_valid),

	},

	{

		.data_type      = QMI_UNSIGNED_2_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u16),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x10,

		.offset         = offsetof(struct servreg_get_domain_list_resp,

					   total_domains),

	},

	{

		.data_type      = QMI_OPT_FLAG,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x11,

		.offset         = offsetof(struct servreg_get_domain_list_resp,

					   db_rev_count_valid),

	},

	{

		.data_type      = QMI_UNSIGNED_2_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u16),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x11,

		.offset         = offsetof(struct servreg_get_domain_list_resp,

					   db_rev_count),

	},

	{

		.data_type      = QMI_OPT_FLAG,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x12,

		.offset         = offsetof(struct servreg_get_domain_list_resp,

					   domain_list_valid),

	},

	{

		.data_type      = QMI_DATA_LEN,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x12,

		.offset         = offsetof(struct servreg_get_domain_list_resp,

					   domain_list_len),

	},

	{

		.data_type      = QMI_STRUCT,

		.elem_len       = SERVREG_DOMAIN_LIST_LENGTH,

		.elem_size      = sizeof(struct servreg_location_entry),

		.array_type	= VAR_LEN_ARRAY,

		.tlv_type       = 0x12,

		.offset         = offsetof(struct servreg_get_domain_list_resp,

					   domain_list),

		.ei_array      = servreg_location_entry_ei,

	},

	{}

};



struct servreg_register_listener_req {

	u8 enable;

	char service_path[SERVREG_NAME_LENGTH + 1];

};



static const struct qmi_elem_info servreg_register_listener_req_ei[] = {

	{

		.data_type      = QMI_UNSIGNED_1_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u8),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x01,

		.offset         = offsetof(struct servreg_register_listener_req,

					   enable),

	},

	{

		.data_type      = QMI_STRING,

		.elem_len       = SERVREG_NAME_LENGTH + 1,

		.elem_size      = sizeof(char),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x02,

		.offset         = offsetof(struct servreg_register_listener_req,

					   service_path),

	},

	{}

};



struct servreg_register_listener_resp {

	struct qmi_response_type_v01 resp;

	u8 curr_state_valid;

	enum servreg_service_state curr_state;

};



static const struct qmi_elem_info servreg_register_listener_resp_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 servreg_register_listener_resp,

					   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 servreg_register_listener_resp,

					   curr_state_valid),

	},

	{

		.data_type      = QMI_SIGNED_4_BYTE_ENUM,

		.elem_len       = 1,

		.elem_size      = sizeof(enum servreg_service_state),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x10,

		.offset         = offsetof(struct servreg_register_listener_resp,

					   curr_state),

	},

	{}

};



struct servreg_restart_pd_req {

	char service_path[SERVREG_NAME_LENGTH + 1];

};



static const struct qmi_elem_info servreg_restart_pd_req_ei[] = {

	{

		.data_type      = QMI_STRING,

		.elem_len       = SERVREG_NAME_LENGTH + 1,

		.elem_size      = sizeof(char),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x01,

		.offset         = offsetof(struct servreg_restart_pd_req,

					   service_path),

	},

	{}

};



struct servreg_restart_pd_resp {

	struct qmi_response_type_v01 resp;

};



static const struct qmi_elem_info servreg_restart_pd_resp_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 servreg_restart_pd_resp,

					   resp),

		.ei_array      = qmi_response_type_v01_ei,

	},

	{}

};



struct servreg_state_updated_ind {

	enum servreg_service_state curr_state;

	char service_path[SERVREG_NAME_LENGTH + 1];

	u16 transaction_id;

};



static const struct qmi_elem_info servreg_state_updated_ind_ei[] = {

	{

		.data_type      = QMI_SIGNED_4_BYTE_ENUM,

		.elem_len       = 1,

		.elem_size      = sizeof(u32),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x01,

		.offset         = offsetof(struct servreg_state_updated_ind,

					   curr_state),

	},

	{

		.data_type      = QMI_STRING,

		.elem_len       = SERVREG_NAME_LENGTH + 1,

		.elem_size      = sizeof(char),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x02,

		.offset         = offsetof(struct servreg_state_updated_ind,

					   service_path),

	},

	{

		.data_type      = QMI_UNSIGNED_2_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u16),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x03,

		.offset         = offsetof(struct servreg_state_updated_ind,

					   transaction_id),

	},

	{}

};



struct servreg_set_ack_req {

	char service_path[SERVREG_NAME_LENGTH + 1];

	u16 transaction_id;

};



static const struct qmi_elem_info servreg_set_ack_req_ei[] = {

	{

		.data_type      = QMI_STRING,

		.elem_len       = SERVREG_NAME_LENGTH + 1,

		.elem_size      = sizeof(char),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x01,

		.offset         = offsetof(struct servreg_set_ack_req,

					   service_path),

	},

	{

		.data_type      = QMI_UNSIGNED_2_BYTE,

		.elem_len       = 1,

		.elem_size      = sizeof(u16),

		.array_type	= NO_ARRAY,

		.tlv_type       = 0x02,

		.offset         = offsetof(struct servreg_set_ack_req,

					   transaction_id),

	},

	{}

};



struct servreg_set_ack_resp {

	struct qmi_response_type_v01 resp;

};



static const struct qmi_elem_info servreg_set_ack_resp_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 servreg_set_ack_resp,

					   resp),

		.ei_array       = qmi_response_type_v01_ei,

	},

	{}

struct servreg_loc_pfr_req {

	char service[SERVREG_NAME_LENGTH + 1];

	char reason[257];

};



struct servreg_loc_pfr_resp {

	struct qmi_response_type_v01 rsp;

};



extern const struct qmi_elem_info servreg_location_entry_ei[];

extern const struct qmi_elem_info servreg_get_domain_list_req_ei[];

extern const struct qmi_elem_info servreg_get_domain_list_resp_ei[];

extern const struct qmi_elem_info servreg_register_listener_req_ei[];

extern const struct qmi_elem_info servreg_register_listener_resp_ei[];

extern const struct qmi_elem_info servreg_restart_pd_req_ei[];

extern const struct qmi_elem_info servreg_restart_pd_resp_ei[];

extern const struct qmi_elem_info servreg_state_updated_ind_ei[];

extern const struct qmi_elem_info servreg_set_ack_req_ei[];

extern const struct qmi_elem_info servreg_set_ack_resp_ei[];

extern const struct qmi_elem_info servreg_loc_pfr_req_ei[];

extern const struct qmi_elem_info servreg_loc_pfr_resp_ei[];



#endif

drivers/soc/qcom/qcom_pd_mapper.c

0 → 100644
+677 −0

File added.

Preview size limit exceeded, changes collapsed.