ata: ahci: print the lpm policy on boot

The target LPM policy can be set using either a Kconfig or a kernel module
parameter.

However, if the board type is set to anything but board_ahci_low_power,
then the LPM policy will overridden and set to ATA_LPM_UNKNOWN.

Additionally, if the default suspend is suspend to idle, depending on the
hardware capabilities of the HBA, ahci_update_initial_lpm_policy() might
override the LPM policy to either ATA_LPM_MIN_POWER_WITH_PARTIAL or
ATA_LPM_MIN_POWER.

All this means that it is very hard to know which LPM policy a user will
actually be using on a given system.

In order to make it easier to debug LPM related issues, print the LPM
policy on boot.

One common LPM related issue is that the device fails to link up.
Because of that, we cannot add this print to ata_dev_configure(), as that
function is only called after a successful link up. Instead, add the info
using ata_port_desc(), with the help of a new ata_port_desc_misc() helper.
The port description is printed once per port during boot.

Before changes:
ata1: SATA max UDMA/133 abar m524288@0xa5780000 port 0xa5780100 irq 170
ata2: SATA max UDMA/133 abar m524288@0xa5780000 port 0xa5780180 irq 170

After changes:
ata1: SATA max UDMA/133 abar m524288@0xa5780000 port 0xa5780100 irq 170 lpm-pol 4
ata2: SATA max UDMA/133 abar m524288@0xa5780000 port 0xa5780180 irq 170 lpm-pol 4

Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index f1263364fa97fa5f37f878f5a16c376290fb9e18..1a63200ea437b0e44731679674f75784dc8a3ec1 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -2730,7 +2730,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host,
 
                if (rc)
                        return rc;
-               ata_port_desc(host->ports[i], "irq %d", irq);
+               ata_port_desc_misc(host->ports[i], irq);
        }
 
        return ata_host_register(host, sht);

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index d8cc1e27a125f0fbcadcd31fa146afc8868e2b6e..0f63f805c78c2d75815a5096f71e2ab4eb5f460e 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -6026,7 +6026,7 @@ int ata_host_activate(struct ata_host *host, int irq,
                return rc;
 
        for (i = 0; i < host->n_ports; i++)
-               ata_port_desc(host->ports[i], "irq %d", irq);
+               ata_port_desc_misc(host->ports[i], irq);
 
        rc = ata_host_register(host, sht);
        /* if failed, just free the IRQ and leave ports alone */

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index 8fcc622fcb3d49c67dd7c2c6efcf40c47a020f9f..95a19c4ef2a1ab724b3a192e89a5a6bb9ea924ee 100644 (file)
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2316,7 +2316,7 @@ int ata_pci_sff_activate_host(struct ata_host *host,
                for (i = 0; i < 2; i++) {
                        if (ata_port_is_dummy(host->ports[i]))
                                continue;
-                       ata_port_desc(host->ports[i], "irq %d", pdev->irq);
+                       ata_port_desc_misc(host->ports[i], pdev->irq);
                }
        } else if (legacy_mode) {
                if (!ata_port_is_dummy(host->ports[0])) {
@@ -2326,8 +2326,8 @@ int ata_pci_sff_activate_host(struct ata_host *host,
                        if (rc)
                                goto out;
 
-                       ata_port_desc(host->ports[0], "irq %d",
-                                     ATA_PRIMARY_IRQ(pdev));
+                       ata_port_desc_misc(host->ports[0],
+                                          ATA_PRIMARY_IRQ(pdev));
                }
 
                if (!ata_port_is_dummy(host->ports[1])) {
@@ -2337,8 +2337,8 @@ int ata_pci_sff_activate_host(struct ata_host *host,
                        if (rc)
                                goto out;
 
-                       ata_port_desc(host->ports[1], "irq %d",
-                                     ATA_SECONDARY_IRQ(pdev));
+                       ata_port_desc_misc(host->ports[1],
+                                          ATA_SECONDARY_IRQ(pdev));
                }
        }
 

diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index 422d42761a1d7fe73d65228e547992c4b497c38e..38795508c2e945cc8afddd96d3562af3c60cc931 100644 (file)
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -212,7 +212,7 @@ static int cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
                if (rc)
                        return rc;
 
-               ata_port_desc(ap, "irq %d", irq[i]);
+               ata_port_desc_misc(ap, irq[i]);
        }
 
        return ata_host_register(host, &cs5520_sht);

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 2a7d2af0ed80a860717a27303e7da6b8ade51e3d..54a217868ad0acea5e8c3f6abf1fa71fb74e41fa 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1561,6 +1561,11 @@ void ata_port_desc(struct ata_port *ap, const char *fmt, ...);
 extern void ata_port_pbar_desc(struct ata_port *ap, int bar, ssize_t offset,
                               const char *name);
 #endif
+static inline void ata_port_desc_misc(struct ata_port *ap, int irq)
+{
+       ata_port_desc(ap, "irq %d", irq);
+       ata_port_desc(ap, "lpm-pol %d", ap->target_lpm_policy);
+}
 
 static inline bool ata_tag_internal(unsigned int tag)
 {