Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e39e3f3e authored by Russell King's avatar Russell King
Browse files

ARM: update FIQ support for relocation of vectors 



FIQ should no longer copy the FIQ code into the user visible vector
page.  Instead, it should use the hidden page.  This change makes
that happen.

Cc: <stable@vger.kernel.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent b9b32bf7

arch/arm/kernel/entry-armv.S

+3 −0
Original line number Diff line number Diff line
@@ -1120,6 +1120,9 @@ vector_addrexcptn: 
vector_fiq:

	subs	pc, lr, #4



	.globl	vector_fiq_offset

	.equ	vector_fiq_offset, vector_fiq



	.section .vectors, "ax", %progbits

__vectors_start:

	W(b)	vector_rst

arch/arm/kernel/fiq.c

+14 −5
Original line number Diff line number Diff line
@@ -47,6 +47,11 @@ 
#include <asm/irq.h>

#include <asm/traps.h>



#define FIQ_OFFSET ({					\

		extern void *vector_fiq_offset;		\

		(unsigned)&vector_fiq_offset;		\

	})



static unsigned long no_fiq_insn;



/* Default reacquire function
@@ -80,13 +85,16 @@ 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)

	memcpy((void *)0xffff001c, start, length);

	void *base = (void *)0xffff0000;

#else

	memcpy(vectors_page + 0x1c, start, length);

	void *base = vectors_page;

#endif

	flush_icache_range(0xffff001c, 0xffff001c + length);

	unsigned offset = FIQ_OFFSET;



	memcpy(base + offset, start, length);

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

	if (!vectors_high())

		flush_icache_range(0x1c, 0x1c + length);

		flush_icache_range(offset, offset + length);

}



int claim_fiq(struct fiq_handler *f)
@@ -144,6 +152,7 @@ EXPORT_SYMBOL(disable_fiq); 


void __init init_FIQ(int start)

{

	no_fiq_insn = *(unsigned long *)0xffff001c;

	unsigned offset = FIQ_OFFSET;

	no_fiq_insn = *(unsigned long *)(0xffff0000 + offset);

	fiq_start = start;

}