Patched in Tegra support.

1 files changed, 21 insertions, 83 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 742f5d7eb0f..ffb587817ef 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -12,7 +12,7 @@
  *----------------------------------------------------------------------------*/
 
 #ifndef AAC_DRIVER_BUILD
-# define AAC_DRIVER_BUILD 29801
+# define AAC_DRIVER_BUILD 28000
 # define AAC_DRIVER_BRANCH "-ms"
 #endif
 #define MAXIMUM_NUM_CONTAINERS  32
@@ -100,13 +100,6 @@ struct user_sgentryraw {
         u32             flags;  /* reserved for F/W use */
 };
 
-struct sge_ieee1212 {
-        u32     addrLow;
-        u32     addrHigh;
-        u32     length;
-        u32     flags;
-};
-
 /*
  *      SGMAP
  *
@@ -277,8 +270,6 @@ enum aac_queue_types {
  */
 
 #define         FIB_MAGIC       0x0001
-#define         FIB_MAGIC2      0x0004
-#define         FIB_MAGIC2_64   0x0005
 
 /*
  *      Define the priority levels the FSA communication routines support.
@@ -305,20 +296,22 @@ struct aac_fibhdr {
         __le32 XferState;       /* Current transfer state for this CCB */
         __le16 Command;         /* Routing information for the destination */
         u8 StructType;          /* Type FIB */
-        u8 Unused;              /* Unused */
+        u8 Flags;               /* Flags for FIB */
         __le16 Size;            /* Size of this FIB in bytes */
         __le16 SenderSize;      /* Size of the FIB in the sender
                                    (for response sizing) */
         __le32 SenderFibAddress;  /* Host defined data in the FIB */
