Commit 87dfd85c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM updates from Russell King:

 - Refactor VFP code and convert to C code (Ard Biesheuvel)

 - Fix hardware breakpoint single-stepping using bpf_overflow_handler

 - Make SMP stop calls asynchronous allowing panic from irq context to
   work

 - Fix for kernel-doc warnings for locomo

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  Revert part of ae1f8d79 ("ARM: 9304/1: add prototype for function called only from asm")
  ARM: 9318/1: locomo: move kernel-doc to prevent warnings
  ARM: 9317/1: kexec: Make smp stop calls asynchronous
  ARM: 9316/1: hw_breakpoint: fix single-stepping when using bpf_overflow_handler
  ARM: entry: Make asm coproc dispatch code NWFPE only
  ARM: iwmmxt: Use undef hook to enable coprocessor for task
  ARM: entry: Disregard Thumb undef exception in coproc dispatch
  ARM: vfp: Use undef hook for handling VFP exceptions
  ARM: kernel: Get rid of thread_info::used_cp[] array
  ARM: vfp: Reimplement VFP exception entry in C code
  ARM: vfp: Remove workaround for Feroceon CPUs
  ARM: vfp: Record VFP bounces as perf emulation faults
parents 4ad0a4c2 133789d4

arch/arm/common/locomo.c

+15 −13
Original line number Diff line number Diff line
@@ -350,19 +350,6 @@ static int locomo_resume(struct platform_device *dev) 
}

#endif





/**

 *	locomo_probe - probe for a single LoCoMo chip.

 *	@phys_addr: physical address of device.

 *

 *	Probe for a LoCoMo chip.  This must be called

 *	before any other locomo-specific code.

 *

 *	Returns:

 *	%-ENODEV	device not found.

 *	%-EBUSY		physical address already marked in-use.

 *	%0		successful.

 */

static int

__locomo_probe(struct device *me, struct resource *mem, int irq)

{
@@ -479,6 +466,21 @@ static void __locomo_remove(struct locomo *lchip) 
	kfree(lchip);

}



/**

 *	locomo_probe - probe for a single LoCoMo chip.

 *	@dev: platform device

 *

 *	Probe for a LoCoMo chip.  This must be called

 *	before any other locomo-specific code.

 *

 *	Returns:

 *	* %-EINVAL	- device's IORESOURCE_MEM not found

 *	* %-ENXIO	- could not allocate an IRQ for the device

 *	* %-ENODEV	- device not found.

 *	* %-EBUSY	- physical address already marked in-use.

 *	* %-ENOMEM	- could not allocate or iomap memory.

 *	* %0		- successful.

 */

static int locomo_probe(struct platform_device *dev)

