linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	linux@armlinux.org.uk, nicolas.pitre@linaro.org,
	panand@redhat.com, chris.brandt@renesas.com, arnd@arndb.de,
	jonathan.austin@arm.com, pawel.moll@arm.com,
	vladimir.murzin@arm.com, mark.rutland@arm.com,
	ard.biesheuvel@linaro.org, keescook@chromium.org,
	matt@codeblueprint.co.uk, labbott@fedoraproject.org,
	kirill.shutemov@linux.intel.com, ben@decadent.org.uk,
	js07.lee@samsung.com, stefan@agner.ch,
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 2/4] ARM: Define KERNEL_START and KERNEL_END
Date: Thu,  8 Dec 2016 10:59:31 -0800	[thread overview]
Message-ID: <20161208185933.13749-3-f.fainelli@gmail.com> (raw)
In-Reply-To: <20161208185933.13749-1-f.fainelli@gmail.com>

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.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 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. */
-- 
2.9.3

  parent reply	other threads:[~2016-12-08 19:01 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-06 23:50 [PATCHv5 00/11] CONFIG_DEBUG_VIRTUAL for arm64 Laura Abbott
2016-12-06 23:50 ` [PATCHv5 01/11] lib/Kconfig.debug: Add ARCH_HAS_DEBUG_VIRTUAL Laura Abbott
2016-12-06 23:50 ` [PATCHv5 02/11] mm/cma: Cleanup highmem check Laura Abbott
2016-12-06 23:50 ` [PATCHv5 03/11] arm64: Move some macros under #ifndef __ASSEMBLY__ Laura Abbott
2016-12-06 23:50 ` [PATCHv5 04/11] arm64: Add cast for virt_to_pfn Laura Abbott
2016-12-06 23:50 ` [PATCHv5 05/11] mm: Introduce lm_alias Laura Abbott
2016-12-06 23:50 ` [PATCHv5 06/11] arm64: Use __pa_symbol for kernel symbols Laura Abbott
2016-12-13 12:31   ` Mark Rutland
2016-12-06 23:50 ` [PATCHv5 07/11] drivers: firmware: psci: Use __pa_symbol for kernel symbol Laura Abbott
2016-12-06 23:50 ` [PATCHv5 08/11] kexec: Switch to __pa_symbol Laura Abbott
2016-12-06 23:50 ` [PATCHv5 09/11] mm/kasan: Switch to using __pa_symbol and lm_alias Laura Abbott
2016-12-13 12:31   ` Mark Rutland
2016-12-06 23:50 ` [PATCHv5 10/11] mm/usercopy: Switch to using lm_alias Laura Abbott
2016-12-06 23:50 ` [PATCHv5 11/11] arm64: Add support for CONFIG_DEBUG_VIRTUAL Laura Abbott
2016-12-08 18:59 ` [PATCH v2 0/4] ARM: " Florian Fainelli
2016-12-08 18:59   ` [PATCH v2 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2016-12-08 18:59   ` Florian Fainelli [this message]
2016-12-08 18:59   ` [PATCH v2 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-08 18:59   ` [PATCH v2 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2016-12-08 21:49     ` kbuild test robot
2016-12-09 23:36   ` [PATCH v3 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-09 23:36     ` [PATCH v3 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2016-12-14  7:08       ` Boris Brezillon
2016-12-09 23:36     ` [PATCH v3 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2016-12-09 23:36     ` [PATCH v3 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-22  2:40       ` Laura Abbott
2016-12-09 23:36     ` [PATCH v3 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2016-12-13 20:29     ` [PATCH v3 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-26 20:38     ` [PATCH v4 " Florian Fainelli
2016-12-26 20:38       ` [PATCH v4 1/4] mtd: lart: Rename partition defines to be prefixed with PART_ Florian Fainelli
2016-12-26 20:38       ` [PATCH v4 2/4] ARM: Define KERNEL_START and KERNEL_END Florian Fainelli
2016-12-26 20:38       ` [PATCH v4 3/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Florian Fainelli
2016-12-26 20:38       ` [PATCH v4 4/4] ARM: treewide: Replace uses of virt_to_phys with __pa_symbol Florian Fainelli
2017-01-02 14:10       ` [PATCH v4 0/4] ARM: Add support for CONFIG_DEBUG_VIRTUAL Russell King - ARM Linux
2016-12-13 13:50 ` [PATCHv5 00/11] CONFIG_DEBUG_VIRTUAL for arm64 Mark Rutland

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161208185933.13749-3-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=ard.biesheuvel@linaro.org \
    --cc=arnd@arndb.de \
    --cc=ben@decadent.org.uk \
    --cc=chris.brandt@renesas.com \
    --cc=jonathan.austin@arm.com \
    --cc=js07.lee@samsung.com \
    --cc=keescook@chromium.org \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=labbott@fedoraproject.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=mark.rutland@arm.com \
    --cc=matt@codeblueprint.co.uk \
    --cc=nicolas.pitre@linaro.org \
    --cc=panand@redhat.com \
    --cc=pawel.moll@arm.com \
    --cc=stefan@agner.ch \
    --cc=vladimir.murzin@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).