From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5B34FCD37AA for ; Thu, 7 May 2026 21:22:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=nn6ZcMZVI2ruYcsoJvQ88rOK7HGmwNXekJ6yh3g9DC4=; b=wcmPJKP2eH12CJwgsUvJry0eXe viorqjGPSl6q4n2KuRf7pY+ZJSvmmKVBmOi7veIb25HtdOe4OYN0T+sbquGNTIa2tAQ8F6+UZOoNB qqhAr84ImHe8qHCJgZaKnjFb/FR3oJZsDazJRhxZ5z7NOlmGGiZau5VbMw2oBPTJ4TP2qGSU5CQH9 2B778d5FtZoZ+IbSAQbZXr9IclLZBNll7P4Y7Wyyd6E9wybAiAwGKMD8Y1AneNeLRsDnuD3h02xU0 uROAZ/SZWKTaF7g1/t7RfVt9Tf0ShVDJG3X6jkAvhAMAnvHxfPfhZkNPzmiUtjLw8Qyqmv/ocjEUa NTDgHnbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL6B5-00000004uJo-43jZ; Thu, 07 May 2026 21:22:39 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL6B2-00000004uF6-0S99; Thu, 07 May 2026 21:22:37 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id CC01E41853; Thu, 7 May 2026 21:22:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5896BC2BCC7; Thu, 7 May 2026 21:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778188955; bh=xaTlcJsVpc1H5KUupvjVkia3sjKoUfBhR3qsFl54Tfw=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=LSpZDeXiX4t2qmYv6XoWT08HuymBBeUHDcBK1NaBNm6ehJfMNWZ1FdbXkm9c2XsaA bvzlXoT1nX+ipQRzx1pgqCGyd9Sbo26P7wjWhPcgKls/wmq31YXC4LJt5+AhZU7Dga qJWfM9NeCuEonEMZnwL8XF//ceBocsLiMMglzA7XCQo+mnuv2aLPXNmeEcco3nb6XS jaO5n0AyHiCwhfWBMpl98MtBtz9JvsAWIwLfSY+ufVWCYy29TrMLLSX2m4i+Xk2mQK lyT/wcIhbOiKNAavMLeIl/aTNO3o6ZPjXYpH2GnHMoL7uPnQ8zxpkCdRMZKIShLeXt fnddGjxyPGChw== From: Lorenzo Bianconi Date: Thu, 07 May 2026 23:21:47 +0200 Subject: [PATCH net-next v4 04/10] net: airoha: Rely on airoha_gdm_dev pointer in airhoa_is_lan_gdm_port() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-airoha-eth-multi-serdes-v4-4-af613b61ae02@kernel.org> References: <20260507-airoha-eth-multi-serdes-v4-0-af613b61ae02@kernel.org> In-Reply-To: <20260507-airoha-eth-multi-serdes-v4-0-af613b61ae02@kernel.org> To: Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Lorenzo Bianconi Cc: Christian Marangi , Benjamin Larsson , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, Xuegang Lu X-Mailer: b4 0.14.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260507_142236_190930_3A142632 X-CRM114-Status: GOOD ( 14.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename airhoa_is_lan_gdm_port in airhoa_is_lan_gdm_dev. Moreover, rely on airoha_gdm_dev pointer in airhoa_is_lan_gdm_dev() instead of airoha_gdm_port one. This is a preliminary patch to support multiple net_devices connected to the same GDM{3,4} port via an external hw arbiter. Tested-by: Xuegang Lu Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 6 ++---- drivers/net/ethernet/airoha/airoha_eth.h | 4 +++- drivers/net/ethernet/airoha/airoha_ppe.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 1798b4a6cf5d..080705e2f58d 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -73,12 +73,10 @@ static void airoha_qdma_irq_disable(struct airoha_irq_bank *irq_bank, static void airoha_set_macaddr(struct airoha_gdm_dev *dev, const u8 *addr) { - struct airoha_gdm_port *port = dev->port; struct airoha_eth *eth = dev->eth; u32 val, reg; - reg = airoha_is_lan_gdm_port(port) ? REG_FE_LAN_MAC_H - : REG_FE_WAN_MAC_H; + reg = airoha_is_lan_gdm_dev(dev) ? REG_FE_LAN_MAC_H : REG_FE_WAN_MAC_H; val = (addr[0] << 16) | (addr[1] << 8) | addr[2]; airoha_fe_wr(eth, reg, val); @@ -1859,7 +1857,7 @@ static int airoha_dev_init(struct net_device *netdev) int i; /* QDMA0 is used for lan ports while QDMA1 is used for WAN ports */ - dev->qdma = ð->qdma[!airoha_is_lan_gdm_port(port)]; + dev->qdma = ð->qdma[!airoha_is_lan_gdm_dev(dev)]; dev->dev->irq = dev->qdma->irq_banks[0].irq; airoha_set_macaddr(dev, netdev->dev_addr); diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index 21d308b1f087..18a9dfd75d44 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -645,8 +645,10 @@ static inline u16 airoha_qdma_get_txq(struct airoha_qdma *qdma, u16 qid) return qid % ARRAY_SIZE(qdma->q_tx); } -static inline bool airoha_is_lan_gdm_port(struct airoha_gdm_port *port) +static inline bool airoha_is_lan_gdm_dev(struct airoha_gdm_dev *dev) { + struct airoha_gdm_port *port = dev->port; + /* GDM1 port on EN7581 SoC is connected to the lan dsa switch. * GDM{2,3,4} can be used as wan port connected to an external * phy module. diff --git a/drivers/net/ethernet/airoha/airoha_ppe.c b/drivers/net/ethernet/airoha/airoha_ppe.c index 22f5f1bae730..047141b2d6d8 100644 --- a/drivers/net/ethernet/airoha/airoha_ppe.c +++ b/drivers/net/ethernet/airoha/airoha_ppe.c @@ -362,7 +362,7 @@ static int airoha_ppe_foe_entry_prepare(struct airoha_eth *eth, /* For downlink traffic consume SRAM memory for hw * forwarding descriptors queue. */ - if (airoha_is_lan_gdm_port(port)) + if (airoha_is_lan_gdm_dev(dev)) val |= AIROHA_FOE_IB2_FAST_PATH; if (dsa_port >= 0) val |= FIELD_PREP(AIROHA_FOE_IB2_NBQ, -- 2.54.0