[PATCH] powerpc/powernv: Print correct PHB type names

[PATCH] powerpc/powernv: Print correct PHB type names

[Gavin Shan]

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: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
 arch/powerpc/platforms/powernv/pci-ioda.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index e0a8a92..7f952a6 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -55,6 +55,7 @@
 #define POWERNV_IOMMU_DEFAULT_LEVELS	1
 #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);
 
 void pe_level_printk(const struct pnv_ioda_pe *pe, const char *level,
@@ -3626,7 +3627,8 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
 	void *aux;
 	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);
 	if (!prop64) {
-- 
2.1.0

Re: powerpc/powernv: Print correct PHB type names

[Michael Ellerman]

On Tue, 2016-21-06 at 02:35:56 UTC, Gavin Shan wrote:
> 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: Gavin Shan <gwshan@linux.vnet.ibm.com>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/9497a1c1c5b4de2a359b6d8648

cheers