diff options
| author | James Morse <james.morse@arm.com> | 2021-11-18 15:04:32 +0000 |
|---|---|---|
| committer | James Morse <james.morse@arm.com> | 2022-02-15 17:40:28 +0000 |
| commit | a9c406e6462ff14956d690de7bbe5131a5677dc9 (patch) | |
| tree | 90b8435c09994d03fff2d8d26d131c503efdd700 /arch/arm64/include/asm/fixmap.h | |
| parent | c47e4d04ba0f1ea17353d85d45f611277507e07a (diff) | |
| download | linux-a9c406e6462ff14956d690de7bbe5131a5677dc9.tar.gz linux-a9c406e6462ff14956d690de7bbe5131a5677dc9.tar.bz2 linux-a9c406e6462ff14956d690de7bbe5131a5677dc9.zip | |
arm64: entry: Allow the trampoline text to occupy multiple pages
Adding a second set of vectors to .entry.tramp.text will make it
larger than a single 4K page.
Allow the trampoline text to occupy up to three pages by adding two
more fixmap slots. Previous changes to tramp_valias allowed it to reach
beyond a single page.
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/fixmap.h')
| -rw-r--r-- | arch/arm64/include/asm/fixmap.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/fixmap.h b/arch/arm64/include/asm/fixmap.h index 0aabc0253b18..daff882883f9 100644 --- a/arch/arm64/include/asm/fixmap.h +++ b/arch/arm64/include/asm/fixmap.h @@ -62,9 +62,11 @@ enum fixed_addresses { #endif /* CONFIG_ACPI_APEI_GHES */ #ifdef CONFIG_UNMAP_KERNEL_AT_EL0 - FIX_ENTRY_TRAMP_TEXT, + FIX_ENTRY_TRAMP_TEXT3, + FIX_ENTRY_TRAMP_TEXT2, + FIX_ENTRY_TRAMP_TEXT1, FIX_ENTRY_TRAMP_DATA, -#define TRAMP_VALIAS (__fix_to_virt(FIX_ENTRY_TRAMP_TEXT)) +#define TRAMP_VALIAS (__fix_to_virt(FIX_ENTRY_TRAMP_TEXT1)) #endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */ __end_of_permanent_fixed_addresses, |