| Message ID | 1504847694-23701-1-git-send-email-j-keerthy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Fri, Sep 08, 2017 at 10:44:54AM +0530, Keerthy wrote: > Add shutdown handler to cleanly turn off clocks. This will help > in cases of kexec where in a new kernel can boot abruptly. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > > Changes in v3: > > * Pushed the function outside #ifdef CONFIG_PM_SLEEP. > * Added more details to commit log. > > Changes in v2: > > * used a local dev pointer instead of dereferencing dev at multiple places. > * dra7xx_pcie_stop_link before disabling clks in the shutdown path. You lost both these changes in v3. I assume you'll post a v4. > drivers/pci/dwc/pci-dra7xx.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c > index 0f9adf2..ec8f842 100644 > --- a/drivers/pci/dwc/pci-dra7xx.c > +++ b/drivers/pci/dwc/pci-dra7xx.c > @@ -794,6 +794,19 @@ static int dra7xx_pcie_resume_noirq(struct device *dev) > } > #endif > > +void dra7xx_pcie_shutdown(struct platform_device *pdev) > +{ > + struct dra7xx_pcie *dra7xx = dev_get_drvdata(&pdev->dev); > + int ret; > + > + ret = pm_runtime_put_sync(&pdev->dev); > + if (ret < 0) > + dev_dbg(&pdev->dev, "pm_runtime_put_sync failed\n"); > + > + pm_runtime_disable(&pdev->dev); > + dra7xx_pcie_disable_phy(dra7xx); > +} > + > static const struct dev_pm_ops dra7xx_pcie_pm_ops = { > SET_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume) > SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq, > @@ -807,5 +820,6 @@ static int dra7xx_pcie_resume_noirq(struct device *dev) > .suppress_bind_attrs = true, > .pm = &dra7xx_pcie_pm_ops, > }, > + .shutdown = dra7xx_pcie_shutdown, > }; > builtin_platform_driver_probe(dra7xx_pcie_driver, dra7xx_pcie_probe); > -- > 1.9.1 >
On Wednesday 20 September 2017 01:00 AM, Bjorn Helgaas wrote: > On Fri, Sep 08, 2017 at 10:44:54AM +0530, Keerthy wrote: >> Add shutdown handler to cleanly turn off clocks. This will help >> in cases of kexec where in a new kernel can boot abruptly. >> >> Signed-off-by: Keerthy <j-keerthy@ti.com> >> Acked-by: Kishon Vijay Abraham I <kishon@ti.com> >> --- >> >> Changes in v3: >> >> * Pushed the function outside #ifdef CONFIG_PM_SLEEP. >> * Added more details to commit log. >> >> Changes in v2: >> >> * used a local dev pointer instead of dereferencing dev at multiple places. >> * dra7xx_pcie_stop_link before disabling clks in the shutdown path. > > You lost both these changes in v3. I assume you'll post a v4. Thanks Bjorn for catching this! Sent v4 with the corrections. https://patchwork.ozlabs.org/patch/816010/ Regards, Keerthy > >> drivers/pci/dwc/pci-dra7xx.c | 14 ++++++++++++++ >> 1 file changed, 14 insertions(+) >> >> diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c >> index 0f9adf2..ec8f842 100644 >> --- a/drivers/pci/dwc/pci-dra7xx.c >> +++ b/drivers/pci/dwc/pci-dra7xx.c >> @@ -794,6 +794,19 @@ static int dra7xx_pcie_resume_noirq(struct device *dev) >> } >> #endif >> >> +void dra7xx_pcie_shutdown(struct platform_device *pdev) >> +{ >> + struct dra7xx_pcie *dra7xx = dev_get_drvdata(&pdev->dev); >> + int ret; >> + >> + ret = pm_runtime_put_sync(&pdev->dev); >> + if (ret < 0) >> + dev_dbg(&pdev->dev, "pm_runtime_put_sync failed\n"); >> + >> + pm_runtime_disable(&pdev->dev); >> + dra7xx_pcie_disable_phy(dra7xx); >> +} >> + >> static const struct dev_pm_ops dra7xx_pcie_pm_ops = { >> SET_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume) >> SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq, >> @@ -807,5 +820,6 @@ static int dra7xx_pcie_resume_noirq(struct device *dev) >> .suppress_bind_attrs = true, >> .pm = &dra7xx_pcie_pm_ops, >> }, >> + .shutdown = dra7xx_pcie_shutdown, >> }; >> builtin_platform_driver_probe(dra7xx_pcie_driver, dra7xx_pcie_probe); >> -- >> 1.9.1 >>
diff --git a/drivers/pci/dwc/pci-dra7xx.c b/drivers/pci/dwc/pci-dra7xx.c index 0f9adf2..ec8f842 100644 --- a/drivers/pci/dwc/pci-dra7xx.c +++ b/drivers/pci/dwc/pci-dra7xx.c @@ -794,6 +794,19 @@ static int dra7xx_pcie_resume_noirq(struct device *dev) } #endif +void dra7xx_pcie_shutdown(struct platform_device *pdev) +{ + struct dra7xx_pcie *dra7xx = dev_get_drvdata(&pdev->dev); + int ret; + + ret = pm_runtime_put_sync(&pdev->dev); + if (ret < 0) + dev_dbg(&pdev->dev, "pm_runtime_put_sync failed\n"); + + pm_runtime_disable(&pdev->dev); + dra7xx_pcie_disable_phy(dra7xx); +} + static const struct dev_pm_ops dra7xx_pcie_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend, dra7xx_pcie_resume) SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(dra7xx_pcie_suspend_noirq, @@ -807,5 +820,6 @@ static int dra7xx_pcie_resume_noirq(struct device *dev) .suppress_bind_attrs = true, .pm = &dra7xx_pcie_pm_ops, }, + .shutdown = dra7xx_pcie_shutdown, }; builtin_platform_driver_probe(dra7xx_pcie_driver, dra7xx_pcie_probe);