ARM: fiq_glue: Add fiq_glue

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I27d2554e07d9de204e0a06696d38db51608d9f6b

arch/arm/common/Kconfig

@@ -18,3 +18,7 @@ config SHARP_PARAM
 
 config SHARP_SCOOP
 	bool
+
+config FIQ_GLUE
+	bool
+	select FIQ

arch/arm/common/Makefile

@@ -5,6 +5,7 @@
 
 obj-y				+= firmware.o
 
+obj-$(CONFIG_FIQ_GLUE)		+= fiq_glue.o fiq_glue_setup.o
 obj-$(CONFIG_SA1111)		+= sa1111.o
 obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o
 obj-$(CONFIG_KRAIT_L2_ACCESSORS) += krait-l2-accessors.o

arch/arm/common/fiq_glue_setup.c

@@ -33,7 +33,7 @@ static void fiq_glue_setup_helper(void *info)
 {
 	struct fiq_glue_handler *handler = info;
 	fiq_glue_setup(handler->fiq, handler,
-		__get_cpu_var(fiq_stack) + THREAD_START_SP,
+		(void *)((*this_cpu_ptr(&fiq_stack)) + THREAD_START_SP),
 		fiq_return_handler);
 }
 
@@ -139,7 +139,7 @@ void fiq_glue_resume(void)
 	if (!current_handler)
 		return;
 	fiq_glue_setup(current_handler->fiq, current_handler,
-		__get_cpu_var(fiq_stack) + THREAD_START_SP,
+		(void *)((*this_cpu_ptr(&fiq_stack)) + THREAD_START_SP),
 		fiq_return_handler);
 	if (current_handler->resume)
 		current_handler->resume(current_handler);

arch/arm/kernel/fiq.c

@@ -94,8 +94,9 @@ int show_fiq_list(struct seq_file *p, int prec)
 void set_fiq_handler(void *start, unsigned int length)
 {
 	void *base = vectors_page;
-	unsigned offset = FIQ_OFFSET;
+	unsigned int volatile offset = FIQ_OFFSET;
 
+	offset &= 0xfffffffc;
 	memcpy(base + offset, start, length);
 	if (!cache_is_vipt_nonaliasing())
 		flush_icache_range((unsigned long)base + offset,

drivers/staging/android/fiq_debugger/Kconfig

@@ -70,3 +70,11 @@ config RK_CONSOLE_THREAD
 	default n
 	help
 	  Normal kernel printk will write out to UART by "kconsole" kthread
+
+config FIQ_DEBUGGER_FIQ_GLUE
+	bool "Uart FIQ is captured by linux"
+	depends on FIQ_DEBUGGER
+	select FIQ_GLUE
+	default n
+	help
+	  It is for ARM v7 arch without trust zone.