6 files changed, 189 insertions, 37 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 05f4f2a378eb..e8948b679f5b 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1478,14 +1478,17 @@ typedef union {
         uint32_t b24 : 24;
 
         struct {
-                uint8_t d_id[3];
-                uint8_t rsvd_1;
-        } r;
-
-        struct {
+#ifdef __BIG_ENDIAN
+                uint8_t domain;
+                uint8_t area;
+                uint8_t al_pa;
+#elif __LITTLE_ENDIAN
                 uint8_t al_pa;
                 uint8_t area;
                 uint8_t domain;
+#else
+#error "__BIG_ENDIAN or __LITTLE_ENDIAN must be defined!"
+#endif
                 uint8_t rsvd_1;
         } b;
 } port_id_t;
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 98c01cd5e1a8..3e296ab845b6 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -11,6 +11,11 @@
 
 #include "qla_devtbl.h"
 
+#ifdef CONFIG_SPARC
+#include <asm/prom.h>
+#include <asm/pbm.h>
+#endif
+
 /* XXX(hch): this is ugly, but we don't want to pull in exioctl.h */
 #ifndef EXT_IS_LUN_BIT_SET
 #define EXT_IS_LUN_BIT_SET(P,L) \
@@ -88,12 +93,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
 
         qla_printk(KERN_INFO, ha, "Configure NVRAM parameters...\n");
 
-        rval = ha->isp_ops.nvram_config(ha);
-        if (rval) {
-                DEBUG2(printk("scsi(%ld): Unable to verify NVRAM data.\n",
-                    ha->host_no));
-                return rval;
-        }
+        ha->isp_ops.nvram_config(ha);
 
         if (ha->flags.disable_serdes) {
                 /* Mask HBA via NVRAM settings? */
@@ -1393,6 +1393,28 @@ qla2x00_set_model_info(scsi_qla_host_t *ha, uint8_t *model, size_t len, char *de
         }
 }
 
+/* On sparc systems, obtain port and node WWN from firmware
+ * properties.
+ */
+static void qla2xxx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, nvram_t *nv)
+{
+#ifdef CONFIG_SPARC
+        struct pci_dev *pdev = ha->pdev;
+        struct pcidev_cookie *pcp = pdev->sysdata;
+        struct device_node *dp = pcp->prom_node;
+        u8 *val;
+        int len;
+
+        val = of_get_property(dp, "port-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->port_name, val, WWN_SIZE);
+
+        val = of_get_property(dp, "node-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->node_name, val, WWN_SIZE);
+#endif
+}
+
 /*
 * NVRAM configuration for ISP 2xxx
 *
@@ -1409,6 +1431,7 @@ qla2x00_set_model_info(scsi_qla_host_t *ha, uint8_t *model, size_t len, char *de
 int
 qla2x00_nvram_config(scsi_qla_host_t *ha)
 {
+        int             rval;
         uint8_t         chksum = 0;
         uint16_t        cnt;
         uint8_t         *dptr1, *dptr2;
@@ -1417,6 +1440,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         uint8_t         *ptr = (uint8_t *)ha->request_ring;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
+        rval = QLA_SUCCESS;
+
         /* Determine NVRAM starting address. */
         ha->nvram_size = sizeof(nvram_t);
         ha->nvram_base = 0;
@@ -1440,7 +1465,57 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
                 qla_printk(KERN_WARNING, ha, "Inconsistent NVRAM detected: "
                     "checksum=0x%x id=%c version=0x%x.\n", chksum, nv->id[0],
                     nv->nvram_version);
-                return QLA_FUNCTION_FAILED;
+                qla_printk(KERN_WARNING, ha, "Falling back to functioning (yet "
+                    "invalid -- WWPN) defaults.\n");
+
+                /*
+                 * Set default initialization control block.
+                 */
+                memset(nv, 0, ha->nvram_size);
+                nv->parameter_block_version = ICB_VERSION;
+
+                if (IS_QLA23XX(ha)) {
+                        nv->firmware_options[0] = BIT_2 | BIT_1;
+                        nv->firmware_options[1] = BIT_7 | BIT_5;
+                        nv->add_firmware_options[0] = BIT_5;
+                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
+                        nv->frame_payload_size = __constant_cpu_to_le16(2048);
+                        nv->special_options[1] = BIT_7;
+                } else if (IS_QLA2200(ha)) {
+                        nv->firmware_options[0] = BIT_2 | BIT_1;
+                        nv->firmware_options[1] = BIT_7 | BIT_5;
+                        nv->add_firmware_options[0] = BIT_5;
+                        nv->add_firmware_options[1] = BIT_5 | BIT_4;
+                        nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                } else if (IS_QLA2100(ha)) {
+                        nv->firmware_options[0] = BIT_3 | BIT_1;
+                        nv->firmware_options[1] = BIT_5;
+                        nv->frame_payload_size = __constant_cpu_to_le16(1024);
+                }
+
+                nv->max_iocb_allocation = __constant_cpu_to_le16(256);
+                nv->execution_throttle = __constant_cpu_to_le16(16);
+                nv->retry_count = 8;
+                nv->retry_delay = 1;
+
+                nv->port_name[0] = 33;
+                nv->port_name[3] = 224;
+                nv->port_name[4] = 139;
+
+                qla2xxx_nvram_wwn_from_ofw(ha, nv);
+
+                nv->login_timeout = 4;
+
+                /*
+                 * Set default host adapter parameters
+                 */
+                nv->host_p[1] = BIT_2;
+                nv->reset_delay = 5;
+                nv->port_down_retry_count = 8;
+                nv->max_luns_per_target = __constant_cpu_to_le16(8);
+                nv->link_down_timeout = 60;
+
+                rval = 1;
         }
 
 #if defined(CONFIG_IA64_GENERIC) || defined(CONFIG_IA64_SGI_SN2)
@@ -1653,7 +1728,11 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
                 }
         }
 
