Module Name: src
Committed By: martin
Date: Wed Sep 18 16:30:33 UTC 2019
Modified Files:
src/sys/arch/x86/acpi [netbsd-8]: acpi_machdep.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #1380):
sys/arch/x86/acpi/acpi_machdep.c: revision 1.27,1.28 (patch)
Attempt to obtain ACPI RSDP from the hypervisor for Xen PV
There are three possible way of obtaining the ACPI RSDP
- From Extended BIOS Data Area (EBDA) when kernel or Xen was booted from
BIOS bootstrap
- From EFI SystemTable when kernel is booted from EFI bootstrap
- When Xen is booted from EFI bootstrap, EBDA is not mapped, and EFI
SystemTable is not passed to the kernel. The only way to go is to
obtain ACPI RSDP trhough an hypercall.
Note: EFI bootstrap support for booting Xen has not yet been committed.
Cast physical addresses via uintptr_t to ACPI_PHYSICAL_ADDRESS to deal
with all size variants of the types used here in different builds.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/arch/x86/acpi/acpi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.18 src/sys/arch/x86/acpi/acpi_machdep.c:1.18.6.1
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.18 Tue Feb 14 13:29:09 2017
+++ src/sys/arch/x86/acpi/acpi_machdep.c Wed Sep 18 16:30:33 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.18 2017/02/14 13:29:09 nonaka Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.18.6.1 2019/09/18 16:30:33 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.18 2017/02/14 13:29:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.18.6.1 2019/09/18 16:30:33 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -100,8 +100,61 @@ acpi_md_OsGetRootPointer(void)
ACPI_PHYSICAL_ADDRESS PhysicalAddress;
ACPI_STATUS Status;
-#ifndef XEN
- /* If EFI is available, attempt to use it to locate the ACPI table. */
+#ifdef XEN
+ /*
+ * Obtain the ACPI RSDP from the hypervisor.
+ * This is the only way to go if Xen booted from EFI: the
+ * Extended BIOS Data Area (EBDA) is not mapped, and Xen
+ * does not pass an EFI SystemTable to the kernel.
+ */
+ struct xen_platform_op op = {
+ .cmd = XENPF_firmware_info,
+ .u.firmware_info = {
+ .type = XEN_FW_EFI_INFO,
+ .index = XEN_FW_EFI_CONFIG_TABLE
+ }
+ };
+ union xenpf_efi_info *info = &op.u.firmware_info.u.efi_info;
+
+ if (HYPERVISOR_platform_op(&op) == 0) {
+ struct efi_cfgtbl *ct;
+ int i;
+
+ ct = AcpiOsMapMemory(info->cfg.addr,
+ sizeof(*ct) * info->cfg.nent);
+
+ for (i = 0; i < info->cfg.nent; i++) {
+ if (memcmp(&ct[i].ct_uuid,
+ &EFI_UUID_ACPI20, sizeof(EFI_UUID_ACPI20)) == 0) {
+ PhysicalAddress = (ACPI_PHYSICAL_ADDRESS)
+ (uintptr_t)ct[i].ct_data;
+ if (PhysicalAddress)
+ goto out;
+
+ }
+ }
+
+ for (i = 0; i < info->cfg.nent; i++) {
+ if (memcmp(&ct[i].ct_uuid,
+ &EFI_UUID_ACPI10, sizeof(EFI_UUID_ACPI10)) == 0) {
+ PhysicalAddress = (ACPI_PHYSICAL_ADDRESS)
+ (uintptr_t)ct[i].ct_data;
+ if (PhysicalAddress)
+ goto out;
+
+ }
+ }
+out:
+ AcpiOsUnmapMemory(ct, sizeof(*ct) * info->cfg.nent);
+
+ if (PhysicalAddress)
+ return PhysicalAddress;
+ }
+#else
+ /*
+ * Get the ACPI RSDP from EFI SystemTable. This works when the
+ * kernel was loaded from EFI bootloader.
+ */
if (efi_probe()) {
PhysicalAddress = efi_getcfgtblpa(&EFI_UUID_ACPI20);
if (!PhysicalAddress)
@@ -111,6 +164,11 @@ acpi_md_OsGetRootPointer(void)
}
#endif
+ /*
+ * Find ACPI RSDP from Extended BIOS Data Area (EBDA). This
+ * works when the kernel was started from BIOS bootloader,
+ * or for Xen PV when Xen was started from BIOS bootloader.
+ */
Status = AcpiFindRootPointer(&PhysicalAddress);
if (ACPI_FAILURE(Status))
PhysicalAddress = 0;
