Blackfin: initial XIP support

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

5 files changed, 92 insertions, 7 deletions

diff --git a/arch/blackfin/kernel/cplb-mpu/cplbinit.c b/arch/blackfin/kernel/cplb-mpu/cplbinit.c
index 8d42b9e50dfa..30fd6417f069 100644
--- a/arch/blackfin/kernel/cplb-mpu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-mpu/cplbinit.c
@@ -64,6 +64,15 @@ void __init generate_cplb_tables_cpu(unsigned int cpu)
                 icplb_tbl[cpu][i_i++].data = i_data | (addr == 0 ? CPLB_USER_RD : 0);
         }
 
+#ifdef CONFIG_ROMKERNEL
+        /* Cover kernel XIP flash area */
+        addr = CONFIG_ROM_BASE & ~(4 * 1024 * 1024 - 1);
+        dcplb_tbl[cpu][i_d].addr = addr;
+        dcplb_tbl[cpu][i_d++].data = d_data | CPLB_USER_RD;
+        icplb_tbl[cpu][i_i].addr = addr;
+        icplb_tbl[cpu][i_i++].data = i_data | CPLB_USER_RD;
+#endif
+
         /* Cover L1 memory.  One 4M area for code and data each is enough.  */
 #if L1_DATA_A_LENGTH > 0 || L1_DATA_B_LENGTH > 0
         dcplb_tbl[cpu][i_d].addr = get_l1_data_a_start_cpu(cpu);
diff --git a/arch/blackfin/kernel/cplb-nompu/cplbinit.c b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
index 282a7919821b..bfe75af4e8bd 100644
--- a/arch/blackfin/kernel/cplb-nompu/cplbinit.c
+++ b/arch/blackfin/kernel/cplb-nompu/cplbinit.c
@@ -56,6 +56,15 @@ void __init generate_cplb_tables_cpu(unsigned int cpu)
                 i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_4MB;
         }
 
