 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_machdep.c,v 1.26 2019/05/01 07:26:28 mlelstv Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.26.2.1 2019/09/17 19:41:45 martin Exp $ */
 /*
  * Copyright 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Machine-dependent routines for ACPICA.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.26 2019/05/01 07:26:28 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.26.2.1 2019/09/17 19:41:45 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpufunc.h>
 #include <machine/bootinfo.h>
 #include <machine/autoconf.h>
 @@ -90,37 +90,95 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_machdep
 ACPI_STATUS
 acpi_md_OsInitialize(void)
+{
 	return AE_OK;
+}
 ACPI_PHYSICAL_ADDRESS
 acpi_md_OsGetRootPointer(void)
+{
 	ACPI_PHYSICAL_ADDRESS PhysicalAddress;
 	ACPI_STATUS Status;
-#ifndef XENPV
+#ifdef XENPV
-	/* If EFI is available, attempt to use it to locate the ACPI table. */
+	/*
 	 * 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)
 			PhysicalAddress = efi_getcfgtblpa(&EFI_UUID_ACPI10);
 		if (PhysicalAddress)
 			return PhysicalAddress;
+	}
 #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;
 	return PhysicalAddress;
+}
 struct acpi_md_override {
 	int irq;
 	int pin;
 	int flags;
 };