Blackfin: initial XIP support

Signed-off-by: Barry Song <barry.song@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>

3 files changed, 19 insertions, 13 deletions

diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 0df7ef200f9d..ccfa7c490ff9 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -405,7 +405,7 @@ ENTRY(_double_fault)
 
         r0 = sp;        /* stack frame pt_regs pointer argument ==> r0 */
         SP += -12;
-        call _double_fault_c;
+        pseudo_long_call _double_fault_c, p5;
         SP += 12;
 .L_double_fault_panic:
         JUMP .L_double_fault_panic
@@ -447,7 +447,7 @@ ENTRY(_exception_to_level5)
 
         r0 = sp;        /* stack frame pt_regs pointer argument ==> r0 */
         SP += -12;
-        call _trap_c;
+        pseudo_long_call _trap_c, p4;
         SP += 12;
 
         /* If interrupts were off during the exception (IPEND[4] = 1), turn them off
@@ -551,7 +551,7 @@ ENTRY(_kernel_execve)
         p0 = sp;
         sp += -16;
         [sp + 12] = p0;
-        call _do_execve;
+        pseudo_long_call _do_execve, p5;
         SP += 16;
         cc = r0 == 0;
         if ! cc jump .Lexecve_failed;
@@ -704,7 +704,7 @@ ENTRY(_system_call)
         sp += 4;
 
         SP += -12;
-        call _schedule;
+        pseudo_long_call _schedule, p4;
         SP += 12;
 
         jump .Lresume_userspace_1;
@@ -723,7 +723,7 @@ ENTRY(_system_call)
 
         r0 = sp;
         SP += -12;
-        call _do_notify_resume;
+        pseudo_long_call _do_notify_resume, p5;
         SP += 12;
 
 .Lsyscall_really_exit:
@@ -736,7 +736,7 @@ ENDPROC(_system_call)
  * this symbol need not be global anyways, so ...
  */
 _sys_trace:
-        call _syscall_trace;
+        pseudo_long_call _syscall_trace, p5;
 
         /* Execute the appropriate system call */
 
@@ -760,7 +760,7 @@ _sys_trace:
         SP += 24;
         [sp + PT_R0] = r0;
 
-        call _syscall_trace;
+        pseudo_long_call _syscall_trace, p5;
         jump .Lresume_userspace;
 ENDPROC(_sys_trace)
 
@@ -1007,7 +1007,8 @@ ENTRY(_schedule_and_signal_from_int)
 
         r0 = sp;
         sp += -12;
-        call _finish_atomic_sections;
+
+        pseudo_long_call _finish_atomic_sections, p5;
         sp += 12;
         jump.s .Lresume_userspace;
 ENDPROC(_schedule_and_signal_from_int)
diff --git a/arch/blackfin/mach-common/head.S b/arch/blackfin/mach-common/head.S
index cf037782c8ad..4391621d9048 100644
--- a/arch/blackfin/mach-common/head.S
+++ b/arch/blackfin/mach-common/head.S
@@ -186,6 +186,11 @@ ENTRY(__start)
 
         /* Put The Code for PLL Programming and SDRAM Programming in L1 ISRAM */
         call _bfin_relocate_l1_mem;
+
+#ifdef CONFIG_ROMKERNEL
+        call _bfin_relocate_xip_data;
+#endif
+
 #ifdef CONFIG_BFIN_KERNEL_CLOCK
         /* Only use on-chip scratch space for stack when absolutely required
          * to avoid Anomaly 05000227 ... we know the init_clocks() func only
diff --git a/arch/blackfin/mach-common/interrupt.S b/arch/blackfin/mach-common/interrupt.S
index 8085ff1cce00..df984960cf90 100644
--- a/arch/blackfin/mach-common/interrupt.S
+++ b/arch/blackfin/mach-common/interrupt.S
@@ -109,10 +109,10 @@ __common_int_entry:
         cc = r0 == 0;
         if cc jump .Lcommon_restore_context;
 #else /* CONFIG_IPIPE */
-        call _do_irq;
+        pseudo_long_call _do_irq, p2;
         SP += 12;
 #endif /* CONFIG_IPIPE */
-        call _return_from_int;
+        pseudo_long_call _return_from_int, p2;
 .Lcommon_restore_context:
         RESTORE_CONTEXT
         rti;
@@ -168,7 +168,7 @@ ENTRY(_evt_ivhw)
 
         r0 = sp;        /* stack frame pt_regs pointer argument ==> r0 */
         SP += -12;
-        call _trap_c;
+        pseudo_long_call _trap_c, p5;
         SP += 12;
 
 #ifdef EBIU_ERRMST
@@ -179,7 +179,7 @@ ENTRY(_evt_ivhw)
         w[p0] = r0.l;
 #endif
 
-        call _ret_from_exception;
+        pseudo_long_call _ret_from_exception, p2;
 
 .Lcommon_restore_all_sys:
         RESTORE_ALL_SYS
@@ -223,7 +223,7 @@ ENTRY(_evt_system_call)
 #ifdef CONFIG_FRAME_POINTER
         fp = 0;
 #endif
-        call _system_call;
+        pseudo_long_call _system_call, p2;
         jump .Lcommon_restore_context;
 ENDPROC(_evt_system_call)