From patchwork Wed Jan 4 01:14:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 9495985 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 22B5B606B4 for ; Wed, 4 Jan 2017 01:17:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1508C2711E for ; Wed, 4 Jan 2017 01:17:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 099C427829; Wed, 4 Jan 2017 01:17:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 9FCC42711E for ; Wed, 4 Jan 2017 01:17:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cOaB4-00065D-Oc; Wed, 04 Jan 2017 01:15:42 +0000 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cOaAL-0004aR-Qg; Wed, 04 Jan 2017 01:14:59 +0000 Received: by mail-pg0-x242.google.com with SMTP id i5so35193612pgh.2; Tue, 03 Jan 2017 17:14:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Qg6uomNnSwU6+fGbHQOmGRp2uv2OnDw9dkLRbVQ+jo4=; b=LY+nPnuzzspRGwiJrc0YskmCfdu12bMQqFxMbP7b8hGbQAY2FCPm1x93vkIGgLZ7mr OP39w3b66mT/TickPfe767ByBKLyeAntXQOLM5d+b4e0TvK2k/hUHnGYtXK9+khcMKAv dsd944n7DM1Ib2RxHW2zd6bOanuZUFXvtrX82YMucDQRbAex4OLASC9igtyr6kVvvIJg hkue5o/yZqmCZink4mjJiZll7otS5ATBHXQnjBaKo/5HkycMazC1lWqmL0dIocAzEScY xFGICqoaTYaMI1Od9AftU00BHhwGf4H024uoc/a7eDD8/twLmf0m8ztKKY0+jIMuzFCX 5RFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Qg6uomNnSwU6+fGbHQOmGRp2uv2OnDw9dkLRbVQ+jo4=; b=IPXLCtaVtqk6DfmHnBinH0fjDeTU7SRXbnwykTHco26OJsWEsv6o4Fv6UW8fSvUegw eRmBniwNnY3TWr4umMPzrHHD9FIgom838s/DI51yIIWXlsDHlhWgDfEt0Fxb4rl77tTa VkUWbITiirQ6muEj2gxrowRbHvBGT03WexMk0FRfaNQObMjqmRIuZiFp0iAWH7ON9BLH 7YoIsunWcCx4VvsQaWWAhcFHGaKkuxkklxRkdt6Wp4V7B37NI6TExeOvWKZmCA0G0BDB xlYLYUg4XFQ1nxYbuhwxJ8aNqRSs6BEn5gMQ5unTTtxLPar41Mvs1pxNSRMWct7A8Pu2 OvWw== X-Gm-Message-State: AIkVDXIiKF8kBhAteBOzcT0Yj6Aa4nGbeNwuxJlRXppzkRUCNHS+Z0oj1Bc5w9otlUFriA== X-Received: by 10.99.135.200 with SMTP id i191mr120222634pge.162.1483492476860; Tue, 03 Jan 2017 17:14:36 -0800 (PST) Received: from fainelli-desktop.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id 64sm142574551pfu.17.2017.01.03.17.14.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Jan 2017 17:14:36 -0800 (PST) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org, catalin.marinas@arm.com Subject: [PATCH v5 2/4] ARM: Define KERNEL_START and KERNEL_END Date: Tue, 3 Jan 2017 17:14:15 -0800 Message-Id: <20170104011417.1496-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170104011417.1496-1-f.fainelli@gmail.com> References: <20170104011417.1496-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170103_171458_046371_259A7BAF X-CRM114-Status: GOOD ( 10.25 ) 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: nicolas.pitre@linaro.org, mark.rutland@arm.com, matt@codeblueprint.co.uk, will.deacon@arm.com, stefan@agner.ch, chris.brandt@renesas.com, linux-mtd@lists.infradead.org, cyrille.pitchen@atmel.com, panand@redhat.com, boris.brezillon@free-electrons.com, Florian Fainelli , pawel.moll@arm.com, richard@nod.at, linux@armlinux.org.uk, ben@decadent.org.uk, vladimir.murzin@arm.com, keescook@chromium.org, arnd@arndb.de, labbott@fedoraproject.org, jonathan.austin@arm.com, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, computersforpeace@gmail.com, dwmw2@infradead.org, kirill.shutemov@linux.intel.com, js07.lee@samsung.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for adding CONFIG_DEBUG_VIRTUAL support, define a set of common constants: KERNEL_START and KERNEL_END which abstract CONFIG_XIP_KERNEL vs. !CONFIG_XIP_KERNEL. Update the code where relevant. Acked-by: Russell King Signed-off-by: Florian Fainelli --- arch/arm/include/asm/memory.h | 7 +++++++ arch/arm/mm/init.c | 7 ++----- arch/arm/mm/mmu.c | 6 +----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 76cbd9c674df..bee7511c5098 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -111,6 +111,13 @@ #endif /* !CONFIG_MMU */ +#ifdef CONFIG_XIP_KERNEL +#define KERNEL_START _sdata +#else +#define KERNEL_START _stext +#endif +#define KERNEL_END _end + /* * We fix the TCM memories max 32 KiB ITCM resp DTCM at these * locations diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 370581aeb871..c87d0d5b65f2 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -230,11 +230,8 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align) void __init arm_memblock_init(const struct machine_desc *mdesc) { /* Register the kernel text, kernel data and initrd with memblock. */ -#ifdef CONFIG_XIP_KERNEL - memblock_reserve(__pa(_sdata), _end - _sdata); -#else - memblock_reserve(__pa(_stext), _end - _stext); -#endif + memblock_reserve(__pa(KERNEL_START), _end - KERNEL_START); + #ifdef CONFIG_BLK_DEV_INITRD /* FDT scan will populate initrd_start */ if (initrd_start && !phys_initrd_size) { diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 4001dd15818d..f0fd1a2db036 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1437,11 +1437,7 @@ static void __init kmap_init(void) static void __init map_lowmem(void) { struct memblock_region *reg; -#ifdef CONFIG_XIP_KERNEL - phys_addr_t kernel_x_start = round_down(__pa(_sdata), SECTION_SIZE); -#else - phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE); -#endif + phys_addr_t kernel_x_start = round_down(__pa(KERNEL_START), SECTION_SIZE); phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE); /* Map all the lowmem memory banks. */