leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/fsl-pci: Only scan PCI bus if configured as a host

Browse Source 
We change fsl_add_bridge to return -ENODEV if the controller is working in
agent mode. Then check the return value of fsl_add_bridge to guarantee
that only successfully added host bus will be scanned.

Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Jia Hongtao 2012-08-03 18:14:09 +08:00 committed by Kumar Gala
parent 0d7614f09c
commit c9f11c3037
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/powerpc/sysdev/fsl_pci.c
View File

@ -465,7 +465,7 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
iounmap(hose->cfg_data); iounmap(hose->cfg_data);
iounmap(hose->cfg_addr); iounmap(hose->cfg_addr);
pcibios_free_controller(hose); pcibios_free_controller(hose);
return 0; return -ENODEV;
} }
setup_pci_cmd(hose); setup_pci_cmd(hose);
@ -827,6 +827,7 @@ struct device_node *fsl_pci_primary;
void __devinit fsl_pci_init(void) void __devinit fsl_pci_init(void)
{ {
int ret;
struct device_node *node; struct device_node *node;
struct pci_controller *hose; struct pci_controller *hose;
dma_addr_t max = 0xffffffff; dma_addr_t max = 0xffffffff;
@ -855,10 +856,12 @@ void __devinit fsl_pci_init(void)
if (!fsl_pci_primary) if (!fsl_pci_primary)
fsl_pci_primary = node; fsl_pci_primary = node;
fsl_add_bridge(node, fsl_pci_primary == node); ret = fsl_add_bridge(node, fsl_pci_primary == node);
hose = pci_find_hose_for_OF_device(node); if (ret == 0) {
max = min(max, hose->dma_window_base_cur + hose = pci_find_hose_for_OF_device(node);
hose->dma_window_size); max = min(max, hose->dma_window_base_cur +
hose->dma_window_size);
}
} }
} }