1 files changed, 107 insertions, 53 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 4cec123a6a6a..6142729167f4 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1337,18 +1337,18 @@ static int qla4xxx_session_get_param(struct iscsi_cls_session *cls_sess,
                                               sess->password_in, BIDI_CHAP,
                                               &idx);
                 if (rval)
-                        return -EINVAL;
-
-                len = sprintf(buf, "%hu\n", idx);
+                        len = sprintf(buf, "\n");
+                else
+                        len = sprintf(buf, "%hu\n", idx);
                 break;
         case ISCSI_PARAM_CHAP_OUT_IDX:
                 rval = qla4xxx_get_chap_index(ha, sess->username,
                                               sess->password, LOCAL_CHAP,
                                               &idx);
                 if (rval)
-                        return -EINVAL;
-
-                len = sprintf(buf, "%hu\n", idx);
+                        len = sprintf(buf, "\n");
+                else
+                        len = sprintf(buf, "%hu\n", idx);
                 break;
         default:
                 return iscsi_session_get_param(cls_sess, param, buf);
@@ -2242,6 +2242,7 @@ static int qla4xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
             test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags) ||
             !test_bit(AF_ONLINE, &ha->flags) ||
             !test_bit(AF_LINK_UP, &ha->flags) ||
+            test_bit(AF_LOOPBACK, &ha->flags) ||
             test_bit(DPC_RESET_HA_FW_CONTEXT, &ha->dpc_flags))
                 goto qc_host_busy;
 
@@ -2978,6 +2979,7 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)
                 if (status == QLA_SUCCESS) {
                         if (!test_bit(AF_FW_RECOVERY, &ha->flags))
                                 qla4xxx_cmd_wait(ha);
+
                         ha->isp_ops->disable_intrs(ha);
                         qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
                         qla4xxx_abort_active_cmds(ha, DID_RESET << 16);
@@ -3479,7 +3481,8 @@ dpc_post_reset_ha:
         }
 
         /* ---- link change? --- */
