From 12425888280713f6bc5356de98f65fdaf3c8a22d Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Tue, 11 Dec 2018 11:13:11 +0000
Subject: [PATCH] Only read the ACPI proximity tabled on arm64 when we are
 booting from ACPI.

Sponsored by:	DARPA, AFRL
---
 sys/arm64/acpica/acpi_machdep.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/sys/arm64/acpica/acpi_machdep.c b/sys/arm64/acpica/acpi_machdep.c
index 3d423e910a32..dc2febe02fac 100644
--- a/sys/arm64/acpica/acpi_machdep.c
+++ b/sys/arm64/acpica/acpi_machdep.c
@@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
+#include <machine/machdep.h>
+
 #include <contrib/dev/acpica/include/acpi.h>
 #include <contrib/dev/acpica/include/accommon.h>
 #include <contrib/dev/acpica/include/actables.h>
@@ -239,6 +241,10 @@ static void
 parse_pxm_tables(void *dummy)
 {
 
+	/* Only parse ACPI tables when booting via ACPI */
+	if (arm64_bus_method != ARM64_BUS_ACPI)
+		return;
+
 	acpi_pxm_init(MAXCPU, (vm_paddr_t)1 << 40);
 	acpi_pxm_parse_tables();
 	acpi_pxm_set_mem_locality();