1 files changed, 160 insertions, 53 deletions

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 9f9d6081959b..076f826d5a50 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -19,7 +19,7 @@
  * MA  02111-1307, USA.
  *
  * The full GNU General Public License is included in this distribution
- * in the file called LICENSE.
+ * in the file called "COPYING".
  *
  */
 
@@ -35,6 +35,7 @@
 #include <linux/ipv6.h>
 #include <linux/inetdevice.h>
 #include <linux/sysfs.h>
+#include <linux/aer.h>
 
 MODULE_DESCRIPTION("QLogic/NetXen (1/10) GbE Converged Ethernet Driver");
 MODULE_LICENSE("GPL");
@@ -84,6 +85,7 @@ static void netxen_remove_sysfs_entries(struct netxen_adapter *adapter);
 static void netxen_create_diag_entries(struct netxen_adapter *adapter);
 static void netxen_remove_diag_entries(struct netxen_adapter *adapter);
 
+static int nx_dev_request_aer(struct netxen_adapter *adapter);
 static int nx_decr_dev_ref_cnt(struct netxen_adapter *adapter);
 static int netxen_can_start_firmware(struct netxen_adapter *adapter);
 
@@ -98,7 +100,7 @@ static void netxen_config_indev_addr(struct net_device *dev, unsigned long);
         {PCI_DEVICE(PCI_VENDOR_ID_NETXEN, (device)), \
         .class = PCI_CLASS_NETWORK_ETHERNET << 8, .class_mask = ~0}
 
-static struct pci_device_id netxen_pci_tbl[] __devinitdata = {
+static DEFINE_PCI_DEVICE_TABLE(netxen_pci_tbl) = {
         ENTRY(PCI_DEVICE_ID_NX2031_10GXSR),
         ENTRY(PCI_DEVICE_ID_NX2031_10GCX4),
         ENTRY(PCI_DEVICE_ID_NX2031_4GCU),
@@ -430,7 +432,7 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
 {
         int i;
         unsigned char *p;
-        __le64 mac_addr;
+        u64 mac_addr;
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
 
@@ -1262,6 +1264,9 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         if ((err = pci_request_regions(pdev, netxen_nic_driver_name)))
                 goto err_out_disable_pdev;
 
+        if (NX_IS_REVISION_P3(pdev->revision))
+                pci_enable_pcie_error_reporting(pdev);
+
         pci_set_master(pdev);
 
         netdev = alloc_etherdev(sizeof(struct netxen_adapter));
@@ -1409,17 +1414,19 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev)
 
         netxen_release_firmware(adapter);
 
+        if (NX_IS_REVISION_P3(pdev->revision))
+                pci_disable_pcie_error_reporting(pdev);
+
         pci_release_regions(pdev);
         pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 
         free_netdev(netdev);
 }
-static int __netxen_nic_shutdown(struct pci_dev *pdev)
+
+static void netxen_nic_detach_func(struct netxen_adapter *adapter)
 {
-        struct netxen_adapter *adapter = pci_get_drvdata(pdev);
         struct net_device *netdev = adapter->netdev;
-        int retval;
 
         netif_device_detach(netdev);
 
@@ -1438,53 +1445,22 @@ static int __netxen_nic_shutdown(struct pci_dev *pdev)
         nx_decr_dev_ref_cnt(adapter);
 
         clear_bit(__NX_RESETTING, &adapter->state);
-
-        retval = pci_save_state(pdev);
-        if (retval)
-                return retval;
-
-        if (netxen_nic_wol_supported(adapter)) {
-                pci_enable_wake(pdev, PCI_D3cold, 1);
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-        }
-
-        pci_disable_device(pdev);
-
-        return 0;
 }
-static void netxen_nic_shutdown(struct pci_dev *pdev)
-{
-        if (__netxen_nic_shutdown(pdev))
-                return;
-}
-#ifdef CONFIG_PM
-static int
-netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        int retval;
-
-        retval = __netxen_nic_shutdown(pdev);
-        if (retval)
-                return retval;
 
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
-        return 0;
-}
-
-static int
-netxen_nic_resume(struct pci_dev *pdev)
+static int netxen_nic_attach_func(struct pci_dev *pdev)
 {
         struct netxen_adapter *adapter = pci_get_drvdata(pdev);
         struct net_device *netdev = adapter->netdev;
         int err;
 
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-
         err = pci_enable_device(pdev);
         if (err)
                 return err;
 
+        pci_set_power_state(pdev, PCI_D0);
+        pci_set_master(pdev);
+        pci_restore_state(pdev);
+
         adapter->ahw.crb_win = -1;
         adapter->ahw.ocm_win = -1;
 
@@ -1503,11 +1479,10 @@ netxen_nic_resume(struct pci_dev *pdev)
                 if (err)
                         goto err_out_detach;
 
-                netif_device_attach(netdev);
-
                 netxen_config_indev_addr(netdev, NETDEV_UP);
         }
 
