Various cleanups
Damien Le Moal
maintainerv2 cover Various cleanups
6 patches to clean libata code and better document parameters (config and AHCI driver module parameters).
Overall, no functional changes are introduced.
Changes from v1:
- Improved patch 4 as suggested by Hannes
- Added Hannes'review tag
Damien Le Moal (6):
ata: libata: Remove ATA_DFLAG_ZAC device flag
ata: libata-scsi: Cleanup ata_scsi_offline_dev()
ata: Fix SATA_MOBILE_LPM_POLICY description in Kconfig
ata: libata: Improve LPM policies description
ata: ahci: Clarify mobile_lpm_policy description
ata: libata-eh: Move and rename ata_eh_set_lpm()
drivers/ata/Kconfig | 36 +++-- drivers/ata/ahci.c | 4 +- drivers/ata/libata-core.c | 13 +- drivers/ata/libata-eh.c | 304 +++++++++++++++++++------------------- drivers/ata/libata-scsi.c | 20 ++- drivers/ata/libata.h | 9 +- include/linux/libata.h | 23 ++- 7 files changed, 216 insertions(+), 193 deletions(-)
Signature · 1 line
2.50.0
Damien Le Moal
maintainerPATCH v2 1/6 ata: libata: Remove ATA_DFLAG_ZAC device flag
The ATA device flag ATA_DFLAG_ZAC is used to indicate if a devie is a host managed or host aware zoned device. However, this flag is not used in the hot path and only used during device scanning/revalidation and for inquiry and sense SCSI command translation.
Save one bit from struct ata_device flags field by replacing this flag with the internal helper function ata_dev_is_zac(). This function returns true if the device class is ATA_DEV_ZAC (host managed ZAC device case) or if its identify data reports it supports the zoned command set (host aware ZAC device case).
--- drivers/ata/libata-core.c | 13 +------------ drivers/ata/libata-scsi.c | 5 ++--- drivers/ata/libata.h | 7 +++++++ include/linux/libata.h | 1 - 4 files changed, 10 insertions(+), 16 deletions(-)
drivers/ata/libata-core.c +1 -12
@@ -2421,18 +2421,7 @@ static void ata_dev_config_zac(struct ata_device *dev) dev->zac_zones_optimal_nonseq =U32_MAX ; dev->zac_zones_max_open =U32_MAX ; -/* -* Always set the 'ZAC' flag for Host-managed devices. -*/ -if (dev->class ==ATA_DEV_ZAC ) - dev->flags |=ATA_DFLAG_ZAC ; -else if (ata_id_zoned_cap (dev->id) ==0x01 ) -/* -* Check for host-aware devices. -*/ - dev->flags |=ATA_DFLAG_ZAC ; - -if (!(dev->flags &ATA_DFLAG_ZAC )) +if (!ata_dev_is_zac (dev))return ;if (!ata_identify_page_supported (dev,ATA_LOG_ZONED_INFORMATION )) {
drivers/ata/libata-scsi.c +2 -3
@@ -1923,8 +1923,7 @@ static unsigned int ata_scsiop_inq_00(struct ata_device *dev, };for (i =0 ; i <sizeof (pages); i++) { -if (pages[i] ==0xb6 && - !(dev->flags &ATA_DFLAG_ZAC )) +if (pages[i] ==0xb6 && !ata_dev_is_zac (dev))continue ; rbuf[num_pages +4 ] = pages[i]; num_pages++;
@@ -2181,7 +2180,7 @@ static unsigned int ata_scsiop_inq_b2(struct ata_device *dev,static unsigned int ata_scsiop_inq_b6 (struct ata_device *dev,struct scsi_cmnd *cmd,u8 *rbuf) { -if (!(dev->flags &ATA_DFLAG_ZAC )) { +if (!ata_dev_is_zac (dev)) {ata_scsi_set_invalid_field (dev, cmd,2 ,0xff );return 0 ; }
drivers/ata/libata.h +7 -0
@@ -44,6 +44,13 @@ static inline bool ata_sstatus_online(u32 sstatus)return (sstatus &0xf ) ==0x3 ; } +static inline bool ata_dev_is_zac (struct ata_device *dev) +{ +/* Host managed device or host aware device */ +return dev->class ==ATA_DEV_ZAC || +ata_id_zoned_cap (dev->id) ==0x01 ; +} +#ifdef CONFIG_ATA_FORCE extern void ata_force_cbl (struct ata_port *ap);#else
include/linux/libata.h +0 -1
@@ -144,7 +144,6 @@ enum {ATA_DFLAG_DEVSLP = (1 <<27 ),/* device supports Device Sleep */ ATA_DFLAG_ACPI_DISABLED = (1 <<28 ),/* ACPI for the device is disabled */ ATA_DFLAG_D_SENSE = (1 <<29 ),/* Descriptor sense requested */ -ATA_DFLAG_ZAC = (1 <<30 ),/* ZAC device */ ATA_DFLAG_FEATURES_MASK = (ATA_DFLAG_TRUSTED | ATA_DFLAG_DA | \ ATA_DFLAG_DEVSLP | ATA_DFLAG_NCQ_SEND_RECV | \
Signature · 1 line
2.50.0
Re: [PATCH v2 1/6] ata: libata: Remove ATA_DFLAG_ZAC device flag
Quoted 5 lines · Damien Le Moal
The ATA device flag
ATA_DFLAG_ZACis used to indicate if a devie is a host managed or host aware zoned device. However, this flag is not used in the hot path and only used during device scanning/revalidation and for inquiry and sense SCSI command translation.
Quoted 8 lines
Save one bit from struct
ata_deviceflags field by replacing this flag with the internal helper functionata_dev_is_zac(). This function returns true if the device class isATA_DEV_ZAC(host managed ZAC device case) or if its identify data reports it supports the zoned command set (host aware ZAC device case).Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Damien Le Moal
maintainerPATCH v2 2/6 ata: libata-scsi: Cleanup ata_scsi_offline_dev()
In reply to Damien Le MoalChange the function ata_scsi_offline_dev() to return a bool and change this function kdoc comment to have the correct mention of its call site. No functional changes.
--- drivers/ata/libata-scsi.c | 15 +++++++-------- drivers/ata/libata.h | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-)
drivers/ata/libata-scsi.c +7 -8
@@ -4633,24 +4633,23 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync)* ata_scsi_offline_dev - offline attached SCSI device * @dev: ATA device to offline attached SCSI device for * -* This function is called from ata_eh_hotplug() and responsible -* for taking the SCSI device attached to @dev offline. This -* function is called with host lock which protects dev->sdev -* against clearing. +* This function is called from ata_eh_detach_dev() and is responsible for +* taking the SCSI device attached to @dev offline. This function is +* called with host lock which protects dev->sdev against clearing. * * LOCKING: * spin_lock_irqsave(host lock) * * RETURNS: -* 1 if attached SCSI device exists, 0 otherwise. +* true if attached SCSI device exists, false otherwise. */ -int ata_scsi_offline_dev (struct ata_device *dev) +bool ata_scsi_offline_dev (struct ata_device *dev) {if (dev->sdev) {scsi_device_set_state (dev->sdev,SDEV_OFFLINE ); -return 1 ; +return true; } -return 0 ; +return false; }/**
drivers/ata/libata.h +1 -1
@@ -144,7 +144,7 @@ extern struct ata_device *ata_scsi_find_dev(struct ata_port *ap,extern int ata_scsi_add_hosts (struct ata_host *host,const struct scsi_host_template *sht);extern void ata_scsi_scan_host (struct ata_port *ap,int sync); -extern int ata_scsi_offline_dev (struct ata_device *dev); +extern bool ata_scsi_offline_dev (struct ata_device *dev);extern bool ata_scsi_sense_is_valid (u8 sk,u8 asc,u8 ascq);extern void ata_scsi_set_sense (struct ata_device *dev,struct scsi_cmnd *cmd,u8 sk,u8 asc,u8 ascq);
Signature · 1 line
2.50.0
Re: [PATCH v2 2/6] ata: libata-scsi: Cleanup ata_scsi_offline_dev()
Quoted 6 lines · Damien Le Moal
Change the function
ata_scsi_offline_dev()to return a bool and change this function kdoc comment to have the correct mention of its call site. No functional changes.Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Damien Le Moal
maintainerPATCH v2 3/6 ata: Fix SATA_MOBILE_LPM_POLICY description in Kconfig
In reply to Damien Le MoalImprove the description of the possible default SATA link power management policies and add the missing description for policy 5. No functional changes.
--- drivers/ata/Kconfig | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)
drivers/ata/Kconfig +26 -10
@@ -117,23 +117,39 @@ config SATA_AHCI config SATA_MOBILE_LPM_POLICY int "Default SATA Link Power Management policy" - range 0 4 + range 0 5 default 3 depends on SATA_AHCI help Select the Default SATA Link Power Management (LPM) policy to use for chipsets / "South Bridges" supporting low-power modes. Such chipsets are ubiquitous across laptops, desktops and servers. - - The value set has the following meanings: + Each policy combines power saving states and features: + - Partial: The Phy logic is powered but is in a reduced power + state. The exit latency from this state is no longer than + 10us). + - Slumber: The Phy logic is powered but is in an even lower power + state. The exit latency from this state is potentially + longer, but no longer than 10ms. + - DevSleep: The Phy logic may be powered down. The exit latency from + this state is no longer than 20 ms, unless otherwise + specified by DETO in the device Identify Device Data log. + - HIPM: Host Initiated Power Management (host automatic transisitons + to partial and slumber). + - DIPM: Device Initiated Power Management (device automatic + transitions to partial and slumber). + + The possible values for the default SATA link power management + policies are: 0 => Keep firmware settings - 1 => Maximum performance - 2 => Medium power - 3 => Medium power with Device Initiated PM enabled - 4 => Minimum power - - Note "Minimum power" is known to cause issues, including disk - corruption, with some disks and should not be used. + 1 => No power savings (maximum performance) + 2 => HIPM (Partial) + 3 => HIPM (Partial) and DIPM (Partial and Slumber) + 4 => HIPM (Partial and DevSleep) and DIPM (Partial and Slumber) + 5 => HIPM (Slumber and DevSleep) and DIPM (Partial and Slumber) + + Excluding the value 0, higher values represent policies with higher + power savings. config SATA_AHCI_PLATFORM tristate "Platform AHCI SATA support"
Signature · 1 line
2.50.0
Re: [PATCH v2 3/6] ata: Fix SATA_MOBILE_LPM_POLICY description in Kconfig
Quoted 31 lines · Damien Le Moal
Improve the description of the possible default SATA link power management policies and add the missing description for policy 5. No functional changes.
Fixes a5ec5a7bfd1f ("ata: ahci: Support state with min power but Partial low power state")Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>--- drivers/ata/Kconfig | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-)drivers/ata/Kconfig +2
-3@@ -117,23 +117,39 @@ config SATA_AHCI config SATA_MOBILE_LPM_POLICY int "Default SATA Link Power Management policy" - range 0 4 + range 0 5 default 3 depends on SATA_AHCI help Select the Default SATA Link Power Management (LPM) policy to use for chipsets / "South Bridges" supporting low-power modes. Such chipsets are ubiquitous across laptops, desktops and servers. - - The value set has the following meanings: + Each policy combines power saving states and features:
drivers/ata/Kconfig config SATA_AHCI · line 137
Quoted 10 lines
drivers/ata/Kconfig +10
-0+ - Partial: The Phy logic is powered but is in a reduced power + state. The exit latency from this state is no longer than + 10us). + - Slumber: The Phy logic is powered but is in an even lower power + state. The exit latency from this state is potentially + longer, but no longer than 10ms. + - DevSleep: The Phy logic may be powered down. The exit latency from + this state is no longer than 20 ms, unless otherwise + specified by DETO in the device Identify Device Data log. + - HIPM: Host Initiated Power Management (host automatic transisitons
s/transisitons/transitions/
Perhaps:
s/automatic/automatically/
drivers/ata/Kconfig config SATA_AHCI · line 139
Quoted 2 lines
drivers/ata/Kconfig +2
-0+ to partial and slumber). + - DIPM: Device Initiated Power Management (device automatic
Perhaps:
s/automatic/automatically/
drivers/ata/Kconfig config SATA_AHCI · line 140
Quoted 1 line
drivers/ata/Kconfig +1
-0+ transitions to partial and slumber).
With that:
Damien Le Moal
maintainerPATCH v2 4/6 ata: libata: Improve LPM policies description
In reply to Damien Le MoalImprove the comment describing enum ata_lpm_policy and add comments within that enum to describe each of the different possible values. The enum values comments match the description given for the CONFIG_SATA_MOBILE_LPM_POLICY config parameter.
No functional changes.
--- include/linux/libata.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
include/linux/libata.h +17 -5
@@ -499,16 +499,28 @@ enum ata_completion_errors { };/* -* Link power management policy: If you alter this, you also need to -* alter libata-sata.c (for the ascii descriptions) +* Link Power Management (LPM) policies. +* +* The default LPM policy to use for a device link is defined using these values +* with the CONFIG_SATA_MOBILE_LPM_POLICY config option and applied through the +* target_lpm_policy field of struct ata_port. +* +* If you alter this, you also need to alter the policy names used with the +* sysfs attribute link_power_management_policy defined in libata-sata.c. */ enum ata_lpm_policy { +/* Keep firmware settings */ ATA_LPM_UNKNOWN , +/* No power savings (maximum performance) */ ATA_LPM_MAX_POWER , +/* HIPM (Partial) */ ATA_LPM_MED_POWER , -ATA_LPM_MED_POWER_WITH_DIPM ,/* Med power + DIPM as win IRST does */ -ATA_LPM_MIN_POWER_WITH_PARTIAL ,/* Min Power + partial and slumber */ -ATA_LPM_MIN_POWER ,/* Min power + no partial (slumber only) */ +/* HIPM (Partial) and DIPM (Partial and Slumber) */ +ATA_LPM_MED_POWER_WITH_DIPM , +/* HIPM (Partial and DevSleep) and DIPM (Partial and Slumber) */ +ATA_LPM_MIN_POWER_WITH_PARTIAL , +/* HIPM (Slumber and DevSleep) and DIPM (Partial and Slumber) */ +ATA_LPM_MIN_POWER , };enum ata_lpm_hints {
Signature · 1 line
2.50.0
Re: [PATCH v2 4/6] ata: libata: Improve LPM policies description
Quoted 5 lines · Damien Le Moal
Improve the comment describing enum
ata_lpm_policyand add comments within that enum to describe each of the different possible values. The enum values comments match the description given for theCONFIG_SATA_MOBILE_LPM_POLICYconfig parameter.
Quoted 7 lines
No functional changes.
Signed-off-by Damien Le Moal <[email protected]>--- include/linux/libata.h | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
Cheers,
Hannes
Signature · 4 lines
Dr. Hannes Reinecke Kernel Storage Architect [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Frankenstr. 146, 90461 Nürnberg HRB 36809 (AG Nürnberg), GF: I. Totev, A. McDonald, W. Knoblich
Re: [PATCH v2 4/6] ata: libata: Improve LPM policies description
In reply to Damien Le MoalQuoted 8 lines · Damien Le Moal
Improve the comment describing enum
ata_lpm_policyand add comments within that enum to describe each of the different possible values. The enum values comments match the description given for theCONFIG_SATA_MOBILE_LPM_POLICYconfig parameter.No functional changes.
Signed-off-by Damien Le Moal <[email protected]>
Damien Le Moal
maintainerPATCH v2 5/6 ata: ahci: Clarify mobile_lpm_policy description
In reply to Damien Le MoalDespite its name, the mobile_lpm_policy module parameter defines the default LPM policy to use for an AHCI adapter for all chipsets, including desktop and server chipsets. Clarify this point in the parameter description.
No functional changes.
--- drivers/ata/ahci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/ata/ahci.c +3 -1
@@ -674,7 +674,9 @@ MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");static int mobile_lpm_policy =-1 ;module_param (mobile_lpm_policy, int,0644 ); -MODULE_PARM_DESC (mobile_lpm_policy,"Default LPM policy for mobile chipsets" ); +MODULE_PARM_DESC (mobile_lpm_policy, +"Default LPM policy. Despite its name, this parameter applies " +"to all chipsets, including desktop and servers chipsets" );static char *ahci_mask_port_map;module_param_named (mask_port_map, ahci_mask_port_map, charp,0444 );
Signature · 1 line
2.50.0
Re: [PATCH v2 5/6] ata: ahci: Clarify mobile_lpm_policy description
Quoted 18 lines · Damien Le Moal
Despite its name, the
mobile_lpm_policymodule parameter defines the default LPM policy to use for an AHCI adapter for all chipsets, including desktop and server chipsets. Clarify this point in the parameter description.No functional changes.
Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>--- drivers/ata/ahci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/ata/ahci.c +0
-0
drivers/ata/ahci.c MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)"); · line 679
Quoted 7 lines
drivers/ata/ahci.c +3
-1@@ -674,7 +674,9 @@ MODULE_PARM_DESC(marvell_enable, "Marvell SATA via AHCI (1 = enabled)");static int mobile_lpm_policy =-1 ;module_param (mobile_lpm_policy, int,0644 ); -MODULE_PARM_DESC (mobile_lpm_policy,"Default LPM policy for mobile chipsets" ); +MODULE_PARM_DESC (mobile_lpm_policy, +"Default LPM policy. Despite its name, this parameter applies " +"to all chipsets, including desktop and servers chipsets" );
Nit: desktop is singular, servers is plural.
Make both singular or both plural.
(I think both in singular sounds slightly better.)
Damien Le Moal
maintainerPATCH v2 6/6 ata: libata-eh: Move and rename ata_eh_set_lpm()
In reply to Damien Le MoalMove the definition of the function ata_eh_set_lpm() to avoid its unnecessary forward declaration and rename the function to ata_eh_link_set_lpm() to clarify that it acts on a link. No functional changes.
--- drivers/ata/libata-eh.c | 304 ++++++++++++++++++++-------------------- 1 file changed, 152 insertions(+), 152 deletions(-)
drivers/ata/libata-eh.c +152 -152
@@ -153,8 +153,6 @@ ata_eh_cmd_timeout_table[ATA_EH_CMD_TIMEOUT_TABLE_SIZE] = {#undef CMDSstatic void __ata_port_freeze (struct ata_port *ap); -static int ata_eh_set_lpm (struct ata_link *link,enum ata_lpm_policy policy, -struct ata_device **r_failed_dev);#ifdef CONFIG_PM static void ata_eh_handle_port_suspend (struct ata_port *ap);static void ata_eh_handle_port_resume (struct ata_port *ap);
@@ -2073,6 +2071,154 @@ static void ata_eh_get_success_sense(struct ata_link *link)ata_eh_done (link, dev,ATA_EH_GET_SUCCESS_SENSE ); } +/** +* ata_eh_link_set_lpm - configure SATA interface power management +* @link: link to configure +* @policy: the link power management policy +* @r_failed_dev: out parameter for failed device +* +* Enable SATA Interface power management. This will enable +* Device Interface Power Management (DIPM) for min_power and +* medium_power_with_dipm policies, and then call driver specific +* callbacks for enabling Host Initiated Power management. +* +* LOCKING: +* EH context. +* +* RETURNS: +* 0 on success, -errno on failure. +*/ +static int ata_eh_link_set_lpm (struct ata_link *link, +enum ata_lpm_policy policy, +struct ata_device **r_failed_dev) +{ +struct ata_port *ap =ata_is_host_link (link) ? link->ap :NULL ; +struct ata_eh_context *ehc = &link->eh_context; +struct ata_device *dev, *link_dev =NULL , *lpm_dev =NULL ; +enum ata_lpm_policy old_policy = link->lpm_policy; +bool host_has_dipm = !(link->ap->flags &ATA_FLAG_NO_DIPM ); +unsigned int hints =ATA_LPM_EMPTY |ATA_LPM_HIPM ; +unsigned int err_mask; +int rc; + +/* if the link or host doesn't do LPM, noop */ +if (!IS_ENABLED (CONFIG_SATA_HOST ) || + (link->flags &ATA_LFLAG_NO_LPM ) || (ap && !ap->ops->set_lpm)) +return 0 ; + +/* +* This function currently assumes that it will never be supplied policy +* ATA_LPM_UNKNOWN. +*/ +if (WARN_ON_ONCE (policy ==ATA_LPM_UNKNOWN )) +return 0 ; + +/* +* DIPM is enabled only for ATA_LPM_MIN_POWER, +* ATA_LPM_MIN_POWER_WITH_PARTIAL, and ATA_LPM_MED_POWER_WITH_DIPM, as +* some devices misbehave when the host NACKs transition to SLUMBER. +*/ +ata_for_each_dev (dev, link,ENABLED ) { +bool dev_has_hipm =ata_id_has_hipm (dev->id); +bool dev_has_dipm =ata_id_has_dipm (dev->id); + +/* find the first enabled and LPM enabled devices */ +if (!link_dev) + link_dev = dev; + +if (!lpm_dev && + (dev_has_hipm || (dev_has_dipm && host_has_dipm))) + lpm_dev = dev; + + hints &= ~ATA_LPM_EMPTY ; +if (!dev_has_hipm) + hints &= ~ATA_LPM_HIPM ; + +/* disable DIPM before changing link config */ +if (dev_has_dipm) { + err_mask =ata_dev_set_feature (dev, +SETFEATURES_SATA_DISABLE ,SATA_DIPM ); +if (err_mask && err_mask !=AC_ERR_DEV ) { +ata_dev_warn (dev, +"failed to disable DIPM, Emask 0x%x\n" , + err_mask); + rc = -EIO ; + goto fail; + } + } + } + +if (ap) { + rc = ap->ops->set_lpm (link, policy, hints); +if (!rc && ap->slave_link) + rc = ap->ops->set_lpm (ap->slave_link, policy, hints); + }else + rc =sata_pmp_set_lpm (link, policy, hints); + +/* +* Attribute link config failure to the first (LPM) enabled +* device on the link. +*/ +if (rc) { +if (rc == -EOPNOTSUPP ) { + link->flags |=ATA_LFLAG_NO_LPM ; +return 0 ; + } + dev = lpm_dev ? lpm_dev : link_dev; + goto fail; + } + +/* +* Low level driver acked the transition. Issue DIPM command +* with the new policy set. +*/ + link->lpm_policy = policy; +if (ap && ap->slave_link) + ap->slave_link->lpm_policy = policy; + +/* +* Host config updated, enable DIPM if transitioning to +* ATA_LPM_MIN_POWER, ATA_LPM_MIN_POWER_WITH_PARTIAL, or +* ATA_LPM_MED_POWER_WITH_DIPM. +*/ +ata_for_each_dev (dev, link,ENABLED ) { +bool dev_has_dipm =ata_id_has_dipm (dev->id); + +if (policy >=ATA_LPM_MED_POWER_WITH_DIPM && host_has_dipm && + dev_has_dipm) { + err_mask =ata_dev_set_feature (dev, +SETFEATURES_SATA_ENABLE ,SATA_DIPM ); +if (err_mask && err_mask !=AC_ERR_DEV ) { +ata_dev_warn (dev, +"failed to enable DIPM, Emask 0x%x\n" , + err_mask); + rc = -EIO ; + goto fail; + } + } + } + + link->last_lpm_change = jiffies; + link->flags |=ATA_LFLAG_CHANGED ; + +return 0 ; + +fail: +/* restore the old policy */ + link->lpm_policy = old_policy; +if (ap && ap->slave_link) + ap->slave_link->lpm_policy = old_policy; + +/* if no device or only one more chance is left, disable LPM */ +if (!dev || ehc->tries[dev->devno] <=2 ) { +ata_link_warn (link,"disabling LPM on the link\n" ); + link->flags |=ATA_LFLAG_NO_LPM ; + } +if (r_failed_dev) + *r_failed_dev = dev; +return rc; +} +/** * ata_eh_link_autopsy - analyze error and determine recovery action * @link: host link to perform autopsy on
@@ -3123,8 +3269,8 @@ static int ata_eh_revalidate_and_attach(struct ata_link *link,* to ap->target_lpm_policy after revalidation is done. */ if (link->lpm_policy >ATA_LPM_MAX_POWER ) { - rc =ata_eh_set_lpm (link,ATA_LPM_MAX_POWER , - r_failed_dev); + rc =ata_eh_link_set_lpm (link,ATA_LPM_MAX_POWER , + r_failed_dev);if (rc) goto err; }
@@ -3408,153 +3554,6 @@ static int ata_eh_maybe_retry_flush(struct ata_device *dev)return rc; } -/** -* ata_eh_set_lpm - configure SATA interface power management -* @link: link to configure power management -* @policy: the link power management policy -* @r_failed_dev: out parameter for failed device -* -* Enable SATA Interface power management. This will enable -* Device Interface Power Management (DIPM) for min_power and -* medium_power_with_dipm policies, and then call driver specific -* callbacks for enabling Host Initiated Power management. -* -* LOCKING: -* EH context. -* -* RETURNS: -* 0 on success, -errno on failure. -*/ -static int ata_eh_set_lpm (struct ata_link *link,enum ata_lpm_policy policy, -struct ata_device **r_failed_dev) -{ -struct ata_port *ap =ata_is_host_link (link) ? link->ap :NULL ; -struct ata_eh_context *ehc = &link->eh_context; -struct ata_device *dev, *link_dev =NULL , *lpm_dev =NULL ; -enum ata_lpm_policy old_policy = link->lpm_policy; -bool host_has_dipm = !(link->ap->flags &ATA_FLAG_NO_DIPM ); -unsigned int hints =ATA_LPM_EMPTY |ATA_LPM_HIPM ; -unsigned int err_mask; -int rc; - -/* if the link or host doesn't do LPM, noop */ -if (!IS_ENABLED (CONFIG_SATA_HOST ) || - (link->flags &ATA_LFLAG_NO_LPM ) || (ap && !ap->ops->set_lpm)) -return 0 ; - -/* -* This function currently assumes that it will never be supplied policy -* ATA_LPM_UNKNOWN. -*/ -if (WARN_ON_ONCE (policy ==ATA_LPM_UNKNOWN )) -return 0 ; - -/* -* DIPM is enabled only for ATA_LPM_MIN_POWER, -* ATA_LPM_MIN_POWER_WITH_PARTIAL, and ATA_LPM_MED_POWER_WITH_DIPM, as -* some devices misbehave when the host NACKs transition to SLUMBER. -*/ -ata_for_each_dev (dev, link,ENABLED ) { -bool dev_has_hipm =ata_id_has_hipm (dev->id); -bool dev_has_dipm =ata_id_has_dipm (dev->id); - -/* find the first enabled and LPM enabled devices */ -if (!link_dev) - link_dev = dev; - -if (!lpm_dev && - (dev_has_hipm || (dev_has_dipm && host_has_dipm))) - lpm_dev = dev; - - hints &= ~ATA_LPM_EMPTY ; -if (!dev_has_hipm) - hints &= ~ATA_LPM_HIPM ; - -/* disable DIPM before changing link config */ -if (dev_has_dipm) { - err_mask =ata_dev_set_feature (dev, -SETFEATURES_SATA_DISABLE ,SATA_DIPM ); -if (err_mask && err_mask !=AC_ERR_DEV ) { -ata_dev_warn (dev, -"failed to disable DIPM, Emask 0x%x\n" , - err_mask); - rc = -EIO ; - goto fail; - } - } - } - -if (ap) { - rc = ap->ops->set_lpm (link, policy, hints); -if (!rc && ap->slave_link) - rc = ap->ops->set_lpm (ap->slave_link, policy, hints); - }else - rc =sata_pmp_set_lpm (link, policy, hints); - -/* -* Attribute link config failure to the first (LPM) enabled -* device on the link. -*/ -if (rc) { -if (rc == -EOPNOTSUPP ) { - link->flags |=ATA_LFLAG_NO_LPM ; -return 0 ; - } - dev = lpm_dev ? lpm_dev : link_dev; - goto fail; - } - -/* -* Low level driver acked the transition. Issue DIPM command -* with the new policy set. -*/ - link->lpm_policy = policy; -if (ap && ap->slave_link) - ap->slave_link->lpm_policy = policy; - -/* -* Host config updated, enable DIPM if transitioning to -* ATA_LPM_MIN_POWER, ATA_LPM_MIN_POWER_WITH_PARTIAL, or -* ATA_LPM_MED_POWER_WITH_DIPM. -*/ -ata_for_each_dev (dev, link,ENABLED ) { -bool dev_has_dipm =ata_id_has_dipm (dev->id); - -if (policy >=ATA_LPM_MED_POWER_WITH_DIPM && host_has_dipm && - dev_has_dipm) { - err_mask =ata_dev_set_feature (dev, -SETFEATURES_SATA_ENABLE ,SATA_DIPM ); -if (err_mask && err_mask !=AC_ERR_DEV ) { -ata_dev_warn (dev, -"failed to enable DIPM, Emask 0x%x\n" , - err_mask); - rc = -EIO ; - goto fail; - } - } - } - - link->last_lpm_change = jiffies; - link->flags |=ATA_LFLAG_CHANGED ; - -return 0 ; - -fail: -/* restore the old policy */ - link->lpm_policy = old_policy; -if (ap && ap->slave_link) - ap->slave_link->lpm_policy = old_policy; - -/* if no device or only one more chance is left, disable LPM */ -if (!dev || ehc->tries[dev->devno] <=2 ) { -ata_link_warn (link,"disabling LPM on the link\n" ); - link->flags |=ATA_LFLAG_NO_LPM ; - } -if (r_failed_dev) - *r_failed_dev = dev; -return rc; -} -int ata_link_nr_enabled (struct ata_link *link) {struct ata_device *dev;
@@ -3943,7 +3942,8 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, config_lpm:/* configure link power saving */ if (link->lpm_policy != ap->target_lpm_policy) { - rc =ata_eh_set_lpm (link, ap->target_lpm_policy, &dev); + rc =ata_eh_link_set_lpm (link, ap->target_lpm_policy, + &dev);if (rc) goto rest_fail; }
Signature · 1 line
2.50.0
Re: [PATCH v2 6/6] ata: libata-eh: Move and rename ata_eh_set_lpm()
Quoted 7 lines · Damien Le Moal
Move the definition of the function
ata_eh_set_lpm()to avoid its unnecessary forward declaration and rename the function toata_eh_link_set_lpm()to clarify that it acts on a link. No functional changes.Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>
Damien Le Moal
maintainerRe: [PATCH v2 6/6] ata: libata-eh: Move and rename ata_eh_set_lpm()
Quoted 10 lines · Niklas Cassel
Quoted 7 lines · Damien Le Moal
Move the definition of the function
ata_eh_set_lpm()to avoid its unnecessary forward declaration and rename the function toata_eh_link_set_lpm()to clarify that it acts on a link. No functional changes.Signed-off-by Damien Le Moal <[email protected]>Reviewed-by Hannes Reinecke <[email protected]>Reviewed-by Niklas Cassel <[email protected]>
Thanks. Corrected the patches as you suggested and queued them in for-6.17.
Signature · 2 lines
Damien Le Moal Western Digital Research