]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
rtase: Link IRQs to NAPI instances
authorJustin Lai <justinlai0215@realtek.com>
Mon, 16 Jun 2025 03:22:25 +0000 (11:22 +0800)
committerJakub Kicinski <kuba@kernel.org>
Tue, 17 Jun 2025 23:24:09 +0000 (16:24 -0700)
Link IRQs to NAPI instances with netif_napi_set_irq. This
information can be queried with the netdev-genl API.

Also add support for persistent NAPI configuration using
netif_napi_add_config().

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

index 4d37217e9a148ace23da1dab3e1d5dc4a852fa40..d13877f051e756e611af2b2ffb18adbfc23b2423 100644 (file)
@@ -1871,6 +1871,18 @@ static void rtase_init_netdev_ops(struct net_device *dev)
        dev->ethtool_ops = &rtase_ethtool_ops;
 }
 
+static void rtase_init_napi(struct rtase_private *tp)
+{
+       u16 i;
+
+       for (i = 0; i < tp->int_nums; i++) {
+               netif_napi_add_config(tp->dev, &tp->int_vector[i].napi,
+                                     tp->int_vector[i].poll, i);
+               netif_napi_set_irq(&tp->int_vector[i].napi,
+                                  tp->int_vector[i].irq);
+       }
+}
+
 static void rtase_reset_interrupt(struct pci_dev *pdev,
                                  const struct rtase_private *tp)
 {
@@ -1956,9 +1968,6 @@ static void rtase_init_int_vector(struct rtase_private *tp)
        memset(tp->int_vector[0].name, 0x0, sizeof(tp->int_vector[0].name));
        INIT_LIST_HEAD(&tp->int_vector[0].ring_list);
 
-       netif_napi_add(tp->dev, &tp->int_vector[0].napi,
-                      tp->int_vector[0].poll);
-
        /* interrupt vector 1 ~ 3 */
        for (i = 1; i < tp->int_nums; i++) {
                tp->int_vector[i].tp = tp;
@@ -1972,9 +1981,6 @@ static void rtase_init_int_vector(struct rtase_private *tp)
                memset(tp->int_vector[i].name, 0x0,
                       sizeof(tp->int_vector[0].name));
                INIT_LIST_HEAD(&tp->int_vector[i].ring_list);
-
-               netif_napi_add(tp->dev, &tp->int_vector[i].napi,
-                              tp->int_vector[i].poll);
        }
 }
 
@@ -2206,6 +2212,8 @@ static int rtase_init_one(struct pci_dev *pdev,
                goto err_out_del_napi;
        }
 
+       rtase_init_napi(tp);
+
        rtase_init_netdev_ops(dev);
 
        dev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;