1 files changed, 19 insertions, 8 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index d54b1cc88d0d..30fd8d6e3f31 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -481,6 +481,7 @@ enum aac_log_level {
 #define FSAFS_NTC_FIB_CONTEXT                   0x030c
 
 struct aac_dev;
+struct fib;
 
 struct adapter_ops
 {
@@ -489,6 +490,7 @@ struct adapter_ops
         void (*adapter_disable_int)(struct aac_dev *dev);
         int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4);
         int  (*adapter_check_health)(struct aac_dev *dev);
+        int  (*adapter_send)(struct fib * fib);
 };
 
 /*
@@ -659,6 +661,10 @@ struct rx_mu_registers {
                                                 Status Register */
         __le32  OIMR;       /*  1334h  | 34h | Outbound Interrupt 
                                                 Mask Register */
+        __le32  reserved2;  /*  1338h  | 38h | Reserved */
+        __le32  reserved3;  /*  133Ch  | 3Ch | Reserved */
+        __le32  InboundQueue;/* 1340h  | 40h | Inbound Queue Port relative to firmware */
+        __le32  OutboundQueue;/*1344h  | 44h | Outbound Queue Port relative to firmware */
                             /* * Must access through ATU Inbound 
                                  Translation Window */
 };
@@ -693,8 +699,8 @@ struct rx_inbound {
 #define OutboundDoorbellReg     MUnit.ODR
 
 struct rx_registers {
-        struct rx_mu_registers          MUnit;          /* 1300h - 1334h */
-        __le32                          reserved1[6];   /* 1338h - 134ch */
+        struct rx_mu_registers          MUnit;          /* 1300h - 1344h */
+        __le32                          reserved1[2];   /* 1348h - 134ch */
         struct rx_inbound               IndexRegs;
 };
 
@@ -711,8 +717,8 @@ struct rx_registers {
 #define rkt_inbound rx_inbound
 
 struct rkt_registers {
-        struct rkt_mu_registers         MUnit;           /* 1300h - 1334h */
-        __le32                          reserved1[1010]; /* 1338h - 22fch */
+        struct rkt_mu_registers         MUnit;           /* 1300h - 1344h */
+        __le32                          reserved1[1006]; /* 1348h - 22fch */
         struct rkt_inbound              IndexRegs;       /* 2300h - */
 };
 
@@ -721,8 +727,6 @@ struct rkt_registers {
 #define rkt_writeb(AEP, CSR, value)     writeb(value, &((AEP)->regs.rkt->CSR))
 #define rkt_writel(AEP, CSR, value)     writel(value, &((AEP)->regs.rkt->CSR))
 
-struct fib;
-
 typedef void (*fib_callback)(void *ctxt, struct fib *fibctx);
 
 struct aac_fib_context {
@@ -937,7 +941,6 @@ struct aac_dev
         const char              *name;
         int                     id;
 
-        u16                     irq_mask;
         /*
          *      negotiated FIB settings
          */
@@ -972,6 +975,7 @@ struct aac_dev
         struct adapter_ops      a_ops;
         unsigned long           fsrev;          /* Main driver's revision number */
         
+        unsigned                base_size;      /* Size of mapped in region */
         struct aac_init         *init;          /* Holds initialization info to communicate with adapter */
         dma_addr_t              init_pa;        /* Holds physical address of the init struct */
         
@@ -992,6 +996,9 @@ struct aac_dev
         /*
          *      The following is the device specific extension.
          */
+#if (!defined(AAC_MIN_FOOTPRINT_SIZE))
+#       define AAC_MIN_FOOTPRINT_SIZE 8192
+#endif
         union
         {
                 struct sa_registers __iomem *sa;
@@ -1012,6 +1019,7 @@ struct aac_dev
         u8                      nondasd_support; 
         u8                      dac_support;
         u8                      raid_scsi_mode;
+        u8                      new_comm_interface;
         /* macro side-effects BEWARE */
 #       define                  raw_io_interface \
           init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
@@ -1034,6 +1042,8 @@ struct aac_dev
 #define aac_adapter_check_health(dev) \
         (dev)->a_ops.adapter_check_health(dev)
 
+#define aac_adapter_send(fib) \
+        ((fib)->dev)->a_ops.adapter_send(fib)
 
 #define FIB_CONTEXT_FLAG_TIMED_OUT              (0x00000001)
 
@@ -1560,7 +1570,7 @@ struct fib_ioctl
 
 struct revision
 {
-        __le32 compat;
+        u32 compat;
         __le32 version;
         __le32 build;
 };
@@ -1779,6 +1789,7 @@ int aac_rkt_init(struct aac_dev *dev);
 int aac_sa_init(struct aac_dev *dev);
 unsigned int aac_response_normal(struct aac_queue * q);
 unsigned int aac_command_normal(struct aac_queue * q);
+unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index);
 int aac_command_thread(struct aac_dev * dev);
 int aac_close_fib_context(struct aac_dev * dev, struct aac_fib_context *fibctx);
 int fib_adapter_complete(struct fib * fibptr, unsigned short size);