This is a backport of commit f4de51de2edcd26ec77bfc71b1f00b1de5a5dc20 to adjust the point at which we initialize IRQs for the tile PCI system.
The original commit doesn't apply because of some partial PCI hot-plug support that was added more recently, changing the indentation of the code as well as the controller index variable name. Signed-off-by: Chris Metcalf <[email protected]> diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c index ea38f0c..1073269 100644 --- a/arch/tile/kernel/pci.c +++ b/arch/tile/kernel/pci.c @@ -179,12 +179,6 @@ int __init tile_pci_init(void) controller = &controllers[num_controllers]; - if (tile_init_irqs(i, controller)) { - pr_err("PCI: Could not initialize " - "IRQs, aborting.\n"); - goto err_cont; - } - controller->index = num_controllers; controller->hv_cfg_fd[0] = hv_cfg_fd0; controller->hv_cfg_fd[1] = hv_cfg_fd1; @@ -300,6 +294,11 @@ static int __init pcibios_init(void) struct pci_controller *controller = &controllers[i]; struct pci_bus *bus; + if (tile_init_irqs(i, controller)) { + pr_err("PCI: Could not initialize IRQS\n"); + continue; + } + pr_info("PCI: initializing controller #%d\n", i); /* _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
