scsi: ufs-pci: Fixes for Intel controllers
cover scsi: ufs-pci: Fixes for Intel controllers
Hi
Here are some small fixes / amendments.
Adrian Hunter (4):
scsi: ufs-pci: Fix restore from S4 for Intel controllers
scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
scsi: ufs-pci: Fix recovery from hibernate exit errors for Intel controllers
scsi: ufs-pci: Enable UFSHCD_CAP_RPM_AUTOSUSPEND for Intel controllers
drivers/scsi/ufs/ufshcd-pci.c | 73 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 2 deletions(-)
Regards
Adrian
PATCH 1/4 scsi: ufs-pci: Fix restore from S4 for Intel controllers
Currently, ufshcd-pci is the only UFS driver with support for suspend-to-disk PM callbacks (i.e. freeze/thaw/restore/poweroff). These callbacks are set by the macro SET_SYSTEM_SLEEP_PM_OPS to the same functions as system suspend/resume. That will work with spm_lvl 5 because spm_lvl 5 will result in a full restore for the ->restore() callback. In the absence of a full restore, the host controller registers will have values set up by the restore kernel (the kernel that boots and loads the restore image) which are not necessarily the same. However it turns out, the only registers that sometimes need restore are the base address registers. This has gone un-noticed because, depending on IOMMU settings, the kernel can end up allocating the same addresses every time.
For Intel controllers, an spm_lvl other than 5 can be used, so to support S4 (suspend-to-disk) with spm_lvl other than 5, restore the base address registers.
--- drivers/scsi/ufs/ufshcd-pci.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/scsi/ufs/ufshcd-pci.c +20 -0
@@ -163,6 +163,24 @@ static void ufs_intel_common_exit(struct ufs_hba *hba)intel_ltr_hide (hba->dev); } +static int ufs_intel_resume (struct ufs_hba *hba,enum ufs_pm_op op) +{ +/* +* To support S4 (suspend-to-disk) with spm_lvl other than 5, the base +* address registers must be restored because the restore kernel can +* have used different addresses. +*/ +ufshcd_writel (hba,lower_32_bits (hba->utrdl_dma_addr), +REG_UTP_TRANSFER_REQ_LIST_BASE_L ); +ufshcd_writel (hba,upper_32_bits (hba->utrdl_dma_addr), +REG_UTP_TRANSFER_REQ_LIST_BASE_H ); +ufshcd_writel (hba,lower_32_bits (hba->utmrdl_dma_addr), +REG_UTP_TASK_REQ_LIST_BASE_L ); +ufshcd_writel (hba,upper_32_bits (hba->utmrdl_dma_addr), +REG_UTP_TASK_REQ_LIST_BASE_H ); +return 0 ; +} +static int ufs_intel_ehl_init (struct ufs_hba *hba) { hba->quirks |=UFSHCD_QUIRK_BROKEN_AUTO_HIBERN8 ;
@@ -174,6 +192,7 @@ static struct ufs_hba_variant_ops ufs_intel_cnl_hba_vops = { .init = ufs_intel_common_init, .exit = ufs_intel_common_exit, .link_startup_notify = ufs_intel_link_startup_notify, + .resume = ufs_intel_resume, };static struct ufs_hba_variant_ops ufs_intel_ehl_hba_vops = {
@@ -181,6 +200,7 @@ static struct ufs_hba_variant_ops ufs_intel_ehl_hba_vops = { .init = ufs_intel_ehl_init, .exit = ufs_intel_common_exit, .link_startup_notify = ufs_intel_link_startup_notify, + .resume = ufs_intel_resume, };#ifdef CONFIG_PM_SLEEP
Signature · 1 line
2.17.1
PATCH 2/4 scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
In reply to Adrian HunterThe expectation for suspend-to-disk is that devices will be powered-off, so the UFS device should be put in PowerDown mode. If spm_lvl is not 5, then that will not happen. Change the pm callbacks to force spm_lvl 5 for suspend-to-disk poweroff.
--- drivers/scsi/ufs/ufshcd-pci.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-)
drivers/scsi/ufs/ufshcd-pci.c +32 -2
@@ -227,6 +227,30 @@ static int ufshcd_pci_resume(struct device *dev) {return ufshcd_system_resume (dev_get_drvdata (dev)); } + +/** +* ufshcd_pci_poweroff - suspend-to-disk poweroff function +* @dev: pointer to PCI device handle +* +* Returns 0 if successful +* Returns non-zero otherwise +*/ +static int ufshcd_pci_poweroff (struct device *dev) +{ +struct ufs_hba *hba =dev_get_drvdata (dev); +int spm_lvl = hba->spm_lvl; +int ret; + +/* +* For poweroff we need to set the UFS device to PowerDown mode. +* Force spm_lvl to ensure that. +*/ + hba->spm_lvl =5 ; + ret =ufshcd_system_suspend (hba); + hba->spm_lvl = spm_lvl; +return ret; +} +#endif /* !CONFIG_PM_SLEEP */ #ifdef CONFIG_PM
@@ -322,8 +346,14 @@ ufshcd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) }static const struct dev_pm_ops ufshcd_pci_pm_ops = { - SET_SYSTEM_SLEEP_PM_OPS(ufshcd_pci_suspend, - ufshcd_pci_resume) +#ifdef CONFIG_PM_SLEEP + .suspend = ufshcd_pci_suspend, + .resume = ufshcd_pci_resume, + .freeze = ufshcd_pci_suspend, + .thaw = ufshcd_pci_resume, + .poweroff = ufshcd_pci_poweroff, + .restore = ufshcd_pci_resume, +#endifSET_RUNTIME_PM_OPS (ufshcd_pci_runtime_suspend, ufshcd_pci_runtime_resume, ufshcd_pci_runtime_idle)
Signature · 1 line
2.17.1
PATCH 3/4 scsi: ufs-pci: Fix recovery from hibernate exit errors for Intel controllers
In reply to Adrian HunterIntel controllers can end up in an unrecoverable state after a hibernate exit error unless a full reset and restore is done before anything else. Force that to happen.
--- drivers/scsi/ufs/ufshcd-pci.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/scsi/ufs/ufshcd-pci.c +17 -0
@@ -178,6 +178,23 @@ static int ufs_intel_resume(struct ufs_hba *hba, enum ufs_pm_op op) REG_UTP_TASK_REQ_LIST_BASE_L);ufshcd_writel (hba,upper_32_bits (hba->utmrdl_dma_addr),REG_UTP_TASK_REQ_LIST_BASE_H ); + +if (ufshcd_is_link_hibern8 (hba)) { +int ret =ufshcd_uic_hibern8_exit (hba); + +if (!ret) { +ufshcd_set_link_active (hba); + }else { +dev_err (hba->dev,"%s: hibern8 exit failed %d\n" , + __func__, ret); +/* +* Force reset and restore. Any other actions can lead +* to an unrecoverable state. +*/ +ufshcd_set_link_off (hba); + } + } +return 0 ; }
Signature · 1 line
2.17.1
PATCH 4/4 scsi: ufs-pci: Enable UFSHCD_CAP_RPM_AUTOSUSPEND for Intel controllers
In reply to Adrian HunterEnable runtime PM auto-suspend by default for Intel host controllers.
--- drivers/scsi/ufs/ufshcd-pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/ufs/ufshcd-pci.c +2 -0
@@ -148,6 +148,8 @@ static int ufs_intel_common_init(struct ufs_hba *hba) {struct intel_host *host; + hba->caps |=UFSHCD_CAP_RPM_AUTOSUSPEND ; + host =devm_kzalloc (hba->dev,sizeof (*host),GFP_KERNEL );if (!host)return -ENOMEM ;
Signature · 1 line
2.17.1
Martin K. Petersen
AppliedAdrian,
Quoted 7 lines
Here are some small fixes / amendments.
Adrian Hunter (4):
scsi: ufs-pci: Fix restore from S4 for Intel controllers
scsi: ufs-pci: Ensure UFS device is in PowerDown mode for suspend-to-disk ->poweroff()
scsi: ufs-pci: Fix recovery from hibernate exit errors for Intel controllers
scsi: ufs-pci: EnableUFSHCD_CAP_RPM_AUTOSUSPENDfor Intel controllers
Applied to 5.11/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering