AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[POWERPC] Fixup resources on pci_bus for PCIe PHB when no device is connected

Browse Source 
On the 85xx/86xx PCIe controllers if there is no device connected to the
PHB we will still allocate a pci_bus for downstream bus of the virtual
P2P bridge. However the resources allocated to the downstream bus are not
correct and so we just mimic the resources from the upstream pci_bus.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala 2007-07-19 15:29:53 -05:00
parent 66afe8780f
commit 6c0a11c118
4 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/platforms/85xx/mpc85xx_cds.c
View File

@ -272,4 +272,5 @@ define_machine(mpc85xx_cds) {
.restart = mpc85xx_restart, .restart = mpc85xx_restart,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress, .progress = udbg_progress,
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
}; };

2
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
View File

@ -431,7 +431,6 @@ mpc86xx_time_init(void)
return 0; return 0;
} }
define_machine(mpc86xx_hpcn) { define_machine(mpc86xx_hpcn) {
.name = "MPC86xx HPCN", .name = "MPC86xx HPCN",
.probe = mpc86xx_hpcn_probe, .probe = mpc86xx_hpcn_probe,
@ -443,4 +442,5 @@ define_machine(mpc86xx_hpcn) {
.time_init = mpc86xx_time_init, .time_init = mpc86xx_time_init,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
.progress = udbg_progress, .progress = udbg_progress,
.pcibios_fixup_bus = fsl_pcibios_fixup_bus,
}; };

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

@ -142,6 +142,20 @@ int __init fsl_pcie_check_link(struct pci_controller *hose)
return 0; return 0;
} }
void fsl_pcibios_fixup_bus(struct pci_bus *bus)
{
struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
int i;
/* deal with bogus pci_bus when we don't have anything connected on PCIe */
if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) {
if (bus->parent) {
for (i = 0; i < 4; ++i)
bus->resource[i] = bus->parent->resource[i];
}
}
}
int __init fsl_add_bridge(struct device_node *dev, int is_primary) int __init fsl_add_bridge(struct device_node *dev, int is_primary)
{ {
int len; int len;

1
arch/powerpc/sysdev/fsl_pci.h
View File

@ -82,6 +82,7 @@ struct ccsr_pci {
}; };
extern int fsl_add_bridge(struct device_node *dev, int is_primary); extern int fsl_add_bridge(struct device_node *dev, int is_primary);
extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
#endif /* __POWERPC_FSL_PCI_H */ #endif /* __POWERPC_FSL_PCI_H */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */