1 files changed, 240 insertions, 94 deletions

diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h
index cb988c41cad9..3a621c74b76f 100644
--- a/drivers/scsi/hpsa_cmd.h
+++ b/drivers/scsi/hpsa_cmd.h
@@ -206,27 +206,27 @@ struct raid_map_disk_data {
 };
 
 struct raid_map_data {
-        u32   structure_size;           /* Size of entire structure in bytes */
-        u32   volume_blk_size;          /* bytes / block in the volume */
-        u64   volume_blk_cnt;           /* logical blocks on the volume */
+        __le32   structure_size;        /* Size of entire structure in bytes */
+        __le32   volume_blk_size;       /* bytes / block in the volume */
+        __le64   volume_blk_cnt;        /* logical blocks on the volume */
         u8    phys_blk_shift;           /* Shift factor to convert between
                                          * units of logical blocks and physical
                                          * disk blocks */
         u8    parity_rotation_shift;    /* Shift factor to convert between units
                                          * of logical stripes and physical
                                          * stripes */
-        u16   strip_size;               /* blocks used on each disk / stripe */
-        u64   disk_starting_blk;        /* First disk block used in volume */
-        u64   disk_blk_cnt;             /* disk blocks used by volume / disk */
-        u16   data_disks_per_row;       /* data disk entries / row in the map */
-        u16   metadata_disks_per_row;   /* mirror/parity disk entries / row
+        __le16   strip_size;            /* blocks used on each disk / stripe */
+        __le64   disk_starting_blk;     /* First disk block used in volume */
+        __le64   disk_blk_cnt;          /* disk blocks used by volume / disk */
+        __le16   data_disks_per_row;    /* data disk entries / row in the map */
+        __le16   metadata_disks_per_row;/* mirror/parity disk entries / row
                                          * in the map */
-        u16   row_cnt;                  /* rows in each layout map */
-        u16   layout_map_count;         /* layout maps (1 map per mirror/parity
+        __le16   row_cnt;               /* rows in each layout map */
+        __le16   layout_map_count;      /* layout maps (1 map per mirror/parity
                                          * group) */
-        u16   flags;                    /* Bit 0 set if encryption enabled */
+        __le16   flags;                 /* Bit 0 set if encryption enabled */
 #define RAID_MAP_FLAG_ENCRYPT_ON  0x01
-        u16   dekindex;                 /* Data encryption key index. */
+        __le16   dekindex;              /* Data encryption key index. */
         u8    reserved[16];
         struct raid_map_disk_data data[RAID_MAP_MAX_ENTRIES];
 };
