1 files changed, 29 insertions, 27 deletions

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 47701b286f8b..4d716c7347e7 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -118,7 +118,7 @@ enum {
         PIIX_80C_SEC            = (1 << 7) | (1 << 6),
 
         /* controller IDs */
-        piix_pata_33            = 0,    /* PIIX3 or 4 at 33Mhz */
+        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 */
@@ -128,6 +128,7 @@ enum {
         ich6_sata_ahci          = 7,
         ich6m_sata_ahci         = 8,
         ich8_sata_ahci          = 9,
+        piix_pata_mwdma         = 10,   /* PIIX3 MWDMA only */
 
         /* constants for mapping table */
         P0                      = 0,  /* port 0 */
@@ -153,7 +154,6 @@ struct piix_host_priv {
 
 static int piix_init_one (struct pci_dev *pdev,
                                     const struct pci_device_id *ent);
-static void piix_host_stop(struct ata_host *host);
 static void piix_pata_error_handler(struct ata_port *ap);
 static void ich_pata_error_handler(struct ata_port *ap);
 static void piix_sata_error_handler(struct ata_port *ap);
@@ -164,7 +164,8 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
 static unsigned int in_module_init = 1;
 
 static const struct pci_device_id piix_pci_tbl[] = {
-#ifdef ATA_ENABLE_PATA
+        /* Intel PIIX3 for the 430HX etc */
+        { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
         /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
         /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
         { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
@@ -202,7 +203,6 @@ static const struct pci_device_id piix_pci_tbl[] = {
         /* ICH7/7-R (i945, i975) UDMA 100*/
         { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
         { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
-#endif
 
         /* NOTE: The following PCI ids must be kept in sync with the
          * list in drivers/pci/quirks.c.
@@ -297,7 +297,7 @@ static const struct ata_port_operations piix_pata_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
-        .data_xfer              = ata_pio_data_xfer,
+        .data_xfer              = ata_data_xfer,
 
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
@@ -306,10 +306,10 @@ static const struct ata_port_operations piix_pata_ops = {
 
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
+        .irq_on                 = ata_irq_on,
+        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
-        .port_stop              = ata_port_stop,
-        .host_stop              = piix_host_stop,
 };
 
 static const struct ata_port_operations ich_pata_ops = {
@@ -330,7 +330,7 @@ static const struct ata_port_operations ich_pata_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
-        .data_xfer              = ata_pio_data_xfer,
+        .data_xfer              = ata_data_xfer,
 
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
@@ -339,10 +339,10 @@ static const struct ata_port_operations ich_pata_ops = {
 
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
+        .irq_on                 = ata_irq_on,
+        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
-        .port_stop              = ata_port_stop,
-        .host_stop              = piix_host_stop,
 };
 
 static const struct ata_port_operations piix_sata_ops = {
@@ -360,7 +360,7 @@ static const struct ata_port_operations piix_sata_ops = {
         .bmdma_status           = ata_bmdma_status,
         .qc_prep                = ata_qc_prep,
         .qc_issue               = ata_qc_issue_prot,
-        .data_xfer              = ata_pio_data_xfer,
+        .data_xfer              = ata_data_xfer,
 
         .freeze                 = ata_bmdma_freeze,
         .thaw                   = ata_bmdma_thaw,
@@ -369,10 +369,10 @@ static const struct ata_port_operations piix_sata_ops = {
 
         .irq_handler            = ata_interrupt,
         .irq_clear              = ata_bmdma_irq_clear,
+        .irq_on                 = ata_irq_on,
+        .irq_ack                = ata_irq_ack,
 
         .port_start             = ata_port_start,
-        .port_stop              = ata_port_stop,
-        .host_stop              = piix_host_stop,
 };
 
 static const struct piix_map_db ich5_map_db = {
@@ -441,7 +441,7 @@ static const struct piix_map_db *piix_map_db_table[] = {
 };
 
 static struct ata_port_info piix_port_info[] = {
-        /* piix_pata_33: 0:  PIIX3 or 4 at 33MHz */
+        /* piix_pata_33: 0:  PIIX4 at 33MHz */
         {
                 .sht            = &piix_sht,
                 .flags          = PIIX_PATA_FLAGS,
@@ -543,6 +543,14 @@ static struct ata_port_info piix_port_info[] = {
                 .port_ops       = &piix_sata_ops,
         },
 
+        /* piix_pata_mwdma: 10:  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,
+        },
 };
 
 static struct pci_bits piix_enable_bits[] = {
@@ -569,6 +577,7 @@ struct ich_laptop {
 static const struct ich_laptop ich_laptop[] = {
         /* devid, subvendor, subdev */
         { 0x27DF, 0x0005, 0x0280 },     /* ICH7 on Acer 5602WLMi */
+        { 0x27DF, 0x1025, 0x0110 },     /* ICH7 on Acer 3682WLMi */
         /* end marker */
         { 0, }
 };
@@ -632,7 +641,7 @@ static int piix_pata_prereset(struct ata_port *ap)
 
         if (!pci_test_config_bits(pdev, &piix_enable_bits[ap->port_no]))
                 return -ENOENT;
-                
+
         ap->cbl = ATA_CBL_PATA40;
         return ata_std_prereset(ap);
 }
@@ -776,7 +785,7 @@ static void do_pata_set_dmamode (struct ata_port *ap, struct ata_device *adev, i
         u16 master_data;
         u8 speed                = adev->dma_mode;
         int devid               = adev->devno + 2 * ap->port_no;
-        u8 udma_enable;
+        u8 udma_enable          = 0;
 
         static const     /* ISP  RTC */
         u8 timings[][2] = { { 0, 0 },
@@ -786,7 +795,8 @@ static void do_pata_set_dmamode (struct ata_port *ap, struct ata_device *adev, i
                             { 2, 3 }, };
 
         pci_read_config_word(dev, master_port, &master_data);
-        pci_read_config_byte(dev, 0x48, &udma_enable);
+        if (ap->udma_mask)
+                pci_read_config_byte(dev, 0x48, &udma_enable);
 
         if (speed >= XFER_UDMA_0) {
                 unsigned int udma = adev->dma_mode - XFER_UDMA_0;
@@ -1059,6 +1069,7 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev,
 static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
 {
         static int printed_version;
+        struct device *dev = &pdev->dev;
         struct ata_port_info port_info[2];
         struct ata_port_info *ppinfo[2] = { &port_info[0], &port_info[1] };
         struct piix_host_priv *hpriv;
@@ -1072,7 +1083,7 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         if (!in_module_init)
                 return -ENODEV;
 
-        hpriv = kzalloc(sizeof(*hpriv), GFP_KERNEL);
+        hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
         if (!hpriv)
                 return -ENOMEM;
 
@@ -1122,15 +1133,6 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         return ata_pci_init_one(pdev, ppinfo, 2);
 }
 
-static void piix_host_stop(struct ata_host *host)
-{
-        struct piix_host_priv *hpriv = host->private_data;
-
-        ata_host_stop(host);
-
-        kfree(hpriv);
-}
-
 static int __init piix_init(void)
 {
         int rc;