rtase: Link queues to NAPI instances

Link queues to NAPI instances with netif_queue_set_napi. This
information can be queried with the netdev-genl API.

Signed-off-by: Justin Lai <justinlai0215@realtek.com>
Reviewed-by: Joe Damato <joe@dama.to>
Link: https://patch.msgid.link/20250616032226.7318-3-justinlai0215@realtek.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/rtase/rtase.h b/drivers/net/ethernet/realtek/rtase/rtase.h
index 498cfe4d0cac3abb8adf238c73e61cf3a6eee65e..20decdeb9fdbb7fb43db48e7ed27160b0de1ccec 100644 (file)
--- a/drivers/net/ethernet/realtek/rtase/rtase.h
+++ b/drivers/net/ethernet/realtek/rtase/rtase.h
@@ -288,6 +288,7 @@ struct rtase_ring {
        u32 cur_idx;
        u32 dirty_idx;
        u16 index;
+       u8 type;
 
        struct sk_buff *skbuff[RTASE_NUM_DESC];
        void *data_buf[RTASE_NUM_DESC];

diff --git a/drivers/net/ethernet/realtek/rtase/rtase_main.c b/drivers/net/ethernet/realtek/rtase/rtase_main.c
index d13877f051e756e611af2b2ffb18adbfc23b2423..ef13109c49cff576ab58d96796e1bffbfbe872bf 100644 (file)
--- a/drivers/net/ethernet/realtek/rtase/rtase_main.c
+++ b/drivers/net/ethernet/realtek/rtase/rtase_main.c
@@ -326,6 +326,7 @@ static void rtase_tx_desc_init(struct rtase_private *tp, u16 idx)
        ring->cur_idx = 0;
        ring->dirty_idx = 0;
        ring->index = idx;
+       ring->type = NETDEV_QUEUE_TYPE_TX;
        ring->alloc_fail = 0;
 
        for (i = 0; i < RTASE_NUM_DESC; i++) {
@@ -345,6 +346,9 @@ static void rtase_tx_desc_init(struct rtase_private *tp, u16 idx)
                ring->ivec = &tp->int_vector[0];
                list_add_tail(&ring->ring_entry, &tp->int_vector[0].ring_list);
        }
+
+       netif_queue_set_napi(tp->dev, ring->index,
+                            ring->type, &ring->ivec->napi);
 }
 
 static void rtase_map_to_asic(union rtase_rx_desc *desc, dma_addr_t mapping,
@@ -590,6 +594,7 @@ static void rtase_rx_desc_init(struct rtase_private *tp, u16 idx)
        ring->cur_idx = 0;
        ring->dirty_idx = 0;
        ring->index = idx;
+       ring->type = NETDEV_QUEUE_TYPE_RX;
        ring->alloc_fail = 0;
 
        for (i = 0; i < RTASE_NUM_DESC; i++)
@@ -597,6 +602,8 @@ static void rtase_rx_desc_init(struct rtase_private *tp, u16 idx)
 
        ring->ring_handler = rx_handler;
        ring->ivec = &tp->int_vector[idx];
+       netif_queue_set_napi(tp->dev, ring->index,
+                            ring->type, &ring->ivec->napi);
        list_add_tail(&ring->ring_entry, &tp->int_vector[idx].ring_list);
 }
 
@@ -1161,8 +1168,12 @@ static void rtase_down(struct net_device *dev)
                ivec = &tp->int_vector[i];
                napi_disable(&ivec->napi);
                list_for_each_entry_safe(ring, tmp, &ivec->ring_list,
-                                        ring_entry)
+                                        ring_entry) {
+                       netif_queue_set_napi(tp->dev, ring->index,
+                                            ring->type, NULL);
+
                        list_del(&ring->ring_entry);
+               }
        }
 
        netif_tx_disable(dev);
@@ -1518,8 +1529,12 @@ static void rtase_sw_reset(struct net_device *dev)
        for (i = 0; i < tp->int_nums; i++) {
                ivec = &tp->int_vector[i];
                list_for_each_entry_safe(ring, tmp, &ivec->ring_list,
-                                        ring_entry)
+                                        ring_entry) {
+                       netif_queue_set_napi(tp->dev, ring->index,
+                                            ring->type, NULL);
+
                        list_del(&ring->ring_entry);
+               }
        }
 
        ret = rtase_init_ring(dev);