From: Thomas Richard <thomas.richard@bootlin.com>
To: "Philipp Zabel" <p.zabel@pengutronix.de>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Bartosz Golaszewski" <brgl@bgdev.pl>,
"Andy Shevchenko" <andy@kernel.org>,
"Tony Lindgren" <tony@atomide.com>,
"Haojian Zhuang" <haojian.zhuang@linaro.org>,
"Vignesh R" <vigneshr@ti.com>,
"Aaro Koskinen" <aaro.koskinen@iki.fi>,
"Janusz Krzysztofik" <jmkrzyszt@gmail.com>,
"Andi Shyti" <andi.shyti@kernel.org>,
"Peter Rosin" <peda@axentia.se>, "Vinod Koul" <vkoul@kernel.org>,
"Kishon Vijay Abraham I" <kishon@kernel.org>,
"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
"Krzysztof Wilczyński" <kw@linux.com>,
"Rob Herring" <robh@kernel.org>,
"Bjorn Helgaas" <bhelgaas@google.com>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-i2c@vger.kernel.org, linux-phy@lists.infradead.org,
linux-pci@vger.kernel.org, gregory.clement@bootlin.com,
theo.lebrun@bootlin.com, thomas.petazzoni@bootlin.com,
u-kumar1@ti.com
Subject: Re: [PATCH v3 14/18] phy: cadence-torrent: add suspend and resume support
Date: Wed, 21 Feb 2024 14:41:12 +0100 [thread overview]
Message-ID: <113b7f2e-1313-4ebf-a403-e5fcae8f01ca@bootlin.com> (raw)
In-Reply-To: <c105bfa8567f9e76731f2b018f4ca3176357204d.camel@pengutronix.de>
On 2/21/24 14:09, Philipp Zabel wrote:
> On Do, 2024-02-15 at 16:17 +0100, Thomas Richard wrote:
>> Add suspend and resume support.
>>
>> The already_configured flag is cleared during the suspend stage to force
>> the PHY initialization during the resume stage.
>>
>> Based on the work of Théo Lebrun <theo.lebrun@bootlin.com>
>>
>> Signed-off-by: Thomas Richard <thomas.richard@bootlin.com>
>> ---
>> drivers/phy/cadence/phy-cadence-torrent.c | 54 +++++++++++++++++++++++++++++++
>> 1 file changed, 54 insertions(+)
>>
>> diff --git a/drivers/phy/cadence/phy-cadence-torrent.c b/drivers/phy/cadence/phy-cadence-torrent.c
>> index 52cadca4c07b..f8945a11e7ca 100644
>> --- a/drivers/phy/cadence/phy-cadence-torrent.c
>> +++ b/drivers/phy/cadence/phy-cadence-torrent.c
>> @@ -3005,6 +3005,59 @@ static void cdns_torrent_phy_remove(struct platform_device *pdev)
>> cdns_torrent_clk_cleanup(cdns_phy);
>> }
>>
>> +static int cdns_torrent_phy_suspend_noirq(struct device *dev)
>> +{
>> + struct cdns_torrent_phy *cdns_phy = dev_get_drvdata(dev);
>> + int i;
>> +
>> + reset_control_assert(cdns_phy->phy_rst);
>> + reset_control_assert(cdns_phy->apb_rst);
>> + for (i = 0; i < cdns_phy->nsubnodes; i++)
>> + reset_control_assert(cdns_phy->phys[i].lnk_rst);
>> +
>> + if (cdns_phy->already_configured)
>> + cdns_phy->already_configured = 0;
>> + else
>> + clk_disable_unprepare(cdns_phy->clk);
>> +
>> + return 0;
>> +}
>> +
>> +static int cdns_torrent_phy_resume_noirq(struct device *dev)
>> +{
>> + struct cdns_torrent_phy *cdns_phy = dev_get_drvdata(dev);
>> + int node = cdns_phy->nsubnodes;
>> + int ret, i;
>> +
>> + ret = cdns_torrent_clk(cdns_phy);
>> + if (ret)
>> + goto clk_cleanup;
>> +
>> + /* Enable APB */
>> + reset_control_deassert(cdns_phy->apb_rst);
>> +
>> + if (cdns_phy->nsubnodes > 1) {
>> + ret = cdns_torrent_phy_configure_multilink(cdns_phy);
>> + if (ret)
>> + goto put_lnk_rst;
>> + }
>> +
>> + return 0;
>> +
>> +put_lnk_rst:
>> + for (i = 0; i < node; i++)
>> + reset_control_assert(cdns_phy->phys[i].lnk_rst);
>
> The same cleanup is found in probe. Would it be cleaner to move this
> into cdns_torrent_phy_configure_multilink() instead of duplicating it
> here?
Hello Philipp,
Yes I could, but from my point of view, it would not be cleaner.
This cleanup is called from many places in the probe:
-
https://elixir.bootlin.com/linux/v6.8-rc5/source/drivers/phy/cadence/phy-cadence-torrent.c#L2948
-
https://elixir.bootlin.com/linux/v6.8-rc5/source/drivers/phy/cadence/phy-cadence-torrent.c#L2954
-
https://elixir.bootlin.com/linux/v6.8-rc5/source/drivers/phy/cadence/phy-cadence-torrent.c#L2960
If I add this cleanup in cdns_torrent_phy_configure_multilink(), yes I
could remove it from cdns_torrent_phy_resume_noirq(), but I should keep
it in the probe. And I should modify the probe to jump to clk_cleanup if
cdns_torrent_phy_configure_multilink() fails.
>
>> + reset_control_assert(cdns_phy->apb_rst);
>> + clk_disable_unprepare(cdns_phy->clk);
>> +clk_cleanup:
>> + cdns_torrent_clk_cleanup(cdns_phy);
>
> This calls of_clk_del_provider(), seems misplaced here.
Yes you're right, it's called in cdns_torrent_phy_remove().
So I should not call it in the resume callback, this will cause some
issues during the remove.
Regards,
--
Thomas Richard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2024-02-21 13:41 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 15:17 [PATCH v3 00/18] Add suspend to ram support for PCIe on J7200 Thomas Richard
2024-02-15 15:17 ` [PATCH v3 01/18] gpio: pca953x: move suspend()/resume() to suspend_noirq()/resume_noirq() Thomas Richard
2024-02-21 21:54 ` Linus Walleij
2024-02-15 15:17 ` [PATCH v3 02/18] pinctrl: pinctrl-single: remove dead code in suspend() and resume() callbacks Thomas Richard
2024-02-15 15:27 ` Andy Shevchenko
2024-02-16 7:59 ` Thomas Richard
2024-02-16 15:08 ` Andy Shevchenko
2024-02-21 11:01 ` Thomas Richard
2024-02-21 13:13 ` Andy Shevchenko
2024-02-21 14:19 ` Thomas Richard
2024-02-15 15:17 ` [PATCH v3 03/18] pinctrl: pinctrl-single: move suspend()/resume() callbacks to noirq Thomas Richard
2024-02-15 15:17 ` [PATCH v3 04/18] i2c: omap: wakeup the controller during suspend() callback Thomas Richard
2024-02-15 15:30 ` Andy Shevchenko
2024-02-15 15:17 ` [PATCH v3 05/18] mux: add mux_chip_resume() function Thomas Richard
2024-02-15 15:29 ` Andy Shevchenko
2024-02-16 7:52 ` Thomas Richard
2024-02-16 15:07 ` Andy Shevchenko
2024-02-21 10:59 ` Thomas Richard
2024-02-15 15:17 ` [PATCH v3 06/18] mux: mmio: add resume support Thomas Richard
2024-02-15 15:17 ` [PATCH v3 07/18] phy: ti: phy-j721e-wiz: use dev_err_probe() instead of dev_err() Thomas Richard
2024-02-15 15:33 ` Andy Shevchenko
2024-02-15 15:17 ` [PATCH v3 08/18] phy: ti: phy-j721e-wiz: split wiz_clock_init() function Thomas Richard
2024-02-15 15:43 ` Andy Shevchenko
2024-02-16 6:02 ` Vinod Koul
2024-02-16 9:04 ` Siddharth Vadapalli
2024-02-16 15:03 ` Andy Shevchenko
2024-02-16 14:56 ` Andy Shevchenko
2024-02-15 15:17 ` [PATCH v3 09/18] phy: ti: phy-j721e-wiz: add resume support Thomas Richard
2024-02-15 15:17 ` [PATCH v3 10/18] phy: cadence-torrent: extract calls to clk_get from cdns_torrent_clk Thomas Richard
2024-02-15 15:17 ` [PATCH v3 11/18] phy: cadence-torrent: register resets even if the phy is already configured Thomas Richard
2024-02-15 15:17 ` [PATCH v3 12/18] phy: cadence-torrent: add already_configured to struct cdns_torrent_phy Thomas Richard
2024-02-15 15:17 ` [PATCH v3 13/18] phy: cadence-torrent: remove noop_ops phy operations Thomas Richard
2024-02-15 15:45 ` Andy Shevchenko
2024-02-15 15:17 ` [PATCH v3 14/18] phy: cadence-torrent: add suspend and resume support Thomas Richard
2024-02-15 15:46 ` Andy Shevchenko
2024-02-16 7:36 ` Thomas Richard
2024-02-21 13:09 ` Philipp Zabel
2024-02-21 13:41 ` Thomas Richard [this message]
2024-02-21 13:58 ` Philipp Zabel
2024-02-15 15:18 ` [PATCH v3 15/18] PCI: cadence: extract link setup sequence from cdns_pcie_host_setup() Thomas Richard
2024-02-16 9:34 ` Siddharth Vadapalli
2024-02-15 15:18 ` [PATCH v3 16/18] PCI: cadence: set cdns_pcie_host_init() global Thomas Richard
2024-02-16 9:38 ` Siddharth Vadapalli
2024-02-15 15:18 ` [PATCH v3 17/18] PCI: j721e: add reset GPIO to struct j721e_pcie Thomas Richard
2024-02-15 16:04 ` Andy Shevchenko
2024-02-26 17:05 ` Thomas Richard
2024-02-26 17:54 ` Andy Shevchenko
2024-02-15 15:18 ` [PATCH v3 18/18] PCI: j721e: add suspend and resume support Thomas Richard
2024-02-15 15:51 ` Andy Shevchenko
2024-02-16 10:48 ` Siddharth Vadapalli
2024-02-16 11:09 ` Théo Lebrun
2024-02-16 11:16 ` Siddharth Vadapalli
2024-02-15 15:40 ` [PATCH v3 00/18] Add suspend to ram support for PCIe on J7200 Philipp Stanner
2024-02-15 17:06 ` Bjorn Helgaas
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=113b7f2e-1313-4ebf-a403-e5fcae8f01ca@bootlin.com \
--to=thomas.richard@bootlin.com \
--cc=aaro.koskinen@iki.fi \
--cc=andi.shyti@kernel.org \
--cc=andy@kernel.org \
--cc=bhelgaas@google.com \
--cc=brgl@bgdev.pl \
--cc=gregory.clement@bootlin.com \
--cc=haojian.zhuang@linaro.org \
--cc=jmkrzyszt@gmail.com \
--cc=kishon@kernel.org \
--cc=kw@linux.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=p.zabel@pengutronix.de \
--cc=peda@axentia.se \
--cc=robh@kernel.org \
--cc=theo.lebrun@bootlin.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=tony@atomide.com \
--cc=u-kumar1@ti.com \
--cc=vigneshr@ti.com \
--cc=vkoul@kernel.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).