aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Berger <opendmb@gmail.com>2017-06-21 19:20:12 -0400
committerTejun Heo <tj@kernel.org>2017-06-22 16:12:59 -0400
commitef0da1bf767d9e557c6375c7066717eead54cb15 (patch)
treeb14505fb37293098d814f455272c77b7ecff9aa8
parentd0318fb3c388a4082a4ea2b94fc242cd5c064cea (diff)
libata: Add the AHCI_HFLAG_YES_ALPM flag
Some hardware is capable of supporting Aggresive Link Power Management even though it is not indicated by the Host Capability register. This commit adds the AHCI_HFLAG_YES_ALPM flag to the AHCI library to allow indication of this quirk when the Host Capability register is Read Only and therefore cannot be changed. Signed-off-by: Doug Berger <opendmb@gmail.com> Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r--drivers/ata/ahci.h1
-rw-r--r--drivers/ata/libahci.c5
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h
index 30f67a1a4f54..ee176e4af97a 100644
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
@@ -248,6 +248,7 @@ enum {
248 AHCI_HFLAG_MULTI_MSI = 0, 248 AHCI_HFLAG_MULTI_MSI = 0,
249#endif 249#endif
250 AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */ 250 AHCI_HFLAG_WAKE_BEFORE_STOP = (1 << 22), /* wake before DMA stop */
251 AHCI_HFLAG_YES_ALPM = (1 << 23), /* force ALPM cap on */
251 252
252 /* ap->flags bits */ 253 /* ap->flags bits */
253 254
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index b3a685ad9b87..4462f8a8cf2c 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -504,6 +504,11 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv)
504 cap &= ~HOST_CAP_FBS; 504 cap &= ~HOST_CAP_FBS;
505 } 505 }
506 506
507 if (!(cap & HOST_CAP_ALPM) && (hpriv->flags & AHCI_HFLAG_YES_ALPM)) {
508 dev_info(dev, "controller can do ALPM, turning on CAP_ALPM\n");
509 cap |= HOST_CAP_ALPM;
510 }
511
507 if (hpriv->force_port_map && port_map != hpriv->force_port_map) { 512 if (hpriv->force_port_map && port_map != hpriv->force_port_map) {
508 dev_info(dev, "forcing port_map 0x%x -> 0x%x\n", 513 dev_info(dev, "forcing port_map 0x%x -> 0x%x\n",
509 port_map, hpriv->force_port_map); 514 port_map, hpriv->force_port_map);