-        if (test_and_clear_bit(DPC_LINK_CHANGED, &ha->dpc_flags)) {
+        if (!test_bit(AF_LOOPBACK, &ha->flags) &&
+            test_and_clear_bit(DPC_LINK_CHANGED, &ha->dpc_flags)) {
                 if (!test_bit(AF_LINK_UP, &ha->flags)) {
                         /* ---- link down? --- */
                         qla4xxx_mark_all_devices_missing(ha);
@@ -3508,10 +3511,8 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
 {
         qla4xxx_abort_active_cmds(ha, DID_NO_CONNECT << 16);
 
-        if (test_bit(AF_INTERRUPTS_ON, &ha->flags)) {
-                /* Turn-off interrupts on the card. */
-                ha->isp_ops->disable_intrs(ha);
-        }
+        /* Turn-off interrupts on the card. */
+        ha->isp_ops->disable_intrs(ha);
 
         if (is_qla40XX(ha)) {
                 writel(set_rmask(CSR_SCSI_PROCESSOR_INTR),
@@ -3547,8 +3548,7 @@ static void qla4xxx_free_adapter(struct scsi_qla_host *ha)
         }
 
         /* Detach interrupts */
-        if (test_and_clear_bit(AF_IRQ_ATTACHED, &ha->flags))
-                qla4xxx_free_irqs(ha);
+        qla4xxx_free_irqs(ha);
 
         /* free extra memory */
         qla4xxx_mem_free(ha);
@@ -4687,7 +4687,8 @@ static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha,
         struct iscsi_endpoint *ep;
         struct sockaddr_in *addr;
         struct sockaddr_in6 *addr6;
-        struct sockaddr *dst_addr;
+        struct sockaddr *t_addr;
+        struct sockaddr_storage *dst_addr;
         char *ip;
 
         /* TODO: need to destroy on unload iscsi_endpoint*/
@@ -4696,21 +4697,23 @@ static struct iscsi_endpoint *qla4xxx_get_ep_fwdb(struct scsi_qla_host *ha,
                 return NULL;
 
         if (fw_ddb_entry->options & DDB_OPT_IPV6_DEVICE) {
-                dst_addr->sa_family = AF_INET6;
+                t_addr = (struct sockaddr *)dst_addr;
+                t_addr->sa_family = AF_INET6;
                 addr6 = (struct sockaddr_in6 *)dst_addr;
                 ip = (char *)&addr6->sin6_addr;
                 memcpy(ip, fw_ddb_entry->ip_addr, IPv6_ADDR_LEN);
                 addr6->sin6_port = htons(le16_to_cpu(fw_ddb_entry->port));
 
         } else {
-                dst_addr->sa_family = AF_INET;
+                t_addr = (struct sockaddr *)dst_addr;
+                t_addr->sa_family = AF_INET;
                 addr = (struct sockaddr_in *)dst_addr;
                 ip = (char *)&addr->sin_addr;
                 memcpy(ip, fw_ddb_entry->ip_addr, IP_ADDR_LEN);
                 addr->sin_port = htons(le16_to_cpu(fw_ddb_entry->port));
         }
 
-        ep = qla4xxx_ep_connect(ha->host, dst_addr, 0);
+        ep = qla4xxx_ep_connect(ha->host, (struct sockaddr *)dst_addr, 0);
         vfree(dst_addr);
         return ep;
 }
@@ -4725,7 +4728,8 @@ static int qla4xxx_verify_boot_idx(struct scsi_qla_host *ha, uint16_t idx)
 }
 
 static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
-                                          struct ddb_entry *ddb_entry)
+                                          struct ddb_entry *ddb_entry,
+                                          uint16_t idx)
 {
         uint16_t def_timeout;
 
@@ -4745,6 +4749,10 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
                 def_timeout : LOGIN_TOV;
         ddb_entry->default_time2wait =
                 le16_to_cpu(ddb_entry->fw_ddb_entry.iscsi_def_time2wait);
+
+        if (ql4xdisablesysfsboot &&
+            (idx == ha->pri_ddb_idx || idx == ha->sec_ddb_idx))
+                set_bit(DF_BOOT_TGT, &ddb_entry->flags);
 }
 
 static void qla4xxx_wait_for_ip_configuration(struct scsi_qla_host *ha)
@@ -4881,7 +4889,7 @@ static void qla4xxx_remove_failed_ddb(struct scsi_qla_host *ha,
 
 static int qla4xxx_sess_conn_setup(struct scsi_qla_host *ha,
                                    struct dev_db_entry *fw_ddb_entry,
-                                   int is_reset)
+                                   int is_reset, uint16_t idx)
 {
         struct iscsi_cls_session *cls_sess;
         struct iscsi_session *sess;
@@ -4919,7 +4927,7 @@ static int qla4xxx_sess_conn_setup(struct scsi_qla_host *ha,
         memcpy(&ddb_entry->fw_ddb_entry, fw_ddb_entry,
                sizeof(struct dev_db_entry));
 
-        qla4xxx_setup_flash_ddb_entry(ha, ddb_entry);
+        qla4xxx_setup_flash_ddb_entry(ha, ddb_entry, idx);
 
         cls_conn = iscsi_conn_setup(cls_sess, sizeof(struct qla_conn), conn_id);
 
@@ -5036,7 +5044,7 @@ static void qla4xxx_build_nt_list(struct scsi_qla_host *ha,
                                 goto continue_next_nt;
                 }
 
-                ret = qla4xxx_sess_conn_setup(ha, fw_ddb_entry, is_reset);
+                ret = qla4xxx_sess_conn_setup(ha, fw_ddb_entry, is_reset, idx);
                 if (ret == QLA_ERROR)
                         goto exit_nt_list;
 
@@ -5116,6 +5124,78 @@ void qla4xxx_build_ddb_list(struct scsi_qla_host *ha, int is_reset)
 }
 
 /**
+ * qla4xxx_wait_login_resp_boot_tgt -  Wait for iSCSI boot target login
+ * response.
+ * @ha: pointer to adapter structure
+ *
+ * When the boot entry is normal iSCSI target then DF_BOOT_TGT flag will be
+ * set in DDB and we will wait for login response of boot targets during
+ * probe.
+ **/
+static void qla4xxx_wait_login_resp_boot_tgt(struct scsi_qla_host *ha)
+{
+        struct ddb_entry *ddb_entry;
+        struct dev_db_entry *fw_ddb_entry = NULL;
+        dma_addr_t fw_ddb_entry_dma;
+        unsigned long wtime;
+        uint32_t ddb_state;
+        int max_ddbs, idx, ret;
+
+        max_ddbs =  is_qla40XX(ha) ? MAX_DEV_DB_ENTRIES_40XX :
+                                     MAX_DEV_DB_ENTRIES;
+
+        fw_ddb_entry = dma_alloc_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
+                                          &fw_ddb_entry_dma, GFP_KERNEL);
+        if (!fw_ddb_entry) {
+                ql4_printk(KERN_ERR, ha,
+                           "%s: Unable to allocate dma buffer\n", __func__);
+                goto exit_login_resp;
+        }
+
+        wtime = jiffies + (HZ * BOOT_LOGIN_RESP_TOV);
+
+        for (idx = 0; idx < max_ddbs; idx++) {
+                ddb_entry = qla4xxx_lookup_ddb_by_fw_index(ha, idx);
+                if (ddb_entry == NULL)
+                        continue;
+
+                if (test_bit(DF_BOOT_TGT, &ddb_entry->flags)) {
+                        DEBUG2(ql4_printk(KERN_INFO, ha,
+                                          "%s: DDB index [%d]\n", __func__,
+                                          ddb_entry->fw_ddb_index));
+                        do {
+                                ret = qla4xxx_get_fwddb_entry(ha,
+                                                ddb_entry->fw_ddb_index,
+                                                fw_ddb_entry, fw_ddb_entry_dma,
+                                                NULL, NULL, &ddb_state, NULL,
+                                                NULL, NULL);
+                                if (ret == QLA_ERROR)
+                                        goto exit_login_resp;
+
+                                if ((ddb_state == DDB_DS_SESSION_ACTIVE) ||
+                                    (ddb_state == DDB_DS_SESSION_FAILED))
+                                        break;
+
+                                schedule_timeout_uninterruptible(HZ);
+
+                        } while ((time_after(wtime, jiffies)));
+
+                        if (!time_after(wtime, jiffies)) {
+                                DEBUG2(ql4_printk(KERN_INFO, ha,
+                                                  "%s: Login response wait timer expired\n",
+                                                  __func__));
+                                 goto exit_login_resp;
+                        }
+                }
+        }
+
+exit_login_resp:
+        if (fw_ddb_entry)
+                dma_free_coherent(&ha->pdev->dev, sizeof(*fw_ddb_entry),
+                                  fw_ddb_entry, fw_ddb_entry_dma);
+}
+
+/**
  * qla4xxx_probe_adapter - callback function to probe HBA
  * @pdev: pointer to pci_dev structure
  * @pci_device_id: pointer to pci_device entry
@@ -5270,7 +5350,7 @@ static int qla4xxx_probe_adapter(struct pci_dev *pdev,
                 if (is_qla80XX(ha)) {
                         ha->isp_ops->idc_lock(ha);
                         dev_state = qla4_8xxx_rd_direct(ha,
-                                                        QLA82XX_CRB_DEV_STATE);
+                                                        QLA8XXX_CRB_DEV_STATE);
                         ha->isp_ops->idc_unlock(ha);
                         if (dev_state == QLA8XXX_DEV_FAILED) {
                                 ql4_printk(KERN_WARNING, ha, "%s: don't retry "
@@ -5368,6 +5448,7 @@ skip_retry_init:
                 /* Perform the build ddb list and login to each */
         qla4xxx_build_ddb_list(ha, INIT_ADAPTER);
         iscsi_host_for_each_session(ha->host, qla4xxx_login_flash_ddb);
+        qla4xxx_wait_login_resp_boot_tgt(ha);
 
         qla4xxx_create_chap_list(ha);
 
@@ -6008,14 +6089,6 @@ static int qla4xxx_host_reset(struct Scsi_Host *shost, int reset_type)
                 goto exit_host_reset;
         }
 
-        rval = qla4xxx_wait_for_hba_online(ha);
-        if (rval != QLA_SUCCESS) {
-                DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Unable to reset host "
-                                  "adapter\n", __func__));
-                rval = -EIO;
-                goto exit_host_reset;
-        }
-
         if (test_bit(DPC_RESET_HA, &ha->dpc_flags))
                 goto recover_adapter;
 