+        netif_device_attach(netdev);
         netxen_schedule_work(adapter, netxen_fw_poll_work, FW_POLL_DELAY);
         return 0;
 
@@ -1517,6 +1492,85 @@ err_out:
         nx_decr_dev_ref_cnt(adapter);
         return err;
 }
+
+static pci_ers_result_t netxen_io_error_detected(struct pci_dev *pdev,
+                                                pci_channel_state_t state)
+{
+        struct netxen_adapter *adapter = pci_get_drvdata(pdev);
+
+        if (state == pci_channel_io_perm_failure)
+                return PCI_ERS_RESULT_DISCONNECT;
+
+        if (nx_dev_request_aer(adapter))
+                return PCI_ERS_RESULT_RECOVERED;
+
+        netxen_nic_detach_func(adapter);
+
+        pci_disable_device(pdev);
+
+        return PCI_ERS_RESULT_NEED_RESET;
+}
+
+static pci_ers_result_t netxen_io_slot_reset(struct pci_dev *pdev)
+{
+        int err = 0;
+
+        err = netxen_nic_attach_func(pdev);
+
+        return err ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
+}
+
+static void netxen_io_resume(struct pci_dev *pdev)
+{
+        pci_cleanup_aer_uncorrect_error_status(pdev);
+}
+
+static void netxen_nic_shutdown(struct pci_dev *pdev)
+{
+        struct netxen_adapter *adapter = pci_get_drvdata(pdev);
+
+        netxen_nic_detach_func(adapter);
+
+        if (pci_save_state(pdev))
+                return;
+
+        if (netxen_nic_wol_supported(adapter)) {
+                pci_enable_wake(pdev, PCI_D3cold, 1);
+                pci_enable_wake(pdev, PCI_D3hot, 1);
+        }
+
+        pci_disable_device(pdev);
+}
+
+#ifdef CONFIG_PM
+static int
+netxen_nic_suspend(struct pci_dev *pdev, pm_message_t state)
+{
+        struct netxen_adapter *adapter = pci_get_drvdata(pdev);
+        int retval;
+
+        netxen_nic_detach_func(adapter);
+
+        retval = pci_save_state(pdev);
+        if (retval)
+                return retval;
+
+        if (netxen_nic_wol_supported(adapter)) {
+                pci_enable_wake(pdev, PCI_D3cold, 1);
+                pci_enable_wake(pdev, PCI_D3hot, 1);
+        }
+
+        pci_disable_device(pdev);
+        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        return 0;
+}
+
+static int
+netxen_nic_resume(struct pci_dev *pdev)
+{
+        return netxen_nic_attach_func(pdev);
+}
 #endif
 
 static int netxen_nic_open(struct net_device *netdev)
@@ -2104,20 +2158,49 @@ nx_decr_dev_ref_cnt(struct netxen_adapter *adapter)
         return count;
 }
 
