UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

riscv: Move the linear mapping creation in its own function 

No change intended, it just splits the linear mapping creation from
setup_vm_final: this prepares for upcoming additions to the linear
mapping creation.

Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Tested-by: Anup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/20230324155421.271544-3-alexghiti@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Alexandre Ghiti 2023-03-24 16:54:20 +01:00 committed by Palmer Dabbelt
parent a7407a1318
commit 8589e346bb
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
arch/riscv/mm/init.c
View File

@ -1086,16 +1086,25 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
pt_ops_set_fixmap(); pt_ops_set_fixmap();
} }
static void __init setup_vm_final(void) static void __init create_linear_mapping_range(phys_addr_t start,
phys_addr_t end)
{ {
phys_addr_t pa;
uintptr_t va, map_size; uintptr_t va, map_size;
phys_addr_t pa, start, end;
u64 i;
/* Setup swapper PGD for fixmap */ for (pa = start; pa < end; pa += map_size) {
create_pgd_mapping(swapper_pg_dir, FIXADDR_START, va = (uintptr_t)__va(pa);
__pa_symbol(fixmap_pgd_next), map_size = best_map_size(pa, end - pa);
PGDIR_SIZE, PAGE_TABLE);
create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
pgprot_from_va(va));
}
}
static void __init create_linear_mapping_page_table(void)
{
phys_addr_t start, end;
u64 i;
/* Map all memory banks in the linear mapping */ /* Map all memory banks in the linear mapping */
for_each_mem_range(i, &start, &end) { for_each_mem_range(i, &start, &end) {
@ -1107,14 +1116,19 @@ static void __init setup_vm_final(void)
if (end >= __pa(PAGE_OFFSET) + memory_limit) if (end >= __pa(PAGE_OFFSET) + memory_limit)
end = __pa(PAGE_OFFSET) + memory_limit; end = __pa(PAGE_OFFSET) + memory_limit;
for (pa = start; pa < end; pa += map_size) { create_linear_mapping_range(start, end);
va = (uintptr_t)__va(pa); }
map_size = best_map_size(pa, end - pa); }
create_pgd_mapping(swapper_pg_dir, va, pa, map_size, static void __init setup_vm_final(void)
pgprot_from_va(va)); {
} /* Setup swapper PGD for fixmap */
} create_pgd_mapping(swapper_pg_dir, FIXADDR_START,
__pa_symbol(fixmap_pgd_next),
PGDIR_SIZE, PAGE_TABLE);
/* Map the linear mapping */
create_linear_mapping_page_table();
/* Map the kernel */ /* Map the kernel */
if (IS_ENABLED(CONFIG_64BIT)) if (IS_ENABLED(CONFIG_64BIT))