All of lore.kernel.org
 help / color / mirror / Atom feed
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Gregory Clement <gregory.clement@bootlin.com>,
	Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Bjorn Helgaas <bhelgaas@google.com>
Cc: <devicetree@vger.kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	linux-pci@vger.kernel.org, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	Antoine Tenart <antoine.tenart@bootlin.com>,
	Maxime Chevallier <maxime.chevallier@bootlin.com>,
	Nadav Haklai <nadavh@marvell.com>,
	Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH 05/12] PCI: aardvark: add suspend to RAM support
Date: Fri, 23 Nov 2018 15:18:24 +0100	[thread overview]
Message-ID: <20181123141831.8214-6-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20181123141831.8214-1-miquel.raynal@bootlin.com>

Add suspend and resume callbacks. The priority of these are
"_noirq()", to workaround early access to the registers done by the
PCI core through the ->read()/->write() callbacks at resume time.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/pci/controller/pci-aardvark.c | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 108b3f15c410..7ecf1ac4036b 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1108,6 +1108,55 @@ static int advk_pcie_setup_clk(struct advk_pcie *pcie)
 	return ret;
 }
 
+static int __maybe_unused advk_pcie_suspend(struct device *dev)
+{
+	struct advk_pcie *pcie = dev_get_drvdata(dev);
+
+	advk_pcie_disable_phy(pcie);
+
+	clk_disable_unprepare(pcie->clk);
+
+	return 0;
+}
+
+static int __maybe_unused advk_pcie_resume(struct device *dev)
+{
+	struct advk_pcie *pcie = dev_get_drvdata(dev);
+	int ret;
+
+	ret = clk_prepare_enable(pcie->clk);
+	if (ret)
+		return ret;
+
+	/*
+	 * Empirical delay needed after enabling the clock and before
+	 * accessing any register.
+	 */
+	msleep(10);
+
+	ret = advk_pcie_enable_phy(pcie);
+	if (ret)
+		return ret;
+
+	advk_pcie_hard_reset(pcie);
+
+	advk_pcie_setup_hw(pcie);
+
+	advk_sw_pci_bridge_init(pcie);
+
+	return 0;
+}
+
+/*
+ * The PCI core will try to reconfigure the bus quite early in the resume path.
+ * We must use the _noirq() alternatives to ensure the controller is ready when
+ * the core uses the ->read()/->write() callbacks.
+ */
+static const struct dev_pm_ops advk_pcie_dev_pm_ops = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(advk_pcie_suspend,
+				      advk_pcie_resume)
+};
+
 static int advk_pcie_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -1188,6 +1237,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	dev_set_drvdata(dev, pcie);
+
 	return 0;
 }
 
@@ -1200,6 +1251,7 @@ static struct platform_driver advk_pcie_driver = {
 	.driver = {
 		.name = "advk-pcie",
 		.of_match_table = advk_pcie_of_match_table,
+		.pm = &advk_pcie_dev_pm_ops,
 		/* Driver unloading/unbinding currently not supported */
 		.suppress_bind_attrs = true,
 	},
-- 
2.19.1


WARNING: multiple messages have this Message-ID (diff)
From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Gregory Clement <gregory.clement@bootlin.com>,
	Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
	Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Bjorn Helgaas <bhelgaas@google.com>
Cc: devicetree@vger.kernel.org, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Antoine Tenart <antoine.tenart@bootlin.com>,
	Maxime Chevallier <maxime.chevallier@bootlin.com>,
	Nadav Haklai <nadavh@marvell.com>,
	Miquel Raynal <miquel.raynal@bootlin.com>
Subject: [PATCH 05/12] PCI: aardvark: add suspend to RAM support
Date: Fri, 23 Nov 2018 15:18:24 +0100	[thread overview]
Message-ID: <20181123141831.8214-6-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20181123141831.8214-1-miquel.raynal@bootlin.com>

Add suspend and resume callbacks. The priority of these are
"_noirq()", to workaround early access to the registers done by the
PCI core through the ->read()/->write() callbacks at resume time.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/pci/controller/pci-aardvark.c | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 108b3f15c410..7ecf1ac4036b 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1108,6 +1108,55 @@ static int advk_pcie_setup_clk(struct advk_pcie *pcie)
 	return ret;
 }
 
