[v2] PCI: qcom: add runtime pm support to pcie_port

Message ID 20180523104425.6650-1-srinivas.kandagatla@linaro.org
State New
Headers show
Series
  • [v2] PCI: qcom: add runtime pm support to pcie_port
Related show

Commit Message

Srinivas Kandagatla May 23, 2018, 10:44 a.m.
This patch is required when the pcie controller sits on a bus with
its own power domain and clocks which are controlled via a bus driver
like simple pm bus. As these bus driver have runtime pm enabled, it makes
sense to update the usage counter so that the runtime pm does not suspend
the clks or power domain associated with the bus driver.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

---
 drivers/pci/dwc/pcie-qcom.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

-- 
2.16.2

Comments

Vinod Koul May 23, 2018, 1:36 p.m. | #1
On 23-05-18, 11:44, Srinivas Kandagatla wrote:
> This patch is required when the pcie controller sits on a bus with

> its own power domain and clocks which are controlled via a bus driver

> like simple pm bus. As these bus driver have runtime pm enabled, it makes

> sense to update the usage counter so that the runtime pm does not suspend

> the clks or power domain associated with the bus driver.


FWIW:

Reviewed-by: Vinod Koul <vkoul@kernel.org>


-- 
~Vinod
Stanimir Varbanov May 23, 2018, 1:54 p.m. | #2
Hi Srini,

On 05/23/2018 01:44 PM, Srinivas Kandagatla wrote:
> This patch is required when the pcie controller sits on a bus with

> its own power domain and clocks which are controlled via a bus driver

> like simple pm bus. As these bus driver have runtime pm enabled, it makes

> sense to update the usage counter so that the runtime pm does not suspend

> the clks or power domain associated with the bus driver.

> 

> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---

>  drivers/pci/dwc/pcie-qcom.c | 9 ++++++++-

>  1 file changed, 8 insertions(+), 1 deletion(-)


Acked-by: Stanimir Varbanov <svarbanov@mm-sol.com>


-- 
regards,
Stan
Lorenzo Pieralisi May 23, 2018, 3:49 p.m. | #3
On Wed, May 23, 2018 at 11:44:25AM +0100, Srinivas Kandagatla wrote:
> This patch is required when the pcie controller sits on a bus with

> its own power domain and clocks which are controlled via a bus driver

> like simple pm bus. As these bus driver have runtime pm enabled, it makes

> sense to update the usage counter so that the runtime pm does not suspend

> the clks or power domain associated with the bus driver.

> 

> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---

>  drivers/pci/dwc/pcie-qcom.c | 9 ++++++++-

>  1 file changed, 8 insertions(+), 1 deletion(-)


Applied to pci/dwc for v4.18, thanks.

Lorenzo

> diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c

> index 5897af7d3355..d6ed5aeeae9c 100644

> --- a/drivers/pci/dwc/pcie-qcom.c

> +++ b/drivers/pci/dwc/pcie-qcom.c

> @@ -19,6 +19,7 @@

>  #include <linux/of_device.h>

>  #include <linux/of_gpio.h>

>  #include <linux/pci.h>

> +#include <linux/pm_runtime.h>

>  #include <linux/platform_device.h>

>  #include <linux/phy/phy.h>

>  #include <linux/regulator/consumer.h>

> @@ -1088,6 +1089,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp)

>  	struct qcom_pcie *pcie = to_qcom_pcie(pci);

>  	int ret;

>  

> +	pm_runtime_get_sync(pci->dev);

>  	qcom_ep_reset_assert(pcie);

>  

>  	ret = pcie->ops->init(pcie);

> @@ -1124,6 +1126,7 @@ static int qcom_pcie_host_init(struct pcie_port *pp)

>  	phy_power_off(pcie->phy);

>  err_deinit:

>  	pcie->ops->deinit(pcie);

> +	pm_runtime_put(pci->dev);

>  

>  	return ret;

>  }

> @@ -1212,6 +1215,7 @@ static int qcom_pcie_probe(struct platform_device *pdev)

>  	if (!pci)

>  		return -ENOMEM;

>  

> +	pm_runtime_enable(dev);

>  	pci->dev = dev;

>  	pci->ops = &dw_pcie_ops;

>  	pp = &pci->pp;

> @@ -1257,14 +1261,17 @@ static int qcom_pcie_probe(struct platform_device *pdev)

>  	}

>  

>  	ret = phy_init(pcie->phy);

> -	if (ret)

> +	if (ret) {

> +		pm_runtime_disable(&pdev->dev);

>  		return ret;

> +	}

>  

>  	platform_set_drvdata(pdev, pcie);

>  

>  	ret = dw_pcie_host_init(pp);

>  	if (ret) {

>  		dev_err(dev, "cannot initialize host\n");

> +		pm_runtime_disable(&pdev->dev);

>  		return ret;

>  	}

>  

> -- 

> 2.16.2

>

Patch

diff --git a/drivers/pci/dwc/pcie-qcom.c b/drivers/pci/dwc/pcie-qcom.c
index 5897af7d3355..d6ed5aeeae9c 100644
--- a/drivers/pci/dwc/pcie-qcom.c
+++ b/drivers/pci/dwc/pcie-qcom.c
@@ -19,6 +19,7 @@ 
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/pci.h>
+#include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
 #include <linux/regulator/consumer.h>
@@ -1088,6 +1089,7 @@  static int qcom_pcie_host_init(struct pcie_port *pp)
 	struct qcom_pcie *pcie = to_qcom_pcie(pci);
 	int ret;
 
+	pm_runtime_get_sync(pci->dev);
 	qcom_ep_reset_assert(pcie);
 
 	ret = pcie->ops->init(pcie);
@@ -1124,6 +1126,7 @@  static int qcom_pcie_host_init(struct pcie_port *pp)
 	phy_power_off(pcie->phy);
 err_deinit:
 	pcie->ops->deinit(pcie);
+	pm_runtime_put(pci->dev);
 
 	return ret;
 }
@@ -1212,6 +1215,7 @@  static int qcom_pcie_probe(struct platform_device *pdev)
 	if (!pci)
 		return -ENOMEM;
 
+	pm_runtime_enable(dev);
 	pci->dev = dev;
 	pci->ops = &dw_pcie_ops;
 	pp = &pci->pp;
@@ -1257,14 +1261,17 @@  static int qcom_pcie_probe(struct platform_device *pdev)
 	}
 
 	ret = phy_init(pcie->phy);
-	if (ret)
+	if (ret) {
+		pm_runtime_disable(&pdev->dev);
 		return ret;
+	}
 
 	platform_set_drvdata(pdev, pcie);
 
 	ret = dw_pcie_host_init(pp);
 	if (ret) {
 		dev_err(dev, "cannot initialize host\n");
+		pm_runtime_disable(&pdev->dev);
 		return ret;
 	}