Commit 2620bf06 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm 

Pull ARM fixes from Russell King:
 "The usual collection of random fixes.  Also some further fixes to the
  last set of security fixes, and some more from Will (which you may
  already have in a slightly different form)"

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7807/1: kexec: validate CPU hotplug support
  ARM: 7812/1: rwlocks: retry trylock operation if strex fails on free lock
  ARM: 7811/1: locks: use early clobber in arch_spin_trylock
  ARM: 7810/1: perf: Fix array out of bounds access in armpmu_map_hw_event()
  ARM: 7809/1: perf: fix event validation for software group leaders
  ARM: Fix FIQ code on VIVT CPUs
  ARM: Fix !kuser helpers case
  ARM: Fix the world famous typo with is_gate_vma()
parents 359d16ca 2a282247

arch/arm/include/asm/smp_plat.h

+3 −0
Original line number Diff line number Diff line
@@ -88,4 +88,7 @@ static inline u32 mpidr_hash_size(void) 
{

	return 1 << mpidr_hash.bits;

}



extern int platform_can_cpu_hotplug(void);



#endif

arch/arm/include/asm/spinlock.h

+31 −20
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock) 
		"	subs	%1, %0, %0, ror #16\n"

		"	addeq	%0, %0, %4\n"

		"	strexeq	%2, %0, [%3]"

		: "=&r" (slock), "=&r" (contended), "=r" (res)

		: "=&r" (slock), "=&r" (contended), "=&r" (res)

		: "r" (&lock->slock), "I" (1 << TICKET_SHIFT)

		: "cc");

	} while (res);
@@ -168,17 +168,20 @@ static inline void arch_write_lock(arch_rwlock_t *rw) 


static inline int arch_write_trylock(arch_rwlock_t *rw)

{

	unsigned long tmp;

	unsigned long contended, res;



	do {

		__asm__ __volatile__(

"	ldrex	%0, [%1]\n"

		"	ldrex	%0, [%2]\n"

		"	mov	%1, #0\n"

		"	teq	%0, #0\n"

"	strexeq	%0, %2, [%1]"

	: "=&r" (tmp)

		"	strexeq	%1, %3, [%2]"

		: "=&r" (contended), "=&r" (res)

		: "r" (&rw->lock), "r" (0x80000000)

		: "cc");

	} while (res);



	if (tmp == 0) {

	if (!contended) {

		smp_mb();

		return 1;

	} else {
@@ -254,18 +257,26 @@ static inline void arch_read_unlock(arch_rwlock_t *rw) 


static inline int arch_read_trylock(arch_rwlock_t *rw)

{

	unsigned long tmp, tmp2 = 1;

	unsigned long contended, res;



	do {

		__asm__ __volatile__(

		"	ldrex	%0, [%2]\n"

		"	mov	%1, #0\n"

		"	adds	%0, %0, #1\n"

"	strexpl	%1, %0, [%2]\n"

	: "=&r" (tmp), "+r" (tmp2)

		"	strexpl	%1, %0, [%2]"

		: "=&r" (contended), "=&r" (res)

		: "r" (&rw->lock)

		: "cc");

	} while (res);



	/* If the lock is negative, then it is already held for write. */

	if (contended < 0x80000000) {

		smp_mb();

	return tmp2 == 0;

		return 1;

	} else {

		return 0;

	}

}



/* read_can_lock - would read_trylock() succeed? */

arch/arm/kernel/entry-armv.S

+2 −1
Original line number Diff line number Diff line
@@ -357,7 +357,8 @@ ENDPROC(__pabt_svc) 
	.endm



	.macro	kuser_cmpxchg_check

#if !defined(CONFIG_CPU_32v6K) && !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)

#if !defined(CONFIG_CPU_32v6K) && defined(CONFIG_KUSER_HELPERS) && \

    !defined(CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG)

#ifndef CONFIG_MMU

#warning "NPTL on non MMU needs fixing"

#else

arch/arm/kernel/fiq.c

+2 −6
Original line number Diff line number Diff line
@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, int prec) 


void set_fiq_handler(void *start, unsigned int length)

{

#if defined(CONFIG_CPU_USE_DOMAINS)

	void *base = (void *)0xffff0000;

#else

	void *base = vectors_page;

#endif

	unsigned offset = FIQ_OFFSET;



	memcpy(base + offset, start, length);

	if (!cache_is_vipt_nonaliasing())

		flush_icache_range(base + offset, offset + length);

	flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);

	if (!vectors_high())

		flush_icache_range(offset, offset + length);

}



int claim_fiq(struct fiq_handler *f)

arch/arm/kernel/machine_kexec.c

+16 −4
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <asm/mmu_context.h>

#include <asm/cacheflush.h>

#include <asm/mach-types.h>

#include <asm/smp_plat.h>

#include <asm/system_misc.h>



extern const unsigned char relocate_new_kernel[];
@@ -38,6 +39,14 @@ int machine_kexec_prepare(struct kimage *image) 
	__be32 header;

	int i, err;



	/*

	 * Validate that if the current HW supports SMP, then the SW supports

	 * and implements CPU hotplug for the current HW. If not, we won't be

	 * able to kexec reliably, so fail the prepare operation.

	 */

	if (num_possible_cpus() > 1 && !platform_can_cpu_hotplug())

		return -EINVAL;



	/*

	 * No segment at default ATAGs address. try to locate

	 * a dtb using magic.
@@ -134,10 +143,13 @@ void machine_kexec(struct kimage *image) 
	unsigned long reboot_code_buffer_phys;

	void *reboot_code_buffer;



	if (num_online_cpus() > 1) {

		pr_err("kexec: error: multiple CPUs still online\n");

		return;

	}

	/*

	 * This can only happen if machine_shutdown() failed to disable some

	 * CPU, and that can only happen if the checks in

	 * machine_kexec_prepare() were not correct. If this fails, we can't

	 * reliably kexec anyway, so BUG_ON is appropriate.

	 */

	BUG_ON(num_online_cpus() > 1);



	page_list = image->head & PAGE_MASK;

CRA Git | Maintained and supported by SUSTech CRA and CCSE