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

Commit 1d07489a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Some ARM fixes, the biggest of which is the fix for the signal return
  codes; this came up due to an interaction between the V7M nommu
  changes and the BE8 changes.  Dave Martin spotted that the kexec
  trampoline wasn't being correctly copied (in a way which allows
  Thumb-2 to work).

  I've also fixed a number of breakages on footbridge platforms as I've
  upgraded one of my machines to v3.12...  one which had a 1200 day
  uptime"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 7907/1: lib: delay-loop: Add align directive to fix BogoMIPS calculation
  ARM: 7897/1: kexec: Use the right ISA for relocate_new_kernel
  ARM: 7895/1: signal: fix armv7-m build issue in sigreturn_codes.S
  ARM: footbridge: fix EBSA285 LEDs
  ARM: footbridge: fix VGA initialisation
  ARM: fix booting low-vectors machines
  ARM: dma-mapping: check DMA mask against available memory
parents af91706d 11d4bb1b

arch/arm/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ extern void __pgd_error(const char *file, int line, pgd_t); 
 * mapping to be mapped at.  This is particularly important for

 * non-high vector CPUs.

 */

#define FIRST_USER_ADDRESS	PAGE_SIZE

#define FIRST_USER_ADDRESS	(PAGE_SIZE * 2)



/*

 * Use TASK_SIZE as the ceiling argument for free_pgtables() and

arch/arm/kernel/machine_kexec.c

+10 −7
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ 
#include <asm/pgalloc.h>

#include <asm/mmu_context.h>

#include <asm/cacheflush.h>

#include <asm/fncpy.h>

#include <asm/mach-types.h>

#include <asm/smp_plat.h>

#include <asm/system_misc.h>



extern const unsigned char relocate_new_kernel[];

extern void relocate_new_kernel(void);

extern const unsigned int relocate_new_kernel_size;



extern unsigned long kexec_start_address;
@@ -142,6 +143,8 @@ void machine_kexec(struct kimage *image) 
{

	unsigned long page_list;

	unsigned long reboot_code_buffer_phys;

	unsigned long reboot_entry = (unsigned long)relocate_new_kernel;

	unsigned long reboot_entry_phys;

	void *reboot_code_buffer;



	/*
@@ -168,16 +171,16 @@ void machine_kexec(struct kimage *image) 




	/* copy our kernel relocation code to the control code page */

	memcpy(reboot_code_buffer,

	       relocate_new_kernel, relocate_new_kernel_size);

	reboot_entry = fncpy(reboot_code_buffer,

			     reboot_entry,

			     relocate_new_kernel_size);

	reboot_entry_phys = (unsigned long)reboot_entry +

		(reboot_code_buffer_phys - (unsigned long)reboot_code_buffer);





	flush_icache_range((unsigned long) reboot_code_buffer,

			   (unsigned long) reboot_code_buffer + KEXEC_CONTROL_PAGE_SIZE);

	printk(KERN_INFO "Bye!\n");



	if (kexec_reinit)

		kexec_reinit();



	soft_restart(reboot_code_buffer_phys);

	soft_restart(reboot_entry_phys);

}

arch/arm/kernel/relocate_kernel.S

+6 −2
Original line number Diff line number Diff line
@@ -2,10 +2,12 @@ 
 * relocate_kernel.S - put the kernel image in place to boot

 */



#include <linux/linkage.h>

#include <asm/kexec.h>



	.globl relocate_new_kernel

relocate_new_kernel:

	.align	3	/* not needed for this code, but keeps fncpy() happy */



ENTRY(relocate_new_kernel)



	ldr	r0,kexec_indirection_page

	ldr	r1,kexec_start_address
@@ -79,6 +81,8 @@ kexec_mach_type: 
kexec_boot_atags:

	.long	0x0



ENDPROC(relocate_new_kernel)



relocate_new_kernel_end:



	.globl relocate_new_kernel_size

arch/arm/kernel/sigreturn_codes.S

+31 −9
Original line number Diff line number Diff line
@@ -30,6 +30,27 @@ 
 * snippets.

 */



/*

 * In CPU_THUMBONLY case kernel arm opcodes are not allowed.

 * Note in this case codes skips those instructions but it uses .org

 * directive to keep correct layout of sigreturn_codes array.

 */

#ifndef CONFIG_CPU_THUMBONLY

#define ARM_OK(code...)	code

#else

#define ARM_OK(code...)

#endif



	.macro arm_slot n

	.org	sigreturn_codes + 12 * (\n)

ARM_OK(	.arm	)

	.endm



	.macro thumb_slot n

	.org	sigreturn_codes + 12 * (\n) + 8

	.thumb

	.endm



#if __LINUX_ARM_ARCH__ <= 4

	/*

	 * Note we manually set minimally required arch that supports
@@ -45,26 +66,27 @@ 
	.global sigreturn_codes

	.type	sigreturn_codes, #object



	.arm

	.align



sigreturn_codes:



	/* ARM sigreturn syscall code snippet */

	mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)

	swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)

	arm_slot 0

ARM_OK(	mov	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)	)

ARM_OK(	swi	#(__NR_sigreturn)|(__NR_OABI_SYSCALL_BASE)	)



	/* Thumb sigreturn syscall code snippet */

	.thumb

	thumb_slot 0

	movs	r7, #(__NR_sigreturn - __NR_SYSCALL_BASE)

	swi	#0



	/* ARM sigreturn_rt syscall code snippet */

	.arm

	mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)

	swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)

	arm_slot 1

ARM_OK(	mov	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)	)

ARM_OK(	swi	#(__NR_rt_sigreturn)|(__NR_OABI_SYSCALL_BASE)	)



	/* Thumb sigreturn_rt syscall code snippet */

	.thumb

	thumb_slot 1

	movs	r7, #(__NR_rt_sigreturn - __NR_SYSCALL_BASE)

	swi	#0
@@ -74,7 +96,7 @@ sigreturn_codes: 
	 * it is thumb case or not, so we need additional

	 * word after real last entry.

	 */

	.arm

	arm_slot 2

	.space	4



	.size	sigreturn_codes, . - sigreturn_codes

arch/arm/lib/delay-loop.S

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ ENTRY(__loop_const_udelay) @ 0 <= r0 <= 0x7fffff06 
/*

 * loops = r0 * HZ * loops_per_jiffy / 1000000

 */

		.align 3



@ Delay routine

ENTRY(__loop_delay)