1 files changed, 172 insertions, 71 deletions

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 8cf967108500..6bec673c925c 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -36,23 +36,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.0.14"
-#define IPR_DRIVER_DATE "(May 2, 2005)"
-
-/*
- * IPR_DBG_TRACE: Setting this to 1 will turn on some general function tracing
- *                      resulting in a bunch of extra debugging printks to the console
- *
- * IPR_DEBUG:   Setting this to 1 will turn on some error path tracing.
- *                      Enables the ipr_trace macro.
- */
-#ifdef IPR_DEBUG_ALL
-#define IPR_DEBUG                               1
-#define IPR_DBG_TRACE                   1
-#else
-#define IPR_DEBUG                               0
-#define IPR_DBG_TRACE                   0
-#endif
+#define IPR_DRIVER_VERSION "2.1.0"
+#define IPR_DRIVER_DATE "(October 31, 2005)"
 
 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -76,6 +61,10 @@
 #define IPR_SUBS_DEV_ID_571A    0x02C0
 #define IPR_SUBS_DEV_ID_571B    0x02BE
 #define IPR_SUBS_DEV_ID_571E  0x02BF
+#define IPR_SUBS_DEV_ID_571F    0x02D5
+#define IPR_SUBS_DEV_ID_572A    0x02C1
+#define IPR_SUBS_DEV_ID_572B    0x02C2
+#define IPR_SUBS_DEV_ID_575B    0x030D
 
 #define IPR_NAME                                "ipr"
 
@@ -95,7 +84,10 @@
 #define IPR_IOASC_HW_DEV_BUS_STATUS                     0x04448500
 #define IPR_IOASC_IOASC_MASK                    0xFFFFFF00
 #define IPR_IOASC_SCSI_STATUS_MASK              0x000000FF
+#define IPR_IOASC_IR_INVALID_REQ_TYPE_OR_PKT    0x05240000
 #define IPR_IOASC_IR_RESOURCE_HANDLE            0x05250000
+#define IPR_IOASC_IR_NO_CMDS_TO_2ND_IOA         0x05258100
+#define IPR_IOASA_IR_DUAL_IOA_DISABLED          0x052C8000
 #define IPR_IOASC_BUS_WAS_RESET                 0x06290000
 #define IPR_IOASC_BUS_WAS_RESET_BY_OTHER                0x06298000
 #define IPR_IOASC_ABORTED_CMD_TERM_BY_HOST      0x0B5A0000
@@ -107,14 +99,14 @@
 #define IPR_NUM_LOG_HCAMS                               2
 #define IPR_NUM_CFG_CHG_HCAMS                           2
 #define IPR_NUM_HCAMS   (IPR_NUM_LOG_HCAMS + IPR_NUM_CFG_CHG_HCAMS)
-#define IPR_MAX_NUM_TARGETS_PER_BUS                     0x10
+#define IPR_MAX_NUM_TARGETS_PER_BUS                     256
 #define IPR_MAX_NUM_LUNS_PER_TARGET                     256
 #define IPR_MAX_NUM_VSET_LUNS_PER_TARGET        8
 #define IPR_VSET_BUS                                    0xff
 #define IPR_IOA_BUS                                             0xff
 #define IPR_IOA_TARGET                                  0xff
 #define IPR_IOA_LUN                                             0xff
-#define IPR_MAX_NUM_BUSES                               4
+#define IPR_MAX_NUM_BUSES                               8
 #define IPR_MAX_BUS_TO_SCAN                             IPR_MAX_NUM_BUSES
 
 #define IPR_NUM_RESET_RELOAD_RETRIES            3
@@ -205,6 +197,7 @@
 #define IPR_SDT_FMT2_EXP_ROM_SEL                        0x8
 #define IPR_FMT2_SDT_READY_TO_USE                       0xC4D4E3F2
 #define IPR_DOORBELL                                    0x82800000
+#define IPR_RUNTIME_RESET                               0x40000000
 
 #define IPR_PCII_IOA_TRANS_TO_OPER                      (0x80000000 >> 0)
 #define IPR_PCII_IOARCB_XFER_FAILED                     (0x80000000 >> 3)
