2 files changed, 6 insertions, 0 deletions

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 51af275b3388..60db49b95001 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -235,6 +235,7 @@ enum {
                                                         port start (wait until
                                                         error-handling stage) */
         AHCI_HFLAG_MULTI_MSI            = (1 << 16), /* multiple PCI MSIs */
+        AHCI_HFLAG_NO_FBS               = (1 << 17), /* no FBS */
 
         /* ap->flags bits */
 
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 6bd4f660b4e1..e1cf859876fe 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -457,6 +457,11 @@ void ahci_save_initial_config(struct device *dev,
                 cap |= HOST_CAP_FBS;
         }
 
+        if ((cap & HOST_CAP_FBS) && (hpriv->flags & AHCI_HFLAG_NO_FBS)) {
+                dev_info(dev, "controller can't do FBS, turning off CAP_FBS\n");
+                cap &= ~HOST_CAP_FBS;
+        }
+
         if (force_port_map && port_map != force_port_map) {
                 dev_info(dev, "forcing port_map 0x%x -> 0x%x\n",
                          port_map, force_port_map);