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

Commit b97f5c31 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: Use unsigned integer for length values"

parents bb7ef39b 6ca19cf5

drivers/char/adsprpc.c

+103 −91
Original line number Diff line number Diff line
@@ -85,11 +85,11 @@ static inline uint64_t buf_page_offset(uint64_t buf) 
	return offset;

}



static inline int buf_num_pages(uint64_t buf, ssize_t len)

static inline uint64_t buf_num_pages(uint64_t buf, size_t len)

{

	uint64_t start = buf_page_start(buf) >> PAGE_SHIFT;

	uint64_t end = (((uint64_t) buf + len - 1) & PAGE_MASK) >> PAGE_SHIFT;

	int nPages = end - start + 1;

	uint64_t nPages = end - start + 1;

	return nPages;

}
@@ -123,7 +123,7 @@ struct fastrpc_buf { 
	struct fastrpc_file *fl;

	void *virt;

	uint64_t phys;

	ssize_t size;

	size_t size;

};



struct fastrpc_ctx_lst;
@@ -148,7 +148,7 @@ struct smq_invoke_ctx { 
	int *fds;

	struct fastrpc_mmap **maps;

	struct fastrpc_buf *buf;

	ssize_t used;

	size_t used;

	struct fastrpc_file *fl;

	uint32_t sc;

	struct overlap *overs;
@@ -231,9 +231,9 @@ struct fastrpc_mmap { 
	struct dma_buf_attachment *attach;

	struct ion_handle *handle;

	uint64_t phys;

	ssize_t size;

	size_t size;

	uintptr_t va;

	ssize_t len;

	size_t len;

	int refs;

	uintptr_t raddr;

	int uncached;
@@ -278,7 +278,7 @@ static struct fastrpc_channel_ctx gcinfo[NUM_CHANNELS] = { 


static void fastrpc_buf_free(struct fastrpc_buf *buf, int cache)

{

	struct fastrpc_file *fl = buf == 0 ? 0 : buf->fl;

	struct fastrpc_file *fl = buf == NULL ? NULL : buf->fl;

	int vmid;



	if (!fl)
@@ -313,7 +313,8 @@ static void fastrpc_buf_list_free(struct fastrpc_file *fl) 
	struct fastrpc_buf *buf, *free;

	do {

		struct hlist_node *n;

		free = 0;



		free = NULL;

		spin_lock(&fl->hlock);

		hlist_for_each_entry_safe(buf, n, &fl->bufs, hn) {

			hlist_del_init(&buf->hn);
@@ -344,11 +345,13 @@ static void fastrpc_mmap_add(struct fastrpc_mmap *map) 
}



static int fastrpc_mmap_find(struct fastrpc_file *fl, int fd, uintptr_t va,

			ssize_t len, int mflags, struct fastrpc_mmap **ppmap)

			size_t len, int mflags, struct fastrpc_mmap **ppmap)

{

	struct fastrpc_apps *me = &gfa;

	struct fastrpc_mmap *match = 0, *map;

	struct fastrpc_mmap *match = NULL, *map = NULL;

	struct hlist_node *n;

	if ((va + len) < va)

		return -EOVERFLOW;

	if (mflags == ADSP_MMAP_HEAP_ADDR) {

		spin_lock(&me->hlock);

		hlist_for_each_entry_safe(map, n, &me->maps, hn) {
@@ -381,10 +384,10 @@ static int fastrpc_mmap_find(struct fastrpc_file *fl, int fd, uintptr_t va, 
	return -ENOTTY;

}



static int dma_alloc_memory(phys_addr_t *region_start, ssize_t size)

static int dma_alloc_memory(phys_addr_t *region_start, size_t size)

{

	struct fastrpc_apps *me = &gfa;

	void *vaddr = 0;

	void *vaddr = NULL;

	DEFINE_DMA_ATTRS(attrs);



	if (me->dev == NULL) {
@@ -404,9 +407,9 @@ static int dma_alloc_memory(phys_addr_t *region_start, ssize_t size) 
}



static int fastrpc_mmap_remove(struct fastrpc_file *fl, uintptr_t va,

			       ssize_t len, struct fastrpc_mmap **ppmap)

			       size_t len, struct fastrpc_mmap **ppmap)

{

	struct fastrpc_mmap *match = 0, *map;

	struct fastrpc_mmap *match = NULL, *map = NULL;

	struct hlist_node *n;

	struct fastrpc_apps *me = &gfa;
@@ -513,11 +516,11 @@ static void fastrpc_mmap_free(struct fastrpc_mmap *map) 
}



static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, uintptr_t va,

			ssize_t len, int mflags, struct fastrpc_mmap **ppmap)

			size_t len, int mflags, struct fastrpc_mmap **ppmap)

{

	struct fastrpc_apps *me = &gfa;

	struct fastrpc_session_ctx *sess = fl->sctx;

	struct fastrpc_mmap *map = 0;

	struct fastrpc_mmap *map = NULL;

	struct dma_attrs attrs;

	phys_addr_t region_start = 0;

	unsigned long flags;
@@ -536,7 +539,7 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, uintptr_t va, 
	map->fd = fd;

	if (mflags == ADSP_MMAP_HEAP_ADDR) {

		map->apps = me;

		map->fl = 0;

		map->fl = NULL;

		VERIFY(err, !dma_alloc_memory(&region_start, len));

		if (err)

			goto bail;
@@ -611,11 +614,11 @@ bail: 
	return err;

}



static int fastrpc_buf_alloc(struct fastrpc_file *fl, ssize_t size,

static int fastrpc_buf_alloc(struct fastrpc_file *fl, size_t size,

			     struct fastrpc_buf **obuf)

{

	int err = 0, vmid;

	struct fastrpc_buf *buf = 0, *fr = 0;

	struct fastrpc_buf *buf = NULL, *fr = NULL;

	struct hlist_node *n;



	VERIFY(err, size > 0);
@@ -635,13 +638,13 @@ static int fastrpc_buf_alloc(struct fastrpc_file *fl, ssize_t size, 
		*obuf = fr;

		return 0;

	}

	buf = 0;

	VERIFY(err, buf = kzalloc(sizeof(*buf), GFP_KERNEL));

	buf = NULL;

	VERIFY(err, NULL != (buf = kzalloc(sizeof(*buf), GFP_KERNEL)));

	if (err)

		goto bail;

	INIT_HLIST_NODE(&buf->hn);

	buf->fl = fl;

	buf->virt = 0;

	buf->virt = NULL;

	buf->phys = 0;

	buf->size = size;

	buf->virt = dma_alloc_coherent(fl->sctx->dev, buf->size,
@@ -682,7 +685,7 @@ static int context_restore_interrupted(struct fastrpc_file *fl, 
				       struct smq_invoke_ctx **po)

{

	int err = 0;

	struct smq_invoke_ctx *ctx = 0, *ictx = 0;

	struct smq_invoke_ctx *ctx = NULL, *ictx = NULL;

	struct hlist_node *n;

	struct fastrpc_ioctl_invoke *invoke = &invokefd->inv;

	spin_lock(&fl->hlock);
@@ -735,7 +738,7 @@ static int context_build_overlap(struct smq_invoke_ctx *ctx) 
		ctx->overs[i].raix = i;

		ctx->overps[i] = &ctx->overs[i];

	}

	sort(ctx->overps, nbufs, sizeof(*ctx->overps), overlap_ptr_cmp, 0);

	sort(ctx->overps, nbufs, sizeof(*ctx->overps), overlap_ptr_cmp, NULL);

	max.start = 0;

	max.end = 0;

	for (i = 0; i < nbufs; ++i) {
@@ -764,7 +767,8 @@ bail: 
#define K_COPY_FROM_USER(err, kernel, dst, src, size) \

	do {\

		if (!(kernel))\

			VERIFY(err, 0 == copy_from_user((dst), (src),\

			VERIFY(err, 0 == copy_from_user((dst),\

			(void const __user *)(src),\

							(size)));\

		else\

			memmove((dst), (src), (size));\
@@ -773,8 +777,8 @@ bail: 
#define K_COPY_TO_USER(err, kernel, dst, src, size) \

	do {\

		if (!(kernel))\

			VERIFY(err, 0 == copy_to_user((dst), (src),\

						      (size)));\

			VERIFY(err, 0 == copy_to_user((void __user *)(dst), \

						(src), (size)));\

		else\

			memmove((dst), (src), (size));\

	} while (0)
@@ -787,7 +791,7 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel, 
			 struct smq_invoke_ctx **po)

{

	int err = 0, bufs, size = 0;

	struct smq_invoke_ctx *ctx = 0;

	struct smq_invoke_ctx *ctx = NULL;

	struct fastrpc_ctx_lst *clst = &fl->clst;

	struct fastrpc_ioctl_invoke *invoke = &invokefd->inv;
@@ -797,7 +801,7 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel, 
		sizeof(*ctx->overs) * (bufs) +

		sizeof(*ctx->overps) * (bufs);



	VERIFY(err, ctx = kzalloc(sizeof(*ctx) + size, GFP_KERNEL));

	VERIFY(err, NULL != (ctx = kzalloc(sizeof(*ctx) + size, GFP_KERNEL)));

	if (err)

		goto bail;
@@ -810,7 +814,7 @@ static int context_alloc(struct fastrpc_file *fl, uint32_t kernel, 
	ctx->overs = (struct overlap *)(&ctx->fds[bufs]);

	ctx->overps = (struct overlap **)(&ctx->overs[bufs]);



	K_COPY_FROM_USER(err, kernel, ctx->lpra, invoke->pra,

	K_COPY_FROM_USER(err, kernel, (void *)ctx->lpra, invoke->pra,

					bufs * sizeof(*ctx->lpra));

	if (err)

		goto bail;
@@ -913,10 +917,10 @@ static void context_list_ctor(struct fastrpc_ctx_lst *me) 
static void fastrpc_context_list_dtor(struct fastrpc_file *fl)

{

	struct fastrpc_ctx_lst *clst = &fl->clst;

	struct smq_invoke_ctx *ictx = 0, *ctxfree;

	struct smq_invoke_ctx *ictx = NULL, *ctxfree;

	struct hlist_node *n;

	do {

		ctxfree = 0;

		ctxfree = NULL;

		spin_lock(&fl->hlock);

		hlist_for_each_entry_safe(ictx, n, &clst->interrupted, hn) {

			hlist_del_init(&ictx->hn);
@@ -928,7 +932,7 @@ static void fastrpc_context_list_dtor(struct fastrpc_file *fl) 
			context_free(ctxfree);

	} while (ctxfree);

	do {

		ctxfree = 0;

		ctxfree = NULL;

		spin_lock(&fl->hlock);

		hlist_for_each_entry_safe(ictx, n, &clst->pending, hn) {

			hlist_del_init(&ictx->hn);
@@ -947,7 +951,7 @@ static void fastrpc_file_list_dtor(struct fastrpc_apps *me) 
	struct fastrpc_file *fl, *free;

	struct hlist_node *n;

	do {

		free = 0;

		free = NULL;

		spin_lock(&me->hlock);

		hlist_for_each_entry_safe(fl, n, &me->drivers, hn) {

			hlist_del_init(&fl->hn);
@@ -971,31 +975,32 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
	int outbufs = REMOTE_SCALARS_OUTBUFS(sc);

	int bufs = inbufs + outbufs;

	uintptr_t args;

	ssize_t rlen = 0, copylen = 0, metalen = 0;

	size_t rlen = 0, copylen = 0, metalen = 0;

	int i, inh, oix;

	int err = 0;

	int mflags = 0;



	/* calculate size of the metadata */

	rpra = 0;

	rpra = NULL;

	list = smq_invoke_buf_start(rpra, sc);

	pages = smq_phy_page_start(sc, list);

	ipage = pages;



	for (i = 0; i < bufs; ++i) {

		uintptr_t buf = (uintptr_t)lpra[i].buf.pv;

		ssize_t len = lpra[i].buf.len;

		size_t len = lpra[i].buf.len;

		if (ctx->fds[i])

			fastrpc_mmap_create(ctx->fl, ctx->fds[i], buf, len,

					    mflags, &ctx->maps[i]);

		ipage += 1;

	}

	metalen = copylen = (ssize_t)&ipage[0];

	metalen = copylen = (size_t)&ipage[0];

	/* calculate len requreed for copying */

	for (oix = 0; oix < inbufs + outbufs; ++oix) {

		int i = ctx->overps[oix]->raix;

		uintptr_t mstart, mend;

		ssize_t len = lpra[i].buf.len;

		size_t len = lpra[i].buf.len;



		if (!len)

			continue;

		if (ctx->maps[i])
@@ -1028,7 +1033,7 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
	ipage = pages;

	args = (uintptr_t)ctx->buf->virt + metalen;

	for (i = 0; i < bufs; ++i) {

		ssize_t len = lpra[i].buf.len;

		size_t len = lpra[i].buf.len;

		list[i].num = 0;

		list[i].pgidx = 0;

		if (!len)
@@ -1041,7 +1046,7 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
	for (i = 0; i < inbufs + outbufs; ++i) {

		struct fastrpc_mmap *map = ctx->maps[i];

		uint64_t buf = ptr_to_uint64(lpra[i].buf.pv);

		ssize_t len = lpra[i].buf.len;

		size_t len = lpra[i].buf.len;

		rpra[i].buf.pv = 0;

		rpra[i].buf.len = len;

		if (!len)
@@ -1049,7 +1054,7 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
		if (map) {

			struct vm_area_struct *vma;

			uintptr_t offset;

			int num = buf_num_pages(buf, len);

			uint64_t num = buf_num_pages(buf, len);

			int idx = list[i].pgidx;



			down_read(&current->mm->mmap_sem);
@@ -1075,9 +1080,10 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx) 
	for (oix = 0; oix < inbufs + outbufs; ++oix) {

		int i = ctx->overps[oix]->raix;

		struct fastrpc_mmap *map = ctx->maps[i];

		ssize_t mlen;

		size_t mlen;

		uint64_t buf;

		ssize_t len = lpra[i].buf.len;

		size_t len = lpra[i].buf.len;



		if (!len)

			continue;

		if (map)
@@ -1157,7 +1163,7 @@ static int put_args(uint32_t kernel, struct smq_invoke_ctx *ctx, 
				goto bail;

		} else {

			fastrpc_mmap_free(ctx->maps[i]);

			ctx->maps[i] = 0;

			ctx->maps[i] = NULL;

		}

	}

	size = sizeof(*rpra) * REMOTE_SCALARS_OUTHANDLES(sc);
@@ -1256,7 +1262,7 @@ static int fastrpc_invoke_send(struct smq_invoke_ctx *ctx, 
	struct fastrpc_file *fl = ctx->fl;

	int err = 0, len;



	VERIFY(err, 0 != fl->apps->channel[fl->cid].chan);

	VERIFY(err, NULL != fl->apps->channel[fl->cid].chan);

	if (err)

		goto bail;

	msg->pid = current->tgid;
@@ -1347,13 +1353,13 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode, 
				   uint32_t kernel,

				   struct fastrpc_ioctl_invoke_fd *invokefd)

{

	struct smq_invoke_ctx *ctx = 0;

	struct smq_invoke_ctx *ctx = NULL;

	struct fastrpc_ioctl_invoke *invoke = &invokefd->inv;

	int cid = fl->cid;

	int interrupted = 0;

	int err = 0;



	VERIFY(err, fl->sctx);

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

	if (err)

		goto bail;

	VERIFY(err, fl->cid >= 0 && fl->cid < NUM_CHANNELS);
@@ -1422,7 +1428,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
	int err = 0;

	struct fastrpc_ioctl_invoke_fd ioctl;

	struct smq_phy_page pages[1];

	struct fastrpc_mmap *file = 0, *mem = 0;

	struct fastrpc_mmap *file = NULL, *mem = NULL;

	if (init->flags == FASTRPC_INIT_ATTACH) {

		remote_arg_t ra[1];

		int tgid = current->tgid;
@@ -1431,7 +1437,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
		ioctl.inv.handle = 1;

		ioctl.inv.sc = REMOTE_SCALARS_MAKE(0, 1, 0);

		ioctl.inv.pra = ra;

		ioctl.fds = 0;

		ioctl.fds = NULL;

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

			FASTRPC_MODE_PARALLEL, 1, &ioctl)));

		if (err)
@@ -1505,7 +1511,7 @@ static int fastrpc_release_current_dsp_process(struct fastrpc_file *fl) 
	remote_arg_t ra[1];

	int tgid = 0;



	VERIFY(err, fl->apps->channel[fl->cid].chan != 0);

	VERIFY(err, fl->apps->channel[fl->cid].chan != NULL);

	if (err)

		goto bail;

	tgid = fl->tgid;
@@ -1514,7 +1520,7 @@ static int fastrpc_release_current_dsp_process(struct fastrpc_file *fl) 
	ioctl.inv.handle = 1;

	ioctl.inv.sc = REMOTE_SCALARS_MAKE(1, 1, 0);

	ioctl.inv.pra = ra;

	ioctl.fds = 0;

	ioctl.fds = NULL;

	VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl,

		FASTRPC_MODE_PARALLEL, 1, &ioctl)));

bail:
@@ -1559,7 +1565,7 @@ static int fastrpc_mmap_on_dsp(struct fastrpc_file *fl, uint32_t flags, 
	else

		ioctl.inv.sc = REMOTE_SCALARS_MAKE(2, 2, 1);

	ioctl.inv.pra = ra;

	ioctl.fds = 0;

	ioctl.fds = NULL;

	VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl,

		FASTRPC_MODE_PARALLEL, 1, &ioctl)));

	map->raddr = (uintptr_t)routargs.vaddrout;
@@ -1597,7 +1603,7 @@ static int fastrpc_munmap_on_dsp_rh(struct fastrpc_file *fl, 
	ioctl.inv.handle = 1;

	ioctl.inv.sc = REMOTE_SCALARS_MAKE(7, 0, 1);

	ioctl.inv.pra = ra;

	ioctl.fds = 0;

	ioctl.fds = NULL;



	VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl,

			FASTRPC_MODE_PARALLEL, 1, &ioctl)));
@@ -1624,7 +1630,7 @@ static int fastrpc_munmap_on_dsp(struct fastrpc_file *fl, 
	struct {

		int pid;

		uintptr_t vaddrout;

		ssize_t size;

		size_t size;

	} inargs;

	if (map->flags == ADSP_MMAP_HEAP_ADDR) {

		VERIFY(err, !fastrpc_munmap_on_dsp_rh(fl, map));
@@ -1644,7 +1650,7 @@ static int fastrpc_munmap_on_dsp(struct fastrpc_file *fl, 
	else

		ioctl.inv.sc = REMOTE_SCALARS_MAKE(3, 1, 0);

	ioctl.inv.pra = ra;

	ioctl.fds = 0;

	ioctl.fds = NULL;

	VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl,

		FASTRPC_MODE_PARALLEL, 1, &ioctl)));

bail:
@@ -1653,7 +1659,7 @@ bail: 


static int fastrpc_mmap_remove_ssr(struct fastrpc_file *fl)

{

	struct fastrpc_mmap *match = 0, *map = NULL;

	struct fastrpc_mmap *match = NULL, *map = NULL;

	struct hlist_node *n = NULL;

	int err = 0, ret = 0;

	struct fastrpc_apps *me = &gfa;
@@ -1694,7 +1700,7 @@ bail: 
}



static int fastrpc_mmap_remove(struct fastrpc_file *fl, uintptr_t va,

			     ssize_t len, struct fastrpc_mmap **ppmap);

			     size_t len, struct fastrpc_mmap **ppmap);



static void fastrpc_mmap_add(struct fastrpc_mmap *map);
@@ -1702,7 +1708,7 @@ static int fastrpc_internal_munmap(struct fastrpc_file *fl, 
				   struct fastrpc_ioctl_munmap *ud)

{

	int err = 0;

	struct fastrpc_mmap *map = 0;

	struct fastrpc_mmap *map = NULL;

	if (!fastrpc_mmap_remove(fl, ud->vaddrout, ud->size,

				 &map)) {

		VERIFY(err, !fastrpc_munmap_on_dsp(fl, map));
@@ -1720,7 +1726,7 @@ static int fastrpc_internal_mmap(struct fastrpc_file *fl, 
				 struct fastrpc_ioctl_mmap *ud)

{



	struct fastrpc_mmap *map = 0;

	struct fastrpc_mmap *map = NULL;

	int err = 0;

	if (!fastrpc_mmap_find(fl, ud->fd, (uintptr_t)ud->vaddrin, ud->size,

			       ud->flags, &map))
@@ -1753,7 +1759,7 @@ static void fastrpc_channel_close(struct kref *kref) 
		glink_unregister_link_state_cb(ctx->link_notify_handle);

		glink_close(ctx->chan);

	}

	ctx->chan = 0;

	ctx->chan = NULL;

	mutex_unlock(&me->smd_mutex);

	cid = ctx - &gcinfo[0];

	pr_info("'closed /dev/%s c %d %d'\n", gcinfo[cid].name,
@@ -1765,7 +1771,7 @@ static void fastrpc_context_list_dtor(struct fastrpc_file *fl); 
static int fastrpc_file_free(struct fastrpc_file *fl)

{

	struct hlist_node *n;

	struct fastrpc_mmap *map = 0;

	struct fastrpc_mmap *map = NULL;

	int cid;



	if (!fl)
@@ -1841,19 +1847,20 @@ static int fastrpc_session_free(struct fastrpc_channel_ctx *chan, int session) 
	return err;

}



bool fastrpc_glink_notify_rx_intent_req(void *h, const void *priv, size_t size)

static bool fastrpc_glink_notify_rx_intent_req(void *h, const void *priv,

						size_t size)

{

	if (0 != glink_queue_rx_intent(h, NULL, size))

		return false;

	return true;

}



void fastrpc_glink_notify_tx_done(void *handle, const void *priv,

static void fastrpc_glink_notify_tx_done(void *handle, const void *priv,

		const void *pkt_priv, const void *ptr)

{

}



void fastrpc_glink_notify_rx(void *handle, const void *priv,

static void fastrpc_glink_notify_rx(void *handle, const void *priv,

	const void *pkt_priv, const void *ptr, size_t size)

{

	struct smq_invoke_rsp *rsp = (struct smq_invoke_rsp *)ptr;
@@ -1876,7 +1883,8 @@ bail: 
	glink_rx_done(handle, ptr, true);

}



void fastrpc_glink_notify_state(void *handle, const void *priv, unsigned event)

static void fastrpc_glink_notify_state(void *handle, const void *priv,

				unsigned int event)

{

	struct fastrpc_apps *me = &gfa;

	int cid = (int)(uintptr_t)priv;
@@ -1897,7 +1905,7 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) 
{

	struct fastrpc_apps *me = &gfa;

	struct fastrpc_file *fl = (struct fastrpc_file *)file->private_data;

	struct fastrpc_fl *pfl = 0;

	struct fastrpc_fl *pfl = NULL;

	int session, cid;

	int err = 0;
@@ -1931,7 +1939,7 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) 
		}

		me->pending_free++;

		mutex_unlock(&me->flfree_mutex);

		file->private_data = 0;

		file->private_data = NULL;

	}

bail:

	if (err) {
@@ -1945,8 +1953,8 @@ bail: 
static void file_free_work_handler(struct work_struct *w)

{

	struct fastrpc_apps *me = &gfa;

	struct fastrpc_fl *fl = 0, *freefl = 0;

	struct hlist_node *n = 0;

	struct fastrpc_fl *fl = NULL, *freefl = NULL;

	struct hlist_node *n = NULL;



	while (1) {

		mutex_lock(&me->flfree_mutex);
@@ -2028,7 +2036,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) 
	int err = 0, session;

	int event;

	struct fastrpc_apps *me = &gfa;

	struct fastrpc_file *fl = 0;

	struct fastrpc_file *fl = NULL;



	if (me->pending_free) {

		event = wait_event_interruptible_timeout(wait_queue,
@@ -2060,7 +2068,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) 


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

	if ((kref_get_unless_zero(&me->channel[cid].kref) == 0) ||

	    (me->channel[cid].chan == 0)) {

	    (me->channel[cid].chan == NULL)) {

		if (me->glink) {

			VERIFY(err, 0 == fastrpc_glink_open(cid, me));

		} else {
@@ -2076,7 +2084,7 @@ static int fastrpc_device_open(struct inode *inode, struct file *filp) 
		VERIFY(err, wait_for_completion_timeout(&me->channel[cid].work,

							RPC_TIMEOUT));

		if (err) {

			me->channel[cid].chan = 0;

			me->channel[cid].chan = NULL;

			goto bail;

		}

		kref_init(&me->channel[cid].kref);
@@ -2135,7 +2143,7 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int ioctl_num, 
		p.invokefd.fds = 0;

		size = (ioctl_num == FASTRPC_IOCTL_INVOKE) ?

				sizeof(p.invokefd.inv) : sizeof(p.invokefd);

		VERIFY(err, 0 == copy_from_user(&p.invokefd, param, size));

		K_COPY_FROM_USER(err, 0, &p.invokefd, param, size);

		if (err)

			goto bail;

		VERIFY(err, 0 == (err = fastrpc_internal_invoke(fl, fl->mode,
@@ -2144,20 +2152,20 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int ioctl_num, 
			goto bail;

		break;

	case FASTRPC_IOCTL_MMAP:

		VERIFY(err, 0 == copy_from_user(&p.mmap, param,

						sizeof(p.mmap)));

		K_COPY_FROM_USER(err, 0, &p.mmap, param,

						sizeof(p.mmap));

		if (err)

			goto bail;

		VERIFY(err, 0 == (err = fastrpc_internal_mmap(fl, &p.mmap)));

		if (err)

			goto bail;

		VERIFY(err, 0 == copy_to_user(param, &p.mmap, sizeof(p.mmap)));

		K_COPY_TO_USER(err, 0, param, &p.mmap, sizeof(p.mmap));

		if (err)

			goto bail;

		break;

	case FASTRPC_IOCTL_MUNMAP:

		VERIFY(err, 0 == copy_from_user(&p.munmap, param,

						sizeof(p.munmap)));

		K_COPY_FROM_USER(err, 0, &p.munmap, param,

						sizeof(p.munmap));

		if (err)

			goto bail;

		VERIFY(err, 0 == (err = fastrpc_internal_munmap(fl,
@@ -2177,10 +2185,13 @@ static long fastrpc_device_ioctl(struct file *file, unsigned int ioctl_num, 
		}

		break;

	case FASTRPC_IOCTL_GETINFO:

	    K_COPY_FROM_USER(err, 0, &info, param, sizeof(info));

		if (err)

			goto bail;

		VERIFY(err, 0 == (err = fastrpc_get_info(fl, &info)));

		if (err)

			goto bail;

		VERIFY(err, 0 == copy_to_user(param, &info, sizeof(info)));

		K_COPY_TO_USER(err, 0, param, &info, sizeof(info));

		if (err)

			goto bail;

		break;
@@ -2224,7 +2235,7 @@ static int fastrpc_restart_notifier_cb(struct notifier_block *nb, 
			} else {

				smd_close(ctx->chan);

			}

			ctx->chan = 0;

			ctx->chan = NULL;

			pr_info("'restart notifier: closed /dev/%s c %d %d'\n",

				 gcinfo[cid].name, MAJOR(me->dev_no), cid);

		}
@@ -2280,7 +2291,8 @@ static int fastrpc_cb_probe(struct device *dev) 
	int err = 0, i;

	int disable_htw = 1;



	VERIFY(err, 0 != (name = of_get_property(dev->of_node, "label", NULL)));

	VERIFY(err, NULL != (name = of_get_property(dev->of_node,

					 "label", NULL)));

	if (err)

		goto bail;

	for (i = 0; i < NUM_CHANNELS; i++) {
@@ -2327,11 +2339,11 @@ static int fastrpc_cb_legacy_probe(struct device *dev) 
{

	struct device_node *domains_child_node = NULL;

	struct device_node *ctx_node = NULL;

	struct fastrpc_channel_ctx *chan;

	struct fastrpc_session_ctx *first_sess, *sess;

	const char *name;

	unsigned int *range = 0, range_size = 0;

	unsigned int *sids = 0, sids_size = 0;

	struct fastrpc_channel_ctx *chan = NULL;

	struct fastrpc_session_ctx *first_sess = NULL, *sess = NULL;

	const char *name = NULL;

	unsigned int *range = NULL, range_size = 0;

	unsigned int *sids = NULL, sids_size = 0;

	int err = 0, ret = 0, i;

	int disable_htw = 1;
@@ -2506,17 +2518,17 @@ static void fastrpc_deinit(void) 
		if (chan->chan) {

			kref_put_mutex(&chan->kref,

				fastrpc_channel_close, &me->smd_mutex);

			chan->chan = 0;

			chan->chan = NULL;

		}

		for (j = 0; j < NUM_SESSIONS; j++) {

			struct fastrpc_session_ctx *sess = &chan->session[j];

			if (sess->smmu.enabled) {

				arm_iommu_detach_device(sess->dev);

				sess->dev = 0;

				sess->dev = NULL;

			}

			if (sess->smmu.mapping) {

				arm_iommu_release_mapping(sess->smmu.mapping);

				sess->smmu.mapping = 0;

				sess->smmu.mapping = NULL;

			}

		}

	}
@@ -2574,7 +2586,7 @@ static int __init fastrpc_device_init(void) 
		me->channel[i].ssrcount = 0;

		me->channel[i].prevssrcount = 0;

		me->channel[i].ramdumpenabled = 0;

		me->channel[i].remoteheap_ramdump_dev = 0;

		me->channel[i].remoteheap_ramdump_dev = NULL;

		me->channel[i].nb.notifier_call = fastrpc_restart_notifier_cb;

		me->channel[i].handle = subsys_notif_register_notifier(

							gcinfo[i].subsys,

drivers/char/adsprpc_compat.c

+7 −7
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -33,7 +33,7 @@ 


struct compat_remote_buf {

	compat_uptr_t pv;	/* buffer pointer */

	compat_ssize_t len;	/* length of buffer */

	compat_size_t len;	/* length of buffer */

};



union compat_remote_arg {
@@ -56,13 +56,13 @@ struct compat_fastrpc_ioctl_mmap { 
	compat_int_t fd;	/* ion fd */

	compat_uint_t flags;	/* flags for dsp to map with */

	compat_uptr_t vaddrin;	/* optional virtual address */

	compat_ssize_t size;	/* size */

	compat_size_t size;	/* size */

	compat_uptr_t vaddrout;	/* dsps virtual address */

};



struct compat_fastrpc_ioctl_munmap {

	compat_uptr_t vaddrout;	/* address to unmap */

	compat_ssize_t size;	/* size */

	compat_size_t size;	/* size */

};



struct compat_fastrpc_ioctl_init {
@@ -81,7 +81,7 @@ static int compat_get_fastrpc_ioctl_invoke( 
			unsigned int cmd)

{

	compat_uint_t u, sc;

	compat_ssize_t s;

	compat_size_t s;

	compat_uptr_t p;

	struct fastrpc_ioctl_invoke_fd *inv;

	union compat_remote_arg *pra32;
@@ -164,7 +164,7 @@ static int compat_get_fastrpc_ioctl_mmap( 
{

	compat_uint_t u;

	compat_int_t i;

	compat_ssize_t s;

	compat_size_t s;

	compat_uptr_t p;

	int err;
@@ -198,7 +198,7 @@ static int compat_get_fastrpc_ioctl_munmap( 
			struct fastrpc_ioctl_munmap __user *unmap)

{

	compat_uptr_t p;

	compat_ssize_t s;

	compat_size_t s;

	int err;



	err = get_user(p, &unmap32->vaddrout);

drivers/char/adsprpc_shared.h

+13 −12
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -95,7 +95,7 @@ do {\ 


struct remote_buf64 {

	uint64_t pv;

	int64_t len;

	uint64_t len;

};



union remote_arg64 {
@@ -107,7 +107,7 @@ union remote_arg64 { 


struct remote_buf {

	void *pv;		/* buffer pointer */

	ssize_t len;		/* length of buffer */

	size_t len;		/* length of buffer */

};



union remote_arg {
@@ -128,25 +128,25 @@ struct fastrpc_ioctl_invoke_fd { 


struct fastrpc_ioctl_init {

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

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

	int32_t filelen;	/* elf file length */

	uintptr_t file;		/* pointer to elf file */

	uint32_t filelen;	/* elf file length */

	int32_t filefd;		/* ION fd for the file */

	uintptr_t __user mem;	/* mem for the PD */

	int32_t memlen;		/* mem length */

	uintptr_t mem;		/* mem for the PD */

	uint32_t memlen;	/* mem length */

	int32_t memfd;		/* ION fd for the mem */

};



struct fastrpc_ioctl_munmap {

	uintptr_t vaddrout;	/* address to unmap */

	ssize_t size;		/* size */

	size_t size;		/* size */

};





struct fastrpc_ioctl_mmap {

	int fd;				/* ion fd */

	uint32_t flags;			/* flags for dsp to map with */

	uintptr_t __user *vaddrin;	/* optional virtual address */

	ssize_t size;			/* size */

	uintptr_t vaddrin;		/* optional virtual address */

	size_t size;			/* size */

	uintptr_t vaddrout;		/* dsps virtual address */

};
@@ -185,14 +185,15 @@ struct smq_invoke_rsp { 
static inline struct smq_invoke_buf *smq_invoke_buf_start(remote_arg64_t *pra,

							uint32_t sc)

{

	int len = REMOTE_SCALARS_LENGTH(sc);

	uint32_t len = REMOTE_SCALARS_LENGTH(sc);



	return (struct smq_invoke_buf *)(&pra[len]);

}



static inline struct smq_phy_page *smq_phy_page_start(uint32_t sc,

						struct smq_invoke_buf *buf)

{

	int nTotal = REMOTE_SCALARS_INBUFS(sc) + REMOTE_SCALARS_OUTBUFS(sc);

	uint32_t nTotal = REMOTE_SCALARS_INBUFS(sc)+REMOTE_SCALARS_OUTBUFS(sc);

	return (struct smq_phy_page *)(&buf[nTotal]);

}