Commit e0ff1273 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Wen Zhiwei
Browse files

spi: geni-qcom: Undo runtime PM changes at driver exit time 

stable inclusion
from stable-v6.6.52
commit 64cdc5d114426ea805b591c52a6dd4f9f25ac3c6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYXOD

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=64cdc5d114426ea805b591c52a6dd4f9f25ac3c6



--------------------------------

[ Upstream commit 89e362c883c65ff94b76b9862285f63545fb5274 ]

It's important to undo pm_runtime_use_autosuspend() with
pm_runtime_dont_use_autosuspend() at driver exit time unless driver
initially enabled pm_runtime with devm_pm_runtime_enable()
(which handles it for you).

Hence, switch to devm_pm_runtime_enable() to fix it, so the
pm_runtime_disable() in probe error path and remove function
can be removed.

Fixes: cfdab2cd ("spi: spi-geni-qcom: Set an autosuspend delay of 250 ms")
Signed-off-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Suggested-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://patch.msgid.link/20240909073141.951494-2-ruanjinjie@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 1a8d947c

drivers/spi/spi-geni-qcom.c

+6 −7
Original line number Diff line number Diff line
@@ -1110,25 +1110,27 @@ static int spi_geni_probe(struct platform_device *pdev) 
	spin_lock_init(&mas->lock);

	pm_runtime_use_autosuspend(&pdev->dev);

	pm_runtime_set_autosuspend_delay(&pdev->dev, 250);

	pm_runtime_enable(dev);

	ret = devm_pm_runtime_enable(dev);

	if (ret)

		return ret;



	if (device_property_read_bool(&pdev->dev, "spi-slave"))

		spi->slave = true;



	ret = geni_icc_get(&mas->se, NULL);

	if (ret)

		goto spi_geni_probe_runtime_disable;

		return ret;

	/* Set the bus quota to a reasonable value for register access */

	mas->se.icc_paths[GENI_TO_CORE].avg_bw = Bps_to_icc(CORE_2X_50_MHZ);

	mas->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW;



	ret = geni_icc_set_bw(&mas->se);

	if (ret)

		goto spi_geni_probe_runtime_disable;

		return ret;



	ret = spi_geni_init(mas);

	if (ret)

		goto spi_geni_probe_runtime_disable;

		return ret;



	/*

	 * check the mode supported and set_cs for fifo mode only
@@ -1157,8 +1159,6 @@ static int spi_geni_probe(struct platform_device *pdev) 
	free_irq(mas->irq, spi);

spi_geni_release_dma:

	spi_geni_release_dma_chan(mas);

spi_geni_probe_runtime_disable:

	pm_runtime_disable(dev);

	return ret;

}
@@ -1173,7 +1173,6 @@ static void spi_geni_remove(struct platform_device *pdev) 
	spi_geni_release_dma_chan(mas);



	free_irq(mas->irq, spi);

	pm_runtime_disable(&pdev->dev);

}



static int __maybe_unused spi_geni_runtime_suspend(struct device *dev)