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

Commit 3469531d authored by Sathish Ambley's avatar Sathish Ambley Committed by Jeevan Shriram
Browse files

msm: ADSPRPC: Support for secure context banks 



Add support for secure session that checks whether the
buffer being passed was allocated from a secure heap and
appropriately maps the buffers in the secure context bank.

Change-Id: If590f65d033e264c04f0ad782895b02765ff4f3d
Signed-off-by: default avatarSathish Ambley <sathishambley@codeaurora.org>
parent 06761098

arch/arm/boot/dts/qcom/msmcobalt.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -957,6 +957,12 @@ 
		compatible = "qcom,msm-fastrpc-adsp";

		qcom,fastrpc-glink;



		qcom,msm_fastrpc_cpz_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

			iommus = <&lpass_q6_smmu 2>;

			qcom,secure-context-bank;

		};

		qcom,msm_fastrpc_compute_cb1 {

			compatible = "qcom,msm-fastrpc-compute-cb";

			label = "adsprpc-smd";

drivers/char/adsprpc.c

+236 −141

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/adsprpc_compat.c

+24 −10
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
		_IOWR('R', 4, struct compat_fastrpc_ioctl_invoke_fd)

#define COMPAT_FASTRPC_IOCTL_INIT \

		_IOWR('R', 6, struct compat_fastrpc_ioctl_init)

#define COMPAT_FASTRPC_IOCTL_INVOKE_ATTRS \

		_IOWR('R', 7, struct compat_fastrpc_ioctl_invoke_attrs)



struct compat_remote_buf {

	compat_uptr_t pv;	/* buffer pointer */
@@ -52,6 +54,12 @@ struct compat_fastrpc_ioctl_invoke_fd { 
	compat_uptr_t fds;	/* fd list */

};



struct compat_fastrpc_ioctl_invoke_attrs {

	struct compat_fastrpc_ioctl_invoke inv;

	compat_uptr_t fds;	/* fd list */

	compat_uptr_t attrs;	/* attribute list */

};



struct compat_fastrpc_ioctl_mmap {

	compat_int_t fd;	/* ion fd */

	compat_uint_t flags;	/* flags for dsp to map with */
@@ -76,14 +84,14 @@ struct compat_fastrpc_ioctl_init { 
};



static int compat_get_fastrpc_ioctl_invoke(

			struct compat_fastrpc_ioctl_invoke_fd __user *inv32,

			struct fastrpc_ioctl_invoke_fd __user **inva,

			struct compat_fastrpc_ioctl_invoke_attrs __user *inv32,

			struct fastrpc_ioctl_invoke_attrs __user **inva,

			unsigned int cmd)

{

	compat_uint_t u, sc;

	compat_ssize_t s;

	compat_uptr_t p;

	struct fastrpc_ioctl_invoke_fd *inv;

	struct fastrpc_ioctl_invoke_attrs *inv;

	union compat_remote_arg *pra32;

	union remote_arg *pra;

	int err, len, num, j;
@@ -122,18 +130,23 @@ static int compat_get_fastrpc_ioctl_invoke( 
	}



	err |= put_user(NULL, &inv->fds);

	if (cmd == COMPAT_FASTRPC_IOCTL_INVOKE_FD) {

	if (cmd != COMPAT_FASTRPC_IOCTL_INVOKE) {

		err |= get_user(p, &inv32->fds);

		err |= put_user(p, (compat_uptr_t *)&inv->fds);

	}

	err |= put_user(NULL, &inv->attrs);

	if (cmd == COMPAT_FASTRPC_IOCTL_INVOKE_ATTRS) {

		err |= get_user(p, &inv32->attrs);

		err |= put_user(p, (compat_uptr_t *)&inv->attrs);

	}



	*inva = inv;

	return err;

}



static int compat_put_fastrpc_ioctl_invoke(

			struct compat_fastrpc_ioctl_invoke_fd __user *inv32,

			struct fastrpc_ioctl_invoke_fd __user *inv)

			struct compat_fastrpc_ioctl_invoke_attrs __user *inv32,

			struct fastrpc_ioctl_invoke_attrs __user *inv)

{

	compat_uptr_t p;

	compat_uint_t u, h;
@@ -247,9 +260,10 @@ long compat_fastrpc_device_ioctl(struct file *filp, unsigned int cmd, 
	switch (cmd) {

	case COMPAT_FASTRPC_IOCTL_INVOKE:

	case COMPAT_FASTRPC_IOCTL_INVOKE_FD:

	case COMPAT_FASTRPC_IOCTL_INVOKE_ATTRS:

	{

		struct compat_fastrpc_ioctl_invoke_fd __user *inv32;

		struct fastrpc_ioctl_invoke_fd __user *inv;

		struct compat_fastrpc_ioctl_invoke_attrs __user *inv32;

		struct fastrpc_ioctl_invoke_attrs __user *inv;

		long ret;



		inv32 = compat_ptr(arg);
@@ -257,8 +271,8 @@ long compat_fastrpc_device_ioctl(struct file *filp, unsigned int cmd, 
							&inv, cmd));

		if (err)

			return err;

		ret = filp->f_op->unlocked_ioctl(filp, FASTRPC_IOCTL_INVOKE_FD,

							(unsigned long)inv);

		ret = filp->f_op->unlocked_ioctl(filp,

				FASTRPC_IOCTL_INVOKE_ATTRS, (unsigned long)inv);

		if (ret)

			return ret;

		VERIFY(err, 0 == compat_put_fastrpc_ioctl_invoke(inv32, inv));

drivers/char/adsprpc_shared.h

+17 −6
Original line number Diff line number Diff line
@@ -22,10 +22,15 @@ 
#define FASTRPC_IOCTL_INVOKE_FD	_IOWR('R', 4, struct fastrpc_ioctl_invoke_fd)

#define FASTRPC_IOCTL_SETMODE	_IOWR('R', 5, uint32_t)

#define FASTRPC_IOCTL_INIT	_IOWR('R', 6, struct fastrpc_ioctl_init)

#define FASTRPC_IOCTL_INVOKE_ATTRS \

				_IOWR('R', 7, struct fastrpc_ioctl_invoke_attrs)

#define FASTRPC_GLINK_GUID "fastrpcglink-apps-dsp"

#define FASTRPC_SMD_GUID "fastrpcsmd-apps-dsp"

#define DEVICE_NAME      "adsprpc-smd"



/* Set for buffers that have no virtual mapping in userspace */

#define FASTRPC_ATTR_NOVA 0x1



/* Driver should operate in parallel with the co-processor */

#define FASTRPC_MODE_PARALLEL    0
@@ -125,6 +130,12 @@ struct fastrpc_ioctl_invoke_fd { 
	int *fds;		/* fd list */

};



struct fastrpc_ioctl_invoke_attrs {

	struct fastrpc_ioctl_invoke inv;

	int *fds;		/* fd list */

	unsigned *attrs;	/* attribute list */

};



struct fastrpc_ioctl_init {

	uint32_t flags;		/* one of FASTRPC_INIT_* macros */

	uintptr_t __user file;	/* pointer to elf file */