1 files changed, 29 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index 84d77fd86e5b..ce530f113fdb 100644
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -5,7 +5,8 @@
  * based on the old aacraid driver that is..
  * Adaptec aacraid device driver for Linux.
  *
- * Copyright (c) 2000-2007 Adaptec, Inc. (aacraid@adaptec.com)
+ * Copyright (c) 2000-2010 Adaptec, Inc.
+ *               2010 PMC-Sierra, Inc. (aacraid@pmc-sierra.com)
  *
  * 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
@@ -84,15 +85,35 @@ static irqreturn_t aac_rx_intr_producer(int irq, void *dev_id)
 
 static irqreturn_t aac_rx_intr_message(int irq, void *dev_id)
 {
+        int isAif, isFastResponse, isSpecial;
         struct aac_dev *dev = dev_id;
         u32 Index = rx_readl(dev, MUnit.OutboundQueue);
         if (unlikely(Index == 0xFFFFFFFFL))
                 Index = rx_readl(dev, MUnit.OutboundQueue);
         if (likely(Index != 0xFFFFFFFFL)) {
                 do {
-                        if (unlikely(aac_intr_normal(dev, Index))) {
-                                rx_writel(dev, MUnit.OutboundQueue, Index);
-                                rx_writel(dev, MUnit.ODR, DoorBellAdapterNormRespReady);
+                        isAif = isFastResponse = isSpecial = 0;
+                        if (Index & 0x00000002L) {
+                                isAif = 1;
+                                if (Index == 0xFFFFFFFEL)
+                                        isSpecial = 1;
+                                Index &= ~0x00000002L;
+                        } else {
+                                if (Index & 0x00000001L)
+                                        isFastResponse = 1;
+                                Index >>= 2;
+                        }
+                        if (!isSpecial) {
+                                if (unlikely(aac_intr_normal(dev,
+                                                Index, isAif,
+                                                isFastResponse, NULL))) {
+                                        rx_writel(dev,
+                                                MUnit.OutboundQueue,
+                                                Index);
+                                        rx_writel(dev,
+                                                MUnit.ODR,
+                                                DoorBellAdapterNormRespReady);
+                                }
                         }
                         Index = rx_readl(dev, MUnit.OutboundQueue);
                 } while (Index != 0xFFFFFFFFL);
@@ -631,6 +652,10 @@ int _aac_rx_init(struct aac_dev *dev)
                         name, instance);
                 goto error_iounmap;
         }
+        dev->dbg_base = dev->scsi_host_ptr->base;
+        dev->dbg_base_mapped = dev->base;
+        dev->dbg_size = dev->base_size;
+
         aac_adapter_enable_int(dev);
         /*
          *      Tell the adapter that all is configured, and it can