mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 03:40:04 +00:00
PCI: mobiveil: Move the link up waiting out of mobiveil_host_init()
The host initializing sequence does not depend on the PCIe link being up, so move the link up check right before the code scanning the root bus for enumeration. Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Reviewed-by: Minghuan Lian <Minghuan.Lian@nxp.com> Reviewed-by: Subrahmanya Lingappa <l.subrahmanya@mobiveil.co.in>
This commit is contained in:
parent
0122af0a08
commit
40af900c5f
1 changed files with 7 additions and 8 deletions
|
@ -561,15 +561,8 @@ static void mobiveil_pcie_enable_msi(struct mobiveil_pcie *pcie)
|
|||
static int mobiveil_host_init(struct mobiveil_pcie *pcie)
|
||||
{
|
||||
u32 value, pab_ctrl, type = 0;
|
||||
int err;
|
||||
struct resource_entry *win;
|
||||
|
||||
err = mobiveil_bringup_link(pcie);
|
||||
if (err) {
|
||||
dev_info(&pcie->pdev->dev, "link bring-up failed\n");
|
||||
return err;
|
||||
}
|
||||
|
||||
/*
|
||||
* program Bus Master Enable Bit in Command Register in PAB Config
|
||||
* Space
|
||||
|
@ -635,7 +628,7 @@ static int mobiveil_host_init(struct mobiveil_pcie *pcie)
|
|||
/* setup MSI hardware registers */
|
||||
mobiveil_pcie_enable_msi(pcie);
|
||||
|
||||
return err;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void mobiveil_mask_intx_irq(struct irq_data *data)
|
||||
|
@ -892,6 +885,12 @@ static int mobiveil_pcie_probe(struct platform_device *pdev)
|
|||
bridge->map_irq = of_irq_parse_and_map_pci;
|
||||
bridge->swizzle_irq = pci_common_swizzle;
|
||||
|
||||
ret = mobiveil_bringup_link(pcie);
|
||||
if (ret) {
|
||||
dev_info(dev, "link bring-up failed\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
/* setup the kernel resources for the newly added PCIe root bus */
|
||||
ret = pci_scan_root_bus_bridge(bridge);
|
||||
if (ret)
|
||||
|
|
Loading…
Reference in a new issue