From: "Wu, Bryan" Don't allocate Bank B data sram in l1_data_A_sram_alloc (). Add l1_data_sram_alloc (), which allocates data sram from either Bank A or Bank B. Change all the code which call to l1_data_A_sram_alloc () to use l1_data_sram_alloc () if appropriate. Likewise for l1_data_A_sram_free (). Signed-off-by: Jie Zhang Signed-off-by: Aubrey Li Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton --- arch/blackfin/kernel/bfin_ksyms.c | 2 arch/blackfin/kernel/module.c | 8 +-- arch/blackfin/kernel/setup.c | 35 +++++++++----- arch/blackfin/mm/blackfin_sram.c | 64 ++++++++++++++------------- include/asm-blackfin/bfin-global.h | 3 - 5 files changed, 65 insertions(+), 47 deletions(-) diff -puN arch/blackfin/kernel/bfin_ksyms.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data arch/blackfin/kernel/bfin_ksyms.c --- a/arch/blackfin/kernel/bfin_ksyms.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data +++ a/arch/blackfin/kernel/bfin_ksyms.c @@ -115,3 +115,5 @@ EXPORT_SYMBOL(_ebss_l1); EXPORT_SYMBOL(_stext_l1); EXPORT_SYMBOL(_etext_l1); EXPORT_SYMBOL(_sdata_l1); +EXPORT_SYMBOL(_ebss_b_l1); +EXPORT_SYMBOL(_sdata_b_l1); diff -puN arch/blackfin/kernel/module.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data arch/blackfin/kernel/module.c --- a/arch/blackfin/kernel/module.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data +++ a/arch/blackfin/kernel/module.c @@ -183,7 +183,7 @@ module_frob_arch_sections(Elf_Ehdr * hdr ((strcmp(".data", secstrings + s->sh_name)==0) && (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) { mod->arch.data_a_l1 = s; - dest = l1_data_A_sram_alloc(s->sh_size); + dest = l1_data_sram_alloc(s->sh_size); if (dest == NULL) { printk(KERN_ERR "module %s: L1 data memory allocation failed\n", @@ -198,7 +198,7 @@ module_frob_arch_sections(Elf_Ehdr * hdr ((strcmp(".bss", secstrings + s->sh_name)==0) && (hdr->e_flags & FLG_DATA_IN_L1) && (s->sh_size > 0))) { mod->arch.bss_a_l1 = s; - dest = l1_data_A_sram_alloc(s->sh_size); + dest = l1_data_sram_alloc(s->sh_size); if (dest == NULL) { printk(KERN_ERR "module %s: L1 data memory allocation failed\n", @@ -419,9 +419,9 @@ void module_arch_cleanup(struct module * if ((mod->arch.text_l1) && (mod->arch.text_l1->sh_addr)) l1_inst_sram_free((void*)mod->arch.text_l1->sh_addr); if ((mod->arch.data_a_l1) && (mod->arch.data_a_l1->sh_addr)) - l1_data_A_sram_free((void*)mod->arch.data_a_l1->sh_addr); + l1_data_sram_free((void*)mod->arch.data_a_l1->sh_addr); if ((mod->arch.bss_a_l1) && (mod->arch.bss_a_l1->sh_addr)) - l1_data_A_sram_free((void*)mod->arch.bss_a_l1->sh_addr); + l1_data_sram_free((void*)mod->arch.bss_a_l1->sh_addr); if ((mod->arch.data_b_l1) && (mod->arch.data_b_l1->sh_addr)) l1_data_B_sram_free((void*)mod->arch.data_b_l1->sh_addr); if ((mod->arch.bss_b_l1) && (mod->arch.bss_b_l1->sh_addr)) diff -puN arch/blackfin/kernel/setup.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data arch/blackfin/kernel/setup.c --- a/arch/blackfin/kernel/setup.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data +++ a/arch/blackfin/kernel/setup.c @@ -90,25 +90,34 @@ void __init bf53x_cache_init(void) void bf53x_relocate_l1_mem(void) { - unsigned long l1_length; - - l1_length = _etext_l1 - _stext_l1; - if (l1_length > L1_CODE_LENGTH) - l1_length = L1_CODE_LENGTH; + unsigned long l1_code_length; + unsigned long l1_data_a_length; + unsigned long l1_data_b_length; + + l1_code_length = _etext_l1 - _stext_l1; + if (l1_code_length > L1_CODE_LENGTH) + l1_code_length = L1_CODE_LENGTH; /* cannot complain as printk is not available as yet. * But we can continue booting and complain later! */ /* Copy _stext_l1 to _etext_l1 to L1 instruction SRAM */ - dma_memcpy(_stext_l1, _l1_lma_start, l1_length); - - l1_length = _ebss_l1 - _sdata_l1; - if (l1_length > L1_DATA_A_LENGTH) - l1_length = L1_DATA_A_LENGTH; + dma_memcpy(_stext_l1, _l1_lma_start, l1_code_length); - /* Copy _sdata_l1 to _ebss_l1 to L1 instruction SRAM */ - dma_memcpy(_sdata_l1, _l1_lma_start + (_etext_l1 - _stext_l1), - l1_length); + l1_data_a_length = _ebss_l1 - _sdata_l1; + if (l1_data_a_length > L1_DATA_A_LENGTH) + l1_data_a_length = L1_DATA_A_LENGTH; + + /* Copy _sdata_l1 to _ebss_l1 to L1 data bank A SRAM */ + dma_memcpy(_sdata_l1, _l1_lma_start + l1_code_length, l1_data_a_length); + + l1_data_b_length = _ebss_b_l1 - _sdata_b_l1; + if (l1_data_b_length > L1_DATA_B_LENGTH) + l1_data_b_length = L1_DATA_B_LENGTH; + + /* Copy _sdata_b_l1 to _ebss_b_l1 to L1 data bank B SRAM */ + dma_memcpy(_sdata_b_l1, _l1_lma_start + l1_code_length + + l1_data_a_length, l1_data_b_length); } diff -puN arch/blackfin/mm/blackfin_sram.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data arch/blackfin/mm/blackfin_sram.c --- a/arch/blackfin/mm/blackfin_sram.c~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data +++ a/arch/blackfin/mm/blackfin_sram.c @@ -283,12 +283,6 @@ void *l1_data_A_sram_alloc(size_t size) addr = _l1_sram_alloc(size, l1_data_A_sram, ARRAY_SIZE(l1_data_A_sram)); #endif -#if L1_DATA_B_LENGTH != 0 - if (!addr) - addr = _l1_sram_alloc(size, l1_data_B_sram, - ARRAY_SIZE(l1_data_B_sram)); -#endif - /* add mutex operation */ spin_unlock_irqrestore(&l1_data_sram_lock, flags); @@ -307,17 +301,11 @@ int l1_data_A_sram_free(const void *addr /* add mutex operation */ spin_lock_irqsave(&l1_data_sram_lock, flags); -#if L1_DATA_B_LENGTH != 0 - if (L1_DATA_B_START == ((unsigned long)addr & ~0x0000FFFF)) - ret = _l1_sram_free(addr, - l1_data_B_sram, ARRAY_SIZE(l1_data_B_sram)); - else -#endif #if L1_DATA_A_LENGTH != 0 - ret = _l1_sram_free(addr, - l1_data_A_sram, ARRAY_SIZE(l1_data_A_sram)); + ret = _l1_sram_free(addr, + l1_data_A_sram, ARRAY_SIZE(l1_data_A_sram)); #else - ret = -1; + ret = -1; #endif /* add mutex operation */ @@ -327,20 +315,6 @@ int l1_data_A_sram_free(const void *addr } EXPORT_SYMBOL(l1_data_A_sram_free); -void *l1_data_sram_zalloc(size_t size) -{ - void *addr = l1_data_A_sram_alloc(size); - memset(addr, 0x00, size); - return addr; -} -EXPORT_SYMBOL(l1_data_sram_zalloc); - -int l1_data_sram_free(const void *addr) -{ - return l1_data_A_sram_free(addr); -} -EXPORT_SYMBOL(l1_data_sram_free); - void *l1_data_B_sram_alloc(size_t size) { #if L1_DATA_B_LENGTH != 0 @@ -386,6 +360,38 @@ int l1_data_B_sram_free(const void *addr } EXPORT_SYMBOL(l1_data_B_sram_free); +void *l1_data_sram_alloc(size_t size) +{ + void *addr = l1_data_A_sram_alloc(size); + + if (!addr) + addr = l1_data_B_sram_alloc(size); + + return addr; +} +EXPORT_SYMBOL(l1_data_sram_alloc); + +void *l1_data_sram_zalloc(size_t size) +{ + void *addr = l1_data_sram_alloc(size); + + if (addr) + memset(addr, 0x00, size); + + return addr; +} +EXPORT_SYMBOL(l1_data_sram_zalloc); + +int l1_data_sram_free(const void *addr) +{ + int ret; + ret = l1_data_A_sram_free(addr); + if (ret == -1) + ret = l1_data_B_sram_free(addr); + return ret; +} +EXPORT_SYMBOL(l1_data_sram_free); + void *l1_inst_sram_alloc(size_t size) { #if L1_DATA_A_LENGTH != 0 diff -puN include/asm-blackfin/bfin-global.h~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data include/asm-blackfin/bfin-global.h --- a/include/asm-blackfin/bfin-global.h~blackfin-arch-fix-bug-data-cannot-be-put-into-l1-data +++ a/include/asm-blackfin/bfin-global.h @@ -70,6 +70,7 @@ extern void bfin_gpio_interrupt_setup(in extern void *l1_data_A_sram_alloc(size_t); extern void *l1_data_B_sram_alloc(size_t); extern void *l1_inst_sram_alloc(size_t); +extern void *l1_data_sram_alloc(size_t); extern void *l1_data_sram_zalloc(size_t); extern int l1_data_A_sram_free(const void*); extern int l1_data_B_sram_free(const void*); @@ -108,7 +109,7 @@ extern char _start; extern unsigned long _ramstart, _ramend, _rambase; extern unsigned long memory_start, memory_end, physical_mem_end; extern char _stext_l1[], _etext_l1[], _sdata_l1[], _edata_l1[], _sbss_l1[], - _ebss_l1[], _l1_lma_start[]; + _ebss_l1[], _l1_lma_start[], _sdata_b_l1[], _ebss_b_l1[]; #ifdef CONFIG_MTD_UCLINUX extern unsigned long memory_mtd_start, memory_mtd_end, mtd_size; _