net: airoha: Rely on net_device pointer in HTB callbacks

Remove airoha_gdm_port dependency in HTB tc callback signatures and rely
on net_device pointer instead. Please note this patch does not introduce
any logical change and it is a preliminary patch in order to support
multiple net_devices connected to the same GDM3 or GDM4 port via an
external hw arbiter.

Tested-by: Xuegang Lu <xuegang.lu@airoha.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20260412-airoha-multi-serdes-preliminary-patch-v1-2-08d5b670ca8f@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/airoha/airoha_eth.c b/drivers/net/ethernet/airoha/airoha_eth.c
index a98512e963b5b0bf8d2a481a01a2cfb45d1f816f..c2b5fcffce82b88cde80189a083e4789085b5eb4 100644 (file)
--- a/drivers/net/ethernet/airoha/airoha_eth.c
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
@@ -2492,10 +2492,11 @@ static int airoha_qdma_set_trtcm_token_bucket(struct airoha_qdma *qdma,
                                           mode, val);
 }
 
-static int airoha_qdma_set_tx_rate_limit(struct airoha_gdm_port *port,
+static int airoha_qdma_set_tx_rate_limit(struct net_device *dev,
                                         int channel, u32 rate,
                                         u32 bucket_size)
 {
+       struct airoha_gdm_port *port = netdev_priv(dev);
        int i, err;
 
        for (i = 0; i <= TRTCM_PEAK_MODE; i++) {
@@ -2515,21 +2516,20 @@ static int airoha_qdma_set_tx_rate_limit(struct airoha_gdm_port *port,
        return 0;
 }
 
-static int airoha_tc_htb_alloc_leaf_queue(struct airoha_gdm_port *port,
+static int airoha_tc_htb_alloc_leaf_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 */
-       struct net_device *dev = port->dev;
-       int num_tx_queues = dev->real_num_tx_queues;
-       int err;
+       int err, num_tx_queues = dev->real_num_tx_queues;
+       struct airoha_gdm_port *port = netdev_priv(dev);
 
        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(port, channel, rate, opt->quantum);
+       err = airoha_qdma_set_tx_rate_limit(dev, channel, rate, opt->quantum);
        if (err) {
                NL_SET_ERR_MSG_MOD(opt->extack,
                                   "failed configuring htb offload");
@@ -2541,7 +2541,7 @@ static int airoha_tc_htb_alloc_leaf_queue(struct airoha_gdm_port *port,
 
        err = netif_set_real_num_tx_queues(dev, num_tx_queues + 1);
        if (err) {
-               airoha_qdma_set_tx_rate_limit(port, channel, 0, opt->quantum);
+               airoha_qdma_set_tx_rate_limit(dev, channel, 0, opt->quantum);
                NL_SET_ERR_MSG_MOD(opt->extack,
                                   "failed setting real_num_tx_queues");
                return err;
@@ -2728,44 +2728,47 @@ static int airoha_dev_setup_tc_block(struct net_device *dev,
        }
 }
 
-static void airoha_tc_remove_htb_queue(struct airoha_gdm_port *port, int queue)
+static void airoha_tc_remove_htb_queue(struct net_device *dev, int queue)
 {
-       struct net_device *dev = port->dev;
+       struct airoha_gdm_port *port = netdev_priv(dev);
 
        netif_set_real_num_tx_queues(dev, dev->real_num_tx_queues - 1);
-       airoha_qdma_set_tx_rate_limit(port, queue + 1, 0, 0);
+       airoha_qdma_set_tx_rate_limit(dev, queue + 1, 0, 0);
        clear_bit(queue, port->qos_sq_bmap);
 }
 
-static int airoha_tc_htb_delete_leaf_queue(struct airoha_gdm_port *port,
+static int airoha_tc_htb_delete_leaf_queue(struct net_device *dev,
                                           struct tc_htb_qopt_offload *opt)
 {
        u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS;
+       struct airoha_gdm_port *port = netdev_priv(dev);
 
        if (!test_bit(channel, port->qos_sq_bmap)) {
                NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id");
                return -EINVAL;
        }
 
-       airoha_tc_remove_htb_queue(port, channel);
+       airoha_tc_remove_htb_queue(dev, channel);
 
        return 0;
 }
 
-static int airoha_tc_htb_destroy(struct airoha_gdm_port *port)
+static int airoha_tc_htb_destroy(struct net_device *dev)
 {
+       struct airoha_gdm_port *port = netdev_priv(dev);
        int q;
 
        for_each_set_bit(q, port->qos_sq_bmap, AIROHA_NUM_QOS_CHANNELS)
-               airoha_tc_remove_htb_queue(port, q);
+               airoha_tc_remove_htb_queue(dev, q);
 
        return 0;
 }
 
-static int airoha_tc_get_htb_get_leaf_queue(struct airoha_gdm_port *port,
+static int airoha_tc_get_htb_get_leaf_queue(struct net_device *dev,
                                            struct tc_htb_qopt_offload *opt)
 {
        u32 channel = TC_H_MIN(opt->classid) % AIROHA_NUM_QOS_CHANNELS;
+       struct airoha_gdm_port *port = netdev_priv(dev);
 
        if (!test_bit(channel, port->qos_sq_bmap)) {
                NL_SET_ERR_MSG_MOD(opt->extack, "invalid queue id");
@@ -2777,23 +2780,23 @@ static int airoha_tc_get_htb_get_leaf_queue(struct airoha_gdm_port *port,
        return 0;
 }
 
-static int airoha_tc_setup_qdisc_htb(struct airoha_gdm_port *port,
+static int airoha_tc_setup_qdisc_htb(struct net_device *dev,
                                     struct tc_htb_qopt_offload *opt)
 {
        switch (opt->command) {
        case TC_HTB_CREATE:
                break;
        case TC_HTB_DESTROY:
-               return airoha_tc_htb_destroy(port);
+               return airoha_tc_htb_destroy(dev);
        case TC_HTB_NODE_MODIFY:
        case TC_HTB_LEAF_ALLOC_QUEUE:
-               return airoha_tc_htb_alloc_leaf_queue(port, opt);
+               return airoha_tc_htb_alloc_leaf_queue(dev, opt);
        case TC_HTB_LEAF_DEL:
        case TC_HTB_LEAF_DEL_LAST:
        case TC_HTB_LEAF_DEL_LAST_FORCE:
-               return airoha_tc_htb_delete_leaf_queue(port, opt);
+               return airoha_tc_htb_delete_leaf_queue(dev, opt);
        case TC_HTB_LEAF_QUERY_QUEUE:
-               return airoha_tc_get_htb_get_leaf_queue(port, opt);
+               return airoha_tc_get_htb_get_leaf_queue(dev, opt);
        default:
                return -EOPNOTSUPP;
        }
@@ -2810,7 +2813,7 @@ static int airoha_dev_tc_setup(struct net_device *dev, enum tc_setup_type type,
        case TC_SETUP_QDISC_ETS:
                return airoha_tc_setup_qdisc_ets(port, type_data);
        case TC_SETUP_QDISC_HTB:
-               return airoha_tc_setup_qdisc_htb(port, type_data);
+               return airoha_tc_setup_qdisc_htb(dev, type_data);
        case TC_SETUP_BLOCK:
        case TC_SETUP_FT:
                return airoha_dev_setup_tc_block(dev, type_data);