iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: spi-s3c64xx: Fix system resume support

Browse Source 
commit e935dba111 upstream.

Since Linux v4.10 release (commit 1d9174fbc5 "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: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Marek Szyprowski
2018-05-16 10:42:39 +02:00
committed by Greg Kroah-Hartman
parent e581f7c590
commit c09032b71f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-s3c64xx.c
View File

@ -1273,8 +1273,6 @@ static int s3c64xx_spi_resume(struct device *dev)
if (ret < 0) if (ret < 0)
return ret; return ret;
s3c64xx_spi_hwinit(sdd, sdd->port_id);
return spi_master_resume(master); return spi_master_resume(master);
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
@ -1312,6 +1310,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev)
if (ret != 0) if (ret != 0)
goto err_disable_src_clk; goto err_disable_src_clk;
s3c64xx_spi_hwinit(sdd, sdd->port_id);
return 0; return 0;
err_disable_src_clk: err_disable_src_clk: