Skip to content

Commit 8589e34

Browse files
Alexandre Ghitipalmer-dabbelt
authored andcommitted
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>
1 parent a7407a1 commit 8589e34

1 file changed

Lines changed: 28 additions & 14 deletions

File tree

arch/riscv/mm/init.c

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1086,16 +1086,25 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
10861086
pt_ops_set_fixmap();
10871087
}
10881088

1089-
static void __init setup_vm_final(void)
1089+
static void __init create_linear_mapping_range(phys_addr_t start,
1090+
phys_addr_t end)
10901091
{
1092+
phys_addr_t pa;
10911093
uintptr_t va, map_size;
1092-
phys_addr_t pa, start, end;
1093-
u64 i;
10941094

1095-
/* Setup swapper PGD for fixmap */
1096-
create_pgd_mapping(swapper_pg_dir, FIXADDR_START,
1097-
__pa_symbol(fixmap_pgd_next),
1098-
PGDIR_SIZE, PAGE_TABLE);
1095+
for (pa = start; pa < end; pa += map_size) {
1096+
va = (uintptr_t)__va(pa);
1097+
map_size = best_map_size(pa, end - pa);
1098+
1099+
create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
1100+
pgprot_from_va(va));
1101+
}
1102+
}
1103+
1104+
static void __init create_linear_mapping_page_table(void)
1105+
{
1106+
phys_addr_t start, end;
1107+
u64 i;
10991108

11001109
/* Map all memory banks in the linear mapping */
11011110
for_each_mem_range(i, &start, &end) {
@@ -1107,14 +1116,19 @@ static void __init setup_vm_final(void)
11071116
if (end >= __pa(PAGE_OFFSET) + memory_limit)
11081117
end = __pa(PAGE_OFFSET) + memory_limit;
11091118

1110-
for (pa = start; pa < end; pa += map_size) {
1111-
va = (uintptr_t)__va(pa);
1112-
map_size = best_map_size(pa, end - pa);
1113-
1114-
create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
1115-
pgprot_from_va(va));
1116-
}
1119+
create_linear_mapping_range(start, end);
11171120
}
1121+
}
1122+
1123+
static void __init setup_vm_final(void)
1124+
{
1125+
/* Setup swapper PGD for fixmap */
1126+
create_pgd_mapping(swapper_pg_dir, FIXADDR_START,
1127+
__pa_symbol(fixmap_pgd_next),
1128+
PGDIR_SIZE, PAGE_TABLE);
1129+
1130+
/* Map the linear mapping */
1131+
create_linear_mapping_page_table();
11181132

11191133
/* Map the kernel */
11201134
if (IS_ENABLED(CONFIG_64BIT))

0 commit comments

Comments
 (0)