Patch "ARM: Fix FIQ code on VIVT CPUs" has been added to the 3.10-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
ARM: Fix FIQ code on VIVT CPUs
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-fix-fiq-code-on-vivt-cpus.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
2ba85e7af4c639d933c9a87a6d7363f2983d5adaMon Sep 17 00:00:00 2001
From: Russell King <[email protected]>
Date: Thu, 8 Aug 2013 11:51:21 +0100
Subject: ARM: Fix FIQ code on VIVT CPUs
From: Russell King <[email protected]>
commit 2ba85e7af4c639d933c9a87a6d7363f2983d5ada upstream.
Aaro Koskinen reports the following oops:
Installing fiq handler from c001b110, length 0x164
Unable to handle kernel paging request at virtual address ffff1224
pgd = c0004000
[ffff1224] *pgd=00000000, *pte=11fff0cb, *ppte=11fff00a
...
[<c0013154>] (set_fiq_handler+0x0/0x6c) from [<c0365d38>] (ams_delta_init_fiq+0xa8/0x160)
r6:00000164 r5:c001b110 r4:00000000 r3:fefecb4c
[<c0365c90>] (ams_delta_init_fiq+0x0/0x160) from [<c0365b14>] (ams_delta_init+0xd4/0x114)
r6:00000000 r5:fffece10 r4:c037a9e0
[<c0365a40>] (ams_delta_init+0x0/0x114) from [<c03613b4>] (customize_machine+0x24/0x30)
This is because the vectors page is now write-protected, and to change code in there we must write to its original alias. Make that change, and adjust the cache flushing such that the code will become visible to the instruction stream on VIVT CPUs.
--- arch/arm/kernel/fiq.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
arch/arm/kernel/fiq.c +2 -6
@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, invoid 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)
Patches currently in stable-queue which might be from [email protected] are
queue-3.10/arm-fix-fiq-code-on-vivt-cpus.patch queue-3.10/arm-fix-kuser-helpers-case.patch queue-3.10/arm-7819-1-fiq-cast-the-first-argument-of-flush_icache_range.patch