Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: dw-edma: Fix unaligned 64bit access

On some arch (ie aarch64 iMX8MM) unaligned PCIe accesses are
not allowed and lead to a kernel Oops.
[ 1911.668835] Unable to handle kernel paging request at virtual address ffff80001bc00a8c
[ 1911.668841] Mem abort info:
[ 1911.668844] ESR = 0x96000061
[ 1911.668847] EC = 0x25: DABT (current EL), IL = 32 bits
[ 1911.668850] SET = 0, FnV = 0
[ 1911.668852] EA = 0, S1PTW = 0
[ 1911.668853] Data abort info:
[ 1911.668855] ISV = 0, ISS = 0x00000061
[ 1911.668857] CM = 0, WnR = 1
[ 1911.668861] swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000040ff4000
[ 1911.668864] [ffff80001bc00a8c] pgd=00000000bffff003, pud=00000000bfffe003, pmd=0068000018400705
[ 1911.668872] Internal error: Oops: 96000061 [#1] PREEMPT SMP
...

The llp register present in the channel group registers is not
aligned on 64bit.

Fix unaligned 64bit access using two 32bit accesses

Fixes: 04e0a39fc10f ("dmaengine: dw-edma: Add writeq() and readq() for 64 bits architectures")
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Link: https://lore.kernel.org/r/20220225120252.309404-1-herve.codina@bootlin.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Herve Codina and committed by
Vinod Koul
8fc5133d 545b2baa

+5 -2
+5 -2
drivers/dma/dw-edma/dw-edma-v0-core.c
··· 415 415 (DW_EDMA_V0_CCS | DW_EDMA_V0_LLE)); 416 416 /* Linked list */ 417 417 #ifdef CONFIG_64BIT 418 - SET_CH_64(dw, chan->dir, chan->id, llp.reg, 419 - chunk->ll_region.paddr); 418 + /* llp is not aligned on 64bit -> keep 32bit accesses */ 419 + SET_CH_32(dw, chan->dir, chan->id, llp.lsb, 420 + lower_32_bits(chunk->ll_region.paddr)); 421 + SET_CH_32(dw, chan->dir, chan->id, llp.msb, 422 + upper_32_bits(chunk->ll_region.paddr)); 420 423 #else /* CONFIG_64BIT */ 421 424 SET_CH_32(dw, chan->dir, chan->id, llp.lsb, 422 425 lower_32_bits(chunk->ll_region.paddr));