From nobody Tue Apr 7 17:16:53 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DE88396D06; Thu, 26 Feb 2026 08:54:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772096055; cv=none; b=fCjvghcmu/11FM7uX3GUPG5TGMD6fpk/fkynFihsz2TLkvIjtJW8V9oLsrjdgA4R3fJE/Yu5zdzd7UPHTx5+jzFGCepcm6fOScYRWFJyaqcsobtMR+ykIDONHO4AiReBncmiKczdY0uZpc5AFGtp5Jvr8JM6Bj/S8ENCzduxCXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772096055; c=relaxed/simple; bh=Q9V6sTMaJ2pd7d5NGrdgzvEcNvyFxJE7OuvaMwzwrfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=E85Hjd/WeiuiP9/lJWy8BURnne43Azfkcu4GpeI1o3znMEPWA8eDCK4lbsto24C8CeArP6xbMdRv7SlGw7TqMRtpLaXGskpVDg3pdFt4M+gw+IBho3onrZdilfDhGwrxiHKwkLSGElovPN6v9hMxogTPy1l49dKkUEl8F1CQ/PQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OEnTesdL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OEnTesdL" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0DE03C19424; Thu, 26 Feb 2026 08:54:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772096055; bh=Q9V6sTMaJ2pd7d5NGrdgzvEcNvyFxJE7OuvaMwzwrfQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=OEnTesdLTXh3CRG5FMziIXiU5v7UC1fFPXvISlCawSgWNkNG00f6jobgbp4NEqCTG w4d80TikFRuNdyWYoIaWZCjXtiG+vMVxxdu0HNFaQKTwrniV7JU9JxNOuJnvV3hCfT 2HqVLHXm6AsXZYWY7uYtNTWSJPKRIEi/W89Jf8uVVX7zanc/nQ+OX7WK3pJ2lUozjN /1l5Nso20pqtJixJo070o2aImKJLEKti3AQZRW2XYaFWDm/9zAOpmtDWIPqdrodQ7Z IDYAGRyGfXZENuxjdkz9gMGuAHBQRi966HOd0ZNnFPvBOVzK4Mo9VIyYQAjPwpKPVt MThc4+jlmWUjQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE62AFC5913; Thu, 26 Feb 2026 08:54:14 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Thu, 26 Feb 2026 09:54:06 +0100 Subject: [PATCH v7 1/5] net: stmmac: Use helper macro for loop over queue-based arrays 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 Message-Id: <20260226-dwmac_multi_irq-v7-1-f8fe3b945bb4@oss.nxp.com> References: <20260226-dwmac_multi_irq-v7-0-f8fe3b945bb4@oss.nxp.com> In-Reply-To: <20260226-dwmac_multi_irq-v7-0-f8fe3b945bb4@oss.nxp.com> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alexandre Torgue , Chester Lin , Matthias Brugger , Ghennadi Procopciuc , NXP S32 Linux Team , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, devicetree@vger.kernel.org, rmk+kernel@armlinux.org.uk, vladimir.oltean@nxp.com, boon.khai.ng@altera.com, "Jan Petrous (OSS)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772096053; l=4143; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=AN9BxArjvT+LtwWtaoyDzsO4XeDTxufZg6uDwPtH3+8=; b=qx4zViXLhquemljUdcK9/hePoUKUSGDPdEFSLQaAUKxdNbrTHqfA5yznxNKgqzJbgLNjeQe5h HwPpAWooWzzCnl0hEP7EkpABcn72M2PYEy57NzXZsGL5wKXTtsMpsUG X-Developer-Key: i=jan.petrous@oss.nxp.com; a=ed25519; pk=Ke3wwK7rb2Me9UQRf6vR8AsfJZfhTyoDaxkUCqmSWYY= X-Endpoint-Received: by B4 Relay for jan.petrous@oss.nxp.com/20240922 with auth_id=217 X-Original-From: "Jan Petrous (OSS)" Reply-To: jan.petrous@oss.nxp.com From: "Jan Petrous (OSS)" The stmmac driver contains similar pattern for processing queue-based arrays, ie. interrupt lines, etc. Factor out the for loop and provide a macro STMMAC_FOREACH_MTL_QUEUE(var, limit). Signed-off-by: Jan Petrous (OSS) --- drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +- drivers/net/ethernet/stmicro/stmmac/stmmac.h | 3 +++ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 16 ++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/= net/ethernet/stmicro/stmmac/dwxgmac2_core.c index 49893b9fb88c..3890e82c69f6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c @@ -233,7 +233,7 @@ static void dwxgmac2_prog_mtl_tx_algorithms(struct mac_= device_info *hw, writel(value, ioaddr + XGMAC_MTL_OPMODE); =20 /* Set ETS if desired */ - for (i =3D 0; i < MTL_MAX_TX_QUEUES; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_TX_QUEUES) { value =3D readl(ioaddr + XGMAC_MTL_TCx_ETS_CONTROL(i)); value &=3D ~XGMAC_TSA; if (ets) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/eth= ernet/stmicro/stmmac/stmmac.h index 51c96a738151..c972ad8e79f8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -382,6 +382,9 @@ enum stmmac_state { =20 extern const struct dev_pm_ops stmmac_simple_pm_ops; =20 +#define STMMAC_FOREACH_MTL_QUEUE(var, limit) \ + for (var =3D 0; var < (limit); var++) + int stmmac_mdio_unregister(struct net_device *ndev); int stmmac_mdio_register(struct net_device *ndev); int stmmac_mdio_reset(struct mii_bus *mii); diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/ne= t/ethernet/stmicro/stmmac/stmmac_main.c index edf0799b7236..b920ca17b2be 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3875,7 +3875,7 @@ static int stmmac_request_irq_multi_msi(struct net_de= vice *dev) } =20 /* Request Rx MSI irq */ - for (i =3D 0; i < priv->plat->rx_queues_to_use; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, priv->plat->rx_queues_to_use) { if (i >=3D MTL_MAX_RX_QUEUES) break; if (priv->rx_irq[i] =3D=3D 0) @@ -3899,7 +3899,7 @@ static int stmmac_request_irq_multi_msi(struct net_de= vice *dev) } =20 /* Request Tx MSI irq */ - for (i =3D 0; i < priv->plat->tx_queues_to_use; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, priv->plat->tx_queues_to_use) { if (i >=3D MTL_MAX_TX_QUEUES) break; if (priv->tx_irq[i] =3D=3D 0) @@ -4084,10 +4084,10 @@ static int __stmmac_open(struct net_device *dev, struct stmmac_dma_conf *dma_conf) { struct stmmac_priv *priv =3D netdev_priv(dev); + int ret, i; u32 chan; - int ret; =20 - for (int i =3D 0; i < MTL_MAX_TX_QUEUES; i++) + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_TX_QUEUES) if (priv->dma_conf.tx_queue[i].tbs & STMMAC_TBS_EN) dma_conf->tx_queue[i].tbs =3D priv->dma_conf.tx_queue[i].tbs; memcpy(&priv->dma_conf, dma_conf, sizeof(*dma_conf)); @@ -7734,9 +7734,9 @@ static int __stmmac_dvr_probe(struct device *device, priv->device =3D device; priv->dev =3D ndev; =20 - for (i =3D 0; i < MTL_MAX_RX_QUEUES; i++) + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_RX_QUEUES) u64_stats_init(&priv->xstats.rxq_stats[i].napi_syncp); - for (i =3D 0; i < MTL_MAX_TX_QUEUES; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_TX_QUEUES) { u64_stats_init(&priv->xstats.txq_stats[i].q_syncp); u64_stats_init(&priv->xstats.txq_stats[i].napi_syncp); } @@ -7759,9 +7759,9 @@ static int __stmmac_dvr_probe(struct device *device, priv->sfty_irq =3D res->sfty_irq; priv->sfty_ce_irq =3D res->sfty_ce_irq; priv->sfty_ue_irq =3D res->sfty_ue_irq; - for (i =3D 0; i < MTL_MAX_RX_QUEUES; i++) + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_RX_QUEUES) priv->rx_irq[i] =3D res->rx_irq[i]; - for (i =3D 0; i < MTL_MAX_TX_QUEUES; i++) + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_TX_QUEUES) priv->tx_irq[i] =3D res->tx_irq[i]; =20 if (!is_zero_ether_addr(res->mac)) --=20 2.47.0