diff options
| author |   Christophe Leroy <christophe.leroy@csgroup.eu> | 2021-10-15 12:02:46 +0200 |
|---|---|---|
| committer |   Michael Ellerman <mpe@ellerman.id.au> | 2021-10-22 15:22:03 +1100 |
| commit | 52bda69ae8b5102fe08c9db10f4a1514478e07d3 (patch) | |
| tree | 37cd08395ff9a86d87a590f8501a57ceff28644f /arch/powerpc/mm/nohash/tlb.c | |
| parent | powerpc/fsl_booke: Enable reloading of TLBCAM without switching to AS1 (diff) | |
| download | linux-dev-52bda69ae8b5102fe08c9db10f4a1514478e07d3.tar.xz linux-dev-52bda69ae8b5102fe08c9db10f4a1514478e07d3.zip | |
powerpc/fsl_booke: Tell map_mem_in_cams() if init is done
In order to be able to call map_mem_in_cams() once more
after init for STRICT_KERNEL_RWX, add an argument.
For now, map_mem_in_cams() is always called only during init.
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/3b69a7e0b393b16984ade882a5eae5d727717459.1634292136.git.christophe.leroy@csgroup.eu
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/mm/nohash/tlb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/nohash/tlb.c b/arch/powerpc/mm/nohash/tlb.c index 5872f69141d5..fc195b9f524b 100644 --- a/arch/powerpc/mm/nohash/tlb.c +++ b/arch/powerpc/mm/nohash/tlb.c @@ -643,7 +643,7 @@ static void early_init_this_mmu(void) if (map) linear_map_top = map_mem_in_cams(linear_map_top, - num_cams, false); + num_cams, true, true); } #endif @@ -764,7 +764,7 @@ void setup_initial_memory_limit(phys_addr_t first_memblock_base, num_cams = (mfspr(SPRN_TLB1CFG) & TLBnCFG_N_ENTRY) / 4; linear_sz = map_mem_in_cams(first_memblock_size, num_cams, - true); + false, true); ppc64_rma_size = min_t(u64, linear_sz, 0x40000000); } else |