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 814AD2DEA68; Mon, 11 May 2026 10:50:07 +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=1778496607; cv=none; b=rP4VFvlw9jTs1halTIS+vJP0n2JqX3aOnIYBpmi9jS5QGlo28dgo7HRAHwf/uqNkiAu6/Jg4voM53qdhTAr2YVqKaq/mIfVFo5eaTIkCw0QuB/a92rtOQ+gfJ6kistCk6Kn6lDvMXVhNdomgrayV8XvH2J6JY8f0Sn8FEz3nyGw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778496607; c=relaxed/simple; bh=gQAijkyvFyuKeFFfMXRtm4L3+i0vgZ9Uor/DHg9cFHQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H3imBE+ZLpcGkBjCaTXkBVNJ9IUkP8WXYmxstyESAoRQ8Vs9G4eEEbHTu45KII+fXhZFnWsCy4wie9nW6vDAIW8XUmkA6OKgiRTO7ezoN/0rBYH8BLaGxkIa7g2hwU16tFm3stPC9iAOcoVVuDcB9WwqSkatosg5CGU9kitQbcE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nlSs0tam; 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="nlSs0tam" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BCCFBC2BCB0; Mon, 11 May 2026 10:50:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778496607; bh=gQAijkyvFyuKeFFfMXRtm4L3+i0vgZ9Uor/DHg9cFHQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=nlSs0taml6pzPgCvishlqNGRNNuxATBy0mPccrxm9xKyEenFZkftrpMXCuHcXbSyk s0QwjbsXKkqINFelZDYJ7xH7css9o+4BtnRTQqt1sNhZg0L37B8I9CtbbjuD4lt1bP Jl1SJ0EsHA5IZysdCYTe/JjoNfQacM1lNYVm8Br47cB3V3E0BtC+FpfW3jD6Ogg+DU 84zqVH6U31J40pFi4lCxrHsiwXY8d2FPWgar1gobuksTeKFc6Fl/XN9LC/aGawvfMt Rkwqn61sTa27Y7vMh5CcDo9aSN8umDVtILFv4Ugg4245sG8NiwubKjJXFDL/jrtqVG hnrwrZPg2J2Dg== From: Lorenzo Bianconi Date: Mon, 11 May 2026 12:49:32 +0200 Subject: [PATCH net-next v6 06/12] net: airoha: Move qos_sq_bmap in airoha_gdm_dev struct 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: <20260511-airoha-eth-multi-serdes-v6-6-c899462c4f75@kernel.org> References: <20260511-airoha-eth-multi-serdes-v6-0-c899462c4f75@kernel.org> In-Reply-To: <20260511-airoha-eth-multi-serdes-v6-0-c899462c4f75@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 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_gdm_dev one. Add qos_channel_map bitmap in airoha_qdma struct to track if a shared QDMA channel is already in use by another net_device. Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/airoha/airoha_eth.c | 59 ++++++++++++++++++++------------ drivers/net/ethernet/airoha/airoha_eth.h | 6 ++-- 2 files changed, 42 insertions(+), 23 deletions(-) diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c index 3510b088ad15..033541df2f83 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.c +++ b/drivers/net/ethernet/airoha/airoha_eth.c @@ -2599,44 +2599,61 @@ static int airoha_qdma_set_tx_rate_limit(struct net_device *netdev, return 0; } -static int airoha_tc_htb_alloc_leaf_queue(struct net_device *netdev, - struct tc_htb_qopt_offload *opt) +static int airoha_tc_htb_modify_queue(struct net_device *dev, + struct tc_htb_qopt_offload *opt) { u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS; 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; if (opt->parent_classid != TC_HTB_CLASSID_ROOT) { NL_SET_ERR_MSG_MOD(opt->extack, "invalid parent classid"); return -EINVAL; } - err = airoha_qdma_set_tx_rate_limit(netdev, channel, rate, - opt->quantum); + return airoha_qdma_set_tx_rate_limit(dev, channel, rate, opt->quantum); +} + +static int airoha_tc_htb_alloc_leaf_queue(struct net_device *netdev, + struct tc_htb_qopt_offload *opt) +{ + u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS; + int err, num_tx_queues = netdev->real_num_tx_queues; + struct airoha_gdm_dev *dev = netdev_priv(netdev); + struct airoha_qdma *qdma = dev->qdma; + + /* Here we need to check the requested QDMA channel is not already + * in use by another net_device running on the same QDMA block. + */ + if (test_and_set_bit(channel, qdma->qos_channel_map)) { + NL_SET_ERR_MSG_MOD(opt->extack, + "qdma qos channel already in use"); + return -EBUSY; + } + + err = airoha_tc_htb_modify_queue(netdev, opt); if (err) { NL_SET_ERR_MSG_MOD(opt->extack, "failed configuring htb offload"); - return err; + goto error; } - if (opt->command == TC_HTB_NODE_MODIFY) - return 0; - err = netif_set_real_num_tx_queues(netdev, num_tx_queues + 1); if (err) { airoha_qdma_set_tx_rate_limit(netdev, channel, 0, opt->quantum); NL_SET_ERR_MSG_MOD(opt->extack, "failed setting real_num_tx_queues"); - return err; + goto error; } - set_bit(channel, port->qos_sq_bmap); + set_bit(channel, dev->qos_sq_bmap); opt->qid = AIROHA_NUM_TX_RING + channel; return 0; +error: + clear_bit(channel, qdma->qos_channel_map); + + return err; } static int airoha_qdma_set_rx_meter(struct airoha_gdm_dev *dev, @@ -2817,11 +2834,13 @@ 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_channel_map); + clear_bit(queue, dev->qos_sq_bmap); } static int airoha_tc_htb_delete_leaf_queue(struct net_device *netdev, @@ -2829,9 +2848,8 @@ 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; - if (!test_bit(channel, port->qos_sq_bmap)) { + if (!test_bit(channel, dev->qos_sq_bmap)) { NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id"); return -EINVAL; } @@ -2844,10 +2862,9 @@ 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; int q; - for_each_set_bit(q, port->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS) + for_each_set_bit(q, dev->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS) airoha_tc_remove_htb_queue(netdev, q); return 0; @@ -2858,9 +2875,8 @@ 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; - if (!test_bit(channel, port->qos_sq_bmap)) { + if (!test_bit(channel, dev->qos_sq_bmap)) { NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id"); return -EINVAL; } @@ -2879,6 +2895,7 @@ static int airoha_tc_setup_qdisc_htb(struct net_device *dev, case TC_HTB_DESTROY: return airoha_tc_htb_destroy(dev); case TC_HTB_NODE_MODIFY: + return airoha_tc_htb_modify_queue(dev, opt); case TC_HTB_LEAF_ALLOC_QUEUE: return airoha_tc_htb_alloc_leaf_queue(dev, opt); case TC_HTB_LEAF_DEL: diff --git a/drivers/net/ethernet/airoha/airoha_eth.h b/drivers/net/ethernet/airoha/airoha_eth.h index f6f59d25abd9..a308a770116b 100644 --- a/drivers/net/ethernet/airoha/airoha_eth.h +++ b/drivers/net/ethernet/airoha/airoha_eth.h @@ -533,6 +533,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_channel_map, AIROHA_NUM_QOS_CHANNELS); }; struct airoha_gdm_dev { @@ -540,6 +542,8 @@ struct airoha_gdm_dev { struct airoha_qdma *qdma; struct net_device *dev; struct airoha_eth *eth; + + DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS); }; struct airoha_gdm_port { @@ -549,8 +553,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