[SCSI] bfa: fix compilation warning in powerpc
[safe/jmp/linux-2.6] / drivers / scsi / ipr.c
index 359882e..520461b 100644 (file)
@@ -59,6 +59,7 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
@@ -72,6 +73,8 @@
 #include <linux/moduleparam.h>
 #include <linux/libata.h>
 #include <linux/hdreg.h>
+#include <linux/reboot.h>
+#include <linux/stringify.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/processor.h>
@@ -91,8 +94,8 @@ static unsigned int ipr_max_speed = 1;
 static int ipr_testmode = 0;
 static unsigned int ipr_fastfail = 0;
 static unsigned int ipr_transop_timeout = 0;
-static unsigned int ipr_enable_cache = 1;
 static unsigned int ipr_debug = 0;
+static unsigned int ipr_max_devs = IPR_DEFAULT_SIS64_DEVS;
 static unsigned int ipr_dual_ioa_raid = 1;
 static DEFINE_SPINLOCK(ipr_driver_lock);
 
@@ -104,13 +107,20 @@ static const struct ipr_chip_cfg_t ipr_chip_cfg[] = {
                {
                        .set_interrupt_mask_reg = 0x0022C,
                        .clr_interrupt_mask_reg = 0x00230,
+                       .clr_interrupt_mask_reg32 = 0x00230,
                        .sense_interrupt_mask_reg = 0x0022C,
+                       .sense_interrupt_mask_reg32 = 0x0022C,
                        .clr_interrupt_reg = 0x00228,
+                       .clr_interrupt_reg32 = 0x00228,
                        .sense_interrupt_reg = 0x00224,
+                       .sense_interrupt_reg32 = 0x00224,
                        .ioarrin_reg = 0x00404,
                        .sense_uproc_interrupt_reg = 0x00214,
+                       .sense_uproc_interrupt_reg32 = 0x00214,
                        .set_uproc_interrupt_reg = 0x00214,
-                       .clr_uproc_interrupt_reg = 0x00218
+                       .set_uproc_interrupt_reg32 = 0x00214,
+                       .clr_uproc_interrupt_reg = 0x00218,
+                       .clr_uproc_interrupt_reg32 = 0x00218
                }
        },
        { /* Snipe and Scamp */
@@ -119,13 +129,45 @@ static const struct ipr_chip_cfg_t ipr_chip_cfg[] = {
                {
                        .set_interrupt_mask_reg = 0x00288,
                        .clr_interrupt_mask_reg = 0x0028C,
+                       .clr_interrupt_mask_reg32 = 0x0028C,
                        .sense_interrupt_mask_reg = 0x00288,
+                       .sense_interrupt_mask_reg32 = 0x00288,
                        .clr_interrupt_reg = 0x00284,
+                       .clr_interrupt_reg32 = 0x00284,
                        .sense_interrupt_reg = 0x00280,
+                       .sense_interrupt_reg32 = 0x00280,
                        .ioarrin_reg = 0x00504,
                        .sense_uproc_interrupt_reg = 0x00290,
+                       .sense_uproc_interrupt_reg32 = 0x00290,
                        .set_uproc_interrupt_reg = 0x00290,
-                       .clr_uproc_interrupt_reg = 0x00294
+                       .set_uproc_interrupt_reg32 = 0x00290,
+                       .clr_uproc_interrupt_reg = 0x00294,
+                       .clr_uproc_interrupt_reg32 = 0x00294
+               }
+       },
+       { /* CRoC */
+               .mailbox = 0x00040,
+               .cache_line_size = 0x20,
+               {
+                       .set_interrupt_mask_reg = 0x00010,
+                       .clr_interrupt_mask_reg = 0x00018,
+                       .clr_interrupt_mask_reg32 = 0x0001C,
+                       .sense_interrupt_mask_reg = 0x00010,
+                       .sense_interrupt_mask_reg32 = 0x00014,
+                       .clr_interrupt_reg = 0x00008,
+                       .clr_interrupt_reg32 = 0x0000C,
+                       .sense_interrupt_reg = 0x00000,
+                       .sense_interrupt_reg32 = 0x00004,
+                       .ioarrin_reg = 0x00070,
+                       .sense_uproc_interrupt_reg = 0x00020,
+                       .sense_uproc_interrupt_reg32 = 0x00024,
+                       .set_uproc_interrupt_reg = 0x00020,
+                       .set_uproc_interrupt_reg32 = 0x00024,
+                       .clr_uproc_interrupt_reg = 0x00028,
+                       .clr_uproc_interrupt_reg32 = 0x0002C,
+                       .init_feedback_reg = 0x0005C,
+                       .dump_addr_reg = 0x00064,
+                       .dump_data_reg = 0x00068
                }
        },
 };
