lkml.org 
[lkml]   [2021]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 032/108] spi: stm32: fixes pm_runtime calls in probe/remove
    Date
    From: Alain Volmat <alain.volmat@foss.st.com>

    [ Upstream commit 7999d2555c9f879d006ea8469d74db9cdb038af0 ]

    Add pm_runtime calls in probe/probe error path and remove
    in order to be consistent in all places in ordering and
    ensure that pm_runtime is disabled prior to resources used
    by the SPI controller.

    This patch also fixes the 2 following warnings on driver remove:
    WARNING: CPU: 0 PID: 743 at drivers/clk/clk.c:594 clk_core_disable_lock+0x18/0x24
    WARNING: CPU: 0 PID: 743 at drivers/clk/clk.c:476 clk_unprepare+0x24/0x2c

    Fixes: 038ac869c9d2 ("spi: stm32: add runtime PM support")

    Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com>
    Signed-off-by: Alain Volmat <alain.volmat@foss.st.com>
    Link: https://lore.kernel.org/r/1625646426-5826-2-git-send-email-alain.volmat@foss.st.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/spi/spi-stm32.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c
    index 8c308279c535..e9d48e94f5ed 100644
    --- a/drivers/spi/spi-stm32.c
    +++ b/drivers/spi/spi-stm32.c
    @@ -1936,6 +1936,7 @@ static int stm32_spi_probe(struct platform_device *pdev)
    master->can_dma = stm32_spi_can_dma;

    pm_runtime_set_active(&pdev->dev);
    + pm_runtime_get_noresume(&pdev->dev);
    pm_runtime_enable(&pdev->dev);

    ret = spi_register_master(master);
    @@ -1974,6 +1975,8 @@ static int stm32_spi_probe(struct platform_device *pdev)

    err_pm_disable:
    pm_runtime_disable(&pdev->dev);
    + pm_runtime_put_noidle(&pdev->dev);
    + pm_runtime_set_suspended(&pdev->dev);
    err_dma_release:
    if (spi->dma_tx)
    dma_release_channel(spi->dma_tx);
    @@ -1992,9 +1995,14 @@ static int stm32_spi_remove(struct platform_device *pdev)
    struct spi_master *master = platform_get_drvdata(pdev);
    struct stm32_spi *spi = spi_master_get_devdata(master);

    + pm_runtime_get_sync(&pdev->dev);
    +
    spi_unregister_master(master);
    spi->cfg->disable(spi);

    + pm_runtime_disable(&pdev->dev);
    + pm_runtime_put_noidle(&pdev->dev);
    + pm_runtime_set_suspended(&pdev->dev);
    if (master->dma_tx)
    dma_release_channel(master->dma_tx);
    if (master->dma_rx)
    @@ -2002,7 +2010,6 @@ static int stm32_spi_remove(struct platform_device *pdev)

    clk_disable_unprepare(spi->clk);

    - pm_runtime_disable(&pdev->dev);

    pinctrl_pm_select_sleep_state(&pdev->dev);

    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-26 18:04    [W:5.060 / U:1.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site