From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Bjorn Helgaas <helgaas@kernel.org>
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>,
linux-kernel@vger.kernel.org, bhelgaas@google.com,
Heiko Stuebner <heiko@sntech.de>,
linux-pci@vger.kernel.org, shawn.lin@rock-chips.com,
briannorris@chromium.org, dianders@chromium.org,
linux-rockchip@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org,
Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH v5 1/3] PCI: rockchip: Add support for pcie wake irq
Date: Fri, 13 Oct 2017 15:21:41 +0200 [thread overview]
Message-ID: <2453698.N4jfPaHx71@aspire.rjw.lan> (raw)
In-Reply-To: <20171013030441.GA25517@bhelgaas-glaptop.roam.corp.google.com>
[+cc Tony]
On Friday, October 13, 2017 5:04:41 AM CEST Bjorn Helgaas wrote:
> [+cc Rafael, linux-pm]
>
> On Mon, Sep 11, 2017 at 11:10:27PM +0800, Jeffy Chen wrote:
> > Add support for PCIE_WAKE pin in rockchip pcie driver.
> >
> > Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
> > ---
> >
> > Changes in v5:
> > Rebase
> >
> > Changes in v3:
> > Fix error handling
> >
> > Changes in v2:
> > Use dev_pm_set_dedicated_wake_irq
> > -- Suggested by Brian Norris <briannorris@chromium.com>
> >
> > drivers/pci/host/pcie-rockchip.c | 19 +++++++++++++++++--
> > 1 file changed, 17 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/pci/host/pcie-rockchip.c b/drivers/pci/host/pcie-rockchip.c
> > index 9051c6c8fea4..a8b7272597a7 100644
> > --- a/drivers/pci/host/pcie-rockchip.c
> > +++ b/drivers/pci/host/pcie-rockchip.c
> > @@ -37,6 +37,7 @@
> > #include <linux/pci_ids.h>
> > #include <linux/phy/phy.h>
> > #include <linux/platform_device.h>
> > +#include <linux/pm_wakeirq.h>
> > #include <linux/reset.h>
> > #include <linux/regmap.h>
> >
> > @@ -995,6 +996,15 @@ static int rockchip_pcie_setup_irq(struct rockchip_pcie *rockchip)
> > return err;
> > }
> >
> > + /* Must init wakeup before setting dedicated wakeup irq. */
> > + device_init_wakeup(dev, true);
> > + irq = platform_get_irq_byname(pdev, "wakeup");
> > + if (irq >= 0) {
> > + err = dev_pm_set_dedicated_wake_irq(dev, irq);
>
> I'm a little skeptical about dev_pm_set_dedicated_wake_irq(), not
> because I know anything at all about it, but because there are only
> five callers in the whole tree, three of which are in UART code, and
> none in anything resembling PCI code.
>
> Is Rockchip really that special, or are we going about this the wrong
> way?
>
> > + if (err)
> > + dev_err(dev, "failed to setup PCIe wakeup IRQ\n");
> > + }
> > +
> > return 0;
>
> The above could be structured as:
>
> irq = platform_get_irq_byname(pdev, "wakeup");
> if (irq < 0)
> return 0;
>
> device_init_wakeup(dev, true);
> err = dev_pm_set_dedicated_wake_irq(dev, irq);
> if (err) {
> dev_pm_clear_wake_irq(dev);
> device_init_wakeup(dev, false);
> }
>
> return 0;
>
> to unindent the mainline non-error code.
>
> > }
> >
> > @@ -1542,11 +1552,11 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> >
> > err = rockchip_pcie_parse_dt(rockchip);
> > if (err)
> > - return err;
> > + goto err_disable_wake;
> >
> > err = rockchip_pcie_enable_clocks(rockchip);
> > if (err)
> > - return err;
> > + goto err_disable_wake;
> >
> > err = rockchip_pcie_set_vpcie(rockchip);
> > if (err) {
> > @@ -1656,6 +1666,9 @@ static int rockchip_pcie_probe(struct platform_device *pdev)
> > regulator_disable(rockchip->vpcie0v9);
> > err_set_vpcie:
> > rockchip_pcie_disable_clocks(rockchip);
> > +err_disable_wake:
> > + dev_pm_clear_wake_irq(dev);
> > + device_init_wakeup(dev, false);
>
> I think this error cleanup should be done in rockchip_pcie_setup_irq()
> as shown above. There's no real connection between
> rockchip_pcie_probe() and the wake setup.
>
> > return err;
> > }
> >
> > @@ -1682,6 +1695,8 @@ static int rockchip_pcie_remove(struct platform_device *pdev)
> > if (!IS_ERR(rockchip->vpcie0v9))
> > regulator_disable(rockchip->vpcie0v9);
> >
> > + dev_pm_clear_wake_irq(dev);
> > + device_init_wakeup(dev, false);
> > return 0;
> > }
> >
>
next prev parent reply other threads:[~2017-10-13 13:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 15:10 [PATCH v5 0/3] PCI: rockchip: Move PCIE_WAKE handling into rockchip pcie driver Jeffy Chen
2017-09-11 15:10 ` [PATCH v5 1/3] PCI: rockchip: Add support for pcie wake irq Jeffy Chen
2017-10-13 1:56 ` Brian Norris
2017-10-13 2:32 ` Bjorn Helgaas
2017-10-13 6:31 ` Brian Norris
2017-10-13 3:04 ` Bjorn Helgaas
2017-10-13 13:21 ` Rafael J. Wysocki [this message]
2017-10-13 17:58 ` Tony Lindgren
2017-10-13 18:33 ` jeffy
2017-10-13 19:19 ` Bjorn Helgaas
2017-10-13 19:26 ` jeffy
2017-10-13 20:44 ` Brian Norris
2017-09-11 15:10 ` [PATCH v5 2/3] dt-bindings: PCI: Add definition of " Jeffy Chen
2017-09-11 19:24 ` Rob Herring
2017-09-11 15:10 ` [PATCH v5 3/3] arm64: dts: rockchip: Handle pcie wake in pcie driver for Gru Jeffy Chen
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=2453698.N4jfPaHx71@aspire.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=bhelgaas@google.com \
--cc=briannorris@chromium.org \
--cc=dianders@chromium.org \
--cc=heiko@sntech.de \
--cc=helgaas@kernel.org \
--cc=jeffy.chen@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=shawn.lin@rock-chips.com \
--cc=tony@atomide.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
all inboxes | Powered by JetHome®