4 files changed, 54 insertions, 20 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc.h b/drivers/scsi/bnx2fc/bnx2fc.h
index 08b22a901c25..1ebf3fb683e6 100644
--- a/drivers/scsi/bnx2fc/bnx2fc.h
+++ b/drivers/scsi/bnx2fc/bnx2fc.h
@@ -64,7 +64,7 @@
 #include "bnx2fc_constants.h"
 
 #define BNX2FC_NAME             "bnx2fc"
-#define BNX2FC_VERSION          "1.0.14"
+#define BNX2FC_VERSION          "2.4.1"
 
 #define PFX                     "bnx2fc: "
 
@@ -105,7 +105,7 @@
 #define BNX2FC_RQ_WQE_SIZE              (BNX2FC_RQ_BUF_SZ)
 #define BNX2FC_XFERQ_WQE_SIZE           (sizeof(struct fcoe_xfrqe))
 #define BNX2FC_CONFQ_WQE_SIZE           (sizeof(struct fcoe_confqe))
-#define BNX2FC_5771X_DB_PAGE_SIZE       128
+#define BNX2X_DB_SHIFT                  3
 
 #define BNX2FC_TASK_SIZE                128
 #define BNX2FC_TASKS_PER_PAGE           (PAGE_SIZE/BNX2FC_TASK_SIZE)
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index 23f6eea3fa7a..9b948505d118 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu);
 
 #define DRV_MODULE_NAME         "bnx2fc"
 #define DRV_MODULE_VERSION      BNX2FC_VERSION
-#define DRV_MODULE_RELDATE      "Mar 08, 2013"
+#define DRV_MODULE_RELDATE      "Sep 17, 2013"
 
 
 static char version[] =
@@ -2004,6 +2004,24 @@ static void bnx2fc_ulp_init(struct cnic_dev *dev)
                 set_bit(BNX2FC_CNIC_REGISTERED, &hba->reg_with_cnic);
 }
 
+/* Assumes rtnl_lock and the bnx2fc_dev_lock are already taken */
+static int __bnx2fc_disable(struct fcoe_ctlr *ctlr)
+{
+        struct bnx2fc_interface *interface = fcoe_ctlr_priv(ctlr);
+
+        if (interface->enabled == true) {
+                if (!ctlr->lp) {
+                        pr_err(PFX "__bnx2fc_disable: lport not found\n");
+                        return -ENODEV;
+                } else {
+                        interface->enabled = false;
+                        fcoe_ctlr_link_down(ctlr);
+                        fcoe_clean_pending_queue(ctlr->lp);
+                }
+        }
+        return 0;
+}
+
 /**
  * Deperecated: Use bnx2fc_enabled()
  */
@@ -2018,20 +2036,34 @@ static int bnx2fc_disable(struct net_device *netdev)
 
         interface = bnx2fc_interface_lookup(netdev);
         ctlr = bnx2fc_to_ctlr(interface);
-        if (!interface || !ctlr->lp) {
+
+        if (!interface) {
                 rc = -ENODEV;
-                printk(KERN_ERR PFX "bnx2fc_disable: interface or lport not found\n");
+                pr_err(PFX "bnx2fc_disable: interface not found\n");
         } else {
-                interface->enabled = false;
-                fcoe_ctlr_link_down(ctlr);
-                fcoe_clean_pending_queue(ctlr->lp);
+                rc = __bnx2fc_disable(ctlr);
         }
-
         mutex_unlock(&bnx2fc_dev_lock);
         rtnl_unlock();
         return rc;
 }
 
+static int __bnx2fc_enable(struct fcoe_ctlr *ctlr)
+{
+        struct bnx2fc_interface *interface = fcoe_ctlr_priv(ctlr);
+
+        if (interface->enabled == false) {
+                if (!ctlr->lp) {
+                        pr_err(PFX "__bnx2fc_enable: lport not found\n");
+                        return -ENODEV;
+                } else if (!bnx2fc_link_ok(ctlr->lp)) {
+                        fcoe_ctlr_link_up(ctlr);
+                        interface->enabled = true;
+                }
+        }
+        return 0;
+}
+
 /**
  * Deprecated: Use bnx2fc_enabled()
  */
@@ -2046,12 +2078,11 @@ static int bnx2fc_enable(struct net_device *netdev)
 
         interface = bnx2fc_interface_lookup(netdev);
         ctlr = bnx2fc_to_ctlr(interface);
-        if (!interface || !ctlr->lp) {
+        if (!interface) {
                 rc = -ENODEV;
-                printk(KERN_ERR PFX "bnx2fc_enable: interface or lport not found\n");
-        } else if (!bnx2fc_link_ok(ctlr->lp)) {
-                fcoe_ctlr_link_up(ctlr);
-                interface->enabled = true;
+                pr_err(PFX "bnx2fc_enable: interface not found\n");
+        } else {
+                rc = __bnx2fc_enable(ctlr);
         }
 
         mutex_unlock(&bnx2fc_dev_lock);
@@ -2072,14 +2103,12 @@ static int bnx2fc_enable(struct net_device *netdev)
 static int bnx2fc_ctlr_enabled(struct fcoe_ctlr_device *cdev)
 {
         struct fcoe_ctlr *ctlr = fcoe_ctlr_device_priv(cdev);
-        struct fc_lport *lport = ctlr->lp;
-        struct net_device *netdev = bnx2fc_netdev(lport);
 
         switch (cdev->enabled) {
         case FCOE_CTLR_ENABLED:
-                return bnx2fc_enable(netdev);
+                return __bnx2fc_enable(ctlr);
         case FCOE_CTLR_DISABLED:
-                return bnx2fc_disable(netdev);
+                return __bnx2fc_disable(ctlr);
         case FCOE_CTLR_UNUSED:
         default:
                 return -ENOTSUPP;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_hwi.c b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
index c0d035a8f8f9..46a37657307f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_hwi.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_hwi.c
@@ -1421,8 +1421,7 @@ int bnx2fc_map_doorbell(struct bnx2fc_rport *tgt)
 
         reg_base = pci_resource_start(hba->pcidev,
                                         BNX2X_DOORBELL_PCI_BAR);
-        reg_off = BNX2FC_5771X_DB_PAGE_SIZE *
-                        (context_id & 0x1FFFF) + DPM_TRIGER_TYPE;
+        reg_off = (1 << BNX2X_DB_SHIFT) * (context_id & 0x1FFFF);
         tgt->ctx_base = ioremap_nocache(reg_base + reg_off, 4);
         if (!tgt->ctx_base)
                 return -ENOMEM;
diff --git a/drivers/scsi/bnx2fc/bnx2fc_io.c b/drivers/scsi/bnx2fc/bnx2fc_io.c
index 575142e92d9c..ed880891cb7c 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_io.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_io.c
@@ -1246,6 +1246,12 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd)
                         kref_put(&io_req->refcount,
                                  bnx2fc_cmd_release); /* drop timer hold */
                 rc = bnx2fc_expl_logo(lport, io_req);
+                /* This only occurs when an task abort was requested while ABTS
+                   is in progress.  Setting the IO_CLEANUP flag will skip the
+                   RRQ process in the case when the fw generated SCSI_CMD cmpl
+                   was a result from the ABTS request rather than the CLEANUP
+                   request */
+                set_bit(BNX2FC_FLAG_IO_CLEANUP, &io_req->req_flags);
                 goto out;
         }