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

ice: toggle netif_carrier when setting up XSK pool 



This so we prevent Tx timeout issues. One of conditions checked on
running in the background dev_watchdog() is netif_carrier_ok(), so let
us turn it off when we disable the queues that belong to a q_vector
where XSK pool is being configured. Turn carrier on in ice_qp_ena()
only when ice_get_link_status() tells us that physical link is up.

Fixes: 2d4238f5 ("ice: Add support for AF_XDP")
Reviewed-by: default avatarShannon Nelson <shannon.nelson@amd.com>
Tested-by: Chandan Kumar Rout <chandanx.rout@intel.com> (A Contingent Worker at Intel)
Signed-off-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent d5922717

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

+7 −1
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx) 
	}



	synchronize_net();

	netif_carrier_off(vsi->netdev);

	netif_tx_stop_queue(netdev_get_tx_queue(vsi->netdev, q_idx));



	ice_qvec_dis_irq(vsi, rx_ring, q_vector);
@@ -218,6 +219,7 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx) 
{

	struct ice_q_vector *q_vector;

	int fail = 0;

	bool link_up;

	int err;



	err = ice_vsi_cfg_single_txq(vsi, vsi->tx_rings, q_idx);
@@ -248,7 +250,11 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx) 
	ice_qvec_toggle_napi(vsi, q_vector, true);

	ice_qvec_ena_irq(vsi, q_vector);



	ice_get_link_status(vsi->port_info, &link_up);

	if (link_up) {

		netif_tx_start_queue(netdev_get_tx_queue(vsi->netdev, q_idx));

		netif_carrier_on(vsi->netdev);

	}

	clear_bit(ICE_CFG_BUSY, vsi->state);



	return fail;