Skip to content

Commit 2ba85e7

Browse files
author
Russell King
committed
ARM: Fix FIQ code on VIVT CPUs
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. Reported-by: Aaro Koskinen <[email protected]> Tested-by: Aaro Koskinen <[email protected]> Signed-off-by: Russell King <[email protected]>
1 parent 1b16c4b commit 2ba85e7

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

arch/arm/kernel/fiq.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,13 @@ int show_fiq_list(struct seq_file *p, int prec)
8484

8585
void set_fiq_handler(void *start, unsigned int length)
8686
{
87-
#if defined(CONFIG_CPU_USE_DOMAINS)
88-
void *base = (void *)0xffff0000;
89-
#else
9087
void *base = vectors_page;
91-
#endif
9288
unsigned offset = FIQ_OFFSET;
9389

9490
memcpy(base + offset, start, length);
91+
if (!cache_is_vipt_nonaliasing())
92+
flush_icache_range(base + offset, offset + length);
9593
flush_icache_range(0xffff0000 + offset, 0xffff0000 + offset + length);
96-
if (!vectors_high())
97-
flush_icache_range(offset, offset + length);
9894
}
9995

10096
int claim_fiq(struct fiq_handler *f)

0 commit comments

Comments
 (0)