Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / qlogic / qede / qede_main.c

diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c
index 1c7f9ed..9837bdb 100644 (file)
--- a/drivers/net/ethernet/qlogic/qede/qede_main.c
+++ b/drivers/net/ethernet/qlogic/qede/qede_main.c
@@ -39,12 +39,8 @@
 #include "qede.h"
 #include "qede_ptp.h"
 
-static char version[] =
-       "QLogic FastLinQ 4xxxx Ethernet Driver qede " DRV_MODULE_VERSION "\n";
-
 MODULE_DESCRIPTION("QLogic FastLinQ 4xxxx Ethernet Driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_MODULE_VERSION);
 
 static uint debug;
 module_param(debug, uint, 0);
@@ -258,7 +254,7 @@ int __init qede_init(void)
 {
        int ret;
 
-       pr_info("qede_init: %s\n", version);
+       pr_info("qede init: QLogic FastLinQ 4xxxx Ethernet Driver qede\n");
 
        qede_forced_speed_maps_init();
 
@@ -644,7 +640,7 @@ static const struct net_device_ops qede_netdev_ops = {
        .ndo_set_mac_address    = qede_set_mac_addr,
        .ndo_validate_addr      = eth_validate_addr,
        .ndo_change_mtu         = qede_change_mtu,
-       .ndo_do_ioctl           = qede_ioctl,
+       .ndo_eth_ioctl          = qede_ioctl,
        .ndo_tx_timeout         = qede_tx_timeout,
 #ifdef CONFIG_QED_SRIOV
        .ndo_set_vf_mac         = qede_set_vf_mac,
@@ -1157,10 +1153,6 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level,
        /* Start the Slowpath-process */
        memset(&sp_params, 0, sizeof(sp_params));
        sp_params.int_mode = QED_INT_MODE_MSIX;
-       sp_params.drv_major = QEDE_MAJOR_VERSION;
-       sp_params.drv_minor = QEDE_MINOR_VERSION;
-       sp_params.drv_rev = QEDE_REVISION_VERSION;
-       sp_params.drv_eng = QEDE_ENGINEERING_VERSION;
        strlcpy(sp_params.name, "qede LAN", QED_DRV_VER_STR_SIZE);
        rc = qed_ops->common->slowpath_start(cdev, &sp_params);
        if (rc) {
@@ -1907,6 +1899,12 @@ static int qede_req_msix_irqs(struct qede_dev *edev)
                                 &edev->fp_array[i]);
                if (rc) {
                        DP_ERR(edev, "Request fp %d irq failed\n", i);
+#ifdef CONFIG_RFS_ACCEL
+                       if (edev->ndev->rx_cpu_rmap)
+                               free_irq_cpu_rmap(edev->ndev->rx_cpu_rmap);
+
+                       edev->ndev->rx_cpu_rmap = NULL;
+#endif
                        qede_sync_free_irqs(edev);
                        return rc;
                }
@@ -2299,6 +2297,15 @@ static void qede_unload(struct qede_dev *edev, enum qede_unload_mode mode,
 
                rc = qede_stop_queues(edev);
                if (rc) {
+#ifdef CONFIG_RFS_ACCEL
+                       if (edev->dev_info.common.b_arfs_capable) {
+                               qede_poll_for_freeing_arfs_filters(edev);
+                               if (edev->ndev->rx_cpu_rmap)
+                                       free_irq_cpu_rmap(edev->ndev->rx_cpu_rmap);
+
+                               edev->ndev->rx_cpu_rmap = NULL;
+                       }
+#endif
                        qede_sync_free_irqs(edev);
                        goto out;
                }
@@ -2628,8 +2635,10 @@ static void qede_generic_hw_err_handler(struct qede_dev *edev)
                  "Generic sleepable HW error handling started - err_flags 0x%lx\n",
                  edev->err_flags);
 
-       if (edev->devlink)
+       if (edev->devlink) {
+               DP_NOTICE(edev, "Reporting fatal error to devlink\n");
                edev->ops->common->report_fatal_error(edev->devlink, edev->last_err_type);
+       }
 
        clear_bit(QEDE_ERR_IS_HANDLED, &edev->err_flags);
 
@@ -2651,6 +2660,8 @@ static void qede_set_hw_err_flags(struct qede_dev *edev,
        case QED_HW_ERR_FW_ASSERT:
                set_bit(QEDE_ERR_ATTN_CLR_EN, &err_flags);
                set_bit(QEDE_ERR_GET_DBG_INFO, &err_flags);
+               /* make this error as recoverable and start recovery*/
+               set_bit(QEDE_ERR_IS_RECOVERABLE, &err_flags);
                break;
 
        default: