aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Douglas <adouglas@cadence.com>2018-06-25 04:30:52 -0400
committerLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2018-07-12 07:44:14 -0400
commitee12c9efe685428ebfae1bf5347b5375f54ce44e (patch)
treefa4547e150a97e7dbf36fb55124f2ef3d9d157fa
parent82dfbd27c837b5a7c2a7a13b54a4f0b16c51222f (diff)
PCI: cadence: Add Power Management ops for host and EP
These PM ops will enable/disable the optional PHYs if present. The AXI link-down register in the host driver is now cleared in cdns_pci_map_bus() since the link-down bit will be set if the PHY has been disabled. It is not cleared when enabling the PHY, since the link will not yet be up (e.g. when an EP controller is connected back-to-back to the host controller and its PHY is still disabled). Link: http://lkml.kernel.org/r/1529915453-4633-5-git-send-email-adouglas@cadence.com Signed-off-by: Alan Douglas <adouglas@cadence.com> [lorenzo.pieralisi@arm.com: updated commit log] Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
-rw-r--r--drivers/pci/controller/pcie-cadence-ep.c1
-rw-r--r--drivers/pci/controller/pcie-cadence-host.c3
-rw-r--r--drivers/pci/controller/pcie-cadence.c30
-rw-r--r--drivers/pci/controller/pcie-cadence.h4
4 files changed, 38 insertions, 0 deletions
diff --git a/drivers/pci/controller/pcie-cadence-ep.c b/drivers/pci/controller/pcie-cadence-ep.c
index c02f33d8e506..3eabd99a1233 100644
--- a/drivers/pci/controller/pcie-cadence-ep.c
+++ b/drivers/pci/controller/pcie-cadence-ep.c
@@ -555,6 +555,7 @@ static struct platform_driver cdns_pcie_ep_driver = {
555 .driver = { 555 .driver = {
556 .name = "cdns-pcie-ep", 556 .name = "cdns-pcie-ep",
557 .of_match_table = cdns_pcie_ep_of_match, 557 .of_match_table = cdns_pcie_ep_of_match,
558 .pm = &cdns_pcie_pm_ops,
558 }, 559 },
559 .probe = cdns_pcie_ep_probe, 560 .probe = cdns_pcie_ep_probe,
560 .shutdown = cdns_pcie_ep_shutdown, 561 .shutdown = cdns_pcie_ep_shutdown,
diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c
index 36f31092562f..e3e9b7de8592 100644
--- a/drivers/pci/controller/pcie-cadence-host.c
+++ b/drivers/pci/controller/pcie-cadence-host.c
@@ -61,6 +61,8 @@ static void __iomem *cdns_pci_map_bus(struct pci_bus *bus, unsigned int devfn,
61 /* Check that the link is up */ 61 /* Check that the link is up */
62 if (!(cdns_pcie_readl(pcie, CDNS_PCIE_LM_BASE) & 0x1)) 62 if (!(cdns_pcie_readl(pcie, CDNS_PCIE_LM_BASE) & 0x1))
63 return NULL; 63 return NULL;
64 /* Clear AXI link-down status */
65 cdns_pcie_writel(pcie, CDNS_PCIE_AT_LINKDOWN, 0x0);
64 66
65 /* Update Output registers for AXI region 0. */ 67 /* Update Output registers for AXI region 0. */
66 addr0 = CDNS_PCIE_AT_OB_REGION_PCI_ADDR0_NBITS(12) | 68 addr0 = CDNS_PCIE_AT_OB_REGION_PCI_ADDR0_NBITS(12) |
@@ -345,6 +347,7 @@ static struct platform_driver cdns_pcie_host_driver = {
345 .driver = { 347 .driver = {
346 .name = "cdns-pcie-host", 348 .name = "cdns-pcie-host",
347 .of_match_table = cdns_pcie_host_of_match, 349 .of_match_table = cdns_pcie_host_of_match,
350 .pm = &cdns_pcie_pm_ops,
348 }, 351 },
349 .probe = cdns_pcie_host_probe, 352 .probe = cdns_pcie_host_probe,
350}; 353};
diff --git a/drivers/pci/controller/pcie-cadence.c b/drivers/pci/controller/pcie-cadence.c
index 2edc12661e44..86f1b002c846 100644
--- a/drivers/pci/controller/pcie-cadence.c
+++ b/drivers/pci/controller/pcie-cadence.c
@@ -217,3 +217,33 @@ err_link:
217 217
218 return ret; 218 return ret;
219} 219}
220
221#ifdef CONFIG_PM_SLEEP
222static int cdns_pcie_suspend_noirq(struct device *dev)
223{
224 struct cdns_pcie *pcie = dev_get_drvdata(dev);
225
226 cdns_pcie_disable_phy(pcie);
227
228 return 0;
229}
230
231static int cdns_pcie_resume_noirq(struct device *dev)
232{
233 struct cdns_pcie *pcie = dev_get_drvdata(dev);
234 int ret;
235
236 ret = cdns_pcie_enable_phy(pcie);
237 if (ret) {
238 dev_err(dev, "failed to enable phy\n");
239 return ret;
240 }
241
242 return 0;
243}
244#endif
245
246const struct dev_pm_ops cdns_pcie_pm_ops = {
247 SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(cdns_pcie_suspend_noirq,
248 cdns_pcie_resume_noirq)
249};
diff --git a/drivers/pci/controller/pcie-cadence.h b/drivers/pci/controller/pcie-cadence.h
index b342c808f7d6..ae6bf2a2b3d3 100644
--- a/drivers/pci/controller/pcie-cadence.h
+++ b/drivers/pci/controller/pcie-cadence.h
@@ -166,6 +166,9 @@
166#define CDNS_PCIE_AT_IB_RP_BAR_ADDR1(bar) \ 166#define CDNS_PCIE_AT_IB_RP_BAR_ADDR1(bar) \
167 (CDNS_PCIE_AT_BASE + 0x0804 + (bar) * 0x0008) 167 (CDNS_PCIE_AT_BASE + 0x0804 + (bar) * 0x0008)
168 168
169/* AXI link down register */
170#define CDNS_PCIE_AT_LINKDOWN (CDNS_PCIE_AT_BASE + 0x0824)
171
169enum cdns_pcie_rp_bar { 172enum cdns_pcie_rp_bar {
170 RP_BAR0, 173 RP_BAR0,
171 RP_BAR1, 174 RP_BAR1,
@@ -314,5 +317,6 @@ void cdns_pcie_reset_outbound_region(struct cdns_pcie *pcie, u32 r);
314void cdns_pcie_disable_phy(struct cdns_pcie *pcie); 317void cdns_pcie_disable_phy(struct cdns_pcie *pcie);
315int cdns_pcie_enable_phy(struct cdns_pcie *pcie); 318int cdns_pcie_enable_phy(struct cdns_pcie *pcie);
316int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie); 319int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie);
320extern const struct dev_pm_ops cdns_pcie_pm_ops;
317 321
318#endif /* _PCIE_CADENCE_H */ 322#endif /* _PCIE_CADENCE_H */