Commit c09032b7 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman

spi: spi-s3c64xx: Fix system resume support

commit e935dba1 upstream.

Since Linux v4.10 release (commit 1d9174fb "PM / Runtime: Defer
resuming of the device in pm_runtime_force_resume()"),
pm_runtime_force_resume() function doesn't runtime resume device if it was
not runtime active before system suspend. Thus, driver should not do any
register access after pm_runtime_force_resume() without checking the
runtime status of the device. To fix this issue, simply move
s3c64xx_spi_hwinit() call to s3c64xx_spi_runtime_resume() to ensure that
hardware is always properly initialized. This fixes Synchronous external
abort issue on system suspend/resume cycle on newer Exynos SoCs.
Signed-off-by: default avatarMarek Szyprowski <>
Reviewed-by: default avatarKrzysztof Kozlowski <>
Signed-off-by: default avatarMark Brown <>
Signed-off-by: default avatarSudip Mukherjee <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent e581f7c5
......@@ -1273,8 +1273,6 @@ static int s3c64xx_spi_resume(struct device *dev)
if (ret < 0)
return ret;
s3c64xx_spi_hwinit(sdd, sdd->port_id);
return spi_master_resume(master);
#endif /* CONFIG_PM_SLEEP */
......@@ -1312,6 +1310,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
if (ret != 0)
goto err_disable_src_clk;
s3c64xx_spi_hwinit(sdd, sdd->port_id);
return 0;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment