commit 971342d7a90de74dc9ee60698d8002ed1dfdfaf4
author Haojian Zhuang <haojian.zhuang@linaro.org> Thu Apr 03 21:28:10 2014 +0800
committer Andrey Konovalov <andrey.konovalov@linaro.org> Wed Apr 16 23:52:33 2014 +0400
tree cc17c7a12b562f4f7ece49cca43bc0e8d3f909c2
parent 4fe75b321b14575bd2c2e622c8e17be205f24226

ata: ahci: append new hflag

Append AHCI_HFLAG_NO_FBS to force turning off FBS flag.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>

drivers/ata/ahci.h

diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 2289efd..167e519 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -232,6 +232,7 @@
 						        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 */
 

drivers/ata/libahci.c

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index 36605ab..ec3332f 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -450,6 +450,11 @@
 		cap &= ~HOST_CAP_SNTF;
 	}
 
+	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 (!(cap & HOST_CAP_FBS) && (hpriv->flags & AHCI_HFLAG_YES_FBS)) {
 		dev_info(dev, "controller can do FBS, turning on CAP_FBS\n");
 		cap |= HOST_CAP_FBS;