Commit 3b1f7a46 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: Fix return type of pgd_val() 



Commit 6b0e8279 ("powerpc/e500: switch to 64 bits PGD on 85xx
(32 bits)") switched PGD entries to 64 bits, but pgd_val() returns
an unsigned long which is 32 bits on PPC32. This is not a problem
for regular PMD entries because the upper part is always NULL, but
when PMD entries are leaf they contain 64 bits values, so pgd_val()
must return an unsigned long long instead of an unsigned long.

Also change the condition to CONFIG_PPC_85xx instead of CONFIG_PPC_E500
as the change was meant for 32 bits only. Allthough this should be
harmless on PPC64, it generates a warning with pgd_ERROR print.

Fixes: 6b0e8279 ("powerpc/e500: switch to 64 bits PGD on 85xx (32 bits)")
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/45f8fdf298ec3df7573b66d21b03a5cda92e2cb1.1724313510.git.christophe.leroy@csgroup.eu
parent 6114139c

arch/powerpc/include/asm/nohash/32/pgtable.h

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define USER_PTRS_PER_PGD	(TASK_SIZE / PGDIR_SIZE)



#define pgd_ERROR(e) \

	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))

	pr_err("%s:%d: bad pgd %08llx.\n", __FILE__, __LINE__, (unsigned long long)pgd_val(e))



/*

 * This is the bottom of the PKMAP area with HIGHMEM or an arbitrary
@@ -170,7 +170,7 @@ static inline void pmd_clear(pmd_t *pmdp) 
#define pmd_pfn(pmd)		(pmd_val(pmd) >> PAGE_SHIFT)

#else

#define pmd_page_vaddr(pmd)	\

	((const void *)(pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1)))

	((const void *)((unsigned long)pmd_val(pmd) & ~(PTE_TABLE_SIZE - 1)))

#define pmd_pfn(pmd)		(__pa(pmd_val(pmd)) >> PAGE_SHIFT)

#endif

arch/powerpc/include/asm/pgtable-types.h

+9 −3
Original line number Diff line number Diff line
@@ -49,16 +49,22 @@ static inline unsigned long pud_val(pud_t x) 
#endif /* CONFIG_PPC64 */



/* PGD level */

#if defined(CONFIG_PPC_E500) && defined(CONFIG_PTE_64BIT)

#if defined(CONFIG_PPC_85xx) && defined(CONFIG_PTE_64BIT)

typedef struct { unsigned long long pgd; } pgd_t;



static inline unsigned long long pgd_val(pgd_t x)

{

	return x.pgd;

}

#else

typedef struct { unsigned long pgd; } pgd_t;

#endif

#define __pgd(x)	((pgd_t) { (x) })



static inline unsigned long pgd_val(pgd_t x)

{

	return x.pgd;

}

#endif

#define __pgd(x)	((pgd_t) { (x) })



/* Page protection bits */

typedef struct { unsigned long pgprot; } pgprot_t;