LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v3] PCI: mediatek: Add system pm support for MT2712
@ 2018-06-01  3:04 honghui.zhang
  2018-06-01 10:17 ` Andy Shevchenko
  0 siblings, 1 reply; 5+ messages in thread
From: honghui.zhang @ 2018-06-01  3:04 UTC (permalink / raw)
  To: lorenzo.pieralisi, marc.zyngier, bhelgaas, matthias.bgg,
	linux-arm-kernel, linux-mediatek, linux-pci, linux-kernel,
	devicetree, yingjoe.chen, eddie.huang, ryder.lee
  Cc: honghui.zhang, hongkun.cao, youlin.pei, yong.wu, yt.shen,
	sean.wang, xinping.qian

From: Honghui Zhang <honghui.zhang@mediatek.com>

The MTCMOS of PCIe Host for MT2712 will be off when system suspend, and all
the internal control register will be reset after system resume. The PCIe
link should be re-established and the related control register values
should be re-set after system resume.

Signed-off-by: Honghui Zhang <honghui.zhang@mediatek.com>
CC: Ryder Lee <ryder.lee@mediatek.com>
---
 drivers/pci/host/pcie-mediatek.c | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/drivers/pci/host/pcie-mediatek.c b/drivers/pci/host/pcie-mediatek.c
index dabf1086..5363cc7 100644
--- a/drivers/pci/host/pcie-mediatek.c
+++ b/drivers/pci/host/pcie-mediatek.c
@@ -132,12 +132,14 @@ struct mtk_pcie_port;
 /**
  * struct mtk_pcie_soc - differentiate between host generations
  * @need_fix_class_id: whether this host's class ID needed to be fixed or not
+ * @pm_support: whether the host's MTCMOS will be off when suspend
  * @ops: pointer to configuration access functions
  * @startup: pointer to controller setting functions
  * @setup_irq: pointer to initialize IRQ functions
  */
 struct mtk_pcie_soc {
 	bool need_fix_class_id;
+	bool pm_support;
 	struct pci_ops *ops;
 	int (*startup)(struct mtk_pcie_port *port);
 	int (*setup_irq)(struct mtk_pcie_port *port, struct device_node *node);
@@ -1179,12 +1181,69 @@ static int mtk_pcie_probe(struct platform_device *pdev)
 	return err;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int mtk_pcie_suspend_noirq(struct device *dev)
+{
+	struct mtk_pcie *pcie = dev_get_drvdata(dev);
+	const struct mtk_pcie_soc *soc = pcie->soc;
+	struct mtk_pcie_port *port;
+
+	if (!soc->pm_support)
+		return 0;
+
+	list_for_each_entry(port, &pcie->ports, list) {
+		clk_disable_unprepare(port->ahb_ck);
+		clk_disable_unprepare(port->sys_ck);
+		phy_power_off(port->phy);
+	}
+
+	return 0;
+}
+
+static int mtk_pcie_resume_noirq(struct device *dev)
+{
+	struct mtk_pcie *pcie = dev_get_drvdata(dev);
+	const struct mtk_pcie_soc *soc = pcie->soc;
+	struct mtk_pcie_port *port;
+	int ret;
+
+	if (!soc->pm_support)
+		return 0;
+
+	list_for_each_entry(port, &pcie->ports, list) {
+		phy_power_on(port->phy);
+		clk_prepare_enable(port->sys_ck);
+		clk_prepare_enable(port->ahb_ck);
+
+		ret = soc->startup(port);
+		if (ret) {
+			dev_err(dev, "Port%d link down\n", port->slot);
+			phy_power_off(port->phy);
+			clk_disable_unprepare(port->sys_ck);
+			clk_disable_unprepare(port->ahb_ck);
+			return ret;
+		}
+
+		if (IS_ENABLED(CONFIG_PCI_MSI))
+			mtk_pcie_enable_msi(port);
+	}
+
+	return 0;
+}
+#endif
+
+static const struct dev_pm_ops mtk_pcie_pm_ops = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_pcie_suspend_noirq,
+				      mtk_pcie_resume_noirq)
+};
+
 static const struct mtk_pcie_soc mtk_pcie_soc_v1 = {
 	.ops = &mtk_pcie_ops,
 	.startup = mtk_pcie_startup_port,
 };
 
 static const struct mtk_pcie_soc mtk_pcie_soc_mt2712 = {
+	.pm_support = true,
 	.ops = &mtk_pcie_ops_v2,
 	.startup = mtk_pcie_startup_port_v2,
 	.setup_irq = mtk_pcie_setup_irq,
@@ -1211,6 +1270,7 @@ static struct platform_driver mtk_pcie_driver = {
 		.name = "mtk-pcie",
 		.of_match_table = mtk_pcie_ids,
 		.suppress_bind_attrs = true,
+		.pm = &mtk_pcie_pm_ops,
 	},
 };
 builtin_platform_driver(mtk_pcie_driver);
-- 
2.6.4

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3] PCI: mediatek: Add system pm support for MT2712
  2018-06-01  3:04 [PATCH v3] PCI: mediatek: Add system pm support for MT2712 honghui.zhang
@ 2018-06-01 10:17 ` Andy Shevchenko
  2018-06-01 10:49   ` Honghui Zhang
  0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2018-06-01 10:17 UTC (permalink / raw)
  To: honghui.zhang, Arnd Bergmann
  Cc: Lorenzo Pieralisi, Marc Zyngier, Bjorn Helgaas, Matthias Brugger,
	linux-arm Mailing List, moderated list:ARM/Mediatek SoC support,
	linux-pci, Linux Kernel Mailing List, devicetree, yingjoe.chen,
	Eddie Huang, ryder.lee, hongkun.cao, youlin.pei, yong.wu,
	yt.shen, sean.wang, xinping.qian

On Fri, Jun 1, 2018 at 6:04 AM,  <honghui.zhang@mediatek.com> wrote:
> From: Honghui Zhang <honghui.zhang@mediatek.com>

> +#ifdef CONFIG_PM_SLEEP
> +static int mtk_pcie_suspend_noirq(struct device *dev)

__maybe_unused

-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3] PCI: mediatek: Add system pm support for MT2712
  2018-06-01 10:17 ` Andy Shevchenko
