27 files changed, 116 insertions, 171 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 3d8b62f7441c..cc49a0d3089f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5506,30 +5506,6 @@ void ata_host_resume(struct ata_host *host)
 #endif
 /**
- *      ata_port_start - Set port up for dma.
- *      @ap: Port to initialize
- *
- *      Called just after data structures for each port are
- *      initialized.  Allocates space for PRD table.
- *
- *      May be used as the port_start() entry in ata_port_operations.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-int ata_port_start(struct ata_port *ap)
-{
-        struct device *dev = ap->dev;
-        ap->prd = dmam_alloc_coherent(dev, ATA_PRD_TBL_SZ, &ap->prd_dma,
-                                      GFP_KERNEL);
-        if (!ap->prd)
-                return -ENOMEM;
-        return 0;
-}
-/**
 *      ata_dev_init - Initialize an ata_device structure
 *      @dev: Device structure to initialize
 *
@@ -6757,7 +6733,6 @@ EXPORT_SYMBOL_GPL(ata_xfer_mode2mask);
 EXPORT_SYMBOL_GPL(ata_xfer_mode2shift);
 EXPORT_SYMBOL_GPL(ata_mode_string);
 EXPORT_SYMBOL_GPL(ata_id_xfermask);
-EXPORT_SYMBOL_GPL(ata_port_start);
 EXPORT_SYMBOL_GPL(ata_do_set_mode);
 EXPORT_SYMBOL_GPL(ata_std_qc_defer);
 EXPORT_SYMBOL_GPL(ata_noop_qc_prep);
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 6400e8751391..f1c99a3e8b2c 100644
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -66,8 +66,6 @@ const struct ata_port_operations ata_sff_port_ops = {
        .sff_irq_clear          = ata_sff_irq_clear,
        .lost_interrupt         = ata_sff_lost_interrupt,
-        .port_start             = ata_sff_port_start,
 };
 EXPORT_SYMBOL_GPL(ata_sff_port_ops);
@@ -2444,50 +2442,6 @@ void ata_sff_post_internal_cmd(struct ata_queued_cmd *qc)
 EXPORT_SYMBOL_GPL(ata_sff_post_internal_cmd);
 /**
- *      ata_sff_port_start - Set port up for dma.
- *      @ap: Port to initialize
- *
- *      Called just after data structures for each port are
- *      initialized.  Allocates space for PRD table if the device
- *      is DMA capable SFF.
- *
- *      May be used as the port_start() entry in ata_port_operations.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-int ata_sff_port_start(struct ata_port *ap)
-{
-        if (ap->ioaddr.bmdma_addr)
-                return ata_port_start(ap);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(ata_sff_port_start);
-/**
- *      ata_sff_port_start32 - Set port up for dma.
- *      @ap: Port to initialize
- *
- *      Called just after data structures for each port are
- *      initialized.  Allocates space for PRD table if the device
- *      is DMA capable SFF.
- *
- *      May be used as the port_start() entry in ata_port_operations for
- *      devices that are capable of 32bit PIO.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-int ata_sff_port_start32(struct ata_port *ap)
-{
-        ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;
-        if (ap->ioaddr.bmdma_addr)
-                return ata_port_start(ap);
-        return 0;
-}
-EXPORT_SYMBOL_GPL(ata_sff_port_start32);
-/**
 *      ata_sff_std_ports - initialize ioaddr with standard port offsets.
 *      @ioaddr: IO address structure to be initialized
 *
@@ -2646,21 +2600,12 @@ int ata_pci_sff_prepare_host(struct pci_dev *pdev,
                goto err_out;
        /* init DMA related stuff */
-        rc = ata_pci_bmdma_init(host);
+        ata_pci_bmdma_init(host);
-        if (rc)
-                goto err_bmdma;
        devres_remove_group(&pdev->dev, NULL);
        *r_host = host;
        return 0;
-err_bmdma:
-        /* This is necessary because PCI and iomap resources are
-         * merged and releasing the top group won't release the
-         * acquired resources if some of those have been acquired
-         * before entering this function.
-         */
-        pcim_iounmap_regions(pdev, 0xf);
 err_out:
        devres_release_group(&pdev->dev, NULL);
        return rc;
@@ -2843,12 +2788,12 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_init_one);
 const struct ata_port_operations ata_bmdma_port_ops = {
        .inherits               = &ata_sff_port_ops,
-        .mode_filter            = ata_bmdma_mode_filter,
        .bmdma_setup            = ata_bmdma_setup,
        .bmdma_start            = ata_bmdma_start,
        .bmdma_stop             = ata_bmdma_stop,
        .bmdma_status           = ata_bmdma_status,
+        .port_start             = ata_bmdma_port_start,
 };
 EXPORT_SYMBOL_GPL(ata_bmdma_port_ops);
@@ -2856,22 +2801,10 @@ const struct ata_port_operations ata_bmdma32_port_ops = {
        .inherits               = &ata_bmdma_port_ops,
        .sff_data_xfer          = ata_sff_data_xfer32,
-        .port_start             = ata_sff_port_start32,
+        .port_start             = ata_bmdma_port_start32,
 };
 EXPORT_SYMBOL_GPL(ata_bmdma32_port_ops);
-unsigned long ata_bmdma_mode_filter(struct ata_device *adev,
-                                    unsigned long xfer_mask)
-{
-        /* Filter out DMA modes if the device has been configured by
-           the BIOS as PIO only */
-        if (adev->link->ap->ioaddr.bmdma_addr == NULL)
-                xfer_mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
-        return xfer_mask;
-}
-EXPORT_SYMBOL_GPL(ata_bmdma_mode_filter);
 /**
 *      ata_bmdma_setup - Set up PCI IDE BMDMA transaction
 *      @qc: Info associated with this ATA transaction.
@@ -2976,6 +2909,53 @@ u8 ata_bmdma_status(struct ata_port *ap)
 }
 EXPORT_SYMBOL_GPL(ata_bmdma_status);
+/**
+ *      ata_bmdma_port_start - Set port up for bmdma.
+ *      @ap: Port to initialize
+ *
+ *      Called just after data structures for each port are
+ *      initialized.  Allocates space for PRD table.
+ *
+ *      May be used as the port_start() entry in ata_port_operations.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
+int ata_bmdma_port_start(struct ata_port *ap)
+{
+        if (ap->mwdma_mask || ap->udma_mask) {
+                ap->prd = dmam_alloc_coherent(ap->host->dev, ATA_PRD_TBL_SZ,
+                                              &ap->prd_dma, GFP_KERNEL);
+                if (!ap->prd)
+                        return -ENOMEM;
+        }
+        return 0;
+}
+EXPORT_SYMBOL_GPL(ata_bmdma_port_start);
+/**
+ *      ata_bmdma_port_start32 - Set port up for dma.
+ *      @ap: Port to initialize
+ *
+ *      Called just after data structures for each port are
+ *      initialized.  Enables 32bit PIO and allocates space for PRD
+ *      table.
+ *
+ *      May be used as the port_start() entry in ata_port_operations for
+ *      devices that are capable of 32bit PIO.
+ *
+ *      LOCKING:
+ *      Inherited from caller.
+ */
+int ata_bmdma_port_start32(struct ata_port *ap)
+{
+        ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE;
+        return ata_bmdma_port_start(ap);
+}
+EXPORT_SYMBOL_GPL(ata_bmdma_port_start32);
 #ifdef CONFIG_PCI
 /**
@@ -3004,6 +2984,19 @@ int ata_pci_bmdma_clear_simplex(struct pci_dev *pdev)
 }
 EXPORT_SYMBOL_GPL(ata_pci_bmdma_clear_simplex);
+static void ata_bmdma_nodma(struct ata_host *host, const char *reason)
+{
+        int i;
+        dev_printk(KERN_ERR, host->dev, "BMDMA: %s, falling back to PIO\n",
+                   reason);
+        for (i = 0; i < 2; i++) {
+                host->ports[i]->mwdma_mask = 0;
+                host->ports[i]->udma_mask = 0;
+        }
+}
 /**
 *      ata_pci_bmdma_init - acquire PCI BMDMA resources and init ATA host
 *      @host: target ATA host
@@ -3012,33 +3005,40 @@ EXPORT_SYMBOL_GPL(ata_pci_bmdma_clear_simplex);
 *
 *      LOCKING:
 *      Inherited from calling layer (may sleep).
- *
- *      RETURNS:
- *      0 on success, -errno otherwise.
 */
