From mboxrd@z Thu Jan 1 00:00:00 1970 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 613352DFA4A; Wed, 25 Feb 2026 09:20:56 +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=1772011256; cv=none; b=V0l62BkBZvG0+YkTm27aOgEdjNY39HTjY+PuuGyufZEgwuzMU5WebYJPi7vIhy5fgIX8cU0A8c3OyJ9tLWr2HYuTZ1/M6gTtCeSLOvuFsDzTLQCO26AorbED5PDSgwzEALZkaUQLS6i5bb2o9S1mLQWa6wc5jD5HbfBOtPMjIao= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772011256; c=relaxed/simple; bh=Q9V6sTMaJ2pd7d5NGrdgzvEcNvyFxJE7OuvaMwzwrfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=apf66W73K7nvsUaOULzjZRR5JBVQUQew9R/v69HZToDjX5710B/OmlFA0YjEvywayMIu1FvngW6LbldzXcXotCFL6x1QAh++8yGFB53gpCx1g7NnURRQOqH7vUsWcoFbJkslKx5yRnFoppnvLhd06sXyDEDu6RwbvPEsh1Zk0uc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=txuxe8fu; 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="txuxe8fu" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1867AC19423; Wed, 25 Feb 2026 09:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772011256; bh=Q9V6sTMaJ2pd7d5NGrdgzvEcNvyFxJE7OuvaMwzwrfQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=txuxe8fu54/uCSX5O7MX+rkmCzmlxCbRVbyTO2OMtSMHJn3hzaxvw94I+YimPTcFC YrZaekMenasUoDnOGjvNJgNhJndur1Z8D3AsGQdOnsX76T/2RniEwtkfCkA4V1Hex7 Jg0Z2H6GXzSaDTKtspCKb0dxqZALj3BO6zmBLBa8jC5QKgWqKIbmNL1+PCSyjMK0Rr Kd3IdMjfqaKAJjYnebWhk9R98raP/liB7UEFvrDHcErCJJu+uXgkxzvbem2oAWL5AH /Fsw/f6Z7UEIOqyKQWyGtdYAvoX5cnJfrn7nXHg6JI79X+h7ngJiLD3NkvctUTgMDs tmrC+hwcXQiXQ== 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 05BBBEFD213; Wed, 25 Feb 2026 09:20:56 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Wed, 25 Feb 2026 10:20:33 +0100 Subject: [PATCH v6 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: 7bit Message-Id: <20260225-dwmac_multi_irq-v6-1-245bf1d7110c@oss.nxp.com> References: <20260225-dwmac_multi_irq-v6-0-245bf1d7110c@oss.nxp.com> In-Reply-To: <20260225-dwmac_multi_irq-v6-0-245bf1d7110c@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, "Jan Petrous (OSS)" X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772011254; l=4143; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=AN9BxArjvT+LtwWtaoyDzsO4XeDTxufZg6uDwPtH3+8=; b=HrMyIBe6hiEiK+yI++j0zr4SZkcfnBej78BfknH+fkY5XBTCN+M/FNAdcfWgxyRrV7eMXsYyN xJKwDPLiatADbjLR6Qfv9C/KgR/geTNb1JSLa1Ljt9HaiAOmkBiinwc 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); /* Set ETS if desired */ - for (i = 0; i < MTL_MAX_TX_QUEUES; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_TX_QUEUES) { value = readl(ioaddr + XGMAC_MTL_TCx_ETS_CONTROL(i)); value &= ~XGMAC_TSA; if (ets) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/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 { extern const struct dev_pm_ops stmmac_simple_pm_ops; +#define STMMAC_FOREACH_MTL_QUEUE(var, limit) \ + for (var = 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/net/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_device *dev) } /* Request Rx MSI irq */ - for (i = 0; i < priv->plat->rx_queues_to_use; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, priv->plat->rx_queues_to_use) { if (i >= MTL_MAX_RX_QUEUES) break; if (priv->rx_irq[i] == 0) @@ -3899,7 +3899,7 @@ static int stmmac_request_irq_multi_msi(struct net_device *dev) } /* Request Tx MSI irq */ - for (i = 0; i < priv->plat->tx_queues_to_use; i++) { + STMMAC_FOREACH_MTL_QUEUE(i, priv->plat->tx_queues_to_use) { if (i >= MTL_MAX_TX_QUEUES) break; if (priv->tx_irq[i] == 0) @@ -4084,10 +4084,10 @@ static int __stmmac_open(struct net_device *dev, struct stmmac_dma_conf *dma_conf) { struct stmmac_priv *priv = netdev_priv(dev); + int ret, i; u32 chan; - int ret; - for (int i = 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 = 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 = device; priv->dev = ndev; - for (i = 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 = 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 = res->sfty_irq; priv->sfty_ce_irq = res->sfty_ce_irq; priv->sfty_ue_irq = res->sfty_ue_irq; - for (i = 0; i < MTL_MAX_RX_QUEUES; i++) + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_RX_QUEUES) priv->rx_irq[i] = res->rx_irq[i]; - for (i = 0; i < MTL_MAX_TX_QUEUES; i++) + STMMAC_FOREACH_MTL_QUEUE(i, MTL_MAX_TX_QUEUES) priv->tx_irq[i] = res->tx_irq[i]; if (!is_zero_ether_addr(res->mac)) -- 2.47.0