powerpc/hash: Skip non initialized page size in init_hpte_page_sizes

One of the easiest way to test config with 4K HPTE is to disable 64K hardware
page size like below.

int __init htab_dt_scan_page_sizes(unsigned long node,

 		size -= 3; prop += 3;
 		base_idx = get_idx_from_shift(base_shift);
-		if (base_idx < 0) {
+		if (base_idx < 0 || base_idx == MMU_PAGE_64K) {
 			/* skip the pte encoding also */
 			prop += lpnum * 2; size -= lpnum * 2;

But then this results in error in other part of the code such as MPSS parsing
where we look at 4K base page size and 64K actual page size support.

This patch fix MPSS parsing by ignoring the actual page sizes marked
unsupported. In reality this can happen only with a corrupt device tree. But it
is good to tighten the error check.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 462c34e7b01d294eb5ae7621c1440b94a6f302b0..d97be8d207152ef1f9f5aaa6952eeea206c28260 100644 (file)
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -608,7 +608,7 @@ static void init_hpte_page_sizes(void)
                        continue;       /* not a supported page size */
                for (ap = bp; ap < MMU_PAGE_COUNT; ++ap) {
                        penc = mmu_psize_defs[bp].penc[ap];
-                       if (penc == -1)
+                       if (penc == -1 || !mmu_psize_defs[ap].shift)
                                continue;
                        shift = mmu_psize_defs[ap].shift - LP_SHIFT;
                        if (shift <= 0)