[SCSI] aacraid: Newer adapter communication iterface support

Received from Mark Salyzyn.

This patch adds the 'new comm' interface, which modern AAC based
adapters that are less than a year old support in the name of much
improved performance. These modern adapters support both the legacy and
the 'new comm' interfaces.

Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 37 deletions

diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c
index 3900abc5850d..8b9596209164 100644
--- a/drivers/scsi/aacraid/sa.c
+++ b/drivers/scsi/aacraid/sa.c
@@ -237,29 +237,16 @@ static void aac_sa_interrupt_adapter (struct aac_dev *dev)
 
 static void aac_sa_start_adapter(struct aac_dev *dev)
 {
-        u32 ret;
         struct aac_init *init;
         /*
          * Fill in the remaining pieces of the init.
          */
         init = dev->init;
         init->HostElapsedSeconds = cpu_to_le32(get_seconds());
-
-        /*
-         * Tell the adapter we are back and up and running so it will scan its command
-         * queues and enable our interrupts
-         */
-        dev->irq_mask = (PrintfReady | DOORBELL_1 | DOORBELL_2 | DOORBELL_3 | DOORBELL_4);
-        /*
-         *      First clear out all interrupts.  Then enable the one's that 
-         *      we can handle.
-         */
-        sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
-        sa_writew(dev, SaDbCSR.PRICLEARIRQMASK, (PrintfReady | DOORBELL_1 | DOORBELL_2 | DOORBELL_3 | DOORBELL_4));
         /* We can only use a 32 bit address here */
         sa_sync_cmd(dev, INIT_STRUCT_BASE_ADDRESS, 
                         (u32)(ulong)dev->init_pa, 0, 0, 0, 0, 0,
-                        &ret, NULL, NULL, NULL, NULL);
+                        NULL, NULL, NULL, NULL, NULL);
 }
 
 /**
@@ -314,15 +301,6 @@ int aac_sa_init(struct aac_dev *dev)
         name     = dev->name;
 
         /*
-         *      Map in the registers from the adapter.
-         */
-
-        if((dev->regs.sa = ioremap((unsigned long)dev->scsi_host_ptr->base, 8192))==NULL)
-        {       
-                printk(KERN_WARNING "aacraid: unable to map ARM.\n" );
-                goto error_iounmap;
-        }
-        /*
          *      Check to see if the board failed any self tests.
          */
         if (sa_readl(dev, Mailbox7) & SELF_TEST_FAILED) {
@@ -378,31 +356,17 @@ int aac_sa_init(struct aac_dev *dev)
                 goto error_irq;
 
         /*
-         *      Start any kernel threads needed
-         */
-        dev->thread_pid = kernel_thread((int (*)(void *))aac_command_thread, dev, 0);
-        if (dev->thread_pid < 0) {
-                printk(KERN_ERR "aacraid: Unable to create command thread.\n");
-                goto error_kfree;
-        }
-
-        /*
          *      Tell the adapter that all is configure, and it can start 
          *      accepting requests
          */
         aac_sa_start_adapter(dev);
         return 0;
 
-
-error_kfree:
-        kfree(dev->queues);
-
 error_irq:
         sa_writew(dev, SaDbCSR.PRISETIRQMASK, 0xffff);
         free_irq(dev->scsi_host_ptr->irq, (void *)dev);
 
 error_iounmap:
-        iounmap(dev->regs.sa);
 
         return -1;
 }