@@ -137,7 +179,9 @@ static const struct ipr_chip_t ipr_chip[] = {
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[0] },
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E, IPR_USE_MSI, IPR_SIS32, &ipr_chip_cfg[0] },
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[1] },
-       { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[1] }
+       { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[1] },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2, IPR_USE_MSI, IPR_SIS64, &ipr_chip_cfg[2] },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2, IPR_USE_MSI, IPR_SIS64, &ipr_chip_cfg[2] }
 };
 
 static int ipr_max_bus_speeds [] = {
@@ -156,12 +200,13 @@ module_param_named(fastfail, ipr_fastfail, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(fastfail, "Reduce timeouts and retries");
 module_param_named(transop_timeout, ipr_transop_timeout, int, 0);
 MODULE_PARM_DESC(transop_timeout, "Time in seconds to wait for adapter to come operational (default: 300)");
-module_param_named(enable_cache, ipr_enable_cache, int, 0);
-MODULE_PARM_DESC(enable_cache, "Enable adapter's non-volatile write cache (default: 1)");
 module_param_named(debug, ipr_debug, int, S_IRUGO | S_IWUSR);
 MODULE_PARM_DESC(debug, "Enable device driver debugging logging. Set to 1 to enable. (default: 0)");
 module_param_named(dual_ioa_raid, ipr_dual_ioa_raid, int, 0);
 MODULE_PARM_DESC(dual_ioa_raid, "Enable dual adapter RAID support. Set to 1 to enable. (default: 1)");
+module_param_named(max_devs, ipr_max_devs, int, 0);
+MODULE_PARM_DESC(max_devs, "Specify the maximum number of physical devices. "
+                "[Default=" __stringify(IPR_DEFAULT_SIS64_DEVS) "]");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(IPR_DRIVER_VERSION);
 
@@ -180,6 +225,20 @@ struct ipr_error_table_t ipr_error_table[] = {
        "FFFE: Soft device bus error recovered by the IOA"},
        {0x01088100, 0, IPR_DEFAULT_LOG_LEVEL,
        "4101: Soft device bus fabric error"},
+       {0x01100100, 0, IPR_DEFAULT_LOG_LEVEL,
+       "FFFC: Logical block guard error recovered by the device"},
+       {0x01100300, 0, IPR_DEFAULT_LOG_LEVEL,
+       "FFFC: Logical block reference tag error recovered by the device"},
+       {0x01108300, 0, IPR_DEFAULT_LOG_LEVEL,
+       "4171: Recovered scatter list tag / sequence number error"},
+       {0x01109000, 0, IPR_DEFAULT_LOG_LEVEL,
+       "FF3D: Recovered logical block CRC error on IOA to Host transfer"},
+       {0x01109200, 0, IPR_DEFAULT_LOG_LEVEL,
+       "4171: Recovered logical block sequence number error on IOA to Host transfer"},
+       {0x0110A000, 0, IPR_DEFAULT_LOG_LEVEL,
+       "FFFD: Recovered logical block reference tag error detected by the IOA"},
+       {0x0110A100, 0, IPR_DEFAULT_LOG_LEVEL,
+       "FFFD: Logical block guard error recovered by the IOA"},
        {0x01170600, 0, IPR_DEFAULT_LOG_LEVEL,
        "FFF9: Device sector reassign successful"},
        {0x01170900, 0, IPR_DEFAULT_LOG_LEVEL,
@@ -236,12 +295,28 @@ struct ipr_error_table_t ipr_error_table[] = {
        "3120: SCSI bus is not operational"},
        {0x04088100, 0, IPR_DEFAULT_LOG_LEVEL,
        "4100: Hard device bus fabric error"},
+       {0x04100100, 0, IPR_DEFAULT_LOG_LEVEL,
+       "310C: Logical block guard error detected by the device"},
+       {0x04100300, 0, IPR_DEFAULT_LOG_LEVEL,
+       "310C: Logical block reference tag error detected by the device"},
+       {0x04108300, 1, IPR_DEFAULT_LOG_LEVEL,
+       "4170: Scatter list tag / sequence number error"},
+       {0x04109000, 1, IPR_DEFAULT_LOG_LEVEL,
+       "8150: Logical block CRC error on IOA to Host transfer"},
+       {0x04109200, 1, IPR_DEFAULT_LOG_LEVEL,
+       "4170: Logical block sequence number error on IOA to Host transfer"},
+       {0x0410A000, 0, IPR_DEFAULT_LOG_LEVEL,
+       "310D: Logical block reference tag error detected by the IOA"},
+       {0x0410A100, 0, IPR_DEFAULT_LOG_LEVEL,
+       "310D: Logical block guard error detected by the IOA"},
        {0x04118000, 0, IPR_DEFAULT_LOG_LEVEL,
        "9000: IOA reserved area data check"},
        {0x04118100, 0, IPR_DEFAULT_LOG_LEVEL,
        "9001: IOA reserved area invalid data pattern"},
        {0x04118200, 0, IPR_DEFAULT_LOG_LEVEL,
        "9002: IOA reserved area LRC error"},
+       {0x04118300, 1, IPR_DEFAULT_LOG_LEVEL,
+       "Hardware Error, IOA metadata access error"},
        {0x04320000, 0, IPR_DEFAULT_LOG_LEVEL,
        "102E: Out of alternate sectors for disk storage"},
        {0x04330000, 1, IPR_DEFAULT_LOG_LEVEL,
@@ -306,6 +381,8 @@ struct ipr_error_table_t ipr_error_table[] = {
        "Illegal request, commands not allowed to this device"},
        {0x05258100, 0, 0,
        "Illegal request, command not allowed to a secondary adapter"},
+       {0x05258200, 0, 0,
+       "Illegal request, command not allowed to a non-optimized resource"},
        {0x05260000, 0, 0,
        "Illegal request, invalid field in parameter list"},
        {0x05260100, 0, 0,
@@ -572,10 +649,15 @@ static void ipr_mask_and_clear_interrupts(struct ipr_ioa_cfg *ioa_cfg,
        ioa_cfg->allow_interrupts = 0;
 
        /* Set interrupt mask to stop all new interrupts */
-       writel(~0, ioa_cfg->regs.set_interrupt_mask_reg);
+       if (ioa_cfg->sis64)
+               writeq(~0, ioa_cfg->regs.set_interrupt_mask_reg);
+       else
+               writel(~0, ioa_cfg->regs.set_interrupt_mask_reg);
 
        /* Clear any pending interrupts */
-       writel(clr_ints, ioa_cfg->regs.clr_interrupt_reg);
+       if (ioa_cfg->sis64)
+               writel(~0, ioa_cfg->regs.clr_interrupt_reg);
+       writel(clr_ints, ioa_cfg->regs.clr_interrupt_reg32);
        int_reg = readl(ioa_cfg->regs.sense_interrupt_reg);
 }
 
@@ -906,14 +988,46 @@ static void ipr_send_hcam(struct ipr_ioa_cfg *ioa_cfg, u8 type,
 }
 
 /**
+ * ipr_update_ata_class - Update the ata class in the resource entry
+ * @res:       resource entry struct
+ * @proto:     cfgte device bus protocol value
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_update_ata_class(struct ipr_resource_entry *res, unsigned int proto)
+{
+       switch(proto) {
+       case IPR_PROTO_SATA:
+       case IPR_PROTO_SAS_STP:
+               res->ata_class = ATA_DEV_ATA;
+               break;
+       case IPR_PROTO_SATA_ATAPI:
+       case IPR_PROTO_SAS_STP_ATAPI:
+               res->ata_class = ATA_DEV_ATAPI;
+               break;
+       default:
+               res->ata_class = ATA_DEV_UNKNOWN;
+               break;
+       };
+}
+
+/**
  * ipr_init_res_entry - Initialize a resource entry struct.
  * @res:       resource entry struct
+ * @cfgtew:    config table entry wrapper struct
  *
  * Return value:
  *     none
  **/
-static void ipr_init_res_entry(struct ipr_resource_entry *res)
+static void ipr_init_res_entry(struct ipr_resource_entry *res,
+                              struct ipr_config_table_entry_wrapper *cfgtew)
 {
+       int found = 0;
+       unsigned int proto;
+       struct ipr_ioa_cfg *ioa_cfg = res->ioa_cfg;
+       struct ipr_resource_entry *gscsi_res = NULL;
+
        res->needs_sync_complete = 0;
        res->in_erp = 0;
        res->add_to_ml = 0;
@@ -921,6 +1035,205 @@ static void ipr_init_res_entry(struct ipr_resource_entry *res)
        res->resetting_device = 0;
        res->sdev = NULL;
        res->sata_port = NULL;
+
+       if (ioa_cfg->sis64) {
+               proto = cfgtew->u.cfgte64->proto;
+               res->res_flags = cfgtew->u.cfgte64->res_flags;
+               res->qmodel = IPR_QUEUEING_MODEL64(res);
+               res->type = cfgtew->u.cfgte64->res_type & 0x0f;
+
+               memcpy(res->res_path, &cfgtew->u.cfgte64->res_path,
+                       sizeof(res->res_path));
+
+               res->bus = 0;
+               res->lun = scsilun_to_int(&res->dev_lun);
+
+               if (res->type == IPR_RES_TYPE_GENERIC_SCSI) {
+                       list_for_each_entry(gscsi_res, &ioa_cfg->used_res_q, queue) {
+                               if (gscsi_res->dev_id == cfgtew->u.cfgte64->dev_id) {
+                                       found = 1;
+                                       res->target = gscsi_res->target;
+                                       break;
+                               }
+                       }
+                       if (!found) {
+                               res->target = find_first_zero_bit(ioa_cfg->target_ids,
+                                                                 ioa_cfg->max_devs_supported);
+                               set_bit(res->target, ioa_cfg->target_ids);
+                       }
+
+                       memcpy(&res->dev_lun.scsi_lun, &cfgtew->u.cfgte64->lun,
+                               sizeof(res->dev_lun.scsi_lun));
+               } else if (res->type == IPR_RES_TYPE_IOAFP) {
+                       res->bus = IPR_IOAFP_VIRTUAL_BUS;
+                       res->target = 0;
+               } else if (res->type == IPR_RES_TYPE_ARRAY) {
+                       res->bus = IPR_ARRAY_VIRTUAL_BUS;
+                       res->target = find_first_zero_bit(ioa_cfg->array_ids,
+                                                         ioa_cfg->max_devs_supported);
+                       set_bit(res->target, ioa_cfg->array_ids);
+               } else if (res->type == IPR_RES_TYPE_VOLUME_SET) {
+                       res->bus = IPR_VSET_VIRTUAL_BUS;
+                       res->target = find_first_zero_bit(ioa_cfg->vset_ids,
+                                                         ioa_cfg->max_devs_supported);
+                       set_bit(res->target, ioa_cfg->vset_ids);
+               } else {
+                       res->target = find_first_zero_bit(ioa_cfg->target_ids,
+                                                         ioa_cfg->max_devs_supported);
+                       set_bit(res->target, ioa_cfg->target_ids);
+               }
+       } else {
+               proto = cfgtew->u.cfgte->proto;
+               res->qmodel = IPR_QUEUEING_MODEL(res);
+               res->flags = cfgtew->u.cfgte->flags;
+               if (res->flags & IPR_IS_IOA_RESOURCE)
+                       res->type = IPR_RES_TYPE_IOAFP;
+               else
+                       res->type = cfgtew->u.cfgte->rsvd_subtype & 0x0f;
+
+               res->bus = cfgtew->u.cfgte->res_addr.bus;
+               res->target = cfgtew->u.cfgte->res_addr.target;
+               res->lun = cfgtew->u.cfgte->res_addr.lun;
+       }
+
+       ipr_update_ata_class(res, proto);
+}
+
+/**
+ * ipr_is_same_device - Determine if two devices are the same.
+ * @res:       resource entry struct
+ * @cfgtew:    config table entry wrapper struct
+ *
+ * Return value:
+ *     1 if the devices are the same / 0 otherwise
+ **/
+static int ipr_is_same_device(struct ipr_resource_entry *res,
+                             struct ipr_config_table_entry_wrapper *cfgtew)
+{
+       if (res->ioa_cfg->sis64) {
+               if (!memcmp(&res->dev_id, &cfgtew->u.cfgte64->dev_id,
+                                       sizeof(cfgtew->u.cfgte64->dev_id)) &&
+                       !memcmp(&res->lun, &cfgtew->u.cfgte64->lun,
+                                       sizeof(cfgtew->u.cfgte64->lun))) {
+                       return 1;
+               }
+       } else {
+               if (res->bus == cfgtew->u.cfgte->res_addr.bus &&
+                   res->target == cfgtew->u.cfgte->res_addr.target &&
+                   res->lun == cfgtew->u.cfgte->res_addr.lun)
+                       return 1;
+       }
+
+       return 0;
+}
+
+/**
+ * ipr_format_resource_path - Format the resource path for printing.
+ * @res_path:  resource path
+ * @buf:       buffer
+ *
+ * Return value:
+ *     pointer to buffer
+ **/
+static char *ipr_format_resource_path(u8 *res_path, char *buffer)
+{
+       int i;
+
+       sprintf(buffer, "%02X", res_path[0]);
+       for (i=1; res_path[i] != 0xff; i++)
+               sprintf(buffer, "%s-%02X", buffer, res_path[i]);
+
+       return buffer;
+}
+
+/**
+ * ipr_update_res_entry - Update the resource entry.
+ * @res:       resource entry struct
+ * @cfgtew:    config table entry wrapper struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_update_res_entry(struct ipr_resource_entry *res,
+                                struct ipr_config_table_entry_wrapper *cfgtew)
+{
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
+       unsigned int proto;
+       int new_path = 0;
+
+       if (res->ioa_cfg->sis64) {
+               res->flags = cfgtew->u.cfgte64->flags;
+               res->res_flags = cfgtew->u.cfgte64->res_flags;
+               res->type = cfgtew->u.cfgte64->res_type & 0x0f;
+
+               memcpy(&res->std_inq_data, &cfgtew->u.cfgte64->std_inq_data,
+                       sizeof(struct ipr_std_inq_data));
+
+               res->qmodel = IPR_QUEUEING_MODEL64(res);
+               proto = cfgtew->u.cfgte64->proto;
+               res->res_handle = cfgtew->u.cfgte64->res_handle;
+               res->dev_id = cfgtew->u.cfgte64->dev_id;
+
+               memcpy(&res->dev_lun.scsi_lun, &cfgtew->u.cfgte64->lun,
+                       sizeof(res->dev_lun.scsi_lun));
+
+               if (memcmp(res->res_path, &cfgtew->u.cfgte64->res_path,
+                                       sizeof(res->res_path))) {
+                       memcpy(res->res_path, &cfgtew->u.cfgte64->res_path,
+                               sizeof(res->res_path));
+                       new_path = 1;
+               }
+
+               if (res->sdev && new_path)
+                       sdev_printk(KERN_INFO, res->sdev, "Resource path: %s\n",
+                                   ipr_format_resource_path(&res->res_path[0], &buffer[0]));
+       } else {
+               res->flags = cfgtew->u.cfgte->flags;
+               if (res->flags & IPR_IS_IOA_RESOURCE)
+                       res->type = IPR_RES_TYPE_IOAFP;
+               else
+                       res->type = cfgtew->u.cfgte->rsvd_subtype & 0x0f;
+
+               memcpy(&res->std_inq_data, &cfgtew->u.cfgte->std_inq_data,
+                       sizeof(struct ipr_std_inq_data));
+
+               res->qmodel = IPR_QUEUEING_MODEL(res);
+               proto = cfgtew->u.cfgte->proto;
+               res->res_handle = cfgtew->u.cfgte->res_handle;
+       }
+
+       ipr_update_ata_class(res, proto);
+}
+
+/**
+ * ipr_clear_res_target - Clear the bit in the bit map representing the target
+ *                       for the resource.
+ * @res:       resource entry struct
+ * @cfgtew:    config table entry wrapper struct
+ *
+ * Return value:
+ *      none
+ **/
+static void ipr_clear_res_target(struct ipr_resource_entry *res)
+{
+       struct ipr_resource_entry *gscsi_res = NULL;
+       struct ipr_ioa_cfg *ioa_cfg = res->ioa_cfg;
+
+       if (!ioa_cfg->sis64)
+               return;
+
+       if (res->bus == IPR_ARRAY_VIRTUAL_BUS)
+               clear_bit(res->target, ioa_cfg->array_ids);
+       else if (res->bus == IPR_VSET_VIRTUAL_BUS)
+               clear_bit(res->target, ioa_cfg->vset_ids);
+       else if (res->bus == 0 && res->type == IPR_RES_TYPE_GENERIC_SCSI) {
+               list_for_each_entry(gscsi_res, &ioa_cfg->used_res_q, queue)
+                       if (gscsi_res->dev_id == res->dev_id && gscsi_res != res)
+                               return;
+               clear_bit(res->target, ioa_cfg->target_ids);
+
+       } else if (res->bus == 0)
+               clear_bit(res->target, ioa_cfg->target_ids);
 }
 
 /**
@@ -932,17 +1245,24 @@ static void ipr_init_res_entry(struct ipr_resource_entry *res)
  *     none
  **/
 static void ipr_handle_config_change(struct ipr_ioa_cfg *ioa_cfg,
-                             struct ipr_hostrcb *hostrcb)
+                                    struct ipr_hostrcb *hostrcb)
 {
        struct ipr_resource_entry *res = NULL;
-       struct ipr_config_table_entry *cfgte;
+       struct ipr_config_table_entry_wrapper cfgtew;
+       __be32 cc_res_handle;
+
        u32 is_ndn = 1;
 
-       cfgte = &hostrcb->hcam.u.ccn.cfgte;
+       if (ioa_cfg->sis64) {
+               cfgtew.u.cfgte64 = &hostrcb->hcam.u.ccn.u.cfgte64;
+               cc_res_handle = cfgtew.u.cfgte64->res_handle;
+       } else {
+               cfgtew.u.cfgte = &hostrcb->hcam.u.ccn.u.cfgte;
+               cc_res_handle = cfgtew.u.cfgte->res_handle;
+       }
 
        list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
-               if (!memcmp(&res->cfgte.res_addr, &cfgte->res_addr,
-                           sizeof(cfgte->res_addr))) {
+               if (res->res_handle == cc_res_handle) {
                        is_ndn = 0;
                        break;
                }
@@ -960,20 +1280,22 @@ static void ipr_handle_config_change(struct ipr_ioa_cfg *ioa_cfg,
                                 struct ipr_resource_entry, queue);
 
                list_del(&res->queue);
-               ipr_init_res_entry(res);
+               ipr_init_res_entry(res, &cfgtew);
                list_add_tail(&res->queue, &ioa_cfg->used_res_q);
        }
 
-       memcpy(&res->cfgte, cfgte, sizeof(struct ipr_config_table_entry));
+       ipr_update_res_entry(res, &cfgtew);
 
        if (hostrcb->hcam.notify_type == IPR_HOST_RCB_NOTIF_TYPE_REM_ENTRY) {
                if (res->sdev) {
                        res->del_from_ml = 1;
-                       res->cfgte.res_handle = IPR_INVALID_RES_HANDLE;
+                       res->res_handle = IPR_INVALID_RES_HANDLE;
                        if (ioa_cfg->allow_ml_add_del)
                                schedule_work(&ioa_cfg->work_q);
-               } else
+               } else {
+                       ipr_clear_res_target(res);
                        list_move_tail(&res->queue, &ioa_cfg->free_res_q);
+               }
        } else if (!res->sdev) {
                res->add_to_ml = 1;
                if (ioa_cfg->allow_ml_add_del)
@@ -1125,8 +1447,12 @@ static void ipr_log_ext_vpd(struct ipr_ext_vpd *vpd)
 static void ipr_log_enhanced_cache_error(struct ipr_ioa_cfg *ioa_cfg,
                                         struct ipr_hostrcb *hostrcb)
 {
-       struct ipr_hostrcb_type_12_error *error =
-               &hostrcb->hcam.u.error.u.type_12_error;
+       struct ipr_hostrcb_type_12_error *error;
+
+       if (ioa_cfg->sis64)
+               error = &hostrcb->hcam.u.error64.u.type_12_error;
+       else
+               error = &hostrcb->hcam.u.error.u.type_12_error;
 
        ipr_err("-----Current Configuration-----\n");
        ipr_err("Cache Directory Card Information:\n");
@@ -1219,6 +1545,48 @@ static void ipr_log_enhanced_config_error(struct ipr_ioa_cfg *ioa_cfg,
 }
 
 /**
+ * ipr_log_sis64_config_error - Log a device error.
+ * @ioa_cfg:   ioa config struct
+ * @hostrcb:   hostrcb struct
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_log_sis64_config_error(struct ipr_ioa_cfg *ioa_cfg,
+                                      struct ipr_hostrcb *hostrcb)
+{
+       int errors_logged, i;
+       struct ipr_hostrcb64_device_data_entry_enhanced *dev_entry;
+       struct ipr_hostrcb_type_23_error *error;
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
+
+       error = &hostrcb->hcam.u.error64.u.type_23_error;
+       errors_logged = be32_to_cpu(error->errors_logged);
+
+       ipr_err("Device Errors Detected/Logged: %d/%d\n",
+               be32_to_cpu(error->errors_detected), errors_logged);
+
+       dev_entry = error->dev;
+
+       for (i = 0; i < errors_logged; i++, dev_entry++) {
+               ipr_err_separator;
+
+               ipr_err("Device %d : %s", i + 1,
+                        ipr_format_resource_path(&dev_entry->res_path[0], &buffer[0]));
+               ipr_log_ext_vpd(&dev_entry->vpd);
+
+               ipr_err("-----New Device Information-----\n");
+               ipr_log_ext_vpd(&dev_entry->new_vpd);
+
+               ipr_err("Cache Directory Card Information:\n");
+               ipr_log_ext_vpd(&dev_entry->ioa_last_with_dev_vpd);
+
+               ipr_err("Adapter Card Information:\n");
+               ipr_log_ext_vpd(&dev_entry->cfc_last_with_dev_vpd);
+       }
+}
+
+/**
  * ipr_log_config_error - Log a configuration error.
  * @ioa_cfg:   ioa config struct
  * @hostrcb:   hostrcb struct
@@ -1412,7 +1780,11 @@ static void ipr_log_enhanced_dual_ioa_error(struct ipr_ioa_cfg *ioa_cfg,
 {
        struct ipr_hostrcb_type_17_error *error;
 
-       error = &hostrcb->hcam.u.error.u.type_17_error;
+       if (ioa_cfg->sis64)
+               error = &hostrcb->hcam.u.error64.u.type_17_error;
+       else
+               error = &hostrcb->hcam.u.error.u.type_17_error;
+
        error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
        strim(error->failure_reason);
 
@@ -1519,6 +1891,42 @@ static void ipr_log_fabric_path(struct ipr_hostrcb *hostrcb,
                fabric->ioa_port, fabric->cascaded_expander, fabric->phy);
 }
 
+/**
+ * ipr_log64_fabric_path - Log a fabric path error
+ * @hostrcb:   hostrcb struct
+ * @fabric:            fabric descriptor
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_log64_fabric_path(struct ipr_hostrcb *hostrcb,
+                                 struct ipr_hostrcb64_fabric_desc *fabric)
+{
+       int i, j;
+       u8 path_state = fabric->path_state;
+       u8 active = path_state & IPR_PATH_ACTIVE_MASK;
+       u8 state = path_state & IPR_PATH_STATE_MASK;
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
+
+       for (i = 0; i < ARRAY_SIZE(path_active_desc); i++) {
+               if (path_active_desc[i].active != active)
+                       continue;
+
+               for (j = 0; j < ARRAY_SIZE(path_state_desc); j++) {
+                       if (path_state_desc[j].state != state)
+                               continue;
+
+                       ipr_hcam_err(hostrcb, "%s %s: Resource Path=%s\n",
+                                    path_active_desc[i].desc, path_state_desc[j].desc,
+                                    ipr_format_resource_path(&fabric->res_path[0], &buffer[0]));
+                       return;
+               }
+       }
+
+       ipr_err("Path state=%02X Resource Path=%s\n", path_state,
+               ipr_format_resource_path(&fabric->res_path[0], &buffer[0]));
+}
+
 static const struct {
        u8 type;
        char *desc;
@@ -1628,6 +2036,49 @@ static void ipr_log_path_elem(struct ipr_hostrcb *hostrcb,
 }
 
 /**
+ * ipr_log64_path_elem - Log a fabric path element.
+ * @hostrcb:   hostrcb struct
+ * @cfg:               fabric path element struct
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_log64_path_elem(struct ipr_hostrcb *hostrcb,
+                               struct ipr_hostrcb64_config_element *cfg)
+{
+       int i, j;
+       u8 desc_id = cfg->descriptor_id & IPR_DESCRIPTOR_MASK;
+       u8 type = cfg->type_status & IPR_PATH_CFG_TYPE_MASK;
+       u8 status = cfg->type_status & IPR_PATH_CFG_STATUS_MASK;
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
+
+       if (type == IPR_PATH_CFG_NOT_EXIST || desc_id != IPR_DESCRIPTOR_SIS64)
+               return;
+
+       for (i = 0; i < ARRAY_SIZE(path_type_desc); i++) {
+               if (path_type_desc[i].type != type)
+                       continue;
+
+               for (j = 0; j < ARRAY_SIZE(path_status_desc); j++) {
+                       if (path_status_desc[j].status != status)
+                               continue;
+
+                       ipr_hcam_err(hostrcb, "%s %s: Resource Path=%s, Link rate=%s, WWN=%08X%08X\n",
+                                    path_status_desc[j].desc, path_type_desc[i].desc,
+                                    ipr_format_resource_path(&cfg->res_path[0], &buffer[0]),
+                                    link_rate[cfg->link_rate & IPR_PHY_LINK_RATE_MASK],
+                                    be32_to_cpu(cfg->wwid[0]), be32_to_cpu(cfg->wwid[1]));
+                       return;
+               }
+       }
+       ipr_hcam_err(hostrcb, "Path element=%02X: Resource Path=%s, Link rate=%s "
+                    "WWN=%08X%08X\n", cfg->type_status,
+                    ipr_format_resource_path(&cfg->res_path[0], &buffer[0]),
+                    link_rate[cfg->link_rate & IPR_PHY_LINK_RATE_MASK],
+                    be32_to_cpu(cfg->wwid[0]), be32_to_cpu(cfg->wwid[1]));
+}
+
+/**
  * ipr_log_fabric_error - Log a fabric error.
  * @ioa_cfg:   ioa config struct
  * @hostrcb:   hostrcb struct
@@ -1665,6 +2116,96 @@ static void ipr_log_fabric_error(struct ipr_ioa_cfg *ioa_cfg,
 }
 
 /**
+ * ipr_log_sis64_array_error - Log a sis64 array error.
+ * @ioa_cfg:   ioa config struct
+ * @hostrcb:   hostrcb struct
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_log_sis64_array_error(struct ipr_ioa_cfg *ioa_cfg,
+                                     struct ipr_hostrcb *hostrcb)
+{
+       int i, num_entries;
+       struct ipr_hostrcb_type_24_error *error;
+       struct ipr_hostrcb64_array_data_entry *array_entry;
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
+       const u8 zero_sn[IPR_SERIAL_NUM_LEN] = { [0 ... IPR_SERIAL_NUM_LEN-1] = '0' };
+
+       error = &hostrcb->hcam.u.error64.u.type_24_error;
+
+       ipr_err_separator;
+
+       ipr_err("RAID %s Array Configuration: %s\n",
+               error->protection_level,
+               ipr_format_resource_path(&error->last_res_path[0], &buffer[0]));
+
+       ipr_err_separator;
+
+       array_entry = error->array_member;
+       num_entries = min_t(u32, be32_to_cpu(error->num_entries),
+                           sizeof(error->array_member));
+
+       for (i = 0; i < num_entries; i++, array_entry++) {
+
+               if (!memcmp(array_entry->vpd.vpd.sn, zero_sn, IPR_SERIAL_NUM_LEN))
+                       continue;
+
+               if (error->exposed_mode_adn == i)
+                       ipr_err("Exposed Array Member %d:\n", i);
+               else
+                       ipr_err("Array Member %d:\n", i);
+
+               ipr_err("Array Member %d:\n", i);
+               ipr_log_ext_vpd(&array_entry->vpd);
+               ipr_err("Current Location: %s",
+                        ipr_format_resource_path(&array_entry->res_path[0], &buffer[0]));
+               ipr_err("Expected Location: %s",
+                        ipr_format_resource_path(&array_entry->expected_res_path[0], &buffer[0]));
+
+               ipr_err_separator;
+       }
+}
+
+/**
+ * ipr_log_sis64_fabric_error - Log a sis64 fabric error.
+ * @ioa_cfg:   ioa config struct
+ * @hostrcb:   hostrcb struct
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_log_sis64_fabric_error(struct ipr_ioa_cfg *ioa_cfg,
+                                      struct ipr_hostrcb *hostrcb)
+{
+       struct ipr_hostrcb_type_30_error *error;
+       struct ipr_hostrcb64_fabric_desc *fabric;
+       struct ipr_hostrcb64_config_element *cfg;
+       int i, add_len;
+
+       error = &hostrcb->hcam.u.error64.u.type_30_error;
+
+       error->failure_reason[sizeof(error->failure_reason) - 1] = '\0';
+       ipr_hcam_err(hostrcb, "%s\n", error->failure_reason);
+
+       add_len = be32_to_cpu(hostrcb->hcam.length) -
+               (offsetof(struct ipr_hostrcb64_error, u) +
+                offsetof(struct ipr_hostrcb_type_30_error, desc));
+
+       for (i = 0, fabric = error->desc; i < error->num_entries; i++) {
+               ipr_log64_fabric_path(hostrcb, fabric);
+               for_each_fabric_cfg(fabric, cfg)
+                       ipr_log64_path_elem(hostrcb, cfg);
+
+               add_len -= be16_to_cpu(fabric->length);
+               fabric = (struct ipr_hostrcb64_fabric_desc *)
+                       ((unsigned long)fabric + be16_to_cpu(fabric->length));
+       }
+
+       ipr_log_hex_data(ioa_cfg, (u32 *)fabric, add_len);
+}
+
+/**
  * ipr_log_generic_error - Log an adapter error.
  * @ioa_cfg:   ioa config struct
  * @hostrcb:   hostrcb struct
@@ -1723,13 +2264,16 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg,
        if (hostrcb->hcam.notifications_lost == IPR_HOST_RCB_NOTIFICATIONS_LOST)
                dev_err(&ioa_cfg->pdev->dev, "Error notifications lost\n");
 
-       ioasc = be32_to_cpu(hostrcb->hcam.u.error.failing_dev_ioasc);
+       if (ioa_cfg->sis64)
+               ioasc = be32_to_cpu(hostrcb->hcam.u.error64.fd_ioasc);
+       else
+               ioasc = be32_to_cpu(hostrcb->hcam.u.error.fd_ioasc);
 
-       if (ioasc == IPR_IOASC_BUS_WAS_RESET ||
-           ioasc == IPR_IOASC_BUS_WAS_RESET_BY_OTHER) {
+       if (!ioa_cfg->sis64 && (ioasc == IPR_IOASC_BUS_WAS_RESET ||
+           ioasc == IPR_IOASC_BUS_WAS_RESET_BY_OTHER)) {
                /* Tell the midlayer we had a bus reset so it will handle the UA properly */
                scsi_report_bus_reset(ioa_cfg->host,
-                                     hostrcb->hcam.u.error.failing_dev_res_addr.bus);
+                                     hostrcb->hcam.u.error.fd_res_addr.bus);
        }
 
        error_index = ipr_get_error(ioasc);
@@ -1777,6 +2321,16 @@ static void ipr_handle_log_data(struct ipr_ioa_cfg *ioa_cfg,
        case IPR_HOST_RCB_OVERLAY_ID_20:
                ipr_log_fabric_error(ioa_cfg, hostrcb);
                break;
+       case IPR_HOST_RCB_OVERLAY_ID_23:
+               ipr_log_sis64_config_error(ioa_cfg, hostrcb);
+               break;
+       case IPR_HOST_RCB_OVERLAY_ID_24:
+       case IPR_HOST_RCB_OVERLAY_ID_26:
+               ipr_log_sis64_array_error(ioa_cfg, hostrcb);
+               break;
+       case IPR_HOST_RCB_OVERLAY_ID_30:
+               ipr_log_sis64_fabric_error(ioa_cfg, hostrcb);
+               break;
        case IPR_HOST_RCB_OVERLAY_ID_1:
        case IPR_HOST_RCB_OVERLAY_ID_DEFAULT:
        default:
@@ -1801,7 +2355,12 @@ static void ipr_process_error(struct ipr_cmnd *ipr_cmd)
        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
        struct ipr_hostrcb *hostrcb = ipr_cmd->u.hostrcb;
        u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
-       u32 fd_ioasc = be32_to_cpu(hostrcb->hcam.u.error.failing_dev_ioasc);
+       u32 fd_ioasc;
+
+       if (ioa_cfg->sis64)
+               fd_ioasc = be32_to_cpu(hostrcb->hcam.u.error64.fd_ioasc);
+       else
+               fd_ioasc = be32_to_cpu(hostrcb->hcam.u.error.fd_ioasc);
 
        list_del(&hostrcb->queue);
        list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
@@ -1926,12 +2485,14 @@ static const struct ipr_ses_table_entry *
 ipr_find_ses_entry(struct ipr_resource_entry *res)
 {
        int i, j, matches;
+       struct ipr_std_inq_vpids *vpids;
        const struct ipr_ses_table_entry *ste = ipr_ses_table;
 
        for (i = 0; i < ARRAY_SIZE(ipr_ses_table); i++, ste++) {
                for (j = 0, matches = 0; j < IPR_PROD_ID_LEN; j++) {
                        if (ste->compare_product_id_byte[j] == 'X') {
-                               if (res->cfgte.std_inq_data.vpids.product_id[j] == ste->product_id[j])
+                               vpids = &res->std_inq_data.vpids;
+                               if (vpids->product_id[j] == ste->product_id[j])
                                        matches++;
                                else
                                        break;
@@ -1966,10 +2527,10 @@ static u32 ipr_get_max_scsi_speed(struct ipr_ioa_cfg *ioa_cfg, u8 bus, u8 bus_wi
 
        /* Loop through each config table entry in the config table buffer */
        list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
-               if (!(IPR_IS_SES_DEVICE(res->cfgte.std_inq_data)))
+               if (!(IPR_IS_SES_DEVICE(res->std_inq_data)))
                        continue;
 
-               if (bus != res->cfgte.res_addr.bus)
+               if (bus != res->bus)
                        continue;
 
                if (!(ste = ipr_find_ses_entry(res)))
@@ -2015,6 +2576,31 @@ static int ipr_wait_iodbg_ack(struct ipr_ioa_cfg *ioa_cfg, int max_delay)
 }
 
 /**
+ * ipr_get_sis64_dump_data_section - Dump IOA memory
+ * @ioa_cfg:                   ioa config struct
+ * @start_addr:                        adapter address to dump
+ * @dest:                      destination kernel buffer
+ * @length_in_words:           length to dump in 4 byte words
+ *
+ * Return value:
+ *     0 on success
+ **/
+static int ipr_get_sis64_dump_data_section(struct ipr_ioa_cfg *ioa_cfg,
+                                          u32 start_addr,
+                                          __be32 *dest, u32 length_in_words)
+{
+       int i;
+
+       for (i = 0; i < length_in_words; i++) {
+               writel(start_addr+(i*4), ioa_cfg->regs.dump_addr_reg);
+               *dest = cpu_to_be32(readl(ioa_cfg->regs.dump_data_reg));
+               dest++;
+       }
+
+       return 0;
+}
+
+/**
  * ipr_get_ldump_data_section - Dump IOA memory
  * @ioa_cfg:                   ioa config struct
  * @start_addr:                        adapter address to dump
@@ -2031,9 +2617,13 @@ static int ipr_get_ldump_data_section(struct ipr_ioa_cfg *ioa_cfg,
        volatile u32 temp_pcii_reg;
        int i, delay = 0;
 
+       if (ioa_cfg->sis64)
+               return ipr_get_sis64_dump_data_section(ioa_cfg, start_addr,
+                                                      dest, length_in_words);
+
        /* Write IOA interrupt reg starting LDUMP state  */
        writel((IPR_UPROCI_RESET_ALERT | IPR_UPROCI_IO_DEBUG_ALERT),
-              ioa_cfg->regs.set_uproc_interrupt_reg);
+              ioa_cfg->regs.set_uproc_interrupt_reg32);
 
        /* Wait for IO debug acknowledge */
        if (ipr_wait_iodbg_ack(ioa_cfg,
@@ -2052,7 +2642,7 @@ static int ipr_get_ldump_data_section(struct ipr_ioa_cfg *ioa_cfg,
 
        /* Signal address valid - clear IOA Reset alert */
        writel(IPR_UPROCI_RESET_ALERT,
-              ioa_cfg->regs.clr_uproc_interrupt_reg);
+              ioa_cfg->regs.clr_uproc_interrupt_reg32);
 
        for (i = 0; i < length_in_words; i++) {
                /* Wait for IO debug acknowledge */
@@ -2077,10 +2667,10 @@ static int ipr_get_ldump_data_section(struct ipr_ioa_cfg *ioa_cfg,
 
        /* Signal end of block transfer. Set reset alert then clear IO debug ack */
        writel(IPR_UPROCI_RESET_ALERT,
-              ioa_cfg->regs.set_uproc_interrupt_reg);
+              ioa_cfg->regs.set_uproc_interrupt_reg32);
 
        writel(IPR_UPROCI_IO_DEBUG_ALERT,
-              ioa_cfg->regs.clr_uproc_interrupt_reg);
+              ioa_cfg->regs.clr_uproc_interrupt_reg32);
 
        /* Signal dump data received - Clear IO debug Ack */
        writel(IPR_PCII_IO_DEBUG_ACKNOWLEDGE,
@@ -2089,7 +2679,7 @@ static int ipr_get_ldump_data_section(struct ipr_ioa_cfg *ioa_cfg,
        /* Wait for IOA to signal LDUMP exit - IOA reset alert will be cleared */
        while (delay < IPR_LDUMP_MAX_SHORT_ACK_DELAY_IN_USEC) {
                temp_pcii_reg =
-                   readl(ioa_cfg->regs.sense_uproc_interrupt_reg);
+                   readl(ioa_cfg->regs.sense_uproc_interrupt_reg32);
 
                if (!(temp_pcii_reg & IPR_UPROCI_RESET_ALERT))
                        return 0;
@@ -2288,6 +2878,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
        u32 num_entries, start_off, end_off;
        u32 bytes_to_copy, bytes_copied, rc;
        struct ipr_sdt *sdt;
+       int valid = 1;
        int i;
 
        ENTER;
@@ -2301,7 +2892,7 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
 
        start_addr = readl(ioa_cfg->ioa_mailbox);
 
-       if (!ipr_sdt_is_fmt2(start_addr)) {
+       if (!ioa_cfg->sis64 && !ipr_sdt_is_fmt2(start_addr)) {
                dev_err(&ioa_cfg->pdev->dev,
                        "Invalid dump table format: %lx\n", start_addr);
                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -2330,7 +2921,6 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
 
        /* IOA Dump entry */
        ipr_init_dump_entry_hdr(&ioa_dump->hdr);
-       ioa_dump->format = IPR_SDT_FMT2;
        ioa_dump->hdr.len = 0;
        ioa_dump->hdr.data_type = IPR_DUMP_DATA_TYPE_BINARY;
        ioa_dump->hdr.id = IPR_DUMP_IOA_DUMP_ID;
@@ -2345,7 +2935,8 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
                                        sizeof(struct ipr_sdt) / sizeof(__be32));
 
        /* Smart Dump table is ready to use and the first entry is valid */
-       if (rc || (be32_to_cpu(sdt->hdr.state) != IPR_FMT2_SDT_READY_TO_USE)) {
+       if (rc || ((be32_to_cpu(sdt->hdr.state) != IPR_FMT3_SDT_READY_TO_USE) &&
+           (be32_to_cpu(sdt->hdr.state) != IPR_FMT2_SDT_READY_TO_USE))) {
                dev_err(&ioa_cfg->pdev->dev,
                        "Dump of IOA failed. Dump table not valid: %d, %X.\n",
                        rc, be32_to_cpu(sdt->hdr.state));
@@ -2369,12 +2960,19 @@ static void ipr_get_ioa_dump(struct ipr_ioa_cfg *ioa_cfg, struct ipr_dump *dump)
                }
 
                if (sdt->entry[i].flags & IPR_SDT_VALID_ENTRY) {
-                       sdt_word = be32_to_cpu(sdt->entry[i].bar_str_offset);
-                       start_off = sdt_word & IPR_FMT2_MBX_ADDR_MASK;
-                       end_off = be32_to_cpu(sdt->entry[i].end_offset);
-
-                       if (ipr_sdt_is_fmt2(sdt_word) && sdt_word) {
-                               bytes_to_copy = end_off - start_off;
+                       sdt_word = be32_to_cpu(sdt->entry[i].start_token);
+                       if (ioa_cfg->sis64)
+                               bytes_to_copy = be32_to_cpu(sdt->entry[i].end_token);
+                       else {
+                               start_off = sdt_word & IPR_FMT2_MBX_ADDR_MASK;
+                               end_off = be32_to_cpu(sdt->entry[i].end_token);
+
+                               if (ipr_sdt_is_fmt2(sdt_word) && sdt_word)
+                                       bytes_to_copy = end_off - start_off;
+                               else
+                                       valid = 0;
+                       }
+                       if (valid) {
                                if (bytes_to_copy > IPR_MAX_IOA_DUMP_SIZE) {
                                        sdt->entry[i].flags &= ~IPR_SDT_VALID_ENTRY;
                                        continue;
@@ -2503,9 +3101,9 @@ restart:
 
        list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
                if (res->add_to_ml) {
-                       bus = res->cfgte.res_addr.bus;
-                       target = res->cfgte.res_addr.target;
-                       lun = res->cfgte.res_addr.lun;
+                       bus = res->bus;
+                       target = res->target;
+                       lun = res->lun;
                        res->add_to_ml = 0;
                        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
                        scsi_add_device(ioa_cfg->host, bus, target, lun);
@@ -2513,150 +3111,51 @@ restart:
                        goto restart;
                }
        }
-
-       spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-       kobject_uevent(&ioa_cfg->host->shost_dev.kobj, KOBJ_CHANGE);
-       LEAVE;
-}
-
-#ifdef CONFIG_SCSI_IPR_TRACE
-/**
- * ipr_read_trace - Dump the adapter trace
- * @kobj:              kobject struct
- * @bin_attr:          bin_attribute struct
- * @buf:               buffer
- * @off:               offset
- * @count:             buffer size
- *
- * Return value:
- *     number of bytes printed to buffer
- **/
-static ssize_t ipr_read_trace(struct kobject *kobj,
-                             struct bin_attribute *bin_attr,
-                             char *buf, loff_t off, size_t count)
-{
-       struct device *dev = container_of(kobj, struct device, kobj);
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
-       unsigned long lock_flags = 0;
-       ssize_t ret;
-
-       spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-       ret = memory_read_from_buffer(buf, count, &off, ioa_cfg->trace,
-                               IPR_TRACE_SIZE);
-       spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-
-       return ret;
-}
-
-static struct bin_attribute ipr_trace_attr = {
-       .attr = {
-               .name = "trace",
-               .mode = S_IRUGO,
-       },
-       .size = 0,
-       .read = ipr_read_trace,
-};
-#endif
-
-static const struct {
-       enum ipr_cache_state state;
-       char *name;
-} cache_state [] = {
-       { CACHE_NONE, "none" },
-       { CACHE_DISABLED, "disabled" },
-       { CACHE_ENABLED, "enabled" }
-};
-
-/**
- * ipr_show_write_caching - Show the write caching attribute
- * @dev:       device struct
- * @buf:       buffer
- *
- * Return value:
- *     number of bytes printed to buffer
- **/
-static ssize_t ipr_show_write_caching(struct device *dev,
-                                     struct device_attribute *attr, char *buf)
-{
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
-       unsigned long lock_flags = 0;
-       int i, len = 0;
-
-       spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-       for (i = 0; i < ARRAY_SIZE(cache_state); i++) {
-               if (cache_state[i].state == ioa_cfg->cache_state) {
-                       len = snprintf(buf, PAGE_SIZE, "%s\n", cache_state[i].name);
-                       break;
-               }
-       }
+
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-       return len;
+       kobject_uevent(&ioa_cfg->host->shost_dev.kobj, KOBJ_CHANGE);
+       LEAVE;
 }
 
-
+#ifdef CONFIG_SCSI_IPR_TRACE
 /**
- * ipr_store_write_caching - Enable/disable adapter write cache
- * @dev:       device struct
- * @buf:       buffer
- * @count:     buffer size
- *
- * This function will enable/disable adapter write cache.
+ * ipr_read_trace - Dump the adapter trace
+ * @kobj:              kobject struct
+ * @bin_attr:          bin_attribute struct
+ * @buf:               buffer
+ * @off:               offset
+ * @count:             buffer size
  *
  * Return value:
- *     count on success / other on failure
+ *     number of bytes printed to buffer
  **/
-static ssize_t ipr_store_write_caching(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf, size_t count)
+static ssize_t ipr_read_trace(struct kobject *kobj,
+                             struct bin_attribute *bin_attr,
+                             char *buf, loff_t off, size_t count)
 {
+       struct device *dev = container_of(kobj, struct device, kobj);
        struct Scsi_Host *shost = class_to_shost(dev);
        struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
        unsigned long lock_flags = 0;
-       enum ipr_cache_state new_state = CACHE_INVALID;
-       int i;
-
-       if (!capable(CAP_SYS_ADMIN))
-               return -EACCES;
-       if (ioa_cfg->cache_state == CACHE_NONE)
-               return -EINVAL;
-
-       for (i = 0; i < ARRAY_SIZE(cache_state); i++) {
-               if (!strncmp(cache_state[i].name, buf, strlen(cache_state[i].name))) {
-                       new_state = cache_state[i].state;
-                       break;
-               }
-       }
-
-       if (new_state != CACHE_DISABLED && new_state != CACHE_ENABLED)
-               return -EINVAL;
+       ssize_t ret;
 
        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
-       if (ioa_cfg->cache_state == new_state) {
-               spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-               return count;
-       }
-
-       ioa_cfg->cache_state = new_state;
-       dev_info(&ioa_cfg->pdev->dev, "%s adapter write cache.\n",
-                new_state == CACHE_ENABLED ? "Enabling" : "Disabling");
-       if (!ioa_cfg->in_reset_reload)
-               ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NORMAL);
+       ret = memory_read_from_buffer(buf, count, &off, ioa_cfg->trace,
+                               IPR_TRACE_SIZE);
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
-       wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);
 
-       return count;
+       return ret;
 }
 
-static struct device_attribute ipr_ioa_cache_attr = {
-       .attr = {
-               .name =         "write_cache",
-               .mode =         S_IRUGO | S_IWUSR,
+static struct bin_attribute ipr_trace_attr = {
+       .attr = {
+               .name = "trace",
+               .mode = S_IRUGO,
        },
-       .show = ipr_show_write_caching,
-       .store = ipr_store_write_caching
+       .size = 0,
+       .read = ipr_read_trace,
 };
+#endif
 
 /**
  * ipr_show_fw_version - Show the firmware version
@@ -3259,7 +3758,6 @@ static struct device_attribute *ipr_ioa_attrs[] = {
        &ipr_ioa_state_attr,
        &ipr_ioa_reset_attr,
        &ipr_update_fw_attr,
-       &ipr_ioa_cache_attr,
        NULL,
 };
 
@@ -3563,7 +4061,7 @@ static ssize_t ipr_show_adapter_handle(struct device *dev, struct device_attribu
        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
        res = (struct ipr_resource_entry *)sdev->hostdata;
        if (res)
-               len = snprintf(buf, PAGE_SIZE, "%08X\n", res->cfgte.res_handle);
+               len = snprintf(buf, PAGE_SIZE, "%08X\n", res->res_handle);
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
        return len;
 }
@@ -3576,8 +4074,43 @@ static struct device_attribute ipr_adapter_handle_attr = {
        .show = ipr_show_adapter_handle
 };
 
+/**
+ * ipr_show_resource_path - Show the resource path for this device.
+ * @dev:       device struct
+ * @buf:       buffer
+ *
+ * Return value:
+ *     number of bytes printed to buffer
+ **/
+static ssize_t ipr_show_resource_path(struct device *dev, struct device_attribute *attr, char *buf)
+{
+       struct scsi_device *sdev = to_scsi_device(dev);
+       struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *)sdev->host->hostdata;
+       struct ipr_resource_entry *res;
+       unsigned long lock_flags = 0;
+       ssize_t len = -ENXIO;
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
+
+       spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
+       res = (struct ipr_resource_entry *)sdev->hostdata;
+       if (res)
+               len = snprintf(buf, PAGE_SIZE, "%s\n",
+                              ipr_format_resource_path(&res->res_path[0], &buffer[0]));
+       spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+       return len;
+}
+
+static struct device_attribute ipr_resource_path_attr = {
+       .attr = {
+               .name =         "resource_path",
+               .mode =         S_IRUSR,
+       },
+       .show = ipr_show_resource_path
+};
+
 static struct device_attribute *ipr_dev_attrs[] = {
        &ipr_adapter_handle_attr,
+       &ipr_resource_path_attr,
        NULL,
 };
 
@@ -3630,9 +4163,9 @@ static struct ipr_resource_entry *ipr_find_starget(struct scsi_target *starget)
        struct ipr_resource_entry *res;
 
        list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
-               if ((res->cfgte.res_addr.bus == starget->channel) &&
-                   (res->cfgte.res_addr.target == starget->id) &&
-                   (res->cfgte.res_addr.lun == 0)) {
+               if ((res->bus == starget->channel) &&
+                   (res->target == starget->id) &&
+                   (res->lun == 0)) {
                        return res;
                }
        }
@@ -3702,6 +4235,17 @@ static int ipr_target_alloc(struct scsi_target *starget)
 static void ipr_target_destroy(struct scsi_target *starget)
 {
        struct ipr_sata_port *sata_port = starget->hostdata;
+       struct Scsi_Host *shost = dev_to_shost(&starget->dev);
+       struct ipr_ioa_cfg *ioa_cfg = (struct ipr_ioa_cfg *) shost->hostdata;
+
+       if (ioa_cfg->sis64) {
+               if (starget->channel == IPR_ARRAY_VIRTUAL_BUS)
+                       clear_bit(starget->id, ioa_cfg->array_ids);
+               else if (starget->channel == IPR_VSET_VIRTUAL_BUS)
+                       clear_bit(starget->id, ioa_cfg->vset_ids);
+               else if (starget->channel == 0)
+                       clear_bit(starget->id, ioa_cfg->target_ids);
+       }
 
        if (sata_port) {
                starget->hostdata = NULL;
@@ -3723,9 +4267,9 @@ static struct ipr_resource_entry *ipr_find_sdev(struct scsi_device *sdev)
        struct ipr_resource_entry *res;
 
        list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
-               if ((res->cfgte.res_addr.bus == sdev->channel) &&
-                   (res->cfgte.res_addr.target == sdev->id) &&
-                   (res->cfgte.res_addr.lun == sdev->lun))
+               if ((res->bus == sdev->channel) &&
+                   (res->target == sdev->id) &&
+                   (res->lun == sdev->lun))
                        return res;
        }
 
@@ -3774,6 +4318,7 @@ static int ipr_slave_configure(struct scsi_device *sdev)
        struct ipr_resource_entry *res;
        struct ata_port *ap = NULL;
        unsigned long lock_flags = 0;
+       char buffer[IPR_MAX_RES_PATH_LENGTH];
 
        spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);
        res = sdev->hostdata;
@@ -3800,6 +4345,9 @@ static int ipr_slave_configure(struct scsi_device *sdev)
                        ata_sas_slave_configure(sdev, ap);
                } else
                        scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);
+               if (ioa_cfg->sis64)
+                       sdev_printk(KERN_INFO, sdev, "Resource path: %s\n",
+                                   ipr_format_resource_path(&res->res_path[0], &buffer[0]));
                return 0;
        }
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -3948,7 +4496,7 @@ static int ipr_device_reset(struct ipr_ioa_cfg *ioa_cfg,
        } else
                regs = &ioarcb->u.add_data.u.regs;
 
-       ioarcb->res_handle = res->cfgte.res_handle;
+       ioarcb->res_handle = res->res_handle;
        cmd_pkt->request_type = IPR_RQTYPE_IOACMD;
        cmd_pkt->cdb[0] = IPR_RESET_DEVICE;
        if (ipr_is_gata(res)) {
@@ -3998,19 +4546,7 @@ static int ipr_sata_reset(struct ata_link *link, unsigned int *classes,
        res = sata_port->res;
        if (res) {
                rc = ipr_device_reset(ioa_cfg, res);
-               switch(res->cfgte.proto) {
-               case IPR_PROTO_SATA:
-               case IPR_PROTO_SAS_STP:
-                       *classes = ATA_DEV_ATA;
-                       break;
-               case IPR_PROTO_SATA_ATAPI:
-               case IPR_PROTO_SAS_STP_ATAPI:
-                       *classes = ATA_DEV_ATAPI;
-                       break;
-               default:
-                       *classes = ATA_DEV_UNKNOWN;
-                       break;
-               };
+               *classes = res->ata_class;
        }
 
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -4055,7 +4591,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
                return FAILED;
 
        list_for_each_entry(ipr_cmd, &ioa_cfg->pending_q, queue) {
-               if (ipr_cmd->ioarcb.res_handle == res->cfgte.res_handle) {
+               if (ipr_cmd->ioarcb.res_handle == res->res_handle) {
                        if (ipr_cmd->scsi_cmd)
                                ipr_cmd->done = ipr_scsi_eh_done;
                        if (ipr_cmd->qc)
@@ -4077,7 +4613,7 @@ static int __ipr_eh_dev_reset(struct scsi_cmnd * scsi_cmd)
                spin_lock_irq(scsi_cmd->device->host->host_lock);
 
                list_for_each_entry(ipr_cmd, &ioa_cfg->pending_q, queue) {
-                       if (ipr_cmd->ioarcb.res_handle == res->cfgte.res_handle) {
+                       if (ipr_cmd->ioarcb.res_handle == res->res_handle) {
                                rc = -EIO;
                                break;
                        }
@@ -4116,13 +4652,13 @@ static void ipr_bus_reset_done(struct ipr_cmnd *ipr_cmd)
        struct ipr_resource_entry *res;
 
        ENTER;
-       list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
-               if (!memcmp(&res->cfgte.res_handle, &ipr_cmd->ioarcb.res_handle,
-                           sizeof(res->cfgte.res_handle))) {
-                       scsi_report_bus_reset(ioa_cfg->host, res->cfgte.res_addr.bus);
-                       break;
+       if (!ioa_cfg->sis64)
+               list_for_each_entry(res, &ioa_cfg->used_res_q, queue) {
+                       if (res->res_handle == ipr_cmd->ioarcb.res_handle) {
+                               scsi_report_bus_reset(ioa_cfg->host, res->bus);
+                               break;
+                       }
                }
-       }
 
        /*
         * If abort has not completed, indicate the reset has, else call the
@@ -4220,7 +4756,7 @@ static int ipr_cancel_op(struct scsi_cmnd * scsi_cmd)
                return SUCCESS;
 
        ipr_cmd = ipr_get_free_ipr_cmnd(ioa_cfg);
-       ipr_cmd->ioarcb.res_handle = res->cfgte.res_handle;
+       ipr_cmd->ioarcb.res_handle = res->res_handle;
        cmd_pkt = &ipr_cmd->ioarcb.cmd_pkt;
        cmd_pkt->request_type = IPR_RQTYPE_IOACMD;
        cmd_pkt->cdb[0] = IPR_CANCEL_ALL_REQUESTS;
@@ -4357,11 +4893,29 @@ static irqreturn_t ipr_isr(int irq, void *devp)
                return IRQ_NONE;
        }
 
-       int_mask_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
-       int_reg = readl(ioa_cfg->regs.sense_interrupt_reg) & ~int_mask_reg;
+       int_mask_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg32);
+       int_reg = readl(ioa_cfg->regs.sense_interrupt_reg32) & ~int_mask_reg;
 
-       /* If an interrupt on the adapter did not occur, ignore it */
+       /* If an interrupt on the adapter did not occur, ignore it.
+        * Or in the case of SIS 64, check for a stage change interrupt.
+        */
        if (unlikely((int_reg & IPR_PCII_OPER_INTERRUPTS) == 0)) {
+               if (ioa_cfg->sis64) {
+                       int_mask_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
+                       int_reg = readl(ioa_cfg->regs.sense_interrupt_reg) & ~int_mask_reg;
+                       if (int_reg & IPR_PCII_IPL_STAGE_CHANGE) {
+
+                               /* clear stage change */
+                               writel(IPR_PCII_IPL_STAGE_CHANGE, ioa_cfg->regs.clr_interrupt_reg);
+                               int_reg = readl(ioa_cfg->regs.sense_interrupt_reg) & ~int_mask_reg;
+                               list_del(&ioa_cfg->reset_cmd->queue);
+                               del_timer(&ioa_cfg->reset_cmd->timer);
+                               ipr_reset_ioa_job(ioa_cfg->reset_cmd);
+                               spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
+                               return IRQ_HANDLED;
+                       }
+               }
+
                spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
                return IRQ_NONE;
        }
@@ -4404,8 +4958,8 @@ static irqreturn_t ipr_isr(int irq, void *devp)
                if (ipr_cmd != NULL) {
                        /* Clear the PCI interrupt */
                        do {
-                               writel(IPR_PCII_HRRQ_UPDATED, ioa_cfg->regs.clr_interrupt_reg);
-                               int_reg = readl(ioa_cfg->regs.sense_interrupt_reg) & ~int_mask_reg;
+                               writel(IPR_PCII_HRRQ_UPDATED, ioa_cfg->regs.clr_interrupt_reg32);
+                               int_reg = readl(ioa_cfg->regs.sense_interrupt_reg32) & ~int_mask_reg;
                        } while (int_reg & IPR_PCII_HRRQ_UPDATED &&
                                        num_hrrq++ < IPR_MAX_HRRQ_RETRIES);
 
@@ -5056,9 +5610,9 @@ static int ipr_queuecommand(struct scsi_cmnd *scsi_cmd,
 
        memcpy(ioarcb->cmd_pkt.cdb, scsi_cmd->cmnd, scsi_cmd->cmd_len);
        ipr_cmd->scsi_cmd = scsi_cmd;
-       ioarcb->res_handle = res->cfgte.res_handle;
+       ioarcb->res_handle = res->res_handle;
        ipr_cmd->done = ipr_scsi_done;
-       ipr_trc_hook(ipr_cmd, IPR_TRACE_START, IPR_GET_PHYS_LOC(res->cfgte.res_addr));
+       ipr_trc_hook(ipr_cmd, IPR_TRACE_START, IPR_GET_RES_PHYS_LOC(res));
 
        if (ipr_is_gscsi(res) || ipr_is_vset_device(res)) {
                if (scsi_cmd->underflow == 0)
@@ -5201,20 +5755,9 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
                goto out_unlock;
        }
 
-       switch(res->cfgte.proto) {
-       case IPR_PROTO_SATA:
-       case IPR_PROTO_SAS_STP:
-               ap->link.device[0].class = ATA_DEV_ATA;
-               break;
-       case IPR_PROTO_SATA_ATAPI:
-       case IPR_PROTO_SAS_STP_ATAPI:
-               ap->link.device[0].class = ATA_DEV_ATAPI;
-               break;
-       default:
-               ap->link.device[0].class = ATA_DEV_UNKNOWN;
+       ap->link.device[0].class = res->ata_class;
+       if (ap->link.device[0].class == ATA_DEV_UNKNOWN)
                ata_port_disable(ap);
-               break;
-       };
 
 out_unlock:
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
@@ -5300,8 +5843,7 @@ static void ipr_sata_done(struct ipr_cmnd *ipr_cmd)
        ipr_dump_ioasa(ioa_cfg, ipr_cmd, res);
 
        if (be32_to_cpu(ipr_cmd->ioasa.ioasc_specific) & IPR_ATA_DEVICE_WAS_RESET)
-               scsi_report_device_reset(ioa_cfg->host, res->cfgte.res_addr.bus,
-                                        res->cfgte.res_addr.target);
+               scsi_report_device_reset(ioa_cfg->host, res->bus, res->target);
 
        if (IPR_IOASC_SENSE_KEY(ioasc) > RECOVERED_ERROR)
                qc->err_mask |= __ac_err_mask(ipr_cmd->ioasa.u.gata.status);
@@ -5437,7 +5979,7 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
        list_add_tail(&ipr_cmd->queue, &ioa_cfg->pending_q);
        ipr_cmd->qc = qc;
        ipr_cmd->done = ipr_sata_done;
-       ipr_cmd->ioarcb.res_handle = res->cfgte.res_handle;
+       ipr_cmd->ioarcb.res_handle = res->res_handle;
        ioarcb->cmd_pkt.request_type = IPR_RQTYPE_ATA_PASSTHRU;
        ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_LINK_DESC;
        ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_NO_ULEN_CHK;
@@ -5451,7 +5993,7 @@ static unsigned int ipr_qc_issue(struct ata_queued_cmd *qc)
        regs->flags |= IPR_ATA_FLAG_STATUS_ON_GOOD_COMPLETION;
        ipr_copy_sata_tf(regs, &qc->tf);
        memcpy(ioarcb->cmd_pkt.cdb, qc->cdb, IPR_MAX_CDB_LEN);
-       ipr_trc_hook(ipr_cmd, IPR_TRACE_START, IPR_GET_PHYS_LOC(res->cfgte.res_addr));
+       ipr_trc_hook(ipr_cmd, IPR_TRACE_START, IPR_GET_RES_PHYS_LOC(res));
 
        switch (qc->tf.protocol) {
        case ATA_PROT_NODATA:
@@ -5700,13 +6242,14 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
                        continue;
 
                ipr_cmd->u.res = res;
-               ipr_set_sup_dev_dflt(supp_dev, &res->cfgte.std_inq_data.vpids);
+               ipr_set_sup_dev_dflt(supp_dev, &res->std_inq_data.vpids);
 
                ioarcb->res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
                ioarcb->cmd_pkt.flags_hi |= IPR_FLAGS_HI_WRITE_NOT_READ;
                ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
 
                ioarcb->cmd_pkt.cdb[0] = IPR_SET_SUPPORTED_DEVICES;
+               ioarcb->cmd_pkt.cdb[1] = IPR_SET_ALL_SUPPORTED_DEVICES;
                ioarcb->cmd_pkt.cdb[7] = (sizeof(struct ipr_supported_device) >> 8) & 0xff;
                ioarcb->cmd_pkt.cdb[8] = sizeof(struct ipr_supported_device) & 0xff;
 
@@ -5719,7 +6262,8 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
                ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout,
                           IPR_SET_SUP_DEVICE_TIMEOUT);
 
-               ipr_cmd->job_step = ipr_set_supported_devs;
+               if (!ioa_cfg->sis64)
+                       ipr_cmd->job_step = ipr_set_supported_devs;
                return IPR_RC_JOB_RETURN;
        }
 
@@ -5727,36 +6271,6 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
- * ipr_setup_write_cache - Disable write cache if needed
- * @ipr_cmd:   ipr command struct
- *
- * This function sets up adapters write cache to desired setting
- *
- * Return value:
- *     IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
- **/
-static int ipr_setup_write_cache(struct ipr_cmnd *ipr_cmd)
-{
-       struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
-
-       ipr_cmd->job_step = ipr_set_supported_devs;
-       ipr_cmd->u.res = list_entry(ioa_cfg->used_res_q.next,
-                                   struct ipr_resource_entry, queue);
-
-       if (ioa_cfg->cache_state != CACHE_DISABLED)
-               return IPR_RC_JOB_CONTINUE;
-
-       ipr_cmd->ioarcb.res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
-       ipr_cmd->ioarcb.cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
-       ipr_cmd->ioarcb.cmd_pkt.cdb[0] = IPR_IOA_SHUTDOWN;
-       ipr_cmd->ioarcb.cmd_pkt.cdb[1] = IPR_SHUTDOWN_PREPARE_FOR_NORMAL;
-
-       ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
-
-       return IPR_RC_JOB_RETURN;
-}
-
-/**
  * ipr_get_mode_page - Locate specified mode page
  * @mode_pages:        mode page buffer
  * @page_code: page code to find
@@ -5956,7 +6470,9 @@ static int ipr_ioafp_mode_select_page28(struct ipr_cmnd *ipr_cmd)
                              ioa_cfg->vpd_cbs_dma + offsetof(struct ipr_misc_cbs, mode_pages),
                              length);
 
-       ipr_cmd->job_step = ipr_setup_write_cache;
+       ipr_cmd->job_step = ipr_set_supported_devs;
+       ipr_cmd->u.res = list_entry(ioa_cfg->used_res_q.next,
+                                   struct ipr_resource_entry, queue);
        ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
 
        LEAVE;
@@ -6024,10 +6540,13 @@ static int ipr_reset_cmd_failed(struct ipr_cmnd *ipr_cmd)
  **/
 static int ipr_reset_mode_sense_failed(struct ipr_cmnd *ipr_cmd)
 {
+       struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
        u32 ioasc = be32_to_cpu(ipr_cmd->ioasa.ioasc);
 
        if (ioasc == IPR_IOASC_IR_INVALID_REQ_TYPE_OR_PKT) {
-               ipr_cmd->job_step = ipr_setup_write_cache;
+               ipr_cmd->job_step = ipr_set_supported_devs;
+               ipr_cmd->u.res = list_entry(ioa_cfg->used_res_q.next,
+                                           struct ipr_resource_entry, queue);
                return IPR_RC_JOB_CONTINUE;
        }
 
@@ -6167,24 +6686,36 @@ static int ipr_init_res_table(struct ipr_cmnd *ipr_cmd)
 {
        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
        struct ipr_resource_entry *res, *temp;
-       struct ipr_config_table_entry *cfgte;
-       int found, i;
+       struct ipr_config_table_entry_wrapper cfgtew;
+       int entries, found, flag, i;
        LIST_HEAD(old_res);
 
        ENTER;
-       if (ioa_cfg->cfg_table->hdr.flags & IPR_UCODE_DOWNLOAD_REQ)
+       if (ioa_cfg->sis64)
+               flag = ioa_cfg->u.cfg_table64->hdr64.flags;
+       else
+               flag = ioa_cfg->u.cfg_table->hdr.flags;
+
+       if (flag & IPR_UCODE_DOWNLOAD_REQ)
                dev_err(&ioa_cfg->pdev->dev, "Microcode download required\n");
 
        list_for_each_entry_safe(res, temp, &ioa_cfg->used_res_q, queue)
                list_move_tail(&res->queue, &old_res);
 
-       for (i = 0; i < ioa_cfg->cfg_table->hdr.num_entries; i++) {
-               cfgte = &ioa_cfg->cfg_table->dev[i];
+       if (ioa_cfg->sis64)
+               entries = ioa_cfg->u.cfg_table64->hdr64.num_entries;
+       else
+               entries = ioa_cfg->u.cfg_table->hdr.num_entries;
+
+       for (i = 0; i < entries; i++) {
+               if (ioa_cfg->sis64)
+                       cfgtew.u.cfgte64 = &ioa_cfg->u.cfg_table64->dev[i];
+               else
+                       cfgtew.u.cfgte = &ioa_cfg->u.cfg_table->dev[i];
                found = 0;
 
                list_for_each_entry_safe(res, temp, &old_res, queue) {
-                       if (!memcmp(&res->cfgte.res_addr,
-                                   &cfgte->res_addr, sizeof(cfgte->res_addr))) {
+                       if (ipr_is_same_device(res, &cfgtew)) {
                                list_move_tail(&res->queue, &ioa_cfg->used_res_q);
                                found = 1;
                                break;
@@ -6201,24 +6732,27 @@ static int ipr_init_res_table(struct ipr_cmnd *ipr_cmd)
                        res = list_entry(ioa_cfg->free_res_q.next,
                                         struct ipr_resource_entry, queue);
                        list_move_tail(&res->queue, &ioa_cfg->used_res_q);
-                       ipr_init_res_entry(res);
+                       ipr_init_res_entry(res, &cfgtew);
                        res->add_to_ml = 1;
                }
 
                if (found)
-                       memcpy(&res->cfgte, cfgte, sizeof(struct ipr_config_table_entry));
+                       ipr_update_res_entry(res, &cfgtew);
        }
 
        list_for_each_entry_safe(res, temp, &old_res, queue) {
                if (res->sdev) {
                        res->del_from_ml = 1;
-                       res->cfgte.res_handle = IPR_INVALID_RES_HANDLE;
+                       res->res_handle = IPR_INVALID_RES_HANDLE;
                        list_move_tail(&res->queue, &ioa_cfg->used_res_q);
-               } else {
-                       list_move_tail(&res->queue, &ioa_cfg->free_res_q);
                }
        }
 
+       list_for_each_entry_safe(res, temp, &old_res, queue) {
+               ipr_clear_res_target(res);
+               list_move_tail(&res->queue, &ioa_cfg->free_res_q);
+       }
+
        if (ioa_cfg->dual_raid && ipr_dual_ioa_raid)
                ipr_cmd->job_step = ipr_ioafp_mode_sense_page24;
        else
@@ -6255,11 +6789,10 @@ static int ipr_ioafp_query_ioa_cfg(struct ipr_cmnd *ipr_cmd)
        ioarcb->res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
 
        ioarcb->cmd_pkt.cdb[0] = IPR_QUERY_IOA_CONFIG;
-       ioarcb->cmd_pkt.cdb[7] = (sizeof(struct ipr_config_table) >> 8) & 0xff;
-       ioarcb->cmd_pkt.cdb[8] = sizeof(struct ipr_config_table) & 0xff;
+       ioarcb->cmd_pkt.cdb[7] = (ioa_cfg->cfg_table_size >> 8) & 0xff;
+       ioarcb->cmd_pkt.cdb[8] = ioa_cfg->cfg_table_size & 0xff;
 
-       ipr_init_ioadl(ipr_cmd, ioa_cfg->cfg_table_dma,
-                      sizeof(struct ipr_config_table),
+       ipr_init_ioadl(ipr_cmd, ioa_cfg->cfg_table_dma, ioa_cfg->cfg_table_size,
                       IPR_IOADL_FLAGS_READ_LAST);
 
        ipr_cmd->job_step = ipr_init_res_table;
@@ -6364,13 +6897,9 @@ static int ipr_ioafp_cap_inquiry(struct ipr_cmnd *ipr_cmd)
 static int ipr_ioafp_page3_inquiry(struct ipr_cmnd *ipr_cmd)
 {
        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
-       struct ipr_inquiry_page0 *page0 = &ioa_cfg->vpd_cbs->page0_data;
 
        ENTER;
 
-       if (!ipr_inquiry_page_supported(page0, 1))
-               ioa_cfg->cache_state = CACHE_NONE;
-
        ipr_cmd->job_step = ipr_ioafp_cap_inquiry;
 
        ipr_ioafp_inquiry(ipr_cmd, 1, 3,
@@ -6438,7 +6967,7 @@ static int ipr_ioafp_std_inquiry(struct ipr_cmnd *ipr_cmd)
 }
 
 /**
- * ipr_ioafp_indentify_hrrq - Send Identify Host RRQ.
+ * ipr_ioafp_identify_hrrq - Send Identify Host RRQ.
  * @ipr_cmd:   ipr command struct
  *
  * This function send an Identify Host Request Response Queue
@@ -6447,7 +6976,7 @@ static int ipr_ioafp_std_inquiry(struct ipr_cmnd *ipr_cmd)
  * Return value:
  *     IPR_RC_JOB_RETURN
  **/
-static int ipr_ioafp_indentify_hrrq(struct ipr_cmnd *ipr_cmd)
+static int ipr_ioafp_identify_hrrq(struct ipr_cmnd *ipr_cmd)
 {
        struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
        struct ipr_ioarcb *ioarcb = &ipr_cmd->ioarcb;
@@ -6459,19 +6988,32 @@ static int ipr_ioafp_indentify_hrrq(struct ipr_cmnd *ipr_cmd)
        ioarcb->res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
 
        ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
+       if (ioa_cfg->sis64)
+               ioarcb->cmd_pkt.cdb[1] = 0x1;
        ioarcb->cmd_pkt.cdb[2] =
-               ((u32) ioa_cfg->host_rrq_dma >> 24) & 0xff;
+               ((u64) ioa_cfg->host_rrq_dma >> 24) & 0xff;
        ioarcb->cmd_pkt.cdb[3] =
-               ((u32) ioa_cfg->host_rrq_dma >> 16) & 0xff;
+               ((u64) ioa_cfg->host_rrq_dma >> 16) & 0xff;
        ioarcb->cmd_pkt.cdb[4] =
-               ((u32) ioa_cfg->host_rrq_dma >> 8) & 0xff;
+               ((u64) ioa_cfg->host_rrq_dma >> 8) & 0xff;
        ioarcb->cmd_pkt.cdb[5] =
-               ((u32) ioa_cfg->host_rrq_dma) & 0xff;
+               ((u64) ioa_cfg->host_rrq_dma) & 0xff;
        ioarcb->cmd_pkt.cdb[7] =
                ((sizeof(u32) * IPR_NUM_CMD_BLKS) >> 8) & 0xff;
        ioarcb->cmd_pkt.cdb[8] =
                (sizeof(u32) * IPR_NUM_CMD_BLKS) & 0xff;
 
+       if (ioa_cfg->sis64) {
+               ioarcb->cmd_pkt.cdb[10] =
+                       ((u64) ioa_cfg->host_rrq_dma >> 56) & 0xff;
+               ioarcb->cmd_pkt.cdb[11] =
+                       ((u64) ioa_cfg->host_rrq_dma >> 48) & 0xff;
+               ioarcb->cmd_pkt.cdb[12] =
+                       ((u64) ioa_cfg->host_rrq_dma >> 40) & 0xff;
+               ioarcb->cmd_pkt.cdb[13] =
+                       ((u64) ioa_cfg->host_rrq_dma >> 32) & 0xff;
+       }
+
        ipr_cmd->job_step = ipr_ioafp_std_inquiry;
 
        ipr_do_req(ipr_cmd, ipr_reset_ioa_job, ipr_timeout, IPR_INTERNAL_TIMEOUT);
@@ -6552,7 +7094,58 @@ static void ipr_init_ioa_mem(struct ipr_ioa_cfg *ioa_cfg)
        ioa_cfg->toggle_bit = 1;
 
        /* Zero out config table */
-       memset(ioa_cfg->cfg_table, 0, sizeof(struct ipr_config_table));
+       memset(ioa_cfg->u.cfg_table, 0, ioa_cfg->cfg_table_size);
+}
+
+/**
+ * ipr_reset_next_stage - Process IPL stage change based on feedback register.
+ * @ipr_cmd:   ipr command struct
+ *
+ * Return value:
+ *     IPR_RC_JOB_CONTINUE / IPR_RC_JOB_RETURN
+ **/
+static int ipr_reset_next_stage(struct ipr_cmnd *ipr_cmd)
+{
+       unsigned long stage, stage_time;
+       u32 feedback;
+       volatile u32 int_reg;
+       struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+       u64 maskval = 0;
+
+       feedback = readl(ioa_cfg->regs.init_feedback_reg);
+       stage = feedback & IPR_IPL_INIT_STAGE_MASK;
+       stage_time = feedback & IPR_IPL_INIT_STAGE_TIME_MASK;
+
+       ipr_dbg("IPL stage = 0x%lx, IPL stage time = %ld\n", stage, stage_time);
+
+       /* sanity check the stage_time value */
+       if (stage_time < IPR_IPL_INIT_MIN_STAGE_TIME)
+               stage_time = IPR_IPL_INIT_MIN_STAGE_TIME;
+       else if (stage_time > IPR_LONG_OPERATIONAL_TIMEOUT)
+               stage_time = IPR_LONG_OPERATIONAL_TIMEOUT;
+
+       if (stage == IPR_IPL_INIT_STAGE_UNKNOWN) {
+               writel(IPR_PCII_IPL_STAGE_CHANGE, ioa_cfg->regs.set_interrupt_mask_reg);
+               int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
+               stage_time = ioa_cfg->transop_timeout;
+               ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
+       } else if (stage == IPR_IPL_INIT_STAGE_TRANSOP) {
+               ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
+               maskval = IPR_PCII_IPL_STAGE_CHANGE;
+               maskval = (maskval << 32) | IPR_PCII_IOA_TRANS_TO_OPER;
+               writeq(maskval, ioa_cfg->regs.set_interrupt_mask_reg);
+               int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
+               return IPR_RC_JOB_CONTINUE;
+       }
+
+       ipr_cmd->timer.data = (unsigned long) ipr_cmd;
+       ipr_cmd->timer.expires = jiffies + stage_time * HZ;
+       ipr_cmd->timer.function = (void (*)(unsigned long))ipr_oper_timeout;
+       ipr_cmd->done = ipr_reset_ioa_job;
+       add_timer(&ipr_cmd->timer);
+       list_add_tail(&ipr_cmd->queue, &ioa_cfg->pending_q);
+
+       return IPR_RC_JOB_RETURN;
 }
 
 /**
@@ -6571,7 +7164,7 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
        volatile u32 int_reg;
 
        ENTER;
-       ipr_cmd->job_step = ipr_ioafp_indentify_hrrq;
+       ipr_cmd->job_step = ipr_ioafp_identify_hrrq;
        ipr_init_ioa_mem(ioa_cfg);
 
        ioa_cfg->allow_interrupts = 1;
@@ -6579,19 +7172,27 @@ static int ipr_reset_enable_ioa(struct ipr_cmnd *ipr_cmd)
 
        if (int_reg & IPR_PCII_IOA_TRANS_TO_OPER) {
                writel((IPR_PCII_ERROR_INTERRUPTS | IPR_PCII_HRRQ_UPDATED),
-                      ioa_cfg->regs.clr_interrupt_mask_reg);
+                      ioa_cfg->regs.clr_interrupt_mask_reg32);
                int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
                return IPR_RC_JOB_CONTINUE;
        }
 
        /* Enable destructive diagnostics on IOA */
-       writel(ioa_cfg->doorbell, ioa_cfg->regs.set_uproc_interrupt_reg);
+       writel(ioa_cfg->doorbell, ioa_cfg->regs.set_uproc_interrupt_reg32);
+
+       writel(IPR_PCII_OPER_INTERRUPTS, ioa_cfg->regs.clr_interrupt_mask_reg32);
+       if (ioa_cfg->sis64)
+               writel(IPR_PCII_IPL_STAGE_CHANGE, ioa_cfg->regs.clr_interrupt_mask_reg);
 
-       writel(IPR_PCII_OPER_INTERRUPTS, ioa_cfg->regs.clr_interrupt_mask_reg);
        int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
 
        dev_info(&ioa_cfg->pdev->dev, "Initializing IOA.\n");
 
+       if (ioa_cfg->sis64) {
+               ipr_cmd->job_step = ipr_reset_next_stage;
+               return IPR_RC_JOB_CONTINUE;
+       }
+
        ipr_cmd->timer.data = (unsigned long) ipr_cmd;
        ipr_cmd->timer.expires = jiffies + (ioa_cfg->transop_timeout * HZ);
        ipr_cmd->timer.function = (void (*)(unsigned long))ipr_oper_timeout;
@@ -6661,7 +7262,7 @@ static void ipr_get_unit_check_buffer(struct ipr_ioa_cfg *ioa_cfg)
 
        mailbox = readl(ioa_cfg->ioa_mailbox);
 
-       if (!ipr_sdt_is_fmt2(mailbox)) {
+       if (!ioa_cfg->sis64 && !ipr_sdt_is_fmt2(mailbox)) {
                ipr_unit_check_no_data(ioa_cfg);
                return;
        }
@@ -6670,15 +7271,20 @@ static void ipr_get_unit_check_buffer(struct ipr_ioa_cfg *ioa_cfg)
        rc = ipr_get_ldump_data_section(ioa_cfg, mailbox, (__be32 *) &sdt,
                                        (sizeof(struct ipr_uc_sdt)) / sizeof(__be32));
 
-       if (rc || (be32_to_cpu(sdt.hdr.state) != IPR_FMT2_SDT_READY_TO_USE) ||
-           !(sdt.entry[0].flags & IPR_SDT_VALID_ENTRY)) {
+       if (rc || !(sdt.entry[0].flags & IPR_SDT_VALID_ENTRY) ||
+           ((be32_to_cpu(sdt.hdr.state) != IPR_FMT3_SDT_READY_TO_USE) &&
+           (be32_to_cpu(sdt.hdr.state) != IPR_FMT2_SDT_READY_TO_USE))) {
                ipr_unit_check_no_data(ioa_cfg);
                return;
        }
 
        /* Find length of the first sdt entry (UC buffer) */
-       length = (be32_to_cpu(sdt.entry[0].end_offset) -
-                 be32_to_cpu(sdt.entry[0].bar_str_offset)) & IPR_FMT2_MBX_ADDR_MASK;
+       if (be32_to_cpu(sdt.hdr.state) == IPR_FMT3_SDT_READY_TO_USE)
+               length = be32_to_cpu(sdt.entry[0].end_token);
+       else
+               length = (be32_to_cpu(sdt.entry[0].end_token) -
+                         be32_to_cpu(sdt.entry[0].start_token)) &
+                         IPR_FMT2_MBX_ADDR_MASK;
 
        hostrcb = list_entry(ioa_cfg->hostrcb_free_q.next,
                             struct ipr_hostrcb, queue);
@@ -6686,13 +7292,13 @@ static void ipr_get_unit_check_buffer(struct ipr_ioa_cfg *ioa_cfg)
        memset(&hostrcb->hcam, 0, sizeof(hostrcb->hcam));
 
        rc = ipr_get_ldump_data_section(ioa_cfg,
-                                       be32_to_cpu(sdt.entry[0].bar_str_offset),
+                                       be32_to_cpu(sdt.entry[0].start_token),
                                        (__be32 *)&hostrcb->hcam,
                                        min(length, (int)sizeof(hostrcb->hcam)) / sizeof(__be32));
 
        if (!rc) {
                ipr_handle_log_data(ioa_cfg, hostrcb);
-               ioasc = be32_to_cpu(hostrcb->hcam.u.error.failing_dev_ioasc);
+               ioasc = be32_to_cpu(hostrcb->hcam.u.error.fd_ioasc);
                if (ioasc == IPR_IOASC_NR_IOA_RESET_REQUIRED &&
                    ioa_cfg->sdt_state == GET_DUMP)
                        ioa_cfg->sdt_state = WAIT_FOR_DUMP;
@@ -6920,7 +7526,7 @@ static int ipr_reset_alert(struct ipr_cmnd *ipr_cmd)
 
        if ((rc == PCIBIOS_SUCCESSFUL) && (cmd_reg & PCI_COMMAND_MEMORY)) {
                ipr_mask_and_clear_interrupts(ioa_cfg, ~0);
-               writel(IPR_UPROCI_RESET_ALERT, ioa_cfg->regs.set_uproc_interrupt_reg);
+               writel(IPR_UPROCI_RESET_ALERT, ioa_cfg->regs.set_uproc_interrupt_reg32);
                ipr_cmd->job_step = ipr_reset_wait_to_start_bist;
        } else {
                ipr_cmd->job_step = ioa_cfg->reset;
@@ -7355,8 +7961,8 @@ static void ipr_free_mem(struct ipr_ioa_cfg *ioa_cfg)
        ipr_free_cmd_blks(ioa_cfg);
        pci_free_consistent(ioa_cfg->pdev, sizeof(u32) * IPR_NUM_CMD_BLKS,
                            ioa_cfg->host_rrq, ioa_cfg->host_rrq_dma);
-       pci_free_consistent(ioa_cfg->pdev, sizeof(struct ipr_config_table),
-                           ioa_cfg->cfg_table,
+       pci_free_consistent(ioa_cfg->pdev, ioa_cfg->cfg_table_size,
+                           ioa_cfg->u.cfg_table,
                            ioa_cfg->cfg_table_dma);
 
        for (i = 0; i < IPR_NUM_HCAMS; i++) {
@@ -7473,13 +8079,24 @@ static int __devinit ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
 
        ENTER;
        ioa_cfg->res_entries = kzalloc(sizeof(struct ipr_resource_entry) *
-                                      IPR_MAX_PHYSICAL_DEVS, GFP_KERNEL);
+                                      ioa_cfg->max_devs_supported, GFP_KERNEL);
 
        if (!ioa_cfg->res_entries)
                goto out;
 
-       for (i = 0; i < IPR_MAX_PHYSICAL_DEVS; i++)
+       if (ioa_cfg->sis64) {
+               ioa_cfg->target_ids = kzalloc(sizeof(unsigned long) *
+                                             BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL);
+               ioa_cfg->array_ids = kzalloc(sizeof(unsigned long) *
+                                            BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL);
+               ioa_cfg->vset_ids = kzalloc(sizeof(unsigned long) *
+                                           BITS_TO_LONGS(ioa_cfg->max_devs_supported), GFP_KERNEL);
+       }
+
+       for (i = 0; i < ioa_cfg->max_devs_supported; i++) {
                list_add_tail(&ioa_cfg->res_entries[i].queue, &ioa_cfg->free_res_q);
+               ioa_cfg->res_entries[i].ioa_cfg = ioa_cfg;
+       }
 
        ioa_cfg->vpd_cbs = pci_alloc_consistent(ioa_cfg->pdev,
                                                sizeof(struct ipr_misc_cbs),
@@ -7498,11 +8115,11 @@ static int __devinit ipr_alloc_mem(struct ipr_ioa_cfg *ioa_cfg)
        if (!ioa_cfg->host_rrq)
                goto out_ipr_free_cmd_blocks;
 
-       ioa_cfg->cfg_table = pci_alloc_consistent(ioa_cfg->pdev,
-                                                 sizeof(struct ipr_config_table),
-                                                 &ioa_cfg->cfg_table_dma);
+       ioa_cfg->u.cfg_table = pci_alloc_consistent(ioa_cfg->pdev,
+                                                   ioa_cfg->cfg_table_size,
+                                                   &ioa_cfg->cfg_table_dma);
 
-       if (!ioa_cfg->cfg_table)
+       if (!ioa_cfg->u.cfg_table)
                goto out_free_host_rrq;
 
        for (i = 0; i < IPR_NUM_HCAMS; i++) {
@@ -7536,8 +8153,9 @@ out_free_hostrcb_dma:
                                    ioa_cfg->hostrcb[i],
                                    ioa_cfg->hostrcb_dma[i]);
        }
-       pci_free_consistent(pdev, sizeof(struct ipr_config_table),
-                           ioa_cfg->cfg_table, ioa_cfg->cfg_table_dma);
+       pci_free_consistent(pdev, ioa_cfg->cfg_table_size,
+                           ioa_cfg->u.cfg_table,
+                           ioa_cfg->cfg_table_dma);
 out_free_host_rrq:
        pci_free_consistent(pdev, sizeof(u32) * IPR_NUM_CMD_BLKS,
                            ioa_cfg->host_rrq, ioa_cfg->host_rrq_dma);
@@ -7612,15 +8230,21 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg,
        init_waitqueue_head(&ioa_cfg->reset_wait_q);
        init_waitqueue_head(&ioa_cfg->msi_wait_q);
        ioa_cfg->sdt_state = INACTIVE;
-       if (ipr_enable_cache)
-               ioa_cfg->cache_state = CACHE_ENABLED;
-       else
-               ioa_cfg->cache_state = CACHE_DISABLED;
 
        ipr_initialize_bus_attr(ioa_cfg);
+       ioa_cfg->max_devs_supported = ipr_max_devs;
 
-       host->max_id = IPR_MAX_NUM_TARGETS_PER_BUS;
-       host->max_lun = IPR_MAX_NUM_LUNS_PER_TARGET;
+       if (ioa_cfg->sis64) {
+               host->max_id = IPR_MAX_SIS64_TARGETS_PER_BUS;
+               host->max_lun = IPR_MAX_SIS64_LUNS_PER_TARGET;
+               if (ipr_max_devs > IPR_MAX_SIS64_DEVS)
+                       ioa_cfg->max_devs_supported = IPR_MAX_SIS64_DEVS;
+       } else {
+               host->max_id = IPR_MAX_NUM_TARGETS_PER_BUS;
+               host->max_lun = IPR_MAX_NUM_LUNS_PER_TARGET;
+               if (ipr_max_devs > IPR_MAX_PHYSICAL_DEVS)
+                       ioa_cfg->max_devs_supported = IPR_MAX_PHYSICAL_DEVS;
+       }
        host->max_channel = IPR_MAX_BUS_TO_SCAN;
        host->unique_id = host->host_no;
        host->max_cmd_len = IPR_MAX_CDB_LEN;
@@ -7632,13 +8256,26 @@ static void __devinit ipr_init_ioa_cfg(struct ipr_ioa_cfg *ioa_cfg,
 
        t->set_interrupt_mask_reg = base + p->set_interrupt_mask_reg;
        t->clr_interrupt_mask_reg = base + p->clr_interrupt_mask_reg;
+       t->clr_interrupt_mask_reg32 = base + p->clr_interrupt_mask_reg32;
        t->sense_interrupt_mask_reg = base + p->sense_interrupt_mask_reg;
+       t->sense_interrupt_mask_reg32 = base + p->sense_interrupt_mask_reg32;
        t->clr_interrupt_reg = base + p->clr_interrupt_reg;
+       t->clr_interrupt_reg32 = base + p->clr_interrupt_reg32;
        t->sense_interrupt_reg = base + p->sense_interrupt_reg;
+       t->sense_interrupt_reg32 = base + p->sense_interrupt_reg32;
        t->ioarrin_reg = base + p->ioarrin_reg;
        t->sense_uproc_interrupt_reg = base + p->sense_uproc_interrupt_reg;
+       t->sense_uproc_interrupt_reg32 = base + p->sense_uproc_interrupt_reg32;
        t->set_uproc_interrupt_reg = base + p->set_uproc_interrupt_reg;
+       t->set_uproc_interrupt_reg32 = base + p->set_uproc_interrupt_reg32;
        t->clr_uproc_interrupt_reg = base + p->clr_uproc_interrupt_reg;
+       t->clr_uproc_interrupt_reg32 = base + p->clr_uproc_interrupt_reg32;
+
+       if (ioa_cfg->sis64) {
+               t->init_feedback_reg = base + p->init_feedback_reg;
+               t->dump_addr_reg = base + p->dump_addr_reg;
+               t->dump_data_reg = base + p->dump_data_reg;
+       }
 }
 
 /**
@@ -7710,7 +8347,7 @@ static int __devinit ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg,
        init_waitqueue_head(&ioa_cfg->msi_wait_q);
        ioa_cfg->msi_received = 0;
        ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
-       writel(IPR_PCII_IO_DEBUG_ACKNOWLEDGE, ioa_cfg->regs.clr_interrupt_mask_reg);
+       writel(IPR_PCII_IO_DEBUG_ACKNOWLEDGE, ioa_cfg->regs.clr_interrupt_mask_reg32);
        int_reg = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
        spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
 
@@ -7721,7 +8358,7 @@ static int __devinit ipr_test_msi(struct ipr_ioa_cfg *ioa_cfg,
        } else if (ipr_debug)
                dev_info(&pdev->dev, "IRQ assigned: %d\n", pdev->irq);
 
-       writel(IPR_PCII_IO_DEBUG_ACKNOWLEDGE, ioa_cfg->regs.sense_interrupt_reg);
+       writel(IPR_PCII_IO_DEBUG_ACKNOWLEDGE, ioa_cfg->regs.sense_interrupt_reg32);
        int_reg = readl(ioa_cfg->regs.sense_interrupt_reg);
        wait_event_timeout(ioa_cfg->msi_wait_q, ioa_cfg->msi_received, HZ);
        ipr_mask_and_clear_interrupts(ioa_cfg, ~IPR_PCII_IOA_TRANS_TO_OPER);
@@ -7881,6 +8518,15 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
        if ((rc = ipr_set_pcix_cmd_reg(ioa_cfg)))
                goto cleanup_nomem;
 
+       if (ioa_cfg->sis64)
+               ioa_cfg->cfg_table_size = (sizeof(struct ipr_config_table_hdr64)
+                               + ((sizeof(struct ipr_config_table_entry64)
+                               * ioa_cfg->max_devs_supported)));
+       else
+               ioa_cfg->cfg_table_size = (sizeof(struct ipr_config_table_hdr)
+                               + ((sizeof(struct ipr_config_table_entry)
+                               * ioa_cfg->max_devs_supported)));
+
        rc = ipr_alloc_mem(ioa_cfg);
        if (rc < 0) {
                dev_err(&pdev->dev,
@@ -7892,9 +8538,9 @@ static int __devinit ipr_probe_ioa(struct pci_dev *pdev,
         * If HRRQ updated interrupt is not masked, or reset alert is set,
         * the card is in an unknown state and needs a hard reset
         */
-       mask = readl(ioa_cfg->regs.sense_interrupt_mask_reg);
-       interrupts = readl(ioa_cfg->regs.sense_interrupt_reg);
-       uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg);
+       mask = readl(ioa_cfg->regs.sense_interrupt_mask_reg32);
+       interrupts = readl(ioa_cfg->regs.sense_interrupt_reg32);
+       uproc = readl(ioa_cfg->regs.sense_uproc_interrupt_reg32);
        if ((mask & IPR_PCII_HRRQ_UPDATED) == 0 || (uproc & IPR_UPROCI_RESET_ALERT))
                ioa_cfg->needs_hard_reset = 1;
        if (interrupts & IPR_PCII_ERROR_INTERRUPTS)
@@ -8182,9 +8828,6 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0,
              IPR_USE_LONG_TRANSOP_TIMEOUT },
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
-             PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0,
-             IPR_USE_LONG_TRANSOP_TIMEOUT },
-       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 },
        { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
              PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0,
@@ -8199,9 +8842,22 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = {
        { PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,
                PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572F, 0, 0,
                IPR_USE_LONG_TRANSOP_TIMEOUT },
-       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SCAMP_E,
-               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574D, 0, 0,
-               IPR_USE_LONG_TRANSOP_TIMEOUT },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B5, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574D, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B1, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C6, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0, 0 },
+       { PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+               PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57CE, 0, 0, 0 },
        { }
 };
 MODULE_DEVICE_TABLE(pci, ipr_pci_table);
@@ -8221,6 +8877,61 @@ static struct pci_driver ipr_driver = {
 };
 
 /**
+ * ipr_halt_done - Shutdown prepare completion
+ *
+ * Return value:
+ *     none
+ **/
+static void ipr_halt_done(struct ipr_cmnd *ipr_cmd)
+{
+       struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
+
+       list_add_tail(&ipr_cmd->queue, &ioa_cfg->free_q);
+}
+
+/**
+ * ipr_halt - Issue shutdown prepare to all adapters
+ *
+ * Return value:
+ *     NOTIFY_OK on success / NOTIFY_DONE on failure
+ **/
+static int ipr_halt(struct notifier_block *nb, ulong event, void *buf)
+{
+       struct ipr_cmnd *ipr_cmd;
+       struct ipr_ioa_cfg *ioa_cfg;
+       unsigned long flags = 0;
+
+       if (event != SYS_RESTART && event != SYS_HALT && event != SYS_POWER_OFF)
+               return NOTIFY_DONE;
+
+       spin_lock(&ipr_driver_lock);
+
+       list_for_each_entry(ioa_cfg, &ipr_ioa_head, queue) {
+               spin_lock_irqsave(ioa_cfg->host->host_lock, flags);
+               if (!ioa_cfg->allow_cmds) {
+                       spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
+                       continue;
+               }
+
+               ipr_cmd = ipr_get_free_ipr_cmnd(ioa_cfg);
+               ipr_cmd->ioarcb.res_handle = cpu_to_be32(IPR_IOA_RES_HANDLE);
+               ipr_cmd->ioarcb.cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
+               ipr_cmd->ioarcb.cmd_pkt.cdb[0] = IPR_IOA_SHUTDOWN;
+               ipr_cmd->ioarcb.cmd_pkt.cdb[1] = IPR_SHUTDOWN_PREPARE_FOR_NORMAL;
+
+               ipr_do_req(ipr_cmd, ipr_halt_done, ipr_timeout, IPR_DEVICE_RESET_TIMEOUT);
+               spin_unlock_irqrestore(ioa_cfg->host->host_lock, flags);
+       }
+       spin_unlock(&ipr_driver_lock);
+
+       return NOTIFY_OK;
+}
+
+static struct notifier_block ipr_notifier = {
+       ipr_halt, NULL, 0
+};
+
+/**
  * ipr_init - Module entry point
  *
  * Return value:
@@ -8231,6 +8942,7 @@ static int __init ipr_init(void)
        ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n",
                 IPR_DRIVER_VERSION, IPR_DRIVER_DATE);
 
+       register_reboot_notifier(&ipr_notifier);
        return pci_register_driver(&ipr_driver);
 }
 
@@ -8244,6 +8956,7 @@ static int __init ipr_init(void)
  **/
 static void __exit ipr_exit(void)
 {
+       unregister_reboot_notifier(&ipr_notifier);
        pci_unregister_driver(&ipr_driver);
 }