@@ -6115,7 +6188,6 @@ qla4xxx_pci_mmio_enabled(struct pci_dev *pdev)
 static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)
 {
         uint32_t rval = QLA_ERROR;
-        uint32_t ret = 0;
         int fn;
         struct pci_dev *other_pdev = NULL;
 
@@ -6201,16 +6273,7 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)
                         qla4_8xxx_wr_direct(ha, QLA8XXX_CRB_DRV_STATE, 0);
                         qla4_8xxx_set_drv_active(ha);
                         ha->isp_ops->idc_unlock(ha);
-                        ret = qla4xxx_request_irqs(ha);
-                        if (ret) {
-                                ql4_printk(KERN_WARNING, ha, "Failed to "
-                                    "reserve interrupt %d already in use.\n",
-                                    ha->pdev->irq);
-                                rval = QLA_ERROR;
-                        } else {
-                                ha->isp_ops->enable_intrs(ha);
-                                rval = QLA_SUCCESS;
-                        }
+                        ha->isp_ops->enable_intrs(ha);
                 }
         } else {
                 ql4_printk(KERN_INFO, ha, "scsi%ld: %s: devfn 0x%x is not "
@@ -6220,18 +6283,9 @@ static uint32_t qla4_8xxx_error_recovery(struct scsi_qla_host *ha)
                      QLA8XXX_DEV_READY)) {
                         clear_bit(AF_FW_RECOVERY, &ha->flags);
                         rval = qla4xxx_initialize_adapter(ha, RESET_ADAPTER);
-                        if (rval == QLA_SUCCESS) {
-                                ret = qla4xxx_request_irqs(ha);
-                                if (ret) {
-                                        ql4_printk(KERN_WARNING, ha, "Failed to"
-                                            " reserve interrupt %d already in"
-                                            " use.\n", ha->pdev->irq);
-                                        rval = QLA_ERROR;
-                                } else {
-                                        ha->isp_ops->enable_intrs(ha);
-                                        rval = QLA_SUCCESS;
-                                }
-                        }
+                        if (rval == QLA_SUCCESS)
+                                ha->isp_ops->enable_intrs(ha);
+
                         ha->isp_ops->idc_lock(ha);
                         qla4_8xxx_set_drv_active(ha);
                         ha->isp_ops->idc_unlock(ha);