Skip to contentSkip to conversation

scsi: ufs-pci: Force a full restore after suspend-to-disk

PATCH Applied Adrian Hunter 3 participants 9 messages Oct 12, 2021 – Oct 17, 2021 SCSI

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover scsi: ufs-pci: Force a full restore after suspend-to-disk

Hi

This patch ensures suspend-to-disk works with Host Performance Booster. Since the Host Perfomance Booster feature was added in v5.15, please consider this for v5.15 fixes.

Adrian Hunter (1):
scsi: ufs-pci: Force a full restore after suspend-to-disk

 drivers/scsi/ufs/ufshcd-pci.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

Regards
Adrian

#1 lore raw

PATCH 1/1 scsi: ufs-pci: Force a full restore after suspend-to-disk

Implement the ->restore() PM operation and set the link to off, which will force a full reset and restore. This ensures that Host Performance Booster is reset after suspend-to-disk.

The Host Performance Booster feature caches logical-to-physical mapping information in the host memory. After suspend-to-disk, such information is not valid, so a full reset and restore is needed.

A full reset and restore is done if the SPM level is 5 or 6, but not for other SPM levels, so this change fixes those cases.

A full reset and restore also restores base address registers, so that code is removed.

---
 drivers/scsi/ufs/ufshcd-pci.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)
drivers/scsi/ufs/ufshcd-pci.c +16 -15
index 149c1aa09103..d65e6cd7a28d 100644
@@ -370,20 +370,6 @@ static void ufs_intel_common_exit(struct ufs_hba *hba)
 
 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);
