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

Commit 0b7ba316 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ADSPRPC: Support to set FastRPC session ID"

parents edecb3e5 d4d07948

drivers/char/adsprpc.c

+16 −6
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#define NUM_SESSIONS	9	/*8 compute, 1 cpz*/

#define M_FDLIST	(16)

#define M_CRCLIST	(64)

#define SESSION_ID_INDEX (30)



#define IS_CACHE_ALIGNED(x) (((x) & ((L1_CACHE_BYTES)-1)) == 0)
@@ -282,6 +283,7 @@ struct fastrpc_file { 
	struct fastrpc_session_ctx *secsctx;

	uint32_t mode;

	uint32_t profile;

	int sessionid;

	int tgid;

	int cid;

	int ssrcount;
@@ -860,7 +862,7 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel, 
	}

	ctx->retval = -1;

	ctx->pid = current->pid;

	ctx->tgid = current->tgid;

	ctx->tgid = fl->tgid;

	init_completion(&ctx->work);



	spin_lock(&fl->hlock);
@@ -1351,8 +1353,10 @@ static int fastrpc_invoke_send(struct smq_invoke_ctx *ctx, 
	VERIFY(err, 0 != channel_ctx->chan);

	if (err)

		goto bail;

	msg->pid = current->tgid;

	msg->pid = fl->tgid;

	msg->tid = current->pid;

	if (fl->sessionid)

		msg->tid |= (1 << SESSION_ID_INDEX);

	if (kernel)

		msg->pid = 0;

	msg->invoke.header.ctx = ptr_to_uint64(ctx) | fl->pd;
@@ -1407,6 +1411,7 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
	if (fl->profile)

		getnstimeofday(&invoket);





	VERIFY(err, fl->sctx != NULL);

	if (err)

		goto bail;
@@ -1504,7 +1509,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		goto bail;

	if (init->flags == FASTRPC_INIT_ATTACH) {

		remote_arg_t ra[1];

		int tgid = current->tgid;

		int tgid = fl->tgid;



		ra[0].buf.pv = (void *)&tgid;

		ra[0].buf.len = sizeof(tgid);
@@ -1532,7 +1537,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
			int siglen;

		} inbuf;



		inbuf.pgid = current->tgid;

		inbuf.pgid = fl->tgid;

		inbuf.namelen = strlen(current->comm) + 1;

		inbuf.filelen = init->filelen;

		fl->pd = 1;
@@ -1645,7 +1650,7 @@ static int fastrpc_mmap_on_dsp(struct fastrpc_file *fl, uint32_t flags, 
		uintptr_t vaddrout;

	} routargs;



	inargs.pid = current->tgid;

	inargs.pid = fl->tgid;

	inargs.vaddrin = (uintptr_t)map->va;

	inargs.flags = flags;

	inargs.num = fl->apps->compat ? num * sizeof(page) : num;
@@ -1687,7 +1692,7 @@ static int fastrpc_munmap_on_dsp(struct fastrpc_file *fl, 
		ssize_t size;

	} inargs;



	inargs.pid = current->tgid;

	inargs.pid = fl->tgid;

	inargs.size = map->size;

	inargs.vaddrout = map->raddr;

	ra[0].buf.pv = (void *)&inargs;
@@ -2226,6 +2231,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) 
	INIT_HLIST_HEAD(&fl->maps);

	INIT_HLIST_HEAD(&fl->bufs);

	INIT_HLIST_NODE(&fl->hn);

	fl->sessionid = 0;

	fl->tgid = current->tgid;

	fl->apps = me;

	fl->mode = FASTRPC_MODE_SERIAL;
@@ -2386,6 +2392,10 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int ioctl_num, 
		case FASTRPC_MODE_PROFILE:

			fl->profile = (uint32_t)ioctl_param;

			break;

		case FASTRPC_MODE_SESSION:

			fl->sessionid = 1;

			fl->tgid |= (1 << SESSION_ID_INDEX);

			break;

		default:

			err = -ENOTTY;

			break;

drivers/char/adsprpc_shared.h

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ 
/* Driver should operate in profile mode with the co-processor */

#define FASTRPC_MODE_PROFILE     2



/* Set FastRPC session ID to 1 */

#define FASTRPC_MODE_SESSION     4



/* INIT a new process or attach to guestos */

#define FASTRPC_INIT_ATTACH      0

#define FASTRPC_INIT_CREATE      1