hc
2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da
kernel/drivers/net/ethernet/intel/iavf/iavf_main.c
....@@ -234,21 +234,18 @@
234234 }
235235
236236 /**
237
- * iavf_irq_enable_queues - Enable interrupt for specified queues
237
+ * iavf_irq_enable_queues - Enable interrupt for all queues
238238 * @adapter: board private structure
239
- * @mask: bitmap of queues to enable
240239 **/
241
-void iavf_irq_enable_queues(struct iavf_adapter *adapter, u32 mask)
240
+void iavf_irq_enable_queues(struct iavf_adapter *adapter)
242241 {
243242 struct iavf_hw *hw = &adapter->hw;
244243 int i;
245244
246245 for (i = 1; i < adapter->num_msix_vectors; i++) {
247
- if (mask & BIT(i - 1)) {
248
- wr32(hw, IAVF_VFINT_DYN_CTLN1(i - 1),
249
- IAVF_VFINT_DYN_CTLN1_INTENA_MASK |
250
- IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK);
251
- }
246
+ wr32(hw, IAVF_VFINT_DYN_CTLN1(i - 1),
247
+ IAVF_VFINT_DYN_CTLN1_INTENA_MASK |
248
+ IAVF_VFINT_DYN_CTLN1_ITR_INDX_MASK);
252249 }
253250 }
254251
....@@ -262,7 +259,7 @@
262259 struct iavf_hw *hw = &adapter->hw;
263260
264261 iavf_misc_irq_enable(adapter);
265
- iavf_irq_enable_queues(adapter, ~0);
262
+ iavf_irq_enable_queues(adapter);
266263
267264 if (flush)
268265 iavf_flush(hw);
....@@ -1380,19 +1377,16 @@
13801377 static void iavf_free_q_vectors(struct iavf_adapter *adapter)
13811378 {
13821379 int q_idx, num_q_vectors;
1383
- int napi_vectors;
13841380
13851381 if (!adapter->q_vectors)
13861382 return;
13871383
13881384 num_q_vectors = adapter->num_msix_vectors - NONQ_VECS;
1389
- napi_vectors = adapter->num_active_queues;
13901385
13911386 for (q_idx = 0; q_idx < num_q_vectors; q_idx++) {
13921387 struct iavf_q_vector *q_vector = &adapter->q_vectors[q_idx];
13931388
1394
- if (q_idx < napi_vectors)
1395
- netif_napi_del(&q_vector->napi);
1389
+ netif_napi_del(&q_vector->napi);
13961390 }
13971391 kfree(adapter->q_vectors);
13981392 adapter->q_vectors = NULL;