From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758179AbdJMNbP (ORCPT ); Fri, 13 Oct 2017 09:31:15 -0400 Received: from cloudserver094114.home.net.pl ([79.96.170.134]:50542 "EHLO cloudserver094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753258AbdJMNbN (ORCPT ); Fri, 13 Oct 2017 09:31:13 -0400 From: "Rafael J. Wysocki" To: Bjorn Helgaas Cc: Jeffy Chen , linux-kernel@vger.kernel.org, bhelgaas@google.com, Heiko Stuebner , 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 Subject: Re: [PATCH v5 1/3] PCI: rockchip: Add support for pcie wake irq Date: Fri, 13 Oct 2017 15:21:41 +0200 Message-ID: <2453698.N4jfPaHx71@aspire.rjw.lan> In-Reply-To: <20171013030441.GA25517@bhelgaas-glaptop.roam.corp.google.com> References: <20170911151029.25185-1-jeffy.chen@rock-chips.com> <20170911151029.25185-2-jeffy.chen@rock-chips.com> <20171013030441.GA25517@bhelgaas-glaptop.roam.corp.google.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [+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 > > --- > > > > Changes in v5: > > Rebase > > > > Changes in v3: > > Fix error handling > > > > Changes in v2: > > Use dev_pm_set_dedicated_wake_irq > > -- Suggested by Brian Norris > > > > 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 > > #include > > #include > > +#include > > #include > > #include > > > > @@ -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; > > } > > >