Skip to content

Commit 7271cb9

Browse files
bysuijgross1
authored andcommitted
x86/PVH: Use boot params to pass RSDP address in start_info page
After commit e6e094e ("x86/acpi, x86/boot: Take RSDP address from boot params if available"), the RSDP address can be passed in boot params. Therefore, store the RSDP address in start_info page into boot params in the PVH entry instead of registering a different callback. This removes an absolute reference during the PVH entry and is more standardized. Signed-off-by: Hou Wenlong <houwenlong.hwl@antgroup.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Juergen Gross <jgross@suse.com> Message-ID: <76675c4d49d3a8f72252076812ef8f22276230c2.1772282441.git.houwenlong.hwl@antgroup.com>
1 parent b8c460a commit 7271cb9

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

arch/x86/platform/pvh/enlighten.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ struct hvm_start_info __initdata pvh_start_info;
2525

2626
const unsigned int __initconst pvh_start_info_sz = sizeof(pvh_start_info);
2727

28-
static u64 __init pvh_get_root_pointer(void)
29-
{
30-
return pvh_start_info.rsdp_paddr;
31-
}
32-
3328
/*
3429
* Xen guests are able to obtain the memory map from the hypervisor via the
3530
* HYPERVISOR_memory_op hypercall.
@@ -95,7 +90,7 @@ static void __init init_pvh_bootparams(bool xen_guest)
9590
pvh_bootparams.hdr.version = (2 << 8) | 12;
9691
pvh_bootparams.hdr.type_of_loader = ((xen_guest ? 0x9 : 0xb) << 4) | 0;
9792

98-
x86_init.acpi.get_root_pointer = pvh_get_root_pointer;
93+
pvh_bootparams.acpi_rsdp_addr = pvh_start_info.rsdp_paddr;
9994
}
10095

10196
/*

0 commit comments

Comments
 (0)