+static int __maybe_unused advk_pcie_suspend(struct device *dev)
+{
+	struct advk_pcie *pcie = dev_get_drvdata(dev);
+
+	advk_pcie_disable_phy(pcie);
+
+	clk_disable_unprepare(pcie->clk);
+
+	return 0;
+}
+
+static int __maybe_unused advk_pcie_resume(struct device *dev)
+{
+	struct advk_pcie *pcie = dev_get_drvdata(dev);
+	int ret;
+
+	ret = clk_prepare_enable(pcie->clk);
+	if (ret)
+		return ret;
+
+	/*
+	 * Empirical delay needed after enabling the clock and before
+	 * accessing any register.
+	 */
+	msleep(10);
+
+	ret = advk_pcie_enable_phy(pcie);
+	if (ret)
+		return ret;
+
+	advk_pcie_hard_reset(pcie);
+
+	advk_pcie_setup_hw(pcie);
+
+	advk_sw_pci_bridge_init(pcie);
+
+	return 0;
+}
+
+/*
+ * The PCI core will try to reconfigure the bus quite early in the resume path.
+ * We must use the _noirq() alternatives to ensure the controller is ready when
+ * the core uses the ->read()/->write() callbacks.
+ */
+static const struct dev_pm_ops advk_pcie_dev_pm_ops = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(advk_pcie_suspend,
+				      advk_pcie_resume)
+};
+
 static int advk_pcie_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -1188,6 +1237,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	dev_set_drvdata(dev, pcie);
+
 	return 0;
 }
 
@@ -1200,6 +1251,7 @@ static struct platform_driver advk_pcie_driver = {
 	.driver = {
 		.name = "advk-pcie",
 		.of_match_table = advk_pcie_of_match_table,
+		.pm = &advk_pcie_dev_pm_ops,
 		/* Driver unloading/unbinding currently not supported */
 		.suppress_bind_attrs = true,
 	},
-- 
2.19.1

WARNING: multiple messages have this Message-ID (diff)
From: miquel.raynal@bootlin.com (Miquel Raynal)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/12] PCI: aardvark: add suspend to RAM support
Date: Fri, 23 Nov 2018 15:18:24 +0100	[thread overview]
Message-ID: <20181123141831.8214-6-miquel.raynal@bootlin.com> (raw)
In-Reply-To: <20181123141831.8214-1-miquel.raynal@bootlin.com>

Add suspend and resume callbacks. The priority of these are
"_noirq()", to workaround early access to the registers done by the
PCI core through the ->read()/->write() callbacks at resume time.

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
---
 drivers/pci/controller/pci-aardvark.c | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
index 108b3f15c410..7ecf1ac4036b 100644
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -1108,6 +1108,55 @@ static int advk_pcie_setup_clk(struct advk_pcie *pcie)
 	return ret;
 }
 
+static int __maybe_unused advk_pcie_suspend(struct device *dev)
+{
+	struct advk_pcie *pcie = dev_get_drvdata(dev);
+
+	advk_pcie_disable_phy(pcie);
+
+	clk_disable_unprepare(pcie->clk);
+
+	return 0;
+}
+
+static int __maybe_unused advk_pcie_resume(struct device *dev)
+{
+	struct advk_pcie *pcie = dev_get_drvdata(dev);
+	int ret;
+
+	ret = clk_prepare_enable(pcie->clk);
+	if (ret)
+		return ret;
+
+	/*
+	 * Empirical delay needed after enabling the clock and before
+	 * accessing any register.
+	 */
+	msleep(10);
+
+	ret = advk_pcie_enable_phy(pcie);
+	if (ret)
+		return ret;
+
+	advk_pcie_hard_reset(pcie);
+
+	advk_pcie_setup_hw(pcie);
+
+	advk_sw_pci_bridge_init(pcie);
+
+	return 0;
+}
+
+/*
+ * The PCI core will try to reconfigure the bus quite early in the resume path.
+ * We must use the _noirq() alternatives to ensure the controller is ready when
+ * the core uses the ->read()/->write() callbacks.
+ */
+static const struct dev_pm_ops advk_pcie_dev_pm_ops = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(advk_pcie_suspend,
+				      advk_pcie_resume)
+};
+
 static int advk_pcie_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -1188,6 +1237,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	dev_set_drvdata(dev, pcie);
+
 	return 0;
 }
 