+#ifdef CONFIG_ROMKERNEL
+        /* Cover kernel XIP flash area */
+        addr = CONFIG_ROM_BASE & ~(4 * 1024 * 1024 - 1);
+        d_tbl[i_d].addr = addr;
+        d_tbl[i_d++].data = SDRAM_DGENERIC | PAGE_SIZE_4MB;
+        i_tbl[i_i].addr = addr;
+        i_tbl[i_i++].data = SDRAM_IGENERIC | PAGE_SIZE_4MB;
+#endif
+
         /* Cover L1 memory.  One 4M area for code and data each is enough.  */
         if (cpu == 0) {
                 if (L1_DATA_A_LENGTH || L1_DATA_B_LENGTH) {
diff --git a/arch/blackfin/kernel/entry.S b/arch/blackfin/kernel/entry.S
index f27dc2292e1b..686478f5f66b 100644
--- a/arch/blackfin/kernel/entry.S
+++ b/arch/blackfin/kernel/entry.S
@@ -44,7 +44,7 @@ ENTRY(_ret_from_fork)
         sti r4;
 #endif /* CONFIG_IPIPE */
         SP += -12;
-        call _schedule_tail;
+        pseudo_long_call _schedule_tail, p5;
         SP += 12;
         r0 = [sp + PT_IPEND];
         cc = bittst(r0,1);
@@ -79,7 +79,7 @@ ENTRY(_sys_vfork)
         r0 += 24;
         [--sp] = rets;
         SP += -12;
-        call _bfin_vfork;
+        pseudo_long_call _bfin_vfork, p2;
         SP += 12;
         rets = [sp++];
         rts;
@@ -90,7 +90,7 @@ ENTRY(_sys_clone)
         r0 += 24;
         [--sp] = rets;
         SP += -12;
-        call _bfin_clone;
+        pseudo_long_call _bfin_clone, p2;
         SP += 12;
         rets = [sp++];
         rts;
@@ -101,7 +101,7 @@ ENTRY(_sys_rt_sigreturn)
         r0 += 24;
         [--sp] = rets;
         SP += -12;
-        call _do_rt_sigreturn;
+        pseudo_long_call _do_rt_sigreturn, p2;
         SP += 12;
         rets = [sp++];
         rts;
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index a0bc7d3e1bff..b54ba45db5f1 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -220,6 +220,16 @@ void __init bfin_relocate_l1_mem(void)
                 memcpy(_stext_l2, _l2_lma, l2_len);
 }
 
+#ifdef CONFIG_ROMKERNEL
+void __init bfin_relocate_xip_data(void)
+{
+        early_shadow_stamp();
+
+        memcpy(_sdata, _data_lma, (unsigned long)_data_len - THREAD_SIZE + sizeof(struct thread_info));
+        memcpy(_sinitdata, _init_data_lma, (unsigned long)_init_data_len);
+}
+#endif
+
 /* add_memory_region to memmap */
 static void __init add_memory_region(unsigned long long start,
                               unsigned long long size, int type)
@@ -504,7 +514,7 @@ static __init void memory_setup(void)
 #endif
         unsigned long max_mem;
 
-        _rambase = (unsigned long)_stext;
+        _rambase = CONFIG_BOOT_LOAD;
         _ramstart = (unsigned long)_end;
 
         if (DMA_UNCACHED_REGION > (_ramend - _ramstart)) {
@@ -1261,8 +1271,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         seq_printf(m, "board memory\t: %ld kB (0x%p -> 0x%p)\n",
                  physical_mem_end >> 10, (void *)0, (void *)physical_mem_end);
         seq_printf(m, "kernel memory\t: %d kB (0x%p -> 0x%p)\n",
-                ((int)memory_end - (int)_stext) >> 10,
-                _stext,
+                ((int)memory_end - (int)_rambase) >> 10,
+                (void *)_rambase,
                 (void *)memory_end);
         seq_printf(m, "\n");
 
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S
index be4b1bbb3918..984c78172397 100644
--- a/arch/blackfin/kernel/vmlinux.lds.S
+++ b/arch/blackfin/kernel/vmlinux.lds.S
@@ -15,7 +15,12 @@ _jiffies = _jiffies_64;
 
 SECTIONS
 {
+#ifdef CONFIG_RAMKERNEL
         . = CONFIG_BOOT_LOAD;
+#else
+        . = CONFIG_ROM_BASE;
+#endif
+
         /* Neither the text, ro_data or bss section need to be aligned
          * So pack them back to back
          */
@@ -31,6 +36,12 @@ SECTIONS
                 LOCK_TEXT
                 IRQENTRY_TEXT
                 KPROBES_TEXT
+#ifdef CONFIG_ROMKERNEL
+                __sinittext = .;
+                INIT_TEXT
+                __einittext = .;
+                EXIT_TEXT
+#endif
                 *(.text.*)
                 *(.fixup)
 
@@ -50,8 +61,14 @@ SECTIONS
 
         /* Just in case the first read only is a 32-bit access */
         RO_DATA(4)
+        __rodata_end = .;
 
+#ifdef CONFIG_ROMKERNEL
+        . = CONFIG_BOOT_LOAD;
+        .bss : AT(__rodata_end)
+#else
         .bss :
+#endif
         {
                 . = ALIGN(4);
                 ___bss_start = .;
@@ -67,7 +84,11 @@ SECTIONS
                 ___bss_stop = .;
         }
 
+#if defined(CONFIG_ROMKERNEL)
+        .data : AT(LOADADDR(.bss) + SIZEOF(.bss))
+#else
         .data :
+#endif
         {
                 __sdata = .;
                 /* This gets done first, so the glob doesn't suck it in */
@@ -94,6 +115,8 @@ SECTIONS
 
                 __edata = .;
         }
+        __data_lma = LOADADDR(.data);
+        __data_len = SIZEOF(.data);
 
         /* The init section should be last, so when we free it, it goes into
          * the general memory pool, and (hopefully) will decrease fragmentation
@@ -103,6 +126,7 @@ SECTIONS
         . = ALIGN(PAGE_SIZE);
         ___init_begin = .;
 
+#ifdef CONFIG_RAMKERNEL
         INIT_TEXT_SECTION(PAGE_SIZE)
 
         /* We have to discard exit text and such at runtime, not link time, to
@@ -125,6 +149,35 @@ SECTIONS
         }
 
         .text_l1 L1_CODE_START : AT(LOADADDR(.exit.data) + SIZEOF(.exit.data))
+#else
+        .init.data : AT(__data_lma + __data_len)
+        {
+                __sinitdata = .;
+                INIT_DATA
+                INIT_SETUP(16)
+                INIT_CALLS
+                CON_INITCALL
+                SECURITY_INITCALL
+                INIT_RAM_FS
+
+                . = ALIGN(4);
+                ___per_cpu_load = .;
+                ___per_cpu_start = .;
+                *(.data.percpu.first)
+                *(.data.percpu.page_aligned)
+                *(.data.percpu)
+                *(.data.percpu.shared_aligned)
+                ___per_cpu_end = .;
+
+                EXIT_DATA
+                __einitdata = .;
+        }
+        __init_data_lma = LOADADDR(.init.data);
+        __init_data_len = SIZEOF(.init.data);
+        __init_data_end = .;
+
+        .text_l1 L1_CODE_START : AT(__init_data_lma + __init_data_len)
+#endif
         {
                 . = ALIGN(4);
                 __stext_l1 = .;
@@ -205,7 +258,11 @@ SECTIONS
         /* Force trailing alignment of our init section so that when we
          * free our init memory, we don't leave behind a partial page.
          */
+#ifdef CONFIG_RAMKERNEL
         . = __l2_lma + __l2_len;
+#else
+        . = __init_data_end;
+#endif
         . = ALIGN(PAGE_SIZE);
         ___init_end = .;