Commit d5926e01 authored by Maciej Fijalkowski's avatar Maciej Fijalkowski Committed by Tony Nguyen
Browse files

ice: do not disable Tx queues twice in ice_down() 



ice_down() clears QINT_TQCTL_CAUSE_ENA_M bit twice, which is not
necessary. First clearing happens in ice_vsi_dis_irq() and second in
ice_vsi_stop_tx_ring() - remove the first one.

While at it, make ice_vsi_dis_irq() static as ice_down() is the only
current caller of it.

Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 979c2c04

drivers/net/ethernet/intel/ice/ice_lib.c

+0 −55
Original line number Diff line number Diff line
@@ -2719,61 +2719,6 @@ void ice_dis_vsi(struct ice_vsi *vsi, bool locked) 
	}

}



/**

 * ice_vsi_dis_irq - Mask off queue interrupt generation on the VSI

 * @vsi: the VSI being un-configured

 */

void ice_vsi_dis_irq(struct ice_vsi *vsi)

{

	struct ice_pf *pf = vsi->back;

	struct ice_hw *hw = &pf->hw;

	u32 val;

	int i;



	/* disable interrupt causation from each queue */

	if (vsi->tx_rings) {

		ice_for_each_txq(vsi, i) {

			if (vsi->tx_rings[i]) {

				u16 reg;



				reg = vsi->tx_rings[i]->reg_idx;

				val = rd32(hw, QINT_TQCTL(reg));

				val &= ~QINT_TQCTL_CAUSE_ENA_M;

				wr32(hw, QINT_TQCTL(reg), val);

			}

		}

	}



	if (vsi->rx_rings) {

		ice_for_each_rxq(vsi, i) {

			if (vsi->rx_rings[i]) {

				u16 reg;



				reg = vsi->rx_rings[i]->reg_idx;

				val = rd32(hw, QINT_RQCTL(reg));

				val &= ~QINT_RQCTL_CAUSE_ENA_M;

				wr32(hw, QINT_RQCTL(reg), val);

			}

		}

	}



	/* disable each interrupt */

	ice_for_each_q_vector(vsi, i) {

		if (!vsi->q_vectors[i])

			continue;

		wr32(hw, GLINT_DYN_CTL(vsi->q_vectors[i]->reg_idx), 0);

	}



	ice_flush(hw);



	/* don't call synchronize_irq() for VF's from the host */

	if (vsi->type == ICE_VSI_VF)

		return;



	ice_for_each_q_vector(vsi, i)

		synchronize_irq(vsi->q_vectors[i]->irq.virq);

}



/**

 * __ice_queue_set_napi - Set the napi instance for the queue

 * @dev: device to which NAPI and queue belong

drivers/net/ethernet/intel/ice/ice_lib.h

+0 −2
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ void 
ice_write_qrxflxp_cntxt(struct ice_hw *hw, u16 pf_q, u32 rxdid, u32 prio,

			bool ena_ts);



void ice_vsi_dis_irq(struct ice_vsi *vsi);



void ice_vsi_free_irq(struct ice_vsi *vsi);



void ice_vsi_free_rx_rings(struct ice_vsi *vsi);

drivers/net/ethernet/intel/ice/ice_main.c

+44 −0
Original line number Diff line number Diff line
@@ -7001,6 +7001,50 @@ static void ice_napi_disable_all(struct ice_vsi *vsi) 
	}

}



/**

 * ice_vsi_dis_irq - Mask off queue interrupt generation on the VSI

 * @vsi: the VSI being un-configured

 */

static void ice_vsi_dis_irq(struct ice_vsi *vsi)

{

	struct ice_pf *pf = vsi->back;

	struct ice_hw *hw = &pf->hw;

	u32 val;

	int i;



	/* disable interrupt causation from each Rx queue; Tx queues are

	 * handled in ice_vsi_stop_tx_ring()

	 */

	if (vsi->rx_rings) {

		ice_for_each_rxq(vsi, i) {

			if (vsi->rx_rings[i]) {

				u16 reg;



				reg = vsi->rx_rings[i]->reg_idx;

				val = rd32(hw, QINT_RQCTL(reg));

				val &= ~QINT_RQCTL_CAUSE_ENA_M;

				wr32(hw, QINT_RQCTL(reg), val);

			}

		}

	}



	/* disable each interrupt */

	ice_for_each_q_vector(vsi, i) {

		if (!vsi->q_vectors[i])

			continue;

		wr32(hw, GLINT_DYN_CTL(vsi->q_vectors[i]->reg_idx), 0);

	}



	ice_flush(hw);



	/* don't call synchronize_irq() for VF's from the host */

	if (vsi->type == ICE_VSI_VF)

		return;



	ice_for_each_q_vector(vsi, i)

		synchronize_irq(vsi->q_vectors[i]->irq.virq);

}



/**

 * ice_down - Shutdown the connection

 * @vsi: The VSI being stopped