-int ata_pci_bmdma_init(struct ata_host *host)
+void ata_pci_bmdma_init(struct ata_host *host)
 {
        struct device *gdev = host->dev;
        struct pci_dev *pdev = to_pci_dev(gdev);
        int i, rc;
        /* No BAR4 allocation: No DMA */
-        if (pci_resource_start(pdev, 4) == 0)
+        if (pci_resource_start(pdev, 4) == 0) {
-                return 0;
+                ata_bmdma_nodma(host, "BAR4 is zero");
+                return;
+        }
-        /* TODO: If we get no DMA mask we should fall back to PIO */
+        /*
+         * Some controllers require BMDMA region to be initialized
+         * even if DMA is not in use to clear IRQ status via
+         * ->sff_irq_clear method.  Try to initialize bmdma_addr
+         * regardless of dma masks.
+         */
        rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);
        if (rc)
-                return rc;
+                ata_bmdma_nodma(host, "failed to set dma mask");
-        rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);
+        if (!rc) {
-        if (rc)
+                rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);
-                return rc;
+                if (rc)
+                        ata_bmdma_nodma(host,
+                                        "failed to set consistent dma mask");
+        }
        /* request and iomap DMA region */
        rc = pcim_iomap_regions(pdev, 1 << 4, dev_driver_string(gdev));
        if (rc) {
-                dev_printk(KERN_ERR, gdev, "failed to request/iomap BAR4\n");
+                ata_bmdma_nodma(host, "failed to request/iomap BAR4");
-                return -ENOMEM;
+                return;
        }
        host->iomap = pcim_iomap_table(pdev);
@@ -3057,8 +3057,6 @@ int ata_pci_bmdma_init(struct ata_host *host)
                ata_port_desc(ap, "bmdma 0x%llx",
                    (unsigned long long)pci_resource_start(pdev, 4) + 8 * i);
        }
-        return 0;
 }
 EXPORT_SYMBOL_GPL(ata_pci_bmdma_init);
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c
index 1ea2be0f4b94..1a5a309abccd 100644
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
@@ -101,7 +101,7 @@ static unsigned long pacpi_discover_modes(struct ata_port *ap, struct ata_device
 static unsigned long pacpi_mode_filter(struct ata_device *adev, unsigned long mask)
 {
        struct pata_acpi *acpi = adev->link->ap->private_data;
-        return ata_bmdma_mode_filter(adev, mask & acpi->mask[adev->devno]);
+        return mask & acpi->mask[adev->devno];
 }
 /**
@@ -205,7 +205,7 @@ static int pacpi_port_start(struct ata_port *ap)
                return -ENOMEM;
        acpi->mask[0] = pacpi_discover_modes(ap, &ap->link.device[0]);
        acpi->mask[1] = pacpi_discover_modes(ap, &ap->link.device[1]);
-        ret = ata_sff_port_start(ap);
+        ret = ata_bmdma_port_start(ap);
        if (ret < 0)
                return ret;
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index dc61b72f751c..f306e10c748d 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -124,7 +124,7 @@ static unsigned long ali_20_filter(struct ata_device *adev, unsigned long mask)
        ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
        if (strstr(model_num, "WDC"))
                return mask &= ~ATA_MASK_UDMA;
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 /**
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c
index c6a946aa252c..0da0dcc7dd08 100644
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@ -202,7 +202,6 @@ static struct ata_port_operations pata_at91_port_ops = {
        .sff_data_xfer  = pata_at91_data_xfer_noirq,
        .set_piomode    = pata_at91_set_piomode,
        .cable_detect   = ata_cable_40wire,
-        .port_start     = ATA_OP_NULL,
 };
 static int __devinit pata_at91_probe(struct platform_device *pdev)
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c
index 3d94c800e9d1..6422cfd13d0d 100644
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
@@ -1450,8 +1450,6 @@ static struct ata_port_operations bfin_pata_ops = {
        .port_start             = bfin_port_start,
        .port_stop              = bfin_port_stop,
-        .mode_filter            = ATA_OP_NULL,  /* will be removed soon */
 };
 static struct ata_port_info bfin_port_info[] = {
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 60ab2d2b1ccd..e5f289f59ca3 100644
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -153,16 +153,12 @@ static int cmd640_port_start(struct ata_port *ap)
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
        struct cmd640_reg *timing;
-        int ret = ata_sff_port_start(ap);
-        if (ret < 0)
-                return ret;
        timing = devm_kzalloc(&pdev->dev, sizeof(struct cmd640_reg), GFP_KERNEL);
        if (timing == NULL)
                return -ENOMEM;
        timing->last = -1;      /* Force a load */
        ap->private_data = timing;
-        return ret;
+        return 0;
 }
 static struct scsi_host_template cmd640_sht = {
diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c
index af49bfb57247..8580eb3cd54d 100644
--- a/drivers/ata/pata_hpt366.c
+++ b/drivers/ata/pata_hpt366.c
@@ -182,7 +182,7 @@ static unsigned long hpt366_filter(struct ata_device *adev, unsigned long mask)
        } else if (adev->class == ATA_DEV_ATAPI)
                mask &= ~(ATA_MASK_MWDMA | ATA_MASK_UDMA);
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 static int hpt36x_cable_detect(struct ata_port *ap)
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 8839307a64cf..98b498b6907c 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -282,7 +282,7 @@ static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask)
                if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
                        mask &= ~(0xE0 << ATA_SHIFT_UDMA);
        }
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 /**
@@ -298,7 +298,7 @@ static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
                if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
                        mask &= ~(0xE0 << ATA_SHIFT_UDMA);
        }
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 /**
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c
index 832c8ccd0e80..ee85a9ce0a11 100644
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
@@ -335,7 +335,7 @@ static struct ata_port_operations pata_icside_port_ops = {
        .postreset              = pata_icside_postreset,
        .post_internal_cmd      = pata_icside_bmdma_stop,
-        .mode_filter            = ATA_OP_NULL,  /* will be removed soon */
+        .port_start             = ATA_OP_NULL,  /* don't need PRD table */
 };
 static void __devinit
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 5cb286fd839e..8d73438f292c 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -739,7 +739,7 @@ static int it821x_port_start(struct ata_port *ap)
        struct it821x_dev *itdev;
        u8 conf;
