Commit ae3790b8 authored Aug 24, 2012 by Will Deacon Committed by Russell King Aug 25, 2012

ARM: 7502/1: contextidr: avoid using bfi instruction during notifier



The bfi instruction is not available on ARMv6, so instead use an and/orr
sequence in the contextidr_notifier. This gets rid of the assembler
error:

  Assembler messages:
  Error: selected processor does not support ARM mode `bfi r3,r2,#0,#8'

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent dbece458

arch/arm/mm/context.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -63,10 +63,11 @@ static int contextidr_notifier(struct notifier_block *unused, unsigned long cmd,
		pid = task_pid_nr(thread->task) << ASID_BITS;
		asm volatile(
		" mrc p15, 0, %0, c13, c0, 1\n"
		" bfi %1, %0, #0, %2\n"
		" mcr p15, 0, %1, c13, c0, 1\n"
		" and %0, %0, %2\n"
		" orr %0, %0, %1\n"
		" mcr p15, 0, %0, c13, c0, 1\n"
		: "=r" (contextidr), "+r" (pid)
		: "I" (ASID_BITS));
		: "I" (~ASID_MASK));
		isb();

		return NOTIFY_OK;

Admin message