| Message ID | 20260505123408.41657-1-jon.mason@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | arm-bsp/edk2-firmware: workaround apcica changes | expand |
On Tue, 05 May 2026 08:34:08 -0400, Jon Mason wrote: > With the latest version of acpica (20260408), the following error is > being encountered in edk2 platforms for Arm SGI > > | "iasl" -p/builder/meta-arm/build/tmp/work/rdn2-poky-linux/edk2-firmware/202602/build/Build/RdN2/DEBUG_GCC5/AARCH64/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables/OUTPUT/./SsdtEvents.aml /builder/meta-arm/build/tmp/work/rdn2-poky-linux/edk2-firmware/202602/build/Build/RdN2/DEBUG_GCC5/AARCH64/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables/OUTPUT/./SsdtEvents.iiii > | /builder/meta-arm/build/tmp/work/rdn2-poky-linux/edk2-firmware/202602/build/Build/RdN2/DEBUG_GCC5/AARCH64/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables/OUTPUT/./SsdtEvents.iiii 61: Printf ("GPIO0 Pin0 Toggled") > | Error 6010 - Internal compiler error ^ (Invalid parse opcode in OpcGenerateAmlOpcode) > > [...] Applied, thanks! [1/1] arm-bsp/edk2-firmware: workaround apcica changes commit: 4112fda50b814ad6e3cfaefe5cad78a83114599a Best regards,
diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc index ef069c789055..e020c5d87b29 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdn2.inc @@ -9,6 +9,9 @@ COMPATIBLE_MACHINE = "rdn2" SRC_URI_EDK2 = "gitsm://gitlab.arm.com/infra-solutions/reference-design/platsw/edk2.git;protocol=https" SRC_URI_EDK2_PLATFORMS = "git://gitlab.arm.com/infra-solutions/reference-design/platsw/edk2-platforms.git;protocol=https" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch;patchdir=edk2-platforms" + SRCBRANCH_edk2 = "refinfra" SRCBRANCH_edk2_platforms = "refinfra" diff --git a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc index c2fd6fecfd32..89126c5fdcff 100644 --- a/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware-rdv2.inc @@ -9,6 +9,9 @@ COMPATIBLE_MACHINE = "rdv2" SRC_URI_EDK2 = "gitsm://gitlab.arm.com/infra-solutions/reference-design/platsw/edk2.git;protocol=https" SRC_URI_EDK2_PLATFORMS = "git://gitlab.arm.com/infra-solutions/reference-design/platsw/edk2-platforms.git;protocol=https" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch;patchdir=edk2-platforms" + SRCBRANCH_edk2 = "refinfra" SRCBRANCH_edk2_platforms = "refinfra" diff --git a/meta-arm-bsp/recipes-bsp/uefi/files/0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch b/meta-arm-bsp/recipes-bsp/uefi/files/0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch new file mode 100644 index 000000000000..67faa7e025ee --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/uefi/files/0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch @@ -0,0 +1,24 @@ +From 075fc90da4636b8bca9c21b8527364b31498eeaf Mon Sep 17 00:00:00 2001 +From: Jon Mason <jon.mason@arm.com> +Date: Mon, 4 May 2026 14:40:05 -0400 +Subject: [PATCH] Changes in acpica 20260408 are now causing issues with the + Printf in SsdrEvents.asl. Since this is probably for debug, remove it. + +Upstream-Status: Inappropriate +Signed-off-by: Jon Mason <jon.mason@arm.com> +--- + Platform/ARM/SgiPkg/AcpiTables/SsdtEvents.asl | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtEvents.asl b/Platform/ARM/SgiPkg/AcpiTables/SsdtEvents.asl +index 58efe62c93ea..61489513f61b 100644 +--- a/Platform/ARM/SgiPkg/AcpiTables/SsdtEvents.asl ++++ b/Platform/ARM/SgiPkg/AcpiTables/SsdtEvents.asl +@@ -56,7 +56,6 @@ DefinitionBlock("SsdtEvent.aml", "SSDT", 2, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM + + /* Event handler for pin0 */ + Method (_L00) { +- Printf ("GPIO0 Pin0 Toggled") + Store (1, INC0) + } +
With the latest version of acpica (20260408), the following error is being encountered in edk2 platforms for Arm SGI | "iasl" -p/builder/meta-arm/build/tmp/work/rdn2-poky-linux/edk2-firmware/202602/build/Build/RdN2/DEBUG_GCC5/AARCH64/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables/OUTPUT/./SsdtEvents.aml /builder/meta-arm/build/tmp/work/rdn2-poky-linux/edk2-firmware/202602/build/Build/RdN2/DEBUG_GCC5/AARCH64/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables/OUTPUT/./SsdtEvents.iiii | /builder/meta-arm/build/tmp/work/rdn2-poky-linux/edk2-firmware/202602/build/Build/RdN2/DEBUG_GCC5/AARCH64/Platform/ARM/SgiPkg/AcpiTables/RdN2AcpiTables/OUTPUT/./SsdtEvents.iiii 61: Printf ("GPIO0 Pin0 Toggled") | Error 6010 - Internal compiler error ^ (Invalid parse opcode in OpcGenerateAmlOpcode) Since this appears to be a debug message, and the relevant platforms are a work in progress. Work around this issue by removing the printf. Signed-off-by: Jon Mason <jon.mason@arm.com> --- .../recipes-bsp/uefi/edk2-firmware-rdn2.inc | 3 +++ .../recipes-bsp/uefi/edk2-firmware-rdv2.inc | 3 +++ ...a-20260408-are-now-causing-issues-wi.patch | 24 +++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/uefi/files/0001-Changes-in-acpica-20260408-are-now-causing-issues-wi.patch