+        __le32 ReceiverFibAddress;/* Logical address of this FIB for
+                                     the adapter */
+        u32 SenderData;         /* Place holder for the sender to store data */
         union {
-                __le32 ReceiverFibAddress;/* Logical address of this FIB for
-                                     the adapter (old) */
-                __le32 SenderFibAddressHigh;/* upper 32bit of phys. FIB address */
-                __le32 TimeStamp;       /* otherwise timestamp for FW internal use */
-        } u;
-        u32 Handle;             /* FIB handle used for MSGU commnunication */
-        u32 Previous;           /* FW internal use */
-        u32 Next;               /* FW internal use */
+                struct {
+                    __le32 _ReceiverTimeStart;  /* Timestamp for
+                                                   receipt of fib */
+                    __le32 _ReceiverTimeDone;   /* Timestamp for
+                                                   completion of fib */
+                } _s;
+        } _u;
 };
 
 struct hw_fib {
@@ -368,7 +361,6 @@ struct hw_fib {
 #define         ContainerCommand                500
 #define         ContainerCommand64              501
 #define         ContainerRawIo                  502
-#define         ContainerRawIo2                 503
 /*
  *      Scsi Port commands (scsi passthrough)
  */
@@ -425,7 +417,6 @@ enum fib_xfer_state {
 #define ADAPTER_INIT_STRUCT_REVISION            3
 #define ADAPTER_INIT_STRUCT_REVISION_4          4 // rocket science
 #define ADAPTER_INIT_STRUCT_REVISION_6          6 /* PMC src */
-#define ADAPTER_INIT_STRUCT_REVISION_7          7 /* Denali */
 
 struct aac_init
 {
@@ -450,9 +441,7 @@ struct aac_init
 #define INITFLAGS_NEW_COMM_SUPPORTED    0x00000001
 #define INITFLAGS_DRIVER_USES_UTC_TIME  0x00000010
 #define INITFLAGS_DRIVER_SUPPORTS_PM    0x00000020
-#define INITFLAGS_NEW_COMM_TYPE1_SUPPORTED      0x00000040
-#define INITFLAGS_FAST_JBOD_SUPPORTED   0x00000080
-#define INITFLAGS_NEW_COMM_TYPE2_SUPPORTED      0x00000100
+#define INITFLAGS_NEW_COMM_TYPE1_SUPPORTED      0x00000041
         __le32  MaxIoCommands;  /* max outstanding commands */
         __le32  MaxIoSize;      /* largest I/O command */
         __le32  MaxFibSize;     /* largest FIB to adapter */
@@ -767,16 +756,8 @@ struct src_mu_registers {
 
 struct src_registers {
         struct src_mu_registers MUnit;  /* 00h - c7h */
-        union {
-                struct {
-                        __le32 reserved1[130790];       /* c8h - 7fc5fh */
-                        struct src_inbound IndexRegs;   /* 7fc60h */
-                } tupelo;
-                struct {
-                        __le32 reserved1[974];          /* c8h - fffh */
-                        struct src_inbound IndexRegs;   /* 1000h */
-                } denali;
-        } u;
+        __le32 reserved1[130790];       /* c8h - 7fc5fh */
+        struct src_inbound IndexRegs;   /* 7fc60h */
 };
 
 #define src_readb(AEP, CSR)             readb(&((AEP)->regs.src.bar0->CSR))
@@ -1018,10 +999,6 @@ struct aac_bus_info_response {
 #define AAC_OPT_NEW_COMM                cpu_to_le32(1<<17)
 #define AAC_OPT_NEW_COMM_64             cpu_to_le32(1<<18)
 #define AAC_OPT_NEW_COMM_TYPE1          cpu_to_le32(1<<28)
-#define AAC_OPT_NEW_COMM_TYPE2          cpu_to_le32(1<<29)
-#define AAC_OPT_NEW_COMM_TYPE3          cpu_to_le32(1<<30)
-#define AAC_OPT_NEW_COMM_TYPE4          cpu_to_le32(1<<31)
-
 
 struct aac_dev
 {
@@ -1063,11 +1040,10 @@ struct aac_dev
         struct adapter_ops      a_ops;
         unsigned long           fsrev;          /* Main driver's revision number */
 
-        resource_size_t         base_start;     /* main IO base */
-        resource_size_t         dbg_base;       /* address of UART
+        unsigned long           dbg_base;       /* address of UART
                                                  * debug buffer */
 
-        resource_size_t         base_size, dbg_size;    /* Size of
+        unsigned                base_size, dbg_size;    /* Size of
                                                          *  mapped in region */
 
         struct aac_init         *init;          /* Holds initialization info to communicate with adapter */
@@ -1100,8 +1076,6 @@ struct aac_dev
 #       define AAC_MIN_FOOTPRINT_SIZE 8192
 #       define AAC_MIN_SRC_BAR0_SIZE 0x400000
 #       define AAC_MIN_SRC_BAR1_SIZE 0x800
-#       define AAC_MIN_SRCV_BAR0_SIZE 0x100000
-#       define AAC_MIN_SRCV_BAR1_SIZE 0x400
 #endif
         union
         {
@@ -1135,7 +1109,6 @@ struct aac_dev
 #       define AAC_COMM_PRODUCER 0
 #       define AAC_COMM_MESSAGE  1
 #       define AAC_COMM_MESSAGE_TYPE1   3
-#       define AAC_COMM_MESSAGE_TYPE2   4
         u8                      raw_io_interface;
         u8                      raw_io_64;
         u8                      printf_enabled;
@@ -1143,10 +1116,7 @@ struct aac_dev
         u8                      msi;
         int                     management_fib_count;
         spinlock_t              manage_lock;
-        spinlock_t              sync_lock;
-        int                     sync_mode;
-        struct fib              *sync_fib;
-        struct list_head        sync_fib_list;
+
 };
 
 #define aac_adapter_interrupt(dev) \
@@ -1193,8 +1163,6 @@ struct aac_dev
 
 #define FIB_CONTEXT_FLAG_TIMED_OUT              (0x00000001)
 #define FIB_CONTEXT_FLAG                        (0x00000002)
-#define FIB_CONTEXT_FLAG_WAIT                   (0x00000004)
-#define FIB_CONTEXT_FLAG_FASTRESP               (0x00000008)
 
 /*
  *      Define the command values
@@ -1301,22 +1269,6 @@ struct aac_dev
 #define CMDATA_SYNCH            4
 #define CMUNSTABLE              5
 
-#define RIO_TYPE_WRITE                  0x0000
-#define RIO_TYPE_READ                   0x0001
-#define RIO_SUREWRITE                   0x0008
-
-#define RIO2_IO_TYPE                    0x0003
-#define RIO2_IO_TYPE_WRITE              0x0000
-#define RIO2_IO_TYPE_READ               0x0001
-#define RIO2_IO_TYPE_VERIFY             0x0002
-#define RIO2_IO_ERROR                   0x0004
-#define RIO2_IO_SUREWRITE               0x0008
-#define RIO2_SGL_CONFORMANT             0x0010
-#define RIO2_SG_FORMAT                  0xF000
-#define RIO2_SG_FORMAT_ARC              0x0000
-#define RIO2_SG_FORMAT_SRL              0x1000
-#define RIO2_SG_FORMAT_IEEE1212         0x2000
-
 struct aac_read
 {
         __le32          command;
@@ -1361,6 +1313,9 @@ struct aac_write64
         __le32          block;
         __le16          pad;
         __le16          flags;
+#define IO_TYPE_WRITE 0x00000000
+#define IO_TYPE_READ  0x00000001
+#define IO_SUREWRITE  0x00000008
         struct sgmap64  sg;     // Must be last in struct because it is variable
 };
 struct aac_write_reply
@@ -1381,22 +1336,6 @@ struct aac_raw_io
         struct sgmapraw sg;
 };
 
-struct aac_raw_io2 {
-        __le32          blockLow;
-        __le32          blockHigh;
-        __le32          byteCount;
-        __le16          cid;
-        __le16          flags;          /* RIO2 flags */
-        __le32          sgeFirstSize;   /* size of first sge el. */
-        __le32          sgeNominalSize; /* size of 2nd sge el. (if conformant) */
-        u8              sgeCnt;         /* only 8 bits required */
-        u8              bpTotal;        /* reserved for F/W use */
-        u8              bpComplete;     /* reserved for F/W use */
-        u8              sgeFirstIndex;  /* reserved for F/W use */
-        u8              unused[4];
-        struct sge_ieee1212     sge[1];
-};
-
 #define CT_FLUSH_CACHE 129
 struct aac_synchronize {
         __le32          command;        /* VM_ContainerConfig */
@@ -2031,7 +1970,6 @@ int aac_rkt_init(struct aac_dev *dev);
 int aac_nark_init(struct aac_dev *dev);
 int aac_sa_init(struct aac_dev *dev);
 int aac_src_init(struct aac_dev *dev);
-int aac_srcv_init(struct aac_dev *dev);
 int aac_queue_get(struct aac_dev * dev, u32 * index, u32 qid, struct hw_fib * hw_fib, int wait, struct fib * fibptr, unsigned long *nonotify);
 unsigned int aac_response_normal(struct aac_queue * q);
 unsigned int aac_command_normal(struct aac_queue * q);