From patchwork Mon Apr 14 07:40:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ??? X-Patchwork-Id: 3977251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D71869F2CC for ; Mon, 14 Apr 2014 07:43:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CA31201D3 for ; Mon, 14 Apr 2014 07:43:08 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 39FC2200F2 for ; Mon, 14 Apr 2014 07:43:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WZbWE-0000V8-Q2; Mon, 14 Apr 2014 07:41:30 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WZbVy-0000BQ-4v for linux-arm-kernel@lists.infradead.org; Mon, 14 Apr 2014 07:41:14 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N40005RQG03N810@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 14 Apr 2014 16:40:51 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 40.C6.09028.3019B435; Mon, 14 Apr 2014 16:40:51 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-39-534b9103663d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 8E.0E.29263.3019B435; Mon, 14 Apr 2014 16:40:51 +0900 (KST) Received: from DOJAYSLEE01 ([12.36.166.151]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N4000F2EG03B880@mmp2.samsung.com>; Mon, 14 Apr 2014 16:40:51 +0900 (KST) From: Jungseok Lee To: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, Catalin.Marinas@arm.com, Marc Zyngier , Christoffer Dall Subject: [PATCH 4/8] arm64: Introduce a kernel configuration option for VA_BITS Date: Mon, 14 Apr 2014 16:40:51 +0900 Message-id: <000201cf57b4$dbe63260$93b29720$@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Outlook 14.0 Thread-index: Ac9XrUy/hcb4eczCQ7qwkj0Y19kvsA== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsVy+t8zfV3mid7BBvt2SVv8nXSM3eL9sh5G ixev/zFaHP23kNGid8FVNouPp46zW2x6fI3V4vKuOWwWM87vY7L4e+cfm8WHGSsZHbg91sxb w+jx+9ckRo871/aweZzftIbZY/OSeo++LasYPT5vkgtgj+KySUnNySxLLdK3S+DKmN69kK1g Mm/F8/brTA2M17m6GDk5JARMJH4/uccMYYtJXLi3nq2LkYtDSGAZo8TVdS2sXYwcYEWb1nNA xKczSlw6PpMFwvnDKHFg8mNGkG42AU2JR3d72EESIgI7GCUmr13ECuIwC5xglFh6Zy0rSJWw gL/E7IV3mEBsFgFVic5VP8DivAKWEg+eP4CyBSV+TL7HAmIzC2hJrN95nAnClpfYvOYt1K0K EjvOvgbbLCKgJ/HpCEQvs4CIxL4X7xhBFksItHJIPFj2DmqZgMS3yYdYIP6Rldh0AGqOpMTB FTdYJjCKzUKyehaS1bOQrJ6FZMUCRpZVjKKpBckFxUnpRUZ6xYm5xaV56XrJ+bmbGCHR3LeD 8eYB60OMyUDrJzJLiSbnA5NBXkm8obGZkYWpiamxkbmlGWnCSuK8ix4mBQkJpCeWpGanphak FsUXleakFh9iZOLglGpgXJlSKLzk14xlRtee/J15TSrumZBMoiDriZfPWLnlMhSWzgtJUGdz s8k/p6PCZMXxgbNcX0D/q0cJS9Yig7kLL8U/d7etKGp1FX98hbsy+r1qj5faM78mxmkMvTYz eZY/SZyZxnFxw4Utx2ZxObr19LBzZPGeeqzmMiN2aylj0oHYL9w/bK8qsRRnJBpqMRcVJwIA DdiTovwCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGKsWRmVeSWpSXmKPExsVy+t9jQV3mid7BBn9niVv8nXSM3eL9sh5G ixev/zFaHP23kNGid8FVNouPp46zW2x6fI3V4vKuOWwWM87vY7L4e+cfm8WHGSsZHbg91sxb w+jx+9ckRo871/aweZzftIbZY/OSeo++LasYPT5vkgtgj2pgtMlITUxJLVJIzUvOT8nMS7dV 8g6Od443NTMw1DW0tDBXUshLzE21VXLxCdB1y8wBOlJJoSwxpxQoFJBYXKykb4dpQmiIm64F TGOErm9IEFyPkQEaSFjHmDG9eyFbwWTeiuft15kaGK9zdTFycEgImEhsWs/RxcgJZIpJXLi3 nq2LkYtDSGA6o8Sl4zNZIJw/jBIHJj9mBKliE9CUeHS3hx0kISKwg1Fi8tpFrCAOs8AJRoml d9ayglQJC/hLzF54hwnEZhFQlehc9QMszitgKfHg+QMoW1Dix+R7LCA2s4CWxPqdx5kgbHmJ zWveMkPcpCCx4+xrsM0iAnoSn45A9DILiEjse/GOcQKjwCwko2YhGTULyahZSFoWMLKsYhRN LUguKE5KzzXUK07MLS7NS9dLzs/dxAhOFc+kdjCubLA4xCjAwajEw5uw3TNYiDWxrLgy9xCj BAezkgjvtgyvYCHelMTKqtSi/Pii0pzU4kOMyUCfTmSWEk3OB6axvJJ4Q2MTMyNLIzMLIxNz c9KElcR5D7RaBwoJpCeWpGanphakFsFsYeLglGpg3OBRpHT+aZH88VTOXUFHpgY5Lg4vDsuv X3eK97Dimssf3BRjIp5+SuOa83tS6O7lD37o3DFJXKkrI8PpacVh1Tsn32CiG7M9+1XfvL1T RKW6anfaGx+9mntCj9klK+7TpfPHZaKk5RN8LDYqrzZfVsHR99PlQN6Two9yXt8nPOdRuSt9 M3axEktxRqKhFnNRcSIAUGecA1kDAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140414_004114_330167_EA93374A X-CRM114-Status: GOOD ( 10.40 ) X-Spam-Score: -6.0 (------) Cc: kgene.kim@samsung.com, Arnd Bergmann , linux-kernel@vger.kernel.org, ilho215.lee@samsung.com, linux-samsung-soc , sungjinn.chung@samsung.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds a kernel configuration for VA_BITS. It helps to prevent unnecessary #ifdef statements insertions for VA_BITS when implementing different page sizes and level of translation tables. Signed-off-by: Jungseok Lee Reviewed-by: Sungjinn Chung --- arch/arm64/Kconfig | 8 ++++++++ arch/arm64/include/asm/memory.h | 6 +----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 1a2faf9..431acbc 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -186,6 +186,14 @@ config ARM64_3_LEVELS endchoice +config ARM64_VA_BITS + int "Virtual address space size" + range 39 39 if ARM64_4K_PAGES && ARM64_3_LEVELS + range 42 42 if ARM64_64K_PAGES && ARM64_2_LEVELS + help + This feature is determined by a combination of page size and + level of translation tables. + config CPU_BIG_ENDIAN bool "Build big-endian kernel" help diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index e94f945..f6e7480 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -41,11 +41,7 @@ * The module space lives between the addresses given by TASK_SIZE * and PAGE_OFFSET - it must be within 128MB of the kernel text. */ -#ifdef CONFIG_ARM64_64K_PAGES -#define VA_BITS (42) -#else -#define VA_BITS (39) -#endif +#define VA_BITS (CONFIG_ARM64_VA_BITS) #define PAGE_OFFSET (UL(0xffffffffffffffff) << (VA_BITS - 1)) #define MODULES_END (PAGE_OFFSET) #define MODULES_VADDR (MODULES_END - SZ_64M)