Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d1ff106 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: trigger SW INT with no ITR wait 



Since we want the SW INT to go off as soon as possible, write the
extra bits that will turn off the ITR wait for the interrupt.

Change-ID: I6d5382ba60840fa32abb7dea17c839eb4b5f68f7
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c88e38cc

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+4 −1
Original line number Diff line number Diff line
@@ -1400,7 +1400,10 @@ static int i40e_intr_test(struct net_device *netdev, u64 *data) 
	netif_info(pf, hw, netdev, "interrupt test\n");

	wr32(&pf->hw, I40E_PFINT_DYN_CTL0,

	     (I40E_PFINT_DYN_CTL0_INTENA_MASK |

	      I40E_PFINT_DYN_CTL0_SWINT_TRIG_MASK));

	      I40E_PFINT_DYN_CTL0_SWINT_TRIG_MASK |

	      I40E_PFINT_DYN_CTL0_ITR_INDX_MASK |

	      I40E_PFINT_DYN_CTL0_SW_ITR_INDX_ENA_MASK |

	      I40E_PFINT_DYN_CTL0_SW_ITR_INDX_MASK));

	usleep_range(1000, 2000);

	*data = (swc_old == pf->sw_int_count);

drivers/net/ethernet/intel/i40e/i40e_main.c

+8 −2
Original line number Diff line number Diff line
@@ -5565,11 +5565,17 @@ static void i40e_check_hang_subtask(struct i40e_pf *pf) 
			if (!(pf->flags & I40E_FLAG_MSIX_ENABLED)) {

				wr32(&vsi->back->hw, I40E_PFINT_DYN_CTL0,

				     (I40E_PFINT_DYN_CTL0_INTENA_MASK |

				      I40E_PFINT_DYN_CTL0_SWINT_TRIG_MASK));

				      I40E_PFINT_DYN_CTL0_SWINT_TRIG_MASK |

				      I40E_PFINT_DYN_CTL0_ITR_INDX_MASK |

				      I40E_PFINT_DYN_CTL0_SW_ITR_INDX_ENA_MASK |

				      I40E_PFINT_DYN_CTL0_SW_ITR_INDX_MASK));

			} else {

				u16 vec = vsi->base_vector - 1;

				u32 val = (I40E_PFINT_DYN_CTLN_INTENA_MASK |

					   I40E_PFINT_DYN_CTLN_SWINT_TRIG_MASK);

				      I40E_PFINT_DYN_CTLN_SWINT_TRIG_MASK |

				      I40E_PFINT_DYN_CTLN_ITR_INDX_MASK |

				      I40E_PFINT_DYN_CTLN_SW_ITR_INDX_ENA_MASK |

				      I40E_PFINT_DYN_CTLN_SW_ITR_INDX_MASK);

				for (i = 0; i < vsi->num_q_vectors; i++, vec++)

					wr32(&vsi->back->hw,

					     I40E_PFINT_DYN_CTLN(vec), val);