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

Commit 9497a1c1 authored by Gavin Shan's avatar Gavin Shan Committed by Michael Ellerman
Browse files

powerpc/powernv: Print correct PHB type names 



We're initializing "IODA1" and "IODA2" PHBs though they are IODA2
and NPU PHBs as below kernel log indicates.

   Initializing IODA1 OPAL PHB /pciex@3fffe40700000
   Initializing IODA2 OPAL PHB /pciex@3fff000400000

This fixes the PHB names. After it's applied, we get:

   Initializing IODA2 PHB (/pciex@3fffe40700000)
   Initializing NPU PHB (/pciex@3fff000400000)

Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 66725152

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ 
#define POWERNV_IOMMU_DEFAULT_LEVELS	1

#define POWERNV_IOMMU_DEFAULT_LEVELS	1

#define POWERNV_IOMMU_MAX_LEVELS	5

#define POWERNV_IOMMU_MAX_LEVELS	5





static const char * const pnv_phb_names[] = { "IODA1", "IODA2", "NPU" };

static void pnv_pci_ioda2_table_free_pages(struct iommu_table *tbl);

static void pnv_pci_ioda2_table_free_pages(struct iommu_table *tbl);





void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,

void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,
@@ -3628,7 +3629,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np, 
	void *aux;

	void *aux;

	long rc;

	long rc;





	pr_info("Initializing IODA%d OPAL PHB %s\n", ioda_type, np->full_name);

	pr_info("Initializing %s PHB (%s)\n",

		pnv_phb_names[ioda_type], of_node_full_name(np));





	prop64 = of_get_property(np, "ibm,opal-phbid", NULL);

	prop64 = of_get_property(np, "ibm,opal-phbid", NULL);

	if (!prop64) {

	if (!prop64) {