Unverified Commit 58eaa7b2 authored by Dinghao Liu's avatar Dinghao Liu Committed by Mark Brown
Browse files

spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe 



There is a PM usage counter decrement after zynqmp_qspi_init_hw()
without any refcount increment, which leads to refcount leak.Add
a refcount increment to balance the refcount. Also set
auto_runtime_pm to resume suspended spi controller.

Fixes: 9e3a0003 ("spi: zynqmp: Add pm runtime support")
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Tested-by: default avatarQuanyang Wang <quanyang.wang@windriver.com>
Link: https://lore.kernel.org/r/20210415074644.24646-1-dinghao.liu@zju.edu.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d6371415

drivers/spi/spi-zynqmp-gqspi.c

+12 −2
Original line number Diff line number Diff line
@@ -1163,11 +1163,16 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	pm_runtime_set_autosuspend_delay(&pdev->dev, SPI_AUTOSUSPEND_TIMEOUT);

	pm_runtime_set_active(&pdev->dev);

	pm_runtime_enable(&pdev->dev);



	ret = pm_runtime_get_sync(&pdev->dev);

	if (ret < 0) {

		dev_err(&pdev->dev, "Failed to pm_runtime_get_sync: %d\n", ret);

		goto clk_dis_all;

	}



	/* QSPI controller initializations */

	zynqmp_qspi_init_hw(xqspi);



	pm_runtime_mark_last_busy(&pdev->dev);

	pm_runtime_put_autosuspend(&pdev->dev);

	xqspi->irq = platform_get_irq(pdev, 0);

	if (xqspi->irq <= 0) {

		ret = -ENXIO;
@@ -1190,6 +1195,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
	ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD |

			    SPI_TX_DUAL | SPI_TX_QUAD;

	ctlr->dev.of_node = np;

	ctlr->auto_runtime_pm = true;



	ret = devm_spi_register_controller(&pdev->dev, ctlr);

	if (ret) {
@@ -1197,9 +1203,13 @@ static int zynqmp_qspi_probe(struct platform_device *pdev) 
		goto clk_dis_all;

	}



	pm_runtime_mark_last_busy(&pdev->dev);

	pm_runtime_put_autosuspend(&pdev->dev);



	return 0;



clk_dis_all:

	pm_runtime_put_sync(&pdev->dev);

	pm_runtime_set_suspended(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	clk_disable_unprepare(xqspi->refclk);