| Message ID | 20170104011417.1496-3-f.fainelli@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
On Tuesday, January 03, 2017 6:14 PM, Florian Fainelli wrote: > > 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 <rmk+kernel@armlinux.org.uk> > 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); Shouldn't the '_end' above be 'KERNEL_END'? Hartley
On 01/04/2017 07:58 AM, Hartley Sweeten wrote: > On Tuesday, January 03, 2017 6:14 PM, Florian Fainelli wrote: >> >> 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 <rmk+kernel@armlinux.org.uk> >> 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); > > Shouldn't the '_end' above be 'KERNEL_END'? I sort of intentionally not changed that line in order not to make the line exceed 80 columns and make checkpatch whine about it, but if you think this is clearer, I can add this change, since I need to respin to address Laura's feedback anyway. Thanks!
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. */