[PATCH 3/7] riscv: mm: Refactor create_linear_mapping_range() for hot add
Björn Töpel
bjorn at kernel.org
Fri May 12 07:57:33 PDT 2023
From: Björn Töpel <bjorn at rivosinc.com>
Add a parameter to the direct map setup function, so it can be used in
arch_add_memory() later.
Signed-off-by: Björn Töpel <bjorn at rivosinc.com>
---
arch/riscv/mm/init.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
index e974ff6ef036..aea8ccb3f4ae 100644
--- a/arch/riscv/mm/init.c
+++ b/arch/riscv/mm/init.c
@@ -1247,18 +1247,19 @@ asmlinkage void __init setup_vm(uintptr_t dtb_pa)
pt_ops_set_fixmap();
}
-static void __init create_linear_mapping_range(phys_addr_t start,
- phys_addr_t end)
+static void __meminit create_linear_mapping_range(phys_addr_t start, phys_addr_t end,
+ struct mhp_params *params)
{
phys_addr_t pa;
uintptr_t va, map_size;
for (pa = start; pa < end; pa += map_size) {
+ pgprot_t pgprot;
+
va = (uintptr_t)__va(pa);
+ pgprot = params ? params->pgprot : pgprot_from_va(va);
map_size = best_map_size(pa, end - pa);
-
- create_pgd_mapping(swapper_pg_dir, va, pa, map_size,
- pgprot_from_va(va));
+ create_pgd_mapping(swapper_pg_dir, va, pa, map_size, pgprot);
}
}
@@ -1288,13 +1289,12 @@ static void __init create_linear_mapping_page_table(void)
if (end >= __pa(PAGE_OFFSET) + memory_limit)
end = __pa(PAGE_OFFSET) + memory_limit;
- create_linear_mapping_range(start, end);
+ create_linear_mapping_range(start, end, NULL);
}
#ifdef CONFIG_STRICT_KERNEL_RWX
- create_linear_mapping_range(ktext_start, ktext_start + ktext_size);
- create_linear_mapping_range(krodata_start,
- krodata_start + krodata_size);
+ create_linear_mapping_range(ktext_start, ktext_start + ktext_size, NULL);
+ create_linear_mapping_range(krodata_start, krodata_start + krodata_size, NULL);
memblock_clear_nomap(ktext_start, ktext_size);
memblock_clear_nomap(krodata_start, krodata_size);
--
2.39.2
More information about the linux-riscv
mailing list