@ 2018-06-01 10:49   ` Honghui Zhang
  2018-06-01 10:52     ` Andy Shevchenko
  0 siblings, 1 reply; 5+ messages in thread
From: Honghui Zhang @ 2018-06-01 10:49 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: Arnd Bergmann, Lorenzo Pieralisi, Marc Zyngier, Bjorn Helgaas,
	Matthias Brugger, linux-arm Mailing List,
	moderated list:ARM/Mediatek SoC support, linux-pci,
	Linux Kernel Mailing List, devicetree, yingjoe.chen, Eddie Huang,
	ryder.lee, hongkun.cao, youlin.pei, yong.wu, yt.shen, sean.wang,
	xinping.qian

On Fri, 2018-06-01 at 13:17 +0300, Andy Shevchenko wrote:
> On Fri, Jun 1, 2018 at 6:04 AM,  <honghui.zhang@mediatek.com> wrote:
> > From: Honghui Zhang <honghui.zhang@mediatek.com>
> 
> > +#ifdef CONFIG_PM_SLEEP
> > +static int mtk_pcie_suspend_noirq(struct device *dev)
> 
> __maybe_unused
> 

Hi, Andy, thanks for your review.
Bjorn had point this out that at:
https://www.spinics.net/lists/arm-kernel/msg656774.html

So __maybe_unused is not really needed.

thanks

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3] PCI: mediatek: Add system pm support for MT2712
  2018-06-01 10:49   ` Honghui Zhang
@ 2018-06-01 10:52     ` Andy Shevchenko
  2018-06-15  2:47       ` Honghui Zhang
  0 siblings, 1 reply; 5+ messages in thread
From: Andy Shevchenko @ 2018-06-01 10:52 UTC (permalink / raw)
  To: Honghui Zhang
  Cc: Arnd Bergmann, Lorenzo Pieralisi, Marc Zyngier, Bjorn Helgaas,
	Matthias Brugger, linux-arm Mailing List,
	moderated list:ARM/Mediatek SoC support, linux-pci,
	Linux Kernel Mailing List, devicetree, yingjoe.chen, Eddie Huang,
	ryder.lee, hongkun.cao, youlin.pei, yong.wu, yt.shen, sean.wang,
	xinping.qian

On Fri, Jun 1, 2018 at 1:49 PM, Honghui Zhang
<honghui.zhang@mediatek.com> wrote:
> On Fri, 2018-06-01 at 13:17 +0300, Andy Shevchenko wrote:
>> On Fri, Jun 1, 2018 at 6:04 AM,  <honghui.zhang@mediatek.com> wrote:
>> > From: Honghui Zhang <honghui.zhang@mediatek.com>
>>
>> > +#ifdef CONFIG_PM_SLEEP
>> > +static int mtk_pcie_suspend_noirq(struct device *dev)
>>
>> __maybe_unused
>>
>
> Hi, Andy, thanks for your review.
> Bjorn had point this out that at:
> https://www.spinics.net/lists/arm-kernel/msg656774.html

Nice, one more maintainer with strong opinion here.

Arnd, that's what I mentioned as a split in opinions earlier.
Any new developer or even existing contributor would be now really
confusing since maintainers asked for two different approaches on the
same matter.

-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH v3] PCI: mediatek: Add system pm support for MT2712
  2018-06-01 10:52     ` Andy Shevchenko
@ 2018-06-15  2:47       ` Honghui Zhang
  0 siblings, 0 replies; 5+ messages in thread
From: Honghui Zhang @ 2018-06-15  2:47 UTC (permalink / raw)
  To: Andy Shevchenko
  Cc: Arnd Bergmann, Lorenzo Pieralisi, Marc Zyngier, Bjorn Helgaas,
	Matthias Brugger, linux-arm Mailing List,
	moderated list:ARM/Mediatek SoC support, linux-pci,
	Linux Kernel Mailing List, devicetree, yingjoe.chen, Eddie Huang,
	ryder.lee, hongkun.cao, youlin.pei, yong.wu, yt.shen, sean.wang,
	xinping.qian

On Fri, 2018-06-01 at 13:52 +0300, Andy Shevchenko wrote:
> On Fri, Jun 1, 2018 at 1:49 PM, Honghui Zhang
> <honghui.zhang@mediatek.com> wrote:
> > On Fri, 2018-06-01 at 13:17 +0300, Andy Shevchenko wrote:
> >> On Fri, Jun 1, 2018 at 6:04 AM,  <honghui.zhang@mediatek.com> wrote:
> >> > From: Honghui Zhang <honghui.zhang@mediatek.com>
> >>
> >> > +#ifdef CONFIG_PM_SLEEP
> >> > +static int mtk_pcie_suspend_noirq(struct device *dev)
> >>
> >> __maybe_unused
> >>
> >
> > Hi, Andy, thanks for your review.
> > Bjorn had point this out that at:
> > https://www.spinics.net/lists/arm-kernel/msg656774.html
> 
> Nice, one more maintainer with strong opinion here.
> 
> Arnd, that's what I mentioned as a split in opinions earlier.
> Any new developer or even existing contributor would be now really
> confusing since maintainers asked for two different approaches on the
> same matter.
> 

Hi, Arnd, Do you have any comments about this patch? Sorry I missed the
previous discussion about which should be used for this approach.

thanks.


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2018-06-15  2:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-01  3:04 [PATCH v3] PCI: mediatek: Add system pm support for MT2712 honghui.zhang
2018-06-01 10:17 ` Andy Shevchenko
2018-06-01 10:49   ` Honghui Zhang
2018-06-01 10:52     ` Andy Shevchenko
2018-06-15  2:47       ` Honghui Zhang

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).