1 files changed, 64 insertions, 29 deletions

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 328ce8a08426..483269db2c7d 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -119,18 +119,19 @@ enum {
         PIIX_80C_SEC            = (1 << 7) | (1 << 6),
 
         /* controller IDs */
-        piix_pata_33            = 0,    /* PIIX4 at 33Mhz */
-        ich_pata_33             = 1,    /* ICH up to UDMA 33 only */
-        ich_pata_66             = 2,    /* ICH up to 66 Mhz */
-        ich_pata_100            = 3,    /* ICH up to UDMA 100 */
-        ich5_sata               = 5,
-        ich6_sata               = 6,
-        ich6_sata_ahci          = 7,
-        ich6m_sata_ahci         = 8,
-        ich8_sata_ahci          = 9,
-        piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
-        tolapai_sata_ahci       = 11,
-        ich9_2port_sata         = 12,
+        piix_pata_mwdma         = 0,    /* PIIX3 MWDMA only */
+        piix_pata_33,                   /* PIIX4 at 33Mhz */
+        ich_pata_33,                    /* ICH up to UDMA 33 only */
+        ich_pata_66,                    /* ICH up to 66 Mhz */
+        ich_pata_100,                   /* ICH up to UDMA 100 */
+        ich5_sata,
+        ich6_sata,
+        ich6_sata_ahci,
+        ich6m_sata_ahci,
+        ich8_sata_ahci,
+        ich8_2port_sata,
+        ich8m_apple_sata_ahci,          /* locks up on second port enable */
+        tolapai_sata_ahci,
 
         /* constants for mapping table */
         P0                      = 0,  /* port 0 */
@@ -239,19 +240,21 @@ static const struct pci_device_id piix_pci_tbl[] = {
         /* SATA Controller 1 IDE (ICH8) */
         { 0x8086, 0x2820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller 2 IDE (ICH8) */
-        { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2825, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* Mobile SATA Controller IDE (ICH8M) */
         { 0x8086, 0x2828, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
+        /* Mobile SATA Controller IDE (ICH8M), Apple */
+        { 0x8086, 0x2828, 0x106b, 0x00a0, 0, 0, ich8m_apple_sata_ahci },
         /* SATA Controller IDE (ICH9) */
         { 0x8086, 0x2920, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller IDE (ICH9) */
-        { 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2921, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9) */
-        { 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2926, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9M) */
-        { 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x2928, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9M) */
-        { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich9_2port_sata },
+        { 0x8086, 0x292d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
         /* SATA Controller IDE (ICH9M) */
         { 0x8086, 0x292e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata_ahci },
         /* SATA Controller IDE (Tolapai) */
@@ -427,7 +430,7 @@ static const struct piix_map_db ich6m_map_db = {
 
 static const struct piix_map_db ich8_map_db = {
         .mask = 0x3,
-        .port_enable = 0x3,
+        .port_enable = 0xf,
         .map = {
                 /* PM   PS   SM   SS       MAP */
                 {  P0,  P2,  P1,  P3 }, /* 00b (hardwired when in AHCI) */
@@ -437,7 +440,7 @@ static const struct piix_map_db ich8_map_db = {
         },
 };
 
-static const struct piix_map_db tolapai_map_db = {
+static const struct piix_map_db ich8_2port_map_db = {
         .mask = 0x3,
         .port_enable = 0x3,
         .map = {
@@ -449,7 +452,19 @@ static const struct piix_map_db tolapai_map_db = {
         },
 };
 
-static const struct piix_map_db ich9_2port_map_db = {
+static const struct piix_map_db ich8m_apple_map_db = {
+        .mask = 0x3,
+        .port_enable = 0x1,
+        .map = {
+                /* PM   PS   SM   SS       MAP */
+                {  P0,  NA,  NA,  NA }, /* 00b */
+                {  RV,  RV,  RV,  RV },
+                {  P0,  P2, IDE, IDE }, /* 10b */
+                {  RV,  RV,  RV,  RV },
+        },
+};
+
+static const struct piix_map_db tolapai_map_db = {
         .mask = 0x3,
         .port_enable = 0x3,
         .map = {
@@ -467,11 +482,21 @@ static const struct piix_map_db *piix_map_db_table[] = {
         [ich6_sata_ahci]        = &ich6_map_db,
         [ich6m_sata_ahci]       = &ich6m_map_db,
         [ich8_sata_ahci]        = &ich8_map_db,
+        [ich8_2port_sata]       = &ich8_2port_map_db,
+        [ich8m_apple_sata_ahci] = &ich8m_apple_map_db,
         [tolapai_sata_ahci]     = &tolapai_map_db,
-        [ich9_2port_sata]       = &ich9_2port_map_db,
 };
 
 static struct ata_port_info piix_port_info[] = {
+        [piix_pata_mwdma] =     /* PIIX3 MWDMA only */
+        {
+                .sht            = &piix_sht,
+                .flags          = PIIX_PATA_FLAGS,
+                .pio_mask       = 0x1f, /* pio0-4 */
+                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
+                .port_ops       = &piix_pata_ops,
+        },
+
         [piix_pata_33] =        /* PIIX4 at 33MHz */
         {
                 .sht            = &piix_sht,
@@ -565,13 +590,15 @@ static struct ata_port_info piix_port_info[] = {
                 .port_ops       = &piix_sata_ops,
         },
 
-        [piix_pata_mwdma] =     /* PIIX3 MWDMA only */
+        [ich8_2port_sata] =
         {
                 .sht            = &piix_sht,
-                .flags          = PIIX_PATA_FLAGS,
+                .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
+                                  PIIX_FLAG_AHCI,
                 .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x06, /* mwdma1-2 ?? CHECK 0 should be ok but slow */
-                .port_ops       = &piix_pata_ops,
+                .mwdma_mask     = 0x07, /* mwdma0-2 */
+                .udma_mask      = ATA_UDMA6,
+                .port_ops       = &piix_sata_ops,
         },
 
         [tolapai_sata_ahci] =
@@ -585,7 +612,7 @@ static struct ata_port_info piix_port_info[] = {
                 .port_ops       = &piix_sata_ops,
         },
 
-        [ich9_2port_sata] =
+        [ich8m_apple_sata_ahci] =
         {
                 .sht            = &piix_sht,
                 .flags          = PIIX_SATA_FLAGS | PIIX_FLAG_SCR |
@@ -595,6 +622,7 @@ static struct ata_port_info piix_port_info[] = {
                 .udma_mask      = ATA_UDMA6,
                 .port_ops       = &piix_sata_ops,
         },
+
 };
 
 static struct pci_bits piix_enable_bits[] = {
@@ -974,6 +1002,13 @@ static int piix_broken_suspend(void)
                         },
                 },
                 {
+                        .ident = "SATELLITE U205",
+                        .matches = {
+                                DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                                DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE U205"),
+                        },
+                },
+                {
                         .ident = "Portege M500",
                         .matches = {
                                 DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
@@ -1086,12 +1121,12 @@ static int piix_disable_ahci(struct pci_dev *pdev)
         if (!mmio)
                 return -ENOMEM;
 
-        tmp = readl(mmio + AHCI_GLOBAL_CTL);
+        tmp = ioread32(mmio + AHCI_GLOBAL_CTL);
         if (tmp & AHCI_ENABLE) {
                 tmp &= ~AHCI_ENABLE;
-                writel(tmp, mmio + AHCI_GLOBAL_CTL);
+                iowrite32(tmp, mmio + AHCI_GLOBAL_CTL);
 
-                tmp = readl(mmio + AHCI_GLOBAL_CTL);
+                tmp = ioread32(mmio + AHCI_GLOBAL_CTL);
                 if (tmp & AHCI_ENABLE)
                         rc = -EIO;
         }