@@ -1200,6 +1251,7 @@ static struct platform_driver advk_pcie_driver = {
 	.driver = {
 		.name = "advk-pcie",
 		.of_match_table = advk_pcie_of_match_table,
+		.pm = &advk_pcie_dev_pm_ops,
 		/* Driver unloading/unbinding currently not supported */
 		.suppress_bind_attrs = true,
 	},
-- 
2.19.1

  parent reply	other threads:[~2018-11-23 14:19 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-23 14:18 [PATCH 00/12] Bring suspend to RAM support to PCIe Aardvark driver Miquel Raynal
2018-11-23 14:18 ` Miquel Raynal
2018-11-23 14:18 ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 01/12] PCI: aardvark: configure more registers in the configuration helper Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 02/12] PCI: aardvark: add reset GPIO support Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 03/12] PCI: aardvark: add PHY support Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 04/12] PCI: aardvark: add clock support Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` Miquel Raynal [this message]
2018-11-23 14:18   ` [PATCH 05/12] PCI: aardvark: add suspend to RAM support Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-12-03 10:27   ` Lorenzo Pieralisi
2018-12-03 10:27     ` Lorenzo Pieralisi
2018-12-03 15:38     ` Miquel Raynal
2018-12-03 15:38       ` Miquel Raynal
2018-12-03 17:18       ` Lorenzo Pieralisi
2018-12-03 17:18         ` Lorenzo Pieralisi
2018-12-03 19:19         ` Stephen Boyd
2018-12-03 19:19           ` Stephen Boyd
2018-12-03 22:00       ` Rafael J. Wysocki
2018-12-03 22:00         ` Rafael J. Wysocki
2018-12-03 22:18         ` Miquel Raynal
2018-12-03 22:18           ` Miquel Raynal
2018-12-04  9:45         ` Lorenzo Pieralisi
2018-12-04  9:45           ` Lorenzo Pieralisi
2018-12-04 21:42           ` Rafael J. Wysocki
2018-12-04 21:42             ` Rafael J. Wysocki
2018-12-05 11:00             ` Lorenzo Pieralisi
2018-12-05 11:00               ` Lorenzo Pieralisi
2018-12-11 14:16             ` Lorenzo Pieralisi
2018-12-11 14:16               ` Lorenzo Pieralisi
2018-12-13  9:00               ` Stephen Boyd
2018-12-13  9:00                 ` Stephen Boyd
2018-12-13 10:53                 ` Lorenzo Pieralisi
2018-12-13 10:53                   ` Lorenzo Pieralisi
2018-12-13 14:30                   ` Miquel Raynal
2018-12-13 14:30                     ` Miquel Raynal
2018-12-13 14:52                     ` Lorenzo Pieralisi
2018-12-13 14:52                       ` Lorenzo Pieralisi
2018-12-13 21:50                     ` Rafael J. Wysocki
2018-12-13 21:50                       ` Rafael J. Wysocki
2018-12-17 14:54                       ` Miquel Raynal
2018-12-17 14:54                         ` Miquel Raynal
2018-12-18 10:54                         ` Rafael J. Wysocki
2018-12-18 10:54                           ` Rafael J. Wysocki
2018-12-18 14:14                           ` Miquel Raynal
2018-12-18 14:14                             ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 06/12] dt-bindings: PCI: aardvark: describe the reset-gpios property Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-12-11 21:44   ` Rob Herring
2018-12-11 21:44     ` Rob Herring
2018-12-11 21:44     ` Rob Herring
2018-11-23 14:18 ` [PATCH 07/12] dt-bindings: PCI: aardvark: describe the clocks property Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-12-11 21:44   ` Rob Herring
2018-12-11 21:44     ` Rob Herring
2018-12-11 21:44     ` Rob Herring
2018-11-23 14:18 ` [PATCH 08/12] dt-bindings: PCI: aardvark: describe the PHY property Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-12-11 21:44   ` Rob Herring
2018-12-11 21:44     ` Rob Herring
2018-12-11 21:44     ` Rob Herring
2018-11-23 14:18 ` [PATCH 09/12] ARM64: dts: marvell: armada-37xx: declare PCIe reset pin Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 10/12] ARM64: dts: marvell: armada-3720-espressobin: declare PCIe reset GPIO Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 11/12] ARM64: dts: marvell: armada-37xx: declare PCIe clock Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18 ` [PATCH 12/12] ARM64: dts: marvell: armada-3720-espressobin: declare PCIe PHY Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-23 14:18   ` Miquel Raynal
2018-11-26 14:50 ` [PATCH 00/12] Bring suspend to RAM support to PCIe Aardvark driver Bjorn Helgaas
2018-11-26 14:50   ` Bjorn Helgaas
2018-11-30 13:12   ` Miquel Raynal
2018-11-30 13:12     ` Miquel Raynal

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=20181123141831.8214-6-miquel.raynal@bootlin.com \
    --to=miquel.raynal@bootlin.com \
    --cc=andrew@lunn.ch \
    --cc=antoine.tenart@bootlin.com \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=gregory.clement@bootlin.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=maxime.chevallier@bootlin.com \
    --cc=nadavh@marvell.com \
    --cc=robh+dt@kernel.org \
    --cc=sebastian.hesselbarth@gmail.com \
    --cc=thomas.petazzoni@bootlin.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.