From: "quanyang.wang" <quanyang.wang@windriver.com>
To: Dinghao Liu <dinghao.liu@zju.edu.cn>, kjlu@umn.edu
Cc: Mark Brown <broonie@kernel.org>,
Michal Simek <michal.simek@xilinx.com>,
Naga Sureshkumar Relli <naga.sureshkumar.relli@xilinx.com>,
Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>,
linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] [v4] spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe
Date: Thu, 15 Apr 2021 16:19:27 +0800 [thread overview]
Message-ID: <59f9e657-37e8-a91a-08a9-d2bdb734d9cd@windriver.com> (raw)
In-Reply-To: <20210415074644.24646-1-dinghao.liu@zju.edu.cn>
On 4/15/21 3:46 PM, Dinghao Liu wrote:
> 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: 9e3a000362aec ("spi: zynqmp: Add pm runtime support")
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>
> Changelog:
>
> v2: - Add a refcount increment to fix refcout leak instead of the
> refcount decrement on error.
> Set ctlr->auto_runtime_pm = true.
>
> v3: - Add fix tag.
> Add a return value check against pm_runtime_get_sync().
> Move pm_runtime_{mark_last_busy & put_autosuspend} to the
> end of current function.
>
> v4: - Add error message on failure of pm_runtime_get_sync().
> ---
> drivers/spi/spi-zynqmp-gqspi.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-zynqmp-gqspi.c b/drivers/spi/spi-zynqmp-gqspi.c
> index c8fa6ee18ae7..38f3ddd3ea7c 100644
> --- a/drivers/spi/spi-zynqmp-gqspi.c
> +++ b/drivers/spi/spi-zynqmp-gqspi.c
> @@ -1160,11 +1160,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;
> @@ -1187,6 +1192,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) {
> @@ -1194,9 +1200,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);
Test this patch at zcu102 board:
root@xilinx-zynqmp:~# dmesg | grep domain2
[ 0.905407] zynqmp_gpd_attach_dev() ff0f0000.spi attached to domain2
domain
[ 0.912390] zynqmp_gpd_power_on() Powered on domain2 domain
[ 4.350331] zynqmp_gpd_power_off() Powered off domain2 domain
root@xilinx-zynqmp:~# flash_erase /dev/mtd3 0 0
Erasing 4 Kibyte @ 0 -- 0 % complete [ 153.125894]
zynqmp_gpd_power_on() Powered on domain2 domain
Erasing 4 Kibyte @ 2e8000 -- 49 % complete [ 156.134884]
zynqmp_gpd_power_off() Powered off domain2 domain
[ 156.142648] zynqmp_gpd_power_on() Powered on domain2 domain
Erasing 4 Kibyte @ 5d5000 -- 99 % complete [ 159.148329]
zynqmp_gpd_power_off() Powered off domain2 domain
[ 159.154579] zynqmp_gpd_power_on() Powered on domain2 domain
Erasing 4 Kibyte @ 5df000 -- 100 % complete
root@xilinx-zynqmp:~# [ 162.910329] zynqmp_gpd_power_off() Powered off
domain2 domain
pm_runtime works now. So
Tested-by: Quanyang Wang <quanyang.wang@windriver.com>
Regards,
Quanyang
next prev parent reply other threads:[~2021-04-15 8:20 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-15 7:46 [PATCH] [v4] spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe Dinghao Liu
2021-04-15 8:19 ` quanyang.wang [this message]
2021-04-15 18:33 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59f9e657-37e8-a91a-08a9-d2bdb734d9cd@windriver.com \
--to=quanyang.wang@windriver.com \
--cc=broonie@kernel.org \
--cc=dinghao.liu@zju.edu.cn \
--cc=kjlu@umn.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=naga.sureshkumar.relli@xilinx.com \
--cc=shubhrajyoti.datta@xilinx.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).