Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93b263e authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: clean up lpm related symbols and sysfs show/store functions 



Link power management related symbols are in confusing state w/ mixed
usages of lpm, ipm and pm.  This patch cleans up lpm related symbols
and sysfs show/store functions as follows.

* lpm states - NOT_AVAILABLE, MIN_POWER, MAX_PERFORMANCE and
  MEDIUM_POWER are renamed to ATA_LPM_UNKNOWN and
  ATA_LPM_{MIN|MAX|MED}_POWER.

* Pre/postfixes are unified to lpm.

* sysfs show/store functions for link_power_management_policy were
  curiously named get/put and unnecessarily complex.  Renamed to
  show/store and simplified.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent c43d559f

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
				   0x100 + ap->port_no * 0x80, "port");



		/* set initial link pm policy */

		ap->pm_policy = NOT_AVAILABLE;

		ap->lpm_policy = ATA_LPM_UNKNOWN;



		/* set enclosure management message type */

		if (ap->flags & ATA_FLAG_EM)

drivers/ata/ahci.h

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ enum { 
	AHCI_FLAG_COMMON		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |

					  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |

					  ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |

					  ATA_FLAG_IPM,

					  ATA_FLAG_LPM,



	ICH_MAP				= 0x90, /* ICH MAP register */

drivers/ata/ahci_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int __init ahci_probe(struct platform_device *pdev) 
		ata_port_desc(ap, "port 0x%x", 0x100 + ap->port_no * 0x80);



		/* set initial link pm policy */

		ap->pm_policy = NOT_AVAILABLE;

		ap->lpm_policy = ATA_LPM_UNKNOWN;



		/* set enclosure management message type */

		if (ap->flags & ATA_FLAG_EM)

drivers/ata/libahci.c

+9 −11
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ MODULE_PARM_DESC(skip_host_reset, "skip global host reset (0=don't skip, 1=skip) 
module_param_named(ignore_sss, ahci_ignore_sss, int, 0444);

MODULE_PARM_DESC(ignore_sss, "Ignore staggered spinup flag (0=don't ignore, 1=ignore)");



static int ahci_enable_alpm(struct ata_port *ap,

		enum link_pm policy);

static int ahci_enable_alpm(struct ata_port *ap, enum ata_lpm_policy policy);

static void ahci_disable_alpm(struct ata_port *ap);

static ssize_t ahci_led_show(struct ata_port *ap, char *buf);

static ssize_t ahci_led_store(struct ata_port *ap, const char *buf,
@@ -649,7 +648,7 @@ static void ahci_disable_alpm(struct ata_port *ap) 
	u32 cmd;

	struct ahci_port_priv *pp = ap->private_data;



	/* IPM bits should be disabled by libata-core */

	/* LPM bits should be disabled by libata-core */

	/* get the existing command bits */

	cmd = readl(port_mmio + PORT_CMD);
@@ -691,8 +690,7 @@ static void ahci_disable_alpm(struct ata_port *ap) 
	 */

}



static int ahci_enable_alpm(struct ata_port *ap,

	enum link_pm policy)

static int ahci_enable_alpm(struct ata_port *ap, enum ata_lpm_policy policy)

{

	struct ahci_host_priv *hpriv = ap->host->private_data;

	void __iomem *port_mmio = ahci_port_base(ap);
@@ -705,21 +703,21 @@ static int ahci_enable_alpm(struct ata_port *ap, 
		return -EINVAL;



	switch (policy) {

	case MAX_PERFORMANCE:

	case NOT_AVAILABLE:

	case ATA_LPM_MAX_POWER:

	case ATA_LPM_UNKNOWN:

		/*

		 * if we came here with NOT_AVAILABLE,

		 * if we came here with ATA_LPM_UNKNOWN,

		 * it just means this is the first time we

		 * have tried to enable - default to max performance,

		 * and let the user go to lower power modes on request.

		 */

		ahci_disable_alpm(ap);

		return 0;

	case MIN_POWER:

	case ATA_LPM_MIN_POWER:

		/* configure HBA to enter SLUMBER */

		asp = PORT_CMD_ASP;

		break;

	case MEDIUM_POWER:

	case ATA_LPM_MED_POWER:

		/* configure HBA to enter PARTIAL */

		asp = 0;

		break;
@@ -762,7 +760,7 @@ static int ahci_enable_alpm(struct ata_port *ap, 
	writel(cmd, port_mmio + PORT_CMD);

	cmd = readl(port_mmio + PORT_CMD);



	/* IPM bits should be set by libata-core */

	/* LPM bits should be set by libata-core */

	return 0;

}

drivers/ata/libata-core.c

+25 −25
Original line number Diff line number Diff line
@@ -1030,7 +1030,7 @@ const char *sata_spd_string(unsigned int spd) 
	return spd_str[spd - 1];

}



static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy)

static int ata_dev_set_dipm(struct ata_device *dev, enum ata_lpm_policy policy)

{

	struct ata_link *link = dev->link;

	struct ata_port *ap = link->ap;
@@ -1040,14 +1040,14 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) 


	/*

	 * disallow DIPM for drivers which haven't set

	 * ATA_FLAG_IPM.  This is because when DIPM is enabled,

	 * ATA_FLAG_LPM.  This is because when DIPM is enabled,

	 * phy ready will be set in the interrupt status on

	 * state changes, which will cause some drivers to

	 * think there are errors - additionally drivers will

	 * need to disable hot plug.

	 */

	if (!(ap->flags & ATA_FLAG_IPM) || !ata_dev_enabled(dev)) {

		ap->pm_policy = NOT_AVAILABLE;

	if (!(ap->flags & ATA_FLAG_LPM) || !ata_dev_enabled(dev)) {

		ap->lpm_policy = ATA_LPM_UNKNOWN;

		return -EINVAL;

	}
@@ -1066,8 +1066,8 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) 
		return rc;



	switch (policy) {

	case MIN_POWER:

		/* no restrictions on IPM transitions */

	case ATA_LPM_MIN_POWER:

		/* no restrictions on LPM transitions */

		scontrol &= ~(0x3 << 8);

		rc = sata_scr_write(link, SCR_CONTROL, scontrol);

		if (rc)
@@ -1078,8 +1078,8 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) 
			err_mask = ata_dev_set_feature(dev,

					SETFEATURES_SATA_ENABLE, SATA_DIPM);

		break;

	case MEDIUM_POWER:

		/* allow IPM to PARTIAL */

	case ATA_LPM_MED_POWER:

		/* allow LPM to PARTIAL */

		scontrol &= ~(0x1 << 8);

		scontrol |= (0x2 << 8);

		rc = sata_scr_write(link, SCR_CONTROL, scontrol);
@@ -1087,21 +1087,21 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) 
			return rc;



		/*

		 * we don't have to disable DIPM since IPM flags

		 * we don't have to disable DIPM since LPM flags

		 * disallow transitions to SLUMBER, which effectively

		 * disable DIPM if it does not support PARTIAL

		 */

		break;

	case NOT_AVAILABLE:

	case MAX_PERFORMANCE:

		/* disable all IPM transitions */

	case ATA_LPM_UNKNOWN:

	case ATA_LPM_MAX_POWER:

		/* disable all LPM transitions */

		scontrol |= (0x3 << 8);

		rc = sata_scr_write(link, SCR_CONTROL, scontrol);

		if (rc)

			return rc;



		/*

		 * we don't have to disable DIPM since IPM flags

		 * we don't have to disable DIPM since LPM flags

		 * disallow all transitions which effectively

		 * disable DIPM anyway.

		 */
@@ -1125,9 +1125,9 @@ static int ata_dev_set_dipm(struct ata_device *dev, enum link_pm policy) 
 *	enabling Host Initiated Power management.

 *

 *	Locking: Caller.

 *	Returns: -EINVAL if IPM is not supported, 0 otherwise.

 *	Returns: -EINVAL if LPM is not supported, 0 otherwise.

 */

void ata_dev_enable_pm(struct ata_device *dev, enum link_pm policy)

void ata_dev_enable_pm(struct ata_device *dev, enum ata_lpm_policy policy)

{

	int rc = 0;

	struct ata_port *ap = dev->link->ap;
@@ -1141,9 +1141,9 @@ void ata_dev_enable_pm(struct ata_device *dev, enum link_pm policy) 


enable_pm_out:

	if (rc)

		ap->pm_policy = MAX_PERFORMANCE;

		ap->lpm_policy = ATA_LPM_MAX_POWER;

	else

		ap->pm_policy = policy;

		ap->lpm_policy = policy;

	return /* rc */;	/* hopefully we can use 'rc' eventually */

}
@@ -1164,15 +1164,15 @@ static void ata_dev_disable_pm(struct ata_device *dev) 
{

	struct ata_port *ap = dev->link->ap;



	ata_dev_set_dipm(dev, MAX_PERFORMANCE);

	ata_dev_set_dipm(dev, ATA_LPM_MAX_POWER);

	if (ap->ops->disable_pm)

		ap->ops->disable_pm(ap);

}

#endif	/* CONFIG_PM */



void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy)

void ata_lpm_schedule(struct ata_port *ap, enum ata_lpm_policy policy)

{

	ap->pm_policy = policy;

	ap->lpm_policy = policy;

	ap->link.eh_info.action |= ATA_EH_LPM;

	ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY;

	ata_port_schedule_eh(ap);
@@ -1201,7 +1201,7 @@ static void ata_lpm_disable(struct ata_host *host) 


	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];

		ata_lpm_schedule(ap, ap->pm_policy);

		ata_lpm_schedule(ap, ap->lpm_policy);

	}

}

