Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6c0a11c1 authored by Kumar Gala's avatar Kumar Gala
Browse files

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



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: default avatarKumar Gala <galak@kernel.crashing.org>
parent 66afe878

arch/powerpc/platforms/85xx/mpc85xx_cds.c

+1 −0
Original line number Diff line number Diff line
@@ -272,4 +272,5 @@ define_machine(mpc85xx_cds) { 
	.restart	= mpc85xx_restart,

	.calibrate_decr = generic_calibrate_decr,

	.progress	= udbg_progress,

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

};

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ mpc86xx_time_init(void) 
	return 0;

}





define_machine(mpc86xx_hpcn) {

	.name			= "MPC86xx HPCN",

	.probe			= mpc86xx_hpcn_probe,
@@ -443,4 +442,5 @@ define_machine(mpc86xx_hpcn) { 
	.time_init		= mpc86xx_time_init,

	.calibrate_decr		= generic_calibrate_decr,

	.progress		= udbg_progress,

	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,

};

arch/powerpc/sysdev/fsl_pci.c

+14 −0
Original line number Diff line number Diff line
@@ -142,6 +142,20 @@ int __init fsl_pcie_check_link(struct pci_controller *hose) 
	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 len;

arch/powerpc/sysdev/fsl_pci.h

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ struct ccsr_pci { 
};



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 /* __KERNEL__ */