Commit 38762155 authored by Mike Rapoport (IBM)'s avatar Mike Rapoport (IBM) Committed by Luis Chamberlain
Browse files

nios2: define virtual address space for modules 



nios2 uses kmalloc() to implement module_alloc() because CALL26/PCREL26
cannot reach all of vmalloc address space.

Define module space as 32MiB below the kernel base and switch nios2 to
use vmalloc for module allocations.

Suggested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarDinh Nguyen <dinguyen@kernel.org>
Acked-by: default avatarSong Liu <song@kernel.org>
Signed-off-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 0cdf5876

arch/nios2/include/asm/pgtable.h

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ 
#include <asm-generic/pgtable-nopmd.h>



#define VMALLOC_START		CONFIG_NIOS2_KERNEL_MMU_REGION_BASE

#define VMALLOC_END		(CONFIG_NIOS2_KERNEL_REGION_BASE - 1)

#define VMALLOC_END		(CONFIG_NIOS2_KERNEL_REGION_BASE - SZ_32M - 1)



#define MODULES_VADDR		(CONFIG_NIOS2_KERNEL_REGION_BASE - SZ_32M)

#define MODULES_END		(CONFIG_NIOS2_KERNEL_REGION_BASE - 1)



struct mm_struct;

arch/nios2/kernel/module.c

+4 −15
Original line number Diff line number Diff line
@@ -21,23 +21,12 @@ 


#include <asm/cacheflush.h>



/*

 * Modules should NOT be allocated with kmalloc for (obvious) reasons.

 * But we do it for now to avoid relocation issues. CALL26/PCREL26 cannot reach

 * from 0x80000000 (vmalloc area) to 0xc00000000 (kernel) (kmalloc returns

 * addresses in 0xc0000000)

 */

void *module_alloc(unsigned long size)

{

	if (size == 0)

		return NULL;

	return kmalloc(size, GFP_KERNEL);

}



/* Free memory returned from module_alloc */

void module_memfree(void *module_region)

{

	kfree(module_region);

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				    GFP_KERNEL, PAGE_KERNEL_EXEC,

				    VM_FLUSH_RESET_PERMS, NUMA_NO_NODE,

				    __builtin_return_address(0));

}



int apply_relocate_add(Elf32_Shdr *sechdrs, const char *strtab,