[SCSI] hptiop: adding new firmware interface and more PCI device IDs

updated patch based on Jeff Garzik's comments.

- check adapter firmware version and use appropriate interface accordingly
- add new PCI device IDs and use PCI_VDEVICE macro
- update driver version string
- remove unused data structures
- remove unnecessary typecasts

Signed-off-by: HighPoint Linux Team <linux@highpoint-tech.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 10 insertions, 219 deletions

diff --git a/drivers/scsi/hptiop.h b/drivers/scsi/hptiop.h
index f04f7e81d1ae..2a5e46e001cb 100644
--- a/drivers/scsi/hptiop.h
+++ b/drivers/scsi/hptiop.h
@@ -1,6 +1,6 @@
 /*
  * HighPoint RR3xxx controller driver for Linux
- * Copyright (C) 2006 HighPoint Technologies, Inc. All Rights Reserved.
+ * Copyright (C) 2006-2007 HighPoint Technologies, Inc. All Rights Reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,219 +18,6 @@
 #ifndef _HPTIOP_H_
 #define _HPTIOP_H_
 
-/*
- * logical device type.
- * Identify array (logical device) and physical device.
- */
-#define LDT_ARRAY   1
-#define LDT_DEVICE  2
-
-/*
- * Array types
- */
-#define AT_UNKNOWN  0
-#define AT_RAID0    1
-#define AT_RAID1    2
-#define AT_RAID5    3
-#define AT_RAID6    4
-#define AT_JBOD     7
-
-#define MAX_NAME_LENGTH     36
-#define MAX_ARRAYNAME_LEN   16
-
-#define MAX_ARRAY_MEMBERS_V1 8
-#define MAX_ARRAY_MEMBERS_V2 16
-
-/* keep definition for source code compatiblity */
-#define MAX_ARRAY_MEMBERS MAX_ARRAY_MEMBERS_V1
-
-/*
- * array flags
- */
-#define ARRAY_FLAG_DISABLED         0x00000001 /* The array is disabled */
-#define ARRAY_FLAG_NEEDBUILDING     0x00000002 /* need to be rebuilt */
-#define ARRAY_FLAG_REBUILDING       0x00000004 /* in rebuilding process */
-#define ARRAY_FLAG_BROKEN           0x00000008 /* broken but still working */
-#define ARRAY_FLAG_BOOTDISK         0x00000010 /* has a active partition */
-#define ARRAY_FLAG_BOOTMARK         0x00000040 /* array has boot mark set */
-#define ARRAY_FLAG_NEED_AUTOREBUILD 0x00000080 /* auto-rebuild should start */
-#define ARRAY_FLAG_VERIFYING        0x00000100 /* is being verified */
-#define ARRAY_FLAG_INITIALIZING     0x00000200 /* is being initialized */
-#define ARRAY_FLAG_TRANSFORMING     0x00000400 /* tranform in progress */
-#define ARRAY_FLAG_NEEDTRANSFORM    0x00000800 /* array need tranform */
-#define ARRAY_FLAG_NEEDINITIALIZING 0x00001000 /* initialization not done */
-#define ARRAY_FLAG_BROKEN_REDUNDANT 0x00002000 /* broken but redundant */
-
-/*
- * device flags
- */
-#define DEVICE_FLAG_DISABLED        0x00000001 /* device is disabled */
-#define DEVICE_FLAG_UNINITIALIZED   0x00010000 /* device is not initialized */
-#define DEVICE_FLAG_LEGACY          0x00020000 /* lagacy drive */
-#define DEVICE_FLAG_IS_SPARE        0x80000000 /* is a spare disk */
-
-/*
- * ioctl codes
- */
-#define HPT_CTL_CODE(x) (x+0xFF00)
-#define HPT_CTL_CODE_LINUX_TO_IOP(x) ((x)-0xff00)
-
-#define HPT_IOCTL_GET_CONTROLLER_INFO       HPT_CTL_CODE(2)
-#define HPT_IOCTL_GET_CHANNEL_INFO          HPT_CTL_CODE(3)
-#define HPT_IOCTL_GET_LOGICAL_DEVICES       HPT_CTL_CODE(4)
-#define HPT_IOCTL_GET_DRIVER_CAPABILITIES   HPT_CTL_CODE(19)
-#define HPT_IOCTL_GET_DEVICE_INFO_V3        HPT_CTL_CODE(46)
-#define HPT_IOCTL_GET_CONTROLLER_INFO_V2    HPT_CTL_CODE(47)
-
-/*
- * Controller information.
- */
-struct hpt_controller_info {
-        u8      chip_type;                    /* chip type */
-        u8      interrupt_level;              /* IRQ level */
-        u8      num_buses;                    /* bus count */
-        u8      chip_flags;
-
-        u8      product_id[MAX_NAME_LENGTH];/* product name */
-        u8      vendor_id[MAX_NAME_LENGTH]; /* vendor name */
-}
-__attribute__((packed));
-
-/*
- * Channel information.
- */
-struct hpt_channel_info {
-        __le32  io_port;         /* IDE Base Port Address */
-        __le32  control_port;    /* IDE Control Port Address */
-        __le32  devices[2];      /* device connected to this channel */
-}
-__attribute__((packed));
-
-/*
- * Array information.
- */
-struct hpt_array_info_v3 {
-        u8      name[MAX_ARRAYNAME_LEN]; /* array name */
-        u8      description[64];         /* array description */
-        u8      create_manager[16];      /* who created it */
-        __le32  create_time;             /* when created it */
-
-        u8      array_type;              /* array type */
-        u8      block_size_shift;        /* stripe size */
-        u8      ndisk;                   /* Number of ID in Members[] */
-        u8      reserved;
-
-        __le32  flags;                   /* working flags, see ARRAY_FLAG_XXX */
-        __le32  members[MAX_ARRAY_MEMBERS_V2];  /* member array/disks */
-
-        __le32  rebuilding_progress;
-        __le64  rebuilt_sectors; /* rebuilding point (LBA) for single member */
-
-        __le32  transform_source;
-        __le32  transform_target;    /* destination device ID */
-        __le32  transforming_progress;
-        __le32  signature;              /* persistent identification*/
-        __le16  critical_members;       /* bit mask of critical members */
-        __le16  reserve2;
-        __le32  reserve;
-}
-__attribute__((packed));
-
-/*
- * physical device information.
- */
-#define MAX_PARENTS_PER_DISK    8
-
-struct hpt_device_info_v2 {
-        u8   ctlr_id;             /* controller id */
-        u8   path_id;             /* bus */
-        u8   target_id;           /* id */
-        u8   device_mode_setting; /* Current Data Transfer mode: 0-4 PIO0-4 */
-                                  /* 5-7 MW DMA0-2, 8-13 UDMA0-5 */
-        u8   device_type;         /* device type */
-        u8   usable_mode;         /* highest usable mode */
-
-#ifdef __BIG_ENDIAN_BITFIELD
-        u8   NCQ_enabled: 1;
-        u8   NCQ_supported: 1;
-        u8   TCQ_enabled: 1;
-        u8   TCQ_supported: 1;
-        u8   write_cache_enabled: 1;
-        u8   write_cache_supported: 1;
-        u8   read_ahead_enabled: 1;
-        u8   read_ahead_supported: 1;
-        u8   reserved6: 6;
-        u8   spin_up_mode: 2;
-#else
-        u8   read_ahead_supported: 1;
-        u8   read_ahead_enabled: 1;
-        u8   write_cache_supported: 1;
-        u8   write_cache_enabled: 1;
-        u8   TCQ_supported: 1;
-        u8   TCQ_enabled: 1;
-        u8   NCQ_supported: 1;
-        u8   NCQ_enabled: 1;
-        u8   spin_up_mode: 2;
-        u8   reserved6: 6;
-#endif
-
-        __le32  flags;         /* working flags, see DEVICE_FLAG_XXX */
-        u8      ident[150];    /* (partitial) Identify Data of this device */
-
-        __le64  total_free;
-        __le64  max_free;
-        __le64  bad_sectors;
-        __le32  parent_arrays[MAX_PARENTS_PER_DISK];
-}
-__attribute__((packed));
-
-/*
- * Logical device information.
- */
-#define INVALID_TARGET_ID   0xFF
-#define INVALID_BUS_ID      0xFF
-
-struct hpt_logical_device_info_v3 {
-        u8       type;                   /* LDT_ARRAY or LDT_DEVICE */
-        u8       cache_policy;           /* refer to CACHE_POLICY_xxx */
-        u8       vbus_id;                /* vbus sequence in vbus_list */
-        u8       target_id;              /* OS target id. 0xFF is invalid */
-                                         /* OS name: DISK $VBusId_$TargetId */
-        __le64   capacity;               /* array capacity */
-        __le32   parent_array;           /* don't use this field for physical
-                                            device. use ParentArrays field in
-                                            hpt_device_info_v2 */
-        /* reserved statistic fields */
-        __le32   stat1;
-        __le32   stat2;
-        __le32   stat3;
-        __le32   stat4;
-
-        union {
-                struct hpt_array_info_v3 array;
-                struct hpt_device_info_v2 device;
-        } __attribute__((packed)) u;
-
-}
-__attribute__((packed));
-
-/*
- * ioctl structure
- */
-#define HPT_IOCTL_MAGIC   0xA1B2C3D4
-
-struct hpt_ioctl_u {
-        u32   magic;            /* used to check if it's a valid ioctl packet */
-        u32   ioctl_code;       /* operation control code */
-        void __user *inbuf;     /* input data buffer */
-        u32   inbuf_size;       /* size of input data buffer */
-        void __user *outbuf;    /* output data buffer */
-        u32   outbuf_size;      /* size of output data buffer */
-        void __user *bytes_returned;   /* count of bytes returned */
-}
-__attribute__((packed));
-
-
 struct hpt_iopmu
 {
         __le32 resrved0[4];
@@ -252,6 +39,8 @@ struct hpt_iopmu
 #define IOPMU_QUEUE_EMPTY            0xffffffff
 #define IOPMU_QUEUE_MASK_HOST_BITS   0xf0000000
 #define IOPMU_QUEUE_ADDR_HOST_BIT    0x80000000
+#define IOPMU_QUEUE_REQUEST_SIZE_BIT    0x40000000
+#define IOPMU_QUEUE_REQUEST_RESULT_BIT   0x40000000
 
 #define IOPMU_OUTBOUND_INT_MSG0      1
 #define IOPMU_OUTBOUND_INT_MSG1      2
@@ -336,7 +125,8 @@ struct hpt_iop_request_set_config
 {
         struct hpt_iop_request_header header;
         __le32 iop_id;
-        __le32 vbus_id;
+        __le16 vbus_id;
+        __le16 max_host_request_size;
         __le32 reserve[6];
 };
 
@@ -412,9 +202,8 @@ struct hptiop_hba {
         struct Scsi_Host * host;
         struct pci_dev * pcidev;
 
-        struct list_head link;
-
         /* IOP config info */
+        u32     interface_version;
         u32     firmware_version;
         u32     sdram_size;
         u32     max_devices;
@@ -423,8 +212,10 @@ struct hptiop_hba {
         u32     max_sg_descriptors;
 
         u32     req_size; /* host-allocated request buffer size */
-        int     initialized;
-        int     msg_done;
+
+        int     iopintf_v2: 1;
+        int     initialized: 1;
+        int     msg_done: 1;
 
         struct hptiop_request * req_list;
         struct hptiop_request reqs[HPTIOP_MAX_REQUESTS];