{

	struct resource *mem;

arch/arm/include/asm/thread_info.h

+16 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct task_struct; 
DECLARE_PER_CPU(struct task_struct *, __entry_task);



#include <asm/types.h>

#include <asm/traps.h>



struct cpu_context_save {

	__u32	r4;
@@ -66,7 +67,6 @@ struct thread_info { 
	__u32			cpu_domain;	/* cpu domain */

	struct cpu_context_save	cpu_context;	/* cpu context */

	__u32			abi_syscall;	/* ABI type and syscall nr */

	__u8			used_cp[16];	/* thread used copro */

	unsigned long		tp_value[2];	/* TLS registers */

	union fp_state		fpstate __attribute__((aligned(8)));

	union vfp_state		vfpstate;
@@ -105,6 +105,21 @@ extern void iwmmxt_task_restore(struct thread_info *, void *); 
extern void iwmmxt_task_release(struct thread_info *);

extern void iwmmxt_task_switch(struct thread_info *);



extern int iwmmxt_undef_handler(struct pt_regs *, u32);



static inline void register_iwmmxt_undef_handler(void)

{

	static struct undef_hook iwmmxt_undef_hook = {

		.instr_mask	= 0x0c000e00,

		.instr_val	= 0x0c000000,

		.cpsr_mask	= MODE_MASK | PSR_T_BIT,

		.cpsr_val	= USR_MODE,

		.fn		= iwmmxt_undef_handler,

	};



	register_undef_hook(&iwmmxt_undef_hook);

}



extern void vfp_sync_hwstate(struct thread_info *);

extern void vfp_flush_hwstate(struct thread_info *);

arch/arm/include/asm/vfp.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 


#ifndef __ASSEMBLY__

void vfp_disable(void);

void VFP_bounce(u32 trigger, u32 fpexc, struct pt_regs *regs);

#endif



#endif /* __ASM_VFP_H */

arch/arm/kernel/asm-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ int main(void) 
  DEFINE(TI_CPU_DOMAIN,		offsetof(struct thread_info, cpu_domain));

  DEFINE(TI_CPU_SAVE,		offsetof(struct thread_info, cpu_context));

  DEFINE(TI_ABI_SYSCALL,	offsetof(struct thread_info, abi_syscall));

  DEFINE(TI_USED_CP,		offsetof(struct thread_info, used_cp));

  DEFINE(TI_TP_VALUE,		offsetof(struct thread_info, tp_value));

  DEFINE(TI_FPSTATE,		offsetof(struct thread_info, fpstate));

#ifdef CONFIG_VFP

arch/arm/kernel/entry-armv.S

+10 −242
Original line number Diff line number Diff line
@@ -446,258 +446,26 @@ ENDPROC(__irq_usr) 
__und_usr:

	usr_entry uaccess=0



	mov	r2, r4

	mov	r3, r5



	@ r2 = regs->ARM_pc, which is either 2 or 4 bytes ahead of the

	@      faulting instruction depending on Thumb mode.

	@ r3 = regs->ARM_cpsr

	@

	@ The emulation code returns using r9 if it has emulated the

	@ instruction, or the more conventional lr if we are to treat

	@ this as a real undefined instruction

	@

	badr	r9, ret_from_exception



	@ IRQs must be enabled before attempting to read the instruction from

	@ user space since that could cause a page/translation fault if the

	@ page table was modified by another CPU.

	enable_irq



	tst	r3, #PSR_T_BIT			@ Thumb mode?

	bne	__und_usr_thumb

	sub	r4, r2, #4			@ ARM instr at LR - 4

1:	ldrt	r0, [r4]

 ARM_BE8(rev	r0, r0)				@ little endian instruction



	uaccess_disable ip



	@ r0 = 32-bit ARM instruction which caused the exception

	@ r2 = PC value for the following instruction (:= regs->ARM_pc)

	@ r4 = PC value for the faulting instruction

	@ lr = 32-bit undefined instruction function

	badr	lr, __und_usr_fault_32

	b	call_fpe



__und_usr_thumb:

	@ Thumb instruction

	sub	r4, r2, #2			@ First half of thumb instr at LR - 2

#if CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7

/*

 * Thumb-2 instruction handling.  Note that because pre-v6 and >= v6 platforms

 * can never be supported in a single kernel, this code is not applicable at

 * all when __LINUX_ARM_ARCH__ < 6.  This allows simplifying assumptions to be

 * made about .arch directives.

 */

#if __LINUX_ARM_ARCH__ < 7

/* If the target CPU may not be Thumb-2-capable, a run-time check is needed: */

	ldr_va	r5, cpu_architecture

	cmp	r5, #CPU_ARCH_ARMv7

	blo	__und_usr_fault_16		@ 16bit undefined instruction

/*

 * The following code won't get run unless the running CPU really is v7, so

 * coding round the lack of ldrht on older arches is pointless.  Temporarily

 * override the assembler target arch with the minimum required instead:

 */

	.arch	armv6t2

	tst	r5, #PSR_T_BIT			@ Thumb mode?

	mov	r1, #2				@ set insn size to 2 for Thumb

	bne	0f				@ handle as Thumb undef exception

#ifdef CONFIG_FPE_NWFPE

	adr	r9, ret_from_exception

	bl	call_fpe			@ returns via R9 on success

#endif

2:	ldrht	r5, [r4]

ARM_BE8(rev16	r5, r5)				@ little endian instruction

	cmp	r5, #0xe800			@ 32bit instruction if xx != 0

	blo	__und_usr_fault_16_pan		@ 16bit undefined instruction

3:	ldrht	r0, [r2]

ARM_BE8(rev16	r0, r0)				@ little endian instruction

	mov	r1, #4				@ set insn size to 4 for ARM

0:	mov	r0, sp

	uaccess_disable ip

	add	r2, r2, #2			@ r2 is PC + 2, make it PC + 4

	str	r2, [sp, #S_PC]			@ it's a 2x16bit instr, update

	orr	r0, r0, r5, lsl #16

	badr	lr, __und_usr_fault_32

	@ r0 = the two 16-bit Thumb instructions which caused the exception

	@ r2 = PC value for the following Thumb instruction (:= regs->ARM_pc)

	@ r4 = PC value for the first 16-bit Thumb instruction

	@ lr = 32bit undefined instruction function



#if __LINUX_ARM_ARCH__ < 7

/* If the target arch was overridden, change it back: */

#ifdef CONFIG_CPU_32v6K

	.arch	armv6k

#else

	.arch	armv6

#endif

#endif /* __LINUX_ARM_ARCH__ < 7 */

#else /* !(CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7) */

	b	__und_usr_fault_16

#endif

	bl	__und_fault

	b	ret_from_exception

 UNWIND(.fnend)

ENDPROC(__und_usr)



/*

 * The out of line fixup for the ldrt instructions above.

 */

	.pushsection .text.fixup, "ax"

	.align	2

4:	str     r4, [sp, #S_PC]			@ retry current instruction

	ret	r9

	.popsection

	.pushsection __ex_table,"a"

	.long	1b, 4b

#if CONFIG_ARM_THUMB && __LINUX_ARM_ARCH__ >= 6 && CONFIG_CPU_V7

	.long	2b, 4b

	.long	3b, 4b

#endif

	.popsection



/*

 * Check whether the instruction is a co-processor instruction.

 * If yes, we need to call the relevant co-processor handler.

 *

 * Note that we don't do a full check here for the co-processor

 * instructions; all instructions with bit 27 set are well

 * defined.  The only instructions that should fault are the

 * co-processor instructions.  However, we have to watch out

 * for the ARM6/ARM7 SWI bug.

 *

 * NEON is a special case that has to be handled here. Not all

 * NEON instructions are co-processor instructions, so we have

 * to make a special case of checking for them. Plus, there's

 * five groups of them, so we have a table of mask/opcode pairs

 * to check against, and if any match then we branch off into the

 * NEON handler code.

 *

 * Emulators may wish to make use of the following registers:

 *  r0  = instruction opcode (32-bit ARM or two 16-bit Thumb)

 *  r2  = PC value to resume execution after successful emulation

 *  r9  = normal "successful" return address

 *  r10 = this threads thread_info structure

 *  lr  = unrecognised instruction return address

 * IRQs enabled, FIQs enabled.

 */

	@

	@ Fall-through from Thumb-2 __und_usr

	@

#ifdef CONFIG_NEON

	get_thread_info r10			@ get current thread

	adr	r6, .LCneon_thumb_opcodes

	b	2f

#endif

call_fpe:

	get_thread_info r10			@ get current thread

#ifdef CONFIG_NEON

	adr	r6, .LCneon_arm_opcodes

2:	ldr	r5, [r6], #4			@ mask value

	ldr	r7, [r6], #4			@ opcode bits matching in mask

	cmp	r5, #0				@ end mask?

	beq	1f

	and	r8, r0, r5

	cmp	r8, r7				@ NEON instruction?

	bne	2b

	mov	r7, #1

	strb	r7, [r10, #TI_USED_CP + 10]	@ mark CP#10 as used

	strb	r7, [r10, #TI_USED_CP + 11]	@ mark CP#11 as used

	b	do_vfp				@ let VFP handler handle this

1:

#endif

	tst	r0, #0x08000000			@ only CDP/CPRT/LDC/STC have bit 27

	tstne	r0, #0x04000000			@ bit 26 set on both ARM and Thumb-2

	reteq	lr

	and	r8, r0, #0x00000f00		@ mask out CP number

	mov	r7, #1

	add	r6, r10, r8, lsr #8		@ add used_cp[] array offset first

	strb	r7, [r6, #TI_USED_CP]		@ set appropriate used_cp[]

#ifdef CONFIG_IWMMXT

	@ Test if we need to give access to iWMMXt coprocessors

	ldr	r5, [r10, #TI_FLAGS]

	rsbs	r7, r8, #(1 << 8)		@ CP 0 or 1 only

	movscs	r7, r5, lsr #(TIF_USING_IWMMXT + 1)

	bcs	iwmmxt_task_enable

#endif

 ARM(	add	pc, pc, r8, lsr #6	)

 THUMB(	lsr	r8, r8, #6		)

 THUMB(	add	pc, r8			)

	nop



	ret.w	lr				@ CP#0

	W(b)	do_fpe				@ CP#1 (FPE)

	W(b)	do_fpe				@ CP#2 (FPE)

	ret.w	lr				@ CP#3

	ret.w	lr				@ CP#4

	ret.w	lr				@ CP#5

	ret.w	lr				@ CP#6

	ret.w	lr				@ CP#7

	ret.w	lr				@ CP#8

	ret.w	lr				@ CP#9

#ifdef CONFIG_VFP

	W(b)	do_vfp				@ CP#10 (VFP)

	W(b)	do_vfp				@ CP#11 (VFP)

#else

	ret.w	lr				@ CP#10 (VFP)

	ret.w	lr				@ CP#11 (VFP)

#endif

	ret.w	lr				@ CP#12

	ret.w	lr				@ CP#13

	ret.w	lr				@ CP#14 (Debug)

	ret.w	lr				@ CP#15 (Control)



#ifdef CONFIG_NEON

	.align	6



.LCneon_arm_opcodes:

	.word	0xfe000000			@ mask

	.word	0xf2000000			@ opcode



	.word	0xff100000			@ mask

	.word	0xf4000000			@ opcode



	.word	0x00000000			@ mask

	.word	0x00000000			@ opcode



.LCneon_thumb_opcodes:

	.word	0xef000000			@ mask

	.word	0xef000000			@ opcode



	.word	0xff100000			@ mask

	.word	0xf9000000			@ opcode



	.word	0x00000000			@ mask

	.word	0x00000000			@ opcode

#endif



do_fpe:

	add	r10, r10, #TI_FPSTATE		@ r10 = workspace

	ldr_va	pc, fp_enter, tmp=r4		@ Call FP module USR entry point



/*

 * The FP module is called with these registers set:

 *  r0  = instruction

 *  r2  = PC+4

 *  r9  = normal "successful" return address

 *  r10 = FP workspace

 *  lr  = unrecognised FP instruction return address

 */



	.pushsection .data

	.align	2

ENTRY(fp_enter)

	.word	no_fp

	.popsection



ENTRY(no_fp)

	ret	lr

ENDPROC(no_fp)



__und_usr_fault_32:

	mov	r1, #4

	b	1f

__und_usr_fault_16_pan:

	uaccess_disable ip

__und_usr_fault_16:

	mov	r1, #2

1:	mov	r0, sp

	badr	lr, ret_from_exception

	b	__und_fault

ENDPROC(__und_usr_fault_32)

ENDPROC(__und_usr_fault_16)



	.align	5

__pabt_usr:

	usr_entry