From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 8AEDD390CA9 for ; Fri, 5 Jun 2026 22:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780696931; cv=none; b=YzNqgiwAbTeKkzNhE1MJvWjMdo+u++RVBy05A0JMsO22V0MbedVzCZVt4TyL41EqCok6pG6JJzmQ33mllIrvXAaWECqOxu3iu26z83z6mdxgd/HAsSYow3apCMxgRUEDRXoWpqjk7LFoHTCC6b7ri/sIk4SP83oAg+Xdb/DlNHs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780696931; c=relaxed/simple; bh=5w6tsBgfpFcK6p2n/K6AqHvbyJ9yiri4PsQmj2ASk4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rZ0CcB2bERHKCRK816DMraPP1ru4rwKjMWHEpVExO1+jjjHiMjexNWLiX8BQGCdxRjiwPriMXpoDea2Bxo1NC6ODjxcVJQDTFNnQLZ4i3OVccyukv4DXS1wwK9Vd5uRpKBh1wsw9G7jtk9E4z5kfUdIIUTavsLTFq5LZQbG1fyQ= 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=RkpsoCDM; arc=none smtp.client-ip=209.85.210.179 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="RkpsoCDM" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-84232e83ca9so1129147b3a.2 for ; Fri, 05 Jun 2026 15:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780696930; x=1781301730; 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=lCrOV/66FRzdEdHCWluMsQiKmBFsYBQNgpZa33W4dWo=; b=RkpsoCDM0FHXY8lDHQjOfRyaC4sR5N7qxG1OEJt8nz96FbT9/3Nk1H3Z2sFn7B6Qtv T8nrrJdK3E8Gtagp2o3Jk9VrJWgl28z3JjjSc48q6SzM5AwDZNu5aOEIRzEWtd7zJaaI VioeaLls4Bjqy91dTBsN6WY14I+Rn2lRP5DPYbSBjUErSRFJNzBrJzJMQi454ItI2qCp 2Tt7C/hl36wwfq7EfHEG0sBuMOVy/ioQXC81Iic9+uOiIm3sOdm+mv2W+MTbAohdELah icAxd5VYsHe1ndpH9J1UgEM4QqlrUIv1E/JszvG9pu5XB07yFl9zE2q+LbTPfFtNZkyb 9ORw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780696930; x=1781301730; 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=lCrOV/66FRzdEdHCWluMsQiKmBFsYBQNgpZa33W4dWo=; b=WeH/S2RsEnLqRTxCUfGU0Orgz0D1bGMeRPjUbhbZNs7Q5pR774LYUlJqLmKg19pGVT hWd51tSl+F16CqjrXAeJeDSkORRGhrrDoCYo09mnkW8JxJUms2eVHjcC2XskUSHwtfjm 6JUrIKQyDeHGUngEM3pUf+G9drvKO6sQhpInWVB+QFMWF7veunWYaaa3uLtoKe637akR bmnghCIBjNqw/uq527nlXhglKZd+pQIkosq4fcRlluvvElXG0i3VFS/9fmE21+R8IVsU d9O/CnOaC3/CJyAwhGHRS3iwe9MH9GY7Z9oJLghJHUhC7nVoPK7SRbApzFcF4ALWke4O 14Lw== X-Gm-Message-State: AOJu0YyuSGJ6kyxzf2H9sjbCwWPnRB+igFyD2ji50whyOopWGr/SzVO3 Vv0Vr7HW8DwhUPmxkAYUHJ7y6hDIGFCIyOLhzx1oZcIy3LmzVB9LJ8Qbo+0GMA== X-Gm-Gg: Acq92OHn9fi/8aT9Cg0mr1E/TcuXIs0kmFXOAEp5jfCcEZxF9KJcJoR5AM4wdh8TR8s qAVYNnwz75Vi2uD9EAsC6OjcFVeO2WlgtWXckdIHpAbZEEN5Ux5qLKZu2FfHbv0J0CNMWdj0PQ/ hXdU3RlB7QwO/flVJAiToUFGHnxiVRSdjW0RldCQG7RrvhLkya4AM429eX6LcwZspVZ1z3Y7mXb dLL+kiSml2rFCe0y7f1QkYGrHsqktDVal+F//8AKX/IzYB28PBg4uH+p5ffjx2ZyeqRwVqWgQRu jqP0lG12VCeorBDqWtPUIhC3q8GvopnjET15wsDC5SVVKF0bDBrvvsZFu7oAyUIW0Re/Korg627 4ZkaGC4PepvxwWLP40SB5drfwLKyU/7WttwH5/eiKA3Adj5B8sjn+mSXyAWSqAAV+26LRfG/9QS 42uzUwWfwGtsqMXDlscJF0gRt4M9xsYHPasyayCJeaSXWp4CYIMvQsgiAni+RoKkYikmsCnfUEL tyAsR7/UNr1lsil4hwQzsicsbzKarrczCg/Z52VoAziRw== X-Received: by 2002:aa7:88c6:0:b0:834:e5a2:d089 with SMTP id d2e1a72fcca58-842b109cf44mr5622300b3a.33.1780696929651; Fri, 05 Jun 2026 15:02:09 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-842824a1cb4sm12518883b3a.26.2026.06.05.15.02.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2026 15:02:08 -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: [PATCH 10/10] dmaengine: fsldma: replace ppc-specific accessors with portable generic ones Date: Fri, 5 Jun 2026 15:01:34 -0700 Message-ID: <20260605220134.43295-11-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260605220134.43295-1-rosenp@gmail.com> References: <20260605220134.43295-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 01c9cd27e795..a7c1f1b4c9ac 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); } @@ -1004,8 +1006,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