Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a1e0052 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "A number of core ARM changes:

   - Refactoring linker script by Nicolas Pitre

   - Enable source fortification

   - Add support for Cortex R8"

* 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: decompressor: fix warning introduced in fortify patch
  ARM: 8751/1: Add support for Cortex-R8 processor
  ARM: 8749/1: Kconfig: Add ARCH_HAS_FORTIFY_SOURCE
  ARM: simplify and fix linker script for TCM
  ARM: linker script: factor out TCM bits
  ARM: linker script: factor out vectors and stubs
  ARM: linker script: factor out unwinding table sections
  ARM: linker script: factor out stuff for the .text section
  ARM: linker script: factor out stuff for the DISCARD section
  ARM: linker script: factor out some common definitions between XIP and non-XIP
parents 2025fef0 9178caf9

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config ARM 
	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_FORTIFY_SOURCE

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

arch/arm/boot/compressed/decompress.c

+1 −4
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ 
#include <linux/stddef.h>	/* for NULL */

#include <linux/linkage.h>

#include <asm/string.h>



extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;

extern void error(char *);

#include "misc.h"



#define STATIC static

#define STATIC_RW_DATA	/* non-static please */

arch/arm/boot/compressed/misc.c

+6 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ unsigned int __machine_arch_type; 
#include <linux/compiler.h>	/* for inline */

#include <linux/types.h>

#include <linux/linkage.h>

#include "misc.h"



static void putstr(const char *ptr);

extern void error(char *x);



#include CONFIG_UNCOMPRESS_INCLUDE
@@ -160,3 +160,8 @@ decompress_kernel(unsigned long output_start, unsigned long free_mem_ptr_p, 
	else

		putstr(" done, booting the kernel.\n");

}



void fortify_panic(const char *name)

{

	error("detected buffer overflow");

}

arch/arm/boot/compressed/misc.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#ifndef MISC_H

#define MISC_H



#include <linux/compiler.h>



void error(char *x) __noreturn;

extern unsigned long free_mem_ptr;

extern unsigned long free_mem_end_ptr;



#endif

arch/arm/kernel/vmlinux-xip.lds.S

+11 −155
Original line number Diff line number Diff line
@@ -15,38 +15,7 @@ 
#include <asm/memory.h>

#include <asm/page.h>



#define PROC_INFO							\

	. = ALIGN(4);							\

	VMLINUX_SYMBOL(__proc_info_begin) = .;				\

	*(.proc.info.init)						\

	VMLINUX_SYMBOL(__proc_info_end) = .;



#define IDMAP_TEXT							\

	ALIGN_FUNCTION();						\

	VMLINUX_SYMBOL(__idmap_text_start) = .;				\

	*(.idmap.text)							\

	VMLINUX_SYMBOL(__idmap_text_end) = .;				\

	. = ALIGN(PAGE_SIZE);						\

	VMLINUX_SYMBOL(__hyp_idmap_text_start) = .;			\

	*(.hyp.idmap.text)						\

	VMLINUX_SYMBOL(__hyp_idmap_text_end) = .;



#ifdef CONFIG_HOTPLUG_CPU

#define ARM_CPU_DISCARD(x)

#define ARM_CPU_KEEP(x)		x

#else

#define ARM_CPU_DISCARD(x)	x

#define ARM_CPU_KEEP(x)

#endif



#if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \

	defined(CONFIG_GENERIC_BUG)

#define ARM_EXIT_KEEP(x)	x

#define ARM_EXIT_DISCARD(x)

#else

#define ARM_EXIT_KEEP(x)

#define ARM_EXIT_DISCARD(x)	x

#endif

#include "vmlinux.lds.h"



OUTPUT_ARCH(arm)

ENTRY(stext)
@@ -69,20 +38,9 @@ SECTIONS 
	 * unwind sections get included.

	 */

	/DISCARD/ : {

		*(.ARM.exidx.exit.text)

		*(.ARM.extab.exit.text)

		ARM_CPU_DISCARD(*(.ARM.exidx.cpuexit.text))

		ARM_CPU_DISCARD(*(.ARM.extab.cpuexit.text))

		ARM_EXIT_DISCARD(EXIT_TEXT)

		ARM_EXIT_DISCARD(EXIT_DATA)

		EXIT_CALL

#ifndef CONFIG_MMU

		*(.text.fixup)

		*(__ex_table)

#endif

		ARM_DISCARD

		*(.alt.smp.init)

		*(.discard)

		*(.discard.*)

		*(.pv_table)

	}



	. = XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR);