-        return QLA_SUCCESS;
+        if (rval) {
+                DEBUG2_3(printk(KERN_WARNING
+                    "scsi(%ld): NVRAM configuration failed!\n", ha->host_no));
+        }
+        return (rval);
 }
 
 static void
@@ -3071,9 +3150,7 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
 
                 ha->isp_ops.get_flash_version(ha, ha->request_ring);
 
-                rval = ha->isp_ops.nvram_config(ha);
-                if (rval)
-                        goto isp_abort_retry;
+                ha->isp_ops.nvram_config(ha);
 
                 if (!qla2x00_restart_isp(ha)) {
                         clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
@@ -3103,7 +3180,6 @@ qla2x00_abort_isp(scsi_qla_host_t *ha)
                                 }
                         }
                 } else {        /* failed the ISP abort */
-isp_abort_retry:
                         ha->flags.online = 1;
                         if (test_bit(ISP_ABORT_RETRY, &ha->dpc_flags)) {
                                 if (ha->isp_abort_cnt == 0) {
@@ -3290,9 +3366,32 @@ qla24xx_reset_adapter(scsi_qla_host_t *ha)
         spin_unlock_irqrestore(&ha->hardware_lock, flags);
 }
 
+/* On sparc systems, obtain port and node WWN from firmware
+ * properties.
+ */
+static void qla24xx_nvram_wwn_from_ofw(scsi_qla_host_t *ha, struct nvram_24xx *nv)
+{
+#ifdef CONFIG_SPARC
+        struct pci_dev *pdev = ha->pdev;
+        struct pcidev_cookie *pcp = pdev->sysdata;
+        struct device_node *dp = pcp->prom_node;
+        u8 *val;
+        int len;
+
+        val = of_get_property(dp, "port-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->port_name, val, WWN_SIZE);
+
+        val = of_get_property(dp, "node-wwn", &len);
+        if (val && len >= WWN_SIZE)
+                memcpy(nv->node_name, val, WWN_SIZE);
+#endif
+}
+
 int
 qla24xx_nvram_config(scsi_qla_host_t *ha)
 {
+        int   rval;
         struct init_cb_24xx *icb;
         struct nvram_24xx *nv;
         uint32_t *dptr;
@@ -3300,6 +3399,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
         uint32_t chksum;
         uint16_t cnt;
 
+        rval = QLA_SUCCESS;
         icb = (struct init_cb_24xx *)ha->init_cb;
         nv = (struct nvram_24xx *)ha->request_ring;
 
@@ -3332,7 +3432,52 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                 qla_printk(KERN_WARNING, ha, "Inconsistent NVRAM detected: "
                     "checksum=0x%x id=%c version=0x%x.\n", chksum, nv->id[0],
                     le16_to_cpu(nv->nvram_version));
-                return QLA_FUNCTION_FAILED;
+                qla_printk(KERN_WARNING, ha, "Falling back to functioning (yet "
+                    "invalid -- WWPN) defaults.\n");
+
+                /*
+                 * Set default initialization control block.
+                 */
+                memset(nv, 0, ha->nvram_size);
+                nv->nvram_version = __constant_cpu_to_le16(ICB_VERSION);
+                nv->version = __constant_cpu_to_le16(ICB_VERSION);
+                nv->frame_payload_size = __constant_cpu_to_le16(2048);
+                nv->execution_throttle = __constant_cpu_to_le16(0xFFFF);
+                nv->exchange_count = __constant_cpu_to_le16(0);
+                nv->hard_address = __constant_cpu_to_le16(124);
+                nv->port_name[0] = 0x21;
+                nv->port_name[1] = 0x00 + PCI_FUNC(ha->pdev->devfn);
+                nv->port_name[2] = 0x00;
+                nv->port_name[3] = 0xe0;
+                nv->port_name[4] = 0x8b;
+                nv->port_name[5] = 0x1c;
+                nv->port_name[6] = 0x55;
+                nv->port_name[7] = 0x86;
+                nv->node_name[0] = 0x20;
+                nv->node_name[1] = 0x00;
+                nv->node_name[2] = 0x00;
+                nv->node_name[3] = 0xe0;
+                nv->node_name[4] = 0x8b;
+                nv->node_name[5] = 0x1c;
+                nv->node_name[6] = 0x55;
+                nv->node_name[7] = 0x86;
+                qla24xx_nvram_wwn_from_ofw(ha, nv);
+                nv->login_retry_count = __constant_cpu_to_le16(8);
+                nv->interrupt_delay_timer = __constant_cpu_to_le16(0);
+                nv->login_timeout = __constant_cpu_to_le16(0);
+                nv->firmware_options_1 =
+                    __constant_cpu_to_le32(BIT_14|BIT_13|BIT_2|BIT_1);
+                nv->firmware_options_2 = __constant_cpu_to_le32(2 << 4);
+                nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_12);
+                nv->firmware_options_3 = __constant_cpu_to_le32(2 << 13);
+                nv->host_p = __constant_cpu_to_le32(BIT_11|BIT_10);
+                nv->efi_parameters = __constant_cpu_to_le32(0);
+                nv->reset_delay = 5;
+                nv->max_luns_per_target = __constant_cpu_to_le16(128);
+                nv->port_down_retry_count = __constant_cpu_to_le16(30);
+                nv->link_down_timeout = __constant_cpu_to_le16(30);
+
+                rval = 1;
         }
 
         /* Reset Initialization control block */
@@ -3479,7 +3624,11 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
                 ha->flags.process_response_queue = 1;
         }
 
-        return QLA_SUCCESS;
+        if (rval) {
+                DEBUG2_3(printk(KERN_WARNING
+                    "scsi(%ld): NVRAM configuration failed!\n", ha->host_no));
+        }
+        return (rval);
 }
 
 static int
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 83376f6ac3db..71e32a248528 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1280,14 +1280,14 @@ qla2x00_get_port_name(scsi_qla_host_t *ha, uint16_t loop_id, uint8_t *name,
         } else {
                 if (name != NULL) {
                         /* This function returns name in big endian. */
-                        name[0] = LSB(mcp->mb[2]);
-                        name[1] = MSB(mcp->mb[2]);
-                        name[2] = LSB(mcp->mb[3]);
-                        name[3] = MSB(mcp->mb[3]);
-                        name[4] = LSB(mcp->mb[6]);
-                        name[5] = MSB(mcp->mb[6]);
-                        name[6] = LSB(mcp->mb[7]);
-                        name[7] = MSB(mcp->mb[7]);
+                        name[0] = MSB(mcp->mb[2]);
+                        name[1] = LSB(mcp->mb[2]);
+                        name[2] = MSB(mcp->mb[3]);
+                        name[3] = LSB(mcp->mb[3]);
+                        name[4] = MSB(mcp->mb[6]);
+                        name[5] = LSB(mcp->mb[6]);
+                        name[6] = MSB(mcp->mb[7]);
+                        name[7] = LSB(mcp->mb[7]);
                 }
 
                 DEBUG11(printk("qla2x00_get_port_name(%ld): done.\n",
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 68f5d24b938b..b78919a318e2 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -62,7 +62,7 @@ MODULE_PARM_DESC(ql2xallocfwdump,
                 "vary by ISP type.  Default is 1 - allocate memory.");
 
 int ql2xextended_error_logging;
-module_param(ql2xextended_error_logging, int, S_IRUGO|S_IRUSR);
+module_param(ql2xextended_error_logging, int, S_IRUGO|S_IWUSR);
 MODULE_PARM_DESC(ql2xextended_error_logging,
                 "Option to enable extended error logging, "
                 "Default is 0 - no logging. 1 - log errors.");
@@ -157,6 +157,8 @@ static struct scsi_host_template qla24xx_driver_template = {
 
         .slave_alloc            = qla2xxx_slave_alloc,
         .slave_destroy          = qla2xxx_slave_destroy,
+        .scan_finished          = qla2xxx_scan_finished,
+        .scan_start             = qla2xxx_scan_start,
         .change_queue_depth     = qla2x00_change_queue_depth,
         .change_queue_type      = qla2x00_change_queue_type,
         .this_id                = -1,
@@ -1705,6 +1707,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
 
         scsi_host_put(ha->host);
 
+        pci_disable_device(pdev);
         pci_set_drvdata(pdev, NULL);
 }
 
@@ -1747,8 +1750,6 @@ qla2x00_free_device(scsi_qla_host_t *ha)
         if (ha->iobase)
                 iounmap(ha->iobase);
         pci_release_regions(ha->pdev);
-
-        pci_disable_device(ha->pdev);
 }
 
 static inline void
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index ff1dd4175a7f..206bda093da2 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -466,6 +466,7 @@ qla24xx_read_flash_dword(scsi_qla_host_t *ha, uint32_t addr)
                         udelay(10);
                 else
                         rval = QLA_FUNCTION_TIMEOUT;
+                cond_resched();
         }
 
         /* TODO: What happens if we time out? */
@@ -508,6 +509,7 @@ qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data)
                         udelay(10);
                 else
                         rval = QLA_FUNCTION_TIMEOUT;
