Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

PCI: rcar: Add runtime PM support to pcie-rcar

Browse Source 
If runtime PM is enabled in the kernel config, simply enable the clocks
once during probe.

Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
This commit is contained in:
Phil Edworthy 2016-01-05 13:00:30 +00:00 committed by Bjorn Helgaas
parent 049f419399
commit de1be9a889
1 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/pci/host/pcie-rcar.c
View File

@ -26,6 +26,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/slab.h> #include <linux/slab.h>
#define DRV_NAME "rcar-pcie" #define DRV_NAME "rcar-pcie"
@ -994,32 +995,51 @@ static int rcar_pcie_probe(struct platform_device *pdev)
if (err) if (err)
return err; return err;
of_id = of_match_device(rcar_pcie_of_match, pcie->dev);
if (!of_id || !of_id->data)
return -EINVAL;
hw_init_fn = of_id->data;
pm_runtime_enable(pcie->dev);
err = pm_runtime_get_sync(pcie->dev);
if (err < 0) {
dev_err(pcie->dev, "pm_runtime_get_sync failed\n");
goto err_pm_disable;
}
/* Failure to get a link might just be that no cards are inserted */
err = hw_init_fn(pcie);
if (err) {
dev_info(&pdev->dev, "PCIe link down\n");
err = 0;
goto err_pm_put;
}
data = rcar_pci_read_reg(pcie, MACSR);
dev_info(&pdev->dev, "PCIe x%d: link up\n", (data >> 20) & 0x3f);
if (IS_ENABLED(CONFIG_PCI_MSI)) { if (IS_ENABLED(CONFIG_PCI_MSI)) {
err = rcar_pcie_enable_msi(pcie); err = rcar_pcie_enable_msi(pcie);
if (err < 0) { if (err < 0) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to enable MSI support: %d\n", "failed to enable MSI support: %d\n",
err); err);
return err; goto err_pm_put;
} }
} }
of_id = of_match_device(rcar_pcie_of_match, pcie->dev); err = rcar_pcie_enable(pcie);
if (!of_id || !of_id->data) if (err)
return -EINVAL; goto err_pm_put;
hw_init_fn = of_id->data;
/* Failure to get a link might just be that no cards are inserted */ return 0;
err = hw_init_fn(pcie);
if (err) {
dev_info(&pdev->dev, "PCIe link down\n");
return 0;
}
data = rcar_pci_read_reg(pcie, MACSR); err_pm_put:
dev_info(&pdev->dev, "PCIe x%d: link up\n", (data >> 20) & 0x3f); pm_runtime_put(pcie->dev);
return rcar_pcie_enable(pcie); err_pm_disable:
pm_runtime_disable(pcie->dev);
return err;
} }
static struct platform_driver rcar_pcie_driver = { static struct platform_driver rcar_pcie_driver = {