Commit 88512539 authored Mar 13, 2009 by PJ Waskiewicz Committed by David S. Miller Mar 14, 2009

ixgbe: Two small fixes for 82599 when bringing the device down and for WoL



The Tx DMA unit should be disabled when bringing the device down.  Also,
the KX4 device with 82599 supports WoL, so we should clear the Wake Up
Status (WUS) after a PCIe slot reset.

Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Acked-by: Mallikarjuna R Chilakala <mallikarjuna.chilakala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 9891ca7c

drivers/net/ixgbe/ixgbe_main.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2558,6 +2558,11 @@ void ixgbe_down(struct ixgbe_adapter *adapter)
		IXGBE_WRITE_REG(hw, IXGBE_TXDCTL(j),
		(txdctl & ~IXGBE_TXDCTL_ENABLE));
		}
		/* Disable the Tx DMA engine on 82599 */
		if (hw->mac.type == ixgbe_mac_82599EB)
		IXGBE_WRITE_REG(hw, IXGBE_DMATXCTL,
		(IXGBE_READ_REG(hw, IXGBE_DMATXCTL) &
		~IXGBE_DMATXCTL_TE));

		netif_carrier_off(netdev);

		@@ -4794,7 +4799,7 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
		pci_enable_wake(pdev, PCI_D3cold, 0);

		ixgbe_reset(adapter);

		IXGBE_WRITE_REG(&adapter->hw, IXGBE_WUS, ~0);
		result = PCI_ERS_RESULT_RECOVERED;
		}