From a3593830581b0c629be9e69d5393e98ee8a80807 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 25 Feb 2020 17:32:18 -0700 Subject: [PATCH] Add a patch to allow use of PCC Register() again Signed-off-by: Al Stone --- acpica-tools.spec | 12 +++++++++--- pcc.patch | 24 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pcc.patch diff --git a/acpica-tools.spec b/acpica-tools.spec index 7a69423..1d33f70 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -50,6 +50,7 @@ Patch22: dup-symbol.patch Patch23: no-common.patch Patch24: armv7-str-fixes.patch Patch25: dbtest.patch +Patch26: pcc.patch BuildRequires: bison patchutils flex gcc @@ -127,6 +128,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch23 -p1 -b .no-common %patch24 -p1 -b .armv7-str-fixes %patch25 -p1 -b .dbtest +%patch26 -p1 -b .pcc cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -245,9 +247,13 @@ fi %changelog * Tue Feb 25 2020 Al Stone - 20200214-1 - Update to 20200214 source tree, including patch refreshes -- Add patches to fix an ARMv7 specific issue (utstring) and - an s390x specific issue (dbtest), both involving more careful - checks of array sizes +- Add patch to fix up issues where strings and 4-byte quantities + get interchanged; C strings want to be null terminated now, but + AML does not so using strncpy is painful. +- Add patch for s390x specific issue (dbtest), where initializing a + string on the stack behaves a little differently +- "PCC" is a defined Register() type, but "PlatformCommChannel" was + being used instead; put it back to "PCC" as it should be in pcc.patch * Mon Feb 24 2020 Al Stone - 20200110-1 - Update to 20200110 source tree, including patch refreshes diff --git a/pcc.patch b/pcc.patch new file mode 100644 index 0000000..1ed0bd1 --- /dev/null +++ b/pcc.patch @@ -0,0 +1,24 @@ +diff -Naur acpica-unix2-20200214.orig/source/compiler/aslcompiler.l acpica-unix2-20200214/source/compiler/aslcompiler.l +--- acpica-unix2-20200214.orig/source/compiler/aslcompiler.l 2020-02-25 17:24:22.169290551 -0700 ++++ acpica-unix2-20200214/source/compiler/aslcompiler.l 2020-02-25 17:26:01.807138585 -0700 +@@ -584,7 +584,7 @@ + "IPMI" { count (0); return (PARSEOP_REGIONSPACE_IPMI); } + "GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */ + "GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */ +-"PlatformCommChannel" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */ ++"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */ + "FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); } + + /* ResourceTypeKeyword: Resource Usage - Resource Descriptors */ +diff -Naur acpica-unix2-20200214.orig/source/components/utilities/utdecode.c acpica-unix2-20200214/source/components/utilities/utdecode.c +--- acpica-unix2-20200214.orig/source/components/utilities/utdecode.c 2020-02-14 10:33:55.000000000 -0700 ++++ acpica-unix2-20200214/source/components/utilities/utdecode.c 2020-02-25 17:26:28.524365981 -0700 +@@ -116,7 +116,7 @@ + "IPMI", /* 0x07 */ + "GeneralPurposeIo", /* 0x08 */ + "GenericSerialBus", /* 0x09 */ +- "PlatformCommChannel"/* 0x0A */ ++ "PCC" /* 0x0A */ + }; + +