-static void
+static int
+nx_dev_request_aer(struct netxen_adapter *adapter)
+{
+        u32 state;
+        int ret = -EINVAL;
+
+        if (netxen_api_lock(adapter))
+                return ret;
+
+        state = NXRD32(adapter, NX_CRB_DEV_STATE);
+
+        if (state == NX_DEV_NEED_AER)
+                ret = 0;
+        else if (state == NX_DEV_READY) {
+                NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_NEED_AER);
+                ret = 0;
+        }
+
+        netxen_api_unlock(adapter);
+        return ret;
+}
+
+static int
 nx_dev_request_reset(struct netxen_adapter *adapter)
 {
         u32 state;
+        int ret = -EINVAL;
 
         if (netxen_api_lock(adapter))
-                return;
+                return ret;
 
         state = NXRD32(adapter, NX_CRB_DEV_STATE);
 
-        if (state != NX_DEV_INITALIZING)
+        if (state == NX_DEV_NEED_RESET)
+                ret = 0;
+        else if (state != NX_DEV_INITALIZING && state != NX_DEV_NEED_AER) {
                 NXWR32(adapter, NX_CRB_DEV_STATE, NX_DEV_NEED_RESET);
+                ret = 0;
+        }
 
         netxen_api_unlock(adapter);
+
+        return ret;
 }
 
 static int
@@ -2269,17 +2352,29 @@ netxen_check_health(struct netxen_adapter *adapter)
         u32 state, heartbit;
         struct net_device *netdev = adapter->netdev;
 
+        state = NXRD32(adapter, NX_CRB_DEV_STATE);
+        if (state == NX_DEV_NEED_AER)
+                return 0;
+
         if (netxen_nic_check_temp(adapter))
                 goto detach;
 
         if (adapter->need_fw_reset) {
-                nx_dev_request_reset(adapter);
+                if (nx_dev_request_reset(adapter))
+                        return 0;
                 goto detach;
         }
 
-        state = NXRD32(adapter, NX_CRB_DEV_STATE);
-        if (state == NX_DEV_NEED_RESET)
-                goto detach;
+        /* NX_DEV_NEED_RESET, this state can be marked in two cases
+         * 1. Tx timeout 2. Fw hang
+         * Send request to destroy context in case of tx timeout only
+         * and doesn't required in case of Fw hang
+         */
+        if (state == NX_DEV_NEED_RESET) {
+                adapter->need_fw_reset = 1;
+                if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                        goto detach;
+        }
 
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 return 0;
@@ -2288,12 +2383,17 @@ netxen_check_health(struct netxen_adapter *adapter)
         if (heartbit != adapter->heartbit) {
                 adapter->heartbit = heartbit;
                 adapter->fw_fail_cnt = 0;
+                if (adapter->need_fw_reset)
+                        goto detach;
                 return 0;
         }
 
         if (++adapter->fw_fail_cnt < FW_FAIL_THRESH)
                 return 0;
 
+        if (nx_dev_request_reset(adapter))
+                return 0;
+
         clear_bit(__NX_FW_ATTACHED, &adapter->state);
 
         dev_info(&netdev->dev, "firmware hang detected\n");
@@ -2496,7 +2596,7 @@ netxen_sysfs_read_mem(struct kobject *kobj, struct bin_attribute *attr,
         return size;
 }
 
-ssize_t netxen_sysfs_write_mem(struct kobject *kobj,
+static ssize_t netxen_sysfs_write_mem(struct kobject *kobj,
                 struct bin_attribute *attr, char *buf,
                 loff_t offset, size_t size)
 {
@@ -2723,6 +2823,12 @@ netxen_config_indev_addr(struct net_device *dev, unsigned long event)
 { }
 #endif
 
+static struct pci_error_handlers netxen_err_handler = {
+        .error_detected = netxen_io_error_detected,
+        .slot_reset = netxen_io_slot_reset,
+        .resume = netxen_io_resume,
+};
+
 static struct pci_driver netxen_driver = {
         .name = netxen_nic_driver_name,
         .id_table = netxen_pci_tbl,
@@ -2732,7 +2838,8 @@ static struct pci_driver netxen_driver = {
         .suspend = netxen_nic_suspend,
         .resume = netxen_nic_resume,
 #endif
-        .shutdown = netxen_nic_shutdown
+        .shutdown = netxen_nic_shutdown,
+        .err_handler = &netxen_err_handler
 };
 
 static int __init netxen_init_module(void)