@@ -240,6 +240,10 @@ struct ReportLUNdata {
 
 struct ext_report_lun_entry {
         u8 lunid[8];
+#define GET_BMIC_BUS(lunid) ((lunid)[7] & 0x3F)
+#define GET_BMIC_LEVEL_TWO_TARGET(lunid) ((lunid)[6])
+#define GET_BMIC_DRIVE_NUMBER(lunid) (((GET_BMIC_BUS((lunid)) - 1) << 8) + \
+                        GET_BMIC_LEVEL_TWO_TARGET((lunid)))
         u8 wwid[8];
         u8 device_type;
         u8 device_flags;
@@ -268,6 +272,7 @@ struct SenseSubsystem_info {
 #define HPSA_CACHE_FLUSH 0x01   /* C2 was already being used by HPSA */
 #define BMIC_FLASH_FIRMWARE 0xF7
 #define BMIC_SENSE_CONTROLLER_PARAMETERS 0x64
+#define BMIC_IDENTIFY_PHYSICAL_DEVICE 0x15
 
 /* Command List Structure */
 union SCSI3Addr {
@@ -313,8 +318,8 @@ union LUNAddr {
 struct CommandListHeader {
         u8              ReplyQueue;
         u8              SGList;
-        u16             SGTotal;
-        u64             tag;
+        __le16          SGTotal;
+        __le64          tag;
         union LUNAddr     LUN;
 };
 
@@ -338,14 +343,14 @@ struct RequestBlock {
 };
 
 struct ErrDescriptor {
-        u64 Addr;
-        u32  Len;
+        __le64 Addr;
+        __le32 Len;
 };
 
 struct SGDescriptor {
-        u64 Addr;
-        u32  Len;
-        u32  Ext;
+        __le64 Addr;
+        __le32 Len;
+        __le32 Ext;
 };
 
 union MoreErrInfo {
@@ -375,22 +380,19 @@ struct ErrorInfo {
 #define CMD_IOACCEL1    0x04
 #define CMD_IOACCEL2    0x05
 
-#define DIRECT_LOOKUP_SHIFT 5
-#define DIRECT_LOOKUP_BIT 0x10
+#define DIRECT_LOOKUP_SHIFT 4
 #define DIRECT_LOOKUP_MASK (~((1 << DIRECT_LOOKUP_SHIFT) - 1))
 
 #define HPSA_ERROR_BIT          0x02
 struct ctlr_info; /* defined in hpsa.h */
-/* The size of this structure needs to be divisible by 32
- * on all architectures because low 5 bits of the addresses
+/* The size of this structure needs to be divisible by 128
+ * on all architectures.  The low 4 bits of the addresses
  * are used as follows:
  *
  * bit 0: to device, used to indicate "performant mode" command
  *        from device, indidcates error status.
  * bit 1-3: to device, indicates block fetch table entry for
  *          reducing DMA in fetching commands from host memory.
- * bit 4: used to indicate whether tag is "direct lookup" (index),
- *        or a bus address.
  */
 
 #define COMMANDLIST_ALIGNMENT 128
@@ -405,9 +407,21 @@ struct CommandList {
         struct ctlr_info           *h;
         int                        cmd_type;
         long                       cmdindex;
-        struct list_head list;
         struct completion *waiting;
-        void   *scsi_cmd;
+        struct scsi_cmnd *scsi_cmd;
+        struct work_struct work;
+
+        /*
+         * For commands using either of the two "ioaccel" paths to
+         * bypass the RAID stack and go directly to the physical disk
+         * phys_disk is a pointer to the hpsa_scsi_dev_t to which the
+         * i/o is destined.  We need to store that here because the command
+         * may potentially encounter TASK SET FULL and need to be resubmitted
+         * For "normal" i/o's not using the "ioaccel" paths, phys_disk is
+         * not used.
+         */
+        struct hpsa_scsi_dev_t *phys_disk;
+        atomic_t refcount; /* Must be last to avoid memset in cmd_alloc */
 } __aligned(COMMANDLIST_ALIGNMENT);
 
 /* Max S/G elements in I/O accelerator command */
@@ -420,7 +434,7 @@ struct CommandList {
  */
 #define IOACCEL1_COMMANDLIST_ALIGNMENT 128
 struct io_accel1_cmd {
-        u16 dev_handle;                 /* 0x00 - 0x01 */
+        __le16 dev_handle;              /* 0x00 - 0x01 */
         u8  reserved1;                  /* 0x02 */
         u8  function;                   /* 0x03 */
         u8  reserved2[8];               /* 0x04 - 0x0B */
@@ -430,20 +444,20 @@ struct io_accel1_cmd {
         u8  reserved4;                  /* 0x13 */
         u8  sgl_offset;                 /* 0x14 */
         u8  reserved5[7];               /* 0x15 - 0x1B */
-        u32 transfer_len;               /* 0x1C - 0x1F */
+        __le32 transfer_len;            /* 0x1C - 0x1F */
         u8  reserved6[4];               /* 0x20 - 0x23 */
-        u16 io_flags;                   /* 0x24 - 0x25 */
+        __le16 io_flags;                /* 0x24 - 0x25 */
         u8  reserved7[14];              /* 0x26 - 0x33 */
         u8  LUN[8];                     /* 0x34 - 0x3B */
-        u32 control;                    /* 0x3C - 0x3F */
+        __le32 control;                 /* 0x3C - 0x3F */
         u8  CDB[16];                    /* 0x40 - 0x4F */
         u8  reserved8[16];              /* 0x50 - 0x5F */
-        u16 host_context_flags;         /* 0x60 - 0x61 */
-        u16 timeout_sec;                /* 0x62 - 0x63 */
+        __le16 host_context_flags;      /* 0x60 - 0x61 */
+        __le16 timeout_sec;             /* 0x62 - 0x63 */
         u8  ReplyQueue;                 /* 0x64 */
         u8  reserved9[3];               /* 0x65 - 0x67 */
-        u64 tag;                        /* 0x68 - 0x6F */
-        u64 host_addr;                  /* 0x70 - 0x77 */
+        __le64 tag;                     /* 0x68 - 0x6F */
+        __le64 host_addr;               /* 0x70 - 0x77 */
         u8  CISS_LUN[8];                /* 0x78 - 0x7F */
         struct SGDescriptor SG[IOACCEL1_MAXSGENTRIES];
 } __aligned(IOACCEL1_COMMANDLIST_ALIGNMENT);
@@ -470,8 +484,8 @@ struct io_accel1_cmd {
 #define IOACCEL1_BUSADDR_CMDTYPE        0x00000060
 
 struct ioaccel2_sg_element {
-        u64 address;
-        u32 length;
+        __le64 address;
+        __le32 length;
         u8 reserved[3];
         u8 chain_indicator;
 #define IOACCEL2_CHAIN 0x80
@@ -526,20 +540,20 @@ struct io_accel2_cmd {
                                              /*     0=off, 1=on */
         u8  reply_queue;                /* Reply Queue ID */
         u8  reserved1;                  /* Reserved */
-        u32 scsi_nexus;                 /* Device Handle */
-        u32 Tag;                        /* cciss tag, lower 4 bytes only */
-        u32 tweak_lower;                /* Encryption tweak, lower 4 bytes */
+        __le32 scsi_nexus;              /* Device Handle */
+        __le32 Tag;                     /* cciss tag, lower 4 bytes only */
+        __le32 tweak_lower;             /* Encryption tweak, lower 4 bytes */
         u8  cdb[16];                    /* SCSI Command Descriptor Block */
         u8  cciss_lun[8];               /* 8 byte SCSI address */
-        u32 data_len;                   /* Total bytes to transfer */
+        __le32 data_len;                /* Total bytes to transfer */
         u8  cmd_priority_task_attr;     /* priority and task attrs */
 #define IOACCEL2_PRIORITY_MASK 0x78
 #define IOACCEL2_ATTR_MASK 0x07
         u8  sg_count;                   /* Number of sg elements */
-        u16 dekindex;                   /* Data encryption key index */
-        u64 err_ptr;                    /* Error Pointer */
-        u32 err_len;                    /* Error Length*/
-        u32 tweak_upper;                /* Encryption tweak, upper 4 bytes */
+        __le16 dekindex;                /* Data encryption key index */
+        __le64 err_ptr;                 /* Error Pointer */
+        __le32 err_len;                 /* Error Length*/
+        __le32 tweak_upper;             /* Encryption tweak, upper 4 bytes */
         struct ioaccel2_sg_element sg[IOACCEL2_MAXSGENTRIES];
         struct io_accel2_scsi_response error_data;
 } __aligned(IOACCEL2_COMMANDLIST_ALIGNMENT);
@@ -563,18 +577,18 @@ struct hpsa_tmf_struct {
         u8 reserved1;           /* byte 3 Reserved */
         u32 it_nexus;           /* SCSI I-T Nexus */
         u8 lun_id[8];           /* LUN ID for TMF request */
-        u64 tag;                /* cciss tag associated w/ request */
-        u64 abort_tag;          /* cciss tag of SCSI cmd or task to abort */
-        u64 error_ptr;          /* Error Pointer */
-        u32 error_len;          /* Error Length */
+        __le64 tag;             /* cciss tag associated w/ request */
+        __le64 abort_tag;       /* cciss tag of SCSI cmd or TMF to abort */
+        __le64 error_ptr;               /* Error Pointer */
+        __le32 error_len;               /* Error Length */
 };
 
 /* Configuration Table Structure */
 struct HostWrite {
-        u32 TransportRequest;
-        u32 command_pool_addr_hi;
-        u32 CoalIntDelay;
-        u32 CoalIntCount;
+        __le32          TransportRequest;
+        __le32          command_pool_addr_hi;
+        __le32          CoalIntDelay;
+        __le32          CoalIntCount;
 };
 
 #define SIMPLE_MODE     0x02
@@ -585,54 +599,54 @@ struct HostWrite {
 #define DRIVER_SUPPORT_UA_ENABLE        0x00000001
 
 struct CfgTable {
-        u8            Signature[4];
-        u32             SpecValence;
-        u32           TransportSupport;
-        u32           TransportActive;
-        struct          HostWrite HostWrite;
-        u32           CmdsOutMax;
-        u32           BusTypes;
-        u32           TransMethodOffset;
-        u8            ServerName[16];
-        u32           HeartBeat;
-        u32           driver_support;
-#define                 ENABLE_SCSI_PREFETCH 0x100
-#define                 ENABLE_UNIT_ATTN 0x01
-        u32             MaxScatterGatherElements;
-        u32             MaxLogicalUnits;
-        u32             MaxPhysicalDevices;
-        u32             MaxPhysicalDrivesPerLogicalUnit;
-        u32             MaxPerformantModeCommands;
-        u32             MaxBlockFetch;
-        u32             PowerConservationSupport;
-        u32             PowerConservationEnable;
-        u32             TMFSupportFlags;
+        u8              Signature[4];
+        __le32          SpecValence;
+        __le32          TransportSupport;
+        __le32          TransportActive;
+        struct HostWrite HostWrite;
+        __le32          CmdsOutMax;
+        __le32          BusTypes;
+        __le32          TransMethodOffset;
+        u8              ServerName[16];
+        __le32          HeartBeat;
+        __le32          driver_support;
+#define                 ENABLE_SCSI_PREFETCH            0x100
+#define                 ENABLE_UNIT_ATTN                0x01
+        __le32          MaxScatterGatherElements;
+        __le32          MaxLogicalUnits;
+        __le32          MaxPhysicalDevices;
+        __le32          MaxPhysicalDrivesPerLogicalUnit;
+        __le32          MaxPerformantModeCommands;
+        __le32          MaxBlockFetch;
+        __le32          PowerConservationSupport;
+        __le32          PowerConservationEnable;
+        __le32          TMFSupportFlags;
         u8              TMFTagMask[8];
         u8              reserved[0x78 - 0x70];
-        u32             misc_fw_support; /* offset 0x78 */
-#define                 MISC_FW_DOORBELL_RESET (0x02)
-#define                 MISC_FW_DOORBELL_RESET2 (0x010)
-#define                 MISC_FW_RAID_OFFLOAD_BASIC (0x020)
-#define                 MISC_FW_EVENT_NOTIFY (0x080)
+        __le32          misc_fw_support;                /* offset 0x78 */
+#define                 MISC_FW_DOORBELL_RESET          0x02
+#define                 MISC_FW_DOORBELL_RESET2         0x010
+#define                 MISC_FW_RAID_OFFLOAD_BASIC      0x020
+#define                 MISC_FW_EVENT_NOTIFY            0x080
         u8              driver_version[32];
-        u32             max_cached_write_size;
-        u8              driver_scratchpad[16];
-        u32             max_error_info_length;
-        u32             io_accel_max_embedded_sg_count;
-        u32             io_accel_request_size_offset;
-        u32             event_notify;
-#define HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_STATE_CHANGE (1 << 30)
-#define HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_CONFIG_CHANGE (1 << 31)
-        u32             clear_event_notify;
+        __le32          max_cached_write_size;
+        u8              driver_scratchpad[16];
+        __le32          max_error_info_length;
+        __le32          io_accel_max_embedded_sg_count;
+        __le32          io_accel_request_size_offset;
+        __le32          event_notify;
+#define         HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_STATE_CHANGE (1 << 30)
+#define         HPSA_EVENT_NOTIFY_ACCEL_IO_PATH_CONFIG_CHANGE (1 << 31)
+        __le32          clear_event_notify;
 };
 
 #define NUM_BLOCKFETCH_ENTRIES 8
 struct TransTable_struct {
-        u32            BlockFetch[NUM_BLOCKFETCH_ENTRIES];
-        u32            RepQSize;
-        u32            RepQCount;
-        u32            RepQCtrAddrLow32;
-        u32            RepQCtrAddrHigh32;
+        __le32          BlockFetch[NUM_BLOCKFETCH_ENTRIES];
+        __le32          RepQSize;
+        __le32          RepQCount;
+        __le32          RepQCtrAddrLow32;
+        __le32          RepQCtrAddrHigh32;
 #define MAX_REPLY_QUEUES 64
         struct vals32  RepQAddr[MAX_REPLY_QUEUES];
 };
@@ -644,5 +658,137 @@ struct hpsa_pci_info {
         u32             board_id;
 };
 
+struct bmic_identify_physical_device {
+        u8    scsi_bus;          /* SCSI Bus number on controller */
+        u8    scsi_id;           /* SCSI ID on this bus */
+        __le16 block_size;           /* sector size in bytes */
+        __le32 total_blocks;         /* number for sectors on drive */
+        __le32 reserved_blocks;   /* controller reserved (RIS) */
+        u8    model[40];         /* Physical Drive Model */
+        u8    serial_number[40]; /* Drive Serial Number */
+        u8    firmware_revision[8]; /* drive firmware revision */
+        u8    scsi_inquiry_bits; /* inquiry byte 7 bits */
+        u8    compaq_drive_stamp; /* 0 means drive not stamped */
+        u8    last_failure_reason;
+#define BMIC_LAST_FAILURE_TOO_SMALL_IN_LOAD_CONFIG              0x01
+#define BMIC_LAST_FAILURE_ERROR_ERASING_RIS                     0x02
+#define BMIC_LAST_FAILURE_ERROR_SAVING_RIS                      0x03
+#define BMIC_LAST_FAILURE_FAIL_DRIVE_COMMAND                    0x04
+#define BMIC_LAST_FAILURE_MARK_BAD_FAILED                       0x05
+#define BMIC_LAST_FAILURE_MARK_BAD_FAILED_IN_FINISH_REMAP       0x06
+#define BMIC_LAST_FAILURE_TIMEOUT                               0x07
+#define BMIC_LAST_FAILURE_AUTOSENSE_FAILED                      0x08
+#define BMIC_LAST_FAILURE_MEDIUM_ERROR_1                        0x09
+#define BMIC_LAST_FAILURE_MEDIUM_ERROR_2                        0x0a
+#define BMIC_LAST_FAILURE_NOT_READY_BAD_SENSE                   0x0b
+#define BMIC_LAST_FAILURE_NOT_READY                             0x0c
+#define BMIC_LAST_FAILURE_HARDWARE_ERROR                        0x0d
+#define BMIC_LAST_FAILURE_ABORTED_COMMAND                       0x0e
+#define BMIC_LAST_FAILURE_WRITE_PROTECTED                       0x0f
+#define BMIC_LAST_FAILURE_SPIN_UP_FAILURE_IN_RECOVER            0x10
+#define BMIC_LAST_FAILURE_REBUILD_WRITE_ERROR                   0x11
+#define BMIC_LAST_FAILURE_TOO_SMALL_IN_HOT_PLUG                 0x12
+#define BMIC_LAST_FAILURE_BUS_RESET_RECOVERY_ABORTED            0x13
+#define BMIC_LAST_FAILURE_REMOVED_IN_HOT_PLUG                   0x14
+#define BMIC_LAST_FAILURE_INIT_REQUEST_SENSE_FAILED             0x15
+#define BMIC_LAST_FAILURE_INIT_START_UNIT_FAILED                0x16
+#define BMIC_LAST_FAILURE_INQUIRY_FAILED                        0x17
+#define BMIC_LAST_FAILURE_NON_DISK_DEVICE                       0x18
+#define BMIC_LAST_FAILURE_READ_CAPACITY_FAILED                  0x19
+#define BMIC_LAST_FAILURE_INVALID_BLOCK_SIZE                    0x1a
+#define BMIC_LAST_FAILURE_HOT_PLUG_REQUEST_SENSE_FAILED         0x1b
+#define BMIC_LAST_FAILURE_HOT_PLUG_START_UNIT_FAILED            0x1c
+#define BMIC_LAST_FAILURE_WRITE_ERROR_AFTER_REMAP               0x1d
+#define BMIC_LAST_FAILURE_INIT_RESET_RECOVERY_ABORTED           0x1e
+#define BMIC_LAST_FAILURE_DEFERRED_WRITE_ERROR                  0x1f
+#define BMIC_LAST_FAILURE_MISSING_IN_SAVE_RIS                   0x20
+#define BMIC_LAST_FAILURE_WRONG_REPLACE                         0x21
+#define BMIC_LAST_FAILURE_GDP_VPD_INQUIRY_FAILED                0x22
+#define BMIC_LAST_FAILURE_GDP_MODE_SENSE_FAILED                 0x23
+#define BMIC_LAST_FAILURE_DRIVE_NOT_IN_48BIT_MODE               0x24
+#define BMIC_LAST_FAILURE_DRIVE_TYPE_MIX_IN_HOT_PLUG            0x25
+#define BMIC_LAST_FAILURE_DRIVE_TYPE_MIX_IN_LOAD_CFG            0x26
+#define BMIC_LAST_FAILURE_PROTOCOL_ADAPTER_FAILED               0x27
+#define BMIC_LAST_FAILURE_FAULTY_ID_BAY_EMPTY                   0x28
+#define BMIC_LAST_FAILURE_FAULTY_ID_BAY_OCCUPIED                0x29
+#define BMIC_LAST_FAILURE_FAULTY_ID_INVALID_BAY                 0x2a
+#define BMIC_LAST_FAILURE_WRITE_RETRIES_FAILED                  0x2b
+
+#define BMIC_LAST_FAILURE_SMART_ERROR_REPORTED                  0x37
+#define BMIC_LAST_FAILURE_PHY_RESET_FAILED                      0x38
+#define BMIC_LAST_FAILURE_ONLY_ONE_CTLR_CAN_SEE_DRIVE           0x40
+#define BMIC_LAST_FAILURE_KC_VOLUME_FAILED                      0x41
+#define BMIC_LAST_FAILURE_UNEXPECTED_REPLACEMENT                0x42
+#define BMIC_LAST_FAILURE_OFFLINE_ERASE                         0x80
+#define BMIC_LAST_FAILURE_OFFLINE_TOO_SMALL                     0x81
+#define BMIC_LAST_FAILURE_OFFLINE_DRIVE_TYPE_MIX                0x82
+#define BMIC_LAST_FAILURE_OFFLINE_ERASE_COMPLETE                0x83
+
+        u8     flags;
+        u8     more_flags;
+        u8     scsi_lun;          /* SCSI LUN for phys drive */
+        u8     yet_more_flags;
+        u8     even_more_flags;
+        __le32 spi_speed_rules;/* SPI Speed data:Ultra disable diagnose */
+        u8     phys_connector[2];         /* connector number on controller */
+        u8     phys_box_on_bus;  /* phys enclosure this drive resides */
+        u8     phys_bay_in_box;  /* phys drv bay this drive resides */
+        __le32 rpm;              /* Drive rotational speed in rpm */
+        u8     device_type;       /* type of drive */
+        u8     sata_version;     /* only valid when drive_type is SATA */
+        __le64 big_total_block_count;
+        __le64 ris_starting_lba;
+        __le32 ris_size;
+        u8     wwid[20];
+        u8     controller_phy_map[32];
+        __le16 phy_count;
+        u8     phy_connected_dev_type[256];
+        u8     phy_to_drive_bay_num[256];
+        __le16 phy_to_attached_dev_index[256];
+        u8     box_index;
+        u8     reserved;
+        __le16 extra_physical_drive_flags;
+#define BMIC_PHYS_DRIVE_SUPPORTS_GAS_GAUGE(idphydrv) \
+        (idphydrv->extra_physical_drive_flags & (1 << 10))
+        u8     negotiated_link_rate[256];
+        u8     phy_to_phy_map[256];
+        u8     redundant_path_present_map;
+        u8     redundant_path_failure_map;
+        u8     active_path_number;
+        __le16 alternate_paths_phys_connector[8];
+        u8     alternate_paths_phys_box_on_port[8];
+        u8     multi_lun_device_lun_count;
+        u8     minimum_good_fw_revision[8];
+        u8     unique_inquiry_bytes[20];
+        u8     current_temperature_degreesC;
+        u8     temperature_threshold_degreesC;
+        u8     max_temperature_degreesC;
+        u8     logical_blocks_per_phys_block_exp; /* phyblocksize = 512*2^exp */
+        __le16 current_queue_depth_limit;
+        u8     switch_name[10];
+        __le16 switch_port;
+        u8     alternate_paths_switch_name[40];
+        u8     alternate_paths_switch_port[8];
+        __le16 power_on_hours; /* valid only if gas gauge supported */
+        __le16 percent_endurance_used; /* valid only if gas gauge supported. */
+#define BMIC_PHYS_DRIVE_SSD_WEAROUT(idphydrv) \
+        ((idphydrv->percent_endurance_used & 0x80) || \
+         (idphydrv->percent_endurance_used > 10000))
+        u8     drive_authentication;
+#define BMIC_PHYS_DRIVE_AUTHENTICATED(idphydrv) \
+        (idphydrv->drive_authentication == 0x80)
+        u8     smart_carrier_authentication;
+#define BMIC_SMART_CARRIER_AUTHENTICATION_SUPPORTED(idphydrv) \
+        (idphydrv->smart_carrier_authentication != 0x0)
+#define BMIC_SMART_CARRIER_AUTHENTICATED(idphydrv) \
+        (idphydrv->smart_carrier_authentication == 0x01)
+        u8     smart_carrier_app_fw_version;
+        u8     smart_carrier_bootloader_fw_version;
+        u8     encryption_key_name[64];
+        __le32 misc_drive_flags;
+        __le16 dek_index;
+        u8     padding[112];
+};
+
 #pragma pack()
 #endif /* HPSA_CMD_H */