svn commit: r368081 - head/sys/arm64/arm64

[Emmanuel Vadot]

Author: manu
Date: Thu Nov 26 20:22:34 2020
New Revision: 368081
URL: https://svnweb.freebsd.org/changeset/base/368081

Log:
  arm64: Do not rely on SPCR table to detect acpi
  
  Since EDK2 commit d8e36289cef7bde628b023219cd65fa8e8d4562a, the Graphical console may
  completely hide SPCR, causing panics later when locating timers.
  As such simply rely on the ACPI Root pointer presence.
  
  Submitted by:	dan.kotowski at a9development.com
  Reviewed by:	andrew, mw
  Differential Revision:	https://reviews.freebsd.org/D27306

Modified:
  head/sys/arm64/arm64/machdep.c

Modified: head/sys/arm64/arm64/machdep.c
==============================================================================
--- head/sys/arm64/arm64/machdep.c	Thu Nov 26 19:38:02 2020	(r368080)
+++ head/sys/arm64/arm64/machdep.c	Thu Nov 26 20:22:34 2020	(r368081)
@@ -1036,7 +1036,7 @@ bus_probe(void)
 	has_fdt = (OF_peer(0) != 0);
 #endif
 #ifdef DEV_ACPI
-	has_acpi = (acpi_find_table(ACPI_SIG_SPCR) != 0);
+	has_acpi = (AcpiOsGetRootPointer() != 0);
 #endif
 
 	env = kern_getenv("kern.cfg.order");