From nobody Thu Apr 9 04:05:38 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 869DF3B2FFF; Wed, 11 Mar 2026 07:54:02 +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=1773215642; cv=none; b=sAODGk5hgJJqpI7kokbintHjL8YS6naXgBbo1qdeiFEDxVBGqK8uKhLvemnyjwRIcO+TZnwjhwQkEy4qstquUU8zJgZ7eiLRhLp6tkNyVP7XF8851OnMZ1ocnYtCUIfORqPWTxtAn4RF1lPUC0ZbpnjrBf82GVwHul9DVVmGOng= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215642; c=relaxed/simple; bh=Q9V6sTMaJ2pd7d5NGrdgzvEcNvyFxJE7OuvaMwzwrfQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WJcB9t0dJvaUjRZH3YCa5TFVajhbPRsaimf/oswp1h3I/c1Lef/LvdNBi8IJv6XfYR6Sex3GpXl74z49n5yhRQkmjz9FlW+torIfDzqoTGqoA2Ip2Ebd0+AUiF5GsB1/ko1l0ungQTYzV3SB8ZZGtZ9DEg3HSduur+nzKgTcXuQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=d/7ahIDW; 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="d/7ahIDW" Received: by smtp.kernel.org (Postfix) with ESMTPS id 02C77C2BCAF; Wed, 11 Mar 2026 07:54:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773215642; bh=Q9V6sTMaJ2pd7d5NGrdgzvEcNvyFxJE7OuvaMwzwrfQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=d/7ahIDW/416Xpt3rZB2CEieuPpFRaLuYOoMmPqvJaS3tFxtGsmo+BvMUbZiPH7YC z93y3bnwzPQOr3NKecTnnvv/+Ej/8Iuqn0gSGndWt2GxX7UGyD+ds/d4u+nPwSfz6M FY+0VPMUAw3ObC8rlehle+tWZRKxst1LDNBDXWeLAXTBXaGQ5cJOwWo0CwxGohcxOW JgeZnWYjI7WBKSn4cCY8WI15FcGGbc9RJMrT9pE4ZQ4M0vtwAHiYZpgFKaKHIuFlqb Eu4OJmwq3uJe65HLV+bnL1pPaP1H+J1TjMqt/MCqHOxuix+kmOa3ZQpVc07Iqf0vuG Bvq9yl3wiZhOg== 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 E5ABEFD064F; Wed, 11 Mar 2026 07:54:01 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Wed, 11 Mar 2026 08:53:56 +0100 Subject: [PATCH v9 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: <20260311-dwmac_multi_irq-v9-1-f0c03ef8d01f@oss.nxp.com> References: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@oss.nxp.com> In-Reply-To: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@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=1773215640; l=4143; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=AN9BxArjvT+LtwWtaoyDzsO4XeDTxufZg6uDwPtH3+8=; b=vJtJ+RULvRJVVb65zl8q0iz1SD8tkvUoIaWMt57rDq7J7CI4YHflh8RYc0q6UPZ3xQLnT+EoT 1nYlHU6uGi8CpmnUzTgoIbB30cSQsBLBFMus1thKg0XQSjzSWVjn0Vl 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 From nobody Thu Apr 9 04:05:38 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 9A6A53B38BF; Wed, 11 Mar 2026 07:54:02 +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=1773215642; cv=none; b=n7gztrtyGju3yod7LaocEdIcQXKWJrbGbe4zBBLskH+TPmJCzXhDG6vXZjqPyrzW9Kr308ge9hpSVMdHe0P8S5HKvMXCDkhDxvS8DRpdlPpsnXzvgH0uc6b32qvOE7RpV8O4W+D4gMeHk612VgqC3r19ixb0S8r9NZItEXgra7Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215642; c=relaxed/simple; bh=KLueA/c6Dz81/C8ynUU6RVHQqxMTLTUtghgfet0J2Ow=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DJeBdGH6Li52AUcZ1xpdYvOTaDR6/LI2viNAwNOgv80fUsph6/pQx/D/aBaVHjPFtlAuaScWYB70LoJhnRrFIQc/bqe67Mpz28ERV8Zaf/18erCPheMmF3PWsnc5SAcIIyDA6V2COno5wnrbWuFSZqyC8wZmDhOF2pj7kY+y348= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qWa7almF; 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="qWa7almF" Received: by smtp.kernel.org (Postfix) with ESMTPS id 106EEC2BC9E; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773215642; bh=KLueA/c6Dz81/C8ynUU6RVHQqxMTLTUtghgfet0J2Ow=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=qWa7almFfwRwOqP5Ta5CUz40Lb3xLe8PsIsUTVkNXZMzDPyzeqUq8HnKnvfKwonAt KoK30EDHqzNALbf/NGSaSa0Acwxg23VStoY0P2nauQCLet3PyJ9KVxD1fTAOmiOElI eTeQYqAz4IhVMg/ZevJnHsfdE1grNqNo91mIbO/MW4qZmvDxp8cs31DcOFYdtKOKmL qSE1tFkoBGv6ypGTqLwKujayHKOIKCUux4EuiLseLqHjWAmwme5J9/iF9qMs3m5IRG nyTW6Aa6qc4tnS0VE1YyzhoE7oM87mTlb8HhWew9Le74ByuLF1op0U9WHFULD5W/Qz Qxl/W1XzotBoQ== 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 00C3CFD0650; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Wed, 11 Mar 2026 08:53:57 +0100 Subject: [PATCH v9 2/5] net: stmmac: platform: read channels irq 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: <20260311-dwmac_multi_irq-v9-2-f0c03ef8d01f@oss.nxp.com> References: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@oss.nxp.com> In-Reply-To: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@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=1773215640; l=2726; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=/ncF81mYqriMzIkXDHCjmpdMkczIZjJbkswTEDIvT3Y=; b=l+HKDJWyDQwjpCjdc/YgBikyQFs773aYwFtU6tLi5TJRKBcYjlVG8Lo6++2snw6BqOYy1IiTF u/v8895eZXmA6lT5QcKrz2BTty/GDaI92ZNKQ+2Q8xNikReKcIbAPq7 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)" Read IRQ resources for all rx/tx channels, to allow Multi-IRQ mode for platform glue drivers. Reviewed-by: Matthias Brugger Signed-off-by: Jan Petrous (OSS) --- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 57 ++++++++++++++++++= +++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/driver= s/net/ethernet/stmicro/stmmac/stmmac_platform.c index 5c9fd91a1db9..7c299e47ff14 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -697,9 +697,47 @@ struct clk *stmmac_pltfr_find_clk(struct plat_stmmacen= et_data *plat_dat, } EXPORT_SYMBOL_GPL(stmmac_pltfr_find_clk); =20 +/** + * stmmac_pltfr_get_irq_array - Read per-channel IRQs from platform device + * @pdev: platform device + * @fmt: IRQ name format string (e.g., "tx-queue-%d") + * @irqs: array to store IRQ numbers + * @num: maximum number of IRQs to read + * + * Return: 0 on success, -EPROBE_DEFER if IRQ is deferred, -EINVAL on erro= r. + * Missing IRQs are set to 0 and iteration stops at first missing IRQ. + */ +static int stmmac_pltfr_get_irq_array(struct platform_device *pdev, + const char *fmt, int *irqs, size_t num) +{ + char name[16]; + int i; + + STMMAC_FOREACH_MTL_QUEUE(i, num) { + if (snprintf(name, sizeof(name), fmt, i) >=3D sizeof(name)) + return -EINVAL; + + irqs[i] =3D platform_get_irq_byname_optional(pdev, name); + if (irqs[i] =3D=3D -EPROBE_DEFER) + return -EPROBE_DEFER; + + if (irqs[i] <=3D 0) { + dev_dbg(&pdev->dev, "IRQ %s not found\n", name); + + /* Stop on first unset irq */ + irqs[i] =3D 0; + break; + } + } + + return 0; +} + int stmmac_get_platform_resources(struct platform_device *pdev, struct stmmac_resources *stmmac_res) { + int ret; + memset(stmmac_res, 0, sizeof(*stmmac_res)); =20 /* Get IRQ information early to have an ability to ask for deferred @@ -735,7 +773,24 @@ int stmmac_get_platform_resources(struct platform_devi= ce *pdev, =20 stmmac_res->addr =3D devm_platform_ioremap_resource(pdev, 0); =20 - return PTR_ERR_OR_ZERO(stmmac_res->addr); + if (IS_ERR(stmmac_res->addr)) + return PTR_ERR(stmmac_res->addr); + + /* TX channels irq */ + ret =3D stmmac_pltfr_get_irq_array(pdev, "tx-queue-%d", + stmmac_res->tx_irq, + MTL_MAX_TX_QUEUES); + if (ret) + return ret; + + /* RX channels irq */ + ret =3D stmmac_pltfr_get_irq_array(pdev, "rx-queue-%d", + stmmac_res->rx_irq, + MTL_MAX_RX_QUEUES); + if (ret) + return ret; + + return 0; } EXPORT_SYMBOL_GPL(stmmac_get_platform_resources); =20 --=20 2.47.0 From nobody Thu Apr 9 04:05:38 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 9ECF837703D; Wed, 11 Mar 2026 07:54:02 +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=1773215642; cv=none; b=jiucU1Gv8PMVPwst1kFhv7UcXiNPBAGumhFL5z9gU3m4ygTKIGbTjkr9Q/xmyYuk5sj+lmvkU687vYkHr4dHTtslEkFbjSe6mitiNaPZG2fR11k8pvgOa5FAkaV9nZS4cVZahXP8MRNuAmVwdp5S6lXRYdzC2bv/aWIkBnOmbnc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215642; c=relaxed/simple; bh=t5KwaNb/RUlMNvnjAQljSY30lTI+e060jlUtQ9txKe8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iHmo/tMBOj8S6oZi8qAZby4uu6to0albgMAcYb4NosaVuEGbu7h3wlo/4EvVRZtaTS5ZnKXgXlHmKAAMk1G/8UpeCGf/mMfzHFoLoR1E6UCXj6ZP+rmIgfgSMOujInHZamkS1hEdaBwU1EgHNgY1FJshTuI7jfv+Ws021WEnNbg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ADrYACeI; 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="ADrYACeI" Received: by smtp.kernel.org (Postfix) with ESMTPS id 22C6CC2BCB2; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773215642; bh=t5KwaNb/RUlMNvnjAQljSY30lTI+e060jlUtQ9txKe8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ADrYACeIJZX/4IqeOB2IRx17qhRDNFEJGEUbURBm0fI8ybt6Ozx4N9093q/MCWDLD 3C1vKTmDuqxoelRoJ7RjTaUiwvLTKkOw9WMudR2ydrH2rYYeRVyhP0C54DWmKJrOQN WaMXXbg2ayNhwhA+HVuSI5vEuNaYAVIEYQsWddcLyhHOplH3w3QyrzNxrhby301Uxx aYLJLKovq4Makkx0suMD/YgHsyzXfuofEtOLyULW4LRWUq6TC/UWEVPhmA7lBt8tLZ 7iYz6pMZ9CuRpl5UozKIeYkgaj/ieLkrzfkM0FVRqm7KM4mx7+VteR46iZU6wKSNlh A5gjKgDH3Cr7A== 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 11159FD0648; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Wed, 11 Mar 2026 08:53:58 +0100 Subject: [PATCH v9 3/5] arm64: dts: s32: set Ethernet channel irqs 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: <20260311-dwmac_multi_irq-v9-3-f0c03ef8d01f@oss.nxp.com> References: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@oss.nxp.com> In-Reply-To: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@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=1773215640; l=4163; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=GJtLVXXJ6B4rcW9eI+Zdnzjbg44iN/frnopr12Ti4EU=; b=eJUTqcie0RXcVx8brTOdzgrPB5fI1SjmlsdnCrFneGpms8Wm7ot6TNpqx+1E211nM12CCopQP AjK8s7pMF3BCQ6LQ+pK7aJsjQZXiTV7e8mpPM1l9Gs9TeEEp/h4p5dR 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 GMAC Ethernet controller found on S32G2/S32G3 and S32R45 contains up to 5 RX and 5 TX channels. It can operate in two interrupt modes: 1) Sharing IRQ mode: only MAC IRQ line is used for all channels. 2) Multiple IRQ mode: every channel uses two IRQ lines, one for RX and second for TX. Specify all IRQ twins for all channels. Reviewed-by: Matthias Brugger Signed-off-by: Jan Petrous (OSS) --- arch/arm64/boot/dts/freescale/s32g2.dtsi | 26 +++++++++++++++++++++++--- arch/arm64/boot/dts/freescale/s32g3.dtsi | 26 +++++++++++++++++++++++--- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/s32g2.dtsi b/arch/arm64/boot/dts= /freescale/s32g2.dtsi index 51d00dac12de..5a553d503137 100644 --- a/arch/arm64/boot/dts/freescale/s32g2.dtsi +++ b/arch/arm64/boot/dts/freescale/s32g2.dtsi @@ -3,7 +3,7 @@ * NXP S32G2 SoC family * * Copyright (c) 2021 SUSE LLC - * Copyright 2017-2021, 2024-2025 NXP + * Copyright 2017-2021, 2024-2026 NXP */ =20 #include @@ -732,8 +732,28 @@ gmac0: ethernet@4033c000 { reg =3D <0x4033c000 0x2000>, /* gmac IP */ <0x4007c004 0x4>; /* GMAC_0_CTRL_STS */ interrupt-parent =3D <&gic>; - interrupts =3D ; - interrupt-names =3D "macirq"; + interrupts =3D , + /* CHN 0: tx, rx */ + , + , + /* CHN 1: tx, rx */ + , + , + /* CHN 2: tx, rx */ + , + , + /* CHN 3: tx, rx */ + , + , + /* CHN 4: tx, rx */ + , + ; + interrupt-names =3D "macirq", + "tx-queue-0", "rx-queue-0", + "tx-queue-1", "rx-queue-1", + "tx-queue-2", "rx-queue-2", + "tx-queue-3", "rx-queue-3", + "tx-queue-4", "rx-queue-4"; snps,mtl-rx-config =3D <&mtl_rx_setup>; snps,mtl-tx-config =3D <&mtl_tx_setup>; status =3D "disabled"; diff --git a/arch/arm64/boot/dts/freescale/s32g3.dtsi b/arch/arm64/boot/dts= /freescale/s32g3.dtsi index e314f3c7d61d..b43e6f001f4d 100644 --- a/arch/arm64/boot/dts/freescale/s32g3.dtsi +++ b/arch/arm64/boot/dts/freescale/s32g3.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) /* - * Copyright 2021-2025 NXP + * Copyright 2021-2026 NXP * * Authors: Ghennadi Procopciuc * Ciprian Costea @@ -809,8 +809,28 @@ gmac0: ethernet@4033c000 { reg =3D <0x4033c000 0x2000>, /* gmac IP */ <0x4007c004 0x4>; /* GMAC_0_CTRL_STS */ interrupt-parent =3D <&gic>; - interrupts =3D ; - interrupt-names =3D "macirq"; + interrupts =3D , + /* CHN 0: tx, rx */ + , + , + /* CHN 1: tx, rx */ + , + , + /* CHN 2: tx, rx */ + , + , + /* CHN 3: tx, rx */ + , + , + /* CHN 4: tx, rx */ + , + ; + interrupt-names =3D "macirq", + "tx-queue-0", "rx-queue-0", + "tx-queue-1", "rx-queue-1", + "tx-queue-2", "rx-queue-2", + "tx-queue-3", "rx-queue-3", + "tx-queue-4", "rx-queue-4"; snps,mtl-rx-config =3D <&mtl_rx_setup>; snps,mtl-tx-config =3D <&mtl_tx_setup>; status =3D "disabled"; --=20 2.47.0 From nobody Thu Apr 9 04:05:38 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 C50CA358D3D; Wed, 11 Mar 2026 07:54:02 +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=1773215642; cv=none; b=bZ4p2T9wWLjbU7UjCZ4S00QsuEHHiquSCuuNV51ZqcieJo9WIQSUvGNexUnx1YN1xF99aTw8iwnkke7CoVnWTCnTYsKq2CTLnpaywh8SZknkxJqGJIwW8OxuII6lhqN8FDC/KBeskyBUULrQEYsjXiaSbdqoMfc2lNjuz94BIus= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215642; c=relaxed/simple; bh=hvJFPTL0PBR5lBcMUCqrgiX6bA/dSIBwOKY3DXjrJPU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BHSz6ZLkJiBCzYFdyZpDCVoK2ImqaNhxd5fPh1r27fCoB+iEMjL+9soZev3pX34tdctkWTjszXqVvrx763L/NM0dh/NW8ACwxUMvmPHKflxAKGqZBk66cAhd91qL/n+OAICBRDjL0OKnG6IBjRM5h54mfVqKIddTVZfYg1VpgTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=X+ySyS8F; 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="X+ySyS8F" Received: by smtp.kernel.org (Postfix) with ESMTPS id 2CFBCC2BCB7; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773215642; bh=hvJFPTL0PBR5lBcMUCqrgiX6bA/dSIBwOKY3DXjrJPU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=X+ySyS8FVBd6CaGyhBmYE6jsFGRDFTYSX6WNBbVOTzsaZfxBjJZw9F2Nntg80KpY0 bmKRKCYiXRHkXSAukklVRdBodCMXWrZa8YVHtOJILZg/WtWUnF0faJIebSGPuL8Bkl HG1wKigt4DOe2SmtE1lz3rzDENeTklDyxPuD4e3VVwexFe1sG7dD2KKk7+5Rnzt2ls 7cXyYVVtg9usjIz8EtOfDSPfD8CmrrA3VQfW4GOwT2ytbax32fYGk3LuxnD5ii8ea7 nB+OryNC+Dn5aAJP9euSMDrD2cvwTZAI24tHYy8d8+sjGlVeDVsFgaa5nshwH5GZ/Z MYQga4uTIfHxQ== 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 21BB2FD0652; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Wed, 11 Mar 2026 08:53:59 +0100 Subject: [PATCH v9 4/5] dt-bindings: net: nxp,s32-dwmac: Declare per-queue interrupts 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: <20260311-dwmac_multi_irq-v9-4-f0c03ef8d01f@oss.nxp.com> References: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@oss.nxp.com> In-Reply-To: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@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=1773215640; l=3431; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=/cg076X8F0Fw9UFRXkaiDF0p4JpYl1QE8urFK9ZIBLU=; b=M2/5GhjqNCRPZWBLZC+lX5NF9sel4hy8joz8w+ZWy0YqIu9ehsewxpb4AaRyC34+j1Uj4SPSr JBrARXDQNoLCU/W9TeFUaFMVrYWt1KhmEdiC5B/ZntoYNEDLbKMQFJW 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 DWMAC IP on NXP S32G/R SoCs has connected queue-based IRQ lines, set them to allow using Multi-IRQ mode. Signed-off-by: Jan Petrous (OSS) --- .../devicetree/bindings/net/nxp,s32-dwmac.yaml | 47 ++++++++++++++++++= +--- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml b/Doc= umentation/devicetree/bindings/net/nxp,s32-dwmac.yaml index 1b2934f3c87c..c40f788c0ba8 100644 --- a/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml +++ b/Documentation/devicetree/bindings/net/nxp,s32-dwmac.yaml @@ -1,5 +1,5 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) -# Copyright 2021-2024 NXP +# Copyright 2021-2026 NXP %YAML 1.2 --- $id: http://devicetree.org/schemas/net/nxp,s32-dwmac.yaml# @@ -16,6 +16,8 @@ description: the SoC S32R45 has two instances. The devices can use RGMII/RMII/MII interface over Pinctrl device or the output can be routed to the embedded SerDes for SGMII connectivity. + The DWMAC instances have connected all RX/TX queues interrupts, + enabling load balancing of data traffic across all CPU cores. =20 properties: compatible: @@ -45,10 +47,25 @@ properties: FlexTimer Modules connect to GMAC_0. =20 interrupts: - maxItems: 1 + minItems: 1 + maxItems: 11 =20 interrupt-names: - const: macirq + oneOf: + items: + - const: macirq + items: + - const: macirq + - const: tx-queue-0 + - const: rx-queue-0 + - const: tx-queue-1 + - const: rx-queue-1 + - const: tx-queue-2 + - const: rx-queue-2 + - const: tx-queue-3 + - const: rx-queue-3 + - const: tx-queue-4 + - const: rx-queue-4 =20 clocks: items: @@ -88,8 +105,28 @@ examples: <0x0 0x4007c004 0x0 0x4>; /* GMAC_0_CTRL_STS */ nxp,phy-sel =3D <&gpr 0x4>; interrupt-parent =3D <&gic>; - interrupts =3D ; - interrupt-names =3D "macirq"; + interrupts =3D , + /* CHN 0: tx, rx */ + , + , + /* CHN 1: tx, rx */ + , + , + /* CHN 2: tx, rx */ + , + , + /* CHN 3: tx, rx */ + , + , + /* CHN 4: tx, rx */ + , + ; + interrupt-names =3D "macirq", + "tx-queue-0", "rx-queue-0", + "tx-queue-1", "rx-queue-1", + "tx-queue-2", "rx-queue-2", + "tx-queue-3", "rx-queue-3", + "tx-queue-4", "rx-queue-4"; snps,mtl-rx-config =3D <&mtl_rx_setup>; snps,mtl-tx-config =3D <&mtl_tx_setup>; clocks =3D <&clks 24>, <&clks 17>, <&clks 16>, <&clks 15>; --=20 2.47.0 From nobody Thu Apr 9 04:05:38 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 DDEAA3B4EA6; Wed, 11 Mar 2026 07:54:02 +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=1773215643; cv=none; b=dNRXl7mqvdrNXc3yYCtWgYoUbwJDbhHe+2ncVTMZJEowkct9gF2FuHw5/QA6Z56ADFIJ+wi8fbiqaOqY6Q8SgE4VHk7IxCNBhfIvRs6Ua2Xa+I/K/Eg9o4GoczNH7QOtE5NaMv7ZFtNTe+mGTG5II13YXDVIBNeFLsb1lr4PgyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773215643; c=relaxed/simple; bh=ZezFSr32pT7ms/HOoEkJXINjhxxXzSKhdAF4TkA5u20=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Dz0yG8JozYrfawZtHAtwQfeGFksg73WIUJUpzmDZb8iUIqEYwJXSpzwx0gCnzpbj363+iaJTqnenEYd6TyeU47aRWhzt8kfFAO6ALKScFkA6Lt0hlzxGE8rTkD5ADgO86U+IBuRJ+paEDkytq1w1BYm89eXudFmlgGTm859wkrI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=b00lRnyU; 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="b00lRnyU" Received: by smtp.kernel.org (Postfix) with ESMTPS id 3B16BC2BCC4; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773215642; bh=ZezFSr32pT7ms/HOoEkJXINjhxxXzSKhdAF4TkA5u20=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=b00lRnyUtXN2bdCot0RGwzLGY6m4k4YoUJCCgcreonYpENDWIiSG3+7YCmpc+MLwy g/S1QNPc/XxYy5ooqRGTaRTbRSEWz3BoferZXizMBKsDALwORKpIVzERonxiD1dE50 OC1eWJCXOeSsuuse4NnkQqxB0o8f0UugauJ+jLLp22N68/9VgpsLLIKMLcbtttd5+h dEo8hwgn9k+9qe+9trs8J5c8/AH+V14nQCHHIcxSuUxbfX/r5SsurNoAcA6wry5dHo awp+6d4Wcw6WRga2WbKYIgrtCHa6Ks6wkT6/5TZwqpsDKQ4UBYv1l9anv5di2WShBx vzsEqlC+SqPhA== 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 317C2FD0651; Wed, 11 Mar 2026 07:54:02 +0000 (UTC) From: Jan Petrous via B4 Relay Date: Wed, 11 Mar 2026 08:54:00 +0100 Subject: [PATCH v9 5/5] stmmac: s32: enable support for Multi-IRQ mode 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: <20260311-dwmac_multi_irq-v9-5-f0c03ef8d01f@oss.nxp.com> References: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@oss.nxp.com> In-Reply-To: <20260311-dwmac_multi_irq-v9-0-f0c03ef8d01f@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=1773215640; l=4702; i=jan.petrous@oss.nxp.com; s=20240922; h=from:subject:message-id; bh=Ccg7iBM1Fl+oVJULpuGtFE+LiMWCMv+ramMC+vtotcs=; b=H1HjAGDcAvz+N/DzzuCLtTTeF8bmyfeSGvsBX3cSxarhsY6R8mZcZ/QB/tRoqR1j1G1QbAzym M8btA7TSbpFCd4pwzRc+edowgA81SGyxk0PEPxH3dWiOIqVZ7K9N3MT 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)" Based on previous changes in platform driver, the vendor glue driver can enable Multi-IRQ mode, if needed. To get enabled Multi-IRQ mode for dwmac-s32, the driver checks: 1) property of 'snps,mtl-xx-config' subnode defines 'snps,xx-queues-to-use' bigger then one, ie: ethernet@4033c000 { compatible =3D "nxp,s32g2-dwmac"; ... snps,mtl-rx-config =3D <&mtl_rx_setup>; ... mtl_rx_setup: rx-queues-config { snps,rx-queues-to-use =3D <2>; }; 2) queue based IRQs are set, ie: ethernet@4033c000 { compatible =3D "nxp,s32g2-dwmac"; ... interrupts =3D , /* CHN 0: tx, rx */ , , /* CHN 1: tx, rx */ , ; interrupt-names =3D "macirq", "tx-queue-0", "rx-queue-0", "tx-queue-1", "rx-queue-1"; If those prerequisites are met, the driver switches to Multi-IRQ mode, using per-queue IRQs for rx/tx data pathr: [ 1.387045] s32-dwmac 4033c000.ethernet: Multi-IRQ mode (per queue IRQs)= selected Now the driver owns all queues IRQs: root@s32g399aevb3:~# grep eth /proc/interrupts 29: 0 0 0 0 0 0 0 0 GICv3 89 Level eth0:mac 30: 0 0 0 0 0 0 0 0 GICv3 91 Level eth0:rx-0 31: 0 0 0 0 0 0 0 0 GICv3 93 Level eth0:rx-1 32: 0 0 0 0 0 0 0 0 GICv3 95 Level eth0:rx-2 33: 0 0 0 0 0 0 0 0 GICv3 97 Level eth0:rx-3 34: 0 0 0 0 0 0 0 0 GICv3 99 Level eth0:rx-4 35: 0 0 0 0 0 0 0 0 GICv3 90 Level eth0:tx-0 36: 0 0 0 0 0 0 0 0 GICv3 92 Level eth0:tx-1 37: 0 0 0 0 0 0 0 0 GICv3 94 Level eth0:tx-2 38: 0 0 0 0 0 0 0 0 GICv3 96 Level eth0:tx-3 39: 0 0 0 0 0 0 0 0 GICv3 98 Level eth0:tx-4 Otherwise, if one of the prerequisite don't met, the driver continue with MAC IRQ mode: [ 1.387045] s32-dwmac 4033c000.ethernet: MAC IRQ mode selected And only MAC IRQ will be attached: root@s32g399aevb3:~# grep eth /proc/interrupts 29: 0 0 0 0 0 0 0 0 GICv3 89 Level eth0:mac What represents the original MAC IRQ mode and is fully backward compatible. Reviewed-by: Matthias Brugger Signed-off-by: Jan Petrous (OSS) --- drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c | 36 +++++++++++++++++++++= +++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c b/drivers/net/= ethernet/stmicro/stmmac/dwmac-s32.c index af594a096676..d4e0c9f44fb3 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-s32.c @@ -2,7 +2,7 @@ /* * NXP S32G/R GMAC glue layer * - * Copyright 2019-2024 NXP + * Copyright 2019-2026 NXP * */ =20 @@ -110,6 +110,37 @@ static void s32_gmac_exit(struct device *dev, void *pr= iv) clk_disable_unprepare(gmac->rx_clk); } =20 +static void s32_gmac_setup_multi_irq(struct device *dev, + struct plat_stmmacenet_data *plat, + struct stmmac_resources *res) +{ + int i; + + /* RX IRQs */ + STMMAC_FOREACH_MTL_QUEUE(i, plat->rx_queues_to_use) { + if (res->rx_irq[i] <=3D 0) { + dev_dbg(dev, "Missing RX queue %d interrupt\n", i); + goto mac_irq_mode; + } + } + + /* TX IRQs */ + STMMAC_FOREACH_MTL_QUEUE(i, plat->tx_queues_to_use) { + if (res->tx_irq[i] <=3D 0) { + dev_dbg(dev, "Missing TX queue %d interrupt\n", i); + goto mac_irq_mode; + } + } + + plat->flags |=3D STMMAC_FLAG_MULTI_MSI_EN; + dev_info(dev, "Multi-IRQ mode (per queue IRQs) selected\n"); + return; + +mac_irq_mode: + plat->flags &=3D ~STMMAC_FLAG_MULTI_MSI_EN; + dev_info(dev, "MAC IRQ mode selected\n"); +} + static int s32_dwmac_probe(struct platform_device *pdev) { struct plat_stmmacenet_data *plat; @@ -165,6 +196,9 @@ static int s32_dwmac_probe(struct platform_device *pdev) plat->core_type =3D DWMAC_CORE_GMAC4; plat->pmt =3D 1; plat->flags |=3D STMMAC_FLAG_SPH_DISABLE; + + s32_gmac_setup_multi_irq(dev, plat, &res); + plat->rx_fifo_size =3D 20480; plat->tx_fifo_size =3D 20480; =20 --=20 2.47.0