From: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx> A buffer shared with MPU and DSP has to be aligned on both cache line size to avoid memory corrupton with some DSP cache operations. Since there's no way for dspbridge to know how the shared buffer will be used like: "read-only", "write-only", "rw" through its life span, any shared buffer passed to DSP should be on this alignment. This patch adds checking those shared buffer alignement in bridgedriver cache operations and prevents userland applications from causing the above memory corruption. Please refer to: https://omapzoom.org/gf/download/docmanfileversion/52/985/DSP_cache.pdf Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx> --- drivers/dsp/bridge/rmgr/proc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/drivers/dsp/bridge/rmgr/proc.c b/drivers/dsp/bridge/rmgr/proc.c index 59073dd..437c3fe 100644 --- a/drivers/dsp/bridge/rmgr/proc.c +++ b/drivers/dsp/bridge/rmgr/proc.c @@ -159,6 +159,8 @@ #define PWR_TIMEOUT 500 /* Sleep/wake timout in msec */ #define EXTEND "_EXT_END" /* Extmem end addr in DSP binary */ +#define DSP_CACHE_SIZE 128 /* DSP cacheline size */ + extern char *iva_img; /* The PROC_OBJECT structure. */ struct PROC_OBJECT { @@ -722,6 +724,13 @@ DSP_STATUS PROC_FlushMemory(DSP_HPROCESSOR hProcessor, void *pMpuAddr, enum DSP_FLUSHTYPE FlushMemType = PROC_WRITEBACK_INVALIDATE_MEM; DBC_Require(cRefs > 0); + if (!IS_ALIGNED((u32)pMpuAddr, DSP_CACHE_SIZE) || + !IS_ALIGNED(ulSize, DSP_CACHE_SIZE)) { + pr_err("%s: Invalid alignment %p %x\n", + __func__, pMpuAddr, ulSize); + return DSP_EALIGNMENT; + } + GT_4trace(PROC_DebugMask, GT_ENTER, "Entered PROC_FlushMemory, args:\n\t" "hProcessor: 0x%x pMpuAddr: 0x%x ulSize 0x%x, ulFlags 0x%x\n", @@ -753,6 +762,14 @@ DSP_STATUS PROC_InvalidateMemory(DSP_HPROCESSOR hProcessor, void *pMpuAddr, "Entered PROC_InvalidateMemory, args:\n\t" "hProcessor: 0x%x pMpuAddr: 0x%x ulSize 0x%x\n", hProcessor, pMpuAddr, ulSize); + + if (!IS_ALIGNED((u32)pMpuAddr, DSP_CACHE_SIZE) || + !IS_ALIGNED(ulSize, DSP_CACHE_SIZE)) { + pr_err("%s: Invalid alignment %p %x\n", + __func__, pMpuAddr, ulSize); + return DSP_EALIGNMENT; + } + (void)SYNC_EnterCS(hProcLock); MEM_FlushCache(pMpuAddr, ulSize, FlushMemType); (void)SYNC_LeaveCS(hProcLock); -- 1.6.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
