libata: reimplement LPM support
Subsystems (2)
PATCH 1/1 libata: reimplement LPM support
Hello,
This patchset reimplement LPM support so that it's better integrated with the rest of libata and supports more than just ALPM. After the patchset, DIPM works on ahci w/o ALPM support, host link of PMP can use both H/DIPM and fan-out links supports DIPM, and ata_piix w/ SIDPR also supports DIPM.
Adding DIPM support for other controllers should be easy and DIPM actually works better than ALPM because DIPM implements sane timeout before entering powersave mode and thus doesn't hurt throughput like ALPM does.
Tested with intel and JMB ahci's, ich8 ata_piix, SIMG and marvell PMPs. SATA bus analyzer was used to verify links are actually entering and coming out of powersave mode.
This patchset contains the following five patches
0001-libata-clean-up-lpm-related-symbols-and-sysfs-show-s.patch 0002-libata-implement-sata_link_scr_lpm-and-make-ata_dev_.patch 0003-libata-reimplement-link-power-management.patch 0004-libata-implement-LPM-support-for-port-multipliers.patch 0005-ata_piix-implement-LPM-support.patch
and available in the folloing git tree
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata-dev.git lpm
with the following changes.
drivers/ata/ahci.c | 3 drivers/ata/ahci.h | 3 drivers/ata/ahci_platform.c | 3 drivers/ata/ata_piix.c | 24 +++ drivers/ata/libahci.c | 160 ++++++------------------- drivers/ata/libata-core.c | 276 +++++++++++--------------------------------- drivers/ata/libata-eh.c | 173 ++++++++++++++++++++++++--- drivers/ata/libata-pmp.c | 48 +++++++ drivers/ata/libata-scsi.c | 73 ++++------- drivers/ata/libata.h | 12 + include/linux/libata.h | 42 +++--- 11 files changed, 397 insertions(+), 420 deletions(-)
Thanks.
--
tejun
PATCH 1/5 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.
--- drivers/ata/ahci.c | 2 +- drivers/ata/ahci.h | 2 +- drivers/ata/ahci_platform.c | 2 +- drivers/ata/libahci.c | 20 ++++++------- drivers/ata/libata-core.c | 50 ++++++++++++++++---------------- drivers/ata/libata-eh.c | 2 +- drivers/ata/libata-scsi.c | 68 ++++++++++++++---------------------------- drivers/ata/libata.h | 6 ++- include/linux/libata.h | 29 +++++++++--------- 9 files changed, 80 insertions(+), 101 deletions(-)
drivers/ata/ahci.c +1 -1
@@ -1202,7 +1202,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
@@ -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
@@ -126,7 +126,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
@@ -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,
@@ -657,7 +656,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 );
@@ -699,8 +698,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);
@@ -713,21 +711,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 ;
@@ -770,7 +768,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
141 lines not on this page · raw message
drivers/ata/libata-eh.c +1 -1
@@ -3566,7 +3566,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,/* configure link power saving */ if (ehc->i.action &ATA_EH_LPM )ata_for_each_dev (dev, link,ALL ) -ata_dev_enable_pm (dev, ap->pm_policy); +ata_dev_enable_pm (dev, ap->lpm_policy);/* this link is okay now */ ehc->i.flags =0 ;
drivers/ata/libata-scsi.c +22 -44
94 lines not on this page · raw message
drivers/ata/libata.h +4 -2
@@ -100,8 +100,10 @@ extern int sata_link_init_spd(struct ata_link *link);extern int ata_task_ioctl (struct scsi_device *scsidev,void __user *arg);extern int ata_cmd_ioctl (struct scsi_device *scsidev,void __user *arg);extern struct ata_port *ata_port_alloc (struct ata_host *host); -extern void ata_dev_enable_pm (struct ata_device *dev,enum link_pm policy); -extern void ata_lpm_schedule (struct ata_port *ap,enum link_pm ); +extern void ata_dev_enable_pm (struct ata_device *dev, +enum ata_lpm_policy policy); +extern void ata_lpm_schedule (struct ata_port *ap, +enum ata_lpm_policy policy);extern const char *sata_spd_string (unsigned int spd);/* libata-acpi.c */
include/linux/libata.h +15 -14
@@ -196,7 +196,7 @@ enum {ATA_FLAG_ACPI_SATA = (1 <<17 ),/* need native SATA ACPI layout */ ATA_FLAG_AN = (1 <<18 ),/* controller supports AN */ ATA_FLAG_PMP = (1 <<19 ),/* controller supports PMP */ -ATA_FLAG_IPM = (1 <<20 ),/* driver can handle IPM */ +ATA_FLAG_LPM = (1 <<20 ),/* driver can handle LPM */ ATA_FLAG_EM = (1 <<21 ),/* driver supports enclosure * management */ ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity
@@ -376,7 +376,7 @@ enum {ATA_HORKAGE_BROKEN_HPA = (1 <<4 ),/* Broken HPA */ ATA_HORKAGE_DISABLE = (1 <<5 ),/* Disable it */ ATA_HORKAGE_HPA_SIZE = (1 <<6 ),/* native size off by one */ -ATA_HORKAGE_IPM = (1 <<7 ),/* Link PM problems */ +ATA_HORKAGE_LPM = (1 <<7 ),/* Link PM problems */ ATA_HORKAGE_IVB = (1 <<8 ),/* cbl det validity bit bugs */ ATA_HORKAGE_STUCK_ERR = (1 <<9 ),/* stuck ERR on next PACKET */ ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */
@@ -463,6 +463,17 @@ enum ata_completion_errors { AC_ERR_NCQ = (1 << 10), /* marker for offending NCQ qc */ }; +/* +* Link power management policy: If you alter this, you also need to +* alter libata-scsi.c (for the ascii descriptions) +*/ +enum ata_lpm_policy { +ATA_LPM_UNKNOWN , +ATA_LPM_MAX_POWER , +ATA_LPM_MED_POWER , +ATA_LPM_MIN_POWER , +}; +/* forward declarations */ struct scsi_device ;struct ata_port_operations ;
@@ -477,16 +488,6 @@ typedef int (*ata_reset_fn_t)(struct ata_link *link, unsigned int *classes, unsigned long deadline);typedef void (*ata_postreset_fn_t )(struct ata_link *link,unsigned int *classes); -/* -* host pm policy: If you alter this, you also need to alter libata-scsi.c -* (for the ascii descriptions) -*/ -enum link_pm { -NOT_AVAILABLE , -MIN_POWER , -MAX_PERFORMANCE , -MEDIUM_POWER , -};extern struct device_attribute dev_attr_link_power_management_policy;extern struct device_attribute dev_attr_unload_heads;extern struct device_attribute dev_attr_em_message_type;
@@ -770,7 +771,7 @@ struct ata_port {pm_message_t pm_mesg;int *pm_result; -enum link_pm pm_policy; +enum ata_lpm_policy lpm_policy;struct timer_list fastdrain_timer;unsigned long fastdrain_cnt;
@@ -836,7 +837,7 @@ struct ata_port_operations {int (*scr_write)(struct ata_link *link,unsigned int sc_reg,u32 val);void (*pmp_attach)(struct ata_port *ap);void (*pmp_detach)(struct ata_port *ap); -int (*enable_pm)(struct ata_port *ap,enum link_pm policy); +int (*enable_pm)(struct ata_port *ap,enum ata_lpm_policy policy);void (*disable_pm)(struct ata_port *ap);/*
Signature · 1 line
1.7.1
PATCH 2/5 libata: implement sata_link_scr_lpm() and make ata_dev_set_feature() global
In reply to Tejun HeoLink power management is about to be reimplemented. Prepare for it.
* Implement sata_link_scr_lpm().
* Drop static from ata_dev_set_feature() and make it available to other libata files.
* Trivial whitespace adjustments.
--- drivers/ata/libata-core.c | 75 ++++++++++++++++++++++++++++++++++++++++++--- drivers/ata/libata.h | 2 + include/linux/libata.h | 2 + 3 files changed, 74 insertions(+), 5 deletions(-)
drivers/ata/libata-core.c +70 -5
@@ -91,8 +91,6 @@ const struct ata_port_operations sata_port_ops = {static unsigned int ata_dev_init_params (struct ata_device *dev,u16 heads,u16 sectors);static unsigned int ata_dev_set_xfermode (struct ata_device *dev); -static unsigned int ata_dev_set_feature (struct ata_device *dev, -u8 enable,u8 feature);static void ata_dev_xfermask (struct ata_device *dev);static unsigned long ata_dev_blacklisted (const struct ata_device *dev);
@@ -3628,7 +3626,7 @@ int ata_wait_after_reset(struct ata_link *link, unsigned long deadline,* @params: timing parameters { interval, duratinon, timeout } in msec * @deadline: deadline jiffies for the operation * -* Make sure SStatus of @link reaches stable state, determined by +* Make sure SStatus of @link reaches stable state, determined by * holding the same value where DET is not 1 for @duration polled * every @interval, before @timeout. Timeout constraints the * beginning of the stable state. Because DET gets stuck at 1 on
@@ -3760,6 +3758,72 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params, }/** +* sata_link_scr_lpm - manipulate SControl IPM and SPM fields +* @link: ATA link to manipulate SControl for +* @policy: LPM policy to configure +* @spm_wakeup: initiate LPM transition to active state +* +* Manipulate the IPM field of the SControl register of @link +* according to @policy. If @policy is ATA_LPM_MAX_POWER and +* @spm_wakeup is %true, the SPM field is manipulated to wake up +* the link. This function also clears PHYRDY_CHG before +* returning. +* +* LOCKING: +* EH context. +* +* RETURNS: +* 0 on succes, -errno otherwise. +*/ +int sata_link_scr_lpm (struct ata_link *link,enum ata_lpm_policy policy, +bool spm_wakeup) +{ +struct ata_eh_context *ehc = &link->eh_context; +bool woken_up = false; +u32 scontrol; +int rc; + + rc =sata_scr_read (link,SCR_CONTROL , &scontrol); +if (rc) +return rc; + +switch (policy) { +case ATA_LPM_MAX_POWER : +/* disable all LPM transitions */ + scontrol |= (0x3 <<8 ); +/* initiate transition to active state */ +if (spm_wakeup) { + scontrol |= (0x4 <<12 ); + woken_up = true; + } +break ; +case ATA_LPM_MED_POWER : +/* allow LPM to PARTIAL */ + scontrol &= ~(0x1 <<8 ); + scontrol |= (0x2 <<8 ); +break ; +case ATA_LPM_MIN_POWER : +/* no restrictions on LPM transitions */ + scontrol &= ~(0x3 <<8 ); +break ; +default : +WARN_ON (1 ); + } + + rc =sata_scr_write (link,SCR_CONTROL , scontrol); +if (rc) +return rc; + +/* give the link time to transit out of LPM state */ +if (woken_up) +msleep (10 ); + +/* clear PHYRDY_CHG from SError */ + ehc->i.serror &= ~SERR_PHYRDY_CHG ; +return sata_scr_write (link,SCR_ERROR ,SERR_PHYRDY_CHG ); +} + +/** * ata_std_prereset - prepare for reset * @link: ATA link to be reset * @deadline: deadline jiffies for the operation
@@ -4551,6 +4615,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev)DPRINTK ("EXIT, err_mask=%x\n" , err_mask);return err_mask; } +/** * ata_dev_set_feature - Issue SET FEATURES - SATA FEATURES * @dev: Device to which command will be sent
@@ -4566,8 +4631,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev)* RETURNS: * 0 on success, AC_ERR_* mask otherwise. */ -static unsigned int ata_dev_set_feature (struct ata_device *dev,u8 enable, -u8 feature) +unsigned int ata_dev_set_feature (struct ata_device *dev,u8 enable,u8 feature) {struct ata_taskfile tf;unsigned int err_mask;
@@ -6720,6 +6784,7 @@ EXPORT_SYMBOL_GPL(sata_set_spd);EXPORT_SYMBOL_GPL (ata_wait_after_reset);EXPORT_SYMBOL_GPL (sata_link_debounce);EXPORT_SYMBOL_GPL (sata_link_resume); +EXPORT_SYMBOL_GPL (sata_link_scr_lpm);EXPORT_SYMBOL_GPL (ata_std_prereset);EXPORT_SYMBOL_GPL (sata_link_hardreset);EXPORT_SYMBOL_GPL (sata_std_hardreset);
drivers/ata/libata.h +2 -0
@@ -86,6 +86,8 @@ extern int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class,extern int ata_dev_configure (struct ata_device *dev);extern int sata_down_spd_limit (struct ata_link *link,u32 spd_limit);extern int ata_down_xfermask_limit (struct ata_device *dev,unsigned int sel); +extern unsigned int ata_dev_set_feature (struct ata_device *dev, +u8 enable,u8 feature);extern void ata_sg_clean (struct ata_queued_cmd *qc);extern void ata_qc_free (struct ata_queued_cmd *qc);extern void ata_qc_issue (struct ata_queued_cmd *qc);
include/linux/libata.h +2 -0
@@ -950,6 +950,8 @@ extern int sata_link_debounce(struct ata_link *link, const unsigned long *params, unsigned long deadline);extern int sata_link_resume (struct ata_link *link,const unsigned long *params,unsigned long deadline); +extern int sata_link_scr_lpm (struct ata_link *link,enum ata_lpm_policy policy, +bool spm_wakeup);extern int sata_link_hardreset (struct ata_link *link,const unsigned long *timing,unsigned long deadline,bool *online,int (*check_ready)(struct ata_link *));
Signature · 1 line
1.7.1
PATCH 3/5 libata: reimplement link power management
In reply to Tejun HeoThe current LPM implementation has the following issues.
* Operation order isn't well thought-out. e.g. HIPM should be configured after IPM in SControl is properly configured. Not the other way around.
* Suspend/resume paths call ata_lpm_enable/disable() which must only be called from EH context directly. Also, ata_lpm_enable/disable() were called whether LPM was in use or not.
* Implementation is per-port when it should be per-link. As a result, it can't be used for controllers with slave links or PMP.
* LPM state isn't managed consistently. After a link reset for whatever reason including suspend/resume the actual LPM state would be reset leaving ap->lpm_policy inconsistent.
* Generic/driver-specific logic boundary isn't clear. Currently, libahci has to mangle stuff which libata EH proper should be handling. This makes the implementation unnecessarily complex and fragile.
* Tied to ALPM. Doesn't consider DIPM only cases and doesn't check whether the device allows HIPM.
* Error handling isn't implemented.
Given the extent of mismatch with the rest of libata, I don't think trying to fix it piecewise makes much sense. This patch reimplements LPM support.
* The new implementation is per-link. The target policy is still port-wide (ap->target_lpm_policy) but all the mechanisms and states are per-link and integrate well with the rest of link abstraction and can work with slave and PMP links.
* Core EH has proper control of LPM state. LPM state is reconfigured when and only when reconfiguration is necessary. It makes sure that LPM state is reset when probing for new device on the link. Controller agnostic logic is now implemented in libata EH proper and driver implementation only has to deal with controller specifics.
* Proper error handling. LPM config failure is attributed to the device on the link and LPM is disabled for the link if it fails repeatedly.
* ops->enable/disable_pm() are replaced with single ops->set_lpm() which takes @policy and @hints. This simplifies driver specific implementation.
--- drivers/ata/ahci.c | 3 - drivers/ata/ahci.h | 1 - drivers/ata/ahci_platform.c | 3 - drivers/ata/libahci.c | 158 +++++++++------------------------- drivers/ata/libata-core.c | 201 +------------------------------------------ drivers/ata/libata-eh.c | 164 +++++++++++++++++++++++++++++++---- drivers/ata/libata-scsi.c | 11 ++- drivers/ata/libata.h | 4 - include/linux/libata.h | 17 +++-- 9 files changed, 206 insertions(+), 356 deletions(-)
drivers/ata/ahci.c +0 -3
@@ -1201,9 +1201,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)ata_port_pbar_desc (ap,AHCI_PCI_BAR ,0x100 + ap->port_no *0x80 ,"port" ); -/* set initial link pm policy */ - ap->lpm_policy =ATA_LPM_UNKNOWN ; -/* set enclosure management message type */ if (ap->flags &ATA_FLAG_EM ) ap->em_message_type = hpriv->em_msg_type;
drivers/ata/ahci.h +0 -1
@@ -201,7 +201,6 @@ enum {AHCI_HFLAG_MV_PATA = (1 <<4 ),/* PATA port */ AHCI_HFLAG_NO_MSI = (1 <<5 ),/* no PCI MSI */ AHCI_HFLAG_NO_PMP = (1 <<6 ),/* no PMP */ -AHCI_HFLAG_NO_HOTPLUG = (1 <<7 ),/* ignore PxSERR.DIAG.N */ AHCI_HFLAG_SECT255 = (1 <<8 ),/* max 255 sectors */ AHCI_HFLAG_YES_NCQ = (1 <<9 ),/* force NCQ cap on */ AHCI_HFLAG_NO_SUSPEND = (1 << 10), /* don't suspend */
drivers/ata/ahci_platform.c +0 -3
@@ -125,9 +125,6 @@ static int __init ahci_probe(struct platform_device *pdev)ata_port_desc (ap,"mmio %pR" , mem);ata_port_desc (ap,"port 0x%x" ,0x100 + ap->port_no *0x80 ); -/* set initial link pm policy */ - ap->lpm_policy =ATA_LPM_UNKNOWN ; -/* set enclosure management message type */ if (ap->flags &ATA_FLAG_EM ) ap->em_message_type = hpriv->em_msg_type;
drivers/ata/libahci.c +41 -117
198 lines not on this page · raw message
drivers/ata/libata-core.c +1 -200
237 lines not on this page · raw message
drivers/ata/libata-eh.c +145 -19
244 lines not on this page · raw message
drivers/ata/libata-scsi.c +8 -3
@@ -117,6 +117,7 @@ static ssize_t ata_scsi_lpm_store(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct ata_port *ap =ata_shost_to_port (shost);enum ata_lpm_policy policy; +unsigned long flags;/* UNKNOWN is internal state, iterate from MAX_POWER */ for (policy = ATA_LPM_MAX_POWER;
@@ -129,7 +130,11 @@ static ssize_t ata_scsi_lpm_store(struct device *dev,if (policy ==ARRAY_SIZE (ata_lpm_policy_names))return -EINVAL ; -ata_lpm_schedule (ap, policy); +spin_lock_irqsave (ap->lock, flags); + ap->target_lpm_policy = policy; +ata_port_schedule_eh (ap); +spin_unlock_irqrestore (ap->lock, flags); +return count; }
@@ -139,11 +144,11 @@ static ssize_t ata_scsi_lpm_show(struct device *dev,struct Scsi_Host *shost =class_to_shost (dev);struct ata_port *ap =ata_shost_to_port (shost); -if (ap->lpm_policy >=ARRAY_SIZE (ata_lpm_policy_names)) +if (ap->target_lpm_policy >=ARRAY_SIZE (ata_lpm_policy_names))return -EINVAL ;return snprintf (buf,PAGE_SIZE ,"%s\n" , - ata_lpm_policy_names[ap->lpm_policy]); + ata_lpm_policy_names[ap->target_lpm_policy]); }DEVICE_ATTR (link_power_management_policy,S_IRUGO |S_IWUSR , ata_scsi_lpm_show, ata_scsi_lpm_store);
drivers/ata/libata.h +0 -4
@@ -102,10 +102,6 @@ extern int sata_link_init_spd(struct ata_link *link);extern int ata_task_ioctl (struct scsi_device *scsidev,void __user *arg);extern int ata_cmd_ioctl (struct scsi_device *scsidev,void __user *arg);extern struct ata_port *ata_port_alloc (struct ata_host *host); -extern void ata_dev_enable_pm (struct ata_device *dev, -enum ata_lpm_policy policy); -extern void ata_lpm_schedule (struct ata_port *ap, -enum ata_lpm_policy policy);extern const char *sata_spd_string (unsigned int spd);/* libata-acpi.c */
include/linux/libata.h +11 -6
@@ -172,6 +172,7 @@ enum {ATA_LFLAG_NO_RETRY = (1 <<5 ),/* don't retry this link */ ATA_LFLAG_DISABLED = (1 <<6 ),/* link is disabled */ ATA_LFLAG_SW_ACTIVITY = (1 <<7 ),/* keep activity stats */ +ATA_LFLAG_NO_LPM = (1 <<8 ),/* disable LPM on this link */ /* struct ata_port flags */ ATA_FLAG_SLAVE_POSS = (1 << 0), /* host supports slave dev */
@@ -324,12 +325,11 @@ enum {ATA_EH_HARDRESET = (1 <<2 ),/* meaningful only in ->prereset */ ATA_EH_RESET =ATA_EH_SOFTRESET |ATA_EH_HARDRESET ,ATA_EH_ENABLE_LINK = (1 <<3 ), -ATA_EH_LPM = (1 <<4 ),/* link power management action */ ATA_EH_PARK = (1 <<5 ),/* unload heads and stop I/O */ ATA_EH_PERDEV_MASK =ATA_EH_REVALIDATE |ATA_EH_PARK ,ATA_EH_ALL_ACTIONS =ATA_EH_REVALIDATE |ATA_EH_RESET | -ATA_EH_ENABLE_LINK |ATA_EH_LPM , +ATA_EH_ENABLE_LINK ,/* ata_eh_info->flags */ ATA_EHI_HOTPLUGGED = (1 << 0), /* could have been hotplugged */
@@ -376,7 +376,6 @@ enum {ATA_HORKAGE_BROKEN_HPA = (1 <<4 ),/* Broken HPA */ ATA_HORKAGE_DISABLE = (1 <<5 ),/* Disable it */ ATA_HORKAGE_HPA_SIZE = (1 <<6 ),/* native size off by one */ -ATA_HORKAGE_LPM = (1 <<7 ),/* Link PM problems */ ATA_HORKAGE_IVB = (1 <<8 ),/* cbl det validity bit bugs */ ATA_HORKAGE_STUCK_ERR = (1 <<9 ),/* stuck ERR on next PACKET */ ATA_HORKAGE_BRIDGE_OK = (1 << 10), /* no bridge limits */
@@ -474,6 +473,11 @@ enum ata_lpm_policy { ATA_LPM_MIN_POWER, }; +enum ata_lpm_hints { +ATA_LPM_EMPTY = (1 <<0 ),/* port empty/probing */ +ATA_LPM_HIPM = (1 <<1 ),/* may use HIPM */ +}; +/* forward declarations */ struct scsi_device ;struct ata_port_operations ;
@@ -701,6 +705,7 @@ struct ata_link {unsigned int hw_sata_spd_limit;unsigned int sata_spd_limit;unsigned int sata_spd;/* current SATA PHY speed */ +enum ata_lpm_policy lpm_policy;/* record runtime error info, protected by host_set lock */ struct ata_eh_info eh_info;
@@ -771,7 +776,7 @@ struct ata_port {pm_message_t pm_mesg;int *pm_result; -enum ata_lpm_policy lpm_policy; +enum ata_lpm_policy target_lpm_policy;struct timer_list fastdrain_timer;unsigned long fastdrain_cnt;
@@ -837,8 +842,8 @@ struct ata_port_operations {int (*scr_write)(struct ata_link *link,unsigned int sc_reg,u32 val);void (*pmp_attach)(struct ata_port *ap);void (*pmp_detach)(struct ata_port *ap); -int (*enable_pm)(struct ata_port *ap,enum ata_lpm_policy policy); -void (*disable_pm)(struct ata_port *ap); +int (*set_lpm)(struct ata_link *link,enum ata_lpm_policy policy, +unsigned hints);/* * Start, stop, suspend and resume
Signature · 1 line
1.7.1
PATCH 4/5 libata: implement LPM support for port multipliers
In reply to Tejun HeoPort multipliers can do DIPM on fan-out links fine. Implement support for it. Tested w/ SIMG 57xx and marvell PMPs. Both the host and fan-out links enter power save modes nicely.
SIMG 37xx and 47xx report link offline on SStatus causing EH to detach the devices. Blacklisted.
--- drivers/ata/libata-eh.c | 21 ++++++++++++++----- drivers/ata/libata-pmp.c | 48 ++++++++++++++++++++++++++++++++++++++++++--- drivers/ata/libata.h | 8 +++++++ 3 files changed, 67 insertions(+), 10 deletions(-)
drivers/ata/libata-eh.c +15 -6
@@ -3232,7 +3232,7 @@ static int ata_eh_maybe_retry_flush(struct ata_device *dev)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 = link->ap; +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 ;unsigned int hints =ATA_LPM_EMPTY |ATA_LPM_HIPM ;
@@ -3278,9 +3278,12 @@ static int ata_eh_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, } } - rc = ap->ops->set_lpm (link, policy, hints); -if (!rc && ap->slave_link) - rc = ap->ops->set_lpm (ap->slave_link, policy, hints); +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
@@ -3408,8 +3411,14 @@ static int ata_eh_schedule_probe(struct ata_device *dev) ehc->saved_ncq_enabled &= ~(1 << dev->devno);/* the link maybe in a deep sleep, wake it up */ -if (link->lpm_policy >ATA_LPM_MAX_POWER ) - link->ap->ops->set_lpm (link,ATA_LPM_MAX_POWER ,ATA_LPM_EMPTY ); +if (link->lpm_policy >ATA_LPM_MAX_POWER ) { +if (ata_is_host_link (link)) + link->ap->ops->set_lpm (link,ATA_LPM_MAX_POWER , +ATA_LPM_EMPTY ); +else +sata_pmp_set_lpm (link,ATA_LPM_MAX_POWER , +ATA_LPM_EMPTY ); + }/* Record and count probe trials on the ering. The specific * error mask used is irrelevant. Because a successful device
drivers/ata/libata-pmp.c +44 -4
83 lines not on this page · raw message
drivers/ata/libata.h +8 -0
@@ -176,6 +176,8 @@ extern int ata_ering_map(struct ata_ering *ering,#ifdef CONFIG_SATA_PMP extern int sata_pmp_scr_read (struct ata_link *link,int reg,u32 *val);extern int sata_pmp_scr_write (struct ata_link *link,int reg,u32 val); +extern int sata_pmp_set_lpm (struct ata_link *link,enum ata_lpm_policy policy, +unsigned hints);extern int sata_pmp_attach (struct ata_device *dev);#else /* CONFIG_SATA_PMP */ static inline int sata_pmp_scr_read (struct ata_link *link,int reg,u32 *val)
@@ -188,6 +190,12 @@ static inline int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val)return -EINVAL ; } +static inline int sata_pmp_set_lpm (struct ata_link *link, +enum ata_lpm_policy policy,unsigned hints) +{ +return -EINVAL ; +} +static inline int sata_pmp_attach (struct ata_device *dev) {return -EINVAL ;
Signature · 1 line
1.7.1
PATCH 5/5 ata_piix: implement LPM support
In reply to Tejun HeoNow that DIPM can be used independently from HIPM, ata_piix can support LPM too.
--- drivers/ata/ata_piix.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-)
drivers/ata/ata_piix.c +23 -1
@@ -175,6 +175,8 @@ static int piix_sidpr_scr_read(struct ata_link *link, unsigned int reg, u32 *val);static int piix_sidpr_scr_write (struct ata_link *link,unsigned int reg,u32 val); +static int piix_sidpr_set_lpm (struct ata_link *link,enum ata_lpm_policy policy, +unsigned hints);static bool piix_irq_check (struct ata_port *ap);#ifdef CONFIG_PM static int piix_pci_device_suspend (struct pci_dev *pdev,pm_message_t mesg);
@@ -344,11 +346,22 @@ static struct ata_port_operations ich_pata_ops = { .set_dmamode = ich_set_dmamode, }; +static struct device_attribute *piix_sidpr_shost_attrs[] = { + &dev_attr_link_power_management_policy, +NULL +}; + +static struct scsi_host_template piix_sidpr_sht = { +ATA_BMDMA_SHT (DRV_NAME ), + .shost_attrs = piix_sidpr_shost_attrs, +}; +static struct ata_port_operations piix_sidpr_sata_ops = { .inherits = &piix_sata_ops, .hardreset = sata_std_hardreset, .scr_read = piix_sidpr_scr_read, .scr_write = piix_sidpr_scr_write, + .set_lpm = piix_sidpr_set_lpm, };static const struct piix_map_db ich5_map_db = {
@@ -980,6 +993,12 @@ static int piix_sidpr_scr_write(struct ata_link *link,return 0 ; } +static int piix_sidpr_set_lpm (struct ata_link *link,enum ata_lpm_policy policy, +unsigned hints) +{ +return sata_link_scr_lpm (link, policy, false); +} +static bool piix_irq_check (struct ata_port *ap) {if (unlikely (!ap->ioaddr.bmdma_addr))
@@ -1539,6 +1558,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,struct device *dev = &pdev->dev;struct ata_port_info port_info[2 ];const struct ata_port_info *ppi[] = { &port_info[0 ], &port_info[1 ] }; +struct scsi_host_template *sht = &piix_sht;unsigned long port_flags;struct ata_host *host;struct piix_host_priv *hpriv;
@@ -1608,6 +1628,8 @@ static int __devinit piix_init_one(struct pci_dev *pdev, rc =piix_init_sidpr (host);if (rc)return rc; +if (host->ports[0 ]->ops == &piix_sidpr_sata_ops) + sht = &piix_sidpr_sht; }/* apply IOCFG bit18 quirk */
@@ -1634,7 +1656,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev, host->flags |=ATA_HOST_PARALLEL_SCAN ;pci_set_master (pdev); -return ata_pci_sff_activate_host (host, ata_bmdma_interrupt, &piix_sht); +return ata_pci_sff_activate_host (host, ata_bmdma_interrupt, sht); }static void piix_remove_one (struct pci_dev *pdev)
Signature · 1 line
1.7.1
Quoted 25 lines · Tejun Heo
Hello,
This patchset reimplement LPM support so that it's better integrated with the rest of libata and supports more than just ALPM. After the patchset, DIPM works on ahci w/o ALPM support, host link of PMP can use both H/DIPM and fan-out links supports DIPM, and
ata_piixw/ SIDPR also supports DIPM.Adding DIPM support for other controllers should be easy and DIPM actually works better than ALPM because DIPM implements sane timeout before entering powersave mode and thus doesn't hurt throughput like ALPM does.
Tested with intel and JMB ahci's, ich8
ata_piix, SIMG and marvell PMPs. SATA bus analyzer was used to verify links are actually entering and coming out of powersave mode.This patchset contains the following five patches
0001-libata-clean-up-lpm-related-symbols-and-sysfs-show-s.patch 0002-libata-implement-sata_link_scr_lpm-and-make-ata_dev_.patch 0003-libata-reimplement-link-power-management.patch 0004-libata-implement-LPM-support-for-port-multipliers.patch 0005-ata_piix-implement-LPM-support.patch
Quoted 3 lines
and available in the folloing git tree
git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata-dev.gitlpm
Had to hunt a bit for a good DIPM local test.
Looks good, applied, thanks!