Currently the reserve_real_mode() always allocates memory from below 1M range, although some real mode blob code can execute above 1M. The VTL2 TDX hyperv guest may have no memory available below 1M, but it needs to invoke some real mode blob code that can execute above 1M memory. Instead of providing a platform specific realmode_reserve callback, the reserve_real_mode() is updated to support flexible memory range to meet this requirement. Originally-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Link: https://lore.kernel.org/lkml/87a5ho2q6x.ffs@tglx/ Signed-off-by: Yunhong Jiang <yunhong.jiang@xxxxxxxxxxxxxxx> --- arch/x86/include/asm/x86_init.h | 6 ++++++ arch/x86/kernel/x86_init.c | 3 +++ arch/x86/realmode/init.c | 14 ++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h index 213cf5379a5a..9e3198bfe56e 100644 --- a/arch/x86/include/asm/x86_init.h +++ b/arch/x86/include/asm/x86_init.h @@ -31,12 +31,18 @@ struct x86_init_mpparse { * platform * @memory_setup: platform specific memory setup * @dmi_setup: platform specific DMI setup + * @realmode_limit: platform specific address limit for the realmode trampoline + * (default 1M) + * @reserve_bios: platform specific address limit for reserving the BIOS area + * (default 1M) */ struct x86_init_resources { void (*probe_roms)(void); void (*reserve_resources)(void); char *(*memory_setup)(void); void (*dmi_setup)(void); + unsigned long realmode_limit; + unsigned long reserve_bios; }; /** diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index 82b128d3f309..f3226aa77bfb 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -8,6 +8,7 @@ #include <linux/ioport.h> #include <linux/export.h> #include <linux/pci.h> +#include <linux/sizes.h> #include <asm/acpi.h> #include <asm/bios_ebda.h> @@ -68,6 +69,8 @@ struct x86_init_ops x86_init __initdata = { .reserve_resources = reserve_standard_io_resources, .memory_setup = e820__memory_setup_default, .dmi_setup = dmi_setup, + .realmode_limit = SZ_1M, + .reserve_bios = SZ_1M, }, .mpparse = { diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c index f9bc444a3064..6d658ad8c0f4 100644 --- a/arch/x86/realmode/init.c +++ b/arch/x86/realmode/init.c @@ -45,7 +45,7 @@ void load_trampoline_pgtable(void) void __init reserve_real_mode(void) { - phys_addr_t mem; + phys_addr_t mem, limit = x86_init.resources.realmode_limit; size_t size = real_mode_size_needed(); if (!size) @@ -54,17 +54,15 @@ void __init reserve_real_mode(void) WARN_ON(slab_is_available()); /* Has to be under 1M so we can execute real-mode AP code. */ - mem = memblock_phys_alloc_range(size, PAGE_SIZE, 0, 1<<20); + mem = memblock_phys_alloc_range(size, PAGE_SIZE, 0, limit); if (!mem) - pr_info("No sub-1M memory is available for the trampoline\n"); + pr_info("No memory below %lluM for the real-mode trampoline\n", limit >> 20); else set_real_mode_mem(mem); - /* - * Unconditionally reserve the entire first 1M, see comment in - * setup_arch(). - */ - memblock_reserve(0, SZ_1M); + /* Reserve the entire first 1M, if enabled. See comment in setup_arch(). */ + if (x86_init.resources.reserve_bios) + memblock_reserve(0, x86_init.resources.reserve_bios); } static void __init sme_sev_setup_real_mode(struct trampoline_header *th) -- 2.25.1
