From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mxout4.routing.net (mxout4.routing.net [134.0.28.9]) (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 D581B2116F6; Mon, 16 Jun 2025 08:07:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=134.0.28.9 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750061271; cv=none; b=ri9un2z8V0zFTFatvktpaBOwsExwSWplrjoeCObWtuiorkPFAEuGhryOhS9652hTSuRkWvZOgYCG7FwJgG8oImq2Exq9T1YmDIcmpZKXxZPskJzF8mVqJ78AnY6YBVs2nXG4TMB0N6FHEZry99c+Eykpj91mDO5Ai4gW7fyjSF4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750061271; c=relaxed/simple; bh=3lU+7FBXtk5WVaObG4t5tMM+F+TbxbNIbPpUIntrcC4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dmUyjawWhMhuvWbw5AwE1K8wyAZffa8QlXmKtH03TjhVYZpu/tvF5xpLgjat7RqwclvJU4ByWcYDfTJkXe+RhLC+P20d7MVHc7KSxCBnhL4t6EzVWcFn5VDJ2b0h9UgcDGF7jSdVvNU+AbITM5egVD1MZQ/R6QpoK20VQH6f5P4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fw-web.de; spf=pass smtp.mailfrom=fw-web.de; dkim=pass (1024-bit key) header.d=mailerdienst.de header.i=@mailerdienst.de header.b=gDvpQIX5; arc=none smtp.client-ip=134.0.28.9 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fw-web.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fw-web.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=mailerdienst.de header.i=@mailerdienst.de header.b="gDvpQIX5" Received: from mxbulk.masterlogin.de (unknown [192.168.10.85]) by mxout4.routing.net (Postfix) with ESMTP id B0281100877; Mon, 16 Jun 2025 08:07:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1750061266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NNSm585GJd6bICuICGpn4tPxcvkiDJTHzsEVK8Iy8kc=; b=gDvpQIX5WyvCe80fqTpMlwrF6y1KFQ8cmrFWWswaz4lr3tRDpJWbS3qUyfLAb9XMsDsVl7 N1wGp4ARPqkm5VTQVohvEVfivjdLOcCiAGwkwe3mfpYUCcE06sriUMo3nwPnnH9D6MKys9 KT9cVN4Bsqkd2JtpqR8a+iNH0rUzqlc= Received: from frank-u24.. (fttx-pool-194.15.87.210.bambit.de [194.15.87.210]) by mxbulk.masterlogin.de (Postfix) with ESMTPSA id 76E8B1226D6; Mon, 16 Jun 2025 08:07:46 +0000 (UTC) From: Frank Wunderlich To: Felix Fietkau , Sean Wang , Lorenzo Bianconi , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Matthias Brugger , AngeloGioacchino Del Regno Cc: Frank Wunderlich , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Simon Horman , Daniel Golle , arinc.unal@arinc9.com Subject: [net-next v4 2/3] net: ethernet: mtk_eth_soc: add consts for irq index Date: Mon, 16 Jun 2025 10:07:35 +0200 Message-ID: <20250616080738.117993-3-linux@fw-web.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250616080738.117993-1-linux@fw-web.de> References: <20250616080738.117993-1-linux@fw-web.de> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Frank Wunderlich Use consts instead of fixed integers for accessing IRQ array. Signed-off-by: Frank Wunderlich --- 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 81ae8a6fe838..3ecb399dcf81 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -3341,14 +3341,14 @@ static int mtk_get_irqs(struct platform_device *pdev, struct mtk_eth *eth) { int i; - 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_ETH_IRQ_TX] = platform_get_irq_byname(pdev, "tx"); + eth->irq[MTK_ETH_IRQ_RX] = platform_get_irq_byname(pdev, "rx"); + if (eth->irq[MTK_ETH_IRQ_TX] >= 0 && eth->irq[MTK_ETH_IRQ_RX] >= 0) return 0; - for (i = 0; i < 3; i++) { + for (i = 0; i < MTK_ETH_IRQ_MAX; 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_ETH_IRQ_SHARED]; else eth->irq[i] = platform_get_irq(pdev, i); @@ -3414,7 +3414,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_ETH_IRQ_RX], dev); mtk_tx_irq_enable(eth, MTK_TX_DONE_INT); mtk_rx_irq_enable(eth, eth->soc->rx.irq_done_mask); } @@ -4900,7 +4900,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_ETH_IRQ_SHARED]; eth->netdev[id]->dev.of_node = np; if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) @@ -5177,17 +5177,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_ETH_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_ETH_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_ETH_IRQ_RX], mtk_handle_irq_rx, 0, dev_name(eth->dev), eth); } @@ -5233,7 +5233,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_ETH_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..96b724dca0e2 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_ETH_IRQ_SHARED 0 +#define MTK_ETH_IRQ_TX 1 +#define MTK_ETH_IRQ_RX 2 +#define MTK_ETH_IRQ_MAX (MTK_ETH_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_ETH_IRQ_MAX]; u32 msg_enable; unsigned long sysclk; struct regmap *ethsys; -- 2.43.0