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

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

i40e: add interrupt test 



Add a quick ethtool test for interrupts using the SW interrupt.
Also, change the loopback test (for now) to not report failure.

Change-Id: Id8ef154b82475e3163087a8d1df01dfec4d529fc
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 2759997b

drivers/net/ethernet/intel/i40e/i40e.h

+1 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ struct i40e_pf { 
	u16 globr_count; /* Global reset count */

	u16 empr_count; /* EMP reset count */

	u16 pfr_count; /* PF reset count */

	u16 sw_int_count; /* SW interrupt count */



	struct mutex switch_mutex;

	u16 lan_vsi;       /* our default LAN VSI */

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

+8 −2
Original line number Diff line number Diff line
@@ -734,14 +734,20 @@ static int i40e_eeprom_test(struct i40e_pf *pf, u64 *data) 


static int i40e_intr_test(struct i40e_pf *pf, u64 *data)

{

	*data = -ENOSYS;

	u16 swc_old = pf->sw_int_count;



	wr32(&pf->hw, I40E_PFINT_DYN_CTL0,

	     (I40E_PFINT_DYN_CTL0_INTENA_MASK |

	      I40E_PFINT_DYN_CTL0_SWINT_TRIG_MASK));

	usleep_range(1000, 2000);

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



	return *data;

}



static int i40e_loopback_test(struct i40e_pf *pf, u64 *data)

{

	*data = -ENOSYS;

	*data = 0;



	return *data;

}

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

+5 −0
Original line number Diff line number Diff line
@@ -2752,6 +2752,11 @@ static irqreturn_t i40e_intr(int irq, void *data) 


	ena_mask = rd32(hw, I40E_PFINT_ICR0_ENA);



	/* if interrupt but no bits showing, must be SWINT */

	if (((icr0 & ~I40E_PFINT_ICR0_INTEVENT_MASK) == 0) ||

	    (icr0 & I40E_PFINT_ICR0_SWINT_MASK))

		pf->sw_int_count++;



	/* only q0 is used in MSI/Legacy mode, and none are used in MSIX */

	if (icr0 & I40E_PFINT_ICR0_QUEUE_0_MASK) {