sugar/linux
1
0
Fork 0
Code Activity

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

Browse Source 
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>
This commit is contained in:
Will Deacon
2012-08-24 15:21:52 +01:00
committed by Russell King
parent dbece45894
commit ae3790b8a9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mm/context.c
View File

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