Skip to content

Commit 007480f

Browse files
bjorn-rivospalmer-dabbelt
authored andcommitted
riscv: mm: Refactor create_linear_mapping_range() for memory hot add
Add a parameter to the direct map setup function, so it can be used in arch_add_memory() later. Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> Signed-off-by: Björn Töpel <bjorn@rivosinc.com> Link: https://lore.kernel.org/r/20240605114100.315918-5-bjorn@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent fe122b8 commit 007480f

1 file changed

Lines changed: 6 additions & 9 deletions

File tree

arch/riscv/mm/init.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,7 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
12311231
}
12321232

12331233
static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t end,
1234-
uintptr_t fixed_map_size)
1234+
uintptr_t fixed_map_size, const pgprot_t *pgprot)
12351235
{
12361236
phys_addr_t pa;
12371237
uintptr_t va, map_size;
@@ -1242,7 +1242,7 @@ static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t
12421242
best_map_size(pa, va, end - pa);
12431243

12441244
create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
1245-
pgprot_from_va(va));
1245+
pgprot ? *pgprot : pgprot_from_va(va));
12461246
}
12471247
}
12481248

@@ -1286,22 +1286,19 @@ static void __init create_linear_mapping_page_table(void)
12861286
if (end >= __pa(PAGE_OFFSET) + memory_limit)
12871287
end = __pa(PAGE_OFFSET) + memory_limit;
12881288

1289-
create_linear_mapping_range(start, end, 0);
1289+
create_linear_mapping_range(start, end, 0, NULL);
12901290
}
12911291

12921292
#ifdef CONFIG_STRICT_KERNEL_RWX
1293-
create_linear_mapping_range(ktext_start, ktext_start + ktext_size, 0);
1294-
create_linear_mapping_range(krodata_start,
1295-
krodata_start + krodata_size, 0);
1293+
create_linear_mapping_range(ktext_start, ktext_start + ktext_size, 0, NULL);
1294+
create_linear_mapping_range(krodata_start, krodata_start + krodata_size, 0, NULL);
12961295

12971296
memblock_clear_nomap(ktext_start, ktext_size);
12981297
memblock_clear_nomap(krodata_start, krodata_size);
12991298
#endif
13001299

13011300
#ifdef CONFIG_KFENCE
1302-
create_linear_mapping_range(kfence_pool,
1303-
kfence_pool + KFENCE_POOL_SIZE,
1304-
PAGE_SIZE);
1301+
create_linear_mapping_range(kfence_pool, kfence_pool + KFENCE_POOL_SIZE, PAGE_SIZE, NULL);
13051302

13061303
memblock_clear_nomap(kfence_pool, KFENCE_POOL_SIZE);
13071304
#endif

0 commit comments

Comments
 (0)