@@ -95,22 +53,7 @@ SECTIONS 


	.text : {			/* Real text segment		*/

		_stext = .;		/* Text and read-only data	*/

			IDMAP_TEXT

			__entry_text_start = .;

			*(.entry.text)

			__entry_text_end = .;

			IRQENTRY_TEXT

			TEXT_TEXT

			SCHED_TEXT

			CPUIDLE_TEXT

			LOCK_TEXT

			KPROBES_TEXT

			*(.gnu.warning)

			*(.glue_7)

			*(.glue_7t)

		. = ALIGN(4);

		*(.got)			/* Global offset table		*/

			ARM_CPU_KEEP(PROC_INFO)

		ARM_TEXT

	}



	RO_DATA(PAGE_SIZE)
@@ -118,53 +61,19 @@ SECTIONS 
	. = ALIGN(4);

	__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {

		__start___ex_table = .;

#ifdef CONFIG_MMU

		*(__ex_table)

#endif

		ARM_MMU_KEEP(*(__ex_table))

		__stop___ex_table = .;

	}



#ifdef CONFIG_ARM_UNWIND

	/*

	 * Stack unwinding tables

	 */

	. = ALIGN(8);

	.ARM.unwind_idx : {

		__start_unwind_idx = .;

		*(.ARM.exidx*)

		__stop_unwind_idx = .;

	}

	.ARM.unwind_tab : {

		__start_unwind_tab = .;

		*(.ARM.extab*)

		__stop_unwind_tab = .;

	}

	ARM_UNWIND_SECTIONS

#endif



	NOTES



	_etext = .;			/* End of text and rodata section */



	/*

	 * The vectors and stubs are relocatable code, and the

	 * only thing that matters is their relative offsets

	 */

	__vectors_start = .;

	.vectors 0xffff0000 : AT(__vectors_start) {

		*(.vectors)

	}

	. = __vectors_start + SIZEOF(.vectors);

	__vectors_end = .;



	__stubs_start = .;

	.stubs ADDR(.vectors) + 0x1000 : AT(__stubs_start) {

		*(.stubs)

	}

	. = __stubs_start + SIZEOF(.stubs);

	__stubs_end = .;



	PROVIDE(vector_fiq_offset = vector_fiq - ADDR(.vectors));



	ARM_VECTORS

	INIT_TEXT_SECTION(8)

	.exit.text : {

		ARM_EXIT_KEEP(EXIT_TEXT)
@@ -223,6 +132,10 @@ SECTIONS 
	PERCPU_SECTION(L1_CACHE_BYTES)

#endif



#ifdef CONFIG_HAVE_TCM

	ARM_TCM

#endif



	/*

	 * End of copied data. We need a dummy section to get its LMA.

	 * Also located before final ALIGN() as trailing padding is not stored
@@ -234,63 +147,6 @@ SECTIONS 
	. = ALIGN(PAGE_SIZE);

	__init_end = .;



#ifdef CONFIG_HAVE_TCM

        /*

	 * We align everything to a page boundary so we can

	 * free it after init has commenced and TCM contents have

	 * been copied to its destination.

	 */

	.tcm_start : {

		. = ALIGN(PAGE_SIZE);

		__tcm_start = .;

		__itcm_start = .;

	}



	/*

	 * Link these to the ITCM RAM

	 * Put VMA to the TCM address and LMA to the common RAM

	 * and we'll upload the contents from RAM to TCM and free

	 * the used RAM after that.

	 */

	.text_itcm ITCM_OFFSET : AT(__itcm_start)

	{

		__sitcm_text = .;

		*(.tcm.text)

		*(.tcm.rodata)

		. = ALIGN(4);

		__eitcm_text = .;

	}



	/*

	 * Reset the dot pointer, this is needed to create the

	 * relative __dtcm_start below (to be used as extern in code).

	 */

	. = ADDR(.tcm_start) + SIZEOF(.tcm_start) + SIZEOF(.text_itcm);



	.dtcm_start : {

		__dtcm_start = .;

	}



	/* TODO: add remainder of ITCM as well, that can be used for data! */

	.data_dtcm DTCM_OFFSET : AT(__dtcm_start)

	{

		. = ALIGN(4);

		__sdtcm_data = .;

		*(.tcm.data)

		. = ALIGN(4);

		__edtcm_data = .;

	}



	/* Reset the dot pointer or the linker gets confused */

	. = ADDR(.dtcm_start) + SIZEOF(.data_dtcm);



	/* End marker for freeing TCM copy in linked object */

	.tcm_end : AT(ADDR(.dtcm_start) + SIZEOF(.data_dtcm)){

		. = ALIGN(PAGE_SIZE);

		__tcm_end = .;

	}

#endif



	BSS_SECTION(0, 0, 8)

	_end = .;