+                cond_resched();
         }
         return rval;
 }
@@ -1255,6 +1257,7 @@ qla2x00_poll_flash(scsi_qla_host_t *ha, uint32_t addr, uint8_t poll_data,
                 }
                 udelay(10);
                 barrier();
+                cond_resched();
         }
         return status;
 }
@@ -1403,6 +1406,7 @@ qla2x00_read_flash_data(scsi_qla_host_t *ha, uint8_t *tmp_buf, uint32_t saddr,
                 if (saddr % 100)
                         udelay(10);
                 *tmp_buf = data;
+                cond_resched();
         }
 }
 
@@ -1449,7 +1453,6 @@ uint8_t *
 qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
     uint32_t offset, uint32_t length)
 {
-        unsigned long flags;
         uint32_t addr, midpoint;
         uint8_t *data;
         struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
@@ -1458,7 +1461,6 @@ qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
         qla2x00_suspend_hba(ha);
 
         /* Go with read. */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         midpoint = ha->optrom_size / 2;
 
         qla2x00_flash_enable(ha);
@@ -1473,7 +1475,6 @@ qla2x00_read_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
                 *data = qla2x00_read_flash_byte(ha, addr);
         }
         qla2x00_flash_disable(ha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Resume HBA. */
         qla2x00_resume_hba(ha);
@@ -1487,7 +1488,6 @@ qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
 {
 
         int rval;
-        unsigned long flags;
         uint8_t man_id, flash_id, sec_number, data;
         uint16_t wd;
         uint32_t addr, liter, sec_mask, rest_addr;
@@ -1500,7 +1500,6 @@ qla2x00_write_optrom_data(struct scsi_qla_host *ha, uint8_t *buf,
         sec_number = 0;
 
         /* Reset ISP chip. */
-        spin_lock_irqsave(&ha->hardware_lock, flags);
         WRT_REG_WORD(&reg->ctrl_status, CSR_ISP_SOFT_RESET);
         pci_read_config_word(ha->pdev, PCI_COMMAND, &wd);
 
@@ -1689,10 +1688,10 @@ update_flash:
                                 rval = QLA_FUNCTION_FAILED;
                                 break;
                         }
+                        cond_resched();
                 }
         } while (0);
         qla2x00_flash_disable(ha);
-        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         /* Resume HBA. */
         qla2x00_resume_hba(ha);
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 61347aee55ce..dc85495c337f 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -7,7 +7,7 @@
 /*
  * Driver version
  */
-#define QLA2XXX_VERSION      "8.01.07-k5"
+#define QLA2XXX_VERSION      "8.01.07-k6"
 
 #define QLA_DRIVER_MAJOR_VER    8
 #define QLA_DRIVER_MINOR_VER    1