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

Commit 848c0959 authored by Tharun Kumar Merugu's avatar Tharun Kumar Merugu
Browse files

msm: ADSPRPC: Root process creation in Sensors PD 



Support root process creation in sensors PD and share context
bank for all sensors processes.

Change-Id: I17859f6b5c9ec8ae6a325172ddfab9860bf896f5
Acked-by: default avatarHimateja Reddy <hmreddy@qti.qualcomm.com>
Signed-off-by: default avatarTharun Kumar Merugu <mtharu@codeaurora.org>
parent 9efa0593

Documentation/devicetree/bindings/qdsp/msm-fastrpc.txt

+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Optional properties: 
- qcom,rpc-latency-us:	FastRPC QoS latency vote

- qcom,adsp-remoteheap-vmid:  FastRPC remote heap VMID list

- qcom,fastrpc-adsp-audio-pdr:  Flag to enable ADSP Audio PDR

- qcom,fastrpc-adsp-sensors-pdr: Flag to enable Sensors PDR



Optional subnodes:

- qcom,msm_fastrpc_compute_cb :	Child nodes representing the compute context
@@ -25,12 +26,17 @@ Subnode Required properties: 
- iommus : 		A list of phandle and IOMMU specifier pairs that describe the

			IOMMU master interfaces of the device



Subnode Optional properties:

- shared-cb : 		Present if context bank need to be shared





Example:

	qcom,msm_fastrpc {

		compatible = "qcom,msm-fastrpc-adsp";

		qcom,fastrpc-glink;

		qcom,rpc-latency-us = <2343>;

		qcom,adsp-remoteheap-vmid = <22 37>;

		qcom,fastrpc-adsp-sensors-pdr;



		qcom,msm_fastrpc_compute_cb_1 {

			compatible = "qcom,msm-fastrpc-compute-cb";
@@ -41,6 +47,7 @@ Example: 
			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			iommus = <&lpass_q6_smmu 9>,

			shared-cb;

		};

	};

drivers/char/adsprpc.c

+70 −21
Original line number Diff line number Diff line
@@ -66,6 +66,9 @@ 
#define AUDIO_PDR_SERVICE_LOCATION_CLIENT_NAME   "audio_pdr_adsprpc"

#define AUDIO_PDR_ADSP_SERVICE_NAME              "avs/audio"



#define SENSORS_PDR_SERVICE_LOCATION_CLIENT_NAME   "sensors_pdr_adsprpc"

#define SENSORS_PDR_ADSP_SERVICE_NAME              "tms/servreg"



#define RPC_TIMEOUT	(5 * HZ)

#define BALIGN		128

#define NUM_CHANNELS	4	/* adsp, mdsp, slpi, cdsp*/
@@ -120,7 +123,7 @@ 


static int fastrpc_glink_open(int cid);

static void fastrpc_glink_close(void *chan, int cid);