-
 	if (ufshcd_is_link_hibern8(hba)) {
 		int ret = ufshcd_uic_hibern8_exit(hba);
 
@@ -463,6 +449,16 @@ static struct ufs_hba_variant_ops ufs_intel_lkf_hba_vops = {
 	.device_reset		= ufs_intel_device_reset,
 };
 
+static int ufshcd_pci_restore(struct device *dev)
+{
+	struct ufs_hba *hba = dev_get_drvdata(dev);
+
+	/* Force a full reset and restore */
+	ufshcd_set_link_off(hba);
+
+	return ufshcd_system_resume(dev);
+}
+
 /**
  * ufshcd_pci_shutdown - main function to put the controller in reset state
  * @pdev: pointer to PCI device handle
@@ -546,9 +542,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_system_suspend, ufshcd_system_resume)
 	SET_RUNTIME_PM_OPS(ufshcd_runtime_suspend, ufshcd_runtime_resume, NULL)
 #ifdef CONFIG_PM_SLEEP
+	.suspend	= ufshcd_system_suspend,
+	.resume		= ufshcd_system_resume,
+	.freeze		= ufshcd_system_suspend,
+	.thaw		= ufshcd_system_resume,
+	.poweroff	= ufshcd_system_suspend,
+	.restore	= ufshcd_pci_restore,
 	.prepare	= ufshcd_suspend_prepare,
 	.complete	= ufshcd_resume_complete,
 #endif
Signature · 1 line
2.25.1
Reviewed-by on v1 1/1
#2 lore raw
Quoted 11 lines

Implement the ->restore() PM operation and set the link to off, which will force a full reset and restore. This ensures that Host Performance Booster is reset after suspend-to-disk.

The Host Performance Booster feature caches logical-to-physical mapping information in the host memory. After suspend-to-disk, such information is not valid, so a full reset and restore is needed.

A full reset and restore is done if the SPM level is 5 or 6, but not for other SPM levels, so this change fixes those cases.

It is perfectly fine for you to do that on your platform, if you choose so - Hence my reviewed-by.
But the reasoning is a bit odd, because you already set SSU4 for your spm-lvl, And on SSU3 the device does not dump its internal tables.

Thanks,
Avri

Quoted 4 lines

A full reset and restore also restores base address registers, so that code is removed.

#3 lore raw
Quoted 9 lines · Avri Altman
Quoted 9 lines

Implement the ->restore() PM operation and set the link to off, which will force a full reset and restore. This ensures that Host Performance Booster is reset after suspend-to-disk.

The Host Performance Booster feature caches logical-to-physical mapping information in the host memory. After suspend-to-disk, such information is not valid, so a full reset and restore is needed.

Quoted 6 lines
Quoted 2 lines

A full reset and restore is done if the SPM level is 5 or 6, but not for other SPM levels, so this change fixes those cases.

It is perfectly fine for you to do that on your platform, if you choose so - Hence my reviewed-by.
But the reasoning is a bit odd, because you already set SSU4 for your spm-lvl, And on SSU3 the device does not dump its internal tables.

Hibernation flow is:

	->freeze()
	create memory image
	->thaw()
	write image
	->poweroff()

	time passes
	someone presses the power button or something else activates the machine

	kernel boots
	detects restore image
	read image
	->freeze()
	restore memory image
	->restore()

It is up to ->restore() to ensure the device state matches the memory state as it was when the hibernation image was made.

Quoted 10 lines

Thanks,
Avri

Quoted 4 lines

A full reset and restore also restores base address registers, so that code is removed.

#4 lore raw
Quoted 37 lines · Avri Altman
Quoted 9 lines
Quoted 9 lines

Implement the ->restore() PM operation and set the link to off, which will force a full reset and restore. This ensures that Host Performance Booster is reset after suspend-to-disk.

The Host Performance Booster feature caches logical-to-physical mapping information in the host memory. After suspend-to-disk, such information is not valid, so a full reset and restore is needed.

Quoted 6 lines
Quoted 2 lines

A full reset and restore is done if the SPM level is 5 or 6, but not for other SPM levels, so this change fixes those cases.

It is perfectly fine for you to do that on your platform, if you choose so - Hence my reviewed-by.
But the reasoning is a bit odd, because you already set SSU4 for your spm-lvl, And on SSU3 the device does not dump its internal tables.

Hibernation flow is:

        ->freeze()
        create memory image
        ->thaw()
        write image
        ->poweroff()

        time passes
        someone presses the power button or something else activates the

machine

kernel boots
detects restore image
read image
->freeze()
restore memory image
->restore()

Quoted 2 lines

It is up to ->restore() to ensure the device state matches the memory state as it was when the hibernation image was made.

Oh, ok. I missed the poweroff part before.

Thanks,
Avri

Quoted 11 lines
Quoted 11 lines

Thanks,
Avri

Quoted 4 lines

A full reset and restore also restores base address registers, so that code is removed.

#5 lore raw
In reply to Adrian Hunter

Adrian,

Quoted 3 lines

Implement the ->restore() PM operation and set the link to off, which will force a full reset and restore. This ensures that Host Performance Booster is reset after suspend-to-disk.

Applied to 5.16/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering
#6 lore raw
In reply to Adrian Hunter
Quoted 3 lines

Hi

This patch ensures suspend-to-disk works with Host Performance Booster.

What is "suspend-to-disk"?
What power mode is used for that?

Thanks,
Avri

Quoted 13 lines

Since the Host Perfomance Booster feature was added in v5.15, please consider this for v5.15 fixes.

Adrian Hunter (1):
scsi: ufs-pci: Force a full restore after suspend-to-disk

 drivers/scsi/ufs/ufshcd-pci.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

Regards
Adrian

#7 lore raw
Quoted 4 lines · Avri Altman
Quoted 3 lines

Hi

This patch ensures suspend-to-disk works with Host Performance Booster.

What is "suspend-to-disk"?

Hibernation, refer kernel config CONFIG_HIBERNATION i.e.

echo disk > /sys/power/state

Quoted 1 line

What power mode is used for that?

Same as spm_lvl except ufshcd_wl_poweroff() naturally uses the same as shutdown i.e. POWERDOWN

Quoted 17 lines

Thanks,
Avri

Quoted 13 lines

Since the Host Perfomance Booster feature was added in v5.15, please consider this for v5.15 fixes.

Adrian Hunter (1):
scsi: ufs-pci: Force a full restore after suspend-to-disk

 drivers/scsi/ufs/ufshcd-pci.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

Regards
Adrian

#8 lore raw
Quoted 6 lines · Avri Altman
Quoted 4 lines
Quoted 3 lines

Hi

This patch ensures suspend-to-disk works with Host Performance Booster.

What is "suspend-to-disk"?

Quoted 8 lines

Hibernation, refer kernel config CONFIG_HIBERNATION i.e.

echo disk > /sys/power/state

Quoted 1 line

What power mode is used for that?

Same as spm_lvl except ufshcd_wl_poweroff() naturally uses the same as shutdown i.e. POWERDOWN

If spm_lvl is SSU3 - the device maintains its RAM. On SSU4 however, the RAM is powered down.

Quoted 18 lines
Quoted 18 lines

Thanks,
Avri

Quoted 13 lines

Since the Host Perfomance Booster feature was added in v5.15, please consider this for v5.15 fixes.

Adrian Hunter (1):
scsi: ufs-pci: Force a full restore after suspend-to-disk

 drivers/scsi/ufs/ufshcd-pci.c | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

Regards
Adrian