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

Commit a3d772a3 authored by Anjali Singhai Jain's avatar Anjali Singhai Jain Committed by Jeff Kirsher
Browse files

i40e: fix write-back-on-itr to work with legacy itr 



We were not doing write-back on interrupt throttle for Legacy case in X722.
This patch fixes that, so we do WB_ON_ITR for Legacy as well. Plus the issue
that we should still be setting NO_ITR if we are touching the DYN_CTLN register
since we do not want to change ITR setting here.

Change-ID: I5db8491ee1544118a389db839cecc93e1bbc480e
Signed-off-by: default avatarAnjali Singhai Jain <anjali.singhai@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 071c859b

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

+13 −5
Original line number Diff line number Diff line
@@ -789,12 +789,20 @@ void i40e_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector) 
		if (q_vector->arm_wb_state)

			return;



		val = I40E_PFINT_DYN_CTLN_WB_ON_ITR_MASK;

		if (vsi->back->flags & I40E_FLAG_MSIX_ENABLED) {

			val = I40E_PFINT_DYN_CTLN_WB_ON_ITR_MASK |

			      I40E_PFINT_DYN_CTLN_ITR_INDX_MASK; /* set noitr */



			wr32(&vsi->back->hw,

			     I40E_PFINT_DYN_CTLN(q_vector->v_idx +

						 vsi->base_vector - 1),

			     val);

		} else {

			val = I40E_PFINT_DYN_CTL0_WB_ON_ITR_MASK |

			      I40E_PFINT_DYN_CTL0_ITR_INDX_MASK; /* set noitr */



			wr32(&vsi->back->hw, I40E_PFINT_DYN_CTL0, val);

		}

		q_vector->arm_wb_state = true;

	} else if (vsi->back->flags & I40E_FLAG_MSIX_ENABLED) {

		u32 val = I40E_PFINT_DYN_CTLN_INTENA_MASK |

drivers/net/ethernet/intel/i40evf/i40e_txrx.c

+2 −1
Original line number Diff line number Diff line
@@ -307,7 +307,8 @@ static void i40evf_force_wb(struct i40e_vsi *vsi, struct i40e_q_vector *q_vector 
		if (q_vector->arm_wb_state)

			return;



		val = I40E_VFINT_DYN_CTLN1_WB_ON_ITR_MASK;

		val = I40E_VFINT_DYN_CTLN1_WB_ON_ITR_MASK |

		      I40E_VFINT_DYN_CTLN1_ITR_INDX_MASK; /* set noitr */



		wr32(&vsi->back->hw,

		     I40E_VFINT_DYN_CTLN1(q_vector->v_idx +