openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

igb: Add support for pci-e Advanced Error Reporting 

Add the calls necessary to enable advanced error reporting for igb on
systems with AER enabled.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2008-11-27 00:24:37 -08:00 committed by David S. Miller
parent f4113030e7
commit 40a914fa72
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/net/igb/igb_main.c
View File

@ -42,6 +42,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/if_ether.h> #include <linux/if_ether.h>
#include <linux/aer.h>
#ifdef CONFIG_IGB_DCA #ifdef CONFIG_IGB_DCA
#include <linux/dca.h> #include <linux/dca.h>
#endif #endif
@ -1049,6 +1050,8 @@ static int __devinit igb_probe(struct pci_dev *pdev,
if (err) if (err)
goto err_pci_reg; goto err_pci_reg;
pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev); pci_set_master(pdev);
pci_save_state(pdev); pci_save_state(pdev);
@ -1379,6 +1382,8 @@ static void __devexit igb_remove(struct pci_dev *pdev)
free_netdev(netdev); free_netdev(netdev);
pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }
@ -4470,27 +4475,33 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
struct net_device *netdev = pci_get_drvdata(pdev); struct net_device *netdev = pci_get_drvdata(pdev);
struct igb_adapter *adapter = netdev_priv(netdev); struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw; struct e1000_hw *hw = &adapter->hw;
pci_ers_result_t result;
int err; int err;
if (adapter->need_ioport) if (adapter->need_ioport)
err = pci_enable_device(pdev); err = pci_enable_device(pdev);
else else
err = pci_enable_device_mem(pdev); err = pci_enable_device_mem(pdev);
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Cannot re-enable PCI device after reset.\n"); "Cannot re-enable PCI device after reset.\n");
return PCI_ERS_RESULT_DISCONNECT; result = PCI_ERS_RESULT_DISCONNECT;
} else {
pci_set_master(pdev);
pci_restore_state(pdev);
pci_enable_wake(pdev, PCI_D3hot, 0);
pci_enable_wake(pdev, PCI_D3cold, 0);
igb_reset(adapter);
wr32(E1000_WUS, ~0);
result = PCI_ERS_RESULT_RECOVERED;
} }
pci_set_master(pdev);
pci_restore_state(pdev);
pci_enable_wake(pdev, PCI_D3hot, 0); pci_cleanup_aer_uncorrect_error_status(pdev);
pci_enable_wake(pdev, PCI_D3cold, 0);
igb_reset(adapter); return result;
wr32(E1000_WUS, ~0);
return PCI_ERS_RESULT_RECOVERED;
} }
/** /**
@ -4518,7 +4529,6 @@ static void igb_io_resume(struct pci_dev *pdev)
/* let the f/w know that the h/w is now under the control of the /* let the f/w know that the h/w is now under the control of the
* driver. */ * driver. */
igb_get_hw_control(adapter); igb_get_hw_control(adapter);
} }
/* igb_main.c */ /* igb_main.c */