Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e935dba1 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Mark Brown
Browse files

spi: spi-s3c64xx: Fix system resume support 



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 <m.szyprowski@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent b6456057

drivers/spi/spi-s3c64xx.c

+2 −2
Original line number Diff line number Diff line
@@ -1292,8 +1292,6 @@ static int s3c64xx_spi_resume(struct device *dev) 
	if (ret < 0)

		return ret;



	s3c64xx_spi_hwinit(sdd);



	return spi_master_resume(master);

}

#endif /* CONFIG_PM_SLEEP */
@@ -1331,6 +1329,8 @@ static int s3c64xx_spi_runtime_resume(struct device *dev) 
	if (ret != 0)

		goto err_disable_src_clk;



	s3c64xx_spi_hwinit(sdd);



	return 0;



err_disable_src_clk: