Commit 94559a4a 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:
 "Various assorted fixes:

   - a couple of patches from Mark Rutland to resolve an errata with
     Cortex-A15 CPUs.
   - fix cpuidle for the CPU part ID changes in the last merge window
   - add support for a relocation which ARM binutils is generating in
     some circumstances"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8130/1: cpuidle/cpuidle-big_little: fix reading cpu id part number
  ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex
  ARM: 8128/1: abort: don't clear the exclusive monitors
  ARM: 8127/1: module: add support for R_ARM_TARGET1 relocations
parents 19ed3eb9 eba1c718

arch/arm/include/asm/cacheflush.h

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ static inline void __sync_cache_range_r(volatile void *p, size_t size) 
	"mcr	p15, 0, r0, c1, c0, 0	@ set SCTLR \n\t" \

	"isb	\n\t" \

	"bl	v7_flush_dcache_"__stringify(level)" \n\t" \

	"clrex	\n\t" \

	"mrc	p15, 0, r0, c1, c0, 1	@ get ACTLR \n\t" \

	"bic	r0, r0, #(1 << 6)	@ disable local coherency \n\t" \

	"mcr	p15, 0, r0, c1, c0, 1	@ set ACTLR \n\t" \

arch/arm/include/asm/cputype.h

+2 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#define ARM_CPU_PART_CORTEX_A12		0x4100c0d0

#define ARM_CPU_PART_CORTEX_A17		0x4100c0e0

#define ARM_CPU_PART_CORTEX_A15		0x4100c0f0

#define ARM_CPU_PART_MASK		0xff00fff0



#define ARM_CPU_XSCALE_ARCH_MASK	0xe000

#define ARM_CPU_XSCALE_ARCH_V1		0x2000
@@ -179,7 +180,7 @@ static inline unsigned int __attribute_const__ read_cpuid_implementor(void) 
 */

static inline unsigned int __attribute_const__ read_cpuid_part(void)

{

	return read_cpuid_id() & 0xff00fff0;

	return read_cpuid_id() & ARM_CPU_PART_MASK;

}



static inline unsigned int __attribute_const__ __deprecated read_cpuid_part_number(void)

arch/arm/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; 
#define R_ARM_ABS32		2

#define R_ARM_CALL		28

#define R_ARM_JUMP24		29

#define R_ARM_TARGET1		38

#define R_ARM_V4BX		40

#define R_ARM_PREL31		42

#define R_ARM_MOVW_ABS_NC	43

arch/arm/include/asm/smp_plat.h

+15 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/cpumask.h>

#include <linux/err.h>



#include <asm/cpu.h>

#include <asm/cputype.h>



/*
@@ -25,6 +26,20 @@ static inline bool is_smp(void) 
#endif

}



/**

 * smp_cpuid_part() - return part id for a given cpu

 * @cpu:	logical cpu id.

 *

 * Return: part id of logical cpu passed as argument.

 */

static inline unsigned int smp_cpuid_part(int cpu)

{

	struct cpuinfo_arm *cpu_info = &per_cpu(cpu_data, cpu);



	return is_smp() ? cpu_info->cpuid & ARM_CPU_PART_MASK :

			  read_cpuid_part();

}



/* all SMP configurations have the extended CPUID registers */

#ifndef CONFIG_MMU

#define tlb_ops_need_broadcast()	0

arch/arm/kernel/entry-header.S

+15 −14
Original line number Diff line number Diff line
@@ -208,26 +208,21 @@ 
#endif

	.endif

	msr	spsr_cxsf, \rpsr

#if defined(CONFIG_CPU_V6)

	ldr	r0, [sp]

	strex	r1, r2, [sp]			@ clear the exclusive monitor

	ldmib	sp, {r1 - pc}^			@ load r1 - pc, cpsr

#elif defined(CONFIG_CPU_32v6K)

	clrex					@ clear the exclusive monitor

	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr

#else

	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr

#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)

	@ We must avoid clrex due to Cortex-A15 erratum #830321

	sub	r0, sp, #4			@ uninhabited address

	strex	r1, r2, [r0]			@ clear the exclusive monitor

#endif

	ldmia	sp, {r0 - pc}^			@ load r0 - pc, cpsr

	.endm



	.macro	restore_user_regs, fast = 0, offset = 0

	ldr	r1, [sp, #\offset + S_PSR]	@ get calling cpsr

	ldr	lr, [sp, #\offset + S_PC]!	@ get pc

	msr	spsr_cxsf, r1			@ save in spsr_svc

#if defined(CONFIG_CPU_V6)

#if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)

	@ We must avoid clrex due to Cortex-A15 erratum #830321

	strex	r1, r2, [sp]			@ clear the exclusive monitor

#elif defined(CONFIG_CPU_32v6K)

	clrex					@ clear the exclusive monitor

#endif

	.if	\fast

	ldmdb	sp, {r1 - lr}^			@ get calling r1 - lr
@@ -261,7 +256,10 @@ 
	.endif

	ldr	lr, [sp, #S_SP]			@ top of the stack

	ldrd	r0, r1, [sp, #S_LR]		@ calling lr and pc

	clrex					@ clear the exclusive monitor



	@ We must avoid clrex due to Cortex-A15 erratum #830321

	strex	r2, r1, [sp, #S_LR]		@ clear the exclusive monitor



	stmdb	lr!, {r0, r1, \rpsr}		@ calling lr and rfe context

	ldmia	sp, {r0 - r12}

	mov	sp, lr
@@ -282,13 +280,16 @@ 
	.endm

#else	/* ifdef CONFIG_CPU_V7M */

	.macro	restore_user_regs, fast = 0, offset = 0

	clrex					@ clear the exclusive monitor

	mov	r2, sp

	load_user_sp_lr r2, r3, \offset + S_SP	@ calling sp, lr

	ldr	r1, [sp, #\offset + S_PSR]	@ get calling cpsr

	ldr	lr, [sp, #\offset + S_PC]	@ get pc

	add	sp, sp, #\offset + S_SP

	msr	spsr_cxsf, r1			@ save in spsr_svc



	@ We must avoid clrex due to Cortex-A15 erratum #830321

	strex	r1, r2, [sp]			@ clear the exclusive monitor



	.if	\fast

	ldmdb	sp, {r1 - r12}			@ get calling r1 - r12

	.else

CRA Git | Maintained and supported by SUSTech CRA and CCSE