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 54D30CD37AC for ; Thu, 7 May 2026 21:22:46 +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=7CbzJ3S18iW1VEBs3GrCiWQaV1ra2NK8sywRypSDGSc=; b=y1PosH1VGtOf1XzBRKJBB4tpmD ljbFaIdD9qOyuuq1MYomo5bbElN0KtzWYOsTT4EX44OklXlzsGEaCRtmRlco66r/sxIum7R/lSoP0 E8ihvEp50LWOEUoSEHtKTiPpKICZVWrEpwmJ2ApQq5HfyLbgg7bwrR4xnHutyErL9w9JuvmsPfrqE 0ewAnf9yjcCS5dFdYUt9uOtmZup6xAfz/zYSr5BMY/6aNF8ubTKTwIHIg+kOjAB5oJRs3TL4JkXH7 LnDYDJm6lBI/78RM+RdCCaibq4S8e7HLeYt4so/ZYFRJ8lkChafIgTyjK67p/aCcS3Rrho1fHLVOE 63QEERWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL6B6-00000004uKH-15Fl; Thu, 07 May 2026 21:22:40 +0000 Received: from tor.source.kernel.org ([172.105.4.254]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wL6B5-00000004uIT-0QCW; Thu, 07 May 2026 21:22:39 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 8C88160181; Thu, 7 May 2026 21:22:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E139FC2BCC9; Thu, 7 May 2026 21:22:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778188958; bh=XgAYoU0y85slz9uL3LFVwtZeHsDOMroq0sYN29Ni1v4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Pa1GTTBX5w2DQ4jeqg7ftrvjxpnoK4tTi9IBFDynXi6KtNN7oXFzvSkTMWlFbPMAY yArnKFsrSCjGX81+p9B93uLgHJ6TgWmASL/8gIbTzuqh3ci4U3J2WACgvQqu6MWAAf fqJ1Z1QM8FsdgumuWu4w6anvODzdTPUic5RP5IWT3rFYeF4R453674O0KcweX6VSy7 aRYUEsEIdyDuBSRwEfJ8ir79yDq8aBV9lrT8tfgiapxO/KZ5wVIn/2a/5cWipsA8N8 W5Hc/G5HltBkW4xwPkE1Po4kBkwr83z26/Su1FfrNVIJ3vFFTN08G8wMpbR5ar3DXX V37oh07PbUxMQ== From: Lorenzo Bianconi Date: Thu, 07 May 2026 23:21:48 +0200 Subject: [PATCH net-next v4 05/10] net: airoha: Move qos_sq_bmap in airoha_qdma struct MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260507-airoha-eth-multi-serdes-v4-5-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 X-Mailer: b4 0.14.3 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 Since now multiple net_devices connected to different QDMA blocks can share the same GDM port, qos_sq_bmap field can be overwritten with the configuration obtained from a net_device connected to a different QDMA block. In order to fix the issue move qos_sq_bmap field from airoha_gdm_port struct to airoha_qdma one. Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 20 ++++++++++---------- drivers/net/ethernet/airoha/airoha_eth.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 080705e2f58d..69a4c2e0d58b 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -2600,7 +2600,7 @@ static int airoha_tc_htb_alloc_leaf_queue(struct net_device *netdev, u32 rate = div_u64(opt->rate, 1000) << 3; /* kbps */ int err, num_tx_queues = netdev->real_num_tx_queues; struct airoha_gdm_dev *dev = netdev_priv(netdev); - struct airoha_gdm_port *port = dev->port; + struct airoha_qdma *qdma = dev->qdma; if (opt->parent_classid != TC_HTB_CLASSID_ROOT) { NL_SET_ERR_MSG_MOD(opt->extack, "invalid parent classid"); @@ -2627,7 +2627,7 @@ static int airoha_tc_htb_alloc_leaf_queue(struct net_device *netdev, return err; } - set_bit(channel, port->qos_sq_bmap); + set_bit(channel, qdma->qos_sq_bmap); opt->qid = AIROHA_NUM_TX_RING + channel; return 0; @@ -2811,11 +2811,11 @@ static int airoha_dev_setup_tc_block(struct net_device *dev, static void airoha_tc_remove_htb_queue(struct net_device *netdev, int queue) { struct airoha_gdm_dev *dev = netdev_priv(netdev); - struct airoha_gdm_port *port = dev->port; + struct airoha_qdma *qdma = dev->qdma; netif_set_real_num_tx_queues(netdev, netdev->real_num_tx_queues - 1); airoha_qdma_set_tx_rate_limit(netdev, queue + 1, 0, 0); - clear_bit(queue, port->qos_sq_bmap); + clear_bit(queue, qdma->qos_sq_bmap); } static int airoha_tc_htb_delete_leaf_queue(struct net_device *netdev, @@ -2823,9 +2823,9 @@ static int airoha_tc_htb_delete_leaf_queue(struct net_device *netdev, { u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS; struct airoha_gdm_dev *dev = netdev_priv(netdev); - struct airoha_gdm_port *port = dev->port; + struct airoha_qdma *qdma = dev->qdma; - if (!test_bit(channel, port->qos_sq_bmap)) { + if (!test_bit(channel, qdma->qos_sq_bmap)) { NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id"); return -EINVAL; } @@ -2838,10 +2838,10 @@ static int airoha_tc_htb_delete_leaf_queue(struct net_device *netdev, static int airoha_tc_htb_destroy(struct net_device *netdev) { struct airoha_gdm_dev *dev = netdev_priv(netdev); - struct airoha_gdm_port *port = dev->port; + struct airoha_qdma *qdma = dev->qdma; int q; - for_each_set_bit(q, port->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS) + for_each_set_bit(q, qdma->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS) airoha_tc_remove_htb_queue(netdev, q); return 0; @@ -2852,9 +2852,9 @@ static int airoha_tc_get_htb_get_leaf_queue(struct net_device *netdev, { u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS; struct airoha_gdm_dev *dev = netdev_priv(netdev); - struct airoha_gdm_port *port = dev->port; + struct airoha_qdma *qdma = dev->qdma; - if (!test_bit(channel, port->qos_sq_bmap)) { + if (!test_bit(channel, qdma->qos_sq_bmap)) { NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id"); return -EINVAL; } diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index 18a9dfd75d44..34f1fef51640 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -531,6 +531,8 @@ struct airoha_qdma { struct airoha_queue q_tx[AIROHA_NUM_TX_RING]; struct airoha_queue q_rx[AIROHA_NUM_RX_RING]; + + DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS); }; struct airoha_gdm_dev { @@ -547,8 +549,6 @@ struct airoha_gdm_port { struct airoha_hw_stats stats; - DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS); - /* qos stats counters */ u64 cpu_tx_packets; u64 fwd_tx_packets; -- 2.54.0