dmaengine: dw-edma: Removed redundant #ifdef check for 64-bit
Subsystems (2)
PATCH 1/1 dmaengine: dw-edma: Removed redundant #ifdef check for 64-bit
Commit at 8fc5133d fixed unaligned memory access, which caused both 32 and 64 bit to be the same.
#ifdef CONFIG_64BIT
/* llp is not aligned on 64bit -> keep 32bit accesses */
SET_CH_32(dw, chan->dir, chan->id, llp.lsb,
lower_32_bits(chunk->ll_region.paddr));
SET_CH_32(dw, chan->dir, chan->id, llp.msb,
upper_32_bits(chunk->ll_region.paddr));
#else /* CONFIG_64BIT */
SET_CH_32(dw, chan->dir, chan->id, llp.lsb,
lower_32_bits(chunk->ll_region.paddr));
SET_CH_32(dw, chan->dir, chan->id, llp.msb,
upper_32_bits(chunk->ll_region.paddr));
#endif /* CONFIG_64BIT */This patch removes redundant preprocessor check for 64 bit.
Signed-off-by Ruiqi Li <[email protected]>
--- drivers/dma/dw-edma/dw-edma-v0-core.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/dma/dw-edma/dw-edma-v0-core.c +0 -7
@@ -415,18 +415,11 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) (DW_EDMA_V0_CCS | DW_EDMA_V0_LLE));/* Linked list */ -#ifdef CONFIG_64BIT /* llp is not aligned on 64bit -> keep 32bit accesses */ SET_CH_32 (dw, chan->dir, chan->id, llp.lsb,lower_32_bits (chunk->ll_region.paddr));SET_CH_32 (dw, chan->dir, chan->id, llp.msb,upper_32_bits (chunk->ll_region.paddr)); -#else /* CONFIG_64BIT */ -SET_CH_32 (dw, chan->dir, chan->id, llp.lsb, -lower_32_bits (chunk->ll_region.paddr)); -SET_CH_32 (dw, chan->dir, chan->id, llp.msb, -upper_32_bits (chunk->ll_region.paddr)); -#endif /* CONFIG_64BIT */ }/* Doorbell */ SET_RW_32(dw, chan->dir, doorbell,
Signature · 1 line
2.36.1
Hello Ruiqu
Quoted 16 lines · Ruiqi Li
Commit at
8fc5133dfixed unaligned memory access, which caused both 32 and 64 bit to be the same.#ifdef CONFIG_64BIT /* llp is not aligned on 64bit -> keep 32bit accesses */ SET_CH_32(dw, chan->dir, chan->id, llp.lsb, lower_32_bits(chunk->ll_region.paddr)); SET_CH_32(dw, chan->dir, chan->id, llp.msb, upper_32_bits(chunk->ll_region.paddr)); #else /* CONFIG_64BIT */ SET_CH_32(dw, chan->dir, chan->id, llp.lsb, lower_32_bits(chunk->ll_region.paddr)); SET_CH_32(dw, chan->dir, chan->id, llp.msb, upper_32_bits(chunk->ll_region.paddr)); #endif /* CONFIG_64BIT */
Quoted 1 line
This patch removes redundant preprocessor check for 64 bit.
A similar fix but with another reasoning has already been submitted:
So not only the denoted but all 64BIT-ifdef's will be dropped from the driver.
-Sergey
Quoted 32 lines
Signed-off-by Ruiqi Li <[email protected]>--- drivers/dma/dw-edma/dw-edma-v0-core.c | 7 ------- 1 file changed, 7 deletions(-)drivers/dma/dw-edma/dw-edma-v0-core.c +0
-7@@ -415,18 +415,11 @@ void dw_edma_v0_core_start(struct dw_edma_chunk *chunk, bool first) (DW_EDMA_V0_CCS | DW_EDMA_V0_LLE));/* Linked list */ -#ifdef CONFIG_64BIT /* llp is not aligned on 64bit -> keep 32bit accesses */ SET_CH_32 (dw, chan->dir, chan->id, llp.lsb,lower_32_bits (chunk->ll_region.paddr));SET_CH_32 (dw, chan->dir, chan->id, llp.msb,upper_32_bits (chunk->ll_region.paddr)); -#else /* CONFIG_64BIT */ -SET_CH_32 (dw, chan->dir, chan->id, llp.lsb, -lower_32_bits (chunk->ll_region.paddr)); -SET_CH_32 (dw, chan->dir, chan->id, llp.msb, -upper_32_bits (chunk->ll_region.paddr)); -#endif /* CONFIG_64BIT */ }/* Doorbell */ SET_RW_32(dw, chan->dir, doorbell,Signature · 1 line
2.36.1