Skip to content

Commit b17d9d1

Browse files
jgross1Ingo Molnar
authored andcommitted
x86/xen: Add pvh specific rsdp address retrieval function
Add pvh_get_root_pointer() for Xen PVH guests to communicate the address of the RSDP table given to the kernel via Xen start info. This makes the kernel boot again in PVH mode after on recent Xen the RSDP was moved to higher addresses. So up to that change it was pure luck that the legacy method to locate the RSDP was working when running as PVH mode. Signed-off-by: Juergen Gross <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Eric Biederman <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Kees Cook <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 038bac2 commit b17d9d1

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

arch/x86/xen/enlighten_pvh.c

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <asm/io_apic.h>
77
#include <asm/hypervisor.h>
88
#include <asm/e820/api.h>
9+
#include <asm/x86_init.h>
910

1011
#include <asm/xen/interface.h>
1112
#include <asm/xen/hypercall.h>
@@ -16,15 +17,20 @@
1617
/*
1718
* PVH variables.
1819
*
19-
* xen_pvh and pvh_bootparams need to live in data segment since they
20-
* are used after startup_{32|64}, which clear .bss, are invoked.
20+
* xen_pvh pvh_bootparams and pvh_start_info need to live in data segment
21+
* since they are used after startup_{32|64}, which clear .bss, are invoked.
2122
*/
2223
bool xen_pvh __attribute__((section(".data"))) = 0;
2324
struct boot_params pvh_bootparams __attribute__((section(".data")));
25+
struct hvm_start_info pvh_start_info __attribute__((section(".data")));
2426

25-
struct hvm_start_info pvh_start_info;
2627
unsigned int pvh_start_info_sz = sizeof(pvh_start_info);
2728

29+
static u64 pvh_get_root_pointer(void)
30+
{
31+
return pvh_start_info.rsdp_paddr;
32+
}
33+
2834
static void __init init_pvh_bootparams(void)
2935
{
3036
struct xen_memory_map memmap;
@@ -71,6 +77,8 @@ static void __init init_pvh_bootparams(void)
7177
*/
7278
pvh_bootparams.hdr.version = 0x212;
7379
pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */
80+
81+
x86_init.acpi.get_root_pointer = pvh_get_root_pointer;
7482
}
7583

7684
/*

0 commit comments

Comments
 (0)