4 files changed, 81 insertions, 61 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index 00c033511cbf..b6345d91bb66 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -753,7 +753,7 @@ extern int bnx2i_send_iscsi_tmf(struct bnx2i_conn *conn,
 extern int bnx2i_send_iscsi_scsicmd(struct bnx2i_conn *conn,
                                     struct bnx2i_cmd *cmnd);
 extern int bnx2i_send_iscsi_nopout(struct bnx2i_conn *conn,
-                                   struct iscsi_task *mtask, u32 ttt,
+                                   struct iscsi_task *mtask,
                                    char *datap, int data_len, int unsol);
 extern int bnx2i_send_iscsi_logout(struct bnx2i_conn *conn,
                                    struct iscsi_task *mtask);
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index d23fc256d585..90cef716b796 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -385,7 +385,6 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn,
         struct bnx2i_cmd *bnx2i_cmd;
         struct bnx2i_tmf_request *tmfabort_wqe;
         u32 dword;
-        u32 scsi_lun[2];
 
         bnx2i_cmd = (struct bnx2i_cmd *)mtask->dd_data;
         tmfabort_hdr = (struct iscsi_tm *)mtask->hdr;
@@ -393,38 +392,41 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn,
                                                 bnx2i_conn->ep->qp.sq_prod_qe;
 
         tmfabort_wqe->op_code = tmfabort_hdr->opcode;
-        tmfabort_wqe->op_attr = 0;
-        tmfabort_wqe->op_attr =
-                ISCSI_TMF_REQUEST_ALWAYS_ONE | ISCSI_TM_FUNC_ABORT_TASK;
+        tmfabort_wqe->op_attr = tmfabort_hdr->flags;
 
         tmfabort_wqe->itt = (mtask->itt | (ISCSI_TASK_TYPE_MPATH << 14));
         tmfabort_wqe->reserved2 = 0;
         tmfabort_wqe->cmd_sn = be32_to_cpu(tmfabort_hdr->cmdsn);
 
-        ctask = iscsi_itt_to_task(conn, tmfabort_hdr->rtt);
-        if (!ctask || !ctask->sc)
-                /*
-                 * the iscsi layer must have completed the cmd while this
-                 * was starting up.
-                 *
-                 * Note: In the case of a SCSI cmd timeout, the task's sc
-                 *       is still active; hence ctask->sc != 0
-                 *       In this case, the task must be aborted
-                 */
-                return 0;
-
-        ref_sc = ctask->sc;
-
-        /* Retrieve LUN directly from the ref_sc */
-        int_to_scsilun(ref_sc->device->lun, (struct scsi_lun *) scsi_lun);
-        tmfabort_wqe->lun[0] = be32_to_cpu(scsi_lun[0]);
-        tmfabort_wqe->lun[1] = be32_to_cpu(scsi_lun[1]);
-
-        if (ref_sc->sc_data_direction == DMA_TO_DEVICE)
-                dword = (ISCSI_TASK_TYPE_WRITE << ISCSI_CMD_REQUEST_TYPE_SHIFT);
-        else
-                dword = (ISCSI_TASK_TYPE_READ << ISCSI_CMD_REQUEST_TYPE_SHIFT);
-        tmfabort_wqe->ref_itt = (dword | (tmfabort_hdr->rtt & ISCSI_ITT_MASK));
+        switch (tmfabort_hdr->flags & ISCSI_FLAG_TM_FUNC_MASK) {
+        case ISCSI_TM_FUNC_ABORT_TASK:
+        case ISCSI_TM_FUNC_TASK_REASSIGN:
+                ctask = iscsi_itt_to_task(conn, tmfabort_hdr->rtt);
+                if (!ctask || !ctask->sc)
+                        /*
+                         * the iscsi layer must have completed the cmd while
+                         * was starting up.
+                         *
+                         * Note: In the case of a SCSI cmd timeout, the task's
+                         *       sc is still active; hence ctask->sc != 0
+                         *       In this case, the task must be aborted
+                         */
+                        return 0;
+
+                ref_sc = ctask->sc;
+                if (ref_sc->sc_data_direction == DMA_TO_DEVICE)
+                        dword = (ISCSI_TASK_TYPE_WRITE <<
+                                 ISCSI_CMD_REQUEST_TYPE_SHIFT);
+                else
+                        dword = (ISCSI_TASK_TYPE_READ <<
+                                 ISCSI_CMD_REQUEST_TYPE_SHIFT);
+                tmfabort_wqe->ref_itt = (dword |
+                                        (tmfabort_hdr->rtt & ISCSI_ITT_MASK));
+                break;
+        default:
+                tmfabort_wqe->ref_itt = RESERVED_ITT;
+        }
+        memcpy(tmfabort_wqe->lun, tmfabort_hdr->lun, sizeof(struct scsi_lun));
         tmfabort_wqe->ref_cmd_sn = be32_to_cpu(tmfabort_hdr->refcmdsn);
 
         tmfabort_wqe->bd_list_addr_lo = (u32) bnx2i_conn->hba->mp_bd_dma;
@@ -464,7 +466,6 @@ int bnx2i_send_iscsi_scsicmd(struct bnx2i_conn *bnx2i_conn,
  * @conn:               iscsi connection
  * @cmd:                driver command structure which is requesting
  *                      a WQE to sent to chip for further processing
- * @ttt:                TTT to be used when building pdu header
  * @datap:              payload buffer pointer
  * @data_len:           payload data length
  * @unsol:              indicated whether nopout pdu is unsolicited pdu or
@@ -473,7 +474,7 @@ int bnx2i_send_iscsi_scsicmd(struct bnx2i_conn *bnx2i_conn,
  * prepare and post a nopout request WQE to CNIC firmware
  */
 int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
-                            struct iscsi_task *task, u32 ttt,
+                            struct iscsi_task *task,
                             char *datap, int data_len, int unsol)
 {
         struct bnx2i_endpoint *ep = bnx2i_conn->ep;
@@ -498,7 +499,7 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
         nopout_wqe->itt = ((u16)task->itt |
                            (ISCSI_TASK_TYPE_MPATH <<
                             ISCSI_TMF_REQUEST_TYPE_SHIFT));
-        nopout_wqe->ttt = ttt;
+        nopout_wqe->ttt = nopout_hdr->ttt;
         nopout_wqe->flags = 0;
         if (!unsol)
                 nopout_wqe->flags = ISCSI_NOP_OUT_REQUEST_LOCAL_COMPLETION;
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index a796f565f383..50c2aa3b8eb1 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -17,15 +17,17 @@ static struct list_head adapter_list = LIST_HEAD_INIT(adapter_list);
 static u32 adapter_count;
 
 #define DRV_MODULE_NAME         "bnx2i"
-#define DRV_MODULE_VERSION      "2.1.2"
-#define DRV_MODULE_RELDATE      "Jun 28, 2010"
+#define DRV_MODULE_VERSION      "2.1.3"
+#define DRV_MODULE_RELDATE      "Aug 10, 2010"
 
 static char version[] __devinitdata =
                 "Broadcom NetXtreme II iSCSI Driver " DRV_MODULE_NAME \
                 " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 
-MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com>");
+MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and "
+              "Eddie Wai <eddie.wai@broadcom.com>");
+
 MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711"
                    " iSCSI Driver");
 MODULE_LICENSE("GPL");
@@ -167,6 +169,38 @@ void bnx2i_start(void *handle)
 
 
 /**
+ * bnx2i_chip_cleanup - local routine to handle chip cleanup
+ * @hba:        Adapter instance to register
+ *
+ * Driver checks if adapter still has any active connections before
+ *      executing the cleanup process
+ */
+static void bnx2i_chip_cleanup(struct bnx2i_hba *hba)
+{
+        struct bnx2i_endpoint *bnx2i_ep;
+        struct list_head *pos, *tmp;
+
+        if (hba->ofld_conns_active) {
+                /* Stage to force the disconnection
+                 * This is the case where the daemon is either slow or
+                 * not present
+                 */
+                printk(KERN_ALERT "bnx2i: (%s) chip cleanup for %d active "
+                        "connections\n", hba->netdev->name,
+                        hba->ofld_conns_active);
+                mutex_lock(&hba->net_dev_lock);
+                list_for_each_safe(pos, tmp, &hba->ep_active_list) {
+                        bnx2i_ep = list_entry(pos, struct bnx2i_endpoint, link);
+                        /* Clean up the chip only */
+                        bnx2i_hw_ep_disconnect(bnx2i_ep);
+                        bnx2i_ep->cm_sk = NULL;
+                }
+                mutex_unlock(&hba->net_dev_lock);
+        }
+}
+
+
+/**
  * bnx2i_stop - cnic callback to shutdown adapter instance
  * @handle:     transparent handle pointing to adapter structure
  *
@@ -176,8 +210,6 @@ void bnx2i_start(void *handle)
 void bnx2i_stop(void *handle)
 {
         struct bnx2i_hba *hba = handle;
-        struct list_head *pos, *tmp;
-        struct bnx2i_endpoint *bnx2i_ep;
         int conns_active;
 
         /* check if cleanup happened in GOING_DOWN context */
@@ -198,24 +230,7 @@ void bnx2i_stop(void *handle)
                 if (hba->ofld_conns_active == conns_active)
                         break;
         }
-        if (hba->ofld_conns_active) {
-                /* Stage to force the disconnection
-                 * This is the case where the daemon is either slow or
-                 * not present
-                 */
-                printk(KERN_ALERT "bnx2i: Wait timeout, force all eps "
-                        "to disconnect (%d)\n", hba->ofld_conns_active);
-                mutex_lock(&hba->net_dev_lock);
-                list_for_each_safe(pos, tmp, &hba->ep_active_list) {
-                        bnx2i_ep = list_entry(pos, struct bnx2i_endpoint, link);
-                        /* Clean up the chip only */
-                        bnx2i_hw_ep_disconnect(bnx2i_ep);
-                }
-                mutex_unlock(&hba->net_dev_lock);
-                if (hba->ofld_conns_active)
-                        printk(KERN_ERR "bnx2i: EP disconnect timeout (%d)!\n",
-                                hba->ofld_conns_active);
-        }
+        bnx2i_chip_cleanup(hba);
 
         /* This flag should be cleared last so that ep_disconnect() gracefully
          * cleans up connection context
@@ -457,6 +472,7 @@ static void __exit bnx2i_mod_exit(void)
                 adapter_count--;
 
                 if (test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic)) {
+                        bnx2i_chip_cleanup(hba);
                         hba->cnic->unregister_device(hba->cnic, CNIC_ULP_ISCSI);
                         clear_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic);
                 }
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index a46ccc380ab1..fb50efbce087 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1078,11 +1078,9 @@ static int bnx2i_iscsi_send_generic_request(struct iscsi_task *task)
                 buf = bnx2i_conn->gen_pdu.req_buf;
                 if (data_len)
                         rc = bnx2i_send_iscsi_nopout(bnx2i_conn, task,
-                                                     RESERVED_ITT,
                                                      buf, data_len, 1);
                 else
                         rc = bnx2i_send_iscsi_nopout(bnx2i_conn, task,
-                                                     RESERVED_ITT,
                                                      NULL, 0, 1);
                 break;
         case ISCSI_OP_LOGOUT:
@@ -1955,6 +1953,9 @@ int bnx2i_hw_ep_disconnect(struct bnx2i_endpoint *bnx2i_ep)
         if (!cnic)
                 return 0;
 
+        if (bnx2i_ep->state == EP_STATE_IDLE)
+                return 0;
+
         if (!bnx2i_ep_tcp_conn_active(bnx2i_ep))
                 goto destroy_conn;
 
@@ -1998,11 +1999,13 @@ int bnx2i_hw_ep_disconnect(struct bnx2i_endpoint *bnx2i_ep)
         else
                 close_ret = cnic->cm_abort(bnx2i_ep->cm_sk);
 
+        /* No longer allow CFC delete if cm_close/abort fails the request */
         if (close_ret)
-                bnx2i_ep->state = EP_STATE_DISCONN_COMPL;
-
-        /* wait for option-2 conn teardown */
-        wait_event_interruptible(bnx2i_ep->ofld_wait,
+                printk(KERN_ALERT "bnx2i: %s close/abort(%d) returned %d\n",
+                        bnx2i_ep->hba->netdev->name, close, close_ret);
+        else
+                /* wait for option-2 conn teardown */
+                wait_event_interruptible(bnx2i_ep->ofld_wait,
                                  bnx2i_ep->state != EP_STATE_DISCONN_START);
 
         if (signal_pending(current))