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

Commit 975b1bb5 authored by Mitchel Humpherys's avatar Mitchel Humpherys
Browse files

msm: ADSPRPC: Always map buffers into IOMMU if one is present 



If the buffers are not mapped into IOMMU and the physical address
is passed to remote processor, then it could result in IOMMU faults
if the passed physical address falls in the IOMMU virtual address
range. Map all buffers into IOMMU if one is present and do not pass
the physical address directly to the remote processor.

Change-Id: Id567ac4bff16f49487439d1d505dd25b88ed2868
Acked-by: default avatarSathish Ambley <sambley@qualcomm.com>
Signed-off-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
parent 4ae4d503

drivers/char/adsprpc.c

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

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

 * Copyright (c) 2012-2014, 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
@@ -596,10 +596,7 @@ static int get_args(uint32_t kernel, uint32_t sc, remote_arg_t *pra, 
		rpra[i].buf.len = pra[i].buf.len;

		if (!rpra[i].buf.len)

			continue;

		if (list[i].num) {

			rpra[i].buf.pv = pra[i].buf.pv;

			continue;

		} else if (me->channel[cid].smmu.enabled &&

		if (me->channel[cid].smmu.enabled &&

					fds && (fds[i] >= 0)) {

			len = buf_page_size(pra[i].buf.len);

			handles[i] = ion_import_dma_buf(me->iclient, fds[i]);
@@ -616,6 +613,9 @@ static int get_args(uint32_t kernel, uint32_t sc, remote_arg_t *pra, 
			pages[list[i].pgidx].addr = iova;

			pages[list[i].pgidx].size = len;

			continue;

		} else if (list[i].num) {

			rpra[i].buf.pv = pra[i].buf.pv;

			continue;

		}

		if (rlen < pra[i].buf.len) {

			struct fastrpc_buf *b;