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

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

i40e: clear only cause_ena bit 



When disabling interrupts, we should only be clearing the CAUSE_ENA bit,
not clearing the whole register.  Clearing the whole register sets the
NEXTQ_IDX field to 0 instead of 0x7ff which can confuse the Firmware in
some reset sequences.

Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e5887239

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

+12 −2
Original line number Original line Diff line number Diff line
@@ -3588,14 +3588,24 @@ static void i40e_vsi_disable_irq(struct i40e_vsi *vsi) 
	int base = vsi->base_vector;

	int base = vsi->base_vector;

	int i;

	int i;





	/* disable interrupt causation from each queue */

	for (i = 0; i < vsi->num_queue_pairs; i++) {

	for (i = 0; i < vsi->num_queue_pairs; i++) {

		wr32(hw, I40E_QINT_TQCTL(vsi->tx_rings[i]->reg_idx), 0);

		u32 val;

		wr32(hw, I40E_QINT_RQCTL(vsi->rx_rings[i]->reg_idx), 0);



		val = rd32(hw, I40E_QINT_TQCTL(vsi->tx_rings[i]->reg_idx));

		val &= ~I40E_QINT_TQCTL_CAUSE_ENA_MASK;

		wr32(hw, I40E_QINT_TQCTL(vsi->tx_rings[i]->reg_idx), val);



		val = rd32(hw, I40E_QINT_RQCTL(vsi->rx_rings[i]->reg_idx));

		val &= ~I40E_QINT_RQCTL_CAUSE_ENA_MASK;

		wr32(hw, I40E_QINT_RQCTL(vsi->rx_rings[i]->reg_idx), val);



		if (!i40e_enabled_xdp_vsi(vsi))

		if (!i40e_enabled_xdp_vsi(vsi))

			continue;

			continue;

		wr32(hw, I40E_QINT_TQCTL(vsi->xdp_rings[i]->reg_idx), 0);

		wr32(hw, I40E_QINT_TQCTL(vsi->xdp_rings[i]->reg_idx), 0);

	}

	}





	/* disable each interrupt */

	if (pf->flags & I40E_FLAG_MSIX_ENABLED) {

	if (pf->flags & I40E_FLAG_MSIX_ENABLED) {

		for (i = vsi->base_vector;

		for (i = vsi->base_vector;

		     i < (vsi->num_q_vectors + vsi->base_vector); i++)

		     i < (vsi->num_q_vectors + vsi->base_vector); i++)