libata/pata_it821x: Improve handling of poorly compatible emulations

[linux-2.6] / drivers / ata / ata_piix.c

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index b406b39b878e90e981f89d10decf52369ac20bca..2db635817edf03ac61b9cc816bf5ac917ced1701 100644 (file)
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -118,22 +118,6 @@ enum {
        PIIX_80C_PRI            = (1 << 5) | (1 << 4),
        PIIX_80C_SEC            = (1 << 7) | (1 << 6),
 
-       /* controller IDs */
-       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,
-       piix_pata_vmw,                  /* PIIX4 for VMware, spurious DMA_ERR */
-
        /* constants for mapping table */
        P0                      = 0,  /* port 0 */
        P1                      = 1,  /* port 1 */
@@ -149,6 +133,24 @@ enum {
        PIIX_HOST_BROKEN_SUSPEND = (1 << 24),
 };
 
+enum piix_controller_ids {
+       /* controller IDs */
+       piix_pata_mwdma,        /* 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,
+       piix_pata_vmw,                  /* PIIX4 for VMware, spurious DMA_ERR */
+};
+
 struct piix_map_db {
        const u32 mask;
        const u16 port_enable;
@@ -1033,6 +1035,13 @@ static int piix_broken_suspend(void)
                                DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M5"),
                        },
                },
+               {
+                       .ident = "TECRA M6",
+                       .matches = {
+                               DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                               DMI_MATCH(DMI_PRODUCT_NAME, "TECRA M6"),
+                       },
+               },
                {
                        .ident = "TECRA M7",
                        .matches = {
@@ -1047,6 +1056,13 @@ static int piix_broken_suspend(void)
                                DMI_MATCH(DMI_PRODUCT_NAME, "TECRA A8"),
                        },
                },
+               {
+                       .ident = "Satellite R20",
+                       .matches = {
+                               DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                               DMI_MATCH(DMI_PRODUCT_NAME, "Satellite R20"),
+                       },
+               },
                {
                        .ident = "Satellite R25",
                        .matches = {