#endif	/* CONFIG_PM */
@@ -2564,7 +2564,7 @@ int ata_dev_configure(struct ata_device *dev) 
	if (dev->flags & ATA_DFLAG_LBA48)

		dev->max_sectors = ATA_MAX_SECTORS_LBA48;



	if (!(dev->horkage & ATA_HORKAGE_IPM)) {

	if (!(dev->horkage & ATA_HORKAGE_LPM)) {

		if (ata_id_has_hipm(dev->id))

			dev->flags |= ATA_DFLAG_HIPM;

		if (ata_id_has_dipm(dev->id))
@@ -2591,11 +2591,11 @@ int ata_dev_configure(struct ata_device *dev) 
		dev->max_sectors = min_t(unsigned int, ATA_MAX_SECTORS_128,

					 dev->max_sectors);



	if (ata_dev_blacklisted(dev) & ATA_HORKAGE_IPM) {

		dev->horkage |= ATA_HORKAGE_IPM;

	if (ata_dev_blacklisted(dev) & ATA_HORKAGE_LPM) {

		dev->horkage |= ATA_HORKAGE_LPM;



		/* reset link pm_policy for this port to no pm */

		ap->pm_policy = MAX_PERFORMANCE;

		ap->lpm_policy = ATA_LPM_MAX_POWER;

	}



	if (ap->ops->dev_config)