| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <aFLL9Uhu6zmovd2O@pidgin.makrotopia.org>
Date: Wed, 18 Jun 2025 16:23:49 +0200
From: Daniel Golle <daniel@...rotopia.org>
To: Frank Wunderlich <linux@...web.de>
Cc: Felix Fietkau <nbd@....name>, Sean Wang <sean.wang@...iatek.com>,
Lorenzo Bianconi <lorenzo@...nel.org>,
Andrew Lunn <andrew+netdev@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Frank Wunderlich <frank-w@...lic-files.de>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, Simon Horman <horms@...nel.org>,
arinc.unal@...nc9.com
Subject: Re: [net-next v5 2/3] net: ethernet: mtk_eth_soc: add consts for irq
index
On Wed, Jun 18, 2025 at 03:07:13PM +0200, Frank Wunderlich wrote:
> From: Frank Wunderlich <frank-w@...lic-files.de>
>
> Use consts instead of fixed integers for accessing IRQ array.
>
> Signed-off-by: Frank Wunderlich <frank-w@...lic-files.de>
> Reviewed-by: Simon Horman <horms@...nel.org>
Reviewed-by: Daniel Golle <daniel@...rotopia.org>
> ---
> v5:
> - rename consts to be compatible with upcoming RSS/LRO changes
> MTK_ETH_IRQ_SHARED => MTK_FE_IRQ_SHARED
> MTK_ETH_IRQ_TX => MTK_FE_IRQ_TX
> MTK_ETH_IRQ_RX => MTK_FE_IRQ_RX
> MTK_ETH_IRQ_MAX => MTK_FE_IRQ_NUM
> v4:
> - calculate max from last (rx) irq index and use it for array size too
> ---
> drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 ++++++++++-----------
> drivers/net/ethernet/mediatek/mtk_eth_soc.h | 7 ++++++-
> 2 files changed, 17 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> index 39b673ed7495..875e477a987b 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
> @@ -3342,9 +3342,9 @@ static int mtk_get_irqs(struct platform_device *pdev, struct mtk_eth *eth)
> int i;
>
> /* future SoCs beginning with MT7988 should use named IRQs in dts */
> - eth->irq[1] = platform_get_irq_byname(pdev, "tx");
> - eth->irq[2] = platform_get_irq_byname(pdev, "rx");
> - if (eth->irq[1] >= 0 && eth->irq[2] >= 0)
> + eth->irq[MTK_FE_IRQ_TX] = platform_get_irq_byname(pdev, "tx");
> + eth->irq[MTK_FE_IRQ_RX] = platform_get_irq_byname(pdev, "rx");
> + if (eth->irq[MTK_FE_IRQ_TX] >= 0 && eth->irq[MTK_FE_IRQ_RX] >= 0)
> return 0;
>
> /* legacy way:
> @@ -3353,9 +3353,9 @@ static int mtk_get_irqs(struct platform_device *pdev, struct mtk_eth *eth)
> * On SoCs with non-shared IRQs the first entry is not used,
> * the second is for TX, and the third is for RX.
> */
> - for (i = 0; i < 3; i++) {
> + for (i = 0; i < MTK_FE_IRQ_NUM; i++) {
> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT) && i > 0)
> - eth->irq[i] = eth->irq[0];
> + eth->irq[i] = eth->irq[MTK_FE_IRQ_SHARED];
> else
> eth->irq[i] = platform_get_irq(pdev, i);
>
> @@ -3421,7 +3421,7 @@ static void mtk_poll_controller(struct net_device *dev)
>
> mtk_tx_irq_disable(eth, MTK_TX_DONE_INT);
> mtk_rx_irq_disable(eth, eth->soc->rx.irq_done_mask);
> - mtk_handle_irq_rx(eth->irq[2], dev);
> + mtk_handle_irq_rx(eth->irq[MTK_FE_IRQ_RX], dev);
> mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
> mtk_rx_irq_enable(eth, eth->soc->rx.irq_done_mask);
> }
> @@ -4907,7 +4907,7 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
> eth->netdev[id]->features |= eth->soc->hw_features;
> eth->netdev[id]->ethtool_ops = &mtk_ethtool_ops;
>
> - eth->netdev[id]->irq = eth->irq[0];
> + eth->netdev[id]->irq = eth->irq[MTK_FE_IRQ_SHARED];
> eth->netdev[id]->dev.of_node = np;
>
> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
> @@ -5184,17 +5184,17 @@ static int mtk_probe(struct platform_device *pdev)
> }
>
> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT)) {
> - err = devm_request_irq(eth->dev, eth->irq[0],
> + err = devm_request_irq(eth->dev, eth->irq[MTK_FE_IRQ_SHARED],
> mtk_handle_irq, 0,
> dev_name(eth->dev), eth);
> } else {
> - err = devm_request_irq(eth->dev, eth->irq[1],
> + err = devm_request_irq(eth->dev, eth->irq[MTK_FE_IRQ_TX],
> mtk_handle_irq_tx, 0,
> dev_name(eth->dev), eth);
> if (err)
> goto err_free_dev;
>
> - err = devm_request_irq(eth->dev, eth->irq[2],
> + err = devm_request_irq(eth->dev, eth->irq[MTK_FE_IRQ_RX],
> mtk_handle_irq_rx, 0,
> dev_name(eth->dev), eth);
> }
> @@ -5240,7 +5240,7 @@ static int mtk_probe(struct platform_device *pdev)
> } else
> netif_info(eth, probe, eth->netdev[i],
> "mediatek frame engine at 0x%08lx, irq %d\n",
> - eth->netdev[i]->base_addr, eth->irq[0]);
> + eth->netdev[i]->base_addr, eth->irq[MTK_FE_IRQ_SHARED]);
> }
>
> /* we run 2 devices on the same DMA ring so we need a dummy device
> diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
> index 6f72a8c8ae1e..8cdf1317dff5 100644
> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
> +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
> @@ -642,6 +642,11 @@
>
> #define MTK_MAC_FSM(x) (0x1010C + ((x) * 0x100))
>
> +#define MTK_FE_IRQ_SHARED 0
> +#define MTK_FE_IRQ_TX 1
> +#define MTK_FE_IRQ_RX 2
> +#define MTK_FE_IRQ_NUM (MTK_FE_IRQ_RX + 1)
> +
> struct mtk_rx_dma {
> unsigned int rxd1;
> unsigned int rxd2;
> @@ -1292,7 +1297,7 @@ struct mtk_eth {
> struct net_device *dummy_dev;
> struct net_device *netdev[MTK_MAX_DEVS];
> struct mtk_mac *mac[MTK_MAX_DEVS];
> - int irq[3];
> + int irq[MTK_FE_IRQ_NUM];
> u32 msg_enable;
> unsigned long sysclk;
> struct regmap *ethsys;
> --
> 2.43.0
>
Powered by blists - more mailing lists