If we're an agent/end-point or fsl_add_bridge doesn't succeed due to some resource failure we should not scan the PCI bus. We change fsl_add_bridge() to return -ENODEV in the case we're an agent/end-point.
Signed-off-by: Jia Hongtao <[email protected]> Signed-off-by: Li Yang <[email protected]> --- arch/powerpc/sysdev/fsl_pci.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 4d4536f..11c1e23 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -370,7 +370,7 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary) iounmap(hose->cfg_data); iounmap(hose->cfg_addr); pcibios_free_controller(hose); - return 0; + return -ENODEV; } setup_pci_cmd(hose); @@ -418,6 +418,8 @@ void fsl_pci_setup(int primary_phb_addr) { struct device_node *np; struct pci_controller *hose; + int ret; + int has_host = 0; dma_addr_t min_dma_addr = 0xffffffff; for_each_node_by_type(np, "pci") { @@ -425,14 +427,17 @@ void fsl_pci_setup(int primary_phb_addr) struct resource rsrc; of_address_to_resource(np, 0, &rsrc); if ((rsrc.start & 0xfffff) == primary_phb_addr) - fsl_add_bridge(np, 1); + ret = fsl_add_bridge(np, 1); else - fsl_add_bridge(np, 0); - - hose = pci_find_hose_for_OF_device(np); - min_dma_addr = min(min_dma_addr, - hose->dma_window_base_cur - + hose->dma_window_size); + ret = fsl_add_bridge(np, 0); + + if (ret == 0) { + has_host = 1; + hose = pci_find_hose_for_OF_device(np); + min_dma_addr = min(min_dma_addr, + hose->dma_window_base_cur + + hose->dma_window_size); + } } } @@ -442,7 +447,7 @@ void fsl_pci_setup(int primary_phb_addr) * if we couldn't map all of DRAM via the dma windows we need SWIOTLB * to handle buffers located outside of dma capable memory region */ - if (memblock_end_of_DRAM() > min_dma_addr) { + if (has_host && memblock_end_of_DRAM() > min_dma_addr) { ppc_swiotlb_enable = 1; set_pci_dma_ops(&swiotlb_dma_ops); ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb; -- 1.7.5.1 _______________________________________________ Linuxppc-dev mailing list [email protected] https://lists.ozlabs.org/listinfo/linuxppc-dev
