evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

msm: ADSPRPC: attributes to support per-buffer coherent mappings

Browse source 
Added attributes for forcing a buffer mapped as coherent or
non-coherent by using the DMA_ATTR_FORCE_COHERENT and
DMA_ATTR_FORCE_NON_COHERENT.

Change-Id: Ifecad81dd96b99ab63854bddce378ff775c22d38
Acked-by: Viswanatham Paduchuri <vpaduchu@qti.qualcomm.com>
Signed-off-by: Sathish Ambley <sathishambley@codeaurora.org>
This commit is contained in:
Sathish Ambley 2017-01-06 09:50:11 -08:00
parent 2dc96b1cbb
commit e83e4c14e9
2 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/char/adsprpc.c
View file

@ -1,5 +1,5 @@
/* /*
* 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -606,6 +606,13 @@ static int fastrpc_mmap_create(struct fastrpc_file *fl, int fd, unsigned attr,
if (sess->smmu.enabled) { if (sess->smmu.enabled) {
init_dma_attrs(&attrs); init_dma_attrs(&attrs);
dma_set_attr(DMA_ATTR_EXEC_MAPPING, &attrs); dma_set_attr(DMA_ATTR_EXEC_MAPPING, &attrs);
if (map->attr & FASTRPC_ATTR_NON_COHERENT)
dma_set_attr(DMA_ATTR_FORCE_NON_COHERENT,
&attrs);
else if (map->attr & FASTRPC_ATTR_COHERENT)
dma_set_attr(DMA_ATTR_FORCE_COHERENT, &attrs);
VERIFY(err, map->table->nents == VERIFY(err, map->table->nents ==
msm_dma_map_sg_attrs(sess->dev, msm_dma_map_sg_attrs(sess->dev,
map->table->sgl, map->table->nents, map->table->sgl, map->table->nents,
@ -1143,10 +1150,15 @@ static int get_args(uint32_t kernel, struct smq_invoke_ctx *ctx)
for (oix = 0; oix < inbufs + outbufs; ++oix) { for (oix = 0; oix < inbufs + outbufs; ++oix) {
int i = ctx->overps[oix]->raix; int i = ctx->overps[oix]->raix;
struct fastrpc_mmap *map = ctx->maps[i]; struct fastrpc_mmap *map = ctx->maps[i];
if (ctx->fl->sctx->smmu.coherent)
continue;
if (map && map->uncached) if (map && map->uncached)
continue; continue;
if (ctx->fl->sctx->smmu.coherent &&
!(map && (map->attr & FASTRPC_ATTR_NON_COHERENT)))
continue;
if (map && (map->attr & FASTRPC_ATTR_COHERENT))
continue;
if (rpra[i].buf.len && ctx->overps[oix]->mstart) if (rpra[i].buf.len && ctx->overps[oix]->mstart)
dmac_flush_range(uint64_to_ptr(rpra[i].buf.pv), dmac_flush_range(uint64_to_ptr(rpra[i].buf.pv),
uint64_to_ptr(rpra[i].buf.pv + rpra[i].buf.len)); uint64_to_ptr(rpra[i].buf.pv + rpra[i].buf.len));
@ -1213,6 +1225,12 @@ static void inv_args_pre(struct smq_invoke_ctx *ctx)
continue; continue;
if (!rpra[i].buf.len) if (!rpra[i].buf.len)
continue; continue;
if (ctx->fl->sctx->smmu.coherent &&
!(map && (map->attr & FASTRPC_ATTR_NON_COHERENT)))
continue;
if (map && (map->attr & FASTRPC_ATTR_COHERENT))
continue;
if (buf_page_start(ptr_to_uint64((void *)rpra)) == if (buf_page_start(ptr_to_uint64((void *)rpra)) ==
buf_page_start(rpra[i].buf.pv)) buf_page_start(rpra[i].buf.pv))
continue; continue;
@ -1239,10 +1257,17 @@ static void inv_args(struct smq_invoke_ctx *ctx)
outbufs = REMOTE_SCALARS_OUTBUFS(sc); outbufs = REMOTE_SCALARS_OUTBUFS(sc);
for (i = inbufs; i < inbufs + outbufs; ++i) { for (i = inbufs; i < inbufs + outbufs; ++i) {
struct fastrpc_mmap *map = ctx->maps[i]; struct fastrpc_mmap *map = ctx->maps[i];
if (map && map->uncached) if (map && map->uncached)
continue; continue;
if (!rpra[i].buf.len) if (!rpra[i].buf.len)
continue; continue;
if (ctx->fl->sctx->smmu.coherent &&
!(map && (map->attr & FASTRPC_ATTR_NON_COHERENT)))
continue;
if (map && (map->attr & FASTRPC_ATTR_COHERENT))
continue;
if (buf_page_start(ptr_to_uint64((void *)rpra)) == if (buf_page_start(ptr_to_uint64((void *)rpra)) ==
buf_page_start(rpra[i].buf.pv)) { buf_page_start(rpra[i].buf.pv)) {
inv = 1; inv = 1;
@ -1389,15 +1414,13 @@ static int fastrpc_internal_invoke(struct fastrpc_file *fl, uint32_t mode,
goto bail; goto bail;
} }
if (!fl->sctx->smmu.coherent) {
inv_args_pre(ctx); inv_args_pre(ctx);
if (mode == FASTRPC_MODE_SERIAL) if (mode == FASTRPC_MODE_SERIAL)
inv_args(ctx); inv_args(ctx);
}
VERIFY(err, 0 == fastrpc_invoke_send(ctx, kernel, invoke->handle)); VERIFY(err, 0 == fastrpc_invoke_send(ctx, kernel, invoke->handle));
if (err) if (err)
goto bail; goto bail;
if (mode == FASTRPC_MODE_PARALLEL && !fl->sctx->smmu.coherent) if (mode == FASTRPC_MODE_PARALLEL)
inv_args(ctx); inv_args(ctx);
wait: wait:
if (kernel) if (kernel)

8
drivers/char/adsprpc_shared.h
View file

@ -1,5 +1,5 @@
/* /*
* 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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -33,6 +33,12 @@
/* Set for buffers that have no virtual mapping in userspace */ /* Set for buffers that have no virtual mapping in userspace */
#define FASTRPC_ATTR_NOVA 0x1 #define FASTRPC_ATTR_NOVA 0x1
/* Set for buffers that are NOT dma coherent */
#define FASTRPC_ATTR_NON_COHERENT 0x2
/* Set for buffers that are dma coherent */
#define FASTRPC_ATTR_COHERENT 0x4
/* Driver should operate in parallel with the co-processor */ /* Driver should operate in parallel with the co-processor */
#define FASTRPC_MODE_PARALLEL 0 #define FASTRPC_MODE_PARALLEL 0