-        int ret = ata_sff_port_start(ap);
+        int ret = ata_bmdma_port_start(ap);
        if (ret < 0)
                return ret;
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 17e4e5d19696..25df50f51c04 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -720,6 +720,8 @@ static int pata_macio_port_start(struct ata_port *ap)
        if (priv->dma_table_cpu == NULL) {
                dev_err(priv->dev, "Unable to allocate DMA command list\n");
                ap->ioaddr.bmdma_addr = NULL;
+                ap->mwdma_mask = 0;
+                ap->udma_mask = 0;
        }
        return 0;
 }
diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index ca5cad0fd80b..09f1f22c0307 100644
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -265,7 +265,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
        struct ata_device *pair = ata_dev_pair(adev);
        if (adev->class != ATA_DEV_ATA || adev->devno == 0 || pair == NULL)
-                return ata_bmdma_mode_filter(adev, mask);
+                return mask;
        /* Check for slave of a Maxtor at UDMA6 */
        ata_id_c_string(pair->id, model_num, ATA_ID_PROD,
@@ -274,7 +274,7 @@ static unsigned long pdc2027x_mode_filter(struct ata_device *adev, unsigned long
        if (strstr(model_num, "Maxtor") == NULL && pair->dma_mode == XFER_UDMA_6)
                mask &= ~ (1 << (6 + ATA_SHIFT_UDMA));
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 /**
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 9ac0897cf8b0..fa1e2f3bc0fd 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -249,7 +249,7 @@ static int pdc2026x_port_start(struct ata_port *ap)
                u8 burst = ioread8(bmdma + 0x1f);
                iowrite8(burst | 0x01, bmdma + 0x1f);
        }
-        return ata_sff_port_start(ap);
+        return ata_bmdma_port_start(ap);
 }
 /**
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 3f6ebc6c665a..50400fa120fe 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -53,7 +53,6 @@ static struct ata_port_operations pata_platform_port_ops = {
        .sff_data_xfer          = ata_sff_data_xfer_noirq,
        .cable_detect           = ata_cable_unknown,
        .set_mode               = pata_platform_set_mode,
-        .port_start             = ATA_OP_NULL,
 };
 static void pata_platform_setup_port(struct ata_ioports *ioaddr,
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index d3988991ca68..70d549e28f0f 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -265,7 +265,7 @@ unsigned long scc_mode_filter(struct ata_device *adev, unsigned long mask)
                printk(KERN_INFO "%s: limit ATAPI UDMA to UDMA4\n", DRV_NAME);
                mask &= ~(0xE0 << ATA_SHIFT_UDMA);
        }
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 /**
@@ -892,7 +892,7 @@ static void scc_irq_clear (struct ata_port *ap)
 *      scc_port_start - Set port up for dma.
 *      @ap: Port to initialize
 *
- *      Allocate space for PRD table using ata_port_start().
+ *      Allocate space for PRD table using ata_bmdma_port_start().
 *      Set PRD table address for PTERADD. (PRD Transfer End Read)
 */
@@ -901,7 +901,7 @@ static int scc_port_start (struct ata_port *ap)
        void __iomem *mmio = ap->ioaddr.bmdma_addr;
        int rc;
-        rc = ata_port_start(ap);
+        rc = ata_bmdma_port_start(ap);
        if (rc)
                return rc;
diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c
index 9524d54035f7..43ea389df2b3 100644
--- a/drivers/ata/pata_serverworks.c
+++ b/drivers/ata/pata_serverworks.c
@@ -198,7 +198,7 @@ static unsigned long serverworks_osb4_filter(struct ata_device *adev, unsigned l
 {
        if (adev->class == ATA_DEV_ATA)
                mask &= ~ATA_MASK_UDMA;
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
@@ -218,7 +218,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
        /* Disk, UDMA */
        if (adev->class != ATA_DEV_ATA)
-                return ata_bmdma_mode_filter(adev, mask);
+                return mask;
        /* Actually do need to check */
        ata_id_c_string(adev->id, model_num, ATA_ID_PROD, sizeof(model_num));
@@ -227,7 +227,7 @@ static unsigned long serverworks_csb_filter(struct ata_device *adev, unsigned lo
                if (!strcmp(p, model_num))
                        mask &= ~(0xE0 << ATA_SHIFT_UDMA);
        }
-        return ata_bmdma_mode_filter(adev, mask);
+        return mask;
 }
 /**
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c
index 87fb89e407f7..7e3e0a5598b7 100644
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
@@ -355,7 +355,7 @@ static unsigned long via_mode_filter(struct ata_device *dev, unsigned long mask)
                        mask &= ~ ATA_MASK_UDMA;
                }
        }
-        return ata_bmdma_mode_filter(dev, mask);
+        return mask;
 }
 /**
@@ -424,7 +424,7 @@ static int via_port_start(struct ata_port *ap)
        struct via_port *vp;
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-        int ret = ata_sff_port_start(ap);
+        int ret = ata_bmdma_port_start(ap);
        if (ret < 0)
                return ret;
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index ed18d8b42c52..bb4f838655b6 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -556,11 +556,7 @@ static int adma_port_start(struct ata_port *ap)
 {
        struct device *dev = ap->host->dev;
        struct adma_port_priv *pp;
-        int rc;
-        rc = ata_port_start(ap);
-        if (rc)
-                return rc;
        adma_enter_reg_mode(ap);
        pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
        if (!pp)
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index d3e1bab2a7ad..a36149ebf4a2 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -682,7 +682,6 @@ static int inic_port_start(struct ata_port *ap)
 {
        struct device *dev = ap->host->dev;
        struct inic_port_priv *pp;
-        int rc;
        /* alloc and initialize private data */
        pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
@@ -691,10 +690,6 @@ static int inic_port_start(struct ata_port *ap)
        ap->private_data = pp;
        /* Alloc resources */
-        rc = ata_port_start(ap);
-        if (rc)
-                return rc;
        pp->pkt = dmam_alloc_coherent(dev, sizeof(struct inic_pkt),
                                      &pp->pkt_dma, GFP_KERNEL);
        if (!pp->pkt)
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index a03371075990..83491861d110 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -717,8 +717,6 @@ static struct ata_port_operations mv6_ops = {
        .port_start             = mv_port_start,
        .port_stop              = mv_port_stop,
-        .mode_filter            = ATA_OP_NULL,  /* will be removed soon */
 };
 static struct ata_port_operations mv_iie_ops = {
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 20cc510595db..a007b20c1991 100644
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1156,7 +1156,8 @@ static int nv_adma_port_start(struct ata_port *ap)
        if (rc)
                return rc;
-        rc = ata_port_start(ap);
+        /* we might fallback to bmdma, allocate bmdma resources */
+        rc = ata_bmdma_port_start(ap);
        if (rc)
                return rc;
@@ -1985,7 +1986,8 @@ static int nv_swncq_port_start(struct ata_port *ap)
        struct nv_swncq_port_priv *pp;
        int rc;
-        rc = ata_port_start(ap);
+        /* we might fallback to bmdma, allocate bmdma resources */
+        rc = ata_bmdma_port_start(ap);
        if (rc)
                return rc;
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 2c029ea12c54..e80628a77669 100644
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -333,7 +333,8 @@ static int pdc_common_port_start(struct ata_port *ap)
        struct pdc_port_priv *pp;
        int rc;
-        rc = ata_port_start(ap);
+        /* we use the same prd table as bmdma, allocate it */
+        rc = ata_bmdma_port_start(ap);
        if (rc)
                return rc;
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index febc6e748420..da84ea9e4fb0 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -504,11 +504,7 @@ static int qs_port_start(struct ata_port *ap)
        void __iomem *mmio_base = qs_mmio_base(ap->host);
        void __iomem *chan = mmio_base + (ap->port_no * 0x4000);
        u64 addr;
-        int rc;
-        rc = ata_port_start(ap);
-        if (rc)
-                return rc;
        pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
        if (!pp)
                return -ENOMEM;
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c
index 7e3a25ec93b1..a4e552a325b0 100644
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
@@ -302,11 +302,6 @@ static int pdc_port_start(struct ata_port *ap)
 {
        struct device *dev = ap->host->dev;
        struct pdc_port_priv *pp;
-        int rc;
-        rc = ata_port_start(ap);
-        if (rc)
-                return rc;
        pp = devm_kzalloc(dev, sizeof(*pp), GFP_KERNEL);
        if (!pp)
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c
index 011e098590d1..d8dac17dc2c8 100644
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.c
@@ -181,9 +181,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        if (rc)
                return rc;
-        rc = ata_pci_bmdma_init(host);
+        ata_pci_bmdma_init(host);
-        if (rc)
-                return rc;
        iomap = host->iomap;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index d735728873b5..45a547e42d47 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1000,7 +1000,6 @@ extern unsigned long ata_xfer_mode2mask(u8 xfer_mode);
 extern int ata_xfer_mode2shift(unsigned long xfer_mode);
 extern const char *ata_mode_string(unsigned long xfer_mask);
 extern unsigned long ata_id_xfermask(const u16 *id);
-extern int ata_port_start(struct ata_port *ap);
 extern int ata_std_qc_defer(struct ata_queued_cmd *qc);
 extern void ata_noop_qc_prep(struct ata_queued_cmd *qc);
 extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg,
@@ -1616,8 +1615,6 @@ extern void ata_sff_postreset(struct ata_link *link, unsigned int *classes);
 extern void ata_sff_drain_fifo(struct ata_queued_cmd *qc);
 extern void ata_sff_error_handler(struct ata_port *ap);
 extern void ata_sff_post_internal_cmd(struct ata_queued_cmd *qc);
-extern int ata_sff_port_start(struct ata_port *ap);
-extern int ata_sff_port_start32(struct ata_port *ap);
 extern void ata_sff_std_ports(struct ata_ioports *ioaddr);
 #ifdef CONFIG_PCI
 extern int ata_pci_sff_init_host(struct ata_host *host);
@@ -1632,16 +1629,16 @@ extern int ata_pci_sff_init_one(struct pci_dev *pdev,
                struct scsi_host_template *sht, void *host_priv, int hflags);
 #endif /* CONFIG_PCI */
-extern unsigned long ata_bmdma_mode_filter(struct ata_device *dev,
-                                           unsigned long xfer_mask);
 extern void ata_bmdma_setup(struct ata_queued_cmd *qc);
 extern void ata_bmdma_start(struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
 extern u8 ata_bmdma_status(struct ata_port *ap);
+extern int ata_bmdma_port_start(struct ata_port *ap);
+extern int ata_bmdma_port_start32(struct ata_port *ap);
 #ifdef CONFIG_PCI
 extern int ata_pci_bmdma_clear_simplex(struct pci_dev *pdev);
-extern int ata_pci_bmdma_init(struct ata_host *host);
+extern void ata_pci_bmdma_init(struct ata_host *host);
 #endif /* CONFIG_PCI */
 /**