@@ -261,6 +254,16 @@ struct ipr_std_inq_vpids {
         u8 product_id[IPR_PROD_ID_LEN];
 }__attribute__((packed));
 
+struct ipr_vpd {
+        struct ipr_std_inq_vpids vpids;
+        u8 sn[IPR_SERIAL_NUM_LEN];
+}__attribute__((packed));
+
+struct ipr_ext_vpd {
+        struct ipr_vpd vpd;
+        __be32 wwid[2];
+}__attribute__((packed));
+
 struct ipr_std_inq_data {
         u8 peri_qual_dev_type;
 #define IPR_STD_INQ_PERI_QUAL(peri) ((peri) >> 5)
@@ -304,6 +307,10 @@ struct ipr_config_table_entry {
 #define IPR_SUBTYPE_GENERIC_SCSI        1
 #define IPR_SUBTYPE_VOLUME_SET          2
 
+#define IPR_QUEUEING_MODEL(res) ((((res)->cfgte.flags) & 0x70) >> 4)
+#define IPR_QUEUE_FROZEN_MODEL  0
+#define IPR_QUEUE_NACA_MODEL            1
+
         struct ipr_res_addr res_addr;
         __be32 res_handle;
         __be32 reserved4[2];
@@ -410,23 +417,26 @@ struct ipr_ioadl_desc {
 struct ipr_ioasa_vset {
         __be32 failing_lba_hi;
         __be32 failing_lba_lo;
-        __be32 ioa_data[22];
+        __be32 reserved;
 }__attribute__((packed, aligned (4)));
 
 struct ipr_ioasa_af_dasd {
         __be32 failing_lba;
+        __be32 reserved[2];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_ioasa_gpdd {
         u8 end_state;
         u8 bus_phase;
         __be16 reserved;
-        __be32 ioa_data[23];
+        __be32 ioa_data[2];
 }__attribute__((packed, aligned (4)));
 
-struct ipr_ioasa_raw {
-        __be32 ioa_data[24];
-}__attribute__((packed, aligned (4)));
+struct ipr_auto_sense {
+        __be16 auto_sense_len;
+        __be16 ioa_data_len;
+        __be32 data[SCSI_SENSE_BUFFERSIZE/sizeof(__be32)];
+};
 
 struct ipr_ioasa {
         __be32 ioasc;
@@ -453,6 +463,8 @@ struct ipr_ioasa {
         __be32 fd_res_handle;
 
         __be32 ioasc_specific;  /* status code specific field */
+#define IPR_ADDITIONAL_STATUS_FMT               0x80000000
+#define IPR_AUTOSENSE_VALID                     0x40000000
 #define IPR_IOASC_SPECIFIC_MASK         0x00ffffff
 #define IPR_FIELD_POINTER_VALID         (0x80000000 >> 8)
 #define IPR_FIELD_POINTER_MASK          0x0000ffff
@@ -461,8 +473,9 @@ struct ipr_ioasa {
                 struct ipr_ioasa_vset vset;
                 struct ipr_ioasa_af_dasd dasd;
                 struct ipr_ioasa_gpdd gpdd;
-                struct ipr_ioasa_raw raw;
         } u;
+
+        struct ipr_auto_sense auto_sense;
 }__attribute__((packed, aligned (4)));
 
 struct ipr_mode_parm_hdr {
@@ -536,28 +549,49 @@ struct ipr_inquiry_page3 {
         u8 patch_number[4];
 }__attribute__((packed));
 
+#define IPR_INQUIRY_PAGE0_ENTRIES 20
+struct ipr_inquiry_page0 {
+        u8 peri_qual_dev_type;
+        u8 page_code;
+        u8 reserved1;
+        u8 len;
+        u8 page[IPR_INQUIRY_PAGE0_ENTRIES];
+}__attribute__((packed));
+
 struct ipr_hostrcb_device_data_entry {
-        struct ipr_std_inq_vpids dev_vpids;
-        u8 dev_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd vpd;
         struct ipr_res_addr dev_res_addr;
-        struct ipr_std_inq_vpids new_dev_vpids;
-        u8 new_dev_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids ioa_last_with_dev_vpids;
-        u8 ioa_last_with_dev_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_last_with_dev_vpids;
-        u8 cfc_last_with_dev_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd new_vpd;
+        struct ipr_vpd ioa_last_with_dev_vpd;
+        struct ipr_vpd cfc_last_with_dev_vpd;
         __be32 ioa_data[5];
 }__attribute__((packed, aligned (4)));
 
+struct ipr_hostrcb_device_data_entry_enhanced {
+        struct ipr_ext_vpd vpd;
+        u8 ccin[4];
+        struct ipr_res_addr dev_res_addr;
+        struct ipr_ext_vpd new_vpd;
+        u8 new_ccin[4];
+        struct ipr_ext_vpd ioa_last_with_dev_vpd;
+        struct ipr_ext_vpd cfc_last_with_dev_vpd;
+}__attribute__((packed, aligned (4)));
+
 struct ipr_hostrcb_array_data_entry {
-        struct ipr_std_inq_vpids vpids;
-        u8 serial_num[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd vpd;
+        struct ipr_res_addr expected_dev_res_addr;
+        struct ipr_res_addr dev_res_addr;
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_array_data_entry_enhanced {
+        struct ipr_ext_vpd vpd;
+        u8 ccin[4];
         struct ipr_res_addr expected_dev_res_addr;
         struct ipr_res_addr dev_res_addr;
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_ff_error {
-        __be32 ioa_data[246];
+        __be32 ioa_data[502];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_01_error {
@@ -568,47 +602,75 @@ struct ipr_hostrcb_type_01_error {
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_02_error {
-        struct ipr_std_inq_vpids ioa_vpids;
-        u8 ioa_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_vpids;
-        u8 cfc_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids ioa_last_attached_to_cfc_vpids;
-        u8 ioa_last_attached_to_cfc_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_last_attached_to_ioa_vpids;
-        u8 cfc_last_attached_to_ioa_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd ioa_vpd;
+        struct ipr_vpd cfc_vpd;
+        struct ipr_vpd ioa_last_attached_to_cfc_vpd;
+        struct ipr_vpd cfc_last_attached_to_ioa_vpd;
+        __be32 ioa_data[3];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_12_error {
+        struct ipr_ext_vpd ioa_vpd;
+        struct ipr_ext_vpd cfc_vpd;
+        struct ipr_ext_vpd ioa_last_attached_to_cfc_vpd;
+        struct ipr_ext_vpd cfc_last_attached_to_ioa_vpd;
         __be32 ioa_data[3];
-        u8 reserved[844];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_03_error {
-        struct ipr_std_inq_vpids ioa_vpids;
-        u8 ioa_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_vpids;
-        u8 cfc_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd ioa_vpd;
+        struct ipr_vpd cfc_vpd;
         __be32 errors_detected;
         __be32 errors_logged;
         u8 ioa_data[12];
-        struct ipr_hostrcb_device_data_entry dev_entry[3];
-        u8 reserved[444];
+        struct ipr_hostrcb_device_data_entry dev[3];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_13_error {
+        struct ipr_ext_vpd ioa_vpd;
+        struct ipr_ext_vpd cfc_vpd;
+        __be32 errors_detected;
+        __be32 errors_logged;
+        struct ipr_hostrcb_device_data_entry_enhanced dev[3];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_type_04_error {
-        struct ipr_std_inq_vpids ioa_vpids;
-        u8 ioa_sn[IPR_SERIAL_NUM_LEN];
-        struct ipr_std_inq_vpids cfc_vpids;
-        u8 cfc_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd ioa_vpd;
+        struct ipr_vpd cfc_vpd;
         u8 ioa_data[12];
         struct ipr_hostrcb_array_data_entry array_member[10];
         __be32 exposed_mode_adn;
         __be32 array_id;
-        struct ipr_std_inq_vpids incomp_dev_vpids;
-        u8 incomp_dev_sn[IPR_SERIAL_NUM_LEN];
+        struct ipr_vpd incomp_dev_vpd;
         __be32 ioa_data2;
         struct ipr_hostrcb_array_data_entry array_member2[8];
         struct ipr_res_addr last_func_vset_res_addr;
         u8 vset_serial_num[IPR_SERIAL_NUM_LEN];
         u8 protection_level[8];
-        u8 reserved[124];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_14_error {
+        struct ipr_ext_vpd ioa_vpd;
+        struct ipr_ext_vpd cfc_vpd;
+        __be32 exposed_mode_adn;
+        __be32 array_id;
+        struct ipr_res_addr last_func_vset_res_addr;
+        u8 vset_serial_num[IPR_SERIAL_NUM_LEN];
+        u8 protection_level[8];
+        __be32 num_entries;
+        struct ipr_hostrcb_array_data_entry_enhanced array_member[18];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_07_error {
+        u8 failure_reason[64];
+        struct ipr_vpd vpd;
+        u32 data[222];
+}__attribute__((packed, aligned (4)));
+
+struct ipr_hostrcb_type_17_error {
+        u8 failure_reason[64];
+        struct ipr_ext_vpd vpd;
+        u32 data[476];
 }__attribute__((packed, aligned (4)));
 
 struct ipr_hostrcb_error {
@@ -622,6 +684,11 @@ struct ipr_hostrcb_error {
                 struct ipr_hostrcb_type_02_error type_02_error;
                 struct ipr_hostrcb_type_03_error type_03_error;
                 struct ipr_hostrcb_type_04_error type_04_error;
+                struct ipr_hostrcb_type_07_error type_07_error;
+                struct ipr_hostrcb_type_12_error type_12_error;
+                struct ipr_hostrcb_type_13_error type_13_error;
+                struct ipr_hostrcb_type_14_error type_14_error;
+                struct ipr_hostrcb_type_17_error type_17_error;
         } u;
 }__attribute__((packed, aligned (4)));
 
@@ -655,6 +722,12 @@ struct ipr_hcam {
 #define IPR_HOST_RCB_OVERLAY_ID_3                               0x03
 #define IPR_HOST_RCB_OVERLAY_ID_4                               0x04
 #define IPR_HOST_RCB_OVERLAY_ID_6                               0x06
+#define IPR_HOST_RCB_OVERLAY_ID_7                               0x07
+#define IPR_HOST_RCB_OVERLAY_ID_12                              0x12
+#define IPR_HOST_RCB_OVERLAY_ID_13                              0x13
+#define IPR_HOST_RCB_OVERLAY_ID_14                              0x14
+#define IPR_HOST_RCB_OVERLAY_ID_16                              0x16
+#define IPR_HOST_RCB_OVERLAY_ID_17                              0x17
 #define IPR_HOST_RCB_OVERLAY_ID_DEFAULT                 0xFF
 
         u8 reserved1[3];
@@ -743,6 +816,7 @@ struct ipr_resource_table {
 
 struct ipr_misc_cbs {
         struct ipr_ioa_vpd ioa_vpd;
+        struct ipr_inquiry_page0 page0_data;
         struct ipr_inquiry_page3 page3_data;
         struct ipr_mode_pages mode_pages;
         struct ipr_supported_device supp_dev;
@@ -813,6 +887,7 @@ struct ipr_trace_entry {
 struct ipr_sglist {
         u32 order;
         u32 num_sg;
+        u32 num_dma_sg;
         u32 buffer_len;
         struct scatterlist scatterlist[1];
 };
@@ -825,6 +900,13 @@ enum ipr_sdt_state {
         DUMP_OBTAINED
 };
 
+enum ipr_cache_state {
+        CACHE_NONE,
+        CACHE_DISABLED,
+        CACHE_ENABLED,
+        CACHE_INVALID
+};
+
 /* Per-controller data */
 struct ipr_ioa_cfg {
         char eye_catcher[8];
@@ -841,6 +923,7 @@ struct ipr_ioa_cfg {
         u8 allow_cmds:1;
         u8 allow_ml_add_del:1;
 
+        enum ipr_cache_state cache_state;
         u16 type; /* CCIN of the card */
 
         u8 log_level;
@@ -911,6 +994,7 @@ struct ipr_ioa_cfg {
         u16 reset_retries;
 
         u32 errors_logged;
+        u32 doorbell;
 
         struct Scsi_Host *host;
         struct pci_dev *pdev;
@@ -948,6 +1032,7 @@ struct ipr_cmnd {
         struct timer_list timer;
         void (*done) (struct ipr_cmnd *);
         int (*job_step) (struct ipr_cmnd *);
+        int (*job_step_failed) (struct ipr_cmnd *);
         u16 cmd_index;
         u8 sense_buffer[SCSI_SENSE_BUFFERSIZE];
         dma_addr_t sense_buffer_dma;
@@ -1083,11 +1168,7 @@ struct ipr_ucode_image_header {
 /*
  * Macros
  */
-#if IPR_DEBUG
-#define IPR_DBG_CMD(CMD) do { CMD; } while (0)
-#else
-#define IPR_DBG_CMD(CMD)
-#endif
+#define IPR_DBG_CMD(CMD) if (ipr_debug) { CMD; }
 
 #ifdef CONFIG_SCSI_IPR_TRACE
 #define ipr_create_trace_file(kobj, attr) sysfs_create_bin_file(kobj, attr)
@@ -1135,16 +1216,22 @@ struct ipr_ucode_image_header {
 #define ipr_res_dbg(ioa_cfg, res, fmt, ...) \
         IPR_DBG_CMD(ipr_res_printk(KERN_INFO, ioa_cfg, res, fmt, ##__VA_ARGS__))
 
+#define ipr_phys_res_err(ioa_cfg, res, fmt, ...)                        \
+{                                                                       \
+        if ((res).bus >= IPR_MAX_NUM_BUSES) {                           \
+                ipr_err(fmt": unknown\n", ##__VA_ARGS__);               \
+        } else {                                                        \
+                ipr_err(fmt": %d:%d:%d:%d\n",                           \
+                        ##__VA_ARGS__, (ioa_cfg)->host->host_no,        \
+                        (res).bus, (res).target, (res).lun);            \
+        }                                                               \
+}
+
 #define ipr_trace ipr_dbg("%s: %s: Line: %d\n",\
         __FILE__, __FUNCTION__, __LINE__)
 
-#if IPR_DBG_TRACE
-#define ENTER printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__)
-#define LEAVE printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__)
-#else
-#define ENTER
-#define LEAVE
-#endif
+#define ENTER IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Entering %s\n", __FUNCTION__))
+#define LEAVE IPR_DBG_CMD(printk(KERN_INFO IPR_NAME": Leaving %s\n", __FUNCTION__))
 
 #define ipr_err_separator \
 ipr_err("----------------------------------------------------------\n")
@@ -1217,6 +1304,20 @@ static inline int ipr_is_gscsi(struct ipr_resource_entry *res)
 }
 
 /**
+ * ipr_is_naca_model - Determine if a resource is using NACA queueing model
+ * @res:        resource entry struct
+ *
+ * Return value:
+ *      1 if NACA queueing model / 0 if not NACA queueing model
+ **/
+static inline int ipr_is_naca_model(struct ipr_resource_entry *res)
+{
+        if (ipr_is_gscsi(res) && IPR_QUEUEING_MODEL(res) == IPR_QUEUE_NACA_MODEL)
+                return 1;
+        return 0;
+}
+
+/**
  * ipr_is_device - Determine if resource address is that of a device
  * @res_addr:   resource address struct
  *
@@ -1226,7 +1327,7 @@ static inline int ipr_is_gscsi(struct ipr_resource_entry *res)
 static inline int ipr_is_device(struct ipr_res_addr *res_addr)
 {
         if ((res_addr->bus < IPR_MAX_NUM_BUSES) &&
-            (res_addr->target < IPR_MAX_NUM_TARGETS_PER_BUS))
+            (res_addr->target < (IPR_MAX_NUM_TARGETS_PER_BUS - 1)))
                 return 1;
 
         return 0;