diff options
| author | Zenghui Yu <yuzenghui@huawei.com> | 2024-06-21 17:28:09 +0800 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2024-06-24 12:37:46 +0100 |
| commit | ecc54006f158ae0245a13e59026da2f0239c1b86 (patch) | |
| tree | 3a3e33892ac6af7c621c767fc12f3db39f32bf85 | |
| parent | 895a37028a4854962def6e2f2820a23c84062f66 (diff) | |
| download | linux-ecc54006f158ae0245a13e59026da2f0239c1b86.tar.gz linux-ecc54006f158ae0245a13e59026da2f0239c1b86.tar.bz2 linux-ecc54006f158ae0245a13e59026da2f0239c1b86.zip | |
arm64: Clear the initial ID map correctly before remapping
In the attempt to clear and recreate the initial ID map for LPA2, we
wrongly use 'start - end' as the map size and make the memset() almost a
nop.
Fix it by passing the correct map size.
Fixes: 9684ec186f8f ("arm64: Enable LPA2 at boot if supported by the system")
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20240621092809.162-1-yuzenghui@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
| -rw-r--r-- | arch/arm64/kernel/pi/map_kernel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/pi/map_kernel.c b/arch/arm64/kernel/pi/map_kernel.c index 5fa08e13e17e..f374a3e5a5fe 100644 --- a/arch/arm64/kernel/pi/map_kernel.c +++ b/arch/arm64/kernel/pi/map_kernel.c @@ -173,7 +173,7 @@ static void __init remap_idmap_for_lpa2(void) * Don't bother with the FDT, we no longer need it after this. */ memset(init_idmap_pg_dir, 0, - (u64)init_idmap_pg_dir - (u64)init_idmap_pg_end); + (u64)init_idmap_pg_end - (u64)init_idmap_pg_dir); create_init_idmap(init_idmap_pg_dir, mask); dsb(ishst); |