pata_hpt37x: Fix outstanding bug reports on the HPT374 and 37x cable detect

- Read frequency correctly
- Correct cable detect handling
- Fix wrong filter test

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 36 insertions, 13 deletions

diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index e61cb1fd57b2..3816b8605e0d 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -295,7 +295,7 @@ static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask)
 
 static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
 {
-        if (adev->class != ATA_DEV_ATA) {
+        if (adev->class == ATA_DEV_ATA) {
                 if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
                         mask &= ~ (0x1F << ATA_SHIFT_UDMA);
         }
@@ -359,28 +359,25 @@ static int hpt374_pre_reset(struct ata_link *link, unsigned long deadline)
                 { 0x50, 1, 0x04, 0x04 },
                 { 0x54, 1, 0x04, 0x04 }
         };
-        u16 mcr3, mcr6;
+        u16 mcr3;
         u8 ata66;
         struct ata_port *ap = link->ap;
         struct pci_dev *pdev = to_pci_dev(ap->host->dev);
+        unsigned int mcrbase = 0x50 + 4 * ap->port_no;
 
         if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
                 return -ENOENT;
 
         /* Do the extra channel work */
-        pci_read_config_word(pdev, 0x52, &mcr3);
-        pci_read_config_word(pdev, 0x56, &mcr6);
+        pci_read_config_word(pdev, mcrbase + 2, &mcr3);
         /* Set bit 15 of 0x52 to enable TCBLID as input
-           Set bit 15 of 0x56 to enable FCBLID as input
          */
-        pci_write_config_word(pdev, 0x52, mcr3 | 0x8000);
-        pci_write_config_word(pdev, 0x56, mcr6 | 0x8000);
+        pci_write_config_word(pdev, mcrbase + 2, mcr3 | 0x8000);
         pci_read_config_byte(pdev, 0x5A, &ata66);
         /* Reset TCBLID/FCBLID to output */
         pci_write_config_word(pdev, 0x52, mcr3);
-        pci_write_config_word(pdev, 0x56, mcr6);
 
-        if (ata66 & (1 << ap->port_no))
+        if (ata66 & (2 >> ap->port_no))
                 ap->cbl = ATA_CBL_PATA40;
         else
                 ap->cbl = ATA_CBL_PATA80;
@@ -844,6 +841,25 @@ static int hpt37x_calibrate_dpll(struct pci_dev *dev)
         /* Never went stable */
         return 0;
 }
+
+static u32 hpt374_read_freq(struct pci_dev *pdev)
+{
+        u32 freq;
+        unsigned long io_base = pci_resource_start(pdev, 4);
+        if (PCI_FUNC(pdev->devfn) & 1) {
+                struct pci_dev *pdev_0 = pci_get_slot(pdev->bus, pdev->devfn - 1);
+                /* Someone hot plugged the controller on us ? */
+                if (pdev_0 == NULL)
+                        return 0;
+                io_base = pci_resource_start(pdev_0, 4);
+                freq = inl(io_base + 0x90);
+                pci_dev_put(pdev_0);
+        }
+        else
+                freq = inl(io_base + 0x90);
+        return freq;
+}
+
 /**
  *      hpt37x_init_one         -       Initialise an HPT37X/302
  *      @dev: PCI device
@@ -902,7 +918,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
-                .udma_mask = 0x0f,
+                .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt370_port_ops
         };
         /* HPT370A - UDMA100 */
@@ -911,7 +927,7 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 .flags = ATA_FLAG_SLAVE_POSS,
                 .pio_mask = 0x1f,
                 .mwdma_mask = 0x07,
-                .udma_mask = 0x0f,
+                .udma_mask = ATA_UDMA5,
                 .port_ops = &hpt370a_port_ops
         };
         /* HPT371, 372 and friends - UDMA133 */
@@ -1047,9 +1063,16 @@ static int hpt37x_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                 outb(0x0e, iobase + 0x9c);
 
         /* Some devices do not let this value be accessed via PCI space
-           according to the old driver */
+           according to the old driver. In addition we must use the value
+           from FN 0 on the HPT374 */
+
+        if (chip_table == &hpt374) {
+                freq = hpt374_read_freq(dev);
+                if (freq == 0)
+                        return -ENODEV;
+        } else
+                freq = inl(iobase + 0x90);
 
-        freq = inl(iobase + 0x90);
         if ((freq >> 12) != 0xABCDE) {
                 int i;
                 u8 sr;