diff options
author | Kefeng Wang <kefeng.wang@linaro.org> | 2014-05-14 02:13:40 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2014-05-14 13:07:09 -0400 |
commit | 888d91a08fa8e2be4cb0eef1e5736ef68b8f77f0 (patch) | |
tree | 6d94d11eeb4f56442acfd21b8f6ca42ecb6e19d0 /drivers/ata | |
parent | 58eb8cd565af4a104395e3c10443951c1f73dafe (diff) |
ata: ahci: append new hflag AHCI_HFLAG_NO_FBS
Append AHCI_HFLAG_NO_FBS to force turning off FBS flag.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Kefeng Wang <kefeng.wang@linaro.org>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/ahci.h | 1 | ||||
-rw-r--r-- | drivers/ata/libahci.c | 5 |
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 { | |||
235 | port start (wait until | 235 | port start (wait until |
236 | error-handling stage) */ | 236 | error-handling stage) */ |
237 | AHCI_HFLAG_MULTI_MSI = (1 << 16), /* multiple PCI MSIs */ | 237 | AHCI_HFLAG_MULTI_MSI = (1 << 16), /* multiple PCI MSIs */ |
238 | AHCI_HFLAG_NO_FBS = (1 << 17), /* no FBS */ | ||
238 | 239 | ||
239 | /* ap->flags bits */ | 240 | /* ap->flags bits */ |
240 | 241 | ||
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, | |||
457 | cap |= HOST_CAP_FBS; | 457 | cap |= HOST_CAP_FBS; |
458 | } | 458 | } |
459 | 459 | ||
460 | if ((cap & HOST_CAP_FBS) && (hpriv->flags & AHCI_HFLAG_NO_FBS)) { | ||
461 | dev_info(dev, "controller can't do FBS, turning off CAP_FBS\n"); | ||
462 | cap &= ~HOST_CAP_FBS; | ||
463 | } | ||
464 | |||
460 | if (force_port_map && port_map != force_port_map) { | 465 | if (force_port_map && port_map != force_port_map) { |
461 | dev_info(dev, "forcing port_map 0x%x -> 0x%x\n", | 466 | dev_info(dev, "forcing port_map 0x%x -> 0x%x\n", |
462 | port_map, force_port_map); | 467 | port_map, force_port_map); |