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

Commit 34cecbbf authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: cleanup some minor issues in ixgbe_down() 



This patch cleans up two minor issues in ixgbe_down.  Specifically it
addresses the fact that the VFs should not be pinged until after interrupts
are disabled otherwise they might still get a response.  It also drops the
use of the txdctl temporary variable since the only bit we should be
writing to the TXDCTL registers during a shutdown is the flush bit.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f0f9778d

drivers/net/ixgbe/ixgbe_main.c

+16 −18
Original line number Diff line number Diff line
@@ -4182,26 +4182,12 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
	struct net_device *netdev = adapter->netdev;

	struct ixgbe_hw *hw = &adapter->hw;

	u32 rxctrl;

	u32 txdctl;

	int i;

	int num_q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;



	/* signal that we are down to the interrupt handler */

	set_bit(__IXGBE_DOWN, &adapter->state);



	/* disable receive for all VFs and wait one second */

	if (adapter->num_vfs) {

		/* ping all the active vfs to let them know we are going down */

		ixgbe_ping_all_vfs(adapter);



		/* Disable all VFTE/VFRE TX/RX */

		ixgbe_disable_tx_rx(adapter);



		/* Mark all the VFs as inactive */

		for (i = 0 ; i < adapter->num_vfs; i++)

			adapter->vfinfo[i].clear_to_send = 0;

	}



	/* disable receives */

	rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);

	IXGBE_WRITE_REG(hw, IXGBE_RXCTRL, rxctrl & ~IXGBE_RXCTRL_RXEN);
@@ -4229,6 +4215,19 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 


	del_timer_sync(&adapter->service_timer);



	/* disable receive for all VFs and wait one second */

	if (adapter->num_vfs) {

		/* ping all the active vfs to let them know we are going down */

		ixgbe_ping_all_vfs(adapter);



		/* Disable all VFTE/VFRE TX/RX */

		ixgbe_disable_tx_rx(adapter);



		/* Mark all the VFs as inactive */

		for (i = 0 ; i < adapter->num_vfs; i++)

			adapter->vfinfo[i].clear_to_send = 0;

	}



	/* Cleanup the affinity_hint CPU mask memory and callback */

	for (i = 0; i < num_q_vectors; i++) {

		struct ixgbe_q_vector *q_vector = adapter->q_vector[i];
@@ -4241,11 +4240,10 @@ void ixgbe_down(struct ixgbe_adapter *adapter) 
	/* disable transmits in the hardware now that interrupts are off */

	for (i = 0; i < adapter->num_tx_queues; i++) {

		u8 reg_idx = adapter->tx_ring[i]->reg_idx;

		txdctl = IXGBE_READ_REG(hw, IXGBE_TXDCTL(reg_idx));

		IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx),

				(txdctl & ~IXGBE_TXDCTL_ENABLE));

		IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(reg_idx), IXGBE_TXDCTL_SWFLSH);

	}

	/* Disable the Tx DMA engine on 82599 */



	/* Disable the Tx DMA engine on 82599 and X540 */

	switch (hw->mac.type) {

	case ixgbe_mac_82599EB:

	case ixgbe_mac_X540: