Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (170 commits)
  [SCSI] scsi_dh_rdac: Add MD36xxf into device list
  [SCSI] scsi_debug: add consecutive medium errors
  [SCSI] libsas: fix ata list corruption issue
  [SCSI] hpsa: export resettable host attribute
  [SCSI] hpsa: move device attributes to avoid forward declarations
  [SCSI] scsi_debug: Logical Block Provisioning (SBC3r26)
  [SCSI] sd: Logical Block Provisioning update
  [SCSI] Include protection operation in SCSI command trace
  [SCSI] hpsa: fix incorrect PCI IDs and add two new ones (2nd try)
  [SCSI] target: Fix volume size misreporting for volumes > 2TB
  [SCSI] bnx2fc: Broadcom FCoE offload driver
  [SCSI] fcoe: fix broken fcoe interface reset
  [SCSI] fcoe: precedence bug in fcoe_filter_frames()
  [SCSI] libfcoe: Remove stale fcoe-netdev entries
  [SCSI] libfcoe: Move FCOE_MTU definition from fcoe.h to libfcoe.h
  [SCSI] libfc: introduce __fc_fill_fc_hdr that accepts fc_hdr as an argument
  [SCSI] fcoe, libfc: initialize EM anchors list and then update npiv EMs
  [SCSI] Revert "[SCSI] libfc: fix exchange being deleted when the abort itself is timed out"
  [SCSI] libfc: Fixing a memory leak when destroying an interface
  [SCSI] megaraid_sas: Version and Changelog update
  ...

Fix up trivial conflicts due to whitespace differences in
drivers/scsi/libsas/{sas_ata.c,sas_scsi_host.c}

4 files changed, 176 insertions, 35 deletions

diff --git a/drivers/scsi/bnx2i/bnx2i.h b/drivers/scsi/bnx2i/bnx2i.h
index e1ca5fe7e6bb..cfd59023227b 100644
--- a/drivers/scsi/bnx2i/bnx2i.h
+++ b/drivers/scsi/bnx2i/bnx2i.h
@@ -360,7 +360,7 @@ struct bnx2i_hba {
                 #define ADAPTER_STATE_LINK_DOWN         2
                 #define ADAPTER_STATE_INIT_FAILED       31
         unsigned int mtu_supported;
-                #define BNX2I_MAX_MTU_SUPPORTED         1500
+                #define BNX2I_MAX_MTU_SUPPORTED         9000
 
         struct Scsi_Host *shost;
 
@@ -751,6 +751,8 @@ extern int bnx2i_send_iscsi_login(struct bnx2i_conn *conn,
                                   struct iscsi_task *mtask);
 extern int bnx2i_send_iscsi_tmf(struct bnx2i_conn *conn,
                                   struct iscsi_task *mtask);
+extern int bnx2i_send_iscsi_text(struct bnx2i_conn *conn,
+                                 struct iscsi_task *mtask);
 extern int bnx2i_send_iscsi_scsicmd(struct bnx2i_conn *conn,
                                     struct bnx2i_cmd *cmnd);
 extern int bnx2i_send_iscsi_nopout(struct bnx2i_conn *conn,
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 96505e3ab986..1da34c019b8a 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -445,6 +445,56 @@ int bnx2i_send_iscsi_tmf(struct bnx2i_conn *bnx2i_conn,
 }
 
 /**
+ * bnx2i_send_iscsi_text - post iSCSI text WQE to hardware
+ * @conn:       iscsi connection
+ * @mtask:      driver command structure which is requesting
+ *              a WQE to sent to chip for further processing
+ *
+ * prepare and post an iSCSI Text request WQE to CNIC firmware
+ */
+int bnx2i_send_iscsi_text(struct bnx2i_conn *bnx2i_conn,
+                          struct iscsi_task *mtask)
+{
+        struct bnx2i_cmd *bnx2i_cmd;
+        struct bnx2i_text_request *text_wqe;
+        struct iscsi_text *text_hdr;
+        u32 dword;
+
+        bnx2i_cmd = (struct bnx2i_cmd *)mtask->dd_data;
+        text_hdr = (struct iscsi_text *)mtask->hdr;
+        text_wqe = (struct bnx2i_text_request *) bnx2i_conn->ep->qp.sq_prod_qe;
+
+        memset(text_wqe, 0, sizeof(struct bnx2i_text_request));
+
+        text_wqe->op_code = text_hdr->opcode;
+        text_wqe->op_attr = text_hdr->flags;
+        text_wqe->data_length = ntoh24(text_hdr->dlength);
+        text_wqe->itt = mtask->itt |
+                (ISCSI_TASK_TYPE_MPATH << ISCSI_TEXT_REQUEST_TYPE_SHIFT);
+        text_wqe->ttt = be32_to_cpu(text_hdr->ttt);
+
+        text_wqe->cmd_sn = be32_to_cpu(text_hdr->cmdsn);
+
+        text_wqe->resp_bd_list_addr_lo = (u32) bnx2i_conn->gen_pdu.resp_bd_dma;
+        text_wqe->resp_bd_list_addr_hi =
+                        (u32) ((u64) bnx2i_conn->gen_pdu.resp_bd_dma >> 32);
+
+        dword = ((1 << ISCSI_TEXT_REQUEST_NUM_RESP_BDS_SHIFT) |
+                 (bnx2i_conn->gen_pdu.resp_buf_size <<
+                  ISCSI_TEXT_REQUEST_RESP_BUFFER_LENGTH_SHIFT));
+        text_wqe->resp_buffer = dword;
+        text_wqe->bd_list_addr_lo = (u32) bnx2i_conn->gen_pdu.req_bd_dma;
+        text_wqe->bd_list_addr_hi =
+                        (u32) ((u64) bnx2i_conn->gen_pdu.req_bd_dma >> 32);
+        text_wqe->num_bds = 1;
+        text_wqe->cq_index = 0; /* CQ# used for completion, 5771x only */
+
+        bnx2i_ring_dbell_update_sq_params(bnx2i_conn, 1);
+        return 0;
+}
+
+
+/**
  * bnx2i_send_iscsi_scsicmd - post iSCSI scsicmd request WQE to hardware
  * @conn:       iscsi connection
  * @cmd:        driver command structure which is requesting
@@ -490,15 +540,18 @@ int bnx2i_send_iscsi_nopout(struct bnx2i_conn *bnx2i_conn,
         bnx2i_cmd = (struct bnx2i_cmd *)task->dd_data;
         nopout_hdr = (struct iscsi_nopout *)task->hdr;
         nopout_wqe = (struct bnx2i_nop_out_request *)ep->qp.sq_prod_qe;
+
+        memset(nopout_wqe, 0x00, sizeof(struct bnx2i_nop_out_request));
+
         nopout_wqe->op_code = nopout_hdr->opcode;
         nopout_wqe->op_attr = ISCSI_FLAG_CMD_FINAL;
         memcpy(nopout_wqe->lun, nopout_hdr->lun, 8);
 
         if (test_bit(BNX2I_NX2_DEV_57710, &ep->hba->cnic_dev_type)) {
-                u32 tmp = nopout_hdr->lun[0];
+                u32 tmp = nopout_wqe->lun[0];
                 /* 57710 requires LUN field to be swapped */
-                nopout_hdr->lun[0] = nopout_hdr->lun[1];
-                nopout_hdr->lun[1] = tmp;
+                nopout_wqe->lun[0] = nopout_wqe->lun[1];
+                nopout_wqe->lun[1] = tmp;
         }
 
         nopout_wqe->itt = ((u16)task->itt |
@@ -1425,6 +1478,68 @@ done:
         return 0;
 }
 
+
+/**
+ * bnx2i_process_text_resp - this function handles iscsi text response
+ * @session:    iscsi session pointer
+ * @bnx2i_conn: iscsi connection pointer
+ * @cqe:        pointer to newly DMA'ed CQE entry for processing
+ *
+ * process iSCSI Text Response CQE&  complete it to open-iscsi user daemon
+ */
+static int bnx2i_process_text_resp(struct iscsi_session *session,
+                                   struct bnx2i_conn *bnx2i_conn,
+                                   struct cqe *cqe)
+{
+        struct iscsi_conn *conn = bnx2i_conn->cls_conn->dd_data;
+        struct iscsi_task *task;
+        struct bnx2i_text_response *text;
+        struct iscsi_text_rsp *resp_hdr;
+        int pld_len;
+        int pad_len;
+
+        text = (struct bnx2i_text_response *) cqe;
+        spin_lock(&session->lock);
+        task = iscsi_itt_to_task(conn, text->itt & ISCSI_LOGIN_RESPONSE_INDEX);
+        if (!task)
+                goto done;
+
+        resp_hdr = (struct iscsi_text_rsp *)&bnx2i_conn->gen_pdu.resp_hdr;
+        memset(resp_hdr, 0, sizeof(struct iscsi_hdr));
+        resp_hdr->opcode = text->op_code;
+        resp_hdr->flags = text->response_flags;
+        resp_hdr->hlength = 0;
+
+        hton24(resp_hdr->dlength, text->data_length);
+        resp_hdr->itt = task->hdr->itt;
+        resp_hdr->ttt = cpu_to_be32(text->ttt);
+        resp_hdr->statsn = task->hdr->exp_statsn;
+        resp_hdr->exp_cmdsn = cpu_to_be32(text->exp_cmd_sn);
+        resp_hdr->max_cmdsn = cpu_to_be32(text->max_cmd_sn);
+        pld_len = text->data_length;
+        bnx2i_conn->gen_pdu.resp_wr_ptr = bnx2i_conn->gen_pdu.resp_buf +
+                                          pld_len;
+        pad_len = 0;
+        if (pld_len & 0x3)
+                pad_len = 4 - (pld_len % 4);
+
+        if (pad_len) {
+                int i = 0;
+                for (i = 0; i < pad_len; i++) {
+                        bnx2i_conn->gen_pdu.resp_wr_ptr[0] = 0;
+                        bnx2i_conn->gen_pdu.resp_wr_ptr++;
+                }
+        }
+        __iscsi_complete_pdu(conn, (struct iscsi_hdr *)resp_hdr,
+                             bnx2i_conn->gen_pdu.resp_buf,
+                             bnx2i_conn->gen_pdu.resp_wr_ptr -
+                             bnx2i_conn->gen_pdu.resp_buf);
+done:
+        spin_unlock(&session->lock);
+        return 0;
+}
+
+
 /**
  * bnx2i_process_tmf_resp - this function handles iscsi TMF response
  * @session:            iscsi session pointer
@@ -1766,6 +1881,10 @@ static void bnx2i_process_new_cqes(struct bnx2i_conn *bnx2i_conn)
                         bnx2i_process_tmf_resp(session, bnx2i_conn,
                                                qp->cq_cons_qe);
                         break;
+                case ISCSI_OP_TEXT_RSP:
+                        bnx2i_process_text_resp(session, bnx2i_conn,
+                                                qp->cq_cons_qe);
+                        break;
                 case ISCSI_OP_LOGOUT_RSP:
                         bnx2i_process_logout_resp(session, bnx2i_conn,
                                                   qp->cq_cons_qe);
diff --git a/drivers/scsi/bnx2i/bnx2i_init.c b/drivers/scsi/bnx2i/bnx2i_init.c
index 72a7b2d4a439..1d24a2819736 100644
--- a/drivers/scsi/bnx2i/bnx2i_init.c
+++ b/drivers/scsi/bnx2i/bnx2i_init.c
@@ -18,8 +18,8 @@ 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.6.2.2"
-#define DRV_MODULE_RELDATE      "Nov 23, 2010"
+#define DRV_MODULE_VERSION      "2.6.2.3"
+#define DRV_MODULE_RELDATE      "Dec 31, 2010"
 
 static char version[] __devinitdata =
                 "Broadcom NetXtreme II iSCSI Driver " DRV_MODULE_NAME \
@@ -29,7 +29,7 @@ static char version[] __devinitdata =
 MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and "
               "Eddie Wai <eddie.wai@broadcom.com>");
 
-MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711"
+MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711/57712"
                    " iSCSI Driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_MODULE_VERSION);
@@ -88,9 +88,11 @@ void bnx2i_identify_device(struct bnx2i_hba *hba)
             (hba->pci_did == PCI_DEVICE_ID_NX2_5709S)) {
                 set_bit(BNX2I_NX2_DEV_5709, &hba->cnic_dev_type);
                 hba->mail_queue_access = BNX2I_MQ_BIN_MODE;
-        } else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710 ||
-                   hba->pci_did == PCI_DEVICE_ID_NX2_57711 ||
-                   hba->pci_did == PCI_DEVICE_ID_NX2_57711E)
+        } else if (hba->pci_did == PCI_DEVICE_ID_NX2_57710  ||
+                   hba->pci_did == PCI_DEVICE_ID_NX2_57711  ||
+                   hba->pci_did == PCI_DEVICE_ID_NX2_57711E ||
+                   hba->pci_did == PCI_DEVICE_ID_NX2_57712  ||
+                   hba->pci_did == PCI_DEVICE_ID_NX2_57712E)
                 set_bit(BNX2I_NX2_DEV_57710, &hba->cnic_dev_type);
         else
                 printk(KERN_ALERT "bnx2i: unknown device, 0x%x\n",
@@ -161,6 +163,21 @@ void bnx2i_start(void *handle)
         struct bnx2i_hba *hba = handle;
         int i = HZ;
 
+        if (!hba->cnic->max_iscsi_conn) {
+                printk(KERN_ALERT "bnx2i: dev %s does not support "
+                        "iSCSI\n", hba->netdev->name);
+
+                if (test_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic)) {
+                        mutex_lock(&bnx2i_dev_lock);
+                        list_del_init(&hba->link);
+                        adapter_count--;
+                        hba->cnic->unregister_device(hba->cnic, CNIC_ULP_ISCSI);
+                        clear_bit(BNX2I_CNIC_REGISTERED, &hba->reg_with_cnic);
+                        mutex_unlock(&bnx2i_dev_lock);
+                        bnx2i_free_hba(hba);
+                }
+                return;
+        }
         bnx2i_send_fw_iscsi_init_msg(hba);
         while (!test_bit(ADAPTER_STATE_UP, &hba->adapter_state) && i--)
                 msleep(BNX2I_INIT_POLL_TIME);
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c
index f0dce26593eb..1809f9ccc4ce 100644
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@ -1092,6 +1092,9 @@ static int bnx2i_iscsi_send_generic_request(struct iscsi_task *task)
         case ISCSI_OP_SCSI_TMFUNC:
                 rc = bnx2i_send_iscsi_tmf(bnx2i_conn, task);
                 break;
+        case ISCSI_OP_TEXT:
+                rc = bnx2i_send_iscsi_text(bnx2i_conn, task);
+                break;
         default:
                 iscsi_conn_printk(KERN_ALERT, bnx2i_conn->cls_conn->dd_data,
                                   "send_gen: unsupported op 0x%x\n",
@@ -1455,42 +1458,40 @@ static void bnx2i_conn_destroy(struct iscsi_cls_conn *cls_conn)
 
 
 /**
- * bnx2i_conn_get_param - return iscsi connection parameter to caller
- * @cls_conn:   pointer to iscsi cls conn
+ * bnx2i_ep_get_param - return iscsi ep parameter to caller
+ * @ep:         pointer to iscsi endpoint
  * @param:      parameter type identifier
  * @buf:        buffer pointer
  *
- * returns iSCSI connection parameters
+ * returns iSCSI ep parameters
  */
-static int bnx2i_conn_get_param(struct iscsi_cls_conn *cls_conn,
-                                enum iscsi_param param, char *buf)
+static int bnx2i_ep_get_param(struct iscsi_endpoint *ep,
+                              enum iscsi_param param, char *buf)
 {
-        struct iscsi_conn *conn = cls_conn->dd_data;
-        struct bnx2i_conn *bnx2i_conn = conn->dd_data;
-        int len = 0;
+        struct bnx2i_endpoint *bnx2i_ep = ep->dd_data;
+        struct bnx2i_hba *hba = bnx2i_ep->hba;
+        int len = -ENOTCONN;
 
-        if (!(bnx2i_conn && bnx2i_conn->ep && bnx2i_conn->ep->hba))
-                goto out;
+        if (!hba)
+                return -ENOTCONN;
 
         switch (param) {
         case ISCSI_PARAM_CONN_PORT:
-                mutex_lock(&bnx2i_conn->ep->hba->net_dev_lock);
-                if (bnx2i_conn->ep->cm_sk)
-                        len = sprintf(buf, "%hu\n",
-                                      bnx2i_conn->ep->cm_sk->dst_port);
-                mutex_unlock(&bnx2i_conn->ep->hba->net_dev_lock);
+                mutex_lock(&hba->net_dev_lock);
+                if (bnx2i_ep->cm_sk)
+                        len = sprintf(buf, "%hu\n", bnx2i_ep->cm_sk->dst_port);
+                mutex_unlock(&hba->net_dev_lock);
                 break;
         case ISCSI_PARAM_CONN_ADDRESS:
-                mutex_lock(&bnx2i_conn->ep->hba->net_dev_lock);
-                if (bnx2i_conn->ep->cm_sk)
-                        len = sprintf(buf, "%pI4\n",
-                                      &bnx2i_conn->ep->cm_sk->dst_ip);
-                mutex_unlock(&bnx2i_conn->ep->hba->net_dev_lock);
+                mutex_lock(&hba->net_dev_lock);
+                if (bnx2i_ep->cm_sk)
+                        len = sprintf(buf, "%pI4\n", &bnx2i_ep->cm_sk->dst_ip);
+                mutex_unlock(&hba->net_dev_lock);
                 break;
         default:
-                return iscsi_conn_get_param(cls_conn, param, buf);
+                return -ENOSYS;
         }
-out:
+
         return len;
 }
 
@@ -1935,13 +1936,13 @@ static int bnx2i_ep_tcp_conn_active(struct bnx2i_endpoint *bnx2i_ep)
                 cnic_dev_10g = 1;
 
         switch (bnx2i_ep->state) {
-        case EP_STATE_CONNECT_FAILED:
         case EP_STATE_CLEANUP_FAILED:
         case EP_STATE_OFLD_FAILED:
         case EP_STATE_DISCONN_TIMEDOUT:
                 ret = 0;
                 break;
         case EP_STATE_CONNECT_START:
+        case EP_STATE_CONNECT_FAILED:
         case EP_STATE_CONNECT_COMPL:
         case EP_STATE_ULP_UPDATE_START:
         case EP_STATE_ULP_UPDATE_COMPL:
@@ -2167,7 +2168,8 @@ struct iscsi_transport bnx2i_iscsi_transport = {
         .name                   = "bnx2i",
         .caps                   = CAP_RECOVERY_L0 | CAP_HDRDGST |
                                   CAP_MULTI_R2T | CAP_DATADGST |
-                                  CAP_DATA_PATH_OFFLOAD,
+                                  CAP_DATA_PATH_OFFLOAD |
+                                  CAP_TEXT_NEGO,
         .param_mask             = ISCSI_MAX_RECV_DLENGTH |
                                   ISCSI_MAX_XMIT_DLENGTH |
                                   ISCSI_HDRDGST_EN |
@@ -2200,7 +2202,7 @@ struct iscsi_transport bnx2i_iscsi_transport = {
         .bind_conn              = bnx2i_conn_bind,
         .destroy_conn           = bnx2i_conn_destroy,
         .set_param              = iscsi_set_param,
-        .get_conn_param         = bnx2i_conn_get_param,
+        .get_conn_param         = iscsi_conn_get_param,
         .get_session_param      = iscsi_session_get_param,
         .get_host_param         = bnx2i_host_get_param,
         .start_conn             = bnx2i_conn_start,
@@ -2209,6 +2211,7 @@ struct iscsi_transport bnx2i_iscsi_transport = {
         .xmit_task              = bnx2i_task_xmit,
         .get_stats              = bnx2i_conn_get_stats,
         /* TCP connect - disconnect - option-2 interface calls */
+        .get_ep_param           = bnx2i_ep_get_param,
         .ep_connect             = bnx2i_ep_connect,
         .ep_poll                = bnx2i_ep_poll,
         .ep_disconnect          = bnx2i_ep_disconnect,