From patchwork Fri Jul 24 16:41:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Ryabinin X-Patchwork-Id: 6861921 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D1F099F358 for ; Fri, 24 Jul 2015 16:45:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E6958205DA for ; Fri, 24 Jul 2015 16:45:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15F0F2061F for ; Fri, 24 Jul 2015 16:45:21 +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 1ZIg4Q-0006GW-GG; Fri, 24 Jul 2015 16:43:38 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZIg3m-0005p3-U1 for linux-arm-kernel@lists.infradead.org; Fri, 24 Jul 2015 16:43:00 +0000 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS0007VN3QUA350@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 24 Jul 2015 17:42:30 +0100 (BST) X-AuditID: cbfec7f5-f794b6d000001495-7c-55b26af6b7ae Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 72.70.05269.6FA62B55; Fri, 24 Jul 2015 17:42:30 +0100 (BST) Received: from localhost.localdomain ([106.109.129.143]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS000K2K3Q21F90@eusync1.samsung.com>; Fri, 24 Jul 2015 17:42:30 +0100 (BST) From: Andrey Ryabinin To: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 3/7] arm64: introduce VA_START macro - the first kernel virtual address. Date: Fri, 24 Jul 2015 19:41:55 +0300 Message-id: <1437756119-12817-4-git-send-email-a.ryabinin@samsung.com> X-Mailer: git-send-email 2.4.5 In-reply-to: <1437756119-12817-1-git-send-email-a.ryabinin@samsung.com> References: <1437756119-12817-1-git-send-email-a.ryabinin@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrNLMWRmVeSWpSXmKPExsVy+t/xy7rfsjaFGrQ+57DY9usRm8Wc9WvY LP5OOsZu8X5ZD6PF7kvPmC0mPGxjt2j/uJfZ4tT5hywWU/4sZ7LY9Pgaq8XlXXPYLO6t+c9q 8fLjCRYHXo8189Ywevz+NYnR43JfL5PHzll32T0WbCr12PRpErvHnWt72DxOzPjN4rF5Sb1H 35ZVjB6fN8kFcEdx2aSk5mSWpRbp2yVwZXRv9yx4wFfxZ/lZxgbGpTxdjJwcEgImEkcWXWaC sMUkLtxbz9bFyMUhJLCUUeJ/w3Uop4lJYuq9BjaQKjYBPYl/s7aD2SICFRJXr05gBLGZBX4x SWyb5wBiCwvESpxuv8QOYrMIqEr0XtsLZvMKuElMPTATqJcDaJucxNLmWpAwp4C7RNOjsywg YSGgkgUbhSYw8i5gZFjFKJpamlxQnJSea6RXnJhbXJqXrpecn7uJERLEX3cwLj1mdYhRgINR iYf3wKSNoUKsiWXFlbmHGCU4mJVEeB08N4UK8aYkVlalFuXHF5XmpBYfYpTmYFES5525632I kEB6YklqdmpqQWoRTJaJg1OqgTHnz9GMmH7rWZNj3xfnMtVXvK+PFVj33oF9Wl2uK9fLOsub FrHMzFv2FHF9VGnh2NKi/Lzqivg/hU1if0oXtZnd279r3wSWR86Hn/ZtbJ8tVl+Z7Dp/pkvb v3VL/vxY4r7q50bheBObl18k7s4L+rZ947rLUtlW1vnCmdYLP7UH++WX9d7TuaHEUpyRaKjF XFScCAC6ZRJqXgIAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150724_094259_257832_34FB3DAD X-CRM114-Status: GOOD ( 16.30 ) X-Spam-Score: -8.1 (--------) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Klimov , Arnd Bergmann , linux-mm@kvack.org, Andrey Ryabinin , Linus Walleij , linux-kernel@vger.kernel.org, David Keitel , Alexander Potapenko , Andrew Morton , Dmitry Vyukov MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 In order to not use lengthy (UL(0xffffffffffffffff) << VA_BITS) everywhere, replace it with VA_START. Signed-off-by: Andrey Ryabinin Reviewed-by: Catalin Marinas --- arch/arm64/include/asm/memory.h | 2 ++ arch/arm64/include/asm/pgtable.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index f800d45..288c19d 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -42,12 +42,14 @@ * PAGE_OFFSET - the virtual address of the start of the kernel image (top * (VA_BITS - 1)) * VA_BITS - the maximum number of bits for virtual addresses. + * VA_START - the first kernel virtual address. * TASK_SIZE - the maximum size of a user space task. * TASK_UNMAPPED_BASE - the lower boundary of the mmap VM area. * The module space lives between the addresses given by TASK_SIZE * and PAGE_OFFSET - it must be within 128MB of the kernel text. */ #define VA_BITS (CONFIG_ARM64_VA_BITS) +#define VA_START (UL(0xffffffffffffffff) << VA_BITS) #define PAGE_OFFSET (UL(0xffffffffffffffff) << (VA_BITS - 1)) #define MODULES_END (PAGE_OFFSET) #define MODULES_VADDR (MODULES_END - SZ_64M) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 56283f8..a1f9f61 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -40,7 +40,7 @@ * fixed mappings and modules */ #define VMEMMAP_SIZE ALIGN((1UL << (VA_BITS - PAGE_SHIFT)) * sizeof(struct page), PUD_SIZE) -#define VMALLOC_START (UL(0xffffffffffffffff) << VA_BITS) +#define VMALLOC_START (VA_START) #define VMALLOC_END (PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - SZ_64K) #define vmemmap ((struct page *)(VMALLOC_END + SZ_64K))