linux-kernel - [PATCH 1/1] dmaengine: dw-edma: Removed redundant #ifdef check for 64-bit

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 10 May 2022 11:31:17 -0500
From:   Ruiqi Li <guywithanaxe42@...il.com>
To:     gustavo.pimentel@...opsys.com, vkoul@...nel.org,
        dmaengine@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Ruiqi Li <guywithanaxe42@...il.com>
Subject: [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 <guywithanaxe42@...il.com>
---
 drivers/dma/dw-edma/dw-edma-v0-core.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/dma/dw-edma/dw-edma-v0-core.c b/drivers/dma/dw-edma/dw-edma-v0-core.c
index 33bc1e6c4cf2..d34f344a094b 100644
--- a/drivers/dma/dw-edma/dw-edma-v0-core.c
+++ b/drivers/dma/dw-edma/dw-edma-v0-core.c
@@ -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,
-- 
2.36.1