From nobody Mon Jun 8 17:38:09 2026 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 C151336C9C2 for ; Wed, 27 May 2026 20:31:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779913906; cv=none; b=uvLJO8ry888ldssVGDdlvhJKk5a928LfP3Qmj6eUKcvqczcz+NT6Pp2MR4xw9l1/Z+0d6SLzdD4Wfi4khiu6KAPJ7JUiRNi9vv3n4es2ej1bb050yX/OZ1LMbCXOnWviJwo88ZCo6v2uKZWIyLI6/RC75q7jipp+ySMhK11sk3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779913906; c=relaxed/simple; bh=n03WGQD2FTWyI7l+8+BAvLXAQDjhiypSJsr08n5cdh8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=hizXu2OFlsEQ6IxSR9myaOnjS6BTVFhf5xJGVw+phGABHZ2gKAnw4VksSlBemjvVgyxmFibnEpQj2OS6HWmVrb6jMUpl1PCZk3EJkh6szOI5oelL3s+jt/H/7RitW6Mpvoa6YMbTaS+zKNZM3VHKyh80UJy2FTR2VWkd/5o6KkQ= 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=Oqbclx16; arc=none smtp.client-ip=209.85.214.171 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="Oqbclx16" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2bd9c3b550aso84190475ad.2 for ; Wed, 27 May 2026 13:31:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779913904; x=1780518704; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=rioPEJ0KzynPgjr6B78MS6b4e5+yQGAXGZOz4iEo+eY=; b=Oqbclx16OL7AIGcrWiQDAVGna8PX8op3e2LGoajD6rN+e3S1nA51VuQsWw4qRyh/6e DoMHQlvhlBUZhELhRvfeuQ7Tobv/hqJpH0On6XruxCZAJ0SaD+J06PHnEIN2YCbb9Me2 kY0/LvxO8AF7QVjDcG8Gotih+0BVvgrzE04+A7iLQiKD70h7Ie418gHsMOggzz2fPLOb z0nsUlEeGlizv4x0eUgZW/kVUcjJq10iiiKGyVrYsAUcSyhie3oSMU3gQeLKpEPutWlZ 98SRnjW4PLAlsOUdDT4BsGZZnh0xzX9Qig+iB17lFOiUeKjUTEB9ubuL1+zE9RP53EV1 AKhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779913904; x=1780518704; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rioPEJ0KzynPgjr6B78MS6b4e5+yQGAXGZOz4iEo+eY=; b=r891lqiv9v92r4oxvTc/A26MipJz2bra0VEPY5XDciB4lxytmv5ar+tgRrgJIUXIWo nO9X/N8mldb4y+UCpc/WK0faQ3QK22bnJkr2PnXjcGsUKrpJ1cOay6vGHuJci1vdK1cQ /4oXm5kA1R3bqTtfMdtr1KaIBt2RtNNCOpMDB1vyAuZkTDewJCLr876eIARt5wzH2vXV /22X95eON4akRaKmDLDhDS4fSBmH2L4LTa9g2ya5P51/kgaacnuTdaBJ4y6d/bA2lEtj z8r3f7ApGlNXNdFEL7FBFx7C8zVgcSTiDRErF1TZiZFy4DCt9dEc6uiRrSvV+LGdzcSi 1nag== X-Forwarded-Encrypted: i=1; AFNElJ9B/nfs0RM4RdeMTmuDkBjywuPWKiyZIqqPQxMfcHfZmE4BVDwPlUonZof9HrTVkehUbBmfi6Bu7zo9Tgk=@vger.kernel.org X-Gm-Message-State: AOJu0Yww0mdRWTG0zcjIFLxR3V/EpHpKrIW0sKQH7LGEAxRoh9HtgcbY 7z3ulongChDvgF8kY/+6RDyithe0intZyHQT9BqyVkQ5koT/5Yc8Tqla X-Gm-Gg: Acq92OEHJGnjBM3o/9a240CxH+Ln61fDRAShiuJlx2jm9uDvBv0WOE3UM5YbfjqDV82 kFsnlfZI3+iB68WpPM4lUMh5rUyY9i96RohwaTAVAe+u1Ntpl/KVzp+Er+aSXpKI2xt1h9lAfgB 45IAnpKN9PhJYh6yt0eN4nvd3HuXaA38458O6Pzc3m+E+tDW48nScDENgHmBwbolKalfQ8bQdLx RepZjtnMdCqF05V5kai8dY2oL7DWTlKL5DBBXofWkTBx04D/m+x4qgkkuAjuVuEYvtWZ+cHzoD5 zGUide/YteDjtYsK74lnbb7dc4BxsIqQYBYe5Zr5FTIDfvWImAyrCg1S0YQKhou78cyrA0P8VIW Lg6t6lzqvWodEXdtEOACdU7bu6jqmQ/Jb84u/ABomXwg8DSNRpU7Gtw0NhbUuyrCO2tetCWMnnC ZhhMSb9a1goRAXjyoQ4NnaNVo2modzfJO1kNRX3mNsvBNngJnK/W8TCvaFL8cVEsu4D1Uecj0I+ J9VUNn6lKMAmmGiHRjAcMX0bm28NolkWwlnUGcsQrPjdw== X-Received: by 2002:a17:902:e745:b0:2b0:6a22:5165 with SMTP id d9443c01a7336-2beb0631a29mr262237615ad.7.1779913904027; Wed, 27 May 2026 13:31:44 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb56b19f3sm218422455ad.18.2026.05.27.13.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 13:31:43 -0700 (PDT) From: Rosen Penev To: dmaengine@vger.kernel.org Cc: Linus Walleij , Vinod Koul , Frank Li , linux-arm-kernel@lists.infradead.org (moderated list:ARM/NOMADIK/Ux500 ARCHITECTURES), linux-kernel@vger.kernel.org (open list) Subject: [PATCHv2] dmaengine: ste_dma40: turn d40_base phy_chans into a flexible array Date: Wed, 27 May 2026 13:31:26 -0700 Message-ID: <20260527203126.7053-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Convert the separately-offset phy_chans pointer to a C99 flexible array member at the end of struct d40_base, and switch the allocation to struct_size(). The log_chans and memcpy_chans slots continue to live in the same allocation immediately after phy_chans, indexed via base->log_chans. This removes the hand-rolled pointer fixup that recomputed phy_chans from base + ALIGN(sizeof(struct d40_base), 4). The ALIGN(sizeof(struct d40_base), 4) requirement is met implicitly by the C compiler when using a flexible array member. With struct d40_chan phy_chans[] as the last member, the C standard guarantees sizeof(struct d40_base) includes trailing padding to satisfy the alignment of the flexible array element type (struct d40_chan). Since struct d40_chan contains members like spinlock_t, pointers, and struct dma_chan =E2=80=94 a= ll with alignment =E2=89=A5 4 =E2=80=94 the compiler ensures sizeof(struct d40_base= ) is already a multiple of _Alignof(struct d40_chan) >=3D 4. The struct_size() macro then computes sizeof(struct d40_base) + sizeof(struct d40_chan) * num_phy_chans, so phy_chans[0] lands at a properly aligned offset without needing the manu= al ALIGN. Assisted-by: Claude:Opus-4.7 Signed-off-by: Rosen Penev --- v2: added ALIGN description drivers/dma/ste_dma40.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 9b803c0aec25..d3e3c4cd43f1 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -602,7 +602,6 @@ struct d40_base { struct dma_device dma_both; struct dma_device dma_slave; struct dma_device dma_memcpy; - struct d40_chan *phy_chans; struct d40_chan *log_chans; struct d40_chan **lookup_log_chans; struct d40_chan **lookup_phy_chans; @@ -621,6 +620,7 @@ struct d40_base { u32 *regs_interrupt; u16 gcc_pwr_off_mask; struct d40_gen_dmac gen_dmac; + struct d40_chan phy_chans[]; }; static struct device *chan2dev(struct d40_chan *d40c) @@ -3128,6 +3128,7 @@ static int __init d40_hw_detect_init(struct platform_= device *pdev, struct clk *clk; void __iomem *virtbase; struct d40_base *base; + size_t alloc_size; int num_log_chans; int num_phy_chans; int num_memcpy_chans; @@ -3197,10 +3198,9 @@ static int __init d40_hw_detect_init(struct platform= _device *pdev, "hardware rev: %d with %d physical and %d logical channels\n", rev, num_phy_chans, num_log_chans); - base =3D devm_kzalloc(dev, - ALIGN(sizeof(struct d40_base), 4) + - (num_phy_chans + num_log_chans + num_memcpy_chans) * - sizeof(struct d40_chan), GFP_KERNEL); + alloc_size =3D struct_size(base, phy_chans, num_phy_chans); + alloc_size +=3D sizeof(*base->log_chans) * (num_log_chans + num_memcpy_ch= ans); + base =3D devm_kzalloc(dev, alloc_size, GFP_KERNEL); if (!base) return -ENOMEM; @@ -3213,7 +3213,6 @@ static int __init d40_hw_detect_init(struct platform_= device *pdev, base->virtbase =3D virtbase; base->plat_data =3D plat_data; base->dev =3D dev; - base->phy_chans =3D ((void *)base) + ALIGN(sizeof(struct d40_base), 4); base->log_chans =3D &base->phy_chans[num_phy_chans]; if (base->plat_data->num_of_phy_chans =3D=3D 14) { -- 2.54.0