Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964924AbaD2RE1 (ORCPT ); Tue, 29 Apr 2014 13:04:27 -0400 Received: from fw-tnat.austin.arm.com ([217.140.110.23]:30432 "EHLO collaborate-mta1.arm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933510AbaD2REY (ORCPT ); Tue, 29 Apr 2014 13:04:24 -0400 Date: Tue, 29 Apr 2014 18:04:04 +0100 From: Catalin Marinas To: Jungseok Lee Cc: "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.cs.columbia.edu" , Marc Zyngier , Christoffer Dall , "linux-kernel@vger.kernel.org" , linux-samsung-soc , "steve.capper@linaro.org" , "sungjinn.chung@samsung.com" , Arnd Bergmann , "kgene.kim@samsung.com" , "ilho215.lee@samsung.com" Subject: Re: [PATCH v4 6/7] arm64: mm: Implement 4 levels of translation tables Message-ID: <20140429170404.GA32121@localhost> References: <000601cf6367$cffab890$6ff029b0$@samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <000601cf6367$cffab890$6ff029b0$@samsung.com> Thread-Topic: [PATCH v4 6/7] arm64: mm: Implement 4 levels of translation tables Accept-Language: en-GB, en-US Content-Language: en-US User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 29, 2014 at 05:59:33AM +0100, Jungseok Lee wrote: > diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S > index 0fd5650..03ec424 100644 > --- a/arch/arm64/kernel/head.S > +++ b/arch/arm64/kernel/head.S > @@ -37,8 +37,9 @@ > > /* > * swapper_pg_dir is the virtual address of the initial page table. We place > - * the page tables 3 * PAGE_SIZE below KERNEL_RAM_VADDR. The idmap_pg_dir has > - * 2 pages and is placed below swapper_pg_dir. > + * the page tables 3 * PAGE_SIZE (2 or 3 levels) or 4 * PAGE_SIZE (4 levels) > + * below KERNEL_RAM_VADDR. The idmap_pg_dir has 2 pages (2 or 3 levels) or > + * 3 pages (4 levels) and is placed below swapper_pg_dir. > */ > #define KERNEL_RAM_VADDR (PAGE_OFFSET + TEXT_OFFSET) > > @@ -46,8 +47,13 @@ > #error KERNEL_RAM_VADDR must start at 0xXXX80000 > #endif > > +#ifdef CONFIG_ARM64_4_LEVELS > +#define SWAPPER_DIR_SIZE (4 * PAGE_SIZE) > +#define IDMAP_DIR_SIZE (3 * PAGE_SIZE) > +#else > #define SWAPPER_DIR_SIZE (3 * PAGE_SIZE) > #define IDMAP_DIR_SIZE (2 * PAGE_SIZE) > +#endif Mark Rutland was doing some clean-up of this code to no longer place swapper_pg_dir and idmap_pg_dir below the kernel image. I'm not sure whether the patches ended up on the list yet (not a problem for now, just a slight change for your patches). -- Catalin -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/