From mboxrd@z Thu Jan 1 00:00:00 1970 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 5439D21CA13; Thu, 7 May 2026 21:22:46 +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=1778188966; cv=none; b=MV3ewycat8CzRYw68q4sJH0Re2cVS/2JIrZFnRRoffMiXwUgf754Y6febX0r+2lPStmhtqqtDw+mllmqpXgH+VY/XqbaUPASvfyABX4yUlmZu89ly8c1qMk1FpJ/FqrxfA5tcNENfUH3QJ8/STSmzW5chC+hyEiCSVR3XfuA2Os= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778188966; c=relaxed/simple; bh=Os92VRV6wobICRUxFOcie8IXUjdXaXgFHGkvzJXHi/0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NNloYboov9A6Hi7h5w7U4o/oIJQImy0cDzOfrdbfXFFwMLLPyNnb17mInW5cmztAKaJpw9GIXVDKJD/75musVpElE3KZa+PkcRIWoijfQX/5Qwu45KwCM3u+OvquQvk2MhL/mPnJI7IO8zIox5At0LX5z6xiUbnuULBJ5azmXcU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K2oPdcBq; 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="K2oPdcBq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9CB5DC2BCF6; Thu, 7 May 2026 21:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778188966; bh=Os92VRV6wobICRUxFOcie8IXUjdXaXgFHGkvzJXHi/0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=K2oPdcBqqRqUQxVUYraBRAGjBfZH+lrsqhW/DNBscoYQpMkB6aT5SbX5QTIe8hHhp 5XwpUx0PpHMbNWN77AZzgk9MBbtTAvf58MnLic1jWAAFCFnSxgi9UjZhWFEfKEici7 d8rrOsCt4BiyJxoFwT0+Sb86WWCs5b0uYnIaEMt13UwRqT+WuM0fpuclHKbPpgVI8A 3HRN28GDbDhDSU3KZZ6JHwSCmv2qP++0LI+VSR6iuS+HXz2XkurrmlMmCZwsLdRG16 bEVV1USypSFu4HqzBJYr3PGo/uqW43BdIBw8YbDkPZTK4t6dHN0ZE4tDTIhyaChVnk GKDwa4p8nEeWw== From: Lorenzo Bianconi Date: Thu, 07 May 2026 23:21:51 +0200 Subject: [PATCH net-next v4 08/10] net: airoha: Do not stop GDM port if it is shared Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-airoha-eth-multi-serdes-v4-8-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 Theoretically, in the current codebase, two independent net_devices can be connected to the same GDM port so we need to check the GDM port is not used by any other running net_device before setting the forward configuration to FE_PSE_PORT_DROP. Tested-by: Xuegang Lu Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 36 +++++++++++++++++++++++++------- drivers/net/ethernet/airoha/airoha_eth.h | 2 ++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 0253919714e0..1c4927c1aeb0 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -1714,8 +1714,8 @@ static int airoha_dev_open(struct net_device *netdev) int err, len = ETH_HLEN + netdev->mtu + ETH_FCS_LEN; struct airoha_gdm_dev *dev = netdev_priv(netdev); struct airoha_gdm_port *port = dev->port; + u32 cur_len, pse_port = FE_PSE_PORT_PPE1; struct airoha_qdma *qdma = dev->qdma; - u32 pse_port = FE_PSE_PORT_PPE1; netif_tx_start_all_queues(netdev); err = airoha_set_vip_for_gdm_port(dev, true); @@ -1729,10 +1729,14 @@ static int airoha_dev_open(struct net_device *netdev) airoha_fe_clear(qdma->eth, REG_GDM_INGRESS_CFG(port->id), GDM_STAG_EN_MASK); - airoha_fe_rmw(qdma->eth, REG_GDM_LEN_CFG(port->id), - GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK, - FIELD_PREP(GDM_SHORT_LEN_MASK, 60) | - FIELD_PREP(GDM_LONG_LEN_MASK, len)); + cur_len = airoha_fe_get(qdma->eth, REG_GDM_LEN_CFG(port->id), + GDM_LONG_LEN_MASK); + if (!atomic_read(&port->users) || len > cur_len) + airoha_fe_rmw(qdma->eth, REG_GDM_LEN_CFG(port->id), + GDM_SHORT_LEN_MASK | GDM_LONG_LEN_MASK, + FIELD_PREP(GDM_SHORT_LEN_MASK, 60) | + FIELD_PREP(GDM_LONG_LEN_MASK, len)); + atomic_inc(&port->users); airoha_qdma_set(qdma, REG_QDMA_GLOBAL_CFG, GLOBAL_CFG_TX_DMA_EN_MASK | @@ -1762,8 +1766,12 @@ static int airoha_dev_stop(struct net_device *netdev) for (i = 0; i < netdev->num_tx_queues; i++) netdev_tx_reset_subqueue(netdev, i); - airoha_set_gdm_port_fwd_cfg(qdma->eth, REG_GDM_FWD_CFG(port->id), - FE_PSE_PORT_DROP); + if (atomic_dec_and_test(&port->users)) { + airoha_set_vip_for_gdm_port(dev, false); + airoha_set_gdm_port_fwd_cfg(qdma->eth, + REG_GDM_FWD_CFG(port->id), + FE_PSE_PORT_DROP); + } if (atomic_dec_and_test(&qdma->users)) { airoha_qdma_clear(qdma, REG_QDMA_GLOBAL_CFG, @@ -1915,10 +1923,22 @@ static void airoha_dev_get_stats64(struct net_device *netdev, static int airoha_dev_change_mtu(struct net_device *netdev, int mtu) { struct airoha_gdm_dev *dev = netdev_priv(netdev); + u32 cur_len, len = ETH_HLEN + mtu + ETH_FCS_LEN; struct airoha_gdm_port *port = dev->port; - u32 len = ETH_HLEN + mtu + ETH_FCS_LEN; struct airoha_eth *eth = dev->eth; + cur_len = airoha_fe_get(eth, REG_GDM_LEN_CFG(port->id), + GDM_LONG_LEN_MASK); + if (len < cur_len) { + u8 port_refcnt = atomic_read(&port->users); + + /* We can decrease the device MTU just if the GDM port is + * not shared or if the other device is not running. + */ + if (port_refcnt > 1 || (port_refcnt && !netif_running(netdev))) + return -EBUSY; + } + airoha_fe_rmw(eth, REG_GDM_LEN_CFG(port->id), GDM_LONG_LEN_MASK, FIELD_PREP(GDM_LONG_LEN_MASK, len)); diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index 207c75152fde..3a313ac439e7 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -553,6 +553,8 @@ struct airoha_gdm_port { struct airoha_gdm_dev *devs[AIROHA_MAX_NUM_GDM_DEVS]; int id; + atomic_t users; + struct airoha_hw_stats stats; struct metadata_dst *dsa_meta[AIROHA_MAX_DSA_PORTS]; -- 2.54.0