From: peter@hurleysoftware•com (Peter Hurley)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: xip: Use correct symbol for end of ROM marker
Date: Thu, 12 Nov 2015 07:17:47 -0500 [thread overview]
Message-ID: <5644836B.2050608@hurleysoftware.com> (raw)
In-Reply-To: <1447251455-22731-1-git-send-email-chris.brandt@renesas.com>
On 11/11/2015 09:17 AM, Chris Brandt wrote:
> For an XIP build, _edata_loc, not _etext, represents the end of the
> binary image that will be programmed into ROM and mapped into the
> MODULES_VADDR area.
> With an XIP kernel, nothing is loaded into RAM before boot, meaning
> you have to take into account the size of the entire binary image
> that was programmed, including the init data values that will be copied
> to RAM during kernel boot.
>
> This fixes the bug where you might lose the end of your kernel area
> after page table setup is complete.
>
>
> Signed-off-by: Chris Brandt <chris.brandt@renesas•com>
> ---
> arch/arm/mm/mmu.c | 4 ++--
> include/asm-generic/sections.h | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
> index 4867f5d..dd5a56b 100644
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@ -1210,7 +1210,7 @@ static inline void prepare_page_table(void)
>
> #ifdef CONFIG_XIP_KERNEL
> /* The XIP kernel is mapped in the module area -- skip over it */
> - addr = ((unsigned long)_etext + PMD_SIZE - 1) & PMD_MASK;
> + addr = ((unsigned long)_edata_loc + PMD_SIZE - 1) & PMD_MASK;
> #endif
> for ( ; addr < PAGE_OFFSET; addr += PMD_SIZE)
> pmd_clear(pmd_off_k(addr));
> @@ -1292,7 +1292,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
> #ifdef CONFIG_XIP_KERNEL
> map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
> map.virtual = MODULES_VADDR;
> - map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
> + map.length = ((unsigned long)_edata_loc - map.virtual + ~SECTION_MASK) & SECTION_MASK;
> map.type = MT_ROM;
> create_mapping(&map);
> #endif
> diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
> index b58fd66..195554d 100644
> --- a/include/asm-generic/sections.h
> +++ b/include/asm-generic/sections.h
> @@ -26,7 +26,7 @@
> * __ctors_start, __ctors_end
> */
> extern char _text[], _stext[], _etext[];
> -extern char _data[], _sdata[], _edata[];
> +extern char _data[], _sdata[], _edata[], _edata_loc[];
> extern char __bss_start[], __bss_stop[];
> extern char __init_begin[], __init_end[];
> extern char _sinittext[], _einittext[];
>
I think below is required as well.
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -34,7 +36,7 @@
* recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off.
*/
#undef MODULES_VADDR
-#define MODULES_VADDR (((unsigned long)_etext + ~PMD_MASK) & PMD_MASK)
+#define MODULES_VADDR (((unsigned long)_edata_loc + ~PMD_MASK) & PMD_MASK)
#endif
Regards,
Peter Hurley
next prev parent reply other threads:[~2015-11-12 12:17 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-11 14:17 [PATCH] ARM: xip: Use correct symbol for end of ROM marker Chris Brandt
2015-11-12 12:17 ` Peter Hurley [this message]
2015-11-12 13:15 ` Chris Brandt
2015-11-12 16:32 ` Russell King - ARM Linux
2015-11-12 21:01 ` [PATCH v2] " Chris Brandt
2015-11-13 7:46 ` Geert Uytterhoeven
2015-11-13 20:03 ` Chris Brandt
2015-11-16 18:05 ` [PATCH v3] " Chris Brandt
2015-11-16 18:17 ` Russell King - ARM Linux
2015-11-16 19:46 ` Chris Brandt
2015-11-16 19:53 ` Russell King - ARM Linux
2015-11-16 20:18 ` Chris Brandt
2015-11-16 20:30 ` Russell King - ARM Linux
2015-11-16 20:57 ` Nicolas Pitre
2015-11-16 21:09 ` Chris Brandt
2015-11-16 20:27 ` Nicolas Pitre
2015-11-16 21:02 ` Chris Brandt
2015-11-16 21:47 ` Nicolas Pitre
2015-11-16 22:19 ` Chris Brandt
2015-11-17 0:48 ` Nicolas Pitre
2015-11-17 2:11 ` Chris Brandt
2015-11-17 2:37 ` Nicolas Pitre
2015-11-17 16:56 ` Chris Brandt
2015-11-17 17:24 ` Nicolas Pitre
2015-11-18 3:58 ` Nicolas Pitre
2015-11-18 5:12 ` Magnus Damm
2015-11-18 13:45 ` Nicolas Pitre
2015-11-18 17:01 ` Nicolas Pitre
2015-11-18 19:12 ` Chris Brandt
2015-11-18 20:23 ` Nicolas Pitre
2015-11-18 20:51 ` Chris Brandt
2015-11-18 21:36 ` Nicolas Pitre
2016-01-29 21:12 ` Chris Brandt
2016-01-29 21:17 ` Nicolas Pitre
2015-11-17 16:45 ` Chris Brandt
2015-11-17 16:57 ` Nicolas Pitre
2015-11-18 2:09 ` Chris Brandt
2015-11-18 3:17 ` Nicolas Pitre
2015-11-18 8:30 ` Arnd Bergmann
2015-11-18 15:28 ` Chris Brandt
2015-11-18 15:16 ` Chris Brandt
2015-11-18 17:07 ` Nicolas Pitre
2015-11-18 19:36 ` Chris Brandt
2015-11-18 19:44 ` Nicolas Pitre
2015-11-18 20:00 ` Chris Brandt
2015-11-17 17:33 ` Russell King - ARM Linux
2016-02-01 17:52 ` [PATCH v4] " Chris Brandt
2016-02-01 19:12 ` Nicolas Pitre
2016-02-01 19:41 ` Chris Brandt
2016-02-01 20:23 ` Nicolas Pitre
2016-02-02 17:05 ` Chris Brandt
2016-02-02 17:19 ` [PATCH v5] " Chris Brandt
2016-02-02 17:35 ` Nicolas Pitre
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=5644836B.2050608@hurleysoftware.com \
--to=peter@hurleysoftware$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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