Skip to content

Commit c8afd03

Browse files
jwrdegoederafaeljw
authored andcommitted
ACPI / LPSS: Use acpi_lpss_* instead of acpi_subsys_* functions for hibernate
Commit 48402ce ("ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq") makes acpi_lpss_{suspend_late,resume_early}() bail early on BYT/CHT as resume_from_noirq is set. This means that on resume from hibernate dw_i2c_plat_resume() doesn't get called by the restore_early callback, acpi_lpss_resume_early(). Instead it should be called by the restore_noirq callback matching how things are done when resume_from_noirq is set and we are doing a regular resume. Change the restore_noirq callback to acpi_lpss_resume_noirq so that dw_i2c_plat_resume() gets properly called when resume_from_noirq is set and we are resuming from hibernate. Likewise also change the poweroff_noirq callback so that dw_i2c_plat_suspend gets called properly. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=202139 Fixes: 48402ce ("ACPI / LPSS: Resume BYT/CHT I2C controllers from resume_noirq") Reported-by: Kai-Heng Feng <[email protected]> Signed-off-by: Hans de Goede <[email protected]> Cc: 4.20+ <[email protected]> # 4.20+ Signed-off-by: Rafael J. Wysocki <[email protected]>
1 parent dc4060a commit c8afd03

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/acpi/acpi_lpss.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,8 @@ static struct dev_pm_domain acpi_lpss_pm_domain = {
11421142
.thaw_noirq = acpi_subsys_thaw_noirq,
11431143
.poweroff = acpi_subsys_suspend,
11441144
.poweroff_late = acpi_lpss_suspend_late,
1145-
.poweroff_noirq = acpi_subsys_suspend_noirq,
1146-
.restore_noirq = acpi_subsys_resume_noirq,
1145+
.poweroff_noirq = acpi_lpss_suspend_noirq,
1146+
.restore_noirq = acpi_lpss_resume_noirq,
11471147
.restore_early = acpi_lpss_resume_early,
11481148
#endif
11491149
.runtime_suspend = acpi_lpss_runtime_suspend,

0 commit comments

Comments
 (0)