Modified: trunk/arch/blackfin/include/asm/elf.h (6533 => 6534)
--- trunk/arch/blackfin/include/asm/elf.h 2009-06-02 10:43:20 UTC (rev 6533)
+++ trunk/arch/blackfin/include/asm/elf.h 2009-06-02 10:43:39 UTC (rev 6534)
@@ -124,4 +124,12 @@
#define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+struct mm_struct;
+struct elf_fdpic_params;
+struct elf32_phdr;
+extern int elf_fdpic_plat_process_phdr(struct mm_struct *, struct elf_fdpic_params *,
+ struct elf32_phdr *, unsigned long *, unsigned long *);
+#define ELF_FDPIC_PLAT_PROCESS_PHDR(mm, params, phdr, maddr, disp) \
+ elf_fdpic_plat_process_phdr(mm, params, phdr, maddr, disp)
+
#endif
Modified: trunk/arch/blackfin/kernel/Makefile (6533 => 6534)
--- trunk/arch/blackfin/kernel/Makefile 2009-06-02 10:43:20 UTC (rev 6533)
+++ trunk/arch/blackfin/kernel/Makefile 2009-06-02 10:43:39 UTC (rev 6534)
@@ -15,6 +15,7 @@
obj-y += time.o
endif
+obj-$(CONFIG_BINFMT_ELF_FDPIC) += binfmt_elf_fdpic.o
obj-$(CONFIG_IPIPE) += ipipe.o
obj-$(CONFIG_IPIPE_TRACE_MCOUNT) += mcount.o
obj-$(CONFIG_BFIN_GPTIMERS) += gptimers.o
Added: trunk/arch/blackfin/kernel/binfmt_elf_fdpic.c (0 => 6534)
--- trunk/arch/blackfin/kernel/binfmt_elf_fdpic.c (rev 0)
+++ trunk/arch/blackfin/kernel/binfmt_elf_fdpic.c 2009-06-02 10:43:39 UTC (rev 6534)
@@ -0,0 +1,80 @@
+/*
+ * FDPIC ELF hooks
+ *
+ * Copyright (c) 2006-2009 Analog Devices Inc.
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/mm.h>
+#include <linux/elf.h>
+#include <linux/elf-fdpic.h>
+#include <linux/kernel.h>
+
+#include <asm/cacheflush.h>
+#include <asm/dma.h>
+
+int elf_fdpic_plat_process_phdr(struct mm_struct *mm,
+ struct elf_fdpic_params *params,
+ struct elf32_phdr *phdr,
+ unsigned long *maddr, unsigned long *disp)
+{
+ /* 0xfeb00000, 0xfec00000, 0xff700000, 0xff800000, 0xff900000
+ * and 0xffa00000 are also used in Dynamic linker and GNU ld.
+ * They need to be kept synchronized.
+ */
+ unsigned long flag = 0;
+ const char *type = NULL;
+
+ unsigned int e_flags = params->hdr.e_flags;
+ unsigned long p_vaddr = phdr->p_vaddr;
+ unsigned long p_flags = phdr->p_flags;
+
+ if (((e_flags & EF_BFIN_CODE_IN_L1) || p_vaddr == 0xffa00000) &&
+ (p_flags & (PF_W | PF_X)) == PF_X)
+ {
+ flag = L1_INST_SRAM;
+ type = "L1 instruction";
+
+ } else if (((e_flags & EF_BFIN_DATA_IN_L1) ||
+ p_vaddr == 0xff700000 ||
+ p_vaddr == 0xff800000 ||
+ p_vaddr == 0xff900000) &&
+ (p_flags & (PF_X | PF_W)) == PF_W)
+ {
+ if (p_vaddr == 0xff800000) {
+ flag = L1_DATA_A_SRAM;
+ type = "L1 Data A";
+ } else if (p_vaddr == 0xff900000) {
+ flag = L1_DATA_B_SRAM;
+ type = "L1 Data B";
+ } else {
+ flag = L1_DATA_SRAM;
+ type = "L1 Data";
+ }
+
+ } else if (p_vaddr == 0xfeb00000 || p_vaddr == 0xfec00000) {
+ flag = L2_SRAM;
+ type = "L2";
+ }
+
+ if (flag) {
+ void *sram_addr = sram_alloc_with_lsl(phdr->p_memsz, flag);
+ if (sram_addr == NULL) {
+ printk(KERN_ERR "elf_fdpic: not enough %s sram\n", type);
+ return -ENOMEM;
+ }
+
+ if (flag & L1_INST_SRAM)
+ safe_dma_memcpy(sram_addr, (const void *)(*maddr + *disp), phdr->p_memsz);
+ else
+ memcpy(sram_addr, (const void *)(*maddr + *disp), phdr->p_memsz);
+
+ down_write(&mm->mmap_sem);
+ do_munmap(mm, *maddr, phdr->p_memsz + *disp);
+ up_write(&mm->mmap_sem);
+ *maddr = (unsigned long)sram_addr;
+ *disp = 0;
+ }
+
+ return 0;
+}
Modified: trunk/fs/binfmt_elf_fdpic.c (6533 => 6534)
--- trunk/fs/binfmt_elf_fdpic.c 2009-06-02 10:43:20 UTC (rev 6533)
+++ trunk/fs/binfmt_elf_fdpic.c 2009-06-02 10:43:39 UTC (rev 6534)
@@ -1111,95 +1111,13 @@
ELF_FDPIC_FLAG_CONTIGUOUS)
load_addr += PAGE_ALIGN(phdr->p_memsz + disp);
- /* Hack, hack, hack */
- /* 0xfeb00000, 0xfec00000, 0xff700000, 0xff800000, 0xff900000
- and 0xffa00000 are also used in Dynamic linker and GNU ld.
- They need to be kept synchronized. */
+#ifndef ELF_FDPIC_PLAT_PROCESS_PHDR
+# define ELF_FDPIC_PLAT_PROCESS_PHDR(mm, params, phdr, maddr, disp) 0
+#endif
+ ret = ELF_FDPIC_PLAT_PROCESS_PHDR(mm, params, phdr, &maddr, &disp);
+ if (ret)
+ return ret;
- if (((params->hdr.e_flags & EF_BFIN_CODE_IN_L1)
- || (phdr->p_vaddr == 0xffa00000))
- && (phdr->p_flags & PF_W) == 0
- && (phdr->p_flags & PF_X)) {
- void *l1_addr;
- l1_addr = sram_alloc_with_lsl(phdr->p_memsz, L1_INST_SRAM);
- if (l1_addr != NULL)
- safe_dma_memcpy(l1_addr, (const void *)(maddr + disp), phdr->p_memsz);
- down_write(&mm->mmap_sem);
- do_munmap(mm, maddr, phdr->p_memsz + disp);
- up_write(&mm->mmap_sem);
- if (l1_addr == NULL) {
- printk(KERN_ERR "Not enough L1 instruction sram\n");
- return -ENOMEM;
- }
- kdebug("[%x] -> l1_addr = %x of len = %x\n",
- maddr + disp, l1_addr, phdr->p_memsz);
- maddr = (unsigned long)l1_addr;
- disp = 0;
- } else if (((params->hdr.e_flags & EF_BFIN_DATA_IN_L1)
- || phdr->p_vaddr == 0xff700000
- || phdr->p_vaddr == 0xff800000
- || phdr->p_vaddr == 0xff900000)
- && (phdr->p_flags & PF_X) == 0
- && (phdr->p_flags & PF_W)) {
- void *l1_addr;
- if (phdr->p_vaddr == 0xff800000)
- l1_addr = sram_alloc_with_lsl(phdr->p_memsz, L1_DATA_A_SRAM);
- else if (phdr->p_vaddr == 0xff900000)
- l1_addr = sram_alloc_with_lsl(phdr->p_memsz, L1_DATA_B_SRAM);
- else
- l1_addr = sram_alloc_with_lsl(phdr->p_memsz, L1_DATA_SRAM);
- if (l1_addr != NULL)
- memcpy(l1_addr, (const void *)(maddr + disp), phdr->p_memsz);
- down_write(&mm->mmap_sem);
- do_munmap(mm, maddr, phdr->p_memsz + disp);
- up_write(&mm->mmap_sem);
- if (l1_addr == NULL) {
- if (phdr->p_vaddr == 0xff800000)
- printk(KERN_ERR "Not enough L1 data bank A sram\n");
- else if (phdr->p_vaddr == 0xff900000)
- printk(KERN_ERR "Not enough L1 data bank B sram\n");
- else
- printk(KERN_ERR "Not enough L1 data sram\n");
- return -ENOMEM;
- }
- kdebug("[%x] -> l1_addr = %x of len = %x\n",
- maddr + disp, l1_addr, phdr->p_memsz);
- maddr = (unsigned long)l1_addr;
- disp = 0;
- } else if (phdr->p_vaddr == 0xfeb00000) {
- void *l2_addr;
- l2_addr = sram_alloc_with_lsl(phdr->p_memsz, L2_SRAM);
- if (l2_addr != NULL)
- memcpy(l2_addr, (const void *)(maddr + disp), phdr->p_memsz);
- down_write(&mm->mmap_sem);
- do_munmap(mm, maddr, phdr->p_memsz + disp);
- up_write(&mm->mmap_sem);
- if (l2_addr == NULL) {
- printk(KERN_ERR "Not enough L2 sram\n");
- return -ENOMEM;
- }
- kdebug("[%x] -> l2_addr = %x of len = %x\n",
- maddr + disp, l2_addr, phdr->p_memsz);
- maddr = (unsigned long)l2_addr;
- disp = 0;
- } else if (phdr->p_vaddr == 0xfec00000) {
- void *l2_addr;
- l2_addr = sram_alloc_with_lsl(phdr->p_memsz, L2_SRAM);
- if (l2_addr != NULL)
- memcpy(l2_addr, (const void *)(maddr + disp), phdr->p_memsz);
- down_write(&mm->mmap_sem);
- do_munmap(mm, maddr, phdr->p_memsz + disp);
- up_write(&mm->mmap_sem);
- if (l2_addr == NULL) {
- printk(KERN_ERR "Not enough L2 sram\n");
- return -ENOMEM;
- }
- kdebug("[%x] -> l2_addr = %x of len = %x\n",
- maddr + disp, l2_addr, phdr->p_memsz);
- maddr = (unsigned long)l2_addr;
- disp = 0;
- }
-
seg->addr = maddr + disp;
seg->p_vaddr = phdr->p_vaddr;
seg->p_memsz = phdr->p_memsz;
