Author: andrew
Date: Tue Dec 11 11:13:11 2018
New Revision: 341814
URL: https://svnweb.freebsd.org/changeset/base/341814
Log:
Only read the ACPI proximity tabled on arm64 when we are booting from
ACPI.
Sponsored by: DARPA, AFRL
Modified:
head/sys/arm64/acpica/acpi_machdep.c
Modified: head/sys/arm64/acpica/acpi_machdep.c
==============================================================================
--- head/sys/arm64/acpica/acpi_machdep.c Tue Dec 11 06:47:04 2018
(r341813)
+++ head/sys/arm64/acpica/acpi_machdep.c Tue Dec 11 11:13:11 2018
(r341814)
@@ -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>
@@ -238,6 +240,10 @@ acpi_map_addr(struct acpi_generic_address *addr, bus_s
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();
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
