[patch] scsi/ahci: Add support for ULi M5287

[Peer.Chen@uli.com.tw]

Hi,Jeff

We add the support for ULi's AHCI controller M5287 in drivers/scsi/ahci.c,
This patch is applied to kernel 2.6.10-rc3. Please apply to new kernels.

Signed-off-by: Peer Chen <peer.chen@uli.com.tw>

Thanks

Best Regards
Peer

--- linux-2.6.10-rc3/drivers/scsi/ahci.c.orig   2004-12-11
03:14:17.170955840 +0800
+++ linux-2.6.10-rc3/drivers/scsi/ahci.c  2004-12-11 03:31:40.979272856
+0800
@@ -241,6 +241,8 @@ static struct pci_device_id ahci_pci_tbl
        board_ahci },
      { PCI_VENDOR_ID_INTEL, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
        board_ahci },
+     { PCI_VENDOR_ID_AL, 0x5287, PCI_ANY_ID, PCI_ANY_ID, 0, 0,
+       board_ahci },
      { }   /* terminate list */
 };

@@ -555,7 +557,6 @@ static void ahci_intr_error(struct ata_p
            writel(0x300, port_mmio + PORT_SCR_CTL);
            readl(port_mmio + PORT_SCR_CTL); /* flush */
      }
-
      /* re-start DMA */
      tmp = readl(port_mmio + PORT_CMD);
      tmp |= PORT_CMD_START | PORT_CMD_FIS_RX;
@@ -711,12 +712,29 @@ static int ahci_host_init(struct ata_pro
      unsigned int i, j, using_dac;
      int rc;
      void __iomem *port_mmio;
+     u8 rev_id;        //peer add for m5287 rev 02h

+     pci_read_config_byte(pdev, PCI_REVISION_ID, &rev_id);
      cap_save = readl(mmio + HOST_CAP);
      cap_save &= ( (1<<28) | (1<<17) );
      cap_save |= (1 << 27);

      /* global controller reset */
+//peer add for m5287 rev 02h
+     if(pdev->vendor==PCI_VENDOR_ID_AL && pdev->device==0x5287 && rev_id
==0x02)
+     {
+           tmp = readl(mmio + HOST_CTL);
+           writel(tmp & ~HOST_RESET, mmio + HOST_CTL);
+           readl(mmio + HOST_CTL); /* flush */
+           writel(tmp | HOST_RESET, mmio + HOST_CTL);
+           readl(mmio + HOST_CTL); /* flush */
+           writel(tmp & ~HOST_RESET, mmio + HOST_CTL);
+           readl(mmio + HOST_CTL); /* flush */
+
+     }
+//peer add end
+     else
+     {
      tmp = readl(mmio + HOST_CTL);
      if ((tmp & HOST_RESET) == 0) {
            writel(tmp | HOST_RESET, mmio + HOST_CTL);
@@ -735,6 +753,7 @@ static int ahci_host_init(struct ata_pro
            return -EIO;
      }

+     }
      writel(HOST_AHCI_EN, mmio + HOST_CTL);
      (void) readl(mmio + HOST_CTL);      /* flush */
      writel(cap_save, mmio + HOST_CAP);
@@ -796,6 +815,18 @@ static int ahci_host_init(struct ata_pro
            /* make sure port is not active */
            tmp = readl(port_mmio + PORT_CMD);
            VPRINTK("PORT_CMD 0x%x\n", tmp);
+//peer add for m5287 rev 02h
+           if(pdev->vendor==PCI_VENDOR_ID_AL && pdev->device==0x5287 &&
rev_id==0x02)
+           {
+                 //set start bit then issue comreset when initialize
+                 writel((tmp|PORT_CMD_START), port_mmio + PORT_CMD);
+                 writel(0x01, port_mmio + PORT_SCR_CTL);
+                 readl(port_mmio + PORT_SCR_CTL); /* flush */
+                 msleep(1);
+                 writel(0x0, port_mmio + PORT_SCR_CTL);
+                 readl(port_mmio + PORT_SCR_CTL); /* flush */
+           }
+//peer add end
            if (tmp & (PORT_CMD_LIST_ON | PORT_CMD_FIS_ON |
                     PORT_CMD_FIS_RX | PORT_CMD_START)) {
                  tmp &= ~(PORT_CMD_LIST_ON | PORT_CMD_FIS_ON |