From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757800AbdJMB41 (ORCPT ); Thu, 12 Oct 2017 21:56:27 -0400 Received: from mail-pf0-f175.google.com ([209.85.192.175]:53593 "EHLO mail-pf0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757680AbdJMB4Z (ORCPT ); Thu, 12 Oct 2017 21:56:25 -0400 X-Google-Smtp-Source: AOwi7QDIfWZdj7YP6JAMQOazuT/kNPXl5Xb1n1jNp1GtXG+NYvw5fa6BbHxrKt5+WALyFJqrKFuQkw== Date: Thu, 12 Oct 2017 18:56:22 -0700 From: Brian Norris To: Jeffy Chen Cc: linux-kernel@vger.kernel.org, bhelgaas@google.com, shawn.lin@rock-chips.com, dianders@chromium.org, Heiko Stuebner , linux-pci@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v5 1/3] PCI: rockchip: Add support for pcie wake irq Message-ID: <20171013015620.GA94568@google.com> References: <20170911151029.25185-1-jeffy.chen@rock-chips.com> <20170911151029.25185-2-jeffy.chen@rock-chips.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170911151029.25185-2-jeffy.chen@rock-chips.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi, 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); Am I crazy, or should this go inside the 'irq >= 0' conditional? Otherwise, for the whole series: Reviewed-by: Brian Norris Tested-by: Brian Norris Bjorn, were you planning to pick this up? Also, the DT binding change conflicts (just simple context) with the PERST# series I just sent out. Would be good if we could land one or both :) Thanks, Brian > + irq = platform_get_irq_byname(pdev, "wakeup"); > + if (irq >= 0) { > + err = dev_pm_set_dedicated_wake_irq(dev, irq); > + if (err) > + dev_err(dev, "failed to setup PCIe wakeup IRQ\n"); > + } > + > return 0; > } > > @@ -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); > 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; > } > > -- > 2.11.0 > >