Commit 6b0e8279 authored by Christophe Leroy's avatar Christophe Leroy Committed by Andrew Morton
Browse files

powerpc/e500: switch to 64 bits PGD on 85xx (32 bits) 

At the time being when CONFIG_PTE_64BIT is selected, PTE entries are 64
bits but PGD entries are still 32 bits.

In order to allow leaf PMD entries, switch the PGD to 64 bits entries.

Link: https://lkml.kernel.org/r/ca85397df02564e5edc3a3c27b55cf43af3e4ef3.1719928057.git.christophe.leroy@csgroup.eu


Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Peter Xu <peterx@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent e081c147

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

+4 −0
Original line number Diff line number Diff line
@@ -49,7 +49,11 @@ static inline unsigned long pud_val(pud_t x) 
#endif /* CONFIG_PPC64 */



/* PGD level */

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

typedef struct { unsigned long long pgd; } pgd_t;

#else

typedef struct { unsigned long pgd; } pgd_t;

#endif

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

static inline unsigned long pgd_val(pgd_t x)

{

arch/powerpc/kernel/head_85xx.S

+6 −4
Original line number Diff line number Diff line
@@ -307,8 +307,9 @@ set_ivor: 
#ifdef CONFIG_PTE_64BIT

#ifdef CONFIG_HUGETLB_PAGE

#define FIND_PTE	\

	rlwinm	r12, r10, 13, 19, 29;	/* Compute pgdir/pmd offset */	\

	lwzx	r11, r12, r11;		/* Get pgd/pmd entry */		\

	rlwinm	r12, r10, 14, 18, 28;	/* Compute pgdir/pmd offset */	\

	add	r12, r11, r12;						\

	lwz	r11, 4(r12);		/* Get pgd/pmd entry */		\

	rlwinm.	r12, r11, 0, 0, 20;	/* Extract pt base address */	\

	blt	1000f;			/* Normal non-huge page */	\

	beq	2f;			/* Bail if no table */		\
@@ -321,8 +322,9 @@ set_ivor: 
1001:	lwz	r11, 4(r12);		/* Get pte entry */

#else

#define FIND_PTE	\

	rlwinm	r12, r10, 13, 19, 29;	/* Compute pgdir/pmd offset */	\

	lwzx	r11, r12, r11;		/* Get pgd/pmd entry */		\

	rlwinm	r12, r10, 14, 18, 28;	/* Compute pgdir/pmd offset */	\

	add	r12, r11, r12;						\

	lwz	r11, 4(r12);		/* Get pgd/pmd entry */		\

	rlwinm.	r12, r11, 0, 0, 20;	/* Extract pt base address */	\

	beq	2f;			/* Bail if no table */		\

	rlwimi	r12, r10, 23, 20, 28;	/* Compute pte address */	\