[Intel-wired-lan] [PATCH net-next v2 5/8] bnxt: use napi's irq affinity

[Ahmed Zaki]

Delete the driver CPU affinity info and use the core's napi config
instead.

Signed-off-by: Ahmed Zaki <ahmed.z...@intel.com>
---
 drivers/net/ethernet/broadcom/bnxt/bnxt.c | 28 ++++-------------------
 drivers/net/ethernet/broadcom/bnxt/bnxt.h |  2 --
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c 
b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index ac729a25ba52..f68f07686105 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -11177,14 +11177,8 @@ static void bnxt_free_irq(struct bnxt *bp)
                int map_idx = bnxt_cp_num_to_irq_num(bp, i);
 
                irq = &bp->irq_tbl[map_idx];
-               if (irq->requested) {
-                       if (irq->have_cpumask) {
-                               irq_update_affinity_hint(irq->vector, NULL);
-                               free_cpumask_var(irq->cpu_mask);
-                               irq->have_cpumask = 0;
-                       }
+               if (irq->requested)
                        free_irq(irq->vector, bp->bnapi[i]);
-               }
 
                irq->requested = 0;
        }
@@ -11213,26 +11207,12 @@ static int bnxt_request_irq(struct bnxt *bp)
 
 #ifdef CONFIG_RFS_ACCEL
                netif_napi_set_irq(&bp->bnapi[i]->napi, irq->vector,
-                                  NAPIF_IRQ_ARFS_RMAP);
+                                  NAPIF_IRQ_AFFINITY | NAPIF_IRQ_ARFS_RMAP);
 #else
-               netif_napi_set_irq(&bp->bnapi[i]->napi, irq->vector, 0);
+               netif_napi_set_irq(&bp->bnapi[i]->napi, irq->vector,
+                                  NAPIF_IRQ_AFFINITY);
 #endif
                irq->requested = 1;
-
-               if (zalloc_cpumask_var(&irq->cpu_mask, GFP_KERNEL)) {
-                       int numa_node = dev_to_node(&bp->pdev->dev);
-
-                       irq->have_cpumask = 1;
-                       cpumask_set_cpu(cpumask_local_spread(i, numa_node),
-                                       irq->cpu_mask);
-                       rc = irq_update_affinity_hint(irq->vector, 
irq->cpu_mask);
-                       if (rc) {
-                               netdev_warn(bp->dev,
-                                           "Update affinity hint failed, IRQ = 
%d\n",
-                                           irq->vector);
-                               break;
-                       }
-               }
        }
        return rc;
 }
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h 
b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 7df7a2233307..8a97c1fb2083 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -1228,9 +1228,7 @@ struct bnxt_irq {
        irq_handler_t   handler;
        unsigned int    vector;
        u8              requested:1;
-       u8              have_cpumask:1;
        char            name[IFNAMSIZ + BNXT_IRQ_NAME_EXTRA];
-       cpumask_var_t   cpu_mask;
 };
 
 #define HWRM_RING_ALLOC_TX     0x1
-- 
2.43.0