4 files changed, 13 insertions, 3 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 3f4aa0c99ee4..03f6338acc8f 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -6,6 +6,7 @@ menu "Serial ATA (prod) and Parallel ATA (experimental) drivers"
 
 config ATA
         tristate "ATA device support"
+        depends on BLOCK
         depends on !(M32R || M68K) || BROKEN
         depends on !SUN4 || BROKEN
         select SCSI
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 25929123ffff..cef2e70d64f8 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1041,7 +1041,7 @@ static void ahci_host_intr(struct ata_port *ap)
         /* hmmm... a spurious interupt */
 
         /* some devices send D2H reg with I bit set during NCQ command phase */
-        if (ap->sactive && status & PORT_IRQ_D2H_REG_FIS)
+        if (ap->sactive && (status & PORT_IRQ_D2H_REG_FIS))
                 return;
 
         /* ignore interim PIO setup fis interrupts */
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 5719704eb0ee..5250187ffce2 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -432,9 +432,9 @@ static const struct piix_map_db ich8_map_db = {
         .present_shift = 8,
         .map = {
                 /* PM   PS   SM   SS       MAP */
-                {  P0,  NA,  P1,  NA }, /* 00b (hardwired) */
+                {  P0,  P2,  P1,  P3 }, /* 00b (hardwired when in AHCI) */
                 {  RV,  RV,  RV,  RV },
-                {  RV,  RV,  RV,  RV }, /* 10b (never) */
+                {  IDE,  IDE,  NA,  NA }, /* 10b (IDE mode) */
                 {  RV,  RV,  RV,  RV },
         },
 };
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 06daaa3736a2..7645f2b30ccf 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -981,6 +981,15 @@ int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                 mask = (1 << 2) | (1 << 0);
                 if ((tmp8 & mask) != mask)
                         legacy_mode = (1 << 3);
+#if defined(CONFIG_NO_ATA_LEGACY)
+                /* Some platforms with PCI limits cannot address compat
+                   port space. In that case we punt if their firmware has
+                   left a device in compatibility mode */
+                if (legacy_mode) {
+                        printk(KERN_ERR "ata: Compatibility mode ATA is not supported on this platform, skipping.\n");
+                        return -EOPNOTSUPP;
+                }
+#endif
         }
 
         rc = pci_request_regions(pdev, DRV_NAME);