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

Commit fb111334 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Michael Ellerman
Browse files

powerpc/powernv: Discover IODA3 PHBs 



We instanciate them as IODA2. We also change the MSI EOI hack
to only kick on PHB3 since it will not be needed on any new
implementation.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d7436188

arch/powerpc/platforms/powernv/pci-ioda.c

+2 −1
Original line number Diff line number Diff line
@@ -2705,7 +2705,8 @@ void pnv_set_msi_irq_chip(struct pnv_phb *phb, unsigned int virq) 
	struct irq_data *idata;

	struct irq_chip *ichip;



	if (phb->type != PNV_PHB_IODA2)

	/* The MSI EOI OPAL call is only needed on PHB3 */

	if (phb->model != PNV_PHB_MODEL_PHB3)

		return;



	if (!phb->ioda.irq_chip_init) {

arch/powerpc/platforms/powernv/pci.c

+4 −0
Original line number Diff line number Diff line
@@ -932,6 +932,10 @@ void __init pnv_pci_init(void) 
	for_each_compatible_node(np, NULL, "ibm,ioda2-phb")

		pnv_pci_init_ioda2_phb(np);



	/* Look for ioda3 built-in PHB4's, we treat them as IODA2 */

	for_each_compatible_node(np, NULL, "ibm,ioda3-phb")

		pnv_pci_init_ioda2_phb(np);



	/* Look for NPU PHBs */

	for_each_compatible_node(np, NULL, "ibm,ioda2-npu-phb")

		pnv_pci_init_npu_phb(np);