From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D80DA4C77A4 for ; Tue, 9 Jun 2026 22:20:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781043616; cv=none; b=LUeyEsCo1VM+j7j6IN6V7Z0BpECIym5JxsX52A4ZaIncbuDFZapMnYfpS0fOuOfCqwJCwkNEK/k0O+HFiFElUK7jbwsieTwkiDauj7SOwFg5EW9DZaRAZL+tT3P6eyc+8NI/rwZqLp7Isf6SGl2mxulkRvCTX/H1ZgPRP83epsk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781043616; c=relaxed/simple; bh=qh8I3vnOxyJVMrriCmgL8Ppb0gIh5xcK0e99IyDGG7o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b0eAGqIABrezuEF9LP+AAIsmbSQ1uI6G6kVMvW9qM6V8w+bBiKsvzMZVRZp2jH01py7mQN+G9O5RTA+iz514maapC7JKuCPb45N+hIc3DEGIIFVoPVigdduVfYLAdXc8xtr80IFn3sZDL7uX0suICkP5C1odzu8MyLgs6r7aI+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EnhHJJM3; arc=none smtp.client-ip=209.85.215.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EnhHJJM3" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c858b392697so2922885a12.3 for ; Tue, 09 Jun 2026 15:20:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781043613; x=1781648413; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8UhO55Yo3qdvFwINhOeOCySQ32WXkyaaxtV0xfPLwL8=; b=EnhHJJM3QQp8DPPTURyWelewrfH0BgItxin6HttJE0m3e7kPRX6H0KUdZBiOGWWejK 2JoI4DEpfnWbJo+CtStlEA29Nul0nNh6o/TcTx0qDqAOf3bSu8R72U3XpE377Gjfhm6B xbY2VM14jNRdwISe2bEtcxN/rcp5mQAQgwe52rdghkc9EUaYUzrFqK3NlS5XBLba/A3p PyIKgRjRaQfstizAv6JAqr87vhZDBPCEPSef1nqc+OQJMpINhQeWTb2FmYFUCyOrX4p7 OdmmI6gEDxU0wAyUWJ0L8aBDoeSmFdYYRM9hs3Ek3ku3bZmAl/XWd7f7pCvKYoLYkU0N Ep/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781043613; x=1781648413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8UhO55Yo3qdvFwINhOeOCySQ32WXkyaaxtV0xfPLwL8=; b=KYwUkqnDqXor3aZyPjd2CC8PxIrEfpI+u++EFOBseY29Fz2gu8Z7OdljwsfVE1N/hR WoXgAOoQ9FhLIC3fb3n8mD56YTCuRoGiBTP2NXJV9t5U+DNpSQCTv2NqfVc1B4hBH3kZ mK7eiiddR3LB0YRwvkP6VLea/aXuzz6uIAMLldMni2jBhn7UOtrXu/EK4OZO0TKKsMv8 BcriGZhlJ0ang2UsthRi1ZGEAETTcTS2JCnxJdIZy67aXGlqDZ85Vd4hPSqFc2j9JDj3 ZrykMZg0S0TIc+CDuJ20PkOHqcP2KYRdGTyjYJ6k3nRe5xgBLwbcs0WscShMfBN9vUix +Y0Q== X-Gm-Message-State: AOJu0YwqXl3qnlSN/UCvduFgONInhEVCky2F6zvOhcMHIgXi0l/Adz73 RBWOLq7wUbZZw28bL7kR7GuCl+KoikJNgp6307gclToGDrms3LWtM3sCVBC1Qs4u X-Gm-Gg: Acq92OEWPaiAFu0H6yrMFH9Kr1ZU8S32+Ccw7TAOdrx0Vn+0S+pW08F6hSDd3yVEjiq c2mcwnPv64Jn31+b9V5Iah+wKBoIC2ajYnx4xc1GZ7Ssz9eX+hDjxh7Q2AhMkoEMOIUmWUWWMvg 9MH/pZGPolOGuQnWe8SydoWbooPWDjNFxNtPjy067N4g2aVz3k0MH8PiMF9WX1FFH36mQtJLKdL LKt5/Mtr1sOh2N76NmBBkeVSgbjHzJd9ahhSlBVKe0XVKn18h855fuZUrIa2lcv9cVD22wE9hrx d35b4QgiNa/QhCXuEmLb2JAcv0nVNjMKxrV1CeLqpjfx7mOsHLILwD46WuvUSLFyoHaFLlaQ6Gz Ok3dmSxYL5n7zLBGG8Jaa50DINvIuMh5Slu5PtbXjbC+9Yofu50mj6jZWH5Y8pr/otX6Nr6GMAy g9BFncdxB7M//H+BwYTDnih51Sdq5/ltFt8854hlkSYF4sYKqUkTl4PTsPFKdCVIdUcZ4r9e+w+ ImQbCzCBzeg79hevdf8TwcF4NySkd2pnHn88UXtPmifgQ== X-Received: by 2002:a05:6a20:918b:b0:3b4:79fd:cba4 with SMTP id adf61e73a8af0-3b4ccdedeb9mr26932559637.12.1781043613288; Tue, 09 Jun 2026 15:20:13 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c85df04ff24sm19661834a12.14.2026.06.09.15.20.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jun 2026 15:20:12 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Vinod Koul , Frank Li , Zhang Wei , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , linux-kernel@vger.kernel.org (open list), linuxppc-dev@lists.ozlabs.org (open list:FREESCALE DMA DRIVER), llvm@lists.linux.dev (open list:CLANG/LLVM BUILD SUPPORT:Keyword:\b(?i:clang|llvm)\b) Subject: [PATCHv3 14/15] dmaengine: fsldma: replace ppc-specific accessors with portable generic ones Date: Tue, 9 Jun 2026 15:19:25 -0700 Message-ID: <20260609221926.35538-15-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260609221926.35538-1-rosenp@gmail.com> References: <20260609221926.35538-1-rosenp@gmail.com> Precedence: bulk X-Mailing-List: dmaengine@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - Convert remaining in_be32/in_le32 calls to FSL_DMA_IN macro - Replace __ilog2 with generic ilog2 (pull in linux/log2.h) - Add linux/io.h include - Expand non-PPC accessor support from ARM-only to all architectures - Guard 64-bit generic accessors with CONFIG_64BIT; provide emulation using 32-bit accessors on 32-bit platforms Add COMPILE_TEST support as a result for extra compile coverage. Assisted-by: opencode:big-pickle Signed-off-by: Rosen Penev --- drivers/dma/Kconfig | 2 +- drivers/dma/fsldma.c | 11 ++++++----- drivers/dma/fsldma.h | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 302021540d76..9b13e7aa31c7 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -206,7 +206,7 @@ config EP93XX_DMA config FSL_DMA tristate "Freescale Elo series DMA support" - depends on FSL_SOC + depends on FSL_SOC || COMPILE_TEST select DMA_ENGINE select ASYNC_TX_ENABLE_CHANNEL_SWITCH help diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 7d0c80121aa4..d4c9b81ade0d 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include #include "dmaengine.h" #include "fsldma.h" @@ -266,7 +268,7 @@ static void fsl_chan_set_src_loop_size(struct fsldma_chan *chan, int size) case 4: case 8: mode &= ~FSL_DMA_MR_SAHTS_MASK; - mode |= FSL_DMA_MR_SAHE | (__ilog2(size) << 14); + mode |= FSL_DMA_MR_SAHE | (ilog2(size) << 14); break; } @@ -299,7 +301,7 @@ static void fsl_chan_set_dst_loop_size(struct fsldma_chan *chan, int size) case 4: case 8: mode &= ~FSL_DMA_MR_DAHTS_MASK; - mode |= FSL_DMA_MR_DAHE | (__ilog2(size) << 16); + mode |= FSL_DMA_MR_DAHE | (ilog2(size) << 16); break; } @@ -326,7 +328,7 @@ static void fsl_chan_set_request_count(struct fsldma_chan *chan, int size) mode = get_mr(chan); mode &= ~FSL_DMA_MR_BWC_MASK; - mode |= (__ilog2(size) << 24) & FSL_DMA_MR_BWC_MASK; + mode |= (ilog2(size) << 24) & FSL_DMA_MR_BWC_MASK; set_mr(chan, mode); } @@ -1007,8 +1009,7 @@ static irqreturn_t fsldma_ctrl_irq(int irq, void *data) u32 gsr, mask; int i; - gsr = (fdev->feature & FSL_DMA_BIG_ENDIAN) ? in_be32(fdev->regs) - : in_le32(fdev->regs); + gsr = FSL_DMA_IN(fdev, fdev->regs, 32); mask = 0xff000000; dev_dbg(fdev->dev, "IRQ: gsr 0x%.8x\n", gsr); diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h index d7b7a3138b85..01f93123b233 100644 --- a/drivers/dma/fsldma.h +++ b/drivers/dma/fsldma.h @@ -232,17 +232,46 @@ static void fsl_iowrite64be(u64 val, u64 __iomem *addr) out_be32((u32 __iomem *)addr + 1, (u32)val); } #endif -#endif - -#if defined(CONFIG_ARM64) || defined(CONFIG_ARM) +#else #define fsl_ioread32(p) ioread32(p) #define fsl_ioread32be(p) ioread32be(p) #define fsl_iowrite32(v, p) iowrite32(v, p) #define fsl_iowrite32be(v, p) iowrite32be(v, p) + +#ifdef CONFIG_64BIT #define fsl_ioread64(p) ioread64(p) #define fsl_ioread64be(p) ioread64be(p) #define fsl_iowrite64(v, p) iowrite64(v, p) #define fsl_iowrite64be(v, p) iowrite64be(v, p) +#else +static inline u64 fsl_ioread64(const u64 __iomem *addr) +{ + u32 val_lo = ioread32((u32 __iomem *)addr); + u32 val_hi = ioread32((u32 __iomem *)addr + 1); + + return ((u64)val_hi << 32) + val_lo; +} + +static inline void fsl_iowrite64(u64 val, u64 __iomem *addr) +{ + iowrite32(val >> 32, (u32 __iomem *)addr + 1); + iowrite32((u32)val, (u32 __iomem *)addr); +} + +static inline u64 fsl_ioread64be(const u64 __iomem *addr) +{ + u32 val_hi = ioread32be((u32 __iomem *)addr); + u32 val_lo = ioread32be((u32 __iomem *)addr + 1); + + return ((u64)val_hi << 32) + val_lo; +} + +static inline void fsl_iowrite64be(u64 val, u64 __iomem *addr) +{ + iowrite32be(val >> 32, (u32 __iomem *)addr); + iowrite32be((u32)val, (u32 __iomem *)addr + 1); +} +#endif #endif #define FSL_DMA_IN(fsl_dma, addr, width) \ -- 2.54.0