From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: marek.vasut@gmail.com
Cc: linux-pci@vger.kernel.org,
Kazufumi Ikeda <kaz-ikeda@xc.jp.nec.com>,
Gaku Inami <gaku.inami.xw@bp.renesas.com>,
Marek Vasut <marek.vasut+renesas@gmail.com>,
Geert Uytterhoeven <geert+renesas@glider.be>,
Phil Edworthy <phil.edworthy@renesas.com>,
Simon Horman <horms+renesas@verge.net.au>,
Wolfram Sang <wsa@the-dreams.de>,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH V2] PCI: rcar: Add the initialization of PCIe link in resume_noirq
Date: Mon, 25 Mar 2019 16:54:39 +0000 [thread overview]
Message-ID: <20190325165439.GA19135@e107981-ln.cambridge.arm.com> (raw)
In-Reply-To: <20190217132441.15139-1-marek.vasut@gmail.com>
On Sun, Feb 17, 2019 at 02:24:41PM +0100, marek.vasut@gmail.com wrote:
> From: Kazufumi Ikeda <kaz-ikeda@xc.jp.nec.com>
>
> Reestablish the PCIe link very early in the resume process in case it
> went down to prevent PCI accesses from hanging the bus. Such accesses
> can happen early in the PCI resume process, in the resume_noirq, thus
> the link must be reestablished in the resume_noirq callback of the
> driver.
>
> Signed-off-by: Kazufumi Ikeda <kaz-ikeda@xc.jp.nec.com>
> Signed-off-by: Gaku Inami <gaku.inami.xw@bp.renesas.com>
> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: Phil Edworthy <phil.edworthy@renesas.com>
> Cc: Simon Horman <horms+renesas@verge.net.au>
> Cc: Wolfram Sang <wsa@the-dreams.de>
> Cc: linux-renesas-soc@vger.kernel.org
> ---
> V2: - Use BIT() macro for (1 << n)
> - Since polling in rcar_pcie_wait_for_dl() uses udelay(), do not
> add extra changes to this function anymore
> - Make resume_noirq return early and clean up parenthesis therein
> ---
> drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++
> 1 file changed, 20 insertions(+)
I applied it to pci/controller-fixes but the kbot barfed at it so we
need to rework it.
Thanks,
Lorenzo
> diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c
> index c8febb009454..b8f8fb3bc640 100644
> --- a/drivers/pci/controller/pcie-rcar.c
> +++ b/drivers/pci/controller/pcie-rcar.c
> @@ -46,6 +46,7 @@
>
> /* Transfer control */
> #define PCIETCTLR 0x02000
> +#define DL_DOWN BIT(3)
> #define CFINIT 1
> #define PCIETSTR 0x02004
> #define DATA_LINK_ACTIVE 1
> @@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev)
> pcie = pci_host_bridge_priv(bridge);
>
> pcie->dev = dev;
> + platform_set_drvdata(pdev, pcie);
>
> err = pci_parse_request_of_pci_ranges(dev, &pcie->resources, NULL);
> if (err)
> @@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)
> return err;
> }
>
> +static int rcar_pcie_resume_noirq(struct device *dev)
> +{
> + struct rcar_pcie *pcie = dev_get_drvdata(dev);
> +
> + if (rcar_pci_read_reg(pcie, PMSR) &&
> + !(rcar_pci_read_reg(pcie, PCIETCTLR) & DL_DOWN))
> + return 0;
> +
> + /* Re-establish the PCIe link */
> + rcar_pci_write_reg(pcie, CFINIT, PCIETCTLR);
> + return rcar_pcie_wait_for_dl(pcie);
> +}
> +
> +static const struct dev_pm_ops rcar_pcie_pm_ops = {
> + .resume_noirq = rcar_pcie_resume_noirq,
> +};
> +
> static struct platform_driver rcar_pcie_driver = {
> .driver = {
> .name = "rcar-pcie",
> .of_match_table = rcar_pcie_of_match,
> + .pm = &rcar_pcie_pm_ops,
> .suppress_bind_attrs = true,
> },
> .probe = rcar_pcie_probe,
> --
> 2.19.2
>
next prev parent reply other threads:[~2019-03-25 16:54 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-17 13:24 [PATCH V2] PCI: rcar: Add the initialization of PCIe link in resume_noirq marek.vasut
2019-02-19 17:24 ` Wolfram Sang
2019-02-25 9:58 ` Simon Horman
2019-03-07 20:50 ` Bjorn Helgaas
2019-03-07 22:49 ` Marek Vasut
2019-03-08 17:17 ` Bjorn Helgaas
2019-03-08 21:35 ` Marek Vasut
2019-03-11 10:10 ` Rafael J. Wysocki
2019-03-19 16:18 ` Lorenzo Pieralisi
2019-03-22 11:31 ` Lorenzo Pieralisi
2019-03-22 12:09 ` Marek Vasut
2019-03-22 12:18 ` Lorenzo Pieralisi
2019-03-22 12:29 ` Geert Uytterhoeven
2019-03-22 12:33 ` Marek Vasut
2019-03-22 12:42 ` Geert Uytterhoeven
2019-03-22 12:49 ` Marek Vasut
2019-03-25 16:54 ` Lorenzo Pieralisi [this message]
2019-03-25 19:44 ` Marek Vasut
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=20190325165439.GA19135@e107981-ln.cambridge.arm.com \
--to=lorenzo.pieralisi@arm.com \
--cc=gaku.inami.xw@bp.renesas.com \
--cc=geert+renesas@glider.be \
--cc=horms+renesas@verge.net.au \
--cc=kaz-ikeda@xc.jp.nec.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=marek.vasut+renesas@gmail.com \
--cc=marek.vasut@gmail.com \
--cc=phil.edworthy@renesas.com \
--cc=wsa@the-dreams.de \
/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).