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

Commit 5e1afb6c authored by Divya Sharma's avatar Divya Sharma
Browse files

Revert "msm: adsprpc: use same CPU address during DMA allocation and free" 



This reverts commit 1c087f09.

Change-Id: Ic4912eacc50abe7f367d70afd4305b573ea09680
Signed-off-by: default avatarDivya Sharma <divyash@codeaurora.org>
parent 799d9375

drivers/char/adsprpc.c

+6 −11
Original line number Diff line number Diff line
@@ -790,7 +790,7 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, 
			goto bail;

		map->phys = (uintptr_t)region_phys;

		map->size = len;

		map->va = (uintptr_t)region_vaddr;

		map->va = 0;

	} else if (mflags == FASTRPC_DMAHANDLE_NOMAP) {

		VERIFY(err, !IS_ERR_OR_NULL(map->buf = dma_buf_get(fd)));

		if (err)
@@ -2035,6 +2035,7 @@ static int fastrpc_init_process(struct fastrpc_file *fl, 
						DMA_ATTR_NO_KERNEL_MAPPING |

						DMA_ATTR_FORCE_NON_COHERENT;

		err = fastrpc_buf_alloc(fl, memlen, imem_dma_attr, 0, 0, &imem);

		imem->virt = NULL;

		if (err)

			goto bail;

		fl->init_mem = imem;
@@ -2576,14 +2577,14 @@ static int fastrpc_internal_mmap(struct fastrpc_file *fl, 
								1, &rbuf);

		if (err)

			goto bail;

		err = fastrpc_mmap_on_dsp(fl, ud->flags, 0,

		rbuf->virt = NULL;

		err = fastrpc_mmap_on_dsp(fl, ud->flags,

				(uintptr_t)rbuf->virt,

				rbuf->phys, rbuf->size, &raddr);

		if (err)

			goto bail;

		rbuf->raddr = raddr;

	} else {

		uintptr_t va_to_dsp;



		mutex_lock(&fl->map_mutex);

		VERIFY(err, !fastrpc_mmap_create(fl, ud->fd, 0,

				(uintptr_t)ud->vaddrin, ud->size,
@@ -2591,13 +2592,7 @@ static int fastrpc_internal_mmap(struct fastrpc_file *fl, 
		mutex_unlock(&fl->map_mutex);

		if (err)

			goto bail;



		if (ud->flags == ADSP_MMAP_HEAP_ADDR ||

				ud->flags == ADSP_MMAP_REMOTE_HEAP_ADDR)

			va_to_dsp = 0;

		else

			va_to_dsp = (uintptr_t)map->va;

		VERIFY(err, 0 == fastrpc_mmap_on_dsp(fl, ud->flags, va_to_dsp,

		VERIFY(err, 0 == fastrpc_mmap_on_dsp(fl, ud->flags, map->va,

				map->phys, map->size, &raddr));

		if (err)

			goto bail;