diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-07-09 10:58:16 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-05-05 18:42:23 +0100 |
| commit | ee5003d0e5823c37d0254cbd83c9b01a57d3f671 (patch) | |
| tree | dc64278486b02d9d822139362480c8ea2e8b7cc7 | |
| parent | 49e1adec95cab65c208603084fa69ef053add8b7 (diff) | |
pci: mvebu: time out reset on link up
If the port reports that the link is up while we are resetting, there's
little point in waiting for the full duration.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/pci/host/pci-mvebu.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c index 72d7292394dd..bd8e78327c59 100644 --- a/drivers/pci/host/pci-mvebu.c +++ b/drivers/pci/host/pci-mvebu.c @@ -1183,6 +1183,7 @@ static int mvebu_pcie_powerup(struct mvebu_pcie_port *port) if (port->reset_gpio) { u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000; + unsigned int i; of_property_read_u32(port->dn, "reset-delay-us", &reset_udelay); @@ -1190,7 +1191,13 @@ static int mvebu_pcie_powerup(struct mvebu_pcie_port *port) udelay(100); gpiod_set_value_cansleep(port->reset_gpio, 0); - msleep(reset_udelay / 1000); + for (i = 0; i < reset_udelay; i += 1000) { + if (mvebu_pcie_link_up(port)) + break; + msleep(1); + } + + printk("%s: reset completed in %dus\n", port->name, i); } return 0; @@ -1278,15 +1285,16 @@ static int mvebu_pcie_probe(struct platform_device *pdev) if (!child) continue; - ret = mvebu_pcie_powerup(port); - if (ret < 0) - continue; - port->base = mvebu_pcie_map_registers(pdev, child, port); if (IS_ERR(port->base)) { dev_err(dev, "%s: cannot map registers\n", port->name); port->base = NULL; - mvebu_pcie_powerdown(port); + continue; + } + + ret = mvebu_pcie_powerup(port); + if (ret < 0) { + port->base = NULL; continue; } |