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

Commit ede1d63f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull second set of ARM changes from Russell King:
 "This is the remainder of the ARM changes for this merge window.
  Included in this request are:

   - fixes for kprobes for big-endian support
   - fix tracing in soft_restart
   - avoid phys address overflow in kdump code
   - fix reporting of read-only pmd bits in kernel page table dump
   - remove unnecessary (and possibly buggy) call to outer_flush_all()
   - fix a three sparse warnings (missing header file for function
     prototypes)
   - fix pj4 crashing single zImage (thanks to arm-soc merging changes
     which enables this with knowledge that the corresponding fix had
     not even been submitted for my tree before the merge window opened)
   - vfp macro cleanups
   - dump register state on undefined instruction userspace faults when
     debugging"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  Dump the registers on undefined instruction userspace faults
  ARM: 8018/1: Add {inc,dec}_preempt_count asm macros
  ARM: 8017/1: Move asm macro get_thread_info to asm/assembler.h
  ARM: 8016/1: Check cpu id in pj4_cp0_init.
  ARM: 8015/1: Add cpu_is_pj4 to distinguish PJ4 because it has some differences with V7
  ARM: add missing system_misc.h include to process.c
  ARM: 8009/1: dcscb.c: remove call to outer_flush_all()
  ARM: 8014/1: mm: fix reporting of read-only PMD bits
  ARM: 8012/1: kdump: Avoid overflow when converting pfn to physaddr
  ARM: 8010/1: avoid tracers in soft_restart
  ARM: kprobes-test: Workaround GAS .align bug
  ARM: kprobes-test: use <asm/opcodes.h> for Thumb instruction building
  ARM: kprobes-test: use <asm/opcodes.h> for ARM instruction building
  ARM: kprobes-test: use <asm/opcodes.h> for instruction accesses
  ARM: probes: fix instruction fetch order with <asm/opcodes.h>
parents b42e6dc6 98f07013

arch/arm/include/asm/assembler.h

+42 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/ptrace.h>

#include <asm/domain.h>

#include <asm/opcodes-virt.h>

#include <asm/asm-offsets.h>



#define IOMEM(x)	(x)
@@ -174,6 +175,47 @@ 
	restore_irqs_notrace \oldcpsr

	.endm



/*

 * Get current thread_info.

 */

	.macro	get_thread_info, rd

 ARM(	mov	\rd, sp, lsr #13	)

 THUMB(	mov	\rd, sp			)

 THUMB(	lsr	\rd, \rd, #13		)

	mov	\rd, \rd, lsl #13

	.endm



/*

 * Increment/decrement the preempt count.

 */

#ifdef CONFIG_PREEMPT_COUNT

	.macro	inc_preempt_count, ti, tmp

	ldr	\tmp, [\ti, #TI_PREEMPT]	@ get preempt count

	add	\tmp, \tmp, #1			@ increment it

	str	\tmp, [\ti, #TI_PREEMPT]

	.endm



	.macro	dec_preempt_count, ti, tmp

	ldr	\tmp, [\ti, #TI_PREEMPT]	@ get preempt count

	sub	\tmp, \tmp, #1			@ decrement it

	str	\tmp, [\ti, #TI_PREEMPT]

	.endm



	.macro	dec_preempt_count_ti, ti, tmp

	get_thread_info \ti

	dec_preempt_count \ti, \tmp

	.endm

#else

	.macro	inc_preempt_count, ti, tmp

	.endm



	.macro	dec_preempt_count, ti, tmp

	.endm



	.macro	dec_preempt_count_ti, ti, tmp

	.endm

#endif



#define USER(x...)				\

9999:	x;					\

	.pushsection __ex_table,"a";		\

arch/arm/include/asm/cputype.h

+19 −0
Original line number Diff line number Diff line
@@ -221,4 +221,23 @@ static inline int cpu_is_xsc3(void) 
#define	cpu_is_xscale()	1

#endif



/*

 * Marvell's PJ4 core is based on V7 version. It has some modification

 * for coprocessor setting. For this reason, we need a way to distinguish

 * it.

 */

#ifndef CONFIG_CPU_PJ4

#define cpu_is_pj4()	0

#else

static inline int cpu_is_pj4(void)

{

	unsigned int id;



	id = read_cpuid_id();

	if ((id & 0xfffffff0) == 0x562f5840)

		return 1;



	return 0;

}

#endif

#endif

arch/arm/kernel/crash_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, 
	if (!csize)

		return 0;



	vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);

	vaddr = ioremap(__pfn_to_phys(pfn), PAGE_SIZE);

	if (!vaddr)

		return -ENOMEM;

arch/arm/kernel/entry-header.S

+0 −11
Original line number Diff line number Diff line
@@ -236,11 +236,6 @@ 
	movs	pc, lr				@ return & move spsr_svc into cpsr

	.endm



	.macro	get_thread_info, rd

	mov	\rd, sp, lsr #13

	mov	\rd, \rd, lsl #13

	.endm



	@

	@ 32-bit wide "mov pc, reg"

	@
@@ -306,12 +301,6 @@ 
	.endm

#endif	/* ifdef CONFIG_CPU_V7M / else */



	.macro	get_thread_info, rd

	mov	\rd, sp

	lsr	\rd, \rd, #13

	mov	\rd, \rd, lsl #13

	.endm



	@

	@ 32-bit wide "mov pc, reg"

	@

arch/arm/kernel/kprobes-common.c

+3 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include <linux/kernel.h>

#include <linux/kprobes.h>

#include <asm/opcodes.h>



#include "kprobes.h"
@@ -153,7 +154,8 @@ kprobe_decode_ldmstm(probes_opcode_t insn, struct arch_probes_insn *asi, 


	if (handler) {

		/* We can emulate the instruction in (possibly) modified form */

		asi->insn[0] = (insn & 0xfff00000) | (rn << 16) | reglist;

		asi->insn[0] = __opcode_to_mem_arm((insn & 0xfff00000) |

						   (rn << 16) | reglist);

		asi->insn_handler = handler;

		return INSN_GOOD;

	}