static int fastrpc_audio_pdr_notifier_cb(struct notifier_block *nb,

static int fastrpc_pdr_notifier_cb(struct notifier_block *nb,

					unsigned long code,

					void *data);

static struct dentry *debugfs_root;
@@ -230,6 +233,7 @@ struct fastrpc_smmu { 
	int faults;

	int secure;

	int coherent;

	int sharedcb;

};



struct fastrpc_session_ctx {
@@ -366,6 +370,7 @@ struct fastrpc_file { 
	int pd;

	char *spdname;

	int file_close;

	int sharedcb;

	struct fastrpc_apps *apps;

	struct hlist_head perf;

	struct dentry *debugfs_file;
@@ -391,7 +396,13 @@ static struct fastrpc_channel_ctx gcinfo[NUM_CHANNELS] = { 
				.spdname =

					AUDIO_PDR_SERVICE_LOCATION_CLIENT_NAME,

				.pdrnb.notifier_call =

						fastrpc_audio_pdr_notifier_cb,

						fastrpc_pdr_notifier_cb,

			},

			{

				.spdname =

				SENSORS_PDR_SERVICE_LOCATION_CLIENT_NAME,

				.pdrnb.notifier_call =

						fastrpc_pdr_notifier_cb,

			}

		},

	},
@@ -1755,7 +1766,7 @@ static void fastrpc_smd_read_handler(int cid) 
		if (err)

			goto bail;



		VERIFY(err, ((me->ctxtable[index]->ctxid == (rsp.ctx & ~1)) &&

		VERIFY(err, ((me->ctxtable[index]->ctxid == (rsp.ctx & ~3)) &&

			me->ctxtable[index]->magic == FASTRPC_CTX_MAGIC));

		if (err)

			goto bail;
@@ -1951,7 +1962,8 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
	VERIFY(err, 0 == (err = fastrpc_channel_open(fl)));

	if (err)

		goto bail;

	if (init->flags == FASTRPC_INIT_ATTACH) {

	if (init->flags == FASTRPC_INIT_ATTACH ||

			init->flags == FASTRPC_INIT_ATTACH_SENSORS) {

		remote_arg_t ra[1];

		int tgid = fl->tgid;
@@ -1963,7 +1975,12 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		ioctl.fds = NULL;

		ioctl.attrs = NULL;

		ioctl.crc = NULL;

		if (init->flags == FASTRPC_INIT_ATTACH)

			fl->pd = 0;

		else if (init->flags == FASTRPC_INIT_ATTACH_SENSORS) {

			fl->spdname = SENSORS_PDR_SERVICE_LOCATION_CLIENT_NAME;

			fl->pd = 2;

		}

		VERIFY(err, !(err = fastrpc_internal_invoke(fl,

			FASTRPC_MODE_PARALLEL, 1, &ioctl)));

		if (err)
@@ -2073,6 +2090,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		if (err)

			goto bail;



		fl->pd = 1;

		inbuf.pgid = current->tgid;

		inbuf.namelen = init->filelen;

		inbuf.pageslen = 0;
@@ -2536,15 +2554,17 @@ static void fastrpc_channel_close(struct kref *kref) 
static void fastrpc_context_list_dtor(struct fastrpc_file *fl);



static int fastrpc_session_alloc_locked(struct fastrpc_channel_ctx *chan,

			int secure, struct fastrpc_session_ctx **session)

	int secure, int sharedcb, struct fastrpc_session_ctx **session)

{

	struct fastrpc_apps *me = &gfa;

	int idx = 0, err = 0;



	if (chan->sesscount) {

		for (idx = 0; idx < chan->sesscount; ++idx) {

			if (!chan->session[idx].used &&

				chan->session[idx].smmu.secure == secure) {

			if ((sharedcb && chan->session[idx].smmu.sharedcb) ||

					(!chan->session[idx].used &&

					chan->session[idx].smmu.secure

					== secure && !sharedcb)) {

				chan->session[idx].used = 1;

				break;

			}
@@ -2600,7 +2620,7 @@ static void fastrpc_glink_notify_rx(void *handle, const void *priv, 
	if (err)

		goto bail;



	VERIFY(err, ((me->ctxtable[index]->ctxid == (rsp->ctx & ~1)) &&

	VERIFY(err, ((me->ctxtable[index]->ctxid == (rsp->ctx & ~3)) &&

		me->ctxtable[index]->magic == FASTRPC_CTX_MAGIC));

	if (err)

		goto bail;
@@ -2645,7 +2665,7 @@ static int fastrpc_session_alloc(struct fastrpc_channel_ctx *chan, int secure, 


	mutex_lock(&me->smd_mutex);

	if (!*session)

		err = fastrpc_session_alloc_locked(chan, secure, session);

		err = fastrpc_session_alloc_locked(chan, secure, 0, session);

	mutex_unlock(&me->smd_mutex);

	return err;

}
@@ -3085,7 +3105,7 @@ static int fastrpc_get_info(struct fastrpc_file *fl, uint32_t *info) 
		fl->cid = cid;

		fl->ssrcount = fl->apps->channel[cid].ssrcount;

		VERIFY(err, !fastrpc_session_alloc_locked(

				&fl->apps->channel[cid], 0, &fl->sctx));

			&fl->apps->channel[cid], 0, fl->sharedcb, &fl->sctx));

		if (err)

			goto bail;

	}
@@ -3124,6 +3144,9 @@ static int fastrpc_internal_control(struct fastrpc_file *fl, 
		} else

			pm_qos_update_request(&fl->pm_qos_req, latency);

		break;

	case FASTRPC_CONTROL_SMMU:

		fl->sharedcb = cp->smmu.sharedcb;

		break;

	default:

		err = -ENOTTY;

		break;
@@ -3364,7 +3387,7 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
	return NOTIFY_DONE;

}



static int fastrpc_audio_pdr_notifier_cb(struct notifier_block *pdrnb,

static int fastrpc_pdr_notifier_cb(struct notifier_block *pdrnb,

					unsigned long code,

					void *data)

{
@@ -3401,7 +3424,7 @@ static int fastrpc_get_service_location_notify(struct notifier_block *nb, 
{

	struct fastrpc_static_pd *spd;

	struct pd_qmi_client_data *pdr = data;

	int curr_state = 0;

	int curr_state = 0, i = 0;



	spd = container_of(nb, struct fastrpc_static_pd, get_service_nb);

	if (opcode == LOCATOR_DOWN) {
@@ -3409,15 +3432,21 @@ static int fastrpc_get_service_location_notify(struct notifier_block *nb, 
		return NOTIFY_DONE;

	}



	if (pdr->total_domains == 1) {

		spd->pdrhandle = service_notif_register_notifier(

				pdr->domain_list[0].name,

				pdr->domain_list[0].instance_id,

	for (i = 0; i < pdr->total_domains; i++) {

		if ((!strcmp(pdr->domain_list[i].name,

					"msm/adsp/audio_pd")) ||

					(!strcmp(pdr->domain_list[i].name,

					"msm/adsp/sensor_pd"))) {

			spd->pdrhandle =

				service_notif_register_notifier(

				pdr->domain_list[i].name,

				pdr->domain_list[i].instance_id,

				&spd->pdrnb, &curr_state);

			if (IS_ERR(spd->pdrhandle))

				pr_err("ADSPRPC: Unable to register notifier\n");

	} else

		pr_err("ADSPRPC: Service returned invalid domains\n");

			break;

		}

	}



	return NOTIFY_DONE;

}
@@ -3476,6 +3505,8 @@ static int fastrpc_cb_probe(struct device *dev) 
	sess->used = 0;

	sess->smmu.coherent = of_property_read_bool(dev->of_node,

						"dma-coherent");

	sess->smmu.sharedcb = of_property_read_bool(dev->of_node,

						"shared-cb");

	sess->smmu.secure = of_property_read_bool(dev->of_node,

						"qcom,secure-context-bank");

	if (sess->smmu.secure)
@@ -3715,6 +3746,24 @@ static int fastrpc_probe(struct platform_device *pdev) 
			pr_err("ADSPRPC: Get service location failed: %d\n",

								ret);

	}

	if (of_property_read_bool(dev->of_node,

					"qcom,fastrpc-adsp-sensors-pdr")) {

		int session;



		VERIFY(err, !fastrpc_get_adsp_session(

			SENSORS_PDR_SERVICE_LOCATION_CLIENT_NAME, &session));

		if (err)

			goto spdbail;

		me->channel[0].spd[session].get_service_nb.notifier_call =

					fastrpc_get_service_location_notify;

		ret = get_service_location(

				SENSORS_PDR_SERVICE_LOCATION_CLIENT_NAME,

				SENSORS_PDR_ADSP_SERVICE_NAME,

				&me->channel[0].spd[session].get_service_nb);

		if (ret)

			pr_err("ADSPRPC: Get service location failed: %d\n",

								ret);

	}

spdbail:

	err = 0;

	VERIFY(err, !of_platform_populate(pdev->dev.of_node,

drivers/char/adsprpc_shared.h

+6 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#define FASTRPC_INIT_ATTACH      0

#define FASTRPC_INIT_CREATE      1

#define FASTRPC_INIT_CREATE_STATIC  2

#define FASTRPC_INIT_ATTACH_SENSORS 3



/* Retrives number of input buffers from the scalars parameter */

#define REMOTE_SCALARS_INBUFS(sc)        (((sc) >> 16) & 0x0ff)
@@ -229,11 +230,15 @@ struct fastrpc_ctrl_latency { 
	uint32_t enable;	//!latency control enable

	uint32_t level;		//!level of control

};



#define FASTRPC_CONTROL_SMMU   (2)

struct fastrpc_ctrl_smmu {

	uint32_t sharedcb;

};

struct fastrpc_ioctl_control {

	uint32_t req;

	union {

		struct fastrpc_ctrl_latency lp;

		struct fastrpc_ctrl_smmu smmu;

	};

};