From 6d6181f108a1b6da20e9dd942c8971ca8ca8a814493ca0a4be380be1fb4c7405 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 15:13:25 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main acpica revision 7d304e549f057d7831877aee58da96bc --- acpica-no-compiletime.patch | 54 ++++++----------- acpica-unix-20221020.tar_0.gz | 3 - acpica-unix-20240321.tar.gz | 3 + acpica.changes | 91 ++++++++++++++++++++++++++++ acpica.spec | 15 +++-- do_not_use_build_date_and_time.patch | 80 +++++++++++++----------- 6 files changed, 165 insertions(+), 81 deletions(-) delete mode 100644 acpica-unix-20221020.tar_0.gz create mode 100644 acpica-unix-20240321.tar.gz diff --git a/acpica-no-compiletime.patch b/acpica-no-compiletime.patch index e63bb99..46abb50 100644 --- a/acpica-no-compiletime.patch +++ b/acpica-no-compiletime.patch @@ -1,39 +1,8 @@ -diff -ur acpica-unix-20200528.orig/source/compiler/aslcompile.c acpica-unix-20200528/source/compiler/aslcompile.c ---- acpica-unix-20200528.orig/source/compiler/aslcompile.c 2020-07-02 23:06:04.925335370 +0200 -+++ acpica-unix-20200528/source/compiler/aslcompile.c 2020-07-02 23:16:10.095860566 +0200 -@@ -648,8 +648,6 @@ - AslCompilerFileHeader ( - UINT32 FileId) - { -- char *NewTime; -- time_t Aclock; - char *Prefix = ""; - - -@@ -692,18 +690,10 @@ - - /* Compilation header with timestamp */ - -- Aclock = time (NULL); -- NewTime = ctime (&Aclock); -- - FlPrintFile (FileId, -- "%sCompilation of \"%s\" -", -+ "%sCompilation of \"%s\"\n", - Prefix, AslGbl_Files[ASL_FILE_INPUT].Filename); - -- if (NewTime) -- { -- FlPrintFile (FileId, " %s%s\n", NewTime, Prefix); -- } -- - switch (FileId) - { - case ASL_FILE_C_SOURCE_OUTPUT: -diff -ur acpica-unix-20200528.orig/source/compiler/aslutils.c acpica-unix-20200528/source/compiler/aslutils.c ---- acpica-unix-20200528.orig/source/compiler/aslutils.c 2020-07-02 23:06:04.929335334 +0200 -+++ acpica-unix-20200528/source/compiler/aslutils.c 2020-07-02 23:18:46.898454693 +0200 -@@ -595,8 +595,8 @@ +Index: acpica-unix-20240321/source/compiler/aslutils.c +=================================================================== +--- acpica-unix-20240321.orig/source/compiler/aslutils.c ++++ acpica-unix-20240321/source/compiler/aslutils.c +@@ -637,8 +637,8 @@ UtDisplayOneSummary ( { /* Compiler name and version number */ @@ -44,3 +13,16 @@ diff -ur acpica-unix-20200528.orig/source/compiler/aslutils.c acpica-unix-202005 } /* Summary of main input and output files */ +Index: acpica-unix-20240321/source/compiler/aslglobal.h +=================================================================== +--- acpica-unix-20240321.orig/source/compiler/aslglobal.h ++++ acpica-unix-20240321/source/compiler/aslglobal.h +@@ -325,7 +325,7 @@ ASL_EXTERN BOOLEAN ASL_ + ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_DisplayRemarks, TRUE); + ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_DisplayWarnings, TRUE); + ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_DisplayOptimizations, FALSE); +-ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_Deterministic, TRUE); ++ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_Deterministic, FALSE); + ASL_EXTERN UINT8 ASL_INIT_GLOBAL (AslGbl_WarningLevel, ASL_WARNING); + ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_UseOriginalCompilerId, FALSE); + ASL_EXTERN BOOLEAN ASL_INIT_GLOBAL (AslGbl_VerboseTemplates, FALSE); diff --git a/acpica-unix-20221020.tar_0.gz b/acpica-unix-20221020.tar_0.gz deleted file mode 100644 index 5ea5703..0000000 --- a/acpica-unix-20221020.tar_0.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33a2e394aca0ca57d4018afe3da340dfad5eb45b1b9300e81dd595fda07cf1c5 -size 1920483 diff --git a/acpica-unix-20240321.tar.gz b/acpica-unix-20240321.tar.gz new file mode 100644 index 0000000..f0b9ba0 --- /dev/null +++ b/acpica-unix-20240321.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54a299487925fd3e0551c95f9d5cee4f4984930273983eff67aa5cd46f8f338b +size 1941366 diff --git a/acpica.changes b/acpica.changes index 4dd6c4f..573b43e 100644 --- a/acpica.changes +++ b/acpica.changes @@ -1,3 +1,94 @@ +------------------------------------------------------------------- +Fri Mar 22 19:10:55 UTC 2024 - Thomas Renninger + +- Use local source, there currently is no fixed tarball URL +- Use AslGbl_Deterministic by default FALSE to not compile in Date/Time + into ACPI table compilings +- Update to version 20240321 + * Get rid of MSVC warnings that arise actually due to GCC's new dangling pointer warning and also tGCC's blindspot to work with nested named structs/unions resulting in breaking of ACPI event-handling + * events/evgpeinit: don't forget to increment registered GPE count + * events/evxfgpe: correctly clear GPE_AUTO_ENABLED in AcpiSetupGpeForWake + * Fix Capabilities[1024] mess + * Update actbl2.h to get rid of the MSVC error C2233 + * Fix CXL 3.0 structure (RDPAS) in the CEDT table + * ACPICA: debugger: check status of AcpiEvaluateObject in AcpiDbWalkForFields + * SRAT: Add dump and compiler support for RINTC affinity structure + * SRAT: Add RISC-V RINTC affinity structure + * Modify ACPI_OBJECT_COMMON_HEADER + * Fix spelling and typos: Clean up the fix for Issue #900 + * Clean up the fix for Issue #900 + * tests/common: use CopyObject instead of Store for NRMT + * acgcc: Fix C++ issue with ACPI_FLEX_ARRAY + * MADT: Add new MADT GICC/GICR/ITS non-coherent flags handling + * MADT: Add GICC online capable bit handling + * Fix various spelling mistakes in text files and code comments + * acpisrc: Add identifiers for the NHLT table + * NHLT: Reintroduce types the table consists of + * AdDisassemblerHeader: omit timestamp for deterministic output + * Fix build indeterminism for asm compiler header. + * os_specific: zephyr: update AcpiOsGetTimer with arch specific timer + * osal: zephyr: Fix write access for mapped memory + * osal: zephyr: Fix AcpiOsPrintf implementation + * Fix issue #896 + * Attempt 1 to fix issue #900 + * ACPI 6.5: RAS2: Add support for RAS2 table + * Add port definitions for CDAT SSLBIS + * dmtbdump2: remove redundant failure check on Status + * dmtbdump: remove duplicated code for both paths of an if statement + * NHLT: Drop preliminary support + * Revert "NHLT: Declare device configuration types" + * os_specific: zephyr: add generic platform support + * Fix segfault when error-checking mixed table types + * actbl1.h: Add EINJ CXL error types + * Get rid of // style comments + * NHLT: Declare device configuration types + * dmtbinfo2.c: RISC-V: Remove redundant Flags print + +------------------------------------------------------------------- +Mon Feb 12 07:01:55 UTC 2024 - Thomas Renninger + +- Update to version 20230628 + * IASL/RHCT: Enable dumping and compiling newly added nodes + * RHCT: Add flags, CMO and MMU nodes + * MADT: Add dump and compile support for RISC-V APICs + * MADT: Add RISC-V external interrupt controllers + * Add AML_NO_OPERAND_RESOLVE flag to Timer + * Add a define for size of acpi_srat_generic_affinity DeviceHandle + * Slightly simplify an error message in acpi_ds_result_push() + * Add port definitions for CDAT SSLBIS + * Fix misspelled CDAT DSMAS define + * Add interrupt command to acpiexec + * Detect GED device and keep track of _EVT + * ACPICA: Modify ACPI_STATE_COMMON + * Manually revert after resolving conflicts PR #757 commit 32d875705c8ee8f99fd8b78dbed48633486a7640 + * fix for conflict macro definition on zephyr interface + * Fix ACPI_FUNCTION_ENTRY() + * Revert "Fixes for ACPI_FLEX_ARRAY, to eliminate warnings on MSVC" + * Revert "Events: Use spaces instead of tabs to fix indentation" + * Add support for _DSC as per ACPI 6.5 + * exserial.c: replace ternary operator with ACPI_MIN() + * ACPICA: Modify ACPI_STATE_COMMON + * Fix GCC 12 dangling-pointer warning + * build: added module name for zephyr build system + * Revert "Move ACPI_FUNCTION_ENTRY to function entry" + * Move ACPI_FUNCTION_ENTRY to function entry + * iASL/MADT: Add dump and compile support for LoongArch APICs + * iasl: check Offset before Subtable dereference + +------------------------------------------------------------------- +Wed Jun 21 14:29:52 UTC 2023 - Ferdinand Thiessen + +- Update to version 20230331 + * Add C Flexible Array support. + * Add support for 64 bit LoongArch compilation. + * Add first batch of RISC-V related definitions. + * hwvalid: Drop port I/O validation. + * iASL: Added full macro support in the preprocessor. + * Add support for AMD Secure Processor Table (ASPT) version 1. + * Add support for Arm's MPAM ACPI table version 2. + * ACPI 6.5: MADT: add support for trace buffer extension in GICC. + * Headers: Delete bogus NodeArray array of pointers from AEST table. + ------------------------------------------------------------------- Tue Dec 27 23:13:22 UTC 2022 - Ferdinand Thiessen diff --git a/acpica.spec b/acpica.spec index 6556577..32c6555 100644 --- a/acpica.spec +++ b/acpica.spec @@ -1,7 +1,7 @@ # # spec file for package acpica # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,20 +20,23 @@ %define kver %(rpm -q --qf '%%{VERSION}' kernel-source) %define dmp_ver %{kver} Name: acpica -Version: 20221020 +Version: 20240321 Release: 0 Summary: A set of tools to display and debug BIOS ACPI tables License: GPL-2.0-only URL: https://acpica.org -Source: https://acpica.org/sites/acpica/files/%{src_dir}.tar_0.gz +# https://acpica.org/sites/acpica/files/%{src_dir}.tar.gz +# New location: +# https://github.com/acpica/acpica/files/14718333/acpica-unix-20240321.tar.gz +Source: %{src_dir}.tar.gz Source1: ec_access.c Source2: acpi_genl.tar.bz2 Source3: acpi_validate # https://xf.iksaif.net/dev/wmidump.html Source4: wmidump-20211011.tar.xz -Patch1: acpica-no-compiletime.patch -Patch2: wmidump_add_she_bang.patch -Patch3: do_not_use_build_date_and_time.patch +Patch1: wmidump_add_she_bang.patch +Patch2: do_not_use_build_date_and_time.patch +Patch3: acpica-no-compiletime.patch BuildRequires: bison BuildRequires: flex BuildRequires: glibc-devel diff --git a/do_not_use_build_date_and_time.patch b/do_not_use_build_date_and_time.patch index 29619c3..b9d07a1 100644 --- a/do_not_use_build_date_and_time.patch +++ b/do_not_use_build_date_and_time.patch @@ -1,7 +1,8 @@ -diff -ur acpica-unix-20200528.orig/source/compiler/asloptions.c acpica-unix-20200528/source/compiler/asloptions.c ---- acpica-unix-20200528.orig/source/compiler/asloptions.c 2020-07-02 23:06:04.929335334 +0200 -+++ acpica-unix-20200528/source/compiler/asloptions.c 2020-07-02 23:30:07.584425436 +0200 -@@ -875,12 +875,6 @@ +Index: acpica-unix-20240321/source/compiler/asloptions.c +=================================================================== +--- acpica-unix-20240321.orig/source/compiler/asloptions.c ++++ acpica-unix-20240321/source/compiler/asloptions.c +@@ -904,12 +904,6 @@ AslDoOptions ( AslGbl_NoErrors = TRUE; break; @@ -14,9 +15,10 @@ diff -ur acpica-unix-20200528.orig/source/compiler/asloptions.c acpica-unix-2020 case 'e': /* Disable all warning/remark messages (errors only) */ -diff -ur acpica-unix-20200528.orig/source/include/acapps.h acpica-unix-20200528/source/include/acapps.h ---- acpica-unix-20200528.orig/source/include/acapps.h 2020-07-02 23:06:04.937335262 +0200 -+++ acpica-unix-20200528/source/include/acapps.h 2020-07-02 23:31:28.763710233 +0200 +Index: acpica-unix-20240321/source/include/acapps.h +=================================================================== +--- acpica-unix-20240321.orig/source/include/acapps.h ++++ acpica-unix-20240321/source/include/acapps.h @@ -188,9 +188,6 @@ Prefix, ACPICA_COPYRIGHT, \ Prefix @@ -27,10 +29,11 @@ diff -ur acpica-unix-20200528.orig/source/include/acapps.h acpica-unix-20200528/ /* Macros for usage messages */ #define ACPI_USAGE_HEADER(Usage) \ -diff -ur acpica-unix-20200528.orig/source/tools/acpibin/abmain.c acpica-unix-20200528/source/tools/acpibin/abmain.c ---- acpica-unix-20200528.orig/source/tools/acpibin/abmain.c 2020-07-02 23:06:04.941335225 +0200 -+++ acpica-unix-20200528/source/tools/acpibin/abmain.c 2020-07-02 23:33:01.750891018 +0200 -@@ -191,7 +191,6 @@ +Index: acpica-unix-20240321/source/tools/acpibin/abmain.c +=================================================================== +--- acpica-unix-20240321.orig/source/tools/acpibin/abmain.c ++++ acpica-unix-20240321/source/tools/acpibin/abmain.c +@@ -191,7 +191,6 @@ AbDisplayUsage ( ACPI_OPTION ("-s ", "Update checksum for binary AML file"); ACPI_OPTION ("-t", "Terse mode"); ACPI_OPTION ("-v", "Display version information"); @@ -38,7 +41,7 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpibin/abmain.c acpica-unix-202 } -@@ -298,11 +297,6 @@ +@@ -298,11 +297,6 @@ main ( return (1); @@ -50,10 +53,11 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpibin/abmain.c acpica-unix-202 default: printf ("Unknown option: -v%s\n", AcpiGbl_Optarg); -diff -ur acpica-unix-20200528.orig/source/tools/acpidump/apmain.c acpica-unix-20200528/source/tools/acpidump/apmain.c ---- acpica-unix-20200528.orig/source/tools/acpidump/apmain.c 2020-07-02 23:06:04.941335225 +0200 -+++ acpica-unix-20200528/source/tools/acpidump/apmain.c 2020-07-02 23:34:06.206323171 +0200 -@@ -379,12 +379,6 @@ +Index: acpica-unix-20240321/source/tools/acpidump/apmain.c +=================================================================== +--- acpica-unix-20240321.orig/source/tools/acpidump/apmain.c ++++ acpica-unix-20240321/source/tools/acpidump/apmain.c +@@ -379,12 +379,6 @@ ApDoOptions ( fprintf (stderr, ACPI_COMMON_SIGNON (AP_UTILITY_NAME)); return (1); @@ -66,10 +70,11 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpidump/apmain.c acpica-unix-20 default: printf ("Unknown option: -v%s\n", AcpiGbl_Optarg); -diff -ur acpica-unix-20200528.orig/source/tools/acpiexec/aemain.c acpica-unix-20200528/source/tools/acpiexec/aemain.c ---- acpica-unix-20200528.orig/source/tools/acpiexec/aemain.c 2020-07-02 23:06:04.941335225 +0200 -+++ acpica-unix-20200528/source/tools/acpiexec/aemain.c 2020-07-02 23:35:40.565491893 +0200 -@@ -280,7 +280,6 @@ +Index: acpica-unix-20240321/source/tools/acpiexec/aemain.c +=================================================================== +--- acpica-unix-20240321.orig/source/tools/acpiexec/aemain.c ++++ acpica-unix-20240321/source/tools/acpiexec/aemain.c +@@ -280,7 +280,6 @@ usage ( ACPI_OPTION ("-v", "Display version information"); ACPI_OPTION ("-va", "Display verbose dump of any memory leaks"); @@ -77,7 +82,7 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpiexec/aemain.c acpica-unix-20 ACPI_OPTION ("-vh", "Verbose exception handler output"); ACPI_OPTION ("-vi", "Verbose initialization output"); ACPI_OPTION ("-vr", "Verbose region handler output"); -@@ -546,11 +545,6 @@ +@@ -546,11 +545,6 @@ AeDoOptions ( AcpiGbl_VerboseLeakDump = TRUE; break; @@ -89,10 +94,11 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpiexec/aemain.c acpica-unix-20 case 'h': AcpiGbl_VerboseHandlers = TRUE; -diff -ur acpica-unix-20200528.orig/source/tools/acpihelp/ahmain.c acpica-unix-20200528/source/tools/acpihelp/ahmain.c ---- acpica-unix-20200528.orig/source/tools/acpihelp/ahmain.c 2020-07-02 23:06:04.941335225 +0200 -+++ acpica-unix-20200528/source/tools/acpihelp/ahmain.c 2020-07-02 23:37:16.832643773 +0200 -@@ -187,7 +187,6 @@ +Index: acpica-unix-20240321/source/tools/acpihelp/ahmain.c +=================================================================== +--- acpica-unix-20240321.orig/source/tools/acpihelp/ahmain.c ++++ acpica-unix-20240321/source/tools/acpihelp/ahmain.c +@@ -187,7 +187,6 @@ AhDisplayUsage ( ACPI_USAGE_HEADER ("acpihelp [Name/Prefix | HexValue]"); ACPI_OPTION ("-h", "Display help"); ACPI_OPTION ("-v", "Display version information"); @@ -100,7 +106,7 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpihelp/ahmain.c acpica-unix-20 ACPI_USAGE_TEXT ("\nAML Names and Encodings (ACPI Machine Language):\n"); ACPI_OPTION ("-a [Name/Prefix | *]", "Display both ASL operator and AML opcode name(s)"); -@@ -317,11 +316,6 @@ +@@ -323,11 +322,6 @@ main ( return (1); @@ -112,10 +118,11 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpihelp/ahmain.c acpica-unix-20 default: printf ("Unknown option: -v%s\n", AcpiGbl_Optarg); -diff -ur acpica-unix-20200528.orig/source/tools/acpisrc/asmain.c acpica-unix-20200528/source/tools/acpisrc/asmain.c ---- acpica-unix-20200528.orig/source/tools/acpisrc/asmain.c 2020-07-02 23:06:04.941335225 +0200 -+++ acpica-unix-20200528/source/tools/acpisrc/asmain.c 2020-07-02 23:37:35.904475746 +0200 -@@ -374,7 +374,6 @@ +Index: acpica-unix-20240321/source/tools/acpisrc/asmain.c +=================================================================== +--- acpica-unix-20240321.orig/source/tools/acpisrc/asmain.c ++++ acpica-unix-20240321/source/tools/acpisrc/asmain.c +@@ -374,7 +374,6 @@ AsDisplayUsage ( ACPI_OPTION ("-s", "Generate source statistics only"); ACPI_OPTION ("-v", "Display version information"); ACPI_OPTION ("-vb", "Verbose mode"); @@ -123,7 +130,7 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpisrc/asmain.c acpica-unix-202 ACPI_OPTION ("-y", "Suppress file overwrite prompts"); } -@@ -479,11 +478,6 @@ +@@ -479,11 +478,6 @@ main ( Gbl_VerboseMode = TRUE; break; @@ -135,10 +142,11 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpisrc/asmain.c acpica-unix-202 default: printf ("Unknown option: -v%s\n", AcpiGbl_Optarg); -diff -ur acpica-unix-20200528.orig/source/tools/acpixtract/axmain.c acpica-unix-20200528/source/tools/acpixtract/axmain.c ---- acpica-unix-20200528.orig/source/tools/acpixtract/axmain.c 2020-07-02 23:06:04.941335225 +0200 -+++ acpica-unix-20200528/source/tools/acpixtract/axmain.c 2020-07-02 23:37:57.828282596 +0200 -@@ -181,7 +181,6 @@ +Index: acpica-unix-20240321/source/tools/acpixtract/axmain.c +=================================================================== +--- acpica-unix-20240321.orig/source/tools/acpixtract/axmain.c ++++ acpica-unix-20240321/source/tools/acpixtract/axmain.c +@@ -181,7 +181,6 @@ DisplayUsage ( ACPI_OPTION ("-m", "Extract multiple DSDT/SSDTs to a single file"); ACPI_OPTION ("-s ", "Extract all tables with "); ACPI_OPTION ("-v", "Display version information"); @@ -146,7 +154,7 @@ diff -ur acpica-unix-20200528.orig/source/tools/acpixtract/axmain.c acpica-unix- ACPI_USAGE_TEXT ("\nExtract binary ACPI tables from text acpidump output\n"); ACPI_USAGE_TEXT ("Default invocation extracts the DSDT and all SSDTs\n"); -@@ -259,11 +258,6 @@ +@@ -259,11 +258,6 @@ main ( exit (0);