e1915674ab
EN7581 or AN7583 SoCs support connecting multiple external SerDes (e.g.
Ethernet or USB SerDes) to GDM3 or GDM4 ports via a hw arbiter that
manages the traffic in a TDM manner. As a result multiple net_devices can
connect to the same GDM{3,4} port and there is a theoretical "1:n"
relation between GDM ports and net_devices.
┌─────────────────────────────────┐
│ │ ┌──────┐
│ P1 GDM1 ├────►MT7530│
│ │ └──────┘
│ │ ETH0 (DSA conduit)
│ │
│ PSE/FE │
│ │
│ │
│ │ ┌─────┐
│ P0 CDM1 ├────►QDMA0│
│ P4 P9 GDM4 │ └─────┘
└──┬─────────────────────────┬────┘
│ │
┌──▼──┐ ┌────▼────┐
│ PPE │ │ ARB │
└─────┘ └─┬─────┬─┘
│ │
┌──▼──┐┌─▼───┐
│ ETH ││ USB │
└─────┘└─────┘
ETH1 ETH2
This series introduces support for multiple net_devices connected to the
same Frame Engine (FE) GDM port (GDM3 or GDM4) via an external hw
arbiter. Please note GDM1 or GDM2 does not support the connection with
the external arbiter.
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://github.com/openwrt/openwrt/pull/23481
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
185 lines
6.3 KiB
Diff
185 lines
6.3 KiB
Diff
From 634d75285db77f3385aa85a1bf2b185396225100 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <634d75285db77f3385aa85a1bf2b185396225100.1779348625.git.lorenzo@kernel.org>
|
|
In-Reply-To: <e15783f7c987e199ecf80b3d858ed5a86d33c508.1779348625.git.lorenzo@kernel.org>
|
|
References: <e15783f7c987e199ecf80b3d858ed5a86d33c508.1779348625.git.lorenzo@kernel.org>
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 10 Apr 2026 14:35:32 +0200
|
|
Subject: [PATCH 04/13] net: airoha: Move qos_sq_bmap in airoha_gdm_dev struct
|
|
|
|
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 <lorenzo@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 58 +++++++++++++++---------
|
|
drivers/net/ethernet/airoha/airoha_eth.h | 6 ++-
|
|
2 files changed, 40 insertions(+), 24 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -2822,30 +2822,40 @@ static int airoha_qdma_set_tx_rate_limit
|
|
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);
|
|
- if (err) {
|
|
+ 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,
|
|
- "failed configuring htb offload");
|
|
- return err;
|
|
+ "qdma qos channel already in use");
|
|
+ return -EBUSY;
|
|
}
|
|
|
|
- if (opt->command == TC_HTB_NODE_MODIFY)
|
|
- return 0;
|
|
+ err = airoha_tc_htb_modify_queue(netdev, opt);
|
|
+ if (err)
|
|
+ goto error;
|
|
|
|
err = netif_set_real_num_tx_queues(netdev, num_tx_queues + 1);
|
|
if (err) {
|
|
@@ -2853,13 +2863,17 @@ static int airoha_tc_htb_alloc_leaf_queu
|
|
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,
|
|
@@ -3040,11 +3054,13 @@ static int airoha_dev_setup_tc_block(str
|
|
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,
|
|
@@ -3052,9 +3068,8 @@ static int airoha_tc_htb_delete_leaf_que
|
|
{
|
|
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;
|
|
}
|
|
@@ -3067,10 +3082,9 @@ static int airoha_tc_htb_delete_leaf_que
|
|
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;
|
|
@@ -3081,9 +3095,8 @@ static int airoha_tc_get_htb_get_leaf_qu
|
|
{
|
|
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;
|
|
}
|
|
@@ -3102,6 +3115,7 @@ static int airoha_tc_setup_qdisc_htb(str
|
|
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:
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.h
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.h
|
|
@@ -544,6 +544,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 {
|
|
@@ -556,6 +558,8 @@ struct airoha_gdm_dev {
|
|
struct phylink *phylink;
|
|
struct phylink_config phylink_config;
|
|
#endif
|
|
+
|
|
+ DECLARE_BITMAP(qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS);
|
|
};
|
|
|
|
struct airoha_gdm_port {
|
|
@@ -565,8 +569,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;
|