From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 42Kj2H729GzF1pS for ; Wed, 26 Sep 2018 12:44:23 +1000 (AEST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8Q2dHke127402 for ; Tue, 25 Sep 2018 22:44:21 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2mqxjcebag-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 25 Sep 2018 22:44:21 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 26 Sep 2018 03:44:19 +0100 From: "Aneesh Kumar K.V" To: Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.vnet.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v5 16/22] powerpc/mm: move platform specific mmu-xxx.h in platform directories In-Reply-To: References: Date: Wed, 26 Sep 2018 08:14:12 +0530 MIME-Version: 1.0 Content-Type: text/plain Message-Id: <87o9clgepv.fsf@linux.ibm.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Christophe Leroy writes: > The purpose of this patch is to move platform specific > mmu-xxx.h files in platform directories like pte-xxx.h files. > > In the meantime this patch creates common nohash and > nohash/32 + nohash/64 mmu.h files for future common parts. > Reviewed-by: Aneesh Kumar K.V > Signed-off-by: Christophe Leroy > --- > arch/powerpc/include/asm/mmu.h | 14 ++------------ > arch/powerpc/include/asm/{ => nohash/32}/mmu-40x.h | 0 > arch/powerpc/include/asm/{ => nohash/32}/mmu-44x.h | 0 > arch/powerpc/include/asm/{ => nohash/32}/mmu-8xx.h | 0 > arch/powerpc/include/asm/nohash/32/mmu.h | 19 +++++++++++++++++++ > arch/powerpc/include/asm/nohash/64/mmu.h | 8 ++++++++ > arch/powerpc/include/asm/{ => nohash}/mmu-book3e.h | 0 > arch/powerpc/include/asm/nohash/mmu.h | 11 +++++++++++ > arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +- > arch/powerpc/kvm/e500.h | 2 +- > 10 files changed, 42 insertions(+), 14 deletions(-) > rename arch/powerpc/include/asm/{ => nohash/32}/mmu-40x.h (100%) > rename arch/powerpc/include/asm/{ => nohash/32}/mmu-44x.h (100%) > rename arch/powerpc/include/asm/{ => nohash/32}/mmu-8xx.h (100%) > create mode 100644 arch/powerpc/include/asm/nohash/32/mmu.h > create mode 100644 arch/powerpc/include/asm/nohash/64/mmu.h > rename arch/powerpc/include/asm/{ => nohash}/mmu-book3e.h (100%) > create mode 100644 arch/powerpc/include/asm/nohash/mmu.h > > diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h > index 13ea441ac531..2b396de45e9e 100644 > --- a/arch/powerpc/include/asm/mmu.h > +++ b/arch/powerpc/include/asm/mmu.h > @@ -326,18 +326,8 @@ static inline void mmu_early_init_devtree(void) { } > #if defined(CONFIG_PPC_STD_MMU_32) > /* 32-bit classic hash table MMU */ > #include > -#elif defined(CONFIG_40x) > -/* 40x-style software loaded TLB */ > -# include > -#elif defined(CONFIG_44x) > -/* 44x-style software loaded TLB */ > -# include > -#elif defined(CONFIG_PPC_BOOK3E_MMU) > -/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */ > -# include > -#elif defined (CONFIG_PPC_8xx) > -/* Motorola/Freescale 8xx software loaded TLB */ > -# include > +#elif defined(CONFIG_PPC_MMU_NOHASH) > +#include > #endif > > #endif /* __KERNEL__ */ > diff --git a/arch/powerpc/include/asm/mmu-40x.h b/arch/powerpc/include/asm/nohash/32/mmu-40x.h > similarity index 100% > rename from arch/powerpc/include/asm/mmu-40x.h > rename to arch/powerpc/include/asm/nohash/32/mmu-40x.h > diff --git a/arch/powerpc/include/asm/mmu-44x.h b/arch/powerpc/include/asm/nohash/32/mmu-44x.h > similarity index 100% > rename from arch/powerpc/include/asm/mmu-44x.h > rename to arch/powerpc/include/asm/nohash/32/mmu-44x.h > diff --git a/arch/powerpc/include/asm/mmu-8xx.h b/arch/powerpc/include/asm/nohash/32/mmu-8xx.h > similarity index 100% > rename from arch/powerpc/include/asm/mmu-8xx.h > rename to arch/powerpc/include/asm/nohash/32/mmu-8xx.h > diff --git a/arch/powerpc/include/asm/nohash/32/mmu.h b/arch/powerpc/include/asm/nohash/32/mmu.h > new file mode 100644 > index 000000000000..af0e8b54876a > --- /dev/null > +++ b/arch/powerpc/include/asm/nohash/32/mmu.h > @@ -0,0 +1,19 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _ASM_POWERPC_NOHASH_32_MMU_H_ > +#define _ASM_POWERPC_NOHASH_32_MMU_H_ > + > +#if defined(CONFIG_40x) > +/* 40x-style software loaded TLB */ > +#include > +#elif defined(CONFIG_44x) > +/* 44x-style software loaded TLB */ > +#include > +#elif defined(CONFIG_PPC_BOOK3E_MMU) > +/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */ > +#include > +#elif defined (CONFIG_PPC_8xx) > +/* Motorola/Freescale 8xx software loaded TLB */ > +#include > +#endif > + > +#endif /* _ASM_POWERPC_NOHASH_32_MMU_H_ */ > diff --git a/arch/powerpc/include/asm/nohash/64/mmu.h b/arch/powerpc/include/asm/nohash/64/mmu.h > new file mode 100644 > index 000000000000..87871d027b75 > --- /dev/null > +++ b/arch/powerpc/include/asm/nohash/64/mmu.h > @@ -0,0 +1,8 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _ASM_POWERPC_NOHASH_64_MMU_H_ > +#define _ASM_POWERPC_NOHASH_64_MMU_H_ > + > +/* Freescale Book-E software loaded TLB or Book-3e (ISA 2.06+) MMU */ > +#include > + > +#endif /* _ASM_POWERPC_NOHASH_64_MMU_H_ */ > diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/nohash/mmu-book3e.h > similarity index 100% > rename from arch/powerpc/include/asm/mmu-book3e.h > rename to arch/powerpc/include/asm/nohash/mmu-book3e.h > diff --git a/arch/powerpc/include/asm/nohash/mmu.h b/arch/powerpc/include/asm/nohash/mmu.h > new file mode 100644 > index 000000000000..a037cb1efb57 > --- /dev/null > +++ b/arch/powerpc/include/asm/nohash/mmu.h > @@ -0,0 +1,11 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _ASM_POWERPC_NOHASH_MMU_H_ > +#define _ASM_POWERPC_NOHASH_MMU_H_ > + > +#ifdef CONFIG_PPC64 > +#include > +#else > +#include > +#endif > + > +#endif /* _ASM_POWERPC_NOHASH_MMU_H_ */ > diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S > index 8d142e5d84cd..5fbc890d1094 100644 > --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S > +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S > @@ -17,7 +17,7 @@ > #include > #include > #include > -#include > +#include > #include > #include > > diff --git a/arch/powerpc/kvm/e500.h b/arch/powerpc/kvm/e500.h > index 94f04fcb373e..962ee90a0dfe 100644 > --- a/arch/powerpc/kvm/e500.h > +++ b/arch/powerpc/kvm/e500.h > @@ -20,7 +20,7 @@ > #define KVM_E500_H > > #include > -#include > +#include > #include > #include > > -- > 2.13.3