Commit 68289ae9 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: change CONFIG_PPC_STD_MMU_32 to CONFIG_PPC_BOOK3S_32 



Today we have:

config PPC_BOOK3S_32
        bool "512x/52xx/6xx/7xx/74xx/82xx/83xx/86xx"
        [depends on PPC32 within a choice]

config PPC_BOOK3S
        def_bool y
        depends on PPC_BOOK3S_32 || PPC_BOOK3S_64

config PPC_STD_MMU
	def_bool y
	depends on PPC_BOOK3S

config PPC_STD_MMU_32
	def_bool y
	depends on PPC_STD_MMU && PPC32

PPC_STD_MMU_32 is therefore redundant with PPC_BOOK3S_32.

In order to make the code clearer, lets use preferably PPC_BOOK3S_32.
This will allow to remove CONFIG_PPC_STD_MMU_32 in a later patch.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a0cd0f8c

arch/powerpc/include/asm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static inline void mmu_early_init_devtree(void) { } 
#endif /* __ASSEMBLY__ */

#endif



#if defined(CONFIG_PPC_STD_MMU_32)

#if defined(CONFIG_PPC_BOOK3S_32)

/* 32-bit classic hash table MMU */

#include <asm/book3s/32/mmu-hash.h>

#elif defined(CONFIG_40x)

arch/powerpc/include/asm/tlb.h

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ extern void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, 
static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep,

					  unsigned long address)

{

#ifdef CONFIG_PPC_STD_MMU_32

#ifdef CONFIG_PPC_BOOK3S_32

	if (pte_val(*ptep) & _PAGE_HASHPTE)

		flush_hash_entry(tlb->mm, ptep, address);

#endif

arch/powerpc/kernel/setup-common.c

+2 −2
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ static __init void print_system_info(void) 
#ifdef CONFIG_PPC_BOOK3S_64

	pr_info("ppc64_pft_size    = 0x%llx\n", ppc64_pft_size);

#endif

#ifdef CONFIG_PPC_STD_MMU_32

#ifdef CONFIG_PPC_BOOK3S_32

	pr_info("Hash_size         = 0x%lx\n", Hash_size);

#endif

	pr_info("phys_mem_size     = 0x%llx\n",
@@ -830,7 +830,7 @@ static __init void print_system_info(void) 
	if (htab_hash_mask)

		pr_info("htab_hash_mask    = 0x%lx\n", htab_hash_mask);

#endif

#ifdef CONFIG_PPC_STD_MMU_32

#ifdef CONFIG_PPC_BOOK3S_32

	if (Hash)

		pr_info("Hash              = 0x%p\n", Hash);

	if (Hash_mask)

arch/powerpc/mm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ hash64-$(CONFIG_PPC_NATIVE) := hash_native_64.o 
obj-$(CONFIG_PPC_BOOK3E_64)   += pgtable-book3e.o

obj-$(CONFIG_PPC_BOOK3S_64)	+= pgtable-hash64.o hash_utils_64.o slb.o $(hash64-y) mmu_context_book3s64.o pgtable-book3s64.o

obj-$(CONFIG_PPC_RADIX_MMU)	+= pgtable-radix.o tlb-radix.o

obj-$(CONFIG_PPC_STD_MMU_32)	+= ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o

obj-$(CONFIG_PPC_BOOK3S_32)	+= ppc_mmu_32.o hash_low_32.o mmu_context_hash32.o

obj-$(CONFIG_PPC_STD_MMU)	+= tlb_hash$(BITS).o

ifdef CONFIG_PPC_BOOK3S_64

obj-$(CONFIG_PPC_4K_PAGES)	+= hash64_4k.o

arch/powerpc/mm/pgtable_32.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static void __init __mapin_ram_chunk(unsigned long offset, unsigned long top) 
		ktext = ((char *)v >= _stext && (char *)v < etext) ||

			((char *)v >= _sinittext && (char *)v < _einittext);

		map_kernel_page(v, p, ktext ? PAGE_KERNEL_TEXT : PAGE_KERNEL);

#ifdef CONFIG_PPC_STD_MMU_32

#ifdef CONFIG_PPC_BOOK3S_32

		if (ktext)

			hash_preload(&init_mm, v, false, 0x300);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE