Re: CVS import: src/sys/external/bsd/acpica/dist

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Hi,

On Mon, 24 Feb 2025 09:32:40 -0500
"Christos Zoulas" <christos%netbsd.org@localhost> wrote:

> Import new acpica-2024-12-12; previous one was 2024-08-27

This seems to have broken the aarch64 kernel build.
Probably this patch is ok? It boots on a RPi4 at least.

/work/src/sys/dev/acpi/acpi.c:1654:(.text+0x22d8): undefined reference to `AcpiSetFirmwareWakingVector'
/work/src/sys/dev/acpi/acpi.c:1654:(.text+0x22d8): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `AcpiSetFirmwareWakingVector'
/work/src/../tools/bin/aarch64--netbsd-ld: utxfinit.o: in function `AcpiEnableSubsystem':
/work/src/sys/external/bsd/acpica/dist/utilities/utxfinit.c:285:(.text+0x14c): undefined reference to `AcpiTbInitializeFacs'
/work/src/sys/external/bsd/acpica/dist/utilities/utxfinit.c:285:(.text+0x14c): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `AcpiTbInitializeFacs'

--- sys/external/bsd/acpica/dist/utilities/utxfinit.c	24 Feb 2025 14:32:16 -0000	1.1.1.17
+++ sys/external/bsd/acpica/dist/utilities/utxfinit.c	24 Feb 2025 21:30:18 -0000
@@ -276,6 +276,8 @@ AcpiEnableSubsystem (
      */
     AcpiGbl_EarlyInitialization = FALSE;
 
+#if (!ACPI_REDUCED_HARDWARE)
+
     /*
      * Obtain a permanent mapping for the FACS. This is required for the
      * Global Lock and the Firmware Waking Vector
@@ -290,8 +292,6 @@ AcpiEnableSubsystem (
         }
     }
 
-#if (!ACPI_REDUCED_HARDWARE)
-
     /* Enable ACPI mode */
 
     if (!(Flags & ACPI_NO_ACPI_ENABLE))
Index: sys/dev/acpi/acpi.c
===================================================================
RCS file: /cvsroot/src/sys/dev/acpi/acpi.c,v
retrieving revision 1.302
diff -p -u -r1.302 acpi.c
--- sys/dev/acpi/acpi.c	30 Dec 2024 11:44:16 -0000	1.302
+++ sys/dev/acpi/acpi.c	24 Feb 2025 21:30:19 -0000
@@ -1651,7 +1651,9 @@ acpi_enter_sleep_state(int state)
 
 			(void)pmf_system_bus_resume(PMF_Q_NONE);
 			(void)AcpiLeaveSleepState(state);
+#if (!ACPI_REDUCED_HARDWARE)
 			(void)AcpiSetFirmwareWakingVector(0, 0);
+#endif
 			(void)pmf_system_resume(PMF_Q_NONE);
 		}