diff options
| author | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2019-03-07 10:12:24 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-28 02:09:57 +0900 |
| commit | 415a0729bd1225f0ffbc0ba82888dd65772554f7 (patch) | |
| tree | 3391d12659b560aacdc57ab5015f653da999c2af /drivers/misc/fastrpc.c | |
| parent | b49f6d83e290f17e20f4e5cf31288d3bb4955ea6 (diff) | |
| download | linux-stable-415a0729bd1225f0ffbc0ba82888dd65772554f7.tar.gz linux-stable-415a0729bd1225f0ffbc0ba82888dd65772554f7.tar.bz2 linux-stable-415a0729bd1225f0ffbc0ba82888dd65772554f7.zip | |
misc: fastrpc: make sure memory read and writes are visible
dma_alloc_coherent buffers could have writes queued in store buffers so
commit them before sending buffer to DSP using correct dma barriers.
Same with vice-versa.
Fixes: c68cfb718c8f ("misc: fastrpc: Add support for context Invoke method")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/fastrpc.c')
| -rw-r--r-- | drivers/misc/fastrpc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index ecb56648b1bb..986c9aee539a 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c @@ -792,6 +792,9 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel, if (err) goto bail; } + + /* make sure that all CPU memory writes are seen by DSP */ + dma_wmb(); /* Send invoke buffer to remote dsp */ err = fastrpc_invoke_send(fl->sctx, ctx, kernel, handle); if (err) @@ -808,6 +811,8 @@ static int fastrpc_internal_invoke(struct fastrpc_user *fl, u32 kernel, goto bail; if (ctx->nscalars) { + /* make sure that all memory writes by DSP are seen by CPU */ + dma_rmb(); /* populate all the output buffers with results */ err = fastrpc_put_args(ctx, kernel); if (err) |