From da7834e1109d6fbbcaa0d50bc7a5c334d124a0c0 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Wed, 19 Dec 2018 17:33:52 -0700 Subject: [PATCH] Add a patch to allow compiling FADTs with DSDT Addresses of zero Signed-off-by: Al Stone --- acpica-tools.spec | 7 ++++++- facp.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 facp.patch diff --git a/acpica-tools.spec b/acpica-tools.spec index 41a584e..dcb6375 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools Version: 20181213 -Release: 1%{?dist} +Release: 2%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -43,6 +43,7 @@ Patch14: cve-2017-13695.patch Patch15: str-trunc-warn.patch Patch16: ptr-cast.patch Patch17: aslcodegen.patch +Patch18: facp.patch BuildRequires: bison patchutils flex gcc @@ -110,6 +111,7 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch15 -p1 -b .str-trunc-warn %patch16 -p1 -b .ptr-cast %patch17 -p1 -b .aslcodegen +%patch18 -p1 -b .facp cp -p %{SOURCE2} README.Fedora cp -p %{SOURCE3} iasl.1 @@ -238,6 +240,9 @@ fi %changelog +* Wed Dec 19 2018 Al Stone - 20181213-2 +- Add a patch to allow zero DSDT addresses in the FADT when compiling + * Thu Dec 13 2018 Al Stone - 20181213-1 - Update to 20181213 source tree, including patch refeshes. - Refresh patches; folded be-tpm2 into the larger big-endian patch after diff --git a/facp.patch b/facp.patch new file mode 100644 index 0000000..8b6bef7 --- /dev/null +++ b/facp.patch @@ -0,0 +1,31 @@ +From 7670c56ebe004e698551635f9c5d48a1794066dd Mon Sep 17 00:00:00 2001 +From: Al Stone +Date: Wed, 19 Dec 2018 16:52:41 -0700 +Subject: [PATCH] Correct DSDT Address field in FACP tables + +The FADT allows either the DSDT Address or XDSDT Address field to be +zero. However, the table definition used by the table compiler still +requires the DSDT Address to be non-zero, which is not correct. So, +remove the DT_NON_ZERO flag from the field. + +Signed-off-by: Al Stone +--- + source/common/dmtbinfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/source/common/dmtbinfo.c b/source/common/dmtbinfo.c +index 2e1c54f84..07d3ce099 100644 +--- a/source/common/dmtbinfo.c ++++ b/source/common/dmtbinfo.c +@@ -292,7 +292,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoFacs[] = + ACPI_DMTABLE_INFO AcpiDmTableInfoFadt1[] = + { + {ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Facs), "FACS Address", 0}, +- {ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Dsdt), "DSDT Address", DT_NON_ZERO}, ++ {ACPI_DMT_UINT32, ACPI_FADT_OFFSET (Dsdt), "DSDT Address", 0}, + {ACPI_DMT_UINT8, ACPI_FADT_OFFSET (Model), "Model", 0}, + {ACPI_DMT_FADTPM, ACPI_FADT_OFFSET (PreferredProfile), "PM Profile", 0}, + {ACPI_DMT_UINT16, ACPI_FADT_OFFSET (SciInterrupt), "SCI Interrupt", 0}, +-- +2.20.1 +