1 files changed, 59 insertions, 15 deletions

diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c
index 14a42848f37f..e1bebc80a5bf 100644
--- a/arch/blackfin/kernel/module.c
+++ b/arch/blackfin/kernel/module.c
@@ -173,7 +173,7 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
         for (s = sechdrs; s < sechdrs_end; ++s) {
                 if ((strcmp(".l1.text", secstrings + s->sh_name) == 0) ||
                     ((strcmp(".text", secstrings + s->sh_name) == 0) &&
-                     (hdr->e_flags & FLG_CODE_IN_L1) && (s->sh_size > 0))) {
+                     (hdr->e_flags & EF_BFIN_CODE_IN_L1) && (s->sh_size > 0))) {
                         dest = l1_inst_sram_alloc(s->sh_size);
                         mod->arch.text_l1 = dest;
                         if (dest == NULL) {
@@ -188,7 +188,7 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                 }
                 if ((strcmp(".l1.data", secstrings + s->sh_name) == 0) ||
                     ((strcmp(".data", secstrings + s->sh_name) == 0) &&
-                     (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
+                     (hdr->e_flags & EF_BFIN_DATA_IN_L1) && (s->sh_size > 0))) {
                         dest = l1_data_sram_alloc(s->sh_size);
                         mod->arch.data_a_l1 = dest;
                         if (dest == NULL) {
@@ -203,7 +203,7 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                 }
                 if (strcmp(".l1.bss", secstrings + s->sh_name) == 0 ||
                     ((strcmp(".bss", secstrings + s->sh_name) == 0) &&
-                     (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) {
+                     (hdr->e_flags & EF_BFIN_DATA_IN_L1) && (s->sh_size > 0))) {
                         dest = l1_data_sram_alloc(s->sh_size);
                         mod->arch.bss_a_l1 = dest;
                         if (dest == NULL) {
@@ -242,6 +242,51 @@ module_frob_arch_sections(Elf_Ehdr * hdr, Elf_Shdr * sechdrs,
                         s->sh_flags &= ~SHF_ALLOC;
                         s->sh_addr = (unsigned long)dest;
                 }
+                if ((strcmp(".l2.text", secstrings + s->sh_name) == 0) ||
+                    ((strcmp(".text", secstrings + s->sh_name) == 0) &&
+                     (hdr->e_flags & EF_BFIN_CODE_IN_L2) && (s->sh_size > 0))) {
+                        dest = l2_sram_alloc(s->sh_size);
+                        mod->arch.text_l2 = dest;
+                        if (dest == NULL) {
+                                printk(KERN_ERR
+                                       "module %s: L2 SRAM allocation failed\n",
+                                       mod->name);
+                                return -1;
+                        }
+                        memcpy(dest, (void *)s->sh_addr, s->sh_size);
+                        s->sh_flags &= ~SHF_ALLOC;
+                        s->sh_addr = (unsigned long)dest;
+                }
+                if ((strcmp(".l2.data", secstrings + s->sh_name) == 0) ||
+                    ((strcmp(".data", secstrings + s->sh_name) == 0) &&
+                     (hdr->e_flags & EF_BFIN_DATA_IN_L2) && (s->sh_size > 0))) {
+                        dest = l2_sram_alloc(s->sh_size);
+                        mod->arch.data_l2 = dest;
+                        if (dest == NULL) {
+                                printk(KERN_ERR
+                                        "module %s: L2 SRAM allocation failed\n",
+                                        mod->name);
+                                return -1;
+                        }
+                        memcpy(dest, (void *)s->sh_addr, s->sh_size);
+                        s->sh_flags &= ~SHF_ALLOC;
+                        s->sh_addr = (unsigned long)dest;
+                }
+                if (strcmp(".l2.bss", secstrings + s->sh_name) == 0 ||
+                    ((strcmp(".bss", secstrings + s->sh_name) == 0) &&
+                     (hdr->e_flags & EF_BFIN_DATA_IN_L2) && (s->sh_size > 0))) {
+                        dest = l2_sram_alloc(s->sh_size);
+                        mod->arch.bss_l2 = dest;
+                        if (dest == NULL) {
+                                printk(KERN_ERR
+                                        "module %s: L2 SRAM allocation failed\n",
+                                        mod->name);
+                                return -1;
+                        }
+                        memset(dest, 0, s->sh_size);
+                        s->sh_flags &= ~SHF_ALLOC;
+                        s->sh_addr = (unsigned long)dest;
+                }
         }
         return 0;
 }
@@ -411,9 +456,10 @@ module_finalize(const Elf_Ehdr * hdr,
                         continue;
 
                 if ((sechdrs[i].sh_type == SHT_RELA) &&
-                    ((strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0) ||
+                    ((strcmp(".rela.l2.text", secstrings + sechdrs[i].sh_name) == 0) ||
+                    (strcmp(".rela.l1.text", secstrings + sechdrs[i].sh_name) == 0) ||
                     ((strcmp(".rela.text", secstrings + sechdrs[i].sh_name) == 0) &&
-                         (hdr->e_flags & FLG_CODE_IN_L1)))) {
+                        (hdr->e_flags & (EF_BFIN_CODE_IN_L1|EF_BFIN_CODE_IN_L2))))) {
                         apply_relocate_add((Elf_Shdr *) sechdrs, strtab,
                                            symindex, i, mod);
                 }
@@ -423,14 +469,12 @@ module_finalize(const Elf_Ehdr * hdr,
 
 void module_arch_cleanup(struct module *mod)
 {
-        if (mod->arch.text_l1)
-                l1_inst_sram_free((void *)mod->arch.text_l1);
-        if (mod->arch.data_a_l1)
-                l1_data_sram_free((void *)mod->arch.data_a_l1);
-        if (mod->arch.bss_a_l1)
-                l1_data_sram_free((void *)mod->arch.bss_a_l1);
-        if (mod->arch.data_b_l1)
-                l1_data_B_sram_free((void *)mod->arch.data_b_l1);
-        if (mod->arch.bss_b_l1)
-                l1_data_B_sram_free((void *)mod->arch.bss_b_l1);
+        l1_inst_sram_free(mod->arch.text_l1);
+        l1_data_A_sram_free(mod->arch.data_a_l1);
+        l1_data_A_sram_free(mod->arch.bss_a_l1);
+        l1_data_B_sram_free(mod->arch.data_b_l1);
+        l1_data_B_sram_free(mod->arch.bss_b_l1);
+        l2_sram_free(mod->arch.text_l2);
+        l2_sram_free(mod->arch.data_l2);
+        l2_sram_free(mod->arch.bss_l2);
 }