1 files changed, 53 insertions, 1 deletions

diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c
index cc5f7726bde7..6981f7680a00 100644
--- a/drivers/ata/ata_generic.c
+++ b/drivers/ata/ata_generic.c
@@ -35,6 +35,7 @@
 enum {
         ATA_GEN_CLASS_MATCH             = (1 << 0),
         ATA_GEN_FORCE_DMA               = (1 << 1),
+        ATA_GEN_INTEL_IDER              = (1 << 2),
 };
 
 /**
@@ -109,6 +110,49 @@ static struct ata_port_operations generic_port_ops = {
 static int all_generic_ide;             /* Set to claim all devices */
 
 /**
+ *      is_intel_ider           -       identify intel IDE-R devices
+ *      @dev: PCI device
+ *
+ *      Distinguish Intel IDE-R controller devices from other Intel IDE
+ *      devices. IDE-R devices have no timing registers and are in
+ *      most respects virtual. They should be driven by the ata_generic
+ *      driver.
+ *
+ *      IDE-R devices have PCI offset 0xF8.L as zero, later Intel ATA has
+ *      it non zero. All Intel ATA has 0x40 writable (timing), but it is
+ *      not writable on IDE-R devices (this is guaranteed).
+ */
+
+static int is_intel_ider(struct pci_dev *dev)
+{
+        /* For Intel IDE the value at 0xF8 is only zero on IDE-R
+           interfaces */
+        u32 r;
+        u16 t;
+
+        /* Check the manufacturing ID, it will be zero for IDE-R */
+        pci_read_config_dword(dev, 0xF8, &r);
+        /* Not IDE-R: punt so that ata_(old)piix gets it */
+        if (r != 0)
+                return 0;
+        /* 0xF8 will also be zero on some early Intel IDE devices
+           but they will have a sane timing register */
+        pci_read_config_word(dev, 0x40, &t);
+        if (t != 0)
+                return 0;
+        /* Finally check if the timing register is writable so that
+           we eliminate any early devices hot-docked in a docking
+           station */
+        pci_write_config_word(dev, 0x40, 1);
+        pci_read_config_word(dev, 0x40, &t);
+        if (t) {
+                pci_write_config_word(dev, 0x40, 0);
+                return 0;
+        }
+        return 1;
+}
+
+/**
  *      ata_generic_init                -       attach generic IDE
  *      @dev: PCI device found
  *      @id: match entry
@@ -134,6 +178,10 @@ static int ata_generic_init_one(struct pci_dev *dev, const struct pci_device_id
         if ((id->driver_data & ATA_GEN_CLASS_MATCH) && all_generic_ide == 0)
                 return -ENODEV;
 
+        if (id->driver_data & ATA_GEN_INTEL_IDER)
+                if (!is_intel_ider(dev))
+                        return -ENODEV;
+
         /* Devices that need care */
         if (dev->vendor == PCI_VENDOR_ID_UMC &&
             dev->device == PCI_DEVICE_ID_UMC_UM8886A &&
@@ -186,7 +234,11 @@ static struct pci_device_id ata_generic[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),  },
         { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_3),  },
         { PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_5),  },
-#endif  
+#endif
+        /* Intel, IDE class device */
+        { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+          PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL, 
+          .driver_data = ATA_GEN_INTEL_IDER },
         /* Must come last. If you add entries adjust this table appropriately */
         { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_IDE << 8, 0xFFFFFF00UL),
           .driver_data = ATA_GEN_CLASS_MATCH },