From nobody Fri Oct 10 09:18:08 2025 Received: from mxout2.routing.net (mxout2.routing.net [134.0.28.12]) (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 40F167FBA2; Sun, 15 Jun 2025 15:03:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=134.0.28.12 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749999839; cv=none; b=AxRyMLUdols8Rsg3jG1YoE9jgDWNPfiVkIIoFoYfnPqtMKXX5vZ+iRnE+AgMCQ7zfR2JcGmpG45WtUEBbEUJn7qkPpkp/nsYHP0i76n+DkEvvdC/vVbdSheIBJQS4kQP+o1Y8hCdI0hK/9Kok0GclWDbcJeRERxVUFQ+yPWJFGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749999839; c=relaxed/simple; bh=VMTM4/TGstnUHxJMg1MRKr4dOdDAu5tuU3B0/aQiQrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CbwjhyRexb22t74ORk4ua5xuPQBVCvFQWSGxUCaVNqm71Dg21vmv0Q/Cp5WOCWSv1AUH0wDi5H0Phu7OpWQ95EwYUwdbPoT9PPyObXTq8xC9UIuTDFC4kwiqfSTPI2+takVNhyPboAElKCSl2KlCVSqpnJD1iUG2BR+wH/7CmSc= 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=PsANyjPF; arc=none smtp.client-ip=134.0.28.12 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="PsANyjPF" Received: from mxbulk.masterlogin.de (unknown [192.168.10.85]) by mxout2.routing.net (Postfix) with ESMTP id 2823B5FBA1; Sun, 15 Jun 2025 15:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1749999829; 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=8+4Fhd4ocII9lpkmXR6H0SugqzwdoLPQH4LwtiRqyCc=; b=PsANyjPF0b03jF6W/HJSynxOLkuwREAJS8ozumrnEefluiJCFdhSv+DO19RftOA3dkvbWd L9BaHERIPEj2CI5qs9IdVIbA2IhVsKAf21J5JNEvC0TlW1OJhI9dFvLd/my/54OXy3py0b KeofimBCKKNtw0Wb3VxRsxVKQTQh+hA= Received: from frank-u24.. (fttx-pool-217.61.157.124.bambit.de [217.61.157.124]) by mxbulk.masterlogin.de (Postfix) with ESMTPSA id E0D4F1226A7; Sun, 15 Jun 2025 15:03:48 +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 Subject: [net-next v3 2/3] net: ethernet: mtk_eth_soc: add consts for irq index Date: Sun, 15 Jun 2025 17:03:17 +0200 Message-ID: <20250615150333.166202-3-linux@fw-web.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250615150333.166202-1-linux@fw-web.de> References: <20250615150333.166202-1-linux@fw-web.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Frank Wunderlich Use consts instead of fixed integers for accessing IRQ array. Signed-off-by: Frank Wunderlich --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 22 ++++++++++----------- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 5 +++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethe= rnet/mediatek/mtk_eth_soc.c index f91ea87d2f72..9aec67c9c6d7 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -3340,14 +3340,14 @@ static int mtk_get_irqs(struct platform_device *pde= v, struct mtk_eth *eth) { int i; =20 - eth->irq[1] =3D platform_get_irq_byname(pdev, "tx"); - eth->irq[2] =3D platform_get_irq_byname(pdev, "rx"); - if (eth->irq[1] >=3D 0 && eth->irq[2] >=3D 0) + eth->irq[MTK_ETH_IRQ_TX] =3D platform_get_irq_byname(pdev, "tx"); + eth->irq[MTK_ETH_IRQ_RX] =3D platform_get_irq_byname(pdev, "rx"); + if (eth->irq[MTK_ETH_IRQ_TX] >=3D 0 && eth->irq[MTK_ETH_IRQ_RX] >=3D 0) return 0; =20 - for (i =3D 0; i < 3; i++) { + for (i =3D 0; i < MTK_ETH_IRQ_MAX; i++) { if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT) && i > 0) - eth->irq[i] =3D eth->irq[0]; + eth->irq[i] =3D eth->irq[MTK_ETH_IRQ_SHARED]; else eth->irq[i] =3D platform_get_irq(pdev, i); =20 @@ -3413,7 +3413,7 @@ static void mtk_poll_controller(struct net_device *de= v) =20 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); } @@ -4899,7 +4899,7 @@ static int mtk_add_mac(struct mtk_eth *eth, struct de= vice_node *np) eth->netdev[id]->features |=3D eth->soc->hw_features; eth->netdev[id]->ethtool_ops =3D &mtk_ethtool_ops; =20 - eth->netdev[id]->irq =3D eth->irq[0]; + eth->netdev[id]->irq =3D eth->irq[MTK_ETH_IRQ_SHARED]; eth->netdev[id]->dev.of_node =3D np; =20 if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) @@ -5176,17 +5176,17 @@ static int mtk_probe(struct platform_device *pdev) } =20 if (MTK_HAS_CAPS(eth->soc->caps, MTK_SHARED_INT)) { - err =3D devm_request_irq(eth->dev, eth->irq[0], + err =3D devm_request_irq(eth->dev, eth->irq[MTK_ETH_IRQ_SHARED], mtk_handle_irq, 0, dev_name(eth->dev), eth); } else { - err =3D devm_request_irq(eth->dev, eth->irq[1], + err =3D 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; =20 - err =3D devm_request_irq(eth->dev, eth->irq[2], + err =3D devm_request_irq(eth->dev, eth->irq[MTK_ETH_IRQ_RX], mtk_handle_irq_rx, 0, dev_name(eth->dev), eth); } @@ -5232,7 +5232,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]); } =20 /* 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/ethe= rnet/mediatek/mtk_eth_soc.h index 6f72a8c8ae1e..6b1208d05f79 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -642,6 +642,11 @@ =20 #define MTK_MAC_FSM(x) (0x1010C + ((x) * 0x100)) =20 +#define MTK_ETH_IRQ_SHARED 0 +#define MTK_ETH_IRQ_TX 1 +#define MTK_ETH_IRQ_RX 2 +#define MTK_ETH_IRQ_MAX 3 + struct mtk_rx_dma { unsigned int rxd1; unsigned int rxd2; --=20 2.43.0