ACPICA: Update to version 20220331

Message ID	20220404130903.108092-1-colin.i.king@gmail.com
State	Accepted
Headers	show Return-Path: <fwts-devel-bounces@lists.ubuntu.com> From: Colin Ian King <colin.i.king@gmail.com> To: fwts-devel@lists.ubuntu.com Subject: [PATCH] ACPICA: Update to version 20220331 Date: Mon, 4 Apr 2022 14:09:03 +0100 Message-Id: <20220404130903.108092-1-colin.i.king@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.221.47; envelope-from=colin.i.king@gmail.com; helo=mail-wr1-f47.google.com Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" <fwts-devel-bounces@lists.ubuntu.com>
Series	ACPICA: Update to version 20220331 \| expand ACPICA: Update to version 20220331

On 4/4/22 21:09, Colin Ian King wrote: > Changes in this release of ACPICA are detailed at the following > link on the ACPICA developer mailing list: > > https://lists.acpica.org/hyperkitty/list/devel@acpica.org/thread/HKEZTSFVZ4ILH7QRKATIQOHIJXIZOYCJ/ > > Signed-off-by: Colin Ian King <colin.i.king@gmail.com> > > diff --git a/src/acpica/source/common/acfileio.c b/src/acpica/source/common/acfileio.c > index 3e26ac3f..7c624f5d 100644 > --- a/src/acpica/source/common/acfileio.c > +++ b/src/acpica/source/common/acfileio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/acgetline.c b/src/acpica/source/common/acgetline.c > index 88479d61..e5d0bf56 100644 > --- a/src/acpica/source/common/acgetline.c > +++ b/src/acpica/source/common/acgetline.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adfile.c b/src/acpica/source/common/adfile.c > index db6bcabc..647333d9 100644 > --- a/src/acpica/source/common/adfile.c > +++ b/src/acpica/source/common/adfile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adisasm.c b/src/acpica/source/common/adisasm.c > index f549bd5a..ecb98485 100644 > --- a/src/acpica/source/common/adisasm.c > +++ b/src/acpica/source/common/adisasm.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/adwalk.c b/src/acpica/source/common/adwalk.c > index c4d149e3..6d51c7e1 100644 > --- a/src/acpica/source/common/adwalk.c > +++ b/src/acpica/source/common/adwalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahids.c b/src/acpica/source/common/ahids.c > index b58bc082..05c31bf5 100644 > --- a/src/acpica/source/common/ahids.c > +++ b/src/acpica/source/common/ahids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahpredef.c b/src/acpica/source/common/ahpredef.c > index d92417d1..724abe6a 100644 > --- a/src/acpica/source/common/ahpredef.c > +++ b/src/acpica/source/common/ahpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahtable.c b/src/acpica/source/common/ahtable.c > index def42520..bff8ae79 100644 > --- a/src/acpica/source/common/ahtable.c > +++ b/src/acpica/source/common/ahtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/ahuuids.c b/src/acpica/source/common/ahuuids.c > index eef1c568..909698c5 100644 > --- a/src/acpica/source/common/ahuuids.c > +++ b/src/acpica/source/common/ahuuids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/cmfsize.c b/src/acpica/source/common/cmfsize.c > index 38ec915a..474ccd95 100644 > --- a/src/acpica/source/common/cmfsize.c > +++ b/src/acpica/source/common/cmfsize.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmextern.c b/src/acpica/source/common/dmextern.c > index 36d58600..806daa33 100644 > --- a/src/acpica/source/common/dmextern.c > +++ b/src/acpica/source/common/dmextern.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmrestag.c b/src/acpica/source/common/dmrestag.c > index 59d5c4f4..b6772984 100644 > --- a/src/acpica/source/common/dmrestag.c > +++ b/src/acpica/source/common/dmrestag.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmswitch.c b/src/acpica/source/common/dmswitch.c > index 2b894c65..4a434736 100644 > --- a/src/acpica/source/common/dmswitch.c > +++ b/src/acpica/source/common/dmswitch.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtable.c b/src/acpica/source/common/dmtable.c > index 3137132a..440c5fb4 100644 > --- a/src/acpica/source/common/dmtable.c > +++ b/src/acpica/source/common/dmtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -248,6 +248,7 @@ static const char *AcpiDmDmarSubnames[] = > "Root Port ATS Capability", > "Remapping Hardware Static Affinity", > "ACPI Namespace Device Declaration", > + "SoC Integrated Address Translation Cache", > "Unknown Subtable Type" /* Reserved */ > }; > > @@ -402,7 +403,8 @@ static const char *AcpiDmMadtSubnames[] = > "Generic Interrupt Redistributor", /* ACPI_MADT_GENERIC_REDISTRIBUTOR */ > "Generic Interrupt Translator", /* ACPI_MADT_GENERIC_TRANSLATOR */ > "Mutiprocessor Wakeup", /* ACPI_MADT_TYPE_MULTIPROC_WAKEUP */ > - "Unknown Subtable Type" /* Reserved */ > + "Unknown Subtable Type", /* Reserved */ > + "Types 80-FF are used for OEM data" /* Reserved for OEM data */ > }; > > static const char *AcpiDmNfitSubnames[] = > @@ -650,6 +652,7 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] = > { > {ACPI_SIG_AEST, NULL, AcpiDmDumpAest, DtCompileAest, TemplateAest}, > {ACPI_SIG_AGDI, AcpiDmTableInfoAgdi, NULL, NULL, TemplateAgdi}, > + {ACPI_SIG_APMT, NULL, AcpiDmDumpApmt, DtCompileApmt, TemplateApmt}, > {ACPI_SIG_ASF, NULL, AcpiDmDumpAsf, DtCompileAsf, TemplateAsf}, > {ACPI_SIG_BDAT, AcpiDmTableInfoBdat, NULL, NULL, TemplateBdat}, > {ACPI_SIG_BERT, AcpiDmTableInfoBert, NULL, NULL, TemplateBert}, > @@ -1361,7 +1364,12 @@ AcpiDmDumpTable ( > AcpiOsPrintf ("%1.1X\n", (*Target >> 2) & 0x03); > break; > > - case ACPI_DMT_FLAGS4: > + case ACPI_DMT_FLAGS8_2: > + > + AcpiOsPrintf ("%2.2X\n", (*Target >> 2) & 0xFF); > + break; > + > + case ACPI_DMT_FLAGS4: > > AcpiOsPrintf ("%1.1X\n", (*Target >> 4) & 0x03); > break; > @@ -1850,11 +1858,14 @@ AcpiDmDumpTable ( > /* MADT subtable types */ > > Temp8 = *Target; > - if (Temp8 > ACPI_MADT_TYPE_RESERVED) > + if ((Temp8 >= ACPI_MADT_TYPE_RESERVED) && (Temp8 < ACPI_MADT_TYPE_OEM_RESERVED)) > { > Temp8 = ACPI_MADT_TYPE_RESERVED; > } > - > + else if (Temp8 >= ACPI_MADT_TYPE_OEM_RESERVED) > + { > + Temp8 = ACPI_MADT_TYPE_RESERVED + 1; > + } > AcpiOsPrintf (UINT8_FORMAT, *Target, > AcpiDmMadtSubnames[Temp8]); > break; > diff --git a/src/acpica/source/common/dmtables.c b/src/acpica/source/common/dmtables.c > index fa04e0c8..6f42bcb3 100644 > --- a/src/acpica/source/common/dmtables.c > +++ b/src/acpica/source/common/dmtables.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbdump.c b/src/acpica/source/common/dmtbdump.c > index 86c90d67..b4faf683 100644 > --- a/src/acpica/source/common/dmtbdump.c > +++ b/src/acpica/source/common/dmtbdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbdump1.c b/src/acpica/source/common/dmtbdump1.c > index fd5e2fd9..13662611 100644 > --- a/src/acpica/source/common/dmtbdump1.c > +++ b/src/acpica/source/common/dmtbdump1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -376,6 +376,68 @@ AcpiDmDumpAest ( > } > } > > +/******************************************************************************* > + * > + * FUNCTION: AcpiDmDumpApmt > + * > + * PARAMETERS: Table - A APMT table > + * > + * RETURN: None > + * > + * DESCRIPTION: Format the contents of a APMT. This table type consists > + * of an open-ended number of subtables. > + * > + * > + * APMT - ARM Performance Monitoring Unit table. Conforms to: > + * ARM Performance Monitoring Unit Architecture 1.0 Platform Design Document > + * ARM DEN0117 v1.0 November 25, 2021 > + * > + ******************************************************************************/ > + > +void > +AcpiDmDumpApmt ( > + ACPI_TABLE_HEADER *Table) > +{ > + ACPI_STATUS Status; > + ACPI_APMT_NODE *Subtable; > + UINT32 Length = Table->Length; > + UINT32 Offset = sizeof (ACPI_TABLE_APMT); > + UINT32 NodeNum = 0; > + > + /* There is no main table (other than the standard ACPI header) */ > + > + /* Subtables */ > + > + Subtable = ACPI_ADD_PTR (ACPI_APMT_NODE, Table, Offset); > + while (Offset < Table->Length) > + { > + AcpiOsPrintf ("\n"); > + > + if (Subtable->Type >= ACPI_APMT_NODE_TYPE_COUNT) > + { > + AcpiOsPrintf ("\n**** Unknown APMT subtable type 0x%X\n", > + Subtable->Type); > + return; > + } > + > + AcpiOsPrintf ("/* APMT Node-%u */\n", NodeNum++); > + > + Status = AcpiDmDumpTable (Length, Offset, Subtable, > + Subtable->Length, AcpiDmTableInfoApmtNode); > + if (ACPI_FAILURE (Status)) > + { > + return; > + } > + > + /* Point to next subtable */ > + > + Offset += Subtable->Length; > + Subtable = ACPI_ADD_PTR (ACPI_APMT_NODE, Subtable, > + Subtable->Length); > + AcpiOsPrintf ("\n"); > + } > +} > + > > /******************************************************************************* > * > @@ -567,7 +629,6 @@ AcpiDmDumpCedt ( > ACPI_CEDT_HEADER *Subtable; > UINT32 Length = Table->Length; > UINT32 Offset = sizeof (ACPI_TABLE_CEDT); > - ACPI_DMTABLE_INFO *InfoTable; > > > /* There is no main table (other than the standard ACPI header) */ > @@ -588,35 +649,52 @@ AcpiDmDumpCedt ( > switch (Subtable->Type) > { > case ACPI_CEDT_TYPE_CHBS: > + Status = AcpiDmDumpTable (Length, Offset, Subtable, > + Subtable->Length, AcpiDmTableInfoCedt0); > + if (ACPI_FAILURE (Status)) { > + return; > + } > + break; > + > + case ACPI_CEDT_TYPE_CFMWS: { > + ACPI_CEDT_CFMWS *ptr = (ACPI_CEDT_CFMWS *) Subtable; > + unsigned int i, max = 0x01 << (ptr->InterleaveWays); > > - InfoTable = AcpiDmTableInfoCedt0; > + /* print out table with first "Interleave target" */ > + > + Status = AcpiDmDumpTable (Length, Offset, Subtable, > + Subtable->Length, AcpiDmTableInfoCedt1); > + if (ACPI_FAILURE (Status)) { > + return; > + } > + > + /* Now, print out any interleave targets beyond the first. */ > + > + for (i = 1; i < max; i++) { > + unsigned int loc_offset = Offset + (i * 4) + ACPI_OFFSET(ACPI_CEDT_CFMWS, InterleaveTargets); > + unsigned int *trg = &(ptr->InterleaveTargets[i]); > + Status = AcpiDmDumpTable (Length, loc_offset, trg, > + Subtable->Length, AcpiDmTableInfoCedt1_te); > + if (ACPI_FAILURE (Status)) { > + return; > + } > + } > break; > + } > > default: > - > AcpiOsPrintf ("\n**** Unknown CEDT subtable type 0x%X\n\n", > Subtable->Type); > > /* Attempt to continue */ > - > if (!Subtable->Length) > { > AcpiOsPrintf ("Invalid zero length subtable\n"); > return; > } > - goto NextSubtable; > - } > - > - Status = AcpiDmDumpTable (Length, Offset, Subtable, > - Subtable->Length, InfoTable); > - if (ACPI_FAILURE (Status)) > - { > - return; > } > > -NextSubtable: > /* Point to next subtable */ > - > Offset += Subtable->Length; > Subtable = ACPI_ADD_PTR (ACPI_CEDT_HEADER, Subtable, > Subtable->Length); > @@ -988,6 +1066,12 @@ AcpiDmDumpDmar ( > ScopeOffset = sizeof (ACPI_DMAR_ANDD); > break; > > + case ACPI_DMAR_TYPE_SATC: > + > + InfoTable = AcpiDmTableInfoDmar5; > + ScopeOffset = sizeof (ACPI_DMAR_SATC); > + break; > + > default: > > AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n", > diff --git a/src/acpica/source/common/dmtbdump2.c b/src/acpica/source/common/dmtbdump2.c > index 04f7139f..c50a6a24 100644 > --- a/src/acpica/source/common/dmtbdump2.c > +++ b/src/acpica/source/common/dmtbdump2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -203,9 +203,9 @@ AcpiDmDumpIort ( > > Revision = Table->Revision; > > - /* Both IORT Rev E and E.a have known issues and are not supported */ > + /* IORT Revisions E, E.a and E.c have known issues and are not supported */ > > - if (Revision == 1 || Revision == 2) > + if (Revision == 1 || Revision == 2 || Revision == 4) > { > AcpiOsPrintf ("\n**** Unsupported IORT revision 0x%X\n", > Revision); > @@ -445,7 +445,7 @@ AcpiDmDumpIort ( > } > break; > > - default: > + default: > > break; > } > @@ -887,6 +887,8 @@ AcpiDmDumpMadt ( > /* Subtables */ > > Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); > + DbgPrint (ASL_PARSE_OUTPUT, "//0B) Offset %X, from table start: 0x%8.8X%8.8X\n", > + Offset, ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table))); > while (Offset < Table->Length) > { > /* Common subtable header */ > @@ -899,6 +901,7 @@ AcpiDmDumpMadt ( > return; > } > > + DbgPrint (ASL_PARSE_OUTPUT, "subtableType: %X\n", Subtable->Type); > switch (Subtable->Type) > { > case ACPI_MADT_TYPE_LOCAL_APIC: > @@ -988,8 +991,23 @@ AcpiDmDumpMadt ( > > default: > > - AcpiOsPrintf ("\n**** Unknown MADT subtable type 0x%X\n\n", > - Subtable->Type); > + if ((Subtable->Type >= ACPI_MADT_TYPE_RESERVED) && > + (Subtable->Type < ACPI_MADT_TYPE_OEM_RESERVED)) > + { > + AcpiOsPrintf ("\n**** Unknown MADT subtable type 0x%X\n\n", > + Subtable->Type); > + goto NextSubtable; > + } > + else if (Subtable->Type >= ACPI_MADT_TYPE_OEM_RESERVED) > + { > + DbgPrint (ASL_PARSE_OUTPUT, "//[Found an OEM structure, type = %0x]\n", > + Subtable->Type); > + Offset += sizeof (ACPI_SUBTABLE_HEADER); > + DbgPrint (ASL_PARSE_OUTPUT, "//[0) Subtable->Length = %X, Subtable = %p, Offset = %X]\n", > + Subtable->Length, Subtable, Offset); > + DbgPrint (ASL_PARSE_OUTPUT, "//[0A) Offset from table start: 0x%8.8X%8.8X]\n", > + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table))); > + } > > /* Attempt to continue */ > > @@ -999,9 +1017,24 @@ AcpiDmDumpMadt ( > return; > } > > + /* Dump the OEM data */ > + > + Status = AcpiDmDumpTable (Length, Offset, ACPI_CAST_PTR (UINT8, Table) + Offset, > + Subtable->Length - sizeof (ACPI_SUBTABLE_HEADER), AcpiDmTableInfoMadt17); > + if (ACPI_FAILURE (Status)) > + { > + return; > + } > + > + DbgPrint (ASL_PARSE_OUTPUT, "//[1) Subtable->Length = %X, Offset = %X]\n", > + Subtable->Length, Offset); > + Offset -= sizeof (ACPI_SUBTABLE_HEADER); > + > goto NextSubtable; > } > > + DbgPrint (ASL_PARSE_OUTPUT, "//[2) Subtable->Length = %X, Offset = %X]\n", > + Subtable->Length, Offset); > Status = AcpiDmDumpTable (Length, Offset, Subtable, > Subtable->Length, InfoTable); > if (ACPI_FAILURE (Status)) > @@ -1012,9 +1045,28 @@ AcpiDmDumpMadt ( > NextSubtable: > /* Point to next subtable */ > > - Offset += Subtable->Length; > + DbgPrint (ASL_PARSE_OUTPUT, "//[3) Subtable->Length = %X, Offset = %X]\n", > + Subtable->Length, Offset); > + DbgPrint (ASL_PARSE_OUTPUT, "//[4) Offset from table start: 0x%8.8X%8.8X (%p) %p]\n", > + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (UINT8, Subtable) - ACPI_CAST_PTR (UINT8, Table)), Subtable, Table); > + if (Offset > Table->Length) > + { > + return; > + } > + > Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, > Subtable->Length); > + > + DbgPrint (ASL_PARSE_OUTPUT, "//[5) Next Subtable %p, length %X]\n", > + Subtable, Subtable->Length); > + DbgPrint (ASL_PARSE_OUTPUT, "//[5B) Offset from table start: 0x%8.8X%8.8X (%p)]\n", > + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)), Subtable); > + > + Offset = ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table); > + if (Offset >= Table->Length) > + { > + return; > + } > } > } > > @@ -1501,9 +1553,9 @@ AcpiDmDumpNhlt ( > ACPI_NHLT_VENDOR_MIC_COUNT *MicCount; > ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_A *DevSpecific; > ACPI_NHLT_FORMATS_CONFIG *FormatsConfig; > - ACPI_NHLT_LINUX_SPECIFIC_COUNT *Count; > - ACPI_NHLT_LINUX_SPECIFIC_DATA *LinuxData; > - ACPI_NHLT_LINUX_SPECIFIC_DATA_B *LinuxDataB; > + ACPI_NHLT_DEVICE_INFO_COUNT *Count; > + ACPI_NHLT_DEVICE_INFO *DeviceInfo; > + ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B *Capabilities; > > > /* Main table */ > @@ -1757,95 +1809,77 @@ AcpiDmDumpNhlt ( > > if (CapabilitiesSize > 0) > { > - FormatSubtable = ACPI_ADD_PTR (ACPI_NHLT_FORMAT_CONFIG, Table, Offset); > + UINT8* CapabilitiesBuf = ACPI_ADD_PTR (UINT8, Table, Offset); > /* Do the Capabilities array (of bytes) */ > > AcpiOsPrintf ("\n /* Specific_Config table #%u */\n", j+1); > - FormatSubtable = ACPI_ADD_PTR (ACPI_NHLT_FORMAT_CONFIG, Table, Offset); > - Status = AcpiDmDumpTable (TableLength, Offset, FormatSubtable, > + > + Status = AcpiDmDumpTable (TableLength, Offset, CapabilitiesBuf, > CapabilitiesSize, AcpiDmTableInfoNhlt3a); > if (ACPI_FAILURE (Status)) > { > return; > } > > - Offset += CapabilitiesSize; // + sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B); > + Offset += CapabilitiesSize; /* + sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B); */ > } > > } /* for (j = 0; j < FormatsCount; j++) */ > > /* > * If we are not done with the current Endpoint yet, then there must be > - * some Linux-specific structure(s) yet to be processed. First, get > + * some non documented structure(s) yet to be processed. First, get > * the count of such structure(s). > */ > if (Offset < EndpointEndOffset) > { > - AcpiOsPrintf ("\n /* Linux-specific structures (not part of NHLT spec) */\n"); > - Count = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_COUNT, Table, Offset); > + AcpiOsPrintf ("\n /* Structures that are not part of NHLT spec */\n"); > + Count = ACPI_ADD_PTR (ACPI_NHLT_DEVICE_INFO_COUNT, Table, Offset); > Status = AcpiDmDumpTable (TableLength, Offset, Count, > - sizeof (ACPI_NHLT_LINUX_SPECIFIC_COUNT), AcpiDmTableInfoNhlt7); > + sizeof (ACPI_NHLT_DEVICE_INFO_COUNT), AcpiDmTableInfoNhlt7); > if (ACPI_FAILURE (Status)) > { > return; > } > - Offset += sizeof (ACPI_NHLT_LINUX_SPECIFIC_COUNT); > + Offset += sizeof (ACPI_NHLT_DEVICE_INFO_COUNT); > > - if (Count->StructureCount > 1) > - { > - /* > - * We currently cannot disassemble more than one > - * Linux-Specific section, because we have no way of > - * knowing whether the "Specific Data" part is present. > - */ > - Count->StructureCount = 1; > - fprintf (stderr, "%s %s\n", "Feature not supported:", > - "Cannot disassemble more than one Linux-Specific structure"); > - return; > - } > - > - /* Variable number of linux-specific structures */ > + /* Variable number of device structures */ > > for (j = 0; j < Count->StructureCount; j++) > { > - LinuxData = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_DATA, Table, Offset); > - AcpiOsPrintf ("\n /* Linux-specific structure #%u (not part of NHLT spec) */\n", j+1); > + DeviceInfo = ACPI_ADD_PTR (ACPI_NHLT_DEVICE_INFO, Table, Offset); > + AcpiOsPrintf ("\n /* Device Info structure #%u (not part of NHLT spec) */\n", j+1); > > /* > - * Dump the following Linux-specific fields: > + * Dump the following Device Info fields: > * 1) Device ID > * 2) Device Instance ID > * 3) Device Port ID > */ > - Status = AcpiDmDumpTable (TableLength, Offset, LinuxData, > - sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA), AcpiDmTableInfoNhlt7a); > + Status = AcpiDmDumpTable (TableLength, Offset, DeviceInfo, > + sizeof (ACPI_NHLT_DEVICE_INFO), AcpiDmTableInfoNhlt7a); > if (ACPI_FAILURE (Status)) > { > return; > } > > - Offset += sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA); > - > - /* > - * Check that the current offset is not beyond the end of > - * this endpoint descriptor. If it is not, we assume that > - * the "Specific Data" field is present and valid. Note: > - * This does not seem to be documented anywhere. > - */ > - if (Offset < EndpointEndOffset) > - { > - /* Dump the linux-specific "Specific Data" field */ > - > - LinuxDataB = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_DATA_B, Table, Offset); > - Status = AcpiDmDumpTable (TableLength, Offset, LinuxDataB, > - sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA_B), AcpiDmTableInfoNhlt7b); > - if (ACPI_FAILURE (Status)) > - { > - return; > - } > + Offset += sizeof (ACPI_NHLT_DEVICE_INFO); > + } > > - Offset += sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA_B); > - } > + /* > + * Check that the current offset is not beyond the end of > + * this endpoint descriptor. If it is not, print those > + * undocumented bytes. > + */ > + if (Offset < EndpointEndOffset) > + { > + /* Unknown data at the end of the Endpoint */ > + UINT32 size = EndpointEndOffset - Offset; > + UINT8* buffer = ACPI_ADD_PTR (UINT8, Table, Offset); > + AcpiOsPrintf ("\n /* Unknown data at the end of the Endpoint, size: %X */\n", size); > + Status = AcpiDmDumpTable (TableLength, Offset, buffer, > + size, AcpiDmTableInfoNhlt7b); > + Offset = EndpointEndOffset; > } > > /* Should be at the end of the Endpoint structure. */ > @@ -1858,17 +1892,30 @@ AcpiDmDumpNhlt ( > * Done with all of the Endpoint Descriptors, Emit the table terminator > * (if such a legacy structure is present -- not in NHLT specification) > */ > - if (Offset == TableLength - sizeof (ACPI_NHLT_TABLE_TERMINATOR)) > + if (Offset < TableLength) > { > - LinuxData = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_DATA, Table, Offset); > - AcpiOsPrintf ("\n /* Table terminator structure (not part of NHLT spec) */\n"); > + Capabilities = ACPI_ADD_PTR (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B, Table, Offset); > + AcpiOsPrintf ("\n/* Terminating specific config (not part of NHLT spec) */\n"); > > - Status = AcpiDmDumpTable (TableLength, Offset, LinuxData, > - sizeof (ACPI_NHLT_TABLE_TERMINATOR), AcpiDmTableInfoNhlt8); > + Status = AcpiDmDumpTable (TableLength, Offset, Capabilities, > + sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B), AcpiDmTableInfoNhlt5b); > if (ACPI_FAILURE (Status)) > { > return; > } > + Offset += sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B); > + > + if (Capabilities->CapabilitiesSize > 0) > + { > + UINT32 remainingBytes = TableLength - Offset; > + UINT8* buffer = ACPI_ADD_PTR (UINT8, Table, Offset); > + > + if (remainingBytes != Capabilities->CapabilitiesSize) > + AcpiOsPrintf ("\n/* Incorrect config size, should be %X, is %X */\n", > + Capabilities->CapabilitiesSize, remainingBytes); > + Status = AcpiDmDumpTable (TableLength, Offset, buffer, > + remainingBytes, AcpiDmTableInfoNhlt3a); > + } > } > > return; > diff --git a/src/acpica/source/common/dmtbdump3.c b/src/acpica/source/common/dmtbdump3.c > index 63b6d2d5..cbcd9e7f 100644 > --- a/src/acpica/source/common/dmtbdump3.c > +++ b/src/acpica/source/common/dmtbdump3.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbinfo.c b/src/acpica/source/common/dmtbinfo.c > index 7d812315..40539969 100644 > --- a/src/acpica/source/common/dmtbinfo.c > +++ b/src/acpica/source/common/dmtbinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/dmtbinfo1.c b/src/acpica/source/common/dmtbinfo1.c > index b30cafa9..d6a94bfc 100644 > --- a/src/acpica/source/common/dmtbinfo1.c > +++ b/src/acpica/source/common/dmtbinfo1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -521,6 +521,28 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoCedt0[] = > ACPI_DMT_TERMINATOR > }; > > +/* 1: CXL Fixed Memory Window Structure */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1[] = > +{ > + {ACPI_DMT_UINT32, ACPI_CEDT1_OFFSET (Reserved1), "Reserved", 0}, > + {ACPI_DMT_UINT64, ACPI_CEDT1_OFFSET (BaseHpa), "Window base address", 0}, > + {ACPI_DMT_UINT64, ACPI_CEDT1_OFFSET (WindowSize), "Window size", 0}, > + {ACPI_DMT_UINT8, ACPI_CEDT1_OFFSET (InterleaveWays), "Interleave Members (2^n)", 0}, > + {ACPI_DMT_UINT8, ACPI_CEDT1_OFFSET (InterleaveArithmetic), "Interleave Arithmetic", 0}, > + {ACPI_DMT_UINT16, ACPI_CEDT1_OFFSET (Reserved2), "Reserved", 0}, > + {ACPI_DMT_UINT32, ACPI_CEDT1_OFFSET (Granularity), "Granularity", 0}, > + {ACPI_DMT_UINT16, ACPI_CEDT1_OFFSET (Restrictions), "Restrictions", 0}, > + {ACPI_DMT_UINT16, ACPI_CEDT1_OFFSET (QtgId), "QtgId", 0}, > + {ACPI_DMT_UINT32, ACPI_CEDT1_OFFSET (InterleaveTargets), "First Target", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1_te[] = > +{ > + {ACPI_DMT_UINT32, ACPI_CEDT1_TE_OFFSET (InterleaveTarget), "Next Target", 0}, > + ACPI_DMT_TERMINATOR > +}; > > /******************************************************************************* > * > @@ -768,6 +790,15 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[] = > ACPI_DMT_TERMINATOR > }; > > +/* 5: Hardware Unit Definition */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoDmar5[] = > +{ > + {ACPI_DMT_UINT8, ACPI_DMAR5_OFFSET (Flags), "Flags", 0}, > + {ACPI_DMT_UINT8, ACPI_DMAR5_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT16, ACPI_DMAR5_OFFSET (Segment), "PCI Segment Number", 0}, > + ACPI_DMT_TERMINATOR > +}; > > /******************************************************************************* > * > diff --git a/src/acpica/source/common/dmtbinfo2.c b/src/acpica/source/common/dmtbinfo2.c > index ab1b2634..2c7d8178 100644 > --- a/src/acpica/source/common/dmtbinfo2.c > +++ b/src/acpica/source/common/dmtbinfo2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -208,6 +208,40 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoAgdi[] = > }; > > > +/******************************************************************************* > + * > + * APMT - ARM Performance Monitoring Unit Table > + * > + * Conforms to: > + * ARM Performance Monitoring Unit Architecture 1.0 Platform Design Document > + * ARM DEN0117 v1.0 November 25, 2021 > + * > + ******************************************************************************/ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoApmtNode[] = > +{ > + {ACPI_DMT_UINT16, ACPI_APMTN_OFFSET (Length), "Length of APMT Node", 0}, > + {ACPI_DMT_UINT8, ACPI_APMTN_OFFSET (Flags), "Node Flags", 0}, > + {ACPI_DMT_FLAG0, ACPI_APMTN_FLAG_OFFSET (Flags, 0), "Dual Page Extension", 0}, > + {ACPI_DMT_FLAG1, ACPI_APMTN_FLAG_OFFSET (Flags, 0), "Processor Affinity Type", 0}, > + {ACPI_DMT_FLAG2, ACPI_APMTN_FLAG_OFFSET (Flags, 0), "64-bit Atomic Support", 0}, > + {ACPI_DMT_UINT8, ACPI_APMTN_OFFSET (Type), "Node Type", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (Id), "Unique Node Identifier", 0}, > + {ACPI_DMT_UINT64, ACPI_APMTN_OFFSET (InstPrimary), "Primary Node Instance", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (InstSecondary), "Secondary Node Instance", 0}, > + {ACPI_DMT_UINT64, ACPI_APMTN_OFFSET (BaseAddress0), "Page 0 Base Address", 0}, > + {ACPI_DMT_UINT64, ACPI_APMTN_OFFSET (BaseAddress1), "Page 1 Base Address", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (OvflwIrq), "Overflow Interrupt ID", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (Reserved), "Reserved", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (OvflwIrqFlags), "Overflow Interrupt Flags", 0}, > + {ACPI_DMT_FLAG0, ACPI_APMTN_FLAG_OFFSET (OvflwIrqFlags, 0), "Interrupt Mode", 0}, > + {ACPI_DMT_FLAG1, ACPI_APMTN_FLAG_OFFSET (OvflwIrqFlags, 0), "Interrupt Type", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (ProcAffinity), "Processor Affinity", 0}, > + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (ImplId), "Implementation ID", 0}, > + ACPI_DMT_TERMINATOR > +}; > + > + > /******************************************************************************* > * > * IORT - IO Remapping Table > @@ -323,7 +357,8 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoIort2[] = > {ACPI_DMT_UINT32, ACPI_IORT2_OFFSET (AtsAttribute), "ATS Attribute", 0}, > {ACPI_DMT_UINT32, ACPI_IORT2_OFFSET (PciSegmentNumber), "PCI Segment Number", 0}, > {ACPI_DMT_UINT8, ACPI_IORT2_OFFSET (MemoryAddressLimit), "Memory Size Limit", 0}, > - {ACPI_DMT_UINT24, ACPI_IORT2_OFFSET (Reserved[0]), "Reserved", 0}, > + {ACPI_DMT_UINT16, ACPI_IORT2_OFFSET (PasidCapabilities), "PASID Capabilities", 0}, > + {ACPI_DMT_UINT8, ACPI_IORT2_OFFSET (Reserved[0]), "Reserved", 0}, > ACPI_DMT_TERMINATOR > }; > > @@ -407,6 +442,8 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoIort6[] = > { > {ACPI_DMT_UINT32, ACPI_IORT6_OFFSET (Flags), "Flags (decoded below)", 0}, > {ACPI_DMT_FLAG0, ACPI_IORT6_FLAG_OFFSET (Flags, 0), "Remapping Permitted", 0}, > + {ACPI_DMT_FLAG1, ACPI_IORT6_FLAG_OFFSET (Flags, 0), "Access Privileged", 0}, > + {ACPI_DMT_FLAGS8_2, ACPI_IORT6_FLAG_OFFSET (Flags, 0), "Access Attributes", 0}, > {ACPI_DMT_UINT32, ACPI_IORT6_OFFSET (RmrCount), "Number of RMR Descriptors", 0}, > {ACPI_DMT_UINT32, ACPI_IORT6_OFFSET (RmrOffset), "RMR Descriptor Offset", 0}, > ACPI_DMT_TERMINATOR > @@ -887,6 +924,13 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[] = > ACPI_DMT_TERMINATOR > }; > > +/* 17: OEM data structure */ > + > +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[] = > +{ > + {ACPI_DMT_RAW_BUFFER, 0, "OEM Data", 0}, > + ACPI_DMT_TERMINATOR > +}; > > /******************************************************************************* > * > @@ -1379,19 +1423,19 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt6[] = > ACPI_DMT_TERMINATOR > }; > > -/* Number of Linux-specific structures */ > +/* Number of DeviceInfo structures */ > > ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7[] = > { > - {ACPI_DMT_UINT8, ACPI_NHLT7_OFFSET (StructureCount), "Linux-specific Count", 0}, > + {ACPI_DMT_UINT8, ACPI_NHLT7_OFFSET (StructureCount), "Device Info struct count", 0}, > ACPI_DMT_TERMINATOR > }; > > -/* The Linux-specific structure */ > +/* The DeviceInfo structure */ > > ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7a[] = > { > - {ACPI_DMT_BUF16, ACPI_NHLT7A_OFFSET (DeviceId), "Device ID", 0}, > + {ACPI_DMT_UUID, ACPI_NHLT7A_OFFSET (DeviceId), "Device ID GUID", 0}, > {ACPI_DMT_UINT8, ACPI_NHLT7A_OFFSET (DeviceInstanceId), "Device Instance ID", 0}, > {ACPI_DMT_UINT8, ACPI_NHLT7A_OFFSET (DevicePortId), "Device Port ID", 0}, > ACPI_DMT_TERMINATOR > @@ -1399,16 +1443,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7a[] = > > ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7b[] = > { > - {ACPI_DMT_BUF18, ACPI_NHLT7B_OFFSET (SpecificData), "Specific Data", 0}, > - ACPI_DMT_TERMINATOR > -}; > - > -/* Table terminator (may or may not be present) */ > - > -ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt8[] = > -{ > - {ACPI_DMT_UINT32, ACPI_NHLT8_OFFSET (TerminatorValue), "Terminator Value", 0}, > - {ACPI_DMT_UINT32, ACPI_NHLT8_OFFSET (TerminatorSignature), "Terminator Signature", 0}, > + {ACPI_DMT_RAW_BUFFER, 0, "Bytes", 0}, > ACPI_DMT_TERMINATOR > }; > > @@ -1995,7 +2030,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoSdevHdr[] = > {ACPI_DMT_UINT8, ACPI_SDEVH_OFFSET (Flags), "Flags (decoded below)", 0}, > {ACPI_DMT_FLAG0, ACPI_SDEVH_FLAG_OFFSET (Flags,0), "Allow handoff to unsecure OS", 0}, > {ACPI_DMT_FLAG1, ACPI_SDEVH_FLAG_OFFSET (Flags,0), "Secure access components present", 0}, > - {ACPI_DMT_UINT16, ACPI_SDEVH_OFFSET (Length), "Length", 0}, > + {ACPI_DMT_UINT16, ACPI_SDEVH_OFFSET (Length), "Length", DT_LENGTH}, > ACPI_DMT_TERMINATOR > }; > > diff --git a/src/acpica/source/common/dmtbinfo3.c b/src/acpica/source/common/dmtbinfo3.c > index 6bdaf676..fa698d2f 100644 > --- a/src/acpica/source/common/dmtbinfo3.c > +++ b/src/acpica/source/common/dmtbinfo3.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/common/getopt.c b/src/acpica/source/common/getopt.c > index 766ab8e3..772b66c0 100644 > --- a/src/acpica/source/common/getopt.c > +++ b/src/acpica/source/common/getopt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslallocate.c b/src/acpica/source/compiler/aslallocate.c > index 8be711b2..d697d059 100644 > --- a/src/acpica/source/compiler/aslallocate.c > +++ b/src/acpica/source/compiler/aslallocate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslanalyze.c b/src/acpica/source/compiler/aslanalyze.c > index c54ff8a2..9db7d4fb 100644 > --- a/src/acpica/source/compiler/aslanalyze.c > +++ b/src/acpica/source/compiler/aslanalyze.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslascii.c b/src/acpica/source/compiler/aslascii.c > index 0e8c4d4e..6c0e62c4 100644 > --- a/src/acpica/source/compiler/aslascii.c > +++ b/src/acpica/source/compiler/aslascii.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslbtypes.c b/src/acpica/source/compiler/aslbtypes.c > index ebb798a7..f7b3fb1b 100644 > --- a/src/acpica/source/compiler/aslbtypes.c > +++ b/src/acpica/source/compiler/aslbtypes.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcache.c b/src/acpica/source/compiler/aslcache.c > index 05ae19b7..9cc707e2 100644 > --- a/src/acpica/source/compiler/aslcache.c > +++ b/src/acpica/source/compiler/aslcache.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcodegen.c b/src/acpica/source/compiler/aslcodegen.c > index 75788689..6ae3a0aa 100644 > --- a/src/acpica/source/compiler/aslcodegen.c > +++ b/src/acpica/source/compiler/aslcodegen.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompile.c b/src/acpica/source/compiler/aslcompile.c > index ffb7496d..c17e219c 100644 > --- a/src/acpica/source/compiler/aslcompile.c > +++ b/src/acpica/source/compiler/aslcompile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -915,10 +915,11 @@ CmCleanupAndExit ( > > if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) > { > - printf ("\nMaximum error count (%d) exceeded\n", > + printf ("\nMaximum error count (%d) exceeded (aslcompile.c)\n", > ASL_MAX_ERROR_COUNT); > } > > + AslGbl_ExceptionCount[ASL_ERROR] = 0; > UtDisplaySummary (ASL_FILE_STDOUT); > > /* > diff --git a/src/acpica/source/compiler/aslcompiler.h b/src/acpica/source/compiler/aslcompiler.h > index 5112ea49..d52f60f2 100644 > --- a/src/acpica/source/compiler/aslcompiler.h > +++ b/src/acpica/source/compiler/aslcompiler.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcompiler.l b/src/acpica/source/compiler/aslcompiler.l > index e0985362..881096ad 100644 > --- a/src/acpica/source/compiler/aslcompiler.l > +++ b/src/acpica/source/compiler/aslcompiler.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslcstyle.y b/src/acpica/source/compiler/aslcstyle.y > index 2f032fac..b4e9065f 100644 > --- a/src/acpica/source/compiler/aslcstyle.y > +++ b/src/acpica/source/compiler/aslcstyle.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asldebug.c b/src/acpica/source/compiler/asldebug.c > index 636fe051..5ac6a4ed 100644 > --- a/src/acpica/source/compiler/asldebug.c > +++ b/src/acpica/source/compiler/asldebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asldefine.h b/src/acpica/source/compiler/asldefine.h > index 9149ff60..12b2899e 100644 > --- a/src/acpica/source/compiler/asldefine.h > +++ b/src/acpica/source/compiler/asldefine.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslerror.c b/src/acpica/source/compiler/aslerror.c > index d73d7de9..a0ebe7b3 100644 > --- a/src/acpica/source/compiler/aslerror.c > +++ b/src/acpica/source/compiler/aslerror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -1025,7 +1025,7 @@ AslLogNewError ( > AslGbl_ExceptionCount[ModifiedLevel]++; > if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) > { > - printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT); > + printf ("\nMaximum error count (%u) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT); > > AslGbl_SourceLine = 0; > AslGbl_NextError = AslGbl_ErrorLog; > @@ -1033,6 +1033,7 @@ AslLogNewError ( > exit(1); > } > > + AslGbl_ExceptionCount[ASL_ERROR] = 0; > return; > } > > diff --git a/src/acpica/source/compiler/aslexternal.c b/src/acpica/source/compiler/aslexternal.c > index 80edfd2b..a7d2c9c3 100644 > --- a/src/acpica/source/compiler/aslexternal.c > +++ b/src/acpica/source/compiler/aslexternal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslfileio.c b/src/acpica/source/compiler/aslfileio.c > index a55b2dbc..88b9def9 100644 > --- a/src/acpica/source/compiler/aslfileio.c > +++ b/src/acpica/source/compiler/aslfileio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslfiles.c b/src/acpica/source/compiler/aslfiles.c > index 14403d3d..2479b404 100644 > --- a/src/acpica/source/compiler/aslfiles.c > +++ b/src/acpica/source/compiler/aslfiles.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslfold.c b/src/acpica/source/compiler/aslfold.c > index d9cc8803..316890c4 100644 > --- a/src/acpica/source/compiler/aslfold.c > +++ b/src/acpica/source/compiler/aslfold.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslglobal.h b/src/acpica/source/compiler/aslglobal.h > index 540d7dd9..ff00b92e 100644 > --- a/src/acpica/source/compiler/aslglobal.h > +++ b/src/acpica/source/compiler/aslglobal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslhelp.c b/src/acpica/source/compiler/aslhelp.c > index 3131b9db..d83d41e3 100644 > --- a/src/acpica/source/compiler/aslhelp.c > +++ b/src/acpica/source/compiler/aslhelp.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslhelpers.y b/src/acpica/source/compiler/aslhelpers.y > index abb729c3..2764bf65 100644 > --- a/src/acpica/source/compiler/aslhelpers.y > +++ b/src/acpica/source/compiler/aslhelpers.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslhex.c b/src/acpica/source/compiler/aslhex.c > index 95b364ff..a6e80fdf 100644 > --- a/src/acpica/source/compiler/aslhex.c > +++ b/src/acpica/source/compiler/aslhex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslkeywords.y b/src/acpica/source/compiler/aslkeywords.y > index 54314e64..661cfc93 100644 > --- a/src/acpica/source/compiler/aslkeywords.y > +++ b/src/acpica/source/compiler/aslkeywords.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllength.c b/src/acpica/source/compiler/asllength.c > index a2a55094..b1c06246 100644 > --- a/src/acpica/source/compiler/asllength.c > +++ b/src/acpica/source/compiler/asllength.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllisting.c b/src/acpica/source/compiler/asllisting.c > index 6ed16139..290d5062 100644 > --- a/src/acpica/source/compiler/asllisting.c > +++ b/src/acpica/source/compiler/asllisting.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllistsup.c b/src/acpica/source/compiler/asllistsup.c > index 60d30423..b03560d3 100644 > --- a/src/acpica/source/compiler/asllistsup.c > +++ b/src/acpica/source/compiler/asllistsup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslload.c b/src/acpica/source/compiler/aslload.c > index f73135f3..3f827d0b 100644 > --- a/src/acpica/source/compiler/aslload.c > +++ b/src/acpica/source/compiler/aslload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asllookup.c b/src/acpica/source/compiler/asllookup.c > index 50f087d7..44bf9a38 100644 > --- a/src/acpica/source/compiler/asllookup.c > +++ b/src/acpica/source/compiler/asllookup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmain.c b/src/acpica/source/compiler/aslmain.c > index 1df36a2b..3c2ce58e 100644 > --- a/src/acpica/source/compiler/aslmain.c > +++ b/src/acpica/source/compiler/aslmain.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -417,7 +417,7 @@ AslSignalHandler ( > } > > printf (ASL_PREFIX "Terminating\n"); > - exit (0); > + _exit (0); > } > > > diff --git a/src/acpica/source/compiler/aslmap.c b/src/acpica/source/compiler/aslmap.c > index 7b591bc6..782d0d96 100644 > --- a/src/acpica/source/compiler/aslmap.c > +++ b/src/acpica/source/compiler/aslmap.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -379,8 +379,8 @@ const ASL_MAPPING_ENTRY AslKeywordMapping [] = > /* LLESSEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_LESS_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), > /* LNOT */ OP_TABLE_ENTRY (AML_LOGICAL_NOT_OP, 0, 0, ACPI_BTYPE_INTEGER), > /* LNOTEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_NOT_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), > -/* LOAD */ OP_TABLE_ENTRY (AML_LOAD_OP, 0, 0, 0), > -/* LOADTABLE */ OP_TABLE_ENTRY (AML_LOAD_TABLE_OP, 0, 0, ACPI_BTYPE_DDB_HANDLE), > +/* LOAD */ OP_TABLE_ENTRY (AML_LOAD_OP, 0, 0, ACPI_BTYPE_INTEGER), > +/* LOADTABLE */ OP_TABLE_ENTRY (AML_LOAD_TABLE_OP, 0, 0, ACPI_BTYPE_INTEGER), > /* LOCAL0 */ OP_TABLE_ENTRY (AML_LOCAL0, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), > /* LOCAL1 */ OP_TABLE_ENTRY (AML_LOCAL1, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), > /* LOCAL2 */ OP_TABLE_ENTRY (AML_LOCAL2, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), > diff --git a/src/acpica/source/compiler/aslmapenter.c b/src/acpica/source/compiler/aslmapenter.c > index 7ade1a31..5dae3e9e 100644 > --- a/src/acpica/source/compiler/aslmapenter.c > +++ b/src/acpica/source/compiler/aslmapenter.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmapoutput.c b/src/acpica/source/compiler/aslmapoutput.c > index 0fe7b117..95146ea6 100644 > --- a/src/acpica/source/compiler/aslmapoutput.c > +++ b/src/acpica/source/compiler/aslmapoutput.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmaputils.c b/src/acpica/source/compiler/aslmaputils.c > index c376bc0a..0b2c7e26 100644 > --- a/src/acpica/source/compiler/aslmaputils.c > +++ b/src/acpica/source/compiler/aslmaputils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmessages.c b/src/acpica/source/compiler/aslmessages.c > index ca50d281..990e376f 100644 > --- a/src/acpica/source/compiler/aslmessages.c > +++ b/src/acpica/source/compiler/aslmessages.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -193,7 +193,8 @@ const char *AslErrorLevelIde [ASL_NUM_REPORT_LEVELS] = { > * > * NOTE2: With the introduction of the -vw option to disable specific messages, > * new messages should only be added to the end of this list, so that values > - * for existing messages are not disturbed. > + * for existing messages are not disturbed. As important, obsolete messages > + * cannot be removed from this list, as it will affect the -vw option. > */ > > /* ASL compiler */ > diff --git a/src/acpica/source/compiler/aslmessages.h b/src/acpica/source/compiler/aslmessages.h > index 0e9fefd4..197e9e22 100644 > --- a/src/acpica/source/compiler/aslmessages.h > +++ b/src/acpica/source/compiler/aslmessages.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslmethod.c b/src/acpica/source/compiler/aslmethod.c > index 4b3b66a5..517ba778 100644 > --- a/src/acpica/source/compiler/aslmethod.c > +++ b/src/acpica/source/compiler/aslmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslnamesp.c b/src/acpica/source/compiler/aslnamesp.c > index 6f9bb65a..60c488db 100644 > --- a/src/acpica/source/compiler/aslnamesp.c > +++ b/src/acpica/source/compiler/aslnamesp.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloffset.c b/src/acpica/source/compiler/asloffset.c > index 5f2661e4..b0954c70 100644 > --- a/src/acpica/source/compiler/asloffset.c > +++ b/src/acpica/source/compiler/asloffset.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslopcodes.c b/src/acpica/source/compiler/aslopcodes.c > index 2f2c7744..e07910b1 100644 > --- a/src/acpica/source/compiler/aslopcodes.c > +++ b/src/acpica/source/compiler/aslopcodes.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloperands.c b/src/acpica/source/compiler/asloperands.c > index ae3b918d..9330fdfb 100644 > --- a/src/acpica/source/compiler/asloperands.c > +++ b/src/acpica/source/compiler/asloperands.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -429,6 +429,11 @@ OpnDoFieldCommon ( > Next->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; > PkgLengthNode->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; > } > +#ifdef _OBSOLETE_CODE > + /* > + * January 2022: removed this check due to complaints by users > + * for too many (invalid) remarks. > + */ > else if (NewBitOffset == CurrentBitOffset) > { > /* > @@ -459,6 +464,7 @@ OpnDoFieldCommon ( > CurrentBitOffset = NewBitOffset; > } > } > +#endif > else > { > /* > diff --git a/src/acpica/source/compiler/aslopt.c b/src/acpica/source/compiler/aslopt.c > index 0246b312..916aebfb 100644 > --- a/src/acpica/source/compiler/aslopt.c > +++ b/src/acpica/source/compiler/aslopt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asloptions.c b/src/acpica/source/compiler/asloptions.c > index ab9daa40..2808650e 100644 > --- a/src/acpica/source/compiler/asloptions.c > +++ b/src/acpica/source/compiler/asloptions.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslparseop.c b/src/acpica/source/compiler/aslparseop.c > index 92eeb0fb..ab81ac28 100644 > --- a/src/acpica/source/compiler/aslparseop.c > +++ b/src/acpica/source/compiler/aslparseop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslparser.y b/src/acpica/source/compiler/aslparser.y > index 0a6fb64d..dff15619 100644 > --- a/src/acpica/source/compiler/aslparser.y > +++ b/src/acpica/source/compiler/aslparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslpld.c b/src/acpica/source/compiler/aslpld.c > index 0939c5c6..9faa8c26 100644 > --- a/src/acpica/source/compiler/aslpld.c > +++ b/src/acpica/source/compiler/aslpld.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslpredef.c b/src/acpica/source/compiler/aslpredef.c > index aa1a9570..c52295ee 100644 > --- a/src/acpica/source/compiler/aslpredef.c > +++ b/src/acpica/source/compiler/aslpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprepkg.c b/src/acpica/source/compiler/aslprepkg.c > index 380c48b0..f562dbe6 100644 > --- a/src/acpica/source/compiler/aslprepkg.c > +++ b/src/acpica/source/compiler/aslprepkg.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprimaries.y b/src/acpica/source/compiler/aslprimaries.y > index dd1310b0..69565def 100644 > --- a/src/acpica/source/compiler/aslprimaries.y > +++ b/src/acpica/source/compiler/aslprimaries.y > @@ -11,7 +11,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -843,7 +843,7 @@ LoadTerm > : PARSEOP_LOAD > PARSEOP_OPEN_PAREN {$<n>$ = TrCreateLeafOp (PARSEOP_LOAD);} > NameString > - RequiredTarget > + Target > PARSEOP_CLOSE_PAREN {$$ = TrLinkOpChildren ($<n>3,2,$4,$5);} > | PARSEOP_LOAD > PARSEOP_OPEN_PAREN > diff --git a/src/acpica/source/compiler/aslprintf.c b/src/acpica/source/compiler/aslprintf.c > index 04f2d31e..3f270fec 100644 > --- a/src/acpica/source/compiler/aslprintf.c > +++ b/src/acpica/source/compiler/aslprintf.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslprune.c b/src/acpica/source/compiler/aslprune.c > index 78b2e34f..4626a1ee 100644 > --- a/src/acpica/source/compiler/aslprune.c > +++ b/src/acpica/source/compiler/aslprune.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslresource.c b/src/acpica/source/compiler/aslresource.c > index a2d85568..104a4835 100644 > --- a/src/acpica/source/compiler/aslresource.c > +++ b/src/acpica/source/compiler/aslresource.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslresources.y b/src/acpica/source/compiler/aslresources.y > index 86c8981f..a5752b01 100644 > --- a/src/acpica/source/compiler/aslresources.y > +++ b/src/acpica/source/compiler/aslresources.y > @@ -11,7 +11,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype1.c b/src/acpica/source/compiler/aslrestype1.c > index 6751444a..a6625c08 100644 > --- a/src/acpica/source/compiler/aslrestype1.c > +++ b/src/acpica/source/compiler/aslrestype1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype1i.c b/src/acpica/source/compiler/aslrestype1i.c > index c880a740..84d5b653 100644 > --- a/src/acpica/source/compiler/aslrestype1i.c > +++ b/src/acpica/source/compiler/aslrestype1i.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2.c b/src/acpica/source/compiler/aslrestype2.c > index 4c308aaa..387e85c8 100644 > --- a/src/acpica/source/compiler/aslrestype2.c > +++ b/src/acpica/source/compiler/aslrestype2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2d.c b/src/acpica/source/compiler/aslrestype2d.c > index c1cafe20..6b597e25 100644 > --- a/src/acpica/source/compiler/aslrestype2d.c > +++ b/src/acpica/source/compiler/aslrestype2d.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2e.c b/src/acpica/source/compiler/aslrestype2e.c > index 63db7852..414b2d23 100644 > --- a/src/acpica/source/compiler/aslrestype2e.c > +++ b/src/acpica/source/compiler/aslrestype2e.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2q.c b/src/acpica/source/compiler/aslrestype2q.c > index ec64da2b..ce796597 100644 > --- a/src/acpica/source/compiler/aslrestype2q.c > +++ b/src/acpica/source/compiler/aslrestype2q.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2s.c b/src/acpica/source/compiler/aslrestype2s.c > index 607aca8b..ea832da3 100644 > --- a/src/acpica/source/compiler/aslrestype2s.c > +++ b/src/acpica/source/compiler/aslrestype2s.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrestype2w.c b/src/acpica/source/compiler/aslrestype2w.c > index 3c3fed7b..a758e058 100644 > --- a/src/acpica/source/compiler/aslrestype2w.c > +++ b/src/acpica/source/compiler/aslrestype2w.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslrules.y b/src/acpica/source/compiler/aslrules.y > index a944308e..79aa2210 100644 > --- a/src/acpica/source/compiler/aslrules.y > +++ b/src/acpica/source/compiler/aslrules.y > @@ -11,7 +11,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -261,11 +261,11 @@ Target > | ',' {$$ = TrCreateNullTargetOp ();} /* Placeholder is a ZeroOp object */ > | ',' SuperName {$$ = TrSetOpFlags ($2, OP_IS_TARGET);} > ; > - > +/* > RequiredTarget > : ',' SuperName {$$ = TrSetOpFlags ($2, OP_IS_TARGET);} > ; > - > +*/ > TermArg > : SimpleName {$$ = TrSetOpFlags ($1, OP_IS_TERM_ARG);} > | Type2Opcode {$$ = TrSetOpFlags ($1, OP_IS_TERM_ARG);} > @@ -715,7 +715,6 @@ Type1Opcode > | FatalTerm {} > | ForTerm {} > | ElseIfTerm {} > - | LoadTerm {} > | NoOpTerm {} > | NotifyTerm {} > | ReleaseTerm {} > @@ -734,6 +733,7 @@ Type2Opcode > | CondRefOfTerm {} > | CopyObjectTerm {} > | DerefOfTerm {} > + | LoadTerm {} /* Moved from Type1 -- now returns an integer (ACPI 6.4) */ > | ObjectTypeTerm {} > | RefOfTerm {} > | SizeOfTerm {} > diff --git a/src/acpica/source/compiler/aslstartup.c b/src/acpica/source/compiler/aslstartup.c > index 3954388c..45462adf 100644 > --- a/src/acpica/source/compiler/aslstartup.c > +++ b/src/acpica/source/compiler/aslstartup.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslstubs.c b/src/acpica/source/compiler/aslstubs.c > index be3337ab..0e6cd56f 100644 > --- a/src/acpica/source/compiler/aslstubs.c > +++ b/src/acpica/source/compiler/aslstubs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslsupport.l b/src/acpica/source/compiler/aslsupport.l > index a507e99b..0daec602 100644 > --- a/src/acpica/source/compiler/aslsupport.l > +++ b/src/acpica/source/compiler/aslsupport.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslsupport.y b/src/acpica/source/compiler/aslsupport.y > index dfc427a9..3f19af2f 100644 > --- a/src/acpica/source/compiler/aslsupport.y > +++ b/src/acpica/source/compiler/aslsupport.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltokens.y b/src/acpica/source/compiler/asltokens.y > index 5e205e01..c43561e7 100644 > --- a/src/acpica/source/compiler/asltokens.y > +++ b/src/acpica/source/compiler/asltokens.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltransform.c b/src/acpica/source/compiler/asltransform.c > index 91655420..573ddad1 100644 > --- a/src/acpica/source/compiler/asltransform.c > +++ b/src/acpica/source/compiler/asltransform.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltree.c b/src/acpica/source/compiler/asltree.c > index 91db420f..9cf49269 100644 > --- a/src/acpica/source/compiler/asltree.c > +++ b/src/acpica/source/compiler/asltree.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltypes.h b/src/acpica/source/compiler/asltypes.h > index 760995f5..d5689dea 100644 > --- a/src/acpica/source/compiler/asltypes.h > +++ b/src/acpica/source/compiler/asltypes.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asltypes.y b/src/acpica/source/compiler/asltypes.y > index aaa732f4..ba98362c 100644 > --- a/src/acpica/source/compiler/asltypes.y > +++ b/src/acpica/source/compiler/asltypes.y > @@ -9,7 +9,7 @@ NoEcho(' > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -175,7 +175,9 @@ NoEcho(' > %type <n> ParameterTypePackageList > %type <n> ParameterTypesPackage > %type <n> ParameterTypesPackageList > +/* > %type <n> RequiredTarget > +*/ > %type <n> SimpleName > %type <n> StringData > %type <n> StringLiteral > diff --git a/src/acpica/source/compiler/aslutils.c b/src/acpica/source/compiler/aslutils.c > index c4325c3b..e91fd460 100644 > --- a/src/acpica/source/compiler/aslutils.c > +++ b/src/acpica/source/compiler/aslutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/asluuid.c b/src/acpica/source/compiler/asluuid.c > index def35c92..0eb36050 100644 > --- a/src/acpica/source/compiler/asluuid.c > +++ b/src/acpica/source/compiler/asluuid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslwalks.c b/src/acpica/source/compiler/aslwalks.c > index 8ee5122c..6e32f081 100644 > --- a/src/acpica/source/compiler/aslwalks.c > +++ b/src/acpica/source/compiler/aslwalks.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslxref.c b/src/acpica/source/compiler/aslxref.c > index ef99a971..3a00f5a9 100644 > --- a/src/acpica/source/compiler/aslxref.c > +++ b/src/acpica/source/compiler/aslxref.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/aslxrefout.c b/src/acpica/source/compiler/aslxrefout.c > index 843504a0..dd3fe80c 100644 > --- a/src/acpica/source/compiler/aslxrefout.c > +++ b/src/acpica/source/compiler/aslxrefout.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/cvcompiler.c b/src/acpica/source/compiler/cvcompiler.c > index 633a31d8..b51a688b 100644 > --- a/src/acpica/source/compiler/cvcompiler.c > +++ b/src/acpica/source/compiler/cvcompiler.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/cvdisasm.c b/src/acpica/source/compiler/cvdisasm.c > index be3378ba..250c009a 100644 > --- a/src/acpica/source/compiler/cvdisasm.c > +++ b/src/acpica/source/compiler/cvdisasm.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/cvparser.c b/src/acpica/source/compiler/cvparser.c > index 62d981fb..66b04e9a 100644 > --- a/src/acpica/source/compiler/cvparser.c > +++ b/src/acpica/source/compiler/cvparser.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompile.c b/src/acpica/source/compiler/dtcompile.c > index 84d8e5c1..89eb937d 100644 > --- a/src/acpica/source/compiler/dtcompile.c > +++ b/src/acpica/source/compiler/dtcompile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompiler.h b/src/acpica/source/compiler/dtcompiler.h > index d9c92ce2..3b3683cc 100644 > --- a/src/acpica/source/compiler/dtcompiler.h > +++ b/src/acpica/source/compiler/dtcompiler.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -569,6 +569,10 @@ ACPI_STATUS > DtCompileAest ( > void **PFieldList); > > +ACPI_STATUS > +DtCompileApmt ( > + void **PFieldList); > + > ACPI_STATUS > DtCompileAsf ( > void **PFieldList); > @@ -763,6 +767,7 @@ DtGetGenericTableInfo ( > > extern const unsigned char TemplateAest[]; > extern const unsigned char TemplateAgdi[]; > +extern const unsigned char TemplateApmt[]; > extern const unsigned char TemplateAsf[]; > extern const unsigned char TemplateBoot[]; > extern const unsigned char TemplateBdat[]; > diff --git a/src/acpica/source/compiler/dtcompilerparser.l b/src/acpica/source/compiler/dtcompilerparser.l > index bd128bed..a00ef56e 100644 > --- a/src/acpica/source/compiler/dtcompilerparser.l > +++ b/src/acpica/source/compiler/dtcompilerparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtcompilerparser.y b/src/acpica/source/compiler/dtcompilerparser.y > index 3b1a67a0..30ead3af 100644 > --- a/src/acpica/source/compiler/dtcompilerparser.y > +++ b/src/acpica/source/compiler/dtcompilerparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtexpress.c b/src/acpica/source/compiler/dtexpress.c > index c9705c9d..fd292d8f 100644 > --- a/src/acpica/source/compiler/dtexpress.c > +++ b/src/acpica/source/compiler/dtexpress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtfield.c b/src/acpica/source/compiler/dtfield.c > index f4c71147..f9316319 100644 > --- a/src/acpica/source/compiler/dtfield.c > +++ b/src/acpica/source/compiler/dtfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -676,6 +676,12 @@ DtCompileFlag ( > BitLength = 2; > break; > > + case ACPI_DMT_FLAGS8_2: > + > + BitPosition = 2; > + BitLength = 8; > + break; > + > case ACPI_DMT_FLAGS4: > > BitPosition = 4; > diff --git a/src/acpica/source/compiler/dtio.c b/src/acpica/source/compiler/dtio.c > index e1776f3f..1a00424c 100644 > --- a/src/acpica/source/compiler/dtio.c > +++ b/src/acpica/source/compiler/dtio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtparser.l b/src/acpica/source/compiler/dtparser.l > index 9d2e3afe..b7cb26e2 100644 > --- a/src/acpica/source/compiler/dtparser.l > +++ b/src/acpica/source/compiler/dtparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtparser.y b/src/acpica/source/compiler/dtparser.y > index 1b6f6df6..fc8275cc 100644 > --- a/src/acpica/source/compiler/dtparser.y > +++ b/src/acpica/source/compiler/dtparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dtsubtable.c b/src/acpica/source/compiler/dtsubtable.c > index 6ea538e6..3c2798b6 100644 > --- a/src/acpica/source/compiler/dtsubtable.c > +++ b/src/acpica/source/compiler/dtsubtable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttable.c b/src/acpica/source/compiler/dttable.c > index fb3f26f1..dfc34c13 100644 > --- a/src/acpica/source/compiler/dttable.c > +++ b/src/acpica/source/compiler/dttable.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttable1.c b/src/acpica/source/compiler/dttable1.c > index 2e6a8569..9ac04350 100644 > --- a/src/acpica/source/compiler/dttable1.c > +++ b/src/acpica/source/compiler/dttable1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -387,6 +387,102 @@ DtCompileAest ( > } > > > +/****************************************************************************** > + * > + * FUNCTION: DtCompileApmt > + * > + * PARAMETERS: List - Current field list pointer > + * > + * RETURN: Status > + * > + * DESCRIPTION: Compile APMT. > + * > + *****************************************************************************/ > + > +ACPI_STATUS > +DtCompileApmt ( > + void **List) > +{ > + ACPI_STATUS Status; > + ACPI_TABLE_HEADER *Header; > + ACPI_APMT_NODE *ApmtNode; > + ACPI_APMT_NODE *PeerApmtNode; > + DT_SUBTABLE *Subtable; > + DT_SUBTABLE *PeerSubtable; > + DT_SUBTABLE *ParentTable; > + DT_FIELD **PFieldList = (DT_FIELD**)List; > + DT_FIELD *SubtableStart; > + UINT32 CurLength; > + char MsgBuffer[64] = ""; > + > + ParentTable = DtPeekSubtable(); > + > + Header = ACPI_CAST_PTR(ACPI_TABLE_HEADER, ParentTable->Buffer); > + > + CurLength = sizeof(ACPI_TABLE_HEADER); > + > + /* Walk the parse tree */ > + > + while (*PFieldList) > + { > + /* APMT Node Subtable */ > + > + SubtableStart = *PFieldList; > + > + Status = DtCompileTable(PFieldList, AcpiDmTableInfoApmtNode, &Subtable); > + > + if (ACPI_FAILURE(Status)) > + { > + return (Status); > + } > + > + ApmtNode = ACPI_CAST_PTR(ACPI_APMT_NODE, Subtable->Buffer); > + > + if (ApmtNode->Length != sizeof(ACPI_APMT_NODE)) > + { > + DtFatal(ASL_MSG_INVALID_LENGTH, SubtableStart, "APMT"); > + return (AE_ERROR); > + } > + > + if (ApmtNode->Type >= ACPI_APMT_NODE_TYPE_COUNT) > + { > + snprintf(MsgBuffer, 64, "Node Type : 0x%X", ApmtNode->Type); > + DtFatal(ASL_MSG_INVALID_TYPE, SubtableStart, MsgBuffer); > + return (AE_ERROR); > + } > + > + PeerSubtable = DtGetNextSubtable(ParentTable, NULL); > + > + /* Validate the node id needs to be unique. */ > + while(PeerSubtable) > + { > + PeerApmtNode = ACPI_CAST_PTR(ACPI_APMT_NODE, PeerSubtable->Buffer); > + if (PeerApmtNode->Id == ApmtNode->Id) > + { > + snprintf(MsgBuffer, 64, "Node Id : 0x%X existed", ApmtNode->Id); > + DtFatal(ASL_MSG_DUPLICATE_ITEM, SubtableStart, MsgBuffer); > + return (AE_ERROR); > + } > + > + PeerSubtable = DtGetNextSubtable(ParentTable, PeerSubtable); > + } > + > + CurLength += ApmtNode->Length; > + > + DtInsertSubtable(ParentTable, Subtable); > + } > + > + if (Header->Length != CurLength) > + { > + snprintf(MsgBuffer, 64, " - APMT Length : %u (expected: %u)", > + Header->Length, CurLength); > + DtFatal(ASL_MSG_INVALID_LENGTH, NULL, MsgBuffer); > + return (AE_ERROR); > + } > + > + return (AE_OK); > +} > + > /****************************************************************************** > * > * FUNCTION: DtCompileAsf > @@ -587,6 +683,9 @@ DtCompileCedt ( > > while (*PFieldList) > { > + /* if CFMWS and has more than one target, then set to zero later */ > + > + int InsertFlag = 1; > SubtableStart = *PFieldList; > > /* CEDT Header */ > @@ -607,25 +706,72 @@ DtCompileCedt ( > switch (CedtHeader->Type) > { > case ACPI_CEDT_TYPE_CHBS: > + Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt0, &Subtable); > + if (ACPI_FAILURE (Status)) > + { > + return (Status); > + } > + break; > + case ACPI_CEDT_TYPE_CFMWS: { > + unsigned char *dump; > + unsigned int idx, offset, max = 0; > + > + /* Compile table with first "Interleave target" */ > > + Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt1, &Subtable); > + if (ACPI_FAILURE (Status)) > + { > + return (Status); > + } > + > + /* Look in buffer for the number of targets */ > + offset = (unsigned int) ACPI_OFFSET (ACPI_CEDT_CFMWS, InterleaveWays); > + dump = (unsigned char *) Subtable->Buffer - 4; /* place at beginning of cedt1 */ > + max = 0x01 << dump[offset]; /* 2^max, so 0=1, 1=2, 2=4, 3=8. 8 is MAX */ > + if (max > 8) max=1; /* Error in encoding Interleaving Ways. */ > + if (max == 1) /* if only one target, then break here. */ > + break; /* break if only one target. */ > + > + /* We need to add more interleave targets, so write the current Subtable. */ > + > + ParentTable = DtPeekSubtable (); > + DtInsertSubtable (ParentTable, Subtable); /* Insert AcpiDmTableInfoCedt1 table so we can put in */ > + DtPushSubtable (Subtable); /* the targets > the first. */ > + > + /* Now, find out all interleave targets beyond the first. */ > + > + for (idx = 1; idx < max; idx++) { > + ParentTable = DtPeekSubtable (); > + > + if (*PFieldList) > + { > + Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt1_te, &Subtable); > + if (ACPI_FAILURE (Status)) > + { > + return (Status); > + } > + if (Subtable) > + { > + DtInsertSubtable (ParentTable, Subtable); /* got a target, so insert table. */ > + InsertFlag = 0; > + } > + } > + } > + > + DtPopSubtable (); > + ParentTable = DtPeekSubtable (); > break; > + } > > default: > - > DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "CEDT"); > return (AE_ERROR); > } > > - /* CEDT Subtable */ > - > - Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt0, &Subtable); > - if (ACPI_FAILURE (Status)) > - { > - return (Status); > - } > - > ParentTable = DtPeekSubtable (); > - DtInsertSubtable (ParentTable, Subtable); > + if (InsertFlag == 1) { > + DtInsertSubtable (ParentTable, Subtable); > + } > DtPopSubtable (); > } > > @@ -1005,6 +1151,11 @@ DtCompileDmar ( > InfoTable = AcpiDmTableInfoDmar4; > break; > > + case ACPI_DMAR_TYPE_SATC: > + > + InfoTable = AcpiDmTableInfoDmar5; > + break; > + > default: > > DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "DMAR"); > @@ -1903,9 +2054,9 @@ DtCompileIort ( > Table = ACPI_CAST_PTR (ACPI_TABLE_HEADER, ParentTable->Buffer); > Revision = Table->Revision; > > - /* Both IORT Rev E and E.a have known issues and are not supported */ > + /* IORT Revisions E, E.a & E.c have known issues and are not supported */ > > - if (Revision == 1 || Revision == 2) > + if (Revision == 1 || Revision == 2 || Revision == 4) > { > DtError (ASL_ERROR, ASL_MSG_UNSUPPORTED, NULL, "IORT table revision"); > return (AE_ERROR); > @@ -2218,7 +2369,7 @@ DtCompileIort ( > IortRmr->RmrCount = RmrCount; > break; > > - default: > + default: > > DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "IORT"); > return (AE_ERROR); > diff --git a/src/acpica/source/compiler/dttable2.c b/src/acpica/source/compiler/dttable2.c > index 85406361..1798a963 100644 > --- a/src/acpica/source/compiler/dttable2.c > +++ b/src/acpica/source/compiler/dttable2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -373,8 +373,17 @@ DtCompileMadt ( > > default: > > - DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "MADT"); > - return (AE_ERROR); > + if (MadtHeader->Type >= ACPI_MADT_TYPE_OEM_RESERVED) > + { > + InfoTable = AcpiDmTableInfoMadt17; > + } > + else > + { > + DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "MADT"); > + return (AE_ERROR); > + } > + > + break; > } > > Status = DtCompileTable (PFieldList, InfoTable, &Subtable); > @@ -807,7 +816,7 @@ DtCompileNhlt ( > UINT32 CapabilitiesSize; > UINT8 ArrayType; > UINT8 ConfigType; > - UINT8 LinuxSpecificCount; > + UINT8 DeviceInfoCount; > UINT32 i; > UINT32 j; > ACPI_TABLE_NHLT_ENDPOINT_COUNT *MainTable; > @@ -815,7 +824,7 @@ DtCompileNhlt ( > ACPI_NHLT_VENDOR_MIC_COUNT *MicCount; > ACPI_NHLT_FORMATS_CONFIG *FormatsConfig; > ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_D *ConfigSpecific; > - ACPI_NHLT_LINUX_SPECIFIC_COUNT *LinuxSpecific; > + ACPI_NHLT_DEVICE_INFO_COUNT *DeviceInfo; > > > /* Main table */ > @@ -1076,12 +1085,12 @@ DtCompileNhlt ( > > /* > * If we are not done with the current Endpoint yet, then there must be > - * some Linux-specific structure(s) yet to be processed. First, get > + * some non documeneted structure(s) yet to be processed. First, get > * the count of such structure(s). > */ > if (*PFieldList && (strcmp ((const char *) (*PFieldList)->Name, "Descriptor Length"))) > { > - /* Get the count of Linux-specific structures */ > + /* Get the count of non documented structures */ > > Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt7, > &Subtable); > @@ -1093,13 +1102,13 @@ DtCompileNhlt ( > ParentTable = DtPeekSubtable (); > DtInsertSubtable (ParentTable, Subtable); > > - LinuxSpecific = ACPI_CAST_PTR (ACPI_NHLT_LINUX_SPECIFIC_COUNT, Subtable->Buffer); > - LinuxSpecificCount = LinuxSpecific->StructureCount; > + DeviceInfo = ACPI_CAST_PTR (ACPI_NHLT_DEVICE_INFO_COUNT, Subtable->Buffer); > + DeviceInfoCount = DeviceInfo->StructureCount; > > - for (j = 0; j < LinuxSpecificCount; j++) > + for (j = 0; j < DeviceInfoCount; j++) > { > /* > - * Compile the following Linux-specific fields: > + * Compile the following Device Info fields: > * 1) Device ID > * 2) Device Instance ID > * 3) Device Port ID > @@ -1113,28 +1122,22 @@ DtCompileNhlt ( > > ParentTable = DtPeekSubtable (); > DtInsertSubtable (ParentTable, Subtable); > + } /* for (j = 0; j < LinuxSpecificCount; j++) */ > > - /* > - * To have a valid Linux-specific "Specific Data" at this > - * point, we need: > - * 1) The next field must be named "Specific Data" > - */ > - if (!strcmp ((const char *) (*PFieldList)->Name, "Specific Data")) > - { > - /* Compile the "Specific Data" field */ > - > - Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt7b, > - &Subtable); > - if (ACPI_FAILURE (Status)) > - { > - return (Status); > - } > > - ParentTable = DtPeekSubtable (); > - DtInsertSubtable (ParentTable, Subtable); > + /* Undocumented data at the end of endpoint */ > + if (*PFieldList && (strcmp ((const char *) (*PFieldList)->Name, "Descriptor Length"))) > + { > + Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt7b, > + &Subtable); > + if (ACPI_FAILURE (Status)) > + { > + return (Status); > } > > - } /* for (j = 0; j < LinuxSpecificCount; j++) */ > + ParentTable = DtPeekSubtable (); > + DtInsertSubtable (ParentTable, Subtable); > + } > } > > DtPopSubtable (); > @@ -1143,11 +1146,21 @@ DtCompileNhlt ( > > /* > * All Endpoint Descriptors are completed. > - * Do the table terminator structure (not in NHLT spec, optional) > + * Do the table terminator specific config (not in NHLT spec, optional) > */ > if (*PFieldList && (strcmp ((const char *) (*PFieldList)->Name, "Descriptor Length"))) > { > - Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt8, > + Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt5b, > + &Subtable); > + if (ACPI_FAILURE (Status)) > + { > + return (Status); > + } > + > + ParentTable = DtPeekSubtable (); > + DtInsertSubtable (ParentTable, Subtable); > + > + Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt3a, > &Subtable); > if (ACPI_FAILURE (Status)) > { > diff --git a/src/acpica/source/compiler/dttemplate.c b/src/acpica/source/compiler/dttemplate.c > index 8154abb5..1bcc4a12 100644 > --- a/src/acpica/source/compiler/dttemplate.c > +++ b/src/acpica/source/compiler/dttemplate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/dttemplate.h b/src/acpica/source/compiler/dttemplate.h > index e9272f3a..ad5af707 100644 > --- a/src/acpica/source/compiler/dttemplate.h > +++ b/src/acpica/source/compiler/dttemplate.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -259,6 +259,29 @@ const unsigned char TemplateAgdi[] = > 0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00 /* 00000028 "...@...." */ > }; > > +const unsigned char TemplateApmt[] = > +{ > + 0x41,0x50,0x4D,0x54,0x94,0x00,0x00,0x00, /* 00000000 "APMT...." */ > + 0x00,0x79,0x4E,0x56,0x49,0x44,0x49,0x41, /* 00000008 ".yNVIDIA" */ > + 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ > + 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ > + 0x17,0x12,0x21,0x20,0x38,0x00,0x04,0x03, /* 00000020 "..! 8..." */ > + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000028 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000030 "........" */ > + 0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 ". ......" */ > + 0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000040 ". ......" */ > + 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000050 "........" */ > + 0x6B,0x03,0x00,0x00,0x38,0x00,0x06,0x03, /* 00000058 "k...8..." */ > + 0x01,0x00,0x00,0x00,0x02,0x00,0x00,0x00, /* 00000060 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000068 "........" */ > + 0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000070 ".0......" */ > + 0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000078 ".0......" */ > + 0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ > + 0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000088 "........" */ > + 0x6B,0x03,0x00,0x00 /* 00000090 "k..." */ > +}; > + > const unsigned char TemplateAsf[] = > { > 0x41,0x53,0x46,0x21,0x72,0x00,0x00,0x00, /* 00000000 "ASF!r..." */ > @@ -320,23 +343,58 @@ const unsigned char TemplateBoot[] = > > const unsigned char TemplateCedt[] = > { > - 0x43,0x45,0x44,0x54,0x84,0x00,0x00,0x00, /* 00000000 "CEDT...." */ > - 0x01,0x8B,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > - 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ > - 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ > - 0x05,0x01,0x21,0x20,0x00,0x00,0x20,0x00, /* 00000020 "..! .. ." */ > - 0x33,0x33,0xCD,0xAB,0x01,0x00,0x00,0x00, /* 00000028 "33......" */ > - 0x00,0x00,0x00,0x00,0x00,0x21,0x43,0xD5, /* 00000030 ".....!C." */ > - 0x00,0x00,0x00,0x00,0x45,0x23,0x01,0x00, /* 00000038 "....E#.." */ > + 0x43,0x45,0x44,0x54,0x9c,0x01,0x00,0x00, /* 00000000 "CEDT...." */ > + 0x01,0x87,0x49,0x4e,0x54,0x45,0x4c,0x20, /* 00000008 "..INTEL " */ > + 0x54,0x45,0x4d,0x50,0x4c,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ > + 0x00,0x00,0x00,0x00,0x49,0x4e,0x54,0x4c, /* 00000018 "....INTL" */ > + 0x17,0x12,0x21,0x20,0x00,0x00,0x20,0x00, /* 00000020 "..! .. ." */ > + 0x00,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000028 ".^......" */ > + 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, /* 00000030 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000038 "..... .." */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00, /* 00000040 "...... ." */ > - 0x44,0x44,0xCD,0xAB,0x01,0x00,0x00,0x00, /* 00000048 "DD......" */ > - 0x00,0x00,0x00,0x00,0x00,0x21,0x43,0xA5, /* 00000050 ".....!C." */ > - 0x00,0x00,0x00,0x00,0x45,0x23,0xB1,0x00, /* 00000058 "....E#.." */ > + 0x01,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000048 ".^......" */ > + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000050 "..... .." */ > + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000058 "..... .." */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00, /* 00000060 "...... ." */ > - 0x55,0x55,0xCD,0xAB,0x01,0x00,0x00,0x00, /* 00000068 "UU......" */ > - 0x00,0x00,0x00,0x00,0x00,0x21,0x43,0xB5, /* 00000070 ".....!C." */ > - 0x00,0x00,0x00,0x00,0x45,0x23,0xB1,0x00, /* 00000078 "....E#.." */ > - 0x00,0x00,0x00,0x00 /* 00000080 "...." */ > + 0x02,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000068 ".^......" */ > + 0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00, /* 00000070 ".....0.." */ > + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000078 "..... .." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00, /* 00000080 "...... ." */ > + 0x03,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000088 ".^......" */ > + 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, /* 00000090 ".....@.." */ > + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000098 "..... .." */ > + 0x00,0x00,0x00,0x00,0x01,0x00,0x28,0x00, /* 000000a0 "......(." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000a8 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000b0 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000b8 "........" */ > + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 000000c0 "........" */ > + 0x00,0x5e,0xba,0x00,0x01,0x00,0x28,0x00, /* 000000c8 ".^....(." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000d0 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000d8 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000e0 "........" */ > + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 000000e8 "........" */ > + 0x01,0x5e,0xba,0x00,0x01,0x00,0x28,0x00, /* 000000f0 ".^....(." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000f8 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000100 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000108 "........" */ > + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 00000110 "........" */ > + 0x02,0x5e,0xba,0x00,0x01,0x00,0x28,0x00, /* 00000118 ".^....(." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000120 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000128 "........" */ > + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000130 "........" */ > + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 00000138 "........" */ > + 0x03,0x5e,0xba,0x00,0x01,0x00,0x2c,0x00, /* 00000140 ".^....,." */ > + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000148 "........" */ > + 0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000150 "........" */ > + 0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000158 "........" */ > + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 00000160 "........" */ > + 0x00,0x5e,0xba,0x00,0x01,0x5e,0xba,0x00, /* 00000160 ".^...^.." */ > + 0x01,0x00,0x2c,0x00,0x00,0x00,0x00,0x00, /* 00000170 "..,....." */ > + 0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00, /* 00000178 "........" */ > + 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /* 00000180 "........" */ > + 0x01,0x00,0x00,0x00,0x03,0x00,0x00,0x00, /* 00000188 "........" */ > + 0x0a,0x00,0x01,0x00,0x02,0x5e,0xba,0x00, /* 00000190 ".....^.." */ > + 0x03,0x5e,0xba,0x00 /* 00000198 ".^.." */ > }; > > const unsigned char TemplateCpep[] = > @@ -436,11 +494,11 @@ const unsigned char TemplateDbgp[] = > > const unsigned char TemplateDmar[] = > { > - 0x44,0x4D,0x41,0x52,0x8C,0x00,0x00,0x00, /* 00000000 "DMAR...." */ > - 0x01,0x03,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > + 0x44,0x4D,0x41,0x52,0x9C,0x00,0x00,0x00, /* 00000000 "DMAR...." */ > + 0x01,0xB8,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ > 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ > - 0x17,0x05,0x13,0x20,0x2F,0x01,0x00,0x00, /* 00000020 "... /..." */ > + 0x17,0x12,0x21,0x20,0x2F,0x01,0x00,0x00, /* 00000020 "..! /..." */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */ > 0x00,0x00,0x18,0x00,0x01,0x00,0x00,0x00, /* 00000030 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ > @@ -453,7 +511,9 @@ const unsigned char TemplateDmar[] = > 0x02,0x08,0x00,0x00,0x00,0x00,0x00,0x03, /* 00000070 "........" */ > 0x03,0x00,0x14,0x00,0x00,0x00,0x00,0x00, /* 00000078 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ > - 0x00,0x00,0x00,0x00 /* 00000088 "...." */ > + 0x00,0x00,0x00,0x00,0x05,0x00,0x10,0x00, /* 00000088 "........" */ > + 0x00,0x00,0x00,0x00,0x01,0x08,0x00,0x00, /* 00000090 "........" */ > + 0x00,0x00,0x00,0x02 /* 00000098 "...." */ > }; > > const unsigned char TemplateDrtm[] = > @@ -833,10 +893,10 @@ const unsigned char TemplateHpet[] = > const unsigned char TemplateIort[] = > { > 0x49,0x4F,0x52,0x54,0x3C,0x02,0x00,0x00, /* 00000000 "IORT<..." */ > - 0x03,0xF1,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > + 0x05,0xCB,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ > 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000010 "Template" */ > 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ > - 0x05,0x01,0x21,0x20,0x07,0x00,0x00,0x00, /* 00000020 "..! ...." */ > + 0x17,0x12,0x21,0x20,0x07,0x00,0x00,0x00, /* 00000020 "..! ...." */ > 0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "4......." */ > 0x49,0x4F,0x52,0x54,0x00,0x18,0x00,0x01, /* 00000030 "IORT...." */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ > @@ -848,7 +908,7 @@ const unsigned char TemplateIort[] = > 0x00,0x5C,0x5F,0x53,0x42,0x2E,0x50,0x43, /* 00000068 ".\_SB.PC" */ > 0x49,0x30,0x2E,0x44,0x45,0x56,0x30,0x00, /* 00000070 "I0.DEV0." */ > 0x49,0x4F,0x52,0x54,0x3C,0x02,0x00,0x00, /* 00000078 "IORT<..." */ > - 0x03,0xF2,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000080 "..INTEL " */ > + 0x03,0xF1,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000080 "..INTEL " */ > 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000088 "Template" */ > 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000090 "....INTL" */ > 0x05,0x01,0x21,0x20,0x07,0x00,0x00,0x00, /* 00000098 "..! ...." */ > @@ -857,7 +917,7 @@ const unsigned char TemplateIort[] = > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000B0 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000B8 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000C0 "........" */ > - 0x00,0x00,0x00,0x00,0x02,0x38,0x00,0x03, /* 000000C8 ".....8.." */ > + 0x00,0x00,0x00,0x00,0x02,0x38,0x00,0x04, /* 000000C8 ".....8.." */ > 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000D0 "........" */ > 0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000D8 "$......." */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000E0 "........" */ > @@ -895,7 +955,7 @@ const unsigned char TemplateIort[] = > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001E0 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001E8 "........" */ > 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000001F0 "........" */ > - 0x06,0x44,0x00,0x01,0x00,0x00,0x00,0x00, /* 000001F8 ".D......" */ > + 0x06,0x44,0x00,0x03,0x00,0x00,0x00,0x00, /* 000001F8 ".D......" */ > 0x01,0x00,0x00,0x00,0x30,0x00,0x00,0x00, /* 00000200 "....0..." */ > 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000208 "........" */ > 0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000210 "........" */ > @@ -903,7 +963,7 @@ const unsigned char TemplateIort[] = > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000220 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000228 "........" */ > 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000230 "........" */ > - 0x01,0x00,0x00,0x00 /* 00000238 "...." */ > + 0x00,0x00,0x00,0x00 /* 00000238 "...." */ > }; > > const unsigned char TemplateIvrs[] = > diff --git a/src/acpica/source/compiler/dtutils.c b/src/acpica/source/compiler/dtutils.c > index 2342ace3..e950763e 100644 > --- a/src/acpica/source/compiler/dtutils.c > +++ b/src/acpica/source/compiler/dtutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -411,6 +411,7 @@ DtGetFieldType ( > case ACPI_DMT_FLAGS0: > case ACPI_DMT_FLAGS1: > case ACPI_DMT_FLAGS2: > + case ACPI_DMT_FLAGS8_2: > case ACPI_DMT_FLAGS4: > case ACPI_DMT_FLAGS4_0: > case ACPI_DMT_FLAGS4_4: > @@ -561,6 +562,7 @@ DtGetFieldLength ( > case ACPI_DMT_FLAGS0: > case ACPI_DMT_FLAGS1: > case ACPI_DMT_FLAGS2: > + case ACPI_DMT_FLAGS8_2: > case ACPI_DMT_FLAGS4: > case ACPI_DMT_FLAGS4_0: > case ACPI_DMT_FLAGS4_4: > diff --git a/src/acpica/source/compiler/preprocess.h b/src/acpica/source/compiler/preprocess.h > index f4c8c309..9c25dd13 100644 > --- a/src/acpica/source/compiler/preprocess.h > +++ b/src/acpica/source/compiler/preprocess.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prexpress.c b/src/acpica/source/compiler/prexpress.c > index db2e76ec..8ac1fd88 100644 > --- a/src/acpica/source/compiler/prexpress.c > +++ b/src/acpica/source/compiler/prexpress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prmacros.c b/src/acpica/source/compiler/prmacros.c > index ab1255f6..5b366978 100644 > --- a/src/acpica/source/compiler/prmacros.c > +++ b/src/acpica/source/compiler/prmacros.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prparser.l b/src/acpica/source/compiler/prparser.l > index febcc319..828d81b2 100644 > --- a/src/acpica/source/compiler/prparser.l > +++ b/src/acpica/source/compiler/prparser.l > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prparser.y b/src/acpica/source/compiler/prparser.y > index f7e052d9..3854d989 100644 > --- a/src/acpica/source/compiler/prparser.y > +++ b/src/acpica/source/compiler/prparser.y > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prscan.c b/src/acpica/source/compiler/prscan.c > index 7672ef89..0d9af86e 100644 > --- a/src/acpica/source/compiler/prscan.c > +++ b/src/acpica/source/compiler/prscan.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/compiler/prutils.c b/src/acpica/source/compiler/prutils.c > index e793b4c4..eea42f89 100644 > --- a/src/acpica/source/compiler/prutils.c > +++ b/src/acpica/source/compiler/prutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbcmds.c b/src/acpica/source/components/debugger/dbcmds.c > index 1b10f161..6f551476 100644 > --- a/src/acpica/source/components/debugger/dbcmds.c > +++ b/src/acpica/source/components/debugger/dbcmds.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbconvert.c b/src/acpica/source/components/debugger/dbconvert.c > index 55307d08..9d1e1ddd 100644 > --- a/src/acpica/source/components/debugger/dbconvert.c > +++ b/src/acpica/source/components/debugger/dbconvert.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbdisply.c b/src/acpica/source/components/debugger/dbdisply.c > index b434cdc6..276217f5 100644 > --- a/src/acpica/source/components/debugger/dbdisply.c > +++ b/src/acpica/source/components/debugger/dbdisply.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbexec.c b/src/acpica/source/components/debugger/dbexec.c > index 26cc73f9..eed0aa35 100644 > --- a/src/acpica/source/components/debugger/dbexec.c > +++ b/src/acpica/source/components/debugger/dbexec.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbfileio.c b/src/acpica/source/components/debugger/dbfileio.c > index 70b9650a..09f8f227 100644 > --- a/src/acpica/source/components/debugger/dbfileio.c > +++ b/src/acpica/source/components/debugger/dbfileio.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbhistry.c b/src/acpica/source/components/debugger/dbhistry.c > index d5ae07f9..31bfc3c5 100644 > --- a/src/acpica/source/components/debugger/dbhistry.c > +++ b/src/acpica/source/components/debugger/dbhistry.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbinput.c b/src/acpica/source/components/debugger/dbinput.c > index d0b77e77..0f21b731 100644 > --- a/src/acpica/source/components/debugger/dbinput.c > +++ b/src/acpica/source/components/debugger/dbinput.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbmethod.c b/src/acpica/source/components/debugger/dbmethod.c > index 4e9a8b53..82202e8e 100644 > --- a/src/acpica/source/components/debugger/dbmethod.c > +++ b/src/acpica/source/components/debugger/dbmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbnames.c b/src/acpica/source/components/debugger/dbnames.c > index b7b45ecf..963f8125 100644 > --- a/src/acpica/source/components/debugger/dbnames.c > +++ b/src/acpica/source/components/debugger/dbnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbobject.c b/src/acpica/source/components/debugger/dbobject.c > index 5b98319a..b8bade43 100644 > --- a/src/acpica/source/components/debugger/dbobject.c > +++ b/src/acpica/source/components/debugger/dbobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbstats.c b/src/acpica/source/components/debugger/dbstats.c > index 7cca32f7..30a686dc 100644 > --- a/src/acpica/source/components/debugger/dbstats.c > +++ b/src/acpica/source/components/debugger/dbstats.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbtest.c b/src/acpica/source/components/debugger/dbtest.c > index cb9c7214..23690ed6 100644 > --- a/src/acpica/source/components/debugger/dbtest.c > +++ b/src/acpica/source/components/debugger/dbtest.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbutils.c b/src/acpica/source/components/debugger/dbutils.c > index 338d1fc2..ef649b2c 100644 > --- a/src/acpica/source/components/debugger/dbutils.c > +++ b/src/acpica/source/components/debugger/dbutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/debugger/dbxface.c b/src/acpica/source/components/debugger/dbxface.c > index 472e30df..c44e1d0d 100644 > --- a/src/acpica/source/components/debugger/dbxface.c > +++ b/src/acpica/source/components/debugger/dbxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmbuffer.c b/src/acpica/source/components/disassembler/dmbuffer.c > index 208fb84f..d5d813c8 100644 > --- a/src/acpica/source/components/disassembler/dmbuffer.c > +++ b/src/acpica/source/components/disassembler/dmbuffer.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmcstyle.c b/src/acpica/source/components/disassembler/dmcstyle.c > index 991b8714..f0bef68e 100644 > --- a/src/acpica/source/components/disassembler/dmcstyle.c > +++ b/src/acpica/source/components/disassembler/dmcstyle.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmdeferred.c b/src/acpica/source/components/disassembler/dmdeferred.c > index 23e1c58f..82ce2bec 100644 > --- a/src/acpica/source/components/disassembler/dmdeferred.c > +++ b/src/acpica/source/components/disassembler/dmdeferred.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmnames.c b/src/acpica/source/components/disassembler/dmnames.c > index 85da9964..8852921f 100644 > --- a/src/acpica/source/components/disassembler/dmnames.c > +++ b/src/acpica/source/components/disassembler/dmnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmopcode.c b/src/acpica/source/components/disassembler/dmopcode.c > index 80cf72f9..1cfe710d 100644 > --- a/src/acpica/source/components/disassembler/dmopcode.c > +++ b/src/acpica/source/components/disassembler/dmopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrc.c b/src/acpica/source/components/disassembler/dmresrc.c > index 12cf5e6b..0a183e9c 100644 > --- a/src/acpica/source/components/disassembler/dmresrc.c > +++ b/src/acpica/source/components/disassembler/dmresrc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcl.c b/src/acpica/source/components/disassembler/dmresrcl.c > index b30316b8..9aa6ac1f 100644 > --- a/src/acpica/source/components/disassembler/dmresrcl.c > +++ b/src/acpica/source/components/disassembler/dmresrcl.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcl2.c b/src/acpica/source/components/disassembler/dmresrcl2.c > index ae15e3d8..59d00f6c 100644 > --- a/src/acpica/source/components/disassembler/dmresrcl2.c > +++ b/src/acpica/source/components/disassembler/dmresrcl2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmresrcs.c b/src/acpica/source/components/disassembler/dmresrcs.c > index f323329f..db5ce5db 100644 > --- a/src/acpica/source/components/disassembler/dmresrcs.c > +++ b/src/acpica/source/components/disassembler/dmresrcs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmutils.c b/src/acpica/source/components/disassembler/dmutils.c > index 1c1e400e..2a7b7b33 100644 > --- a/src/acpica/source/components/disassembler/dmutils.c > +++ b/src/acpica/source/components/disassembler/dmutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/disassembler/dmwalk.c b/src/acpica/source/components/disassembler/dmwalk.c > index 75d75eab..7d2429b7 100644 > --- a/src/acpica/source/components/disassembler/dmwalk.c > +++ b/src/acpica/source/components/disassembler/dmwalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -959,7 +959,15 @@ AcpiDmDescendingOp ( > NextOp->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; > ASL_CV_CLOSE_PAREN (Op, Level); > > - /* Emit description comment for Name() with a predefined ACPI name */ > + if (Op->Asl.Parent->Common.AmlOpcode == AML_NAME_OP) > + { > + /* > + * Emit description comment showing the full ACPI name > + * of the ResourceTemplate only if it was defined using a > + * Name statement. > + */ > + AcpiDmPredefinedDescription (Op->Asl.Parent); > + } > > AcpiDmPredefinedDescription (Op->Asl.Parent); > > diff --git a/src/acpica/source/components/dispatcher/dsargs.c b/src/acpica/source/components/dispatcher/dsargs.c > index 4a24160c..52246693 100644 > --- a/src/acpica/source/components/dispatcher/dsargs.c > +++ b/src/acpica/source/components/dispatcher/dsargs.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dscontrol.c b/src/acpica/source/components/dispatcher/dscontrol.c > index 8b860a55..1d7d676c 100644 > --- a/src/acpica/source/components/dispatcher/dscontrol.c > +++ b/src/acpica/source/components/dispatcher/dscontrol.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsdebug.c b/src/acpica/source/components/dispatcher/dsdebug.c > index 26504c5a..9111a215 100644 > --- a/src/acpica/source/components/dispatcher/dsdebug.c > +++ b/src/acpica/source/components/dispatcher/dsdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsfield.c b/src/acpica/source/components/dispatcher/dsfield.c > index bd2755ae..2d3851ff 100644 > --- a/src/acpica/source/components/dispatcher/dsfield.c > +++ b/src/acpica/source/components/dispatcher/dsfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsinit.c b/src/acpica/source/components/dispatcher/dsinit.c > index 82857cb6..5f941f0c 100644 > --- a/src/acpica/source/components/dispatcher/dsinit.c > +++ b/src/acpica/source/components/dispatcher/dsinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsmethod.c b/src/acpica/source/components/dispatcher/dsmethod.c > index fd56bd50..d5fc3038 100644 > --- a/src/acpica/source/components/dispatcher/dsmethod.c > +++ b/src/acpica/source/components/dispatcher/dsmethod.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsmthdat.c b/src/acpica/source/components/dispatcher/dsmthdat.c > index ab0a9d11..af156790 100644 > --- a/src/acpica/source/components/dispatcher/dsmthdat.c > +++ b/src/acpica/source/components/dispatcher/dsmthdat.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsobject.c b/src/acpica/source/components/dispatcher/dsobject.c > index 20dd20c1..5ffd198b 100644 > --- a/src/acpica/source/components/dispatcher/dsobject.c > +++ b/src/acpica/source/components/dispatcher/dsobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsopcode.c b/src/acpica/source/components/dispatcher/dsopcode.c > index 579421fa..190be1b3 100644 > --- a/src/acpica/source/components/dispatcher/dsopcode.c > +++ b/src/acpica/source/components/dispatcher/dsopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dspkginit.c b/src/acpica/source/components/dispatcher/dspkginit.c > index 06c03414..bd2bf2e3 100644 > --- a/src/acpica/source/components/dispatcher/dspkginit.c > +++ b/src/acpica/source/components/dispatcher/dspkginit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dsutils.c b/src/acpica/source/components/dispatcher/dsutils.c > index 0bb4fb2d..b159b34c 100644 > --- a/src/acpica/source/components/dispatcher/dsutils.c > +++ b/src/acpica/source/components/dispatcher/dsutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswexec.c b/src/acpica/source/components/dispatcher/dswexec.c > index 636067bf..686f03c8 100644 > --- a/src/acpica/source/components/dispatcher/dswexec.c > +++ b/src/acpica/source/components/dispatcher/dswexec.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -173,7 +173,7 @@ static ACPI_EXECUTE_OP AcpiGbl_OpTypeDispatch [] = > AcpiExOpcode_0A_0T_1R, > AcpiExOpcode_1A_0T_0R, > AcpiExOpcode_1A_0T_1R, > - AcpiExOpcode_1A_1T_0R, > + NULL, /* Was: AcpiExOpcode_1A_0T_0R (Was for Load operator) */ > AcpiExOpcode_1A_1T_1R, > AcpiExOpcode_2A_0T_0R, > AcpiExOpcode_2A_0T_1R, > diff --git a/src/acpica/source/components/dispatcher/dswload.c b/src/acpica/source/components/dispatcher/dswload.c > index a9b22dd1..4fdf955a 100644 > --- a/src/acpica/source/components/dispatcher/dswload.c > +++ b/src/acpica/source/components/dispatcher/dswload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswload2.c b/src/acpica/source/components/dispatcher/dswload2.c > index 0311d0d9..496ee91f 100644 > --- a/src/acpica/source/components/dispatcher/dswload2.c > +++ b/src/acpica/source/components/dispatcher/dswload2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswscope.c b/src/acpica/source/components/dispatcher/dswscope.c > index bc360b66..dad0c497 100644 > --- a/src/acpica/source/components/dispatcher/dswscope.c > +++ b/src/acpica/source/components/dispatcher/dswscope.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/dispatcher/dswstate.c b/src/acpica/source/components/dispatcher/dswstate.c > index 9f79601f..68b7f3d1 100644 > --- a/src/acpica/source/components/dispatcher/dswstate.c > +++ b/src/acpica/source/components/dispatcher/dswstate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evevent.c b/src/acpica/source/components/events/evevent.c > index b9359608..8b08338a 100644 > --- a/src/acpica/source/components/events/evevent.c > +++ b/src/acpica/source/components/events/evevent.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evglock.c b/src/acpica/source/components/events/evglock.c > index 1eb740d9..79b519a0 100644 > --- a/src/acpica/source/components/events/evglock.c > +++ b/src/acpica/source/components/events/evglock.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evgpe.c b/src/acpica/source/components/events/evgpe.c > index 45c506ab..b246567d 100644 > --- a/src/acpica/source/components/events/evgpe.c > +++ b/src/acpica/source/components/events/evgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evgpeblk.c b/src/acpica/source/components/events/evgpeblk.c > index 03bb0b05..4dac205e 100644 > --- a/src/acpica/source/components/events/evgpeblk.c > +++ b/src/acpica/source/components/events/evgpeblk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evgpeinit.c b/src/acpica/source/components/events/evgpeinit.c > index 7a41fae0..6f0472cf 100644 > --- a/src/acpica/source/components/events/evgpeinit.c > +++ b/src/acpica/source/components/events/evgpeinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evgpeutil.c b/src/acpica/source/components/events/evgpeutil.c > index 679ca698..1f66717d 100644 > --- a/src/acpica/source/components/events/evgpeutil.c > +++ b/src/acpica/source/components/events/evgpeutil.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evhandler.c b/src/acpica/source/components/events/evhandler.c > index 763b294e..e0859c30 100644 > --- a/src/acpica/source/components/events/evhandler.c > +++ b/src/acpica/source/components/events/evhandler.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evmisc.c b/src/acpica/source/components/events/evmisc.c > index 5052a1fd..b6c6eb6a 100644 > --- a/src/acpica/source/components/events/evmisc.c > +++ b/src/acpica/source/components/events/evmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evregion.c b/src/acpica/source/components/events/evregion.c > index 6c73bc80..6cf77791 100644 > --- a/src/acpica/source/components/events/evregion.c > +++ b/src/acpica/source/components/events/evregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -320,14 +320,14 @@ AcpiEvAddressSpaceDispatch ( > return_ACPI_STATUS (AE_NOT_EXIST); > } > > - if (RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM) > - { > - ACPI_PCC_INFO *Ctx = HandlerDesc->AddressSpace.Context; > + if (RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM) > + { > + ACPI_PCC_INFO *Ctx = HandlerDesc->AddressSpace.Context; > > - Ctx->InternalBuffer = FieldObj->Field.InternalPccBuffer; > - Ctx->Length = (UINT16) RegionObj->Region.Length; > - Ctx->SubspaceId = (UINT8) RegionObj->Region.Address; > - } > + Ctx->InternalBuffer = FieldObj->Field.InternalPccBuffer; > + Ctx->Length = (UINT16) RegionObj->Region.Length; > + Ctx->SubspaceId = (UINT8) RegionObj->Region.Address; > + } > > /* > * We must exit the interpreter because the region setup will > diff --git a/src/acpica/source/components/events/evrgnini.c b/src/acpica/source/components/events/evrgnini.c > index 6959ff98..7cbbe30c 100644 > --- a/src/acpica/source/components/events/evrgnini.c > +++ b/src/acpica/source/components/events/evrgnini.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evsci.c b/src/acpica/source/components/events/evsci.c > index 47ac23f8..26891925 100644 > --- a/src/acpica/source/components/events/evsci.c > +++ b/src/acpica/source/components/events/evsci.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxface.c b/src/acpica/source/components/events/evxface.c > index 01d5f00f..245ca8a4 100644 > --- a/src/acpica/source/components/events/evxface.c > +++ b/src/acpica/source/components/events/evxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxfevnt.c b/src/acpica/source/components/events/evxfevnt.c > index a3454711..3384e098 100644 > --- a/src/acpica/source/components/events/evxfevnt.c > +++ b/src/acpica/source/components/events/evxfevnt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxfgpe.c b/src/acpica/source/components/events/evxfgpe.c > index 1fe27e75..87dab0f8 100644 > --- a/src/acpica/source/components/events/evxfgpe.c > +++ b/src/acpica/source/components/events/evxfgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/events/evxfregn.c b/src/acpica/source/components/events/evxfregn.c > index 3febc81c..ee44e10d 100644 > --- a/src/acpica/source/components/events/evxfregn.c > +++ b/src/acpica/source/components/events/evxfregn.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exconcat.c b/src/acpica/source/components/executer/exconcat.c > index bd7374e8..335d78f1 100644 > --- a/src/acpica/source/components/executer/exconcat.c > +++ b/src/acpica/source/components/executer/exconcat.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exconfig.c b/src/acpica/source/components/executer/exconfig.c > index ff26ade7..a87316ba 100644 > --- a/src/acpica/source/components/executer/exconfig.c > +++ b/src/acpica/source/components/executer/exconfig.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -244,6 +244,7 @@ AcpiExLoadTableOp ( > ACPI_NAMESPACE_NODE *ParentNode; > ACPI_NAMESPACE_NODE *StartNode; > ACPI_NAMESPACE_NODE *ParameterNode = NULL; > + ACPI_OPERAND_OBJECT *ReturnObj; > ACPI_OPERAND_OBJECT *DdbHandle; > UINT32 TableIndex; > > @@ -251,6 +252,16 @@ AcpiExLoadTableOp ( > ACPI_FUNCTION_TRACE (ExLoadTableOp); > > > + /* Create the return object */ > + > + ReturnObj = AcpiUtCreateIntegerObject ((UINT64) 0); > + if (!ReturnObj) > + { > + return_ACPI_STATUS (AE_NO_MEMORY); > + } > + > + *ReturnDesc = ReturnObj; > + > /* Find the ACPI table in the RSDT/XSDT */ > > AcpiExExitInterpreter (); > @@ -268,13 +279,6 @@ AcpiExLoadTableOp ( > > /* Table not found, return an Integer=0 and AE_OK */ > > - DdbHandle = AcpiUtCreateIntegerObject ((UINT64) 0); > - if (!DdbHandle) > - { > - return_ACPI_STATUS (AE_NO_MEMORY); > - } > - > - *ReturnDesc = DdbHandle; > return_ACPI_STATUS (AE_OK); > } > > @@ -365,7 +369,13 @@ AcpiExLoadTableOp ( > } > } > > - *ReturnDesc = DdbHandle; > + /* Remove the reference to DdbHandle created by AcpiExAddTable above */ > + > + AcpiUtRemoveReference (DdbHandle); > + > + /* Return -1 (non-zero) indicates success */ > + > + ReturnObj->Integer.Value = 0xFFFFFFFFFFFFFFFF; > return_ACPI_STATUS (Status); > } > > @@ -423,7 +433,7 @@ AcpiExRegionRead ( > * > * PARAMETERS: ObjDesc - Region or Buffer/Field where the table will be > * obtained > - * Target - Where a handle to the table will be stored > + * Target - Where the status of the load will be stored > * WalkState - Current state > * > * RETURN: Status > @@ -455,6 +465,18 @@ AcpiExLoadOp ( > ACPI_FUNCTION_TRACE (ExLoadOp); > > > + if (Target->Common.DescriptorType == ACPI_DESC_TYPE_NAMED) > + { > + Target = AcpiNsGetAttachedObject (ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, Target)); > + } > + if (Target->Common.Type != ACPI_TYPE_INTEGER) > + { > + fprintf (stderr, "Type not integer: %X\n", Target->Common.Type); > + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); > + } > + > + Target->Integer.Value = 0; > + > /* Source Object can be either an OpRegion or a Buffer/Field */ > > switch (ObjDesc->Common.Type) > @@ -616,8 +638,6 @@ AcpiExLoadOp ( > Status = AcpiExAddTable (TableIndex, &DdbHandle); > if (ACPI_FAILURE (Status)) > { > - /* On error, TablePtr was deallocated above */ > - > return_ACPI_STATUS (Status); > } > > @@ -627,22 +647,13 @@ AcpiExLoadOp ( > AcpiNsInitializeObjects (); > AcpiExEnterInterpreter (); > > - /* Store the DdbHandle into the Target operand */ > + /* Remove the reference to DdbHandle created by AcpiExAddTable above */ > > - Status = AcpiExStore (DdbHandle, Target, WalkState); > - if (ACPI_FAILURE (Status)) > - { > - (void) AcpiExUnloadTable (DdbHandle); > - > - /* TablePtr was deallocated above */ > - > - AcpiUtRemoveReference (DdbHandle); > - return_ACPI_STATUS (Status); > - } > + AcpiUtRemoveReference (DdbHandle); > > - /* Remove the reference by added by AcpiExStore above */ > + /* Return -1 (non-zero) indicates success */ > > - AcpiUtRemoveReference (DdbHandle); > + Target->Integer.Value = 0xFFFFFFFFFFFFFFFF; > return_ACPI_STATUS (Status); > } > > diff --git a/src/acpica/source/components/executer/exconvrt.c b/src/acpica/source/components/executer/exconvrt.c > index 4f6077ff..c9572e90 100644 > --- a/src/acpica/source/components/executer/exconvrt.c > +++ b/src/acpica/source/components/executer/exconvrt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/excreate.c b/src/acpica/source/components/executer/excreate.c > index 18a3af2f..e8381081 100644 > --- a/src/acpica/source/components/executer/excreate.c > +++ b/src/acpica/source/components/executer/excreate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exdebug.c b/src/acpica/source/components/executer/exdebug.c > index 39fc7352..88f75966 100644 > --- a/src/acpica/source/components/executer/exdebug.c > +++ b/src/acpica/source/components/executer/exdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exdump.c b/src/acpica/source/components/executer/exdump.c > index b14cfe84..e72ac01f 100644 > --- a/src/acpica/source/components/executer/exdump.c > +++ b/src/acpica/source/components/executer/exdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exfield.c b/src/acpica/source/components/executer/exfield.c > index b33ab5b3..2834e7b3 100644 > --- a/src/acpica/source/components/executer/exfield.c > +++ b/src/acpica/source/components/executer/exfield.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exfldio.c b/src/acpica/source/components/executer/exfldio.c > index 6a5a5fe1..30d17c19 100644 > --- a/src/acpica/source/components/executer/exfldio.c > +++ b/src/acpica/source/components/executer/exfldio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -262,7 +262,7 @@ AcpiExSetupRegion ( > #ifdef ACPI_UNDER_DEVELOPMENT > /* > * If the Field access is AnyAcc, we can now compute the optimal > - * access (because we know know the length of the parent region) > + * access (because we know the length of the parent region) > */ > if (!(ObjDesc->Common.Flags & AOPOBJ_DATA_VALID)) > { > diff --git a/src/acpica/source/components/executer/exmisc.c b/src/acpica/source/components/executer/exmisc.c > index 220417b9..4a1e2ff2 100644 > --- a/src/acpica/source/components/executer/exmisc.c > +++ b/src/acpica/source/components/executer/exmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exmutex.c b/src/acpica/source/components/executer/exmutex.c > index 010f5bdd..8b335680 100644 > --- a/src/acpica/source/components/executer/exmutex.c > +++ b/src/acpica/source/components/executer/exmutex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exnames.c b/src/acpica/source/components/executer/exnames.c > index 02590728..6045bc6b 100644 > --- a/src/acpica/source/components/executer/exnames.c > +++ b/src/acpica/source/components/executer/exnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg1.c b/src/acpica/source/components/executer/exoparg1.c > index 424e1e99..2d9bbddf 100644 > --- a/src/acpica/source/components/executer/exoparg1.c > +++ b/src/acpica/source/components/executer/exoparg1.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -323,6 +323,7 @@ AcpiExOpcode_1A_0T_0R ( > } > > > +#ifdef _OBSOLETE_CODE /* Was originally used for Load() operator */ > /******************************************************************************* > * > * FUNCTION: AcpiExOpcode_1A_1T_0R > @@ -352,10 +353,12 @@ AcpiExOpcode_1A_1T_0R ( > > switch (WalkState->Opcode) > { > +#ifdef _OBSOLETE_CODE > case AML_LOAD_OP: > > Status = AcpiExLoadOp (Operand[0], Operand[1], WalkState); > break; > +#endif > > default: /* Unknown opcode */ > > @@ -370,7 +373,7 @@ Cleanup: > > return_ACPI_STATUS (Status); > } > - > +#endif > > /******************************************************************************* > * > @@ -382,6 +385,8 @@ Cleanup: > * > * DESCRIPTION: Execute opcode with one argument, one target, and a > * return value. > + * January 2022: Added Load operator, with new ACPI 6.4 > + * semantics. > * > ******************************************************************************/ > > @@ -411,6 +416,7 @@ AcpiExOpcode_1A_1T_1R ( > case AML_FIND_SET_LEFT_BIT_OP: > case AML_FIND_SET_RIGHT_BIT_OP: > case AML_FROM_BCD_OP: > + case AML_LOAD_OP: > case AML_TO_BCD_OP: > case AML_CONDITIONAL_REF_OF_OP: > > @@ -512,6 +518,18 @@ AcpiExOpcode_1A_1T_1R ( > } > break; > > + case AML_LOAD_OP: /* Result1 = Load (Operand[0], Result1) */ > + > + ReturnDesc->Integer.Value = 0; > + Status = AcpiExLoadOp (Operand[0], ReturnDesc, WalkState); > + if (ACPI_SUCCESS (Status)) > + { > + /* Return -1 (non-zero) indicates success */ > + > + ReturnDesc->Integer.Value = 0xFFFFFFFFFFFFFFFF; > + } > + break; > + > case AML_TO_BCD_OP: /* ToBcd (Operand, Result) */ > > ReturnDesc->Integer.Value = 0; > diff --git a/src/acpica/source/components/executer/exoparg2.c b/src/acpica/source/components/executer/exoparg2.c > index d1fc7c11..8b63d615 100644 > --- a/src/acpica/source/components/executer/exoparg2.c > +++ b/src/acpica/source/components/executer/exoparg2.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg3.c b/src/acpica/source/components/executer/exoparg3.c > index 02e73bd4..7b74d32e 100644 > --- a/src/acpica/source/components/executer/exoparg3.c > +++ b/src/acpica/source/components/executer/exoparg3.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exoparg6.c b/src/acpica/source/components/executer/exoparg6.c > index 23f8e295..5506b2c1 100644 > --- a/src/acpica/source/components/executer/exoparg6.c > +++ b/src/acpica/source/components/executer/exoparg6.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exprep.c b/src/acpica/source/components/executer/exprep.c > index c7b55c54..6d239d7a 100644 > --- a/src/acpica/source/components/executer/exprep.c > +++ b/src/acpica/source/components/executer/exprep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exregion.c b/src/acpica/source/components/executer/exregion.c > index cd1fa2eb..01d49065 100644 > --- a/src/acpica/source/components/executer/exregion.c > +++ b/src/acpica/source/components/executer/exregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresnte.c b/src/acpica/source/components/executer/exresnte.c > index 445a1b5e..6801b25b 100644 > --- a/src/acpica/source/components/executer/exresnte.c > +++ b/src/acpica/source/components/executer/exresnte.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresolv.c b/src/acpica/source/components/executer/exresolv.c > index 78b26041..af5202ab 100644 > --- a/src/acpica/source/components/executer/exresolv.c > +++ b/src/acpica/source/components/executer/exresolv.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exresop.c b/src/acpica/source/components/executer/exresop.c > index 619da90f..4abe9376 100644 > --- a/src/acpica/source/components/executer/exresop.c > +++ b/src/acpica/source/components/executer/exresop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exserial.c b/src/acpica/source/components/executer/exserial.c > index 776409db..4dfd6599 100644 > --- a/src/acpica/source/components/executer/exserial.c > +++ b/src/acpica/source/components/executer/exserial.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstore.c b/src/acpica/source/components/executer/exstore.c > index 79564db3..ba1a05d9 100644 > --- a/src/acpica/source/components/executer/exstore.c > +++ b/src/acpica/source/components/executer/exstore.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstoren.c b/src/acpica/source/components/executer/exstoren.c > index f43e67cd..df4a6f40 100644 > --- a/src/acpica/source/components/executer/exstoren.c > +++ b/src/acpica/source/components/executer/exstoren.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exstorob.c b/src/acpica/source/components/executer/exstorob.c > index 1ed93734..56d048a7 100644 > --- a/src/acpica/source/components/executer/exstorob.c > +++ b/src/acpica/source/components/executer/exstorob.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exsystem.c b/src/acpica/source/components/executer/exsystem.c > index cf10a5e7..62768bcf 100644 > --- a/src/acpica/source/components/executer/exsystem.c > +++ b/src/acpica/source/components/executer/exsystem.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -265,7 +265,7 @@ AcpiExSystemWaitMutex ( > * > * FUNCTION: AcpiExSystemDoStall > * > - * PARAMETERS: HowLong - The amount of time to stall, > + * PARAMETERS: HowLongUs - The amount of time to stall, > * in microseconds > * > * RETURN: Status > @@ -280,7 +280,7 @@ AcpiExSystemWaitMutex ( > > ACPI_STATUS > AcpiExSystemDoStall ( > - UINT32 HowLong) > + UINT32 HowLongUs) > { > ACPI_STATUS Status = AE_OK; > > @@ -288,21 +288,26 @@ AcpiExSystemDoStall ( > ACPI_FUNCTION_ENTRY (); > > > - if (HowLong > 255) /* 255 microseconds */ > + if (HowLongUs > 255) > { > /* > - * Longer than 255 usec, this is an error > + * Longer than 255 microseconds, this is an error > * > * (ACPI specifies 100 usec as max, but this gives some slack in > * order to support existing BIOSs) > */ > ACPI_ERROR ((AE_INFO, > - "Time parameter is too large (%u)", HowLong)); > + "Time parameter is too large (%u)", HowLongUs)); > Status = AE_AML_OPERAND_VALUE; > } > else > { > - AcpiOsStall (HowLong); > + if (HowLongUs > 100) > + { > + ACPI_WARNING ((AE_INFO, > + "Time parameter %u us > 100 us violating ACPI spec, please fix the firmware.", HowLongUs)); > + } > + AcpiOsStall (HowLongUs); > } > > return (Status); > @@ -313,7 +318,7 @@ AcpiExSystemDoStall ( > * > * FUNCTION: AcpiExSystemDoSleep > * > - * PARAMETERS: HowLong - The amount of time to sleep, > + * PARAMETERS: HowLongMs - The amount of time to sleep, > * in milliseconds > * > * RETURN: None > @@ -324,7 +329,7 @@ AcpiExSystemDoStall ( > > ACPI_STATUS > AcpiExSystemDoSleep ( > - UINT64 HowLong) > + UINT64 HowLongMs) > { > ACPI_FUNCTION_ENTRY (); > > @@ -333,16 +338,28 @@ AcpiExSystemDoSleep ( > > AcpiExExitInterpreter (); > > + /* > + * Warn users about excessive sleep times, so ASL code can be improved to > + * use polling or similar techniques. > + */ > + if (HowLongMs > 10) > + { > + ACPI_WARNING ((AE_INFO, > + "Firmware issue: Excessive sleep time (0x%8.8X%8.8X ms > 10 ms)" > + " in ACPI Control Method", > + ACPI_FORMAT_UINT64 (HowLongMs))); > + } > + > /* > * For compatibility with other ACPI implementations and to prevent > * accidental deep sleeps, limit the sleep time to something reasonable. > */ > - if (HowLong > ACPI_MAX_SLEEP) > + if (HowLongMs > ACPI_MAX_SLEEP) > { > - HowLong = ACPI_MAX_SLEEP; > + HowLongMs = ACPI_MAX_SLEEP; > } > > - AcpiOsSleep (HowLong); > + AcpiOsSleep (HowLongMs); > > /* And now we must get the interpreter again */ > > diff --git a/src/acpica/source/components/executer/extrace.c b/src/acpica/source/components/executer/extrace.c > index 22c2b8bb..a677393f 100644 > --- a/src/acpica/source/components/executer/extrace.c > +++ b/src/acpica/source/components/executer/extrace.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/executer/exutils.c b/src/acpica/source/components/executer/exutils.c > index 86114c8e..e27f567b 100644 > --- a/src/acpica/source/components/executer/exutils.c > +++ b/src/acpica/source/components/executer/exutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwacpi.c b/src/acpica/source/components/hardware/hwacpi.c > index 71b71cbc..8b322209 100644 > --- a/src/acpica/source/components/hardware/hwacpi.c > +++ b/src/acpica/source/components/hardware/hwacpi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwesleep.c b/src/acpica/source/components/hardware/hwesleep.c > index 19463e5a..85e4cb95 100644 > --- a/src/acpica/source/components/hardware/hwesleep.c > +++ b/src/acpica/source/components/hardware/hwesleep.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwgpe.c b/src/acpica/source/components/hardware/hwgpe.c > index bf333a3f..7f9a5f05 100644 > --- a/src/acpica/source/components/hardware/hwgpe.c > +++ b/src/acpica/source/components/hardware/hwgpe.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwpci.c b/src/acpica/source/components/hardware/hwpci.c > index 1b0721e3..b8e8aa9f 100644 > --- a/src/acpica/source/components/hardware/hwpci.c > +++ b/src/acpica/source/components/hardware/hwpci.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwregs.c b/src/acpica/source/components/hardware/hwregs.c > index 712a0887..7b4ae88a 100644 > --- a/src/acpica/source/components/hardware/hwregs.c > +++ b/src/acpica/source/components/hardware/hwregs.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -633,7 +633,7 @@ AcpiHwGetBitRegisterInfo ( > * RETURN: Status > * > * DESCRIPTION: Write the PM1 A/B control registers. These registers are > - * different than than the PM1 A/B status and enable registers > + * different than the PM1 A/B status and enable registers > * in that different values can be written to the A/B registers. > * Most notably, the SLP_TYP bits can be different, as per the > * values returned from the _Sx predefined methods. > diff --git a/src/acpica/source/components/hardware/hwsleep.c b/src/acpica/source/components/hardware/hwsleep.c > index 4d581da3..45ff336a 100644 > --- a/src/acpica/source/components/hardware/hwsleep.c > +++ b/src/acpica/source/components/hardware/hwsleep.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwvalid.c b/src/acpica/source/components/hardware/hwvalid.c > index 96b5ac7e..d297905b 100644 > --- a/src/acpica/source/components/hardware/hwvalid.c > +++ b/src/acpica/source/components/hardware/hwvalid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwxface.c b/src/acpica/source/components/hardware/hwxface.c > index 5daed99a..8fd3561a 100644 > --- a/src/acpica/source/components/hardware/hwxface.c > +++ b/src/acpica/source/components/hardware/hwxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/hardware/hwxfsleep.c b/src/acpica/source/components/hardware/hwxfsleep.c > index 106dea0d..5f8b7db0 100644 > --- a/src/acpica/source/components/hardware/hwxfsleep.c > +++ b/src/acpica/source/components/hardware/hwxfsleep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsaccess.c b/src/acpica/source/components/namespace/nsaccess.c > index 4286223e..2b810fac 100644 > --- a/src/acpica/source/components/namespace/nsaccess.c > +++ b/src/acpica/source/components/namespace/nsaccess.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsalloc.c b/src/acpica/source/components/namespace/nsalloc.c > index 1deb87c6..560f6f36 100644 > --- a/src/acpica/source/components/namespace/nsalloc.c > +++ b/src/acpica/source/components/namespace/nsalloc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsarguments.c b/src/acpica/source/components/namespace/nsarguments.c > index fe511565..2da06f2f 100644 > --- a/src/acpica/source/components/namespace/nsarguments.c > +++ b/src/acpica/source/components/namespace/nsarguments.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsconvert.c b/src/acpica/source/components/namespace/nsconvert.c > index 7d68386d..2971f08e 100644 > --- a/src/acpica/source/components/namespace/nsconvert.c > +++ b/src/acpica/source/components/namespace/nsconvert.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsdump.c b/src/acpica/source/components/namespace/nsdump.c > index 63a449ab..36cfbdf6 100644 > --- a/src/acpica/source/components/namespace/nsdump.c > +++ b/src/acpica/source/components/namespace/nsdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsdumpdv.c b/src/acpica/source/components/namespace/nsdumpdv.c > index 55ab899d..0cc9b5a5 100644 > --- a/src/acpica/source/components/namespace/nsdumpdv.c > +++ b/src/acpica/source/components/namespace/nsdumpdv.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nseval.c b/src/acpica/source/components/namespace/nseval.c > index 1b80202b..1cb07615 100644 > --- a/src/acpica/source/components/namespace/nseval.c > +++ b/src/acpica/source/components/namespace/nseval.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsinit.c b/src/acpica/source/components/namespace/nsinit.c > index cc15644f..c523035f 100644 > --- a/src/acpica/source/components/namespace/nsinit.c > +++ b/src/acpica/source/components/namespace/nsinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsload.c b/src/acpica/source/components/namespace/nsload.c > index 0a368ab3..c3423e55 100644 > --- a/src/acpica/source/components/namespace/nsload.c > +++ b/src/acpica/source/components/namespace/nsload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsnames.c b/src/acpica/source/components/namespace/nsnames.c > index 4c0f6991..c8412c2e 100644 > --- a/src/acpica/source/components/namespace/nsnames.c > +++ b/src/acpica/source/components/namespace/nsnames.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsobject.c b/src/acpica/source/components/namespace/nsobject.c > index 529d816f..82d735eb 100644 > --- a/src/acpica/source/components/namespace/nsobject.c > +++ b/src/acpica/source/components/namespace/nsobject.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsparse.c b/src/acpica/source/components/namespace/nsparse.c > index 5f7973aa..0ac5efb4 100644 > --- a/src/acpica/source/components/namespace/nsparse.c > +++ b/src/acpica/source/components/namespace/nsparse.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nspredef.c b/src/acpica/source/components/namespace/nspredef.c > index 410eaeb0..e28d6896 100644 > --- a/src/acpica/source/components/namespace/nspredef.c > +++ b/src/acpica/source/components/namespace/nspredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsprepkg.c b/src/acpica/source/components/namespace/nsprepkg.c > index e56bcb5d..e6959dac 100644 > --- a/src/acpica/source/components/namespace/nsprepkg.c > +++ b/src/acpica/source/components/namespace/nsprepkg.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsrepair.c b/src/acpica/source/components/namespace/nsrepair.c > index 24094714..59f7aa33 100644 > --- a/src/acpica/source/components/namespace/nsrepair.c > +++ b/src/acpica/source/components/namespace/nsrepair.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsrepair2.c b/src/acpica/source/components/namespace/nsrepair2.c > index 40f0634d..bf76b7dd 100644 > --- a/src/acpica/source/components/namespace/nsrepair2.c > +++ b/src/acpica/source/components/namespace/nsrepair2.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nssearch.c b/src/acpica/source/components/namespace/nssearch.c > index 408a38e6..706963c4 100644 > --- a/src/acpica/source/components/namespace/nssearch.c > +++ b/src/acpica/source/components/namespace/nssearch.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsutils.c b/src/acpica/source/components/namespace/nsutils.c > index 1ce7fe40..f4208179 100644 > --- a/src/acpica/source/components/namespace/nsutils.c > +++ b/src/acpica/source/components/namespace/nsutils.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nswalk.c b/src/acpica/source/components/namespace/nswalk.c > index 50c5ed5b..3d0fc639 100644 > --- a/src/acpica/source/components/namespace/nswalk.c > +++ b/src/acpica/source/components/namespace/nswalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -322,6 +322,10 @@ AcpiNsWalkNamespace ( > if (StartNode == ACPI_ROOT_OBJECT) > { > StartNode = AcpiGbl_RootNode; > + if (!StartNode) > + { > + return_ACPI_STATUS (AE_NO_NAMESPACE); > + } > } > > /* Null child means "get first node" */ > diff --git a/src/acpica/source/components/namespace/nsxfeval.c b/src/acpica/source/components/namespace/nsxfeval.c > index b067f6e8..9724d024 100644 > --- a/src/acpica/source/components/namespace/nsxfeval.c > +++ b/src/acpica/source/components/namespace/nsxfeval.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfname.c b/src/acpica/source/components/namespace/nsxfname.c > index 7a7393b6..7d52330f 100644 > --- a/src/acpica/source/components/namespace/nsxfname.c > +++ b/src/acpica/source/components/namespace/nsxfname.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/namespace/nsxfobj.c b/src/acpica/source/components/namespace/nsxfobj.c > index fb08e76f..2aa1fc17 100644 > --- a/src/acpica/source/components/namespace/nsxfobj.c > +++ b/src/acpica/source/components/namespace/nsxfobj.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psargs.c b/src/acpica/source/components/parser/psargs.c > index 895feba0..f510623e 100644 > --- a/src/acpica/source/components/parser/psargs.c > +++ b/src/acpica/source/components/parser/psargs.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psloop.c b/src/acpica/source/components/parser/psloop.c > index 478256f2..2b4c1f2a 100644 > --- a/src/acpica/source/components/parser/psloop.c > +++ b/src/acpica/source/components/parser/psloop.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psobject.c b/src/acpica/source/components/parser/psobject.c > index c0c3e965..18a32ef3 100644 > --- a/src/acpica/source/components/parser/psobject.c > +++ b/src/acpica/source/components/parser/psobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psopcode.c b/src/acpica/source/components/parser/psopcode.c > index 4f153303..540716af 100644 > --- a/src/acpica/source/components/parser/psopcode.c > +++ b/src/acpica/source/components/parser/psopcode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -375,7 +375,7 @@ const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES] = > /* 47 */ ACPI_OP ("Event", ARGP_EVENT_OP, ARGI_EVENT_OP, ACPI_TYPE_EVENT, AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE, AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED ), > /* 48 */ ACPI_OP ("CondRefOf", ARGP_COND_REF_OF_OP, ARGI_COND_REF_OF_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R), > /* 49 */ ACPI_OP ("CreateField", ARGP_CREATE_FIELD_OP, ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD, AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE | AML_DEFER | AML_FIELD | AML_CREATE), > -/* 4A */ ACPI_OP ("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R, AML_FLAGS_EXEC_1A_1T_0R), > +/* 4A */ ACPI_OP ("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R), > /* 4B */ ACPI_OP ("Stall", ARGP_STALL_OP, ARGI_STALL_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R), > /* 4C */ ACPI_OP ("Sleep", ARGP_SLEEP_OP, ARGI_SLEEP_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R), > /* 4D */ ACPI_OP ("Acquire", ARGP_ACQUIRE_OP, ARGI_ACQUIRE_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R), > diff --git a/src/acpica/source/components/parser/psopinfo.c b/src/acpica/source/components/parser/psopinfo.c > index 30447c78..fcb080ca 100644 > --- a/src/acpica/source/components/parser/psopinfo.c > +++ b/src/acpica/source/components/parser/psopinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psparse.c b/src/acpica/source/components/parser/psparse.c > index 3b2a3c4c..e0cd5915 100644 > --- a/src/acpica/source/components/parser/psparse.c > +++ b/src/acpica/source/components/parser/psparse.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psscope.c b/src/acpica/source/components/parser/psscope.c > index cbe575dc..269410a6 100644 > --- a/src/acpica/source/components/parser/psscope.c > +++ b/src/acpica/source/components/parser/psscope.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/pstree.c b/src/acpica/source/components/parser/pstree.c > index 7f92b773..92f62304 100644 > --- a/src/acpica/source/components/parser/pstree.c > +++ b/src/acpica/source/components/parser/pstree.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psutils.c b/src/acpica/source/components/parser/psutils.c > index 223f68db..a9ea3536 100644 > --- a/src/acpica/source/components/parser/psutils.c > +++ b/src/acpica/source/components/parser/psutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/pswalk.c b/src/acpica/source/components/parser/pswalk.c > index 0d5b78dd..31232fd4 100644 > --- a/src/acpica/source/components/parser/pswalk.c > +++ b/src/acpica/source/components/parser/pswalk.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/parser/psxface.c b/src/acpica/source/components/parser/psxface.c > index 102033fe..295da1af 100644 > --- a/src/acpica/source/components/parser/psxface.c > +++ b/src/acpica/source/components/parser/psxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsaddr.c b/src/acpica/source/components/resources/rsaddr.c > index 06f8c44a..93d45ca3 100644 > --- a/src/acpica/source/components/resources/rsaddr.c > +++ b/src/acpica/source/components/resources/rsaddr.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rscalc.c b/src/acpica/source/components/resources/rscalc.c > index 2e878e80..c966636b 100644 > --- a/src/acpica/source/components/resources/rscalc.c > +++ b/src/acpica/source/components/resources/rscalc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rscreate.c b/src/acpica/source/components/resources/rscreate.c > index 8443d752..6c230bce 100644 > --- a/src/acpica/source/components/resources/rscreate.c > +++ b/src/acpica/source/components/resources/rscreate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsdump.c b/src/acpica/source/components/resources/rsdump.c > index 44b552ad..e8f13724 100644 > --- a/src/acpica/source/components/resources/rsdump.c > +++ b/src/acpica/source/components/resources/rsdump.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsdumpinfo.c b/src/acpica/source/components/resources/rsdumpinfo.c > index 26f4993d..83b22caa 100644 > --- a/src/acpica/source/components/resources/rsdumpinfo.c > +++ b/src/acpica/source/components/resources/rsdumpinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsinfo.c b/src/acpica/source/components/resources/rsinfo.c > index 9687bfb4..b9d4df46 100644 > --- a/src/acpica/source/components/resources/rsinfo.c > +++ b/src/acpica/source/components/resources/rsinfo.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsio.c b/src/acpica/source/components/resources/rsio.c > index 4be6a7d1..29932623 100644 > --- a/src/acpica/source/components/resources/rsio.c > +++ b/src/acpica/source/components/resources/rsio.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsirq.c b/src/acpica/source/components/resources/rsirq.c > index 1a44bdbe..9a8fc18f 100644 > --- a/src/acpica/source/components/resources/rsirq.c > +++ b/src/acpica/source/components/resources/rsirq.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rslist.c b/src/acpica/source/components/resources/rslist.c > index 1867c0a9..fdd24688 100644 > --- a/src/acpica/source/components/resources/rslist.c > +++ b/src/acpica/source/components/resources/rslist.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsmemory.c b/src/acpica/source/components/resources/rsmemory.c > index e5562a04..e527bad7 100644 > --- a/src/acpica/source/components/resources/rsmemory.c > +++ b/src/acpica/source/components/resources/rsmemory.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsmisc.c b/src/acpica/source/components/resources/rsmisc.c > index f0f186b8..16c52134 100644 > --- a/src/acpica/source/components/resources/rsmisc.c > +++ b/src/acpica/source/components/resources/rsmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsserial.c b/src/acpica/source/components/resources/rsserial.c > index d505ea94..3075b4c4 100644 > --- a/src/acpica/source/components/resources/rsserial.c > +++ b/src/acpica/source/components/resources/rsserial.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsutils.c b/src/acpica/source/components/resources/rsutils.c > index 6aa28337..7110406f 100644 > --- a/src/acpica/source/components/resources/rsutils.c > +++ b/src/acpica/source/components/resources/rsutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/resources/rsxface.c b/src/acpica/source/components/resources/rsxface.c > index 3f055af4..d3aaf1d0 100644 > --- a/src/acpica/source/components/resources/rsxface.c > +++ b/src/acpica/source/components/resources/rsxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbdata.c b/src/acpica/source/components/tables/tbdata.c > index 6f3f7113..5e4f7ca7 100644 > --- a/src/acpica/source/components/tables/tbdata.c > +++ b/src/acpica/source/components/tables/tbdata.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbfadt.c b/src/acpica/source/components/tables/tbfadt.c > index ff00c2f2..7ae35f19 100644 > --- a/src/acpica/source/components/tables/tbfadt.c > +++ b/src/acpica/source/components/tables/tbfadt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbfind.c b/src/acpica/source/components/tables/tbfind.c > index 1bc21b3e..81ed2d97 100644 > --- a/src/acpica/source/components/tables/tbfind.c > +++ b/src/acpica/source/components/tables/tbfind.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbinstal.c b/src/acpica/source/components/tables/tbinstal.c > index f628b460..9253bd1d 100644 > --- a/src/acpica/source/components/tables/tbinstal.c > +++ b/src/acpica/source/components/tables/tbinstal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbprint.c b/src/acpica/source/components/tables/tbprint.c > index 5985abdb..0b53e737 100644 > --- a/src/acpica/source/components/tables/tbprint.c > +++ b/src/acpica/source/components/tables/tbprint.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbutils.c b/src/acpica/source/components/tables/tbutils.c > index 76d8ef3b..d2a30dc3 100644 > --- a/src/acpica/source/components/tables/tbutils.c > +++ b/src/acpica/source/components/tables/tbutils.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxface.c b/src/acpica/source/components/tables/tbxface.c > index d861d9e6..919ad138 100644 > --- a/src/acpica/source/components/tables/tbxface.c > +++ b/src/acpica/source/components/tables/tbxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxfload.c b/src/acpica/source/components/tables/tbxfload.c > index 9e90c91b..ddd9b795 100644 > --- a/src/acpica/source/components/tables/tbxfload.c > +++ b/src/acpica/source/components/tables/tbxfload.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/tables/tbxfroot.c b/src/acpica/source/components/tables/tbxfroot.c > index ed33c9b6..bb90f605 100644 > --- a/src/acpica/source/components/tables/tbxfroot.c > +++ b/src/acpica/source/components/tables/tbxfroot.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utaddress.c b/src/acpica/source/components/utilities/utaddress.c > index 92039cfa..5aa12832 100644 > --- a/src/acpica/source/components/utilities/utaddress.c > +++ b/src/acpica/source/components/utilities/utaddress.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utalloc.c b/src/acpica/source/components/utilities/utalloc.c > index 276a5319..aa06339c 100644 > --- a/src/acpica/source/components/utilities/utalloc.c > +++ b/src/acpica/source/components/utilities/utalloc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utascii.c b/src/acpica/source/components/utilities/utascii.c > index a375e44d..db238902 100644 > --- a/src/acpica/source/components/utilities/utascii.c > +++ b/src/acpica/source/components/utilities/utascii.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utbuffer.c b/src/acpica/source/components/utilities/utbuffer.c > index 214ff20b..2cf097bf 100644 > --- a/src/acpica/source/components/utilities/utbuffer.c > +++ b/src/acpica/source/components/utilities/utbuffer.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utcache.c b/src/acpica/source/components/utilities/utcache.c > index 4e5de96f..2ff1540c 100644 > --- a/src/acpica/source/components/utilities/utcache.c > +++ b/src/acpica/source/components/utilities/utcache.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utcopy.c b/src/acpica/source/components/utilities/utcopy.c > index 32941648..e725d55b 100644 > --- a/src/acpica/source/components/utilities/utcopy.c > +++ b/src/acpica/source/components/utilities/utcopy.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdebug.c b/src/acpica/source/components/utilities/utdebug.c > index 6d8ab27b..f789e686 100644 > --- a/src/acpica/source/components/utilities/utdebug.c > +++ b/src/acpica/source/components/utilities/utdebug.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdecode.c b/src/acpica/source/components/utilities/utdecode.c > index 11818b4f..2a49cbd8 100644 > --- a/src/acpica/source/components/utilities/utdecode.c > +++ b/src/acpica/source/components/utilities/utdecode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utdelete.c b/src/acpica/source/components/utilities/utdelete.c > index de114cb6..b36c4bb3 100644 > --- a/src/acpica/source/components/utilities/utdelete.c > +++ b/src/acpica/source/components/utilities/utdelete.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uterror.c b/src/acpica/source/components/utilities/uterror.c > index 51ce8d59..2aee4d54 100644 > --- a/src/acpica/source/components/utilities/uterror.c > +++ b/src/acpica/source/components/utilities/uterror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uteval.c b/src/acpica/source/components/utilities/uteval.c > index 9e30ee8d..f4ccea68 100644 > --- a/src/acpica/source/components/utilities/uteval.c > +++ b/src/acpica/source/components/utilities/uteval.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utexcep.c b/src/acpica/source/components/utilities/utexcep.c > index 4e7e3f55..279d33fc 100644 > --- a/src/acpica/source/components/utilities/utexcep.c > +++ b/src/acpica/source/components/utilities/utexcep.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utglobal.c b/src/acpica/source/components/utilities/utglobal.c > index 65189ff2..7de4a9c3 100644 > --- a/src/acpica/source/components/utilities/utglobal.c > +++ b/src/acpica/source/components/utilities/utglobal.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uthex.c b/src/acpica/source/components/utilities/uthex.c > index 5cbc8fa6..c64d3def 100644 > --- a/src/acpica/source/components/utilities/uthex.c > +++ b/src/acpica/source/components/utilities/uthex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utids.c b/src/acpica/source/components/utilities/utids.c > index 4ef4fcca..498338a1 100644 > --- a/src/acpica/source/components/utilities/utids.c > +++ b/src/acpica/source/components/utilities/utids.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utinit.c b/src/acpica/source/components/utilities/utinit.c > index 27f1e37b..0f2cf489 100644 > --- a/src/acpica/source/components/utilities/utinit.c > +++ b/src/acpica/source/components/utilities/utinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utlock.c b/src/acpica/source/components/utilities/utlock.c > index a1501189..9357279b 100644 > --- a/src/acpica/source/components/utilities/utlock.c > +++ b/src/acpica/source/components/utilities/utlock.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmath.c b/src/acpica/source/components/utilities/utmath.c > index 2580cb6e..b534bb3e 100644 > --- a/src/acpica/source/components/utilities/utmath.c > +++ b/src/acpica/source/components/utilities/utmath.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmisc.c b/src/acpica/source/components/utilities/utmisc.c > index f2db74e8..1efe0afc 100644 > --- a/src/acpica/source/components/utilities/utmisc.c > +++ b/src/acpica/source/components/utilities/utmisc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utmutex.c b/src/acpica/source/components/utilities/utmutex.c > index b723f5b2..1f1c1d82 100644 > --- a/src/acpica/source/components/utilities/utmutex.c > +++ b/src/acpica/source/components/utilities/utmutex.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utnonansi.c b/src/acpica/source/components/utilities/utnonansi.c > index cf3763bc..e3c2f460 100644 > --- a/src/acpica/source/components/utilities/utnonansi.c > +++ b/src/acpica/source/components/utilities/utnonansi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utobject.c b/src/acpica/source/components/utilities/utobject.c > index 8b3dcd5f..52e02beb 100644 > --- a/src/acpica/source/components/utilities/utobject.c > +++ b/src/acpica/source/components/utilities/utobject.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utosi.c b/src/acpica/source/components/utilities/utosi.c > index 756ca35c..700f30a6 100644 > --- a/src/acpica/source/components/utilities/utosi.c > +++ b/src/acpica/source/components/utilities/utosi.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -221,6 +221,7 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] = > {"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5}, /* Windows 10 version 1809 - Added 11/2018 */ > {"Windows 2019", NULL, 0, ACPI_OSI_WIN_10_19H1}, /* Windows 10 version 1903 - Added 08/2019 */ > {"Windows 2020", NULL, 0, ACPI_OSI_WIN_10_20H1}, /* Windows 10 version 2004 - Added 08/2021 */ > + {"Windows 2021", NULL, 0, ACPI_OSI_WIN_11}, /* Windows 11 - Added 01/2022 */ > > /* Feature Group Strings */ > > diff --git a/src/acpica/source/components/utilities/utownerid.c b/src/acpica/source/components/utilities/utownerid.c > index 2bea3e57..30ba6b75 100644 > --- a/src/acpica/source/components/utilities/utownerid.c > +++ b/src/acpica/source/components/utilities/utownerid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utpredef.c b/src/acpica/source/components/utilities/utpredef.c > index c9a830c2..7f97ee7c 100644 > --- a/src/acpica/source/components/utilities/utpredef.c > +++ b/src/acpica/source/components/utilities/utpredef.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utresdecode.c b/src/acpica/source/components/utilities/utresdecode.c > index 561240f0..12ab6875 100644 > --- a/src/acpica/source/components/utilities/utresdecode.c > +++ b/src/acpica/source/components/utilities/utresdecode.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utresrc.c b/src/acpica/source/components/utilities/utresrc.c > index 70e5119e..26c382d8 100644 > --- a/src/acpica/source/components/utilities/utresrc.c > +++ b/src/acpica/source/components/utilities/utresrc.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstate.c b/src/acpica/source/components/utilities/utstate.c > index ac85c002..f089ffea 100644 > --- a/src/acpica/source/components/utilities/utstate.c > +++ b/src/acpica/source/components/utilities/utstate.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstring.c b/src/acpica/source/components/utilities/utstring.c > index 5218ebab..5af4c4d3 100644 > --- a/src/acpica/source/components/utilities/utstring.c > +++ b/src/acpica/source/components/utilities/utstring.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstrsuppt.c b/src/acpica/source/components/utilities/utstrsuppt.c > index f2a02eab..0487a4f6 100644 > --- a/src/acpica/source/components/utilities/utstrsuppt.c > +++ b/src/acpica/source/components/utilities/utstrsuppt.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utstrtoul64.c b/src/acpica/source/components/utilities/utstrtoul64.c > index 6a121c73..1ef50eac 100644 > --- a/src/acpica/source/components/utilities/utstrtoul64.c > +++ b/src/acpica/source/components/utilities/utstrtoul64.c > @@ -9,7 +9,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/uttrack.c b/src/acpica/source/components/utilities/uttrack.c > index b7928b15..7791fe9b 100644 > --- a/src/acpica/source/components/utilities/uttrack.c > +++ b/src/acpica/source/components/utilities/uttrack.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utuuid.c b/src/acpica/source/components/utilities/utuuid.c > index 299353cc..8fd85d62 100644 > --- a/src/acpica/source/components/utilities/utuuid.c > +++ b/src/acpica/source/components/utilities/utuuid.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxface.c b/src/acpica/source/components/utilities/utxface.c > index 227d18ca..74a8ff48 100644 > --- a/src/acpica/source/components/utilities/utxface.c > +++ b/src/acpica/source/components/utilities/utxface.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxferror.c b/src/acpica/source/components/utilities/utxferror.c > index 0c6b1c76..77701dfe 100644 > --- a/src/acpica/source/components/utilities/utxferror.c > +++ b/src/acpica/source/components/utilities/utxferror.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/components/utilities/utxfinit.c b/src/acpica/source/components/utilities/utxfinit.c > index 15756cb7..865fe9d2 100644 > --- a/src/acpica/source/components/utilities/utxfinit.c > +++ b/src/acpica/source/components/utilities/utxfinit.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acapps.h b/src/acpica/source/include/acapps.h > index 3f1833c5..382ab170 100644 > --- a/src/acpica/source/include/acapps.h > +++ b/src/acpica/source/include/acapps.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -159,7 +159,7 @@ > /* Common info for tool signons */ > > #define ACPICA_NAME "Intel ACPI Component Architecture" > -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2021 Intel Corporation" > +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2022 Intel Corporation" > > #if ACPI_MACHINE_WIDTH == 64 > #define ACPI_WIDTH " (64-bit version)" > diff --git a/src/acpica/source/include/acbuffer.h b/src/acpica/source/include/acbuffer.h > index 1576afa6..0739feb5 100644 > --- a/src/acpica/source/include/acbuffer.h > +++ b/src/acpica/source/include/acbuffer.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/accommon.h b/src/acpica/source/include/accommon.h > index 4ef3f5bc..210035cd 100644 > --- a/src/acpica/source/include/accommon.h > +++ b/src/acpica/source/include/accommon.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acconfig.h b/src/acpica/source/include/acconfig.h > index a5808526..8ba7dc28 100644 > --- a/src/acpica/source/include/acconfig.h > +++ b/src/acpica/source/include/acconfig.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acconvert.h b/src/acpica/source/include/acconvert.h > index b654b18b..048fd53e 100644 > --- a/src/acpica/source/include/acconvert.h > +++ b/src/acpica/source/include/acconvert.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdebug.h b/src/acpica/source/include/acdebug.h > index 434745d1..6716a094 100644 > --- a/src/acpica/source/include/acdebug.h > +++ b/src/acpica/source/include/acdebug.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acdisasm.h b/src/acpica/source/include/acdisasm.h > index 17d70d4e..352417cb 100644 > --- a/src/acpica/source/include/acdisasm.h > +++ b/src/acpica/source/include/acdisasm.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -206,6 +206,7 @@ typedef enum > ACPI_DMT_FLAGS0, > ACPI_DMT_FLAGS1, > ACPI_DMT_FLAGS2, > + ACPI_DMT_FLAGS8_2, > ACPI_DMT_FLAGS4, > ACPI_DMT_FLAGS4_0, > ACPI_DMT_FLAGS4_4, > @@ -388,6 +389,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoAestGicError[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoAestXface[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoAestXrupt[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoAgdi[]; > +extern ACPI_DMTABLE_INFO AcpiDmTableInfoApmtNode[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf0[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf1[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf1a[]; > @@ -402,6 +404,8 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoBert[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoBgrt[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedtHdr[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedt0[]; > +extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1[]; > +extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1_te[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoCpep[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoCpep0[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoCsrt0[]; > @@ -423,6 +427,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar1[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar2[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar3[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[]; > +extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar5[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoDrtm[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoDrtm0[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoDrtm0a[]; > @@ -529,6 +534,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt13[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt14[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt15[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[]; > +extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadtHdr[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoMcfg[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoMcfg0[]; > @@ -571,7 +577,6 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt6b[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7a[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7b[]; > -extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt8[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt9[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoPhatHdr[]; > extern ACPI_DMTABLE_INFO AcpiDmTableInfoPhat0[]; > @@ -734,6 +739,10 @@ void > AcpiDmDumpAest ( > ACPI_TABLE_HEADER *Table); > > +void > +AcpiDmDumpApmt ( > + ACPI_TABLE_HEADER *Table); > + > void > AcpiDmDumpAsf ( > ACPI_TABLE_HEADER *Table); > diff --git a/src/acpica/source/include/acdispat.h b/src/acpica/source/include/acdispat.h > index 2047779f..2c44c9f1 100644 > --- a/src/acpica/source/include/acdispat.h > +++ b/src/acpica/source/include/acdispat.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acevents.h b/src/acpica/source/include/acevents.h > index dda14495..f8c5d776 100644 > --- a/src/acpica/source/include/acevents.h > +++ b/src/acpica/source/include/acevents.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acexcep.h b/src/acpica/source/include/acexcep.h > index 6312602e..92e94972 100644 > --- a/src/acpica/source/include/acexcep.h > +++ b/src/acpica/source/include/acexcep.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acglobal.h b/src/acpica/source/include/acglobal.h > index 35426865..b8831b46 100644 > --- a/src/acpica/source/include/acglobal.h > +++ b/src/acpica/source/include/acglobal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/achware.h b/src/acpica/source/include/achware.h > index 994e9767..256008c7 100644 > --- a/src/acpica/source/include/achware.h > +++ b/src/acpica/source/include/achware.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acinterp.h b/src/acpica/source/include/acinterp.h > index c6e27cc2..d9cec345 100644 > --- a/src/acpica/source/include/acinterp.h > +++ b/src/acpica/source/include/acinterp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/aclocal.h b/src/acpica/source/include/aclocal.h > index e4f46b88..74eb6e27 100644 > --- a/src/acpica/source/include/aclocal.h > +++ b/src/acpica/source/include/aclocal.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acmacros.h b/src/acpica/source/include/acmacros.h > index a7a79fc8..11fd47cc 100644 > --- a/src/acpica/source/include/acmacros.h > +++ b/src/acpica/source/include/acmacros.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acnames.h b/src/acpica/source/include/acnames.h > index 9075ca74..846d192b 100644 > --- a/src/acpica/source/include/acnames.h > +++ b/src/acpica/source/include/acnames.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acnamesp.h b/src/acpica/source/include/acnamesp.h > index 2edd99d7..7b8d069d 100644 > --- a/src/acpica/source/include/acnamesp.h > +++ b/src/acpica/source/include/acnamesp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acobject.h b/src/acpica/source/include/acobject.h > index 51a397f2..b2c9dd9b 100644 > --- a/src/acpica/source/include/acobject.h > +++ b/src/acpica/source/include/acobject.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acopcode.h b/src/acpica/source/include/acopcode.h > index 91cce057..7e54a47f 100644 > --- a/src/acpica/source/include/acopcode.h > +++ b/src/acpica/source/include/acopcode.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acoutput.h b/src/acpica/source/include/acoutput.h > index b72c9a94..cd3d26d5 100644 > --- a/src/acpica/source/include/acoutput.h > +++ b/src/acpica/source/include/acoutput.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acparser.h b/src/acpica/source/include/acparser.h > index 94674d8c..4437d612 100644 > --- a/src/acpica/source/include/acparser.h > +++ b/src/acpica/source/include/acparser.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpi.h b/src/acpica/source/include/acpi.h > index 0a50a443..081e3b7d 100644 > --- a/src/acpica/source/include/acpi.h > +++ b/src/acpica/source/include/acpi.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpiosxf.h b/src/acpica/source/include/acpiosxf.h > index af90cb9c..67c11013 100644 > --- a/src/acpica/source/include/acpiosxf.h > +++ b/src/acpica/source/include/acpiosxf.h > @@ -10,7 +10,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acpixf.h b/src/acpica/source/include/acpixf.h > index c07d0de2..f62c16cb 100644 > --- a/src/acpica/source/include/acpixf.h > +++ b/src/acpica/source/include/acpixf.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -154,7 +154,7 @@ > > /* Current ACPICA subsystem version in YYYYMMDD format */ > > -#define ACPI_CA_VERSION 0x20211217 > +#define ACPI_CA_VERSION 0x20220331 > > #include "acconfig.h" > #include "actypes.h" > diff --git a/src/acpica/source/include/acpredef.h b/src/acpica/source/include/acpredef.h > index bc55155c..9ad8c0ff 100644 > --- a/src/acpica/source/include/acpredef.h > +++ b/src/acpica/source/include/acpredef.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acresrc.h b/src/acpica/source/include/acresrc.h > index 816d4fa4..8214ed83 100644 > --- a/src/acpica/source/include/acresrc.h > +++ b/src/acpica/source/include/acresrc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acrestyp.h b/src/acpica/source/include/acrestyp.h > index 3c258de9..f045c200 100644 > --- a/src/acpica/source/include/acrestyp.h > +++ b/src/acpica/source/include/acrestyp.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acstruct.h b/src/acpica/source/include/acstruct.h > index c07a319d..d50c7a1b 100644 > --- a/src/acpica/source/include/acstruct.h > +++ b/src/acpica/source/include/acstruct.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actables.h b/src/acpica/source/include/actables.h > index d0845643..40b79a47 100644 > --- a/src/acpica/source/include/actables.h > +++ b/src/acpica/source/include/actables.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbinfo.h b/src/acpica/source/include/actbinfo.h > index 7402d97b..633f7349 100644 > --- a/src/acpica/source/include/actbinfo.h > +++ b/src/acpica/source/include/actbinfo.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -225,6 +225,7 @@ > #define ACPI_AEST4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_AEST_GIC,f) > #define ACPI_AEST0D_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_AEST_NODE_INTERFACE,f) > #define ACPI_AEST0E_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_AEST_NODE_INTERRUPT,f) > +#define ACPI_APMTN_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_APMT_NODE,f) > #define ACPI_ASF0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_INFO,f) > #define ACPI_ASF1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ALERT,f) > #define ACPI_ASF1a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ALERT_DATA,f) > @@ -234,6 +235,8 @@ > #define ACPI_ASF4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ADDRESS,f) > #define ACPI_CEDT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_HEADER, f) > #define ACPI_CEDT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_CHBS, f) > +#define ACPI_CEDT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_CFMWS, f) > +#define ACPI_CEDT1_TE_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_CFMWS_TARGET_ELEMENT, f) > #define ACPI_CPEP0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CPEP_POLLING,f) > #define ACPI_CSRT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CSRT_GROUP,f) > #define ACPI_CSRT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CSRT_SHARED_INFO,f) > @@ -245,6 +248,7 @@ > #define ACPI_DMAR2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ATSR,f) > #define ACPI_DMAR3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_RHSA,f) > #define ACPI_DMAR4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ANDD,f) > +#define ACPI_DMAR5_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_SATC,f) > #define ACPI_DRTM0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST,f) > #define ACPI_DRTM1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST,f) > #define ACPI_DRTM1a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DRTM_RESOURCE,f) > @@ -314,6 +318,7 @@ > #define ACPI_MADT14_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_REDISTRIBUTOR,f) > #define ACPI_MADT15_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_TRANSLATOR,f) > #define ACPI_MADT16_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_MULTIPROC_WAKEUP,f) > +#define ACPI_MADT17_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_OEM_DATA,f) > #define ACPI_MADTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f) > #define ACPI_MCFG0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MCFG_ALLOCATION,f) > #define ACPI_MPST0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MPST_POWER_NODE,f) > @@ -343,10 +348,8 @@ > #define ACPI_NHLT6_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_VENDOR_MIC_CONFIG,f) > #define ACPI_NHLT6A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_VENDOR_MIC_COUNT,f) > #define ACPI_NHLT6B_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_RENDER_FEEDBACK_DEVICE_SPECIFIC_CONFIG,f) > -#define ACPI_NHLT7_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_LINUX_SPECIFIC_COUNT,f) > -#define ACPI_NHLT7A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_LINUX_SPECIFIC_DATA,f) > -#define ACPI_NHLT7B_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_LINUX_SPECIFIC_DATA_B,f) > -#define ACPI_NHLT8_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_TABLE_TERMINATOR,f) > +#define ACPI_NHLT7_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_DEVICE_INFO_COUNT,f) > +#define ACPI_NHLT7A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_DEVICE_INFO,f) > #define ACPI_NHLT9_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_MIC_SNR_SENSITIVITY_EXTENSION,f) > #define ACPI_PCCT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PCCT_SUBSPACE,f) > #define ACPI_PCCT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PCCT_HW_REDUCED,f) > @@ -415,6 +418,7 @@ > #define ACPI_AEST0D_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_AEST_NODE_INTERFACE,f,o) > #define ACPI_AEST0E_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_AEST_NODE_INTERRUPT,f,o) > #define ACPI_AGDI_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_AGDI,f,o) > +#define ACPI_APMTN_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_APMT_NODE,f,o) > #define ACPI_BGRT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_BGRT,f,o) > #define ACPI_DRTM_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_DRTM,f,o) > #define ACPI_DRTM1a_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_DRTM_RESOURCE,f,o) > diff --git a/src/acpica/source/include/actbl.h b/src/acpica/source/include/actbl.h > index f70f1b59..f23080fb 100644 > --- a/src/acpica/source/include/actbl.h > +++ b/src/acpica/source/include/actbl.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actbl1.h b/src/acpica/source/include/actbl1.h > index 09e68293..3de78b0d 100644 > --- a/src/acpica/source/include/actbl1.h > +++ b/src/acpica/source/include/actbl1.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -574,17 +574,23 @@ typedef struct acpi_cedt_cfmws > > } ACPI_CEDT_CFMWS; > > +typedef struct acpi_cedt_cfmws_target_element > +{ > + UINT32 InterleaveTarget; > + > +} ACPI_CEDT_CFMWS_TARGET_ELEMENT; > + > /* Values for Interleave Arithmetic field above */ > > -#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0) > +#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0) > > /* Values for Restrictions field above */ > > -#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1) > -#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1) > -#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2) > -#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3) > -#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4) > +#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1) > +#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1) > +#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2) > +#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3) > +#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4) > > > /******************************************************************************* > @@ -847,7 +853,8 @@ enum AcpiDmarType > ACPI_DMAR_TYPE_ROOT_ATS = 2, > ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3, > ACPI_DMAR_TYPE_NAMESPACE = 4, > - ACPI_DMAR_TYPE_RESERVED = 5 /* 5 and greater are reserved */ > + ACPI_DMAR_TYPE_SATC = 5, > + ACPI_DMAR_TYPE_RESERVED = 6 /* 6 and greater are reserved */ > }; > > > @@ -962,6 +969,18 @@ typedef struct acpi_dmar_andd > } ACPI_DMAR_ANDD; > > > +/* 5: SoC Integrated Address Translation Cache (SATC) */ > + > +typedef struct acpi_dmar_satc > +{ > + ACPI_DMAR_HEADER Header; > + UINT8 Flags; > + UINT8 Reserved; > + UINT16 Segment; > + > +} ACPI_DMAR_SATC > + > +; > /******************************************************************************* > * > * DRTM - Dynamic Root of Trust for Measurement table > diff --git a/src/acpica/source/include/actbl2.h b/src/acpica/source/include/actbl2.h > index eaa2e243..3032c5e2 100644 > --- a/src/acpica/source/include/actbl2.h > +++ b/src/acpica/source/include/actbl2.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -169,6 +169,7 @@ > * the wrong signature. > */ > #define ACPI_SIG_AGDI "AGDI" /* Arm Generic Diagnostic Dump and Reset Device Interface */ > +#define ACPI_SIG_APMT "APMT" /* Arm Performance Monitoring Unit table */ > #define ACPI_SIG_BDAT "BDAT" /* BIOS Data ACPI Table */ > #define ACPI_SIG_IORT "IORT" /* IO Remapping Table */ > #define ACPI_SIG_IVRS "IVRS" /* I/O Virtualization Reporting Structure */ > @@ -424,6 +425,86 @@ typedef struct acpi_table_agdi > #define ACPI_AGDI_SIGNALING_MODE (1) > > > +/******************************************************************************* > + * > + * APMT - ARM Performance Monitoring Unit Table > + * > + * Conforms to: > + * ARM Performance Monitoring Unit Architecture 1.0 Platform Design Document > + * ARM DEN0117 v1.0 November 25, 2021 > + * > + ******************************************************************************/ > + > +typedef struct acpi_table_apmt { > + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ > +} ACPI_TABLE_APMT; > + > +#define ACPI_APMT_NODE_ID_LENGTH 4 > + > +/* > + * APMT subtables > + */ > +typedef struct acpi_apmt_node { > + UINT16 Length; > + UINT8 Flags; > + UINT8 Type; > + UINT32 Id; > + UINT64 InstPrimary; > + UINT32 InstSecondary; > + UINT64 BaseAddress0; > + UINT64 BaseAddress1; > + UINT32 OvflwIrq; > + UINT32 Reserved; > + UINT32 OvflwIrqFlags; > + UINT32 ProcAffinity; > + UINT32 ImplId; > +} ACPI_APMT_NODE; > + > +/* Masks for Flags field above */ > + > +#define ACPI_APMT_FLAGS_DUAL_PAGE (1<<0) > +#define ACPI_APMT_FLAGS_AFFINITY (1<<1) > +#define ACPI_APMT_FLAGS_ATOMIC (1<<2) > + > +/* Values for Flags dual page field above */ > + > +#define ACPI_APMT_FLAGS_DUAL_PAGE_NSUPP (0<<0) > +#define ACPI_APMT_FLAGS_DUAL_PAGE_SUPP (1<<0) > + > +/* Values for Flags processor affinity field above */ > +#define ACPI_APMT_FLAGS_AFFINITY_PROC (0<<1) > +#define ACPI_APMT_FLAGS_AFFINITY_PROC_CONTAINER (1<<1) > + > +/* Values for Flags 64-bit atomic field above */ > +#define ACPI_APMT_FLAGS_ATOMIC_NSUPP (0<<2) > +#define ACPI_APMT_FLAGS_ATOMIC_SUPP (1<<2) > + > +/* Values for Type field above */ > + > +enum acpi_apmt_node_type { > + ACPI_APMT_NODE_TYPE_MC = 0x00, > + ACPI_APMT_NODE_TYPE_SMMU = 0x01, > + ACPI_APMT_NODE_TYPE_PCIE_ROOT = 0x02, > + ACPI_APMT_NODE_TYPE_ACPI = 0x03, > + ACPI_APMT_NODE_TYPE_CACHE = 0x04, > + ACPI_APMT_NODE_TYPE_COUNT > +}; > + > +/* Masks for ovflw_irq_flags field above */ > + > +#define ACPI_APMT_OVFLW_IRQ_FLAGS_MODE (1<<0) > +#define ACPI_APMT_OVFLW_IRQ_FLAGS_TYPE (1<<1) > + > +/* Values for ovflw_irq_flags mode field above */ > + > +#define ACPI_APMT_OVFLW_IRQ_FLAGS_MODE_LEVEL (0<<0) > +#define ACPI_APMT_OVFLW_IRQ_FLAGS_MODE_EDGE (1<<0) > + > +/* Values for ovflw_irq_flags type field above */ > + > +#define ACPI_APMT_OVFLW_IRQ_FLAGS_TYPE_WIRED (0<<1) > + > + > /******************************************************************************* > * > * BDAT - BIOS Data ACPI Table > @@ -446,7 +527,7 @@ typedef struct acpi_table_bdat > * IORT - IO Remapping Table > * > * Conforms to "IO Remapping Table System Software on ARM Platforms", > - * Document number: ARM DEN 0049E.b, Feb 2021 > + * Document number: ARM DEN 0049E.d, Feb 2022 > * > ******************************************************************************/ > > @@ -562,7 +643,8 @@ typedef struct acpi_iort_root_complex > UINT32 AtsAttribute; > UINT32 PciSegmentNumber; > UINT8 MemoryAddressLimit; /* Memory address size limit */ > - UINT8 Reserved[3]; /* Reserved, must be zero */ > + UINT16 PasidCapabilities; /* PASID Capabilities */ > + UINT8 Reserved[1]; /* Reserved, must be zero */ > > } ACPI_IORT_ROOT_COMPLEX; > > @@ -572,6 +654,8 @@ typedef struct acpi_iort_root_complex > #define ACPI_IORT_PRI_SUPPORTED (1<<1) /* The root complex PRI support */ > #define ACPI_IORT_PASID_FWD_SUPPORTED (1<<2) /* The root complex PASID forward support */ > > +/* Masks for PasidCapabilities field above */ > +#define ACPI_IORT_PASID_MAX_WIDTH (0x1F) /* Bits 0-4 */ > > typedef struct acpi_iort_smmu > { > @@ -658,6 +742,25 @@ typedef struct acpi_iort_rmr { > > } ACPI_IORT_RMR; > > +/* Masks for Flags field above */ > +#define ACPI_IORT_RMR_REMAP_PERMITTED (1) > +#define ACPI_IORT_RMR_ACCESS_PRIVILEGE (1<<1) > + > +/* > + * Macro to access the Access Attributes in flags field above: > + * Access Attributes is encoded in bits 9:2 > + */ > +#define ACPI_IORT_RMR_ACCESS_ATTRIBUTES(flags) (((flags) >> 2) & 0xFF) > + > +/* Values for above Access Attributes */ > + > +#define ACPI_IORT_RMR_ATTR_DEVICE_NGNRNE 0x00 > +#define ACPI_IORT_RMR_ATTR_DEVICE_NGNRE 0x01 > +#define ACPI_IORT_RMR_ATTR_DEVICE_NGRE 0x02 > +#define ACPI_IORT_RMR_ATTR_DEVICE_GRE 0x03 > +#define ACPI_IORT_RMR_ATTR_NORMAL_NC 0x04 > +#define ACPI_IORT_RMR_ATTR_NORMAL_IWB_OWB 0x05 > + > typedef struct acpi_iort_rmr_desc { > UINT64 BaseAddress; > UINT64 Length; > @@ -1004,7 +1107,8 @@ enum AcpiMadtType > ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14, > ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15, > ACPI_MADT_TYPE_MULTIPROC_WAKEUP = 16, > - ACPI_MADT_TYPE_RESERVED = 17 /* 17 and greater are reserved */ > + ACPI_MADT_TYPE_RESERVED = 17, /* 17 to 0x7F are reserved */ > + ACPI_MADT_TYPE_OEM_RESERVED = 0x80 /* 0x80 to 0xFF are reserved for OEM use */ > }; > > > @@ -1271,8 +1375,8 @@ typedef struct acpi_madt_multiproc_wakeup > > } ACPI_MADT_MULTIPROC_WAKEUP; > > -#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032 > -#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048 > +#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032 > +#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048 > > typedef struct acpi_madt_multiproc_wakeup_mailbox > { > @@ -1287,6 +1391,13 @@ typedef struct acpi_madt_multiproc_wakeup_mailbox > > #define ACPI_MP_WAKE_COMMAND_WAKEUP 1 > > +/* 17: OEM data */ > + > +typedef struct acpi_madt_oem_data > +{ > + UINT8 OemData[0]; > +} ACPI_MADT_OEM_DATA; > + > > /* > * Common flags fields for MADT subtables > @@ -2016,7 +2127,7 @@ typedef struct acpi_nhlt_mic_device_specific_config > > /* Values for ArrayTypeExt above */ > > -#define ACPI_NHLT_ARRAY_TYPE_RESERVED 0x09 // 9 and below are reserved > +#define ACPI_NHLT_ARRAY_TYPE_RESERVED 0x09 /* 9 and below are reserved */ > #define ACPI_NHLT_SMALL_LINEAR_2ELEMENT 0x0A > #define ACPI_NHLT_BIG_LINEAR_2ELEMENT 0x0B > #define ACPI_NHLT_FIRST_GEOMETRY_LINEAR_4ELEMENT 0x0C > @@ -2039,17 +2150,17 @@ typedef struct acpi_nhlt_vendor_mic_config > { > UINT8 Type; > UINT8 Panel; > - UINT16 SpeakerPositionDistance; // mm > - UINT16 HorizontalOffset; // mm > - UINT16 VerticalOffset; // mm > - UINT8 FrequencyLowBand; // 5*Hz > - UINT8 FrequencyHighBand; // 500*Hz > - UINT16 DirectionAngle; // -180 - + 180 > - UINT16 ElevationAngle; // -180 - + 180 > - UINT16 WorkVerticalAngleBegin; // -180 - + 180 with 2 deg step > - UINT16 WorkVerticalAngleEnd; // -180 - + 180 with 2 deg step > - UINT16 WorkHorizontalAngleBegin; // -180 - + 180 with 2 deg step > - UINT16 WorkHorizontalAngleEnd; // -180 - + 180 with 2 deg step > + UINT16 SpeakerPositionDistance; /* mm */ > + UINT16 HorizontalOffset; /* mm */ > + UINT16 VerticalOffset; /* mm */ > + UINT8 FrequencyLowBand; /* 5*Hz */ > + UINT8 FrequencyHighBand; /* 500*Hz */ > + UINT16 DirectionAngle; /* -180 - + 180 */ > + UINT16 ElevationAngle; /* -180 - + 180 */ > + UINT16 WorkVerticalAngleBegin; /* -180 - + 180 with 2 deg step */ > + UINT16 WorkVerticalAngleEnd; /* -180 - + 180 with 2 deg step */ > + UINT16 WorkHorizontalAngleBegin; /* -180 - + 180 with 2 deg step */ > + UINT16 WorkHorizontalAngleEnd; /* -180 - + 180 with 2 deg step */ > > } ACPI_NHLT_VENDOR_MIC_CONFIG; > > @@ -2061,9 +2172,9 @@ typedef struct acpi_nhlt_vendor_mic_config > #define ACPI_NHLT_MIC_SUPER_CARDIOID 3 > #define ACPI_NHLT_MIC_HYPER_CARDIOID 4 > #define ACPI_NHLT_MIC_8_SHAPED 5 > -#define ACPI_NHLT_MIC_RESERVED6 6 // 6 is reserved > +#define ACPI_NHLT_MIC_RESERVED6 6 /* 6 is reserved */ > #define ACPI_NHLT_MIC_VENDOR_DEFINED 7 > -#define ACPI_NHLT_MIC_RESERVED 8 // 8 and above are reserved > +#define ACPI_NHLT_MIC_RESERVED 8 /* 8 and above are reserved */ > > /* Values for Panel field above */ > > @@ -2073,13 +2184,13 @@ typedef struct acpi_nhlt_vendor_mic_config > #define ACPI_NHLT_MIC_POSITION_RIGHT 3 > #define ACPI_NHLT_MIC_POSITION_FRONT 4 > #define ACPI_NHLT_MIC_POSITION_BACK 5 > -#define ACPI_NHLT_MIC_POSITION_RESERVED 6 // 6 and above are reserved > +#define ACPI_NHLT_MIC_POSITION_RESERVED 6 /* 6 and above are reserved */ > > typedef struct acpi_nhlt_vendor_mic_device_specific_config > { > ACPI_NHLT_MIC_DEVICE_SPECIFIC_CONFIG MicArrayDeviceConfig; > UINT8 NumberOfMicrophones; > - ACPI_NHLT_VENDOR_MIC_CONFIG MicConfig[]; // Indexed by NumberOfMicrophones > + ACPI_NHLT_VENDOR_MIC_CONFIG MicConfig[]; /* Indexed by NumberOfMicrophones */ > > } ACPI_NHLT_VENDOR_MIC_DEVICE_SPECIFIC_CONFIG; > > @@ -2096,40 +2207,27 @@ typedef struct acpi_nhlt_mic_snr_sensitivity_extension > > typedef struct acpi_nhlt_render_feedback_device_specific_config > { > - UINT8 FeedbackVirtualSlot; // Render slot in case of capture > - UINT16 FeedbackChannels; // Informative only > + UINT8 FeedbackVirtualSlot; /* Render slot in case of capture */ > + UINT16 FeedbackChannels; /* Informative only */ > UINT16 FeedbackValidBitsPerSample; > > } ACPI_NHLT_RENDER_FEEDBACK_DEVICE_SPECIFIC_CONFIG; > > -/* Linux-specific structures */ > +/* Non documented structures */ > > -typedef struct acpi_nhlt_linux_specific_count > +typedef struct acpi_nhlt_device_info_count > { > UINT8 StructureCount; > > -} ACPI_NHLT_LINUX_SPECIFIC_COUNT; > +} ACPI_NHLT_DEVICE_INFO_COUNT; > > -typedef struct acpi_nhlt_linux_specific_data > +typedef struct acpi_nhlt_device_info > { > UINT8 DeviceId[16]; > UINT8 DeviceInstanceId; > UINT8 DevicePortId; > > -} ACPI_NHLT_LINUX_SPECIFIC_DATA; > - > -typedef struct acpi_nhlt_linux_specific_data_b > -{ > - UINT8 SpecificData[18]; > - > -} ACPI_NHLT_LINUX_SPECIFIC_DATA_B; > - > -typedef struct acpi_nhlt_table_terminator > -{ > - UINT32 TerminatorValue; > - UINT32 TerminatorSignature; > - > -} ACPI_NHLT_TABLE_TERMINATOR; > +} ACPI_NHLT_DEVICE_INFO; > > > /******************************************************************************* > @@ -2707,8 +2805,8 @@ typedef struct acpi_table_prmt_header > > typedef struct acpi_prmt_module_header > { > - UINT16 Revision; > - UINT16 Length; > + UINT16 Revision; > + UINT16 Length; > > } ACPI_PRMT_MODULE_HEADER; > > @@ -2862,7 +2960,7 @@ typedef struct acpi_table_rgrt > UINT16 Version; > UINT8 ImageType; > UINT8 Reserved; > - UINT8 Image[0]; > + UINT8 Image[]; > > } ACPI_TABLE_RGRT; > > diff --git a/src/acpica/source/include/actbl3.h b/src/acpica/source/include/actbl3.h > index 40cf7130..7cc633a2 100644 > --- a/src/acpica/source/include/actbl3.h > +++ b/src/acpica/source/include/actbl3.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/actypes.h b/src/acpica/source/include/actypes.h > index 6805b48f..99588f67 100644 > --- a/src/acpica/source/include/actypes.h > +++ b/src/acpica/source/include/actypes.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -658,8 +658,12 @@ typedef UINT64 ACPI_INTEGER; > /* Pointer/Integer type conversions */ > > #define ACPI_TO_POINTER(i) ACPI_CAST_PTR (void, (ACPI_SIZE) (i)) > +#ifndef ACPI_TO_INTEGER > #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0) > +#endif > +#ifndef ACPI_OFFSET > #define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0) > +#endif > #define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i) > > /* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */ > @@ -686,14 +690,14 @@ typedef UINT64 ACPI_INTEGER; > * Can be used with AccessSize field of ACPI_GENERIC_ADDRESS and > * ACPI_RESOURCE_GENERIC_REGISTER. > */ > -#define ACPI_ACCESS_BIT_SHIFT 2 > -#define ACPI_ACCESS_BYTE_SHIFT -1 > -#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT) > -#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT) > -#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT) > -#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT) > -#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT)) > -#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT)) > +#define ACPI_ACCESS_BIT_SHIFT 2 > +#define ACPI_ACCESS_BYTE_SHIFT -1 > +#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT) > +#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT) > +#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT) > +#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT) > +#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT)) > +#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT)) > > /******************************************************************************* > * > @@ -1550,6 +1554,7 @@ typedef enum > #define ACPI_OSI_WIN_10_RS5 0x13 > #define ACPI_OSI_WIN_10_19H1 0x14 > #define ACPI_OSI_WIN_10_20H1 0x15 > +#define ACPI_OSI_WIN_11 0x16 > > > /* Definitions of getopt */ > diff --git a/src/acpica/source/include/acutils.h b/src/acpica/source/include/acutils.h > index 791b7d9c..f23ee559 100644 > --- a/src/acpica/source/include/acutils.h > +++ b/src/acpica/source/include/acutils.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/acuuid.h b/src/acpica/source/include/acuuid.h > index 48f4c9a1..bc41fa40 100644 > --- a/src/acpica/source/include/acuuid.h > +++ b/src/acpica/source/include/acuuid.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/amlcode.h b/src/acpica/source/include/amlcode.h > index f7ad22a1..25d591e5 100644 > --- a/src/acpica/source/include/amlcode.h > +++ b/src/acpica/source/include/amlcode.h > @@ -10,7 +10,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/amlresrc.h b/src/acpica/source/include/amlresrc.h > index a97a1c63..e89cd824 100644 > --- a/src/acpica/source/include/amlresrc.h > +++ b/src/acpica/source/include/amlresrc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acenv.h b/src/acpica/source/include/platform/acenv.h > index 740d4495..674c4c7d 100644 > --- a/src/acpica/source/include/platform/acenv.h > +++ b/src/acpica/source/include/platform/acenv.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acenvex.h b/src/acpica/source/include/platform/acenvex.h > index 42bb4901..32db36c6 100644 > --- a/src/acpica/source/include/platform/acenvex.h > +++ b/src/acpica/source/include/platform/acenvex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acgcc.h b/src/acpica/source/include/platform/acgcc.h > index 148190a3..3ad22a1f 100644 > --- a/src/acpica/source/include/platform/acgcc.h > +++ b/src/acpica/source/include/platform/acgcc.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/acgccex.h b/src/acpica/source/include/platform/acgccex.h > index 61d42852..035b999d 100644 > --- a/src/acpica/source/include/platform/acgccex.h > +++ b/src/acpica/source/include/platform/acgccex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/include/platform/aclinux.h b/src/acpica/source/include/platform/aclinux.h > index 17fd5113..1c55c659 100644 > --- a/src/acpica/source/include/platform/aclinux.h > +++ b/src/acpica/source/include/platform/aclinux.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -252,6 +252,11 @@ > #define ACPI_SPINLOCK spinlock_t * > #define ACPI_CPU_FLAGS unsigned long > > +#define ACPI_UINTPTR_T uintptr_t > + > +#define ACPI_TO_INTEGER(p) ((uintptr_t)(p)) > +#define ACPI_OFFSET(d, f) offsetof(d, f) > + > /* Use native linux version of AcpiOsAllocateZeroed */ > > #define USE_NATIVE_ALLOCATE_ZEROED > diff --git a/src/acpica/source/include/platform/aclinuxex.h b/src/acpica/source/include/platform/aclinuxex.h > index f88559d2..4e84cd4b 100644 > --- a/src/acpica/source/include/platform/aclinuxex.h > +++ b/src/acpica/source/include/platform/aclinuxex.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/os_specific/service_layers/osunixxf.c b/src/acpica/source/os_specific/service_layers/osunixxf.c > index 33fbb0ce..ef1651b6 100644 > --- a/src/acpica/source/os_specific/service_layers/osunixxf.c > +++ b/src/acpica/source/os_specific/service_layers/osunixxf.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aecommon.h b/src/acpica/source/tools/acpiexec/aecommon.h > index c325d8f3..7bfdd278 100644 > --- a/src/acpica/source/tools/acpiexec/aecommon.h > +++ b/src/acpica/source/tools/acpiexec/aecommon.h > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeexception.c b/src/acpica/source/tools/acpiexec/aeexception.c > index df35aa86..f0903c1f 100644 > --- a/src/acpica/source/tools/acpiexec/aeexception.c > +++ b/src/acpica/source/tools/acpiexec/aeexception.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > @@ -334,7 +334,7 @@ AeSignalHandler ( > SigintCount++; > if (SigintCount >= ACPI_MAX_CONTROL_C) > { > - exit (0); > + _exit (0); > } > > /* Abort the application if there are no methods executing */ > @@ -368,7 +368,7 @@ AeSignalHandler ( > > AcpiOsPrintf (AE_PREFIX "Terminating\n"); > (void) AcpiOsTerminate (); > - exit (0); > + _exit (0); > } > > > diff --git a/src/acpica/source/tools/acpiexec/aehandlers.c b/src/acpica/source/tools/acpiexec/aehandlers.c > index a1abdddd..9b12aa65 100644 > --- a/src/acpica/source/tools/acpiexec/aehandlers.c > +++ b/src/acpica/source/tools/acpiexec/aehandlers.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeinitfile.c b/src/acpica/source/tools/acpiexec/aeinitfile.c > index d568b50e..600f2c7d 100644 > --- a/src/acpica/source/tools/acpiexec/aeinitfile.c > +++ b/src/acpica/source/tools/acpiexec/aeinitfile.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeinstall.c b/src/acpica/source/tools/acpiexec/aeinstall.c > index 1d32443b..28d08d8a 100644 > --- a/src/acpica/source/tools/acpiexec/aeinstall.c > +++ b/src/acpica/source/tools/acpiexec/aeinstall.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License > diff --git a/src/acpica/source/tools/acpiexec/aeregion.c b/src/acpica/source/tools/acpiexec/aeregion.c > index decd17f7..400fd66e 100644 > --- a/src/acpica/source/tools/acpiexec/aeregion.c > +++ b/src/acpica/source/tools/acpiexec/aeregion.c > @@ -8,7 +8,7 @@ > * > * 1. Copyright Notice > * > - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. > + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. > * All rights reserved. > * > * 2. License Acked-by: Ivan Hu <ivan.hu@canonical.com>

diff --git a/src/acpica/source/common/acfileio.c b/src/acpica/source/common/acfileio.c index 3e26ac3f..7c624f5d 100644 --- a/src/acpica/source/common/acfileio.c +++ b/src/acpica/source/common/acfileio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/acgetline.c b/src/acpica/source/common/acgetline.c index 88479d61..e5d0bf56 100644 --- a/src/acpica/source/common/acgetline.c +++ b/src/acpica/source/common/acgetline.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/adfile.c b/src/acpica/source/common/adfile.c index db6bcabc..647333d9 100644 --- a/src/acpica/source/common/adfile.c +++ b/src/acpica/source/common/adfile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/adisasm.c b/src/acpica/source/common/adisasm.c index f549bd5a..ecb98485 100644 --- a/src/acpica/source/common/adisasm.c +++ b/src/acpica/source/common/adisasm.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/adwalk.c b/src/acpica/source/common/adwalk.c index c4d149e3..6d51c7e1 100644 --- a/src/acpica/source/common/adwalk.c +++ b/src/acpica/source/common/adwalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahids.c b/src/acpica/source/common/ahids.c index b58bc082..05c31bf5 100644 --- a/src/acpica/source/common/ahids.c +++ b/src/acpica/source/common/ahids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahpredef.c b/src/acpica/source/common/ahpredef.c index d92417d1..724abe6a 100644 --- a/src/acpica/source/common/ahpredef.c +++ b/src/acpica/source/common/ahpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahtable.c b/src/acpica/source/common/ahtable.c index def42520..bff8ae79 100644 --- a/src/acpica/source/common/ahtable.c +++ b/src/acpica/source/common/ahtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/ahuuids.c b/src/acpica/source/common/ahuuids.c index eef1c568..909698c5 100644 --- a/src/acpica/source/common/ahuuids.c +++ b/src/acpica/source/common/ahuuids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/cmfsize.c b/src/acpica/source/common/cmfsize.c index 38ec915a..474ccd95 100644 --- a/src/acpica/source/common/cmfsize.c +++ b/src/acpica/source/common/cmfsize.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmextern.c b/src/acpica/source/common/dmextern.c index 36d58600..806daa33 100644 --- a/src/acpica/source/common/dmextern.c +++ b/src/acpica/source/common/dmextern.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmrestag.c b/src/acpica/source/common/dmrestag.c index 59d5c4f4..b6772984 100644 --- a/src/acpica/source/common/dmrestag.c +++ b/src/acpica/source/common/dmrestag.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmswitch.c b/src/acpica/source/common/dmswitch.c index 2b894c65..4a434736 100644 --- a/src/acpica/source/common/dmswitch.c +++ b/src/acpica/source/common/dmswitch.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtable.c b/src/acpica/source/common/dmtable.c index 3137132a..440c5fb4 100644 --- a/src/acpica/source/common/dmtable.c +++ b/src/acpica/source/common/dmtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -248,6 +248,7 @@ static const char *AcpiDmDmarSubnames[] = "Root Port ATS Capability", "Remapping Hardware Static Affinity", "ACPI Namespace Device Declaration", + "SoC Integrated Address Translation Cache", "Unknown Subtable Type" /* Reserved */ }; @@ -402,7 +403,8 @@ static const char *AcpiDmMadtSubnames[] = "Generic Interrupt Redistributor", /* ACPI_MADT_GENERIC_REDISTRIBUTOR */ "Generic Interrupt Translator", /* ACPI_MADT_GENERIC_TRANSLATOR */ "Mutiprocessor Wakeup", /* ACPI_MADT_TYPE_MULTIPROC_WAKEUP */ - "Unknown Subtable Type" /* Reserved */ + "Unknown Subtable Type", /* Reserved */ + "Types 80-FF are used for OEM data" /* Reserved for OEM data */ }; static const char *AcpiDmNfitSubnames[] = @@ -650,6 +652,7 @@ const ACPI_DMTABLE_DATA AcpiDmTableData[] = { {ACPI_SIG_AEST, NULL, AcpiDmDumpAest, DtCompileAest, TemplateAest}, {ACPI_SIG_AGDI, AcpiDmTableInfoAgdi, NULL, NULL, TemplateAgdi}, + {ACPI_SIG_APMT, NULL, AcpiDmDumpApmt, DtCompileApmt, TemplateApmt}, {ACPI_SIG_ASF, NULL, AcpiDmDumpAsf, DtCompileAsf, TemplateAsf}, {ACPI_SIG_BDAT, AcpiDmTableInfoBdat, NULL, NULL, TemplateBdat}, {ACPI_SIG_BERT, AcpiDmTableInfoBert, NULL, NULL, TemplateBert}, @@ -1361,7 +1364,12 @@ AcpiDmDumpTable ( AcpiOsPrintf ("%1.1X\n", (*Target >> 2) & 0x03); break; - case ACPI_DMT_FLAGS4: + case ACPI_DMT_FLAGS8_2: + + AcpiOsPrintf ("%2.2X\n", (*Target >> 2) & 0xFF); + break; + + case ACPI_DMT_FLAGS4: AcpiOsPrintf ("%1.1X\n", (*Target >> 4) & 0x03); break; @@ -1850,11 +1858,14 @@ AcpiDmDumpTable ( /* MADT subtable types */ Temp8 = *Target; - if (Temp8 > ACPI_MADT_TYPE_RESERVED) + if ((Temp8 >= ACPI_MADT_TYPE_RESERVED) && (Temp8 < ACPI_MADT_TYPE_OEM_RESERVED)) { Temp8 = ACPI_MADT_TYPE_RESERVED; } - + else if (Temp8 >= ACPI_MADT_TYPE_OEM_RESERVED) + { + Temp8 = ACPI_MADT_TYPE_RESERVED + 1; + } AcpiOsPrintf (UINT8_FORMAT, *Target, AcpiDmMadtSubnames[Temp8]); break; diff --git a/src/acpica/source/common/dmtables.c b/src/acpica/source/common/dmtables.c index fa04e0c8..6f42bcb3 100644 --- a/src/acpica/source/common/dmtables.c +++ b/src/acpica/source/common/dmtables.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtbdump.c b/src/acpica/source/common/dmtbdump.c index 86c90d67..b4faf683 100644 --- a/src/acpica/source/common/dmtbdump.c +++ b/src/acpica/source/common/dmtbdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtbdump1.c b/src/acpica/source/common/dmtbdump1.c index fd5e2fd9..13662611 100644 --- a/src/acpica/source/common/dmtbdump1.c +++ b/src/acpica/source/common/dmtbdump1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -376,6 +376,68 @@ AcpiDmDumpAest ( } } +/******************************************************************************* + * + * FUNCTION: AcpiDmDumpApmt + * + * PARAMETERS: Table - A APMT table + * + * RETURN: None + * + * DESCRIPTION: Format the contents of a APMT. This table type consists + * of an open-ended number of subtables. + * + * + * APMT - ARM Performance Monitoring Unit table. Conforms to: + * ARM Performance Monitoring Unit Architecture 1.0 Platform Design Document + * ARM DEN0117 v1.0 November 25, 2021 + * + ******************************************************************************/ + +void +AcpiDmDumpApmt ( + ACPI_TABLE_HEADER *Table) +{ + ACPI_STATUS Status; + ACPI_APMT_NODE *Subtable; + UINT32 Length = Table->Length; + UINT32 Offset = sizeof (ACPI_TABLE_APMT); + UINT32 NodeNum = 0; + + /* There is no main table (other than the standard ACPI header) */ + + /* Subtables */ + + Subtable = ACPI_ADD_PTR (ACPI_APMT_NODE, Table, Offset); + while (Offset < Table->Length) + { + AcpiOsPrintf ("\n"); + + if (Subtable->Type >= ACPI_APMT_NODE_TYPE_COUNT) + { + AcpiOsPrintf ("\n**** Unknown APMT subtable type 0x%X\n", + Subtable->Type); + return; + } + + AcpiOsPrintf ("/* APMT Node-%u */\n", NodeNum++); + + Status = AcpiDmDumpTable (Length, Offset, Subtable, + Subtable->Length, AcpiDmTableInfoApmtNode); + if (ACPI_FAILURE (Status)) + { + return; + } + + /* Point to next subtable */ + + Offset += Subtable->Length; + Subtable = ACPI_ADD_PTR (ACPI_APMT_NODE, Subtable, + Subtable->Length); + AcpiOsPrintf ("\n"); + } +} + /******************************************************************************* * @@ -567,7 +629,6 @@ AcpiDmDumpCedt ( ACPI_CEDT_HEADER *Subtable; UINT32 Length = Table->Length; UINT32 Offset = sizeof (ACPI_TABLE_CEDT); - ACPI_DMTABLE_INFO *InfoTable; /* There is no main table (other than the standard ACPI header) */ @@ -588,35 +649,52 @@ AcpiDmDumpCedt ( switch (Subtable->Type) { case ACPI_CEDT_TYPE_CHBS: + Status = AcpiDmDumpTable (Length, Offset, Subtable, + Subtable->Length, AcpiDmTableInfoCedt0); + if (ACPI_FAILURE (Status)) { + return; + } + break; + + case ACPI_CEDT_TYPE_CFMWS: { + ACPI_CEDT_CFMWS *ptr = (ACPI_CEDT_CFMWS *) Subtable; + unsigned int i, max = 0x01 << (ptr->InterleaveWays); - InfoTable = AcpiDmTableInfoCedt0; + /* print out table with first "Interleave target" */ + + Status = AcpiDmDumpTable (Length, Offset, Subtable, + Subtable->Length, AcpiDmTableInfoCedt1); + if (ACPI_FAILURE (Status)) { + return; + } + + /* Now, print out any interleave targets beyond the first. */ + + for (i = 1; i < max; i++) { + unsigned int loc_offset = Offset + (i * 4) + ACPI_OFFSET(ACPI_CEDT_CFMWS, InterleaveTargets); + unsigned int *trg = &(ptr->InterleaveTargets[i]); + Status = AcpiDmDumpTable (Length, loc_offset, trg, + Subtable->Length, AcpiDmTableInfoCedt1_te); + if (ACPI_FAILURE (Status)) { + return; + } + } break; + } default: - AcpiOsPrintf ("\n**** Unknown CEDT subtable type 0x%X\n\n", Subtable->Type); /* Attempt to continue */ - if (!Subtable->Length) { AcpiOsPrintf ("Invalid zero length subtable\n"); return; } - goto NextSubtable; - } - - Status = AcpiDmDumpTable (Length, Offset, Subtable, - Subtable->Length, InfoTable); - if (ACPI_FAILURE (Status)) - { - return; } -NextSubtable: /* Point to next subtable */ - Offset += Subtable->Length; Subtable = ACPI_ADD_PTR (ACPI_CEDT_HEADER, Subtable, Subtable->Length); @@ -988,6 +1066,12 @@ AcpiDmDumpDmar ( ScopeOffset = sizeof (ACPI_DMAR_ANDD); break; + case ACPI_DMAR_TYPE_SATC: + + InfoTable = AcpiDmTableInfoDmar5; + ScopeOffset = sizeof (ACPI_DMAR_SATC); + break; + default: AcpiOsPrintf ("\n**** Unknown DMAR subtable type 0x%X\n\n", diff --git a/src/acpica/source/common/dmtbdump2.c b/src/acpica/source/common/dmtbdump2.c index 04f7139f..c50a6a24 100644 --- a/src/acpica/source/common/dmtbdump2.c +++ b/src/acpica/source/common/dmtbdump2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -203,9 +203,9 @@ AcpiDmDumpIort ( Revision = Table->Revision; - /* Both IORT Rev E and E.a have known issues and are not supported */ + /* IORT Revisions E, E.a and E.c have known issues and are not supported */ - if (Revision == 1 || Revision == 2) + if (Revision == 1 || Revision == 2 || Revision == 4) { AcpiOsPrintf ("\n**** Unsupported IORT revision 0x%X\n", Revision); @@ -445,7 +445,7 @@ AcpiDmDumpIort ( } break; - default: + default: break; } @@ -887,6 +887,8 @@ AcpiDmDumpMadt ( /* Subtables */ Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); + DbgPrint (ASL_PARSE_OUTPUT, "//0B) Offset %X, from table start: 0x%8.8X%8.8X\n", + Offset, ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table))); while (Offset < Table->Length) { /* Common subtable header */ @@ -899,6 +901,7 @@ AcpiDmDumpMadt ( return; } + DbgPrint (ASL_PARSE_OUTPUT, "subtableType: %X\n", Subtable->Type); switch (Subtable->Type) { case ACPI_MADT_TYPE_LOCAL_APIC: @@ -988,8 +991,23 @@ AcpiDmDumpMadt ( default: - AcpiOsPrintf ("\n**** Unknown MADT subtable type 0x%X\n\n", - Subtable->Type); + if ((Subtable->Type >= ACPI_MADT_TYPE_RESERVED) && + (Subtable->Type < ACPI_MADT_TYPE_OEM_RESERVED)) + { + AcpiOsPrintf ("\n**** Unknown MADT subtable type 0x%X\n\n", + Subtable->Type); + goto NextSubtable; + } + else if (Subtable->Type >= ACPI_MADT_TYPE_OEM_RESERVED) + { + DbgPrint (ASL_PARSE_OUTPUT, "//[Found an OEM structure, type = %0x]\n", + Subtable->Type); + Offset += sizeof (ACPI_SUBTABLE_HEADER); + DbgPrint (ASL_PARSE_OUTPUT, "//[0) Subtable->Length = %X, Subtable = %p, Offset = %X]\n", + Subtable->Length, Subtable, Offset); + DbgPrint (ASL_PARSE_OUTPUT, "//[0A) Offset from table start: 0x%8.8X%8.8X]\n", + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table))); + } /* Attempt to continue */ @@ -999,9 +1017,24 @@ AcpiDmDumpMadt ( return; } + /* Dump the OEM data */ + + Status = AcpiDmDumpTable (Length, Offset, ACPI_CAST_PTR (UINT8, Table) + Offset, + Subtable->Length - sizeof (ACPI_SUBTABLE_HEADER), AcpiDmTableInfoMadt17); + if (ACPI_FAILURE (Status)) + { + return; + } + + DbgPrint (ASL_PARSE_OUTPUT, "//[1) Subtable->Length = %X, Offset = %X]\n", + Subtable->Length, Offset); + Offset -= sizeof (ACPI_SUBTABLE_HEADER); + goto NextSubtable; } + DbgPrint (ASL_PARSE_OUTPUT, "//[2) Subtable->Length = %X, Offset = %X]\n", + Subtable->Length, Offset); Status = AcpiDmDumpTable (Length, Offset, Subtable, Subtable->Length, InfoTable); if (ACPI_FAILURE (Status)) @@ -1012,9 +1045,28 @@ AcpiDmDumpMadt ( NextSubtable: /* Point to next subtable */ - Offset += Subtable->Length; + DbgPrint (ASL_PARSE_OUTPUT, "//[3) Subtable->Length = %X, Offset = %X]\n", + Subtable->Length, Offset); + DbgPrint (ASL_PARSE_OUTPUT, "//[4) Offset from table start: 0x%8.8X%8.8X (%p) %p]\n", + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (UINT8, Subtable) - ACPI_CAST_PTR (UINT8, Table)), Subtable, Table); + if (Offset > Table->Length) + { + return; + } + Subtable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Subtable, Subtable->Length); + + DbgPrint (ASL_PARSE_OUTPUT, "//[5) Next Subtable %p, length %X]\n", + Subtable, Subtable->Length); + DbgPrint (ASL_PARSE_OUTPUT, "//[5B) Offset from table start: 0x%8.8X%8.8X (%p)]\n", + ACPI_FORMAT_UINT64 (ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table)), Subtable); + + Offset = ACPI_CAST_PTR (char, Subtable) - ACPI_CAST_PTR (char, Table); + if (Offset >= Table->Length) + { + return; + } } } @@ -1501,9 +1553,9 @@ AcpiDmDumpNhlt ( ACPI_NHLT_VENDOR_MIC_COUNT *MicCount; ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_A *DevSpecific; ACPI_NHLT_FORMATS_CONFIG *FormatsConfig; - ACPI_NHLT_LINUX_SPECIFIC_COUNT *Count; - ACPI_NHLT_LINUX_SPECIFIC_DATA *LinuxData; - ACPI_NHLT_LINUX_SPECIFIC_DATA_B *LinuxDataB; + ACPI_NHLT_DEVICE_INFO_COUNT *Count; + ACPI_NHLT_DEVICE_INFO *DeviceInfo; + ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B *Capabilities; /* Main table */ @@ -1757,95 +1809,77 @@ AcpiDmDumpNhlt ( if (CapabilitiesSize > 0) { - FormatSubtable = ACPI_ADD_PTR (ACPI_NHLT_FORMAT_CONFIG, Table, Offset); + UINT8* CapabilitiesBuf = ACPI_ADD_PTR (UINT8, Table, Offset); /* Do the Capabilities array (of bytes) */ AcpiOsPrintf ("\n /* Specific_Config table #%u */\n", j+1); - FormatSubtable = ACPI_ADD_PTR (ACPI_NHLT_FORMAT_CONFIG, Table, Offset); - Status = AcpiDmDumpTable (TableLength, Offset, FormatSubtable, + + Status = AcpiDmDumpTable (TableLength, Offset, CapabilitiesBuf, CapabilitiesSize, AcpiDmTableInfoNhlt3a); if (ACPI_FAILURE (Status)) { return; } - Offset += CapabilitiesSize; // + sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B); + Offset += CapabilitiesSize; /* + sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B); */ } } /* for (j = 0; j < FormatsCount; j++) */ /* * If we are not done with the current Endpoint yet, then there must be - * some Linux-specific structure(s) yet to be processed. First, get + * some non documented structure(s) yet to be processed. First, get * the count of such structure(s). */ if (Offset < EndpointEndOffset) { - AcpiOsPrintf ("\n /* Linux-specific structures (not part of NHLT spec) */\n"); - Count = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_COUNT, Table, Offset); + AcpiOsPrintf ("\n /* Structures that are not part of NHLT spec */\n"); + Count = ACPI_ADD_PTR (ACPI_NHLT_DEVICE_INFO_COUNT, Table, Offset); Status = AcpiDmDumpTable (TableLength, Offset, Count, - sizeof (ACPI_NHLT_LINUX_SPECIFIC_COUNT), AcpiDmTableInfoNhlt7); + sizeof (ACPI_NHLT_DEVICE_INFO_COUNT), AcpiDmTableInfoNhlt7); if (ACPI_FAILURE (Status)) { return; } - Offset += sizeof (ACPI_NHLT_LINUX_SPECIFIC_COUNT); + Offset += sizeof (ACPI_NHLT_DEVICE_INFO_COUNT); - if (Count->StructureCount > 1) - { - /* - * We currently cannot disassemble more than one - * Linux-Specific section, because we have no way of - * knowing whether the "Specific Data" part is present. - */ - Count->StructureCount = 1; - fprintf (stderr, "%s %s\n", "Feature not supported:", - "Cannot disassemble more than one Linux-Specific structure"); - return; - } - - /* Variable number of linux-specific structures */ + /* Variable number of device structures */ for (j = 0; j < Count->StructureCount; j++) { - LinuxData = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_DATA, Table, Offset); - AcpiOsPrintf ("\n /* Linux-specific structure #%u (not part of NHLT spec) */\n", j+1); + DeviceInfo = ACPI_ADD_PTR (ACPI_NHLT_DEVICE_INFO, Table, Offset); + AcpiOsPrintf ("\n /* Device Info structure #%u (not part of NHLT spec) */\n", j+1); /* - * Dump the following Linux-specific fields: + * Dump the following Device Info fields: * 1) Device ID * 2) Device Instance ID * 3) Device Port ID */ - Status = AcpiDmDumpTable (TableLength, Offset, LinuxData, - sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA), AcpiDmTableInfoNhlt7a); + Status = AcpiDmDumpTable (TableLength, Offset, DeviceInfo, + sizeof (ACPI_NHLT_DEVICE_INFO), AcpiDmTableInfoNhlt7a); if (ACPI_FAILURE (Status)) { return; } - Offset += sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA); - - /* - * Check that the current offset is not beyond the end of - * this endpoint descriptor. If it is not, we assume that - * the "Specific Data" field is present and valid. Note: - * This does not seem to be documented anywhere. - */ - if (Offset < EndpointEndOffset) - { - /* Dump the linux-specific "Specific Data" field */ - - LinuxDataB = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_DATA_B, Table, Offset); - Status = AcpiDmDumpTable (TableLength, Offset, LinuxDataB, - sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA_B), AcpiDmTableInfoNhlt7b); - if (ACPI_FAILURE (Status)) - { - return; - } + Offset += sizeof (ACPI_NHLT_DEVICE_INFO); + } - Offset += sizeof (ACPI_NHLT_LINUX_SPECIFIC_DATA_B); - } + /* + * Check that the current offset is not beyond the end of + * this endpoint descriptor. If it is not, print those + * undocumented bytes. + */ + if (Offset < EndpointEndOffset) + { + /* Unknown data at the end of the Endpoint */ + UINT32 size = EndpointEndOffset - Offset; + UINT8* buffer = ACPI_ADD_PTR (UINT8, Table, Offset); + AcpiOsPrintf ("\n /* Unknown data at the end of the Endpoint, size: %X */\n", size); + Status = AcpiDmDumpTable (TableLength, Offset, buffer, + size, AcpiDmTableInfoNhlt7b); + Offset = EndpointEndOffset; } /* Should be at the end of the Endpoint structure. */ @@ -1858,17 +1892,30 @@ AcpiDmDumpNhlt ( * Done with all of the Endpoint Descriptors, Emit the table terminator * (if such a legacy structure is present -- not in NHLT specification) */ - if (Offset == TableLength - sizeof (ACPI_NHLT_TABLE_TERMINATOR)) + if (Offset < TableLength) { - LinuxData = ACPI_ADD_PTR (ACPI_NHLT_LINUX_SPECIFIC_DATA, Table, Offset); - AcpiOsPrintf ("\n /* Table terminator structure (not part of NHLT spec) */\n"); + Capabilities = ACPI_ADD_PTR (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B, Table, Offset); + AcpiOsPrintf ("\n/* Terminating specific config (not part of NHLT spec) */\n"); - Status = AcpiDmDumpTable (TableLength, Offset, LinuxData, - sizeof (ACPI_NHLT_TABLE_TERMINATOR), AcpiDmTableInfoNhlt8); + Status = AcpiDmDumpTable (TableLength, Offset, Capabilities, + sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B), AcpiDmTableInfoNhlt5b); if (ACPI_FAILURE (Status)) { return; } + Offset += sizeof (ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_B); + + if (Capabilities->CapabilitiesSize > 0) + { + UINT32 remainingBytes = TableLength - Offset; + UINT8* buffer = ACPI_ADD_PTR (UINT8, Table, Offset); + + if (remainingBytes != Capabilities->CapabilitiesSize) + AcpiOsPrintf ("\n/* Incorrect config size, should be %X, is %X */\n", + Capabilities->CapabilitiesSize, remainingBytes); + Status = AcpiDmDumpTable (TableLength, Offset, buffer, + remainingBytes, AcpiDmTableInfoNhlt3a); + } } return; diff --git a/src/acpica/source/common/dmtbdump3.c b/src/acpica/source/common/dmtbdump3.c index 63b6d2d5..cbcd9e7f 100644 --- a/src/acpica/source/common/dmtbdump3.c +++ b/src/acpica/source/common/dmtbdump3.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtbinfo.c b/src/acpica/source/common/dmtbinfo.c index 7d812315..40539969 100644 --- a/src/acpica/source/common/dmtbinfo.c +++ b/src/acpica/source/common/dmtbinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/dmtbinfo1.c b/src/acpica/source/common/dmtbinfo1.c index b30cafa9..d6a94bfc 100644 --- a/src/acpica/source/common/dmtbinfo1.c +++ b/src/acpica/source/common/dmtbinfo1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -521,6 +521,28 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoCedt0[] = ACPI_DMT_TERMINATOR }; +/* 1: CXL Fixed Memory Window Structure */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1[] = +{ + {ACPI_DMT_UINT32, ACPI_CEDT1_OFFSET (Reserved1), "Reserved", 0}, + {ACPI_DMT_UINT64, ACPI_CEDT1_OFFSET (BaseHpa), "Window base address", 0}, + {ACPI_DMT_UINT64, ACPI_CEDT1_OFFSET (WindowSize), "Window size", 0}, + {ACPI_DMT_UINT8, ACPI_CEDT1_OFFSET (InterleaveWays), "Interleave Members (2^n)", 0}, + {ACPI_DMT_UINT8, ACPI_CEDT1_OFFSET (InterleaveArithmetic), "Interleave Arithmetic", 0}, + {ACPI_DMT_UINT16, ACPI_CEDT1_OFFSET (Reserved2), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_CEDT1_OFFSET (Granularity), "Granularity", 0}, + {ACPI_DMT_UINT16, ACPI_CEDT1_OFFSET (Restrictions), "Restrictions", 0}, + {ACPI_DMT_UINT16, ACPI_CEDT1_OFFSET (QtgId), "QtgId", 0}, + {ACPI_DMT_UINT32, ACPI_CEDT1_OFFSET (InterleaveTargets), "First Target", 0}, + ACPI_DMT_TERMINATOR +}; + +ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1_te[] = +{ + {ACPI_DMT_UINT32, ACPI_CEDT1_TE_OFFSET (InterleaveTarget), "Next Target", 0}, + ACPI_DMT_TERMINATOR +}; /******************************************************************************* * @@ -768,6 +790,15 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[] = ACPI_DMT_TERMINATOR }; +/* 5: Hardware Unit Definition */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoDmar5[] = +{ + {ACPI_DMT_UINT8, ACPI_DMAR5_OFFSET (Flags), "Flags", 0}, + {ACPI_DMT_UINT8, ACPI_DMAR5_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT16, ACPI_DMAR5_OFFSET (Segment), "PCI Segment Number", 0}, + ACPI_DMT_TERMINATOR +}; /******************************************************************************* * diff --git a/src/acpica/source/common/dmtbinfo2.c b/src/acpica/source/common/dmtbinfo2.c index ab1b2634..2c7d8178 100644 --- a/src/acpica/source/common/dmtbinfo2.c +++ b/src/acpica/source/common/dmtbinfo2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -208,6 +208,40 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoAgdi[] = }; +/******************************************************************************* + * + * APMT - ARM Performance Monitoring Unit Table + * + * Conforms to: + * ARM Performance Monitoring Unit Architecture 1.0 Platform Design Document + * ARM DEN0117 v1.0 November 25, 2021 + * + ******************************************************************************/ + +ACPI_DMTABLE_INFO AcpiDmTableInfoApmtNode[] = +{ + {ACPI_DMT_UINT16, ACPI_APMTN_OFFSET (Length), "Length of APMT Node", 0}, + {ACPI_DMT_UINT8, ACPI_APMTN_OFFSET (Flags), "Node Flags", 0}, + {ACPI_DMT_FLAG0, ACPI_APMTN_FLAG_OFFSET (Flags, 0), "Dual Page Extension", 0}, + {ACPI_DMT_FLAG1, ACPI_APMTN_FLAG_OFFSET (Flags, 0), "Processor Affinity Type", 0}, + {ACPI_DMT_FLAG2, ACPI_APMTN_FLAG_OFFSET (Flags, 0), "64-bit Atomic Support", 0}, + {ACPI_DMT_UINT8, ACPI_APMTN_OFFSET (Type), "Node Type", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (Id), "Unique Node Identifier", 0}, + {ACPI_DMT_UINT64, ACPI_APMTN_OFFSET (InstPrimary), "Primary Node Instance", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (InstSecondary), "Secondary Node Instance", 0}, + {ACPI_DMT_UINT64, ACPI_APMTN_OFFSET (BaseAddress0), "Page 0 Base Address", 0}, + {ACPI_DMT_UINT64, ACPI_APMTN_OFFSET (BaseAddress1), "Page 1 Base Address", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (OvflwIrq), "Overflow Interrupt ID", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (Reserved), "Reserved", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (OvflwIrqFlags), "Overflow Interrupt Flags", 0}, + {ACPI_DMT_FLAG0, ACPI_APMTN_FLAG_OFFSET (OvflwIrqFlags, 0), "Interrupt Mode", 0}, + {ACPI_DMT_FLAG1, ACPI_APMTN_FLAG_OFFSET (OvflwIrqFlags, 0), "Interrupt Type", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (ProcAffinity), "Processor Affinity", 0}, + {ACPI_DMT_UINT32, ACPI_APMTN_OFFSET (ImplId), "Implementation ID", 0}, + ACPI_DMT_TERMINATOR +}; + + /******************************************************************************* * * IORT - IO Remapping Table @@ -323,7 +357,8 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoIort2[] = {ACPI_DMT_UINT32, ACPI_IORT2_OFFSET (AtsAttribute), "ATS Attribute", 0}, {ACPI_DMT_UINT32, ACPI_IORT2_OFFSET (PciSegmentNumber), "PCI Segment Number", 0}, {ACPI_DMT_UINT8, ACPI_IORT2_OFFSET (MemoryAddressLimit), "Memory Size Limit", 0}, - {ACPI_DMT_UINT24, ACPI_IORT2_OFFSET (Reserved[0]), "Reserved", 0}, + {ACPI_DMT_UINT16, ACPI_IORT2_OFFSET (PasidCapabilities), "PASID Capabilities", 0}, + {ACPI_DMT_UINT8, ACPI_IORT2_OFFSET (Reserved[0]), "Reserved", 0}, ACPI_DMT_TERMINATOR }; @@ -407,6 +442,8 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoIort6[] = { {ACPI_DMT_UINT32, ACPI_IORT6_OFFSET (Flags), "Flags (decoded below)", 0}, {ACPI_DMT_FLAG0, ACPI_IORT6_FLAG_OFFSET (Flags, 0), "Remapping Permitted", 0}, + {ACPI_DMT_FLAG1, ACPI_IORT6_FLAG_OFFSET (Flags, 0), "Access Privileged", 0}, + {ACPI_DMT_FLAGS8_2, ACPI_IORT6_FLAG_OFFSET (Flags, 0), "Access Attributes", 0}, {ACPI_DMT_UINT32, ACPI_IORT6_OFFSET (RmrCount), "Number of RMR Descriptors", 0}, {ACPI_DMT_UINT32, ACPI_IORT6_OFFSET (RmrOffset), "RMR Descriptor Offset", 0}, ACPI_DMT_TERMINATOR @@ -887,6 +924,13 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[] = ACPI_DMT_TERMINATOR }; +/* 17: OEM data structure */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[] = +{ + {ACPI_DMT_RAW_BUFFER, 0, "OEM Data", 0}, + ACPI_DMT_TERMINATOR +}; /******************************************************************************* * @@ -1379,19 +1423,19 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt6[] = ACPI_DMT_TERMINATOR }; -/* Number of Linux-specific structures */ +/* Number of DeviceInfo structures */ ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7[] = { - {ACPI_DMT_UINT8, ACPI_NHLT7_OFFSET (StructureCount), "Linux-specific Count", 0}, + {ACPI_DMT_UINT8, ACPI_NHLT7_OFFSET (StructureCount), "Device Info struct count", 0}, ACPI_DMT_TERMINATOR }; -/* The Linux-specific structure */ +/* The DeviceInfo structure */ ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7a[] = { - {ACPI_DMT_BUF16, ACPI_NHLT7A_OFFSET (DeviceId), "Device ID", 0}, + {ACPI_DMT_UUID, ACPI_NHLT7A_OFFSET (DeviceId), "Device ID GUID", 0}, {ACPI_DMT_UINT8, ACPI_NHLT7A_OFFSET (DeviceInstanceId), "Device Instance ID", 0}, {ACPI_DMT_UINT8, ACPI_NHLT7A_OFFSET (DevicePortId), "Device Port ID", 0}, ACPI_DMT_TERMINATOR @@ -1399,16 +1443,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7a[] = ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7b[] = { - {ACPI_DMT_BUF18, ACPI_NHLT7B_OFFSET (SpecificData), "Specific Data", 0}, - ACPI_DMT_TERMINATOR -}; - -/* Table terminator (may or may not be present) */ - -ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt8[] = -{ - {ACPI_DMT_UINT32, ACPI_NHLT8_OFFSET (TerminatorValue), "Terminator Value", 0}, - {ACPI_DMT_UINT32, ACPI_NHLT8_OFFSET (TerminatorSignature), "Terminator Signature", 0}, + {ACPI_DMT_RAW_BUFFER, 0, "Bytes", 0}, ACPI_DMT_TERMINATOR }; @@ -1995,7 +2030,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoSdevHdr[] = {ACPI_DMT_UINT8, ACPI_SDEVH_OFFSET (Flags), "Flags (decoded below)", 0}, {ACPI_DMT_FLAG0, ACPI_SDEVH_FLAG_OFFSET (Flags,0), "Allow handoff to unsecure OS", 0}, {ACPI_DMT_FLAG1, ACPI_SDEVH_FLAG_OFFSET (Flags,0), "Secure access components present", 0}, - {ACPI_DMT_UINT16, ACPI_SDEVH_OFFSET (Length), "Length", 0}, + {ACPI_DMT_UINT16, ACPI_SDEVH_OFFSET (Length), "Length", DT_LENGTH}, ACPI_DMT_TERMINATOR }; diff --git a/src/acpica/source/common/dmtbinfo3.c b/src/acpica/source/common/dmtbinfo3.c index 6bdaf676..fa698d2f 100644 --- a/src/acpica/source/common/dmtbinfo3.c +++ b/src/acpica/source/common/dmtbinfo3.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/common/getopt.c b/src/acpica/source/common/getopt.c index 766ab8e3..772b66c0 100644 --- a/src/acpica/source/common/getopt.c +++ b/src/acpica/source/common/getopt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslallocate.c b/src/acpica/source/compiler/aslallocate.c index 8be711b2..d697d059 100644 --- a/src/acpica/source/compiler/aslallocate.c +++ b/src/acpica/source/compiler/aslallocate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslanalyze.c b/src/acpica/source/compiler/aslanalyze.c index c54ff8a2..9db7d4fb 100644 --- a/src/acpica/source/compiler/aslanalyze.c +++ b/src/acpica/source/compiler/aslanalyze.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslascii.c b/src/acpica/source/compiler/aslascii.c index 0e8c4d4e..6c0e62c4 100644 --- a/src/acpica/source/compiler/aslascii.c +++ b/src/acpica/source/compiler/aslascii.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslbtypes.c b/src/acpica/source/compiler/aslbtypes.c index ebb798a7..f7b3fb1b 100644 --- a/src/acpica/source/compiler/aslbtypes.c +++ b/src/acpica/source/compiler/aslbtypes.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcache.c b/src/acpica/source/compiler/aslcache.c index 05ae19b7..9cc707e2 100644 --- a/src/acpica/source/compiler/aslcache.c +++ b/src/acpica/source/compiler/aslcache.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcodegen.c b/src/acpica/source/compiler/aslcodegen.c index 75788689..6ae3a0aa 100644 --- a/src/acpica/source/compiler/aslcodegen.c +++ b/src/acpica/source/compiler/aslcodegen.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcompile.c b/src/acpica/source/compiler/aslcompile.c index ffb7496d..c17e219c 100644 --- a/src/acpica/source/compiler/aslcompile.c +++ b/src/acpica/source/compiler/aslcompile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -915,10 +915,11 @@ CmCleanupAndExit ( if (AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) { - printf ("\nMaximum error count (%d) exceeded\n", + printf ("\nMaximum error count (%d) exceeded (aslcompile.c)\n", ASL_MAX_ERROR_COUNT); } + AslGbl_ExceptionCount[ASL_ERROR] = 0; UtDisplaySummary (ASL_FILE_STDOUT); /* diff --git a/src/acpica/source/compiler/aslcompiler.h b/src/acpica/source/compiler/aslcompiler.h index 5112ea49..d52f60f2 100644 --- a/src/acpica/source/compiler/aslcompiler.h +++ b/src/acpica/source/compiler/aslcompiler.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcompiler.l b/src/acpica/source/compiler/aslcompiler.l index e0985362..881096ad 100644 --- a/src/acpica/source/compiler/aslcompiler.l +++ b/src/acpica/source/compiler/aslcompiler.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslcstyle.y b/src/acpica/source/compiler/aslcstyle.y index 2f032fac..b4e9065f 100644 --- a/src/acpica/source/compiler/aslcstyle.y +++ b/src/acpica/source/compiler/aslcstyle.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asldebug.c b/src/acpica/source/compiler/asldebug.c index 636fe051..5ac6a4ed 100644 --- a/src/acpica/source/compiler/asldebug.c +++ b/src/acpica/source/compiler/asldebug.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asldefine.h b/src/acpica/source/compiler/asldefine.h index 9149ff60..12b2899e 100644 --- a/src/acpica/source/compiler/asldefine.h +++ b/src/acpica/source/compiler/asldefine.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslerror.c b/src/acpica/source/compiler/aslerror.c index d73d7de9..a0ebe7b3 100644 --- a/src/acpica/source/compiler/aslerror.c +++ b/src/acpica/source/compiler/aslerror.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -1025,7 +1025,7 @@ AslLogNewError ( AslGbl_ExceptionCount[ModifiedLevel]++; if (!AslGbl_IgnoreErrors && AslGbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) { - printf ("\nMaximum error count (%u) exceeded\n", ASL_MAX_ERROR_COUNT); + printf ("\nMaximum error count (%u) exceeded (aslerror.c)\n", ASL_MAX_ERROR_COUNT); AslGbl_SourceLine = 0; AslGbl_NextError = AslGbl_ErrorLog; @@ -1033,6 +1033,7 @@ AslLogNewError ( exit(1); } + AslGbl_ExceptionCount[ASL_ERROR] = 0; return; } diff --git a/src/acpica/source/compiler/aslexternal.c b/src/acpica/source/compiler/aslexternal.c index 80edfd2b..a7d2c9c3 100644 --- a/src/acpica/source/compiler/aslexternal.c +++ b/src/acpica/source/compiler/aslexternal.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslfileio.c b/src/acpica/source/compiler/aslfileio.c index a55b2dbc..88b9def9 100644 --- a/src/acpica/source/compiler/aslfileio.c +++ b/src/acpica/source/compiler/aslfileio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslfiles.c b/src/acpica/source/compiler/aslfiles.c index 14403d3d..2479b404 100644 --- a/src/acpica/source/compiler/aslfiles.c +++ b/src/acpica/source/compiler/aslfiles.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslfold.c b/src/acpica/source/compiler/aslfold.c index d9cc8803..316890c4 100644 --- a/src/acpica/source/compiler/aslfold.c +++ b/src/acpica/source/compiler/aslfold.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslglobal.h b/src/acpica/source/compiler/aslglobal.h index 540d7dd9..ff00b92e 100644 --- a/src/acpica/source/compiler/aslglobal.h +++ b/src/acpica/source/compiler/aslglobal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslhelp.c b/src/acpica/source/compiler/aslhelp.c index 3131b9db..d83d41e3 100644 --- a/src/acpica/source/compiler/aslhelp.c +++ b/src/acpica/source/compiler/aslhelp.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslhelpers.y b/src/acpica/source/compiler/aslhelpers.y index abb729c3..2764bf65 100644 --- a/src/acpica/source/compiler/aslhelpers.y +++ b/src/acpica/source/compiler/aslhelpers.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslhex.c b/src/acpica/source/compiler/aslhex.c index 95b364ff..a6e80fdf 100644 --- a/src/acpica/source/compiler/aslhex.c +++ b/src/acpica/source/compiler/aslhex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslkeywords.y b/src/acpica/source/compiler/aslkeywords.y index 54314e64..661cfc93 100644 --- a/src/acpica/source/compiler/aslkeywords.y +++ b/src/acpica/source/compiler/aslkeywords.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllength.c b/src/acpica/source/compiler/asllength.c index a2a55094..b1c06246 100644 --- a/src/acpica/source/compiler/asllength.c +++ b/src/acpica/source/compiler/asllength.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllisting.c b/src/acpica/source/compiler/asllisting.c index 6ed16139..290d5062 100644 --- a/src/acpica/source/compiler/asllisting.c +++ b/src/acpica/source/compiler/asllisting.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllistsup.c b/src/acpica/source/compiler/asllistsup.c index 60d30423..b03560d3 100644 --- a/src/acpica/source/compiler/asllistsup.c +++ b/src/acpica/source/compiler/asllistsup.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslload.c b/src/acpica/source/compiler/aslload.c index f73135f3..3f827d0b 100644 --- a/src/acpica/source/compiler/aslload.c +++ b/src/acpica/source/compiler/aslload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asllookup.c b/src/acpica/source/compiler/asllookup.c index 50f087d7..44bf9a38 100644 --- a/src/acpica/source/compiler/asllookup.c +++ b/src/acpica/source/compiler/asllookup.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmain.c b/src/acpica/source/compiler/aslmain.c index 1df36a2b..3c2ce58e 100644 --- a/src/acpica/source/compiler/aslmain.c +++ b/src/acpica/source/compiler/aslmain.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -417,7 +417,7 @@ AslSignalHandler ( } printf (ASL_PREFIX "Terminating\n"); - exit (0); + _exit (0); } diff --git a/src/acpica/source/compiler/aslmap.c b/src/acpica/source/compiler/aslmap.c index 7b591bc6..782d0d96 100644 --- a/src/acpica/source/compiler/aslmap.c +++ b/src/acpica/source/compiler/aslmap.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -379,8 +379,8 @@ const ASL_MAPPING_ENTRY AslKeywordMapping [] = /* LLESSEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_LESS_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LNOT */ OP_TABLE_ENTRY (AML_LOGICAL_NOT_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LNOTEQUAL */ OP_TABLE_ENTRY (AML_LOGICAL_NOT_EQUAL_OP, 0, 0, ACPI_BTYPE_INTEGER), -/* LOAD */ OP_TABLE_ENTRY (AML_LOAD_OP, 0, 0, 0), -/* LOADTABLE */ OP_TABLE_ENTRY (AML_LOAD_TABLE_OP, 0, 0, ACPI_BTYPE_DDB_HANDLE), +/* LOAD */ OP_TABLE_ENTRY (AML_LOAD_OP, 0, 0, ACPI_BTYPE_INTEGER), +/* LOADTABLE */ OP_TABLE_ENTRY (AML_LOAD_TABLE_OP, 0, 0, ACPI_BTYPE_INTEGER), /* LOCAL0 */ OP_TABLE_ENTRY (AML_LOCAL0, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), /* LOCAL1 */ OP_TABLE_ENTRY (AML_LOCAL1, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), /* LOCAL2 */ OP_TABLE_ENTRY (AML_LOCAL2, 0, 0, ACPI_BTYPE_OBJECTS_AND_REFS), diff --git a/src/acpica/source/compiler/aslmapenter.c b/src/acpica/source/compiler/aslmapenter.c index 7ade1a31..5dae3e9e 100644 --- a/src/acpica/source/compiler/aslmapenter.c +++ b/src/acpica/source/compiler/aslmapenter.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmapoutput.c b/src/acpica/source/compiler/aslmapoutput.c index 0fe7b117..95146ea6 100644 --- a/src/acpica/source/compiler/aslmapoutput.c +++ b/src/acpica/source/compiler/aslmapoutput.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmaputils.c b/src/acpica/source/compiler/aslmaputils.c index c376bc0a..0b2c7e26 100644 --- a/src/acpica/source/compiler/aslmaputils.c +++ b/src/acpica/source/compiler/aslmaputils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmessages.c b/src/acpica/source/compiler/aslmessages.c index ca50d281..990e376f 100644 --- a/src/acpica/source/compiler/aslmessages.c +++ b/src/acpica/source/compiler/aslmessages.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -193,7 +193,8 @@ const char *AslErrorLevelIde [ASL_NUM_REPORT_LEVELS] = { * * NOTE2: With the introduction of the -vw option to disable specific messages, * new messages should only be added to the end of this list, so that values - * for existing messages are not disturbed. + * for existing messages are not disturbed. As important, obsolete messages + * cannot be removed from this list, as it will affect the -vw option. */ /* ASL compiler */ diff --git a/src/acpica/source/compiler/aslmessages.h b/src/acpica/source/compiler/aslmessages.h index 0e9fefd4..197e9e22 100644 --- a/src/acpica/source/compiler/aslmessages.h +++ b/src/acpica/source/compiler/aslmessages.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslmethod.c b/src/acpica/source/compiler/aslmethod.c index 4b3b66a5..517ba778 100644 --- a/src/acpica/source/compiler/aslmethod.c +++ b/src/acpica/source/compiler/aslmethod.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslnamesp.c b/src/acpica/source/compiler/aslnamesp.c index 6f9bb65a..60c488db 100644 --- a/src/acpica/source/compiler/aslnamesp.c +++ b/src/acpica/source/compiler/aslnamesp.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asloffset.c b/src/acpica/source/compiler/asloffset.c index 5f2661e4..b0954c70 100644 --- a/src/acpica/source/compiler/asloffset.c +++ b/src/acpica/source/compiler/asloffset.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslopcodes.c b/src/acpica/source/compiler/aslopcodes.c index 2f2c7744..e07910b1 100644 --- a/src/acpica/source/compiler/aslopcodes.c +++ b/src/acpica/source/compiler/aslopcodes.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asloperands.c b/src/acpica/source/compiler/asloperands.c index ae3b918d..9330fdfb 100644 --- a/src/acpica/source/compiler/asloperands.c +++ b/src/acpica/source/compiler/asloperands.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -429,6 +429,11 @@ OpnDoFieldCommon ( Next->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; PkgLengthNode->Asl.ParseOpcode = PARSEOP_DEFAULT_ARG; } +#ifdef _OBSOLETE_CODE + /* + * January 2022: removed this check due to complaints by users + * for too many (invalid) remarks. + */ else if (NewBitOffset == CurrentBitOffset) { /* @@ -459,6 +464,7 @@ OpnDoFieldCommon ( CurrentBitOffset = NewBitOffset; } } +#endif else { /* diff --git a/src/acpica/source/compiler/aslopt.c b/src/acpica/source/compiler/aslopt.c index 0246b312..916aebfb 100644 --- a/src/acpica/source/compiler/aslopt.c +++ b/src/acpica/source/compiler/aslopt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asloptions.c b/src/acpica/source/compiler/asloptions.c index ab9daa40..2808650e 100644 --- a/src/acpica/source/compiler/asloptions.c +++ b/src/acpica/source/compiler/asloptions.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslparseop.c b/src/acpica/source/compiler/aslparseop.c index 92eeb0fb..ab81ac28 100644 --- a/src/acpica/source/compiler/aslparseop.c +++ b/src/acpica/source/compiler/aslparseop.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslparser.y b/src/acpica/source/compiler/aslparser.y index 0a6fb64d..dff15619 100644 --- a/src/acpica/source/compiler/aslparser.y +++ b/src/acpica/source/compiler/aslparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslpld.c b/src/acpica/source/compiler/aslpld.c index 0939c5c6..9faa8c26 100644 --- a/src/acpica/source/compiler/aslpld.c +++ b/src/acpica/source/compiler/aslpld.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslpredef.c b/src/acpica/source/compiler/aslpredef.c index aa1a9570..c52295ee 100644 --- a/src/acpica/source/compiler/aslpredef.c +++ b/src/acpica/source/compiler/aslpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslprepkg.c b/src/acpica/source/compiler/aslprepkg.c index 380c48b0..f562dbe6 100644 --- a/src/acpica/source/compiler/aslprepkg.c +++ b/src/acpica/source/compiler/aslprepkg.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslprimaries.y b/src/acpica/source/compiler/aslprimaries.y index dd1310b0..69565def 100644 --- a/src/acpica/source/compiler/aslprimaries.y +++ b/src/acpica/source/compiler/aslprimaries.y @@ -11,7 +11,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -843,7 +843,7 @@ LoadTerm : PARSEOP_LOAD PARSEOP_OPEN_PAREN {$<n>$ = TrCreateLeafOp (PARSEOP_LOAD);} NameString - RequiredTarget + Target PARSEOP_CLOSE_PAREN {$$ = TrLinkOpChildren ($<n>3,2,$4,$5);} | PARSEOP_LOAD PARSEOP_OPEN_PAREN diff --git a/src/acpica/source/compiler/aslprintf.c b/src/acpica/source/compiler/aslprintf.c index 04f2d31e..3f270fec 100644 --- a/src/acpica/source/compiler/aslprintf.c +++ b/src/acpica/source/compiler/aslprintf.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslprune.c b/src/acpica/source/compiler/aslprune.c index 78b2e34f..4626a1ee 100644 --- a/src/acpica/source/compiler/aslprune.c +++ b/src/acpica/source/compiler/aslprune.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslresource.c b/src/acpica/source/compiler/aslresource.c index a2d85568..104a4835 100644 --- a/src/acpica/source/compiler/aslresource.c +++ b/src/acpica/source/compiler/aslresource.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslresources.y b/src/acpica/source/compiler/aslresources.y index 86c8981f..a5752b01 100644 --- a/src/acpica/source/compiler/aslresources.y +++ b/src/acpica/source/compiler/aslresources.y @@ -11,7 +11,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype1.c b/src/acpica/source/compiler/aslrestype1.c index 6751444a..a6625c08 100644 --- a/src/acpica/source/compiler/aslrestype1.c +++ b/src/acpica/source/compiler/aslrestype1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype1i.c b/src/acpica/source/compiler/aslrestype1i.c index c880a740..84d5b653 100644 --- a/src/acpica/source/compiler/aslrestype1i.c +++ b/src/acpica/source/compiler/aslrestype1i.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2.c b/src/acpica/source/compiler/aslrestype2.c index 4c308aaa..387e85c8 100644 --- a/src/acpica/source/compiler/aslrestype2.c +++ b/src/acpica/source/compiler/aslrestype2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2d.c b/src/acpica/source/compiler/aslrestype2d.c index c1cafe20..6b597e25 100644 --- a/src/acpica/source/compiler/aslrestype2d.c +++ b/src/acpica/source/compiler/aslrestype2d.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2e.c b/src/acpica/source/compiler/aslrestype2e.c index 63db7852..414b2d23 100644 --- a/src/acpica/source/compiler/aslrestype2e.c +++ b/src/acpica/source/compiler/aslrestype2e.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2q.c b/src/acpica/source/compiler/aslrestype2q.c index ec64da2b..ce796597 100644 --- a/src/acpica/source/compiler/aslrestype2q.c +++ b/src/acpica/source/compiler/aslrestype2q.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2s.c b/src/acpica/source/compiler/aslrestype2s.c index 607aca8b..ea832da3 100644 --- a/src/acpica/source/compiler/aslrestype2s.c +++ b/src/acpica/source/compiler/aslrestype2s.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrestype2w.c b/src/acpica/source/compiler/aslrestype2w.c index 3c3fed7b..a758e058 100644 --- a/src/acpica/source/compiler/aslrestype2w.c +++ b/src/acpica/source/compiler/aslrestype2w.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslrules.y b/src/acpica/source/compiler/aslrules.y index a944308e..79aa2210 100644 --- a/src/acpica/source/compiler/aslrules.y +++ b/src/acpica/source/compiler/aslrules.y @@ -11,7 +11,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -261,11 +261,11 @@ Target | ',' {$$ = TrCreateNullTargetOp ();} /* Placeholder is a ZeroOp object */ | ',' SuperName {$$ = TrSetOpFlags ($2, OP_IS_TARGET);} ; - +/* RequiredTarget : ',' SuperName {$$ = TrSetOpFlags ($2, OP_IS_TARGET);} ; - +*/ TermArg : SimpleName {$$ = TrSetOpFlags ($1, OP_IS_TERM_ARG);} | Type2Opcode {$$ = TrSetOpFlags ($1, OP_IS_TERM_ARG);} @@ -715,7 +715,6 @@ Type1Opcode | FatalTerm {} | ForTerm {} | ElseIfTerm {} - | LoadTerm {} | NoOpTerm {} | NotifyTerm {} | ReleaseTerm {} @@ -734,6 +733,7 @@ Type2Opcode | CondRefOfTerm {} | CopyObjectTerm {} | DerefOfTerm {} + | LoadTerm {} /* Moved from Type1 -- now returns an integer (ACPI 6.4) */ | ObjectTypeTerm {} | RefOfTerm {} | SizeOfTerm {} diff --git a/src/acpica/source/compiler/aslstartup.c b/src/acpica/source/compiler/aslstartup.c index 3954388c..45462adf 100644 --- a/src/acpica/source/compiler/aslstartup.c +++ b/src/acpica/source/compiler/aslstartup.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslstubs.c b/src/acpica/source/compiler/aslstubs.c index be3337ab..0e6cd56f 100644 --- a/src/acpica/source/compiler/aslstubs.c +++ b/src/acpica/source/compiler/aslstubs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslsupport.l b/src/acpica/source/compiler/aslsupport.l index a507e99b..0daec602 100644 --- a/src/acpica/source/compiler/aslsupport.l +++ b/src/acpica/source/compiler/aslsupport.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslsupport.y b/src/acpica/source/compiler/aslsupport.y index dfc427a9..3f19af2f 100644 --- a/src/acpica/source/compiler/aslsupport.y +++ b/src/acpica/source/compiler/aslsupport.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltokens.y b/src/acpica/source/compiler/asltokens.y index 5e205e01..c43561e7 100644 --- a/src/acpica/source/compiler/asltokens.y +++ b/src/acpica/source/compiler/asltokens.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltransform.c b/src/acpica/source/compiler/asltransform.c index 91655420..573ddad1 100644 --- a/src/acpica/source/compiler/asltransform.c +++ b/src/acpica/source/compiler/asltransform.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltree.c b/src/acpica/source/compiler/asltree.c index 91db420f..9cf49269 100644 --- a/src/acpica/source/compiler/asltree.c +++ b/src/acpica/source/compiler/asltree.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltypes.h b/src/acpica/source/compiler/asltypes.h index 760995f5..d5689dea 100644 --- a/src/acpica/source/compiler/asltypes.h +++ b/src/acpica/source/compiler/asltypes.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asltypes.y b/src/acpica/source/compiler/asltypes.y index aaa732f4..ba98362c 100644 --- a/src/acpica/source/compiler/asltypes.y +++ b/src/acpica/source/compiler/asltypes.y @@ -9,7 +9,7 @@ NoEcho(' * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -175,7 +175,9 @@ NoEcho(' %type <n> ParameterTypePackageList %type <n> ParameterTypesPackage %type <n> ParameterTypesPackageList +/* %type <n> RequiredTarget +*/ %type <n> SimpleName %type <n> StringData %type <n> StringLiteral diff --git a/src/acpica/source/compiler/aslutils.c b/src/acpica/source/compiler/aslutils.c index c4325c3b..e91fd460 100644 --- a/src/acpica/source/compiler/aslutils.c +++ b/src/acpica/source/compiler/aslutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/asluuid.c b/src/acpica/source/compiler/asluuid.c index def35c92..0eb36050 100644 --- a/src/acpica/source/compiler/asluuid.c +++ b/src/acpica/source/compiler/asluuid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslwalks.c b/src/acpica/source/compiler/aslwalks.c index 8ee5122c..6e32f081 100644 --- a/src/acpica/source/compiler/aslwalks.c +++ b/src/acpica/source/compiler/aslwalks.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslxref.c b/src/acpica/source/compiler/aslxref.c index ef99a971..3a00f5a9 100644 --- a/src/acpica/source/compiler/aslxref.c +++ b/src/acpica/source/compiler/aslxref.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/aslxrefout.c b/src/acpica/source/compiler/aslxrefout.c index 843504a0..dd3fe80c 100644 --- a/src/acpica/source/compiler/aslxrefout.c +++ b/src/acpica/source/compiler/aslxrefout.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/cvcompiler.c b/src/acpica/source/compiler/cvcompiler.c index 633a31d8..b51a688b 100644 --- a/src/acpica/source/compiler/cvcompiler.c +++ b/src/acpica/source/compiler/cvcompiler.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/cvdisasm.c b/src/acpica/source/compiler/cvdisasm.c index be3378ba..250c009a 100644 --- a/src/acpica/source/compiler/cvdisasm.c +++ b/src/acpica/source/compiler/cvdisasm.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/cvparser.c b/src/acpica/source/compiler/cvparser.c index 62d981fb..66b04e9a 100644 --- a/src/acpica/source/compiler/cvparser.c +++ b/src/acpica/source/compiler/cvparser.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtcompile.c b/src/acpica/source/compiler/dtcompile.c index 84d8e5c1..89eb937d 100644 --- a/src/acpica/source/compiler/dtcompile.c +++ b/src/acpica/source/compiler/dtcompile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtcompiler.h b/src/acpica/source/compiler/dtcompiler.h index d9c92ce2..3b3683cc 100644 --- a/src/acpica/source/compiler/dtcompiler.h +++ b/src/acpica/source/compiler/dtcompiler.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -569,6 +569,10 @@ ACPI_STATUS DtCompileAest ( void **PFieldList); +ACPI_STATUS +DtCompileApmt ( + void **PFieldList); + ACPI_STATUS DtCompileAsf ( void **PFieldList); @@ -763,6 +767,7 @@ DtGetGenericTableInfo ( extern const unsigned char TemplateAest[]; extern const unsigned char TemplateAgdi[]; +extern const unsigned char TemplateApmt[]; extern const unsigned char TemplateAsf[]; extern const unsigned char TemplateBoot[]; extern const unsigned char TemplateBdat[]; diff --git a/src/acpica/source/compiler/dtcompilerparser.l b/src/acpica/source/compiler/dtcompilerparser.l index bd128bed..a00ef56e 100644 --- a/src/acpica/source/compiler/dtcompilerparser.l +++ b/src/acpica/source/compiler/dtcompilerparser.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtcompilerparser.y b/src/acpica/source/compiler/dtcompilerparser.y index 3b1a67a0..30ead3af 100644 --- a/src/acpica/source/compiler/dtcompilerparser.y +++ b/src/acpica/source/compiler/dtcompilerparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtexpress.c b/src/acpica/source/compiler/dtexpress.c index c9705c9d..fd292d8f 100644 --- a/src/acpica/source/compiler/dtexpress.c +++ b/src/acpica/source/compiler/dtexpress.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtfield.c b/src/acpica/source/compiler/dtfield.c index f4c71147..f9316319 100644 --- a/src/acpica/source/compiler/dtfield.c +++ b/src/acpica/source/compiler/dtfield.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -676,6 +676,12 @@ DtCompileFlag ( BitLength = 2; break; + case ACPI_DMT_FLAGS8_2: + + BitPosition = 2; + BitLength = 8; + break; + case ACPI_DMT_FLAGS4: BitPosition = 4; diff --git a/src/acpica/source/compiler/dtio.c b/src/acpica/source/compiler/dtio.c index e1776f3f..1a00424c 100644 --- a/src/acpica/source/compiler/dtio.c +++ b/src/acpica/source/compiler/dtio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtparser.l b/src/acpica/source/compiler/dtparser.l index 9d2e3afe..b7cb26e2 100644 --- a/src/acpica/source/compiler/dtparser.l +++ b/src/acpica/source/compiler/dtparser.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtparser.y b/src/acpica/source/compiler/dtparser.y index 1b6f6df6..fc8275cc 100644 --- a/src/acpica/source/compiler/dtparser.y +++ b/src/acpica/source/compiler/dtparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dtsubtable.c b/src/acpica/source/compiler/dtsubtable.c index 6ea538e6..3c2798b6 100644 --- a/src/acpica/source/compiler/dtsubtable.c +++ b/src/acpica/source/compiler/dtsubtable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dttable.c b/src/acpica/source/compiler/dttable.c index fb3f26f1..dfc34c13 100644 --- a/src/acpica/source/compiler/dttable.c +++ b/src/acpica/source/compiler/dttable.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dttable1.c b/src/acpica/source/compiler/dttable1.c index 2e6a8569..9ac04350 100644 --- a/src/acpica/source/compiler/dttable1.c +++ b/src/acpica/source/compiler/dttable1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -387,6 +387,102 @@ DtCompileAest ( } +/****************************************************************************** + * + * FUNCTION: DtCompileApmt + * + * PARAMETERS: List - Current field list pointer + * + * RETURN: Status + * + * DESCRIPTION: Compile APMT. + * + *****************************************************************************/ + +ACPI_STATUS +DtCompileApmt ( + void **List) +{ + ACPI_STATUS Status; + ACPI_TABLE_HEADER *Header; + ACPI_APMT_NODE *ApmtNode; + ACPI_APMT_NODE *PeerApmtNode; + DT_SUBTABLE *Subtable; + DT_SUBTABLE *PeerSubtable; + DT_SUBTABLE *ParentTable; + DT_FIELD **PFieldList = (DT_FIELD**)List; + DT_FIELD *SubtableStart; + UINT32 CurLength; + char MsgBuffer[64] = ""; + + ParentTable = DtPeekSubtable(); + + Header = ACPI_CAST_PTR(ACPI_TABLE_HEADER, ParentTable->Buffer); + + CurLength = sizeof(ACPI_TABLE_HEADER); + + /* Walk the parse tree */ + + while (*PFieldList) + { + /* APMT Node Subtable */ + + SubtableStart = *PFieldList; + + Status = DtCompileTable(PFieldList, AcpiDmTableInfoApmtNode, &Subtable); + + if (ACPI_FAILURE(Status)) + { + return (Status); + } + + ApmtNode = ACPI_CAST_PTR(ACPI_APMT_NODE, Subtable->Buffer); + + if (ApmtNode->Length != sizeof(ACPI_APMT_NODE)) + { + DtFatal(ASL_MSG_INVALID_LENGTH, SubtableStart, "APMT"); + return (AE_ERROR); + } + + if (ApmtNode->Type >= ACPI_APMT_NODE_TYPE_COUNT) + { + snprintf(MsgBuffer, 64, "Node Type : 0x%X", ApmtNode->Type); + DtFatal(ASL_MSG_INVALID_TYPE, SubtableStart, MsgBuffer); + return (AE_ERROR); + } + + PeerSubtable = DtGetNextSubtable(ParentTable, NULL); + + /* Validate the node id needs to be unique. */ + while(PeerSubtable) + { + PeerApmtNode = ACPI_CAST_PTR(ACPI_APMT_NODE, PeerSubtable->Buffer); + if (PeerApmtNode->Id == ApmtNode->Id) + { + snprintf(MsgBuffer, 64, "Node Id : 0x%X existed", ApmtNode->Id); + DtFatal(ASL_MSG_DUPLICATE_ITEM, SubtableStart, MsgBuffer); + return (AE_ERROR); + } + + PeerSubtable = DtGetNextSubtable(ParentTable, PeerSubtable); + } + + CurLength += ApmtNode->Length; + + DtInsertSubtable(ParentTable, Subtable); + } + + if (Header->Length != CurLength) + { + snprintf(MsgBuffer, 64, " - APMT Length : %u (expected: %u)", + Header->Length, CurLength); + DtFatal(ASL_MSG_INVALID_LENGTH, NULL, MsgBuffer); + return (AE_ERROR); + } + + return (AE_OK); +} + /****************************************************************************** * * FUNCTION: DtCompileAsf @@ -587,6 +683,9 @@ DtCompileCedt ( while (*PFieldList) { + /* if CFMWS and has more than one target, then set to zero later */ + + int InsertFlag = 1; SubtableStart = *PFieldList; /* CEDT Header */ @@ -607,25 +706,72 @@ DtCompileCedt ( switch (CedtHeader->Type) { case ACPI_CEDT_TYPE_CHBS: + Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt0, &Subtable); + if (ACPI_FAILURE (Status)) + { + return (Status); + } + break; + case ACPI_CEDT_TYPE_CFMWS: { + unsigned char *dump; + unsigned int idx, offset, max = 0; + + /* Compile table with first "Interleave target" */ + Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt1, &Subtable); + if (ACPI_FAILURE (Status)) + { + return (Status); + } + + /* Look in buffer for the number of targets */ + offset = (unsigned int) ACPI_OFFSET (ACPI_CEDT_CFMWS, InterleaveWays); + dump = (unsigned char *) Subtable->Buffer - 4; /* place at beginning of cedt1 */ + max = 0x01 << dump[offset]; /* 2^max, so 0=1, 1=2, 2=4, 3=8. 8 is MAX */ + if (max > 8) max=1; /* Error in encoding Interleaving Ways. */ + if (max == 1) /* if only one target, then break here. */ + break; /* break if only one target. */ + + /* We need to add more interleave targets, so write the current Subtable. */ + + ParentTable = DtPeekSubtable (); + DtInsertSubtable (ParentTable, Subtable); /* Insert AcpiDmTableInfoCedt1 table so we can put in */ + DtPushSubtable (Subtable); /* the targets > the first. */ + + /* Now, find out all interleave targets beyond the first. */ + + for (idx = 1; idx < max; idx++) { + ParentTable = DtPeekSubtable (); + + if (*PFieldList) + { + Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt1_te, &Subtable); + if (ACPI_FAILURE (Status)) + { + return (Status); + } + if (Subtable) + { + DtInsertSubtable (ParentTable, Subtable); /* got a target, so insert table. */ + InsertFlag = 0; + } + } + } + + DtPopSubtable (); + ParentTable = DtPeekSubtable (); break; + } default: - DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "CEDT"); return (AE_ERROR); } - /* CEDT Subtable */ - - Status = DtCompileTable (PFieldList, AcpiDmTableInfoCedt0, &Subtable); - if (ACPI_FAILURE (Status)) - { - return (Status); - } - ParentTable = DtPeekSubtable (); - DtInsertSubtable (ParentTable, Subtable); + if (InsertFlag == 1) { + DtInsertSubtable (ParentTable, Subtable); + } DtPopSubtable (); } @@ -1005,6 +1151,11 @@ DtCompileDmar ( InfoTable = AcpiDmTableInfoDmar4; break; + case ACPI_DMAR_TYPE_SATC: + + InfoTable = AcpiDmTableInfoDmar5; + break; + default: DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "DMAR"); @@ -1903,9 +2054,9 @@ DtCompileIort ( Table = ACPI_CAST_PTR (ACPI_TABLE_HEADER, ParentTable->Buffer); Revision = Table->Revision; - /* Both IORT Rev E and E.a have known issues and are not supported */ + /* IORT Revisions E, E.a & E.c have known issues and are not supported */ - if (Revision == 1 || Revision == 2) + if (Revision == 1 || Revision == 2 || Revision == 4) { DtError (ASL_ERROR, ASL_MSG_UNSUPPORTED, NULL, "IORT table revision"); return (AE_ERROR); @@ -2218,7 +2369,7 @@ DtCompileIort ( IortRmr->RmrCount = RmrCount; break; - default: + default: DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "IORT"); return (AE_ERROR); diff --git a/src/acpica/source/compiler/dttable2.c b/src/acpica/source/compiler/dttable2.c index 85406361..1798a963 100644 --- a/src/acpica/source/compiler/dttable2.c +++ b/src/acpica/source/compiler/dttable2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -373,8 +373,17 @@ DtCompileMadt ( default: - DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "MADT"); - return (AE_ERROR); + if (MadtHeader->Type >= ACPI_MADT_TYPE_OEM_RESERVED) + { + InfoTable = AcpiDmTableInfoMadt17; + } + else + { + DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "MADT"); + return (AE_ERROR); + } + + break; } Status = DtCompileTable (PFieldList, InfoTable, &Subtable); @@ -807,7 +816,7 @@ DtCompileNhlt ( UINT32 CapabilitiesSize; UINT8 ArrayType; UINT8 ConfigType; - UINT8 LinuxSpecificCount; + UINT8 DeviceInfoCount; UINT32 i; UINT32 j; ACPI_TABLE_NHLT_ENDPOINT_COUNT *MainTable; @@ -815,7 +824,7 @@ DtCompileNhlt ( ACPI_NHLT_VENDOR_MIC_COUNT *MicCount; ACPI_NHLT_FORMATS_CONFIG *FormatsConfig; ACPI_NHLT_DEVICE_SPECIFIC_CONFIG_D *ConfigSpecific; - ACPI_NHLT_LINUX_SPECIFIC_COUNT *LinuxSpecific; + ACPI_NHLT_DEVICE_INFO_COUNT *DeviceInfo; /* Main table */ @@ -1076,12 +1085,12 @@ DtCompileNhlt ( /* * If we are not done with the current Endpoint yet, then there must be - * some Linux-specific structure(s) yet to be processed. First, get + * some non documeneted structure(s) yet to be processed. First, get * the count of such structure(s). */ if (*PFieldList && (strcmp ((const char *) (*PFieldList)->Name, "Descriptor Length"))) { - /* Get the count of Linux-specific structures */ + /* Get the count of non documented structures */ Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt7, &Subtable); @@ -1093,13 +1102,13 @@ DtCompileNhlt ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); - LinuxSpecific = ACPI_CAST_PTR (ACPI_NHLT_LINUX_SPECIFIC_COUNT, Subtable->Buffer); - LinuxSpecificCount = LinuxSpecific->StructureCount; + DeviceInfo = ACPI_CAST_PTR (ACPI_NHLT_DEVICE_INFO_COUNT, Subtable->Buffer); + DeviceInfoCount = DeviceInfo->StructureCount; - for (j = 0; j < LinuxSpecificCount; j++) + for (j = 0; j < DeviceInfoCount; j++) { /* - * Compile the following Linux-specific fields: + * Compile the following Device Info fields: * 1) Device ID * 2) Device Instance ID * 3) Device Port ID @@ -1113,28 +1122,22 @@ DtCompileNhlt ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); + } /* for (j = 0; j < LinuxSpecificCount; j++) */ - /* - * To have a valid Linux-specific "Specific Data" at this - * point, we need: - * 1) The next field must be named "Specific Data" - */ - if (!strcmp ((const char *) (*PFieldList)->Name, "Specific Data")) - { - /* Compile the "Specific Data" field */ - - Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt7b, - &Subtable); - if (ACPI_FAILURE (Status)) - { - return (Status); - } - ParentTable = DtPeekSubtable (); - DtInsertSubtable (ParentTable, Subtable); + /* Undocumented data at the end of endpoint */ + if (*PFieldList && (strcmp ((const char *) (*PFieldList)->Name, "Descriptor Length"))) + { + Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt7b, + &Subtable); + if (ACPI_FAILURE (Status)) + { + return (Status); } - } /* for (j = 0; j < LinuxSpecificCount; j++) */ + ParentTable = DtPeekSubtable (); + DtInsertSubtable (ParentTable, Subtable); + } } DtPopSubtable (); @@ -1143,11 +1146,21 @@ DtCompileNhlt ( /* * All Endpoint Descriptors are completed. - * Do the table terminator structure (not in NHLT spec, optional) + * Do the table terminator specific config (not in NHLT spec, optional) */ if (*PFieldList && (strcmp ((const char *) (*PFieldList)->Name, "Descriptor Length"))) { - Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt8, + Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt5b, + &Subtable); + if (ACPI_FAILURE (Status)) + { + return (Status); + } + + ParentTable = DtPeekSubtable (); + DtInsertSubtable (ParentTable, Subtable); + + Status = DtCompileTable (PFieldList, AcpiDmTableInfoNhlt3a, &Subtable); if (ACPI_FAILURE (Status)) { diff --git a/src/acpica/source/compiler/dttemplate.c b/src/acpica/source/compiler/dttemplate.c index 8154abb5..1bcc4a12 100644 --- a/src/acpica/source/compiler/dttemplate.c +++ b/src/acpica/source/compiler/dttemplate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/dttemplate.h b/src/acpica/source/compiler/dttemplate.h index e9272f3a..ad5af707 100644 --- a/src/acpica/source/compiler/dttemplate.h +++ b/src/acpica/source/compiler/dttemplate.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -259,6 +259,29 @@ const unsigned char TemplateAgdi[] = 0x01,0x00,0x00,0x40,0x00,0x00,0x00,0x00 /* 00000028 "...@...." */ }; +const unsigned char TemplateApmt[] = +{ + 0x41,0x50,0x4D,0x54,0x94,0x00,0x00,0x00, /* 00000000 "APMT...." */ + 0x00,0x79,0x4E,0x56,0x49,0x44,0x49,0x41, /* 00000008 ".yNVIDIA" */ + 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ + 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ + 0x17,0x12,0x21,0x20,0x38,0x00,0x04,0x03, /* 00000020 "..! 8..." */ + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000028 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000030 "........" */ + 0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 ". ......" */ + 0x00,0x20,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000040 ". ......" */ + 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000048 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000050 "........" */ + 0x6B,0x03,0x00,0x00,0x38,0x00,0x06,0x03, /* 00000058 "k...8..." */ + 0x01,0x00,0x00,0x00,0x02,0x00,0x00,0x00, /* 00000060 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000068 "........" */ + 0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000070 ".0......" */ + 0x00,0x30,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000078 ".0......" */ + 0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ + 0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000088 "........" */ + 0x6B,0x03,0x00,0x00 /* 00000090 "k..." */ +}; + const unsigned char TemplateAsf[] = { 0x41,0x53,0x46,0x21,0x72,0x00,0x00,0x00, /* 00000000 "ASF!r..." */ @@ -320,23 +343,58 @@ const unsigned char TemplateBoot[] = const unsigned char TemplateCedt[] = { - 0x43,0x45,0x44,0x54,0x84,0x00,0x00,0x00, /* 00000000 "CEDT...." */ - 0x01,0x8B,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ - 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ - 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x05,0x01,0x21,0x20,0x00,0x00,0x20,0x00, /* 00000020 "..! .. ." */ - 0x33,0x33,0xCD,0xAB,0x01,0x00,0x00,0x00, /* 00000028 "33......" */ - 0x00,0x00,0x00,0x00,0x00,0x21,0x43,0xD5, /* 00000030 ".....!C." */ - 0x00,0x00,0x00,0x00,0x45,0x23,0x01,0x00, /* 00000038 "....E#.." */ + 0x43,0x45,0x44,0x54,0x9c,0x01,0x00,0x00, /* 00000000 "CEDT...." */ + 0x01,0x87,0x49,0x4e,0x54,0x45,0x4c,0x20, /* 00000008 "..INTEL " */ + 0x54,0x45,0x4d,0x50,0x4c,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ + 0x00,0x00,0x00,0x00,0x49,0x4e,0x54,0x4c, /* 00000018 "....INTL" */ + 0x17,0x12,0x21,0x20,0x00,0x00,0x20,0x00, /* 00000020 "..! .. ." */ + 0x00,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000028 ".^......" */ + 0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x00, /* 00000030 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000038 "..... .." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00, /* 00000040 "...... ." */ - 0x44,0x44,0xCD,0xAB,0x01,0x00,0x00,0x00, /* 00000048 "DD......" */ - 0x00,0x00,0x00,0x00,0x00,0x21,0x43,0xA5, /* 00000050 ".....!C." */ - 0x00,0x00,0x00,0x00,0x45,0x23,0xB1,0x00, /* 00000058 "....E#.." */ + 0x01,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000048 ".^......" */ + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000050 "..... .." */ + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000058 "..... .." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00, /* 00000060 "...... ." */ - 0x55,0x55,0xCD,0xAB,0x01,0x00,0x00,0x00, /* 00000068 "UU......" */ - 0x00,0x00,0x00,0x00,0x00,0x21,0x43,0xB5, /* 00000070 ".....!C." */ - 0x00,0x00,0x00,0x00,0x45,0x23,0xB1,0x00, /* 00000078 "....E#.." */ - 0x00,0x00,0x00,0x00 /* 00000080 "...." */ + 0x02,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000068 ".^......" */ + 0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00, /* 00000070 ".....0.." */ + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000078 "..... .." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00, /* 00000080 "...... ." */ + 0x03,0x5e,0xba,0x00,0x00,0x00,0x00,0x00, /* 00000088 ".^......" */ + 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, /* 00000090 ".....@.." */ + 0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00, /* 00000098 "..... .." */ + 0x00,0x00,0x00,0x00,0x01,0x00,0x28,0x00, /* 000000a0 "......(." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000a8 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000b0 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000b8 "........" */ + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 000000c0 "........" */ + 0x00,0x5e,0xba,0x00,0x01,0x00,0x28,0x00, /* 000000c8 ".^....(." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000d0 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000d8 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000e0 "........" */ + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 000000e8 "........" */ + 0x01,0x5e,0xba,0x00,0x01,0x00,0x28,0x00, /* 000000f0 ".^....(." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000f8 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000100 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000108 "........" */ + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 00000110 "........" */ + 0x02,0x5e,0xba,0x00,0x01,0x00,0x28,0x00, /* 00000118 ".^....(." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000120 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000128 "........" */ + 0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000130 "........" */ + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 00000138 "........" */ + 0x03,0x5e,0xba,0x00,0x01,0x00,0x2c,0x00, /* 00000140 ".^....,." */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000148 "........" */ + 0x00,0x03,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000150 "........" */ + 0x00,0x01,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000158 "........" */ + 0x03,0x00,0x00,0x00,0x06,0x00,0x01,0x00, /* 00000160 "........" */ + 0x00,0x5e,0xba,0x00,0x01,0x5e,0xba,0x00, /* 00000160 ".^...^.." */ + 0x01,0x00,0x2c,0x00,0x00,0x00,0x00,0x00, /* 00000170 "..,....." */ + 0x00,0x00,0x00,0x00,0x00,0x03,0x00,0x00, /* 00000178 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00, /* 00000180 "........" */ + 0x01,0x00,0x00,0x00,0x03,0x00,0x00,0x00, /* 00000188 "........" */ + 0x0a,0x00,0x01,0x00,0x02,0x5e,0xba,0x00, /* 00000190 ".....^.." */ + 0x03,0x5e,0xba,0x00 /* 00000198 ".^.." */ }; const unsigned char TemplateCpep[] = @@ -436,11 +494,11 @@ const unsigned char TemplateDbgp[] = const unsigned char TemplateDmar[] = { - 0x44,0x4D,0x41,0x52,0x8C,0x00,0x00,0x00, /* 00000000 "DMAR...." */ - 0x01,0x03,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ + 0x44,0x4D,0x41,0x52,0x9C,0x00,0x00,0x00, /* 00000000 "DMAR...." */ + 0x01,0xB8,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x17,0x05,0x13,0x20,0x2F,0x01,0x00,0x00, /* 00000020 "... /..." */ + 0x17,0x12,0x21,0x20,0x2F,0x01,0x00,0x00, /* 00000020 "..! /..." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */ 0x00,0x00,0x18,0x00,0x01,0x00,0x00,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ @@ -453,7 +511,9 @@ const unsigned char TemplateDmar[] = 0x02,0x08,0x00,0x00,0x00,0x00,0x00,0x03, /* 00000070 "........" */ 0x03,0x00,0x14,0x00,0x00,0x00,0x00,0x00, /* 00000078 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ - 0x00,0x00,0x00,0x00 /* 00000088 "...." */ + 0x00,0x00,0x00,0x00,0x05,0x00,0x10,0x00, /* 00000088 "........" */ + 0x00,0x00,0x00,0x00,0x01,0x08,0x00,0x00, /* 00000090 "........" */ + 0x00,0x00,0x00,0x02 /* 00000098 "...." */ }; const unsigned char TemplateDrtm[] = @@ -833,10 +893,10 @@ const unsigned char TemplateHpet[] = const unsigned char TemplateIort[] = { 0x49,0x4F,0x52,0x54,0x3C,0x02,0x00,0x00, /* 00000000 "IORT<..." */ - 0x03,0xF1,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ + 0x05,0xCB,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000010 "Template" */ 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x05,0x01,0x21,0x20,0x07,0x00,0x00,0x00, /* 00000020 "..! ...." */ + 0x17,0x12,0x21,0x20,0x07,0x00,0x00,0x00, /* 00000020 "..! ...." */ 0x34,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "4......." */ 0x49,0x4F,0x52,0x54,0x00,0x18,0x00,0x01, /* 00000030 "IORT...." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ @@ -848,7 +908,7 @@ const unsigned char TemplateIort[] = 0x00,0x5C,0x5F,0x53,0x42,0x2E,0x50,0x43, /* 00000068 ".\_SB.PC" */ 0x49,0x30,0x2E,0x44,0x45,0x56,0x30,0x00, /* 00000070 "I0.DEV0." */ 0x49,0x4F,0x52,0x54,0x3C,0x02,0x00,0x00, /* 00000078 "IORT<..." */ - 0x03,0xF2,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000080 "..INTEL " */ + 0x03,0xF1,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000080 "..INTEL " */ 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000088 "Template" */ 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000090 "....INTL" */ 0x05,0x01,0x21,0x20,0x07,0x00,0x00,0x00, /* 00000098 "..! ...." */ @@ -857,7 +917,7 @@ const unsigned char TemplateIort[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000B0 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000B8 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000C0 "........" */ - 0x00,0x00,0x00,0x00,0x02,0x38,0x00,0x03, /* 000000C8 ".....8.." */ + 0x00,0x00,0x00,0x00,0x02,0x38,0x00,0x04, /* 000000C8 ".....8.." */ 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000D0 "........" */ 0x24,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000D8 "$......." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000E0 "........" */ @@ -895,7 +955,7 @@ const unsigned char TemplateIort[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001E0 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000001E8 "........" */ 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000001F0 "........" */ - 0x06,0x44,0x00,0x01,0x00,0x00,0x00,0x00, /* 000001F8 ".D......" */ + 0x06,0x44,0x00,0x03,0x00,0x00,0x00,0x00, /* 000001F8 ".D......" */ 0x01,0x00,0x00,0x00,0x30,0x00,0x00,0x00, /* 00000200 "....0..." */ 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000208 "........" */ 0x1C,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000210 "........" */ @@ -903,7 +963,7 @@ const unsigned char TemplateIort[] = 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000220 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000228 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000230 "........" */ - 0x01,0x00,0x00,0x00 /* 00000238 "...." */ + 0x00,0x00,0x00,0x00 /* 00000238 "...." */ }; const unsigned char TemplateIvrs[] = diff --git a/src/acpica/source/compiler/dtutils.c b/src/acpica/source/compiler/dtutils.c index 2342ace3..e950763e 100644 --- a/src/acpica/source/compiler/dtutils.c +++ b/src/acpica/source/compiler/dtutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -411,6 +411,7 @@ DtGetFieldType ( case ACPI_DMT_FLAGS0: case ACPI_DMT_FLAGS1: case ACPI_DMT_FLAGS2: + case ACPI_DMT_FLAGS8_2: case ACPI_DMT_FLAGS4: case ACPI_DMT_FLAGS4_0: case ACPI_DMT_FLAGS4_4: @@ -561,6 +562,7 @@ DtGetFieldLength ( case ACPI_DMT_FLAGS0: case ACPI_DMT_FLAGS1: case ACPI_DMT_FLAGS2: + case ACPI_DMT_FLAGS8_2: case ACPI_DMT_FLAGS4: case ACPI_DMT_FLAGS4_0: case ACPI_DMT_FLAGS4_4: diff --git a/src/acpica/source/compiler/preprocess.h b/src/acpica/source/compiler/preprocess.h index f4c8c309..9c25dd13 100644 --- a/src/acpica/source/compiler/preprocess.h +++ b/src/acpica/source/compiler/preprocess.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prexpress.c b/src/acpica/source/compiler/prexpress.c index db2e76ec..8ac1fd88 100644 --- a/src/acpica/source/compiler/prexpress.c +++ b/src/acpica/source/compiler/prexpress.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prmacros.c b/src/acpica/source/compiler/prmacros.c index ab1255f6..5b366978 100644 --- a/src/acpica/source/compiler/prmacros.c +++ b/src/acpica/source/compiler/prmacros.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prparser.l b/src/acpica/source/compiler/prparser.l index febcc319..828d81b2 100644 --- a/src/acpica/source/compiler/prparser.l +++ b/src/acpica/source/compiler/prparser.l @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prparser.y b/src/acpica/source/compiler/prparser.y index f7e052d9..3854d989 100644 --- a/src/acpica/source/compiler/prparser.y +++ b/src/acpica/source/compiler/prparser.y @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prscan.c b/src/acpica/source/compiler/prscan.c index 7672ef89..0d9af86e 100644 --- a/src/acpica/source/compiler/prscan.c +++ b/src/acpica/source/compiler/prscan.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/compiler/prutils.c b/src/acpica/source/compiler/prutils.c index e793b4c4..eea42f89 100644 --- a/src/acpica/source/compiler/prutils.c +++ b/src/acpica/source/compiler/prutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbcmds.c b/src/acpica/source/components/debugger/dbcmds.c index 1b10f161..6f551476 100644 --- a/src/acpica/source/components/debugger/dbcmds.c +++ b/src/acpica/source/components/debugger/dbcmds.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbconvert.c b/src/acpica/source/components/debugger/dbconvert.c index 55307d08..9d1e1ddd 100644 --- a/src/acpica/source/components/debugger/dbconvert.c +++ b/src/acpica/source/components/debugger/dbconvert.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbdisply.c b/src/acpica/source/components/debugger/dbdisply.c index b434cdc6..276217f5 100644 --- a/src/acpica/source/components/debugger/dbdisply.c +++ b/src/acpica/source/components/debugger/dbdisply.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbexec.c b/src/acpica/source/components/debugger/dbexec.c index 26cc73f9..eed0aa35 100644 --- a/src/acpica/source/components/debugger/dbexec.c +++ b/src/acpica/source/components/debugger/dbexec.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbfileio.c b/src/acpica/source/components/debugger/dbfileio.c index 70b9650a..09f8f227 100644 --- a/src/acpica/source/components/debugger/dbfileio.c +++ b/src/acpica/source/components/debugger/dbfileio.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbhistry.c b/src/acpica/source/components/debugger/dbhistry.c index d5ae07f9..31bfc3c5 100644 --- a/src/acpica/source/components/debugger/dbhistry.c +++ b/src/acpica/source/components/debugger/dbhistry.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbinput.c b/src/acpica/source/components/debugger/dbinput.c index d0b77e77..0f21b731 100644 --- a/src/acpica/source/components/debugger/dbinput.c +++ b/src/acpica/source/components/debugger/dbinput.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbmethod.c b/src/acpica/source/components/debugger/dbmethod.c index 4e9a8b53..82202e8e 100644 --- a/src/acpica/source/components/debugger/dbmethod.c +++ b/src/acpica/source/components/debugger/dbmethod.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbnames.c b/src/acpica/source/components/debugger/dbnames.c index b7b45ecf..963f8125 100644 --- a/src/acpica/source/components/debugger/dbnames.c +++ b/src/acpica/source/components/debugger/dbnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbobject.c b/src/acpica/source/components/debugger/dbobject.c index 5b98319a..b8bade43 100644 --- a/src/acpica/source/components/debugger/dbobject.c +++ b/src/acpica/source/components/debugger/dbobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbstats.c b/src/acpica/source/components/debugger/dbstats.c index 7cca32f7..30a686dc 100644 --- a/src/acpica/source/components/debugger/dbstats.c +++ b/src/acpica/source/components/debugger/dbstats.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbtest.c b/src/acpica/source/components/debugger/dbtest.c index cb9c7214..23690ed6 100644 --- a/src/acpica/source/components/debugger/dbtest.c +++ b/src/acpica/source/components/debugger/dbtest.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbutils.c b/src/acpica/source/components/debugger/dbutils.c index 338d1fc2..ef649b2c 100644 --- a/src/acpica/source/components/debugger/dbutils.c +++ b/src/acpica/source/components/debugger/dbutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/debugger/dbxface.c b/src/acpica/source/components/debugger/dbxface.c index 472e30df..c44e1d0d 100644 --- a/src/acpica/source/components/debugger/dbxface.c +++ b/src/acpica/source/components/debugger/dbxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmbuffer.c b/src/acpica/source/components/disassembler/dmbuffer.c index 208fb84f..d5d813c8 100644 --- a/src/acpica/source/components/disassembler/dmbuffer.c +++ b/src/acpica/source/components/disassembler/dmbuffer.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmcstyle.c b/src/acpica/source/components/disassembler/dmcstyle.c index 991b8714..f0bef68e 100644 --- a/src/acpica/source/components/disassembler/dmcstyle.c +++ b/src/acpica/source/components/disassembler/dmcstyle.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmdeferred.c b/src/acpica/source/components/disassembler/dmdeferred.c index 23e1c58f..82ce2bec 100644 --- a/src/acpica/source/components/disassembler/dmdeferred.c +++ b/src/acpica/source/components/disassembler/dmdeferred.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmnames.c b/src/acpica/source/components/disassembler/dmnames.c index 85da9964..8852921f 100644 --- a/src/acpica/source/components/disassembler/dmnames.c +++ b/src/acpica/source/components/disassembler/dmnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmopcode.c b/src/acpica/source/components/disassembler/dmopcode.c index 80cf72f9..1cfe710d 100644 --- a/src/acpica/source/components/disassembler/dmopcode.c +++ b/src/acpica/source/components/disassembler/dmopcode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrc.c b/src/acpica/source/components/disassembler/dmresrc.c index 12cf5e6b..0a183e9c 100644 --- a/src/acpica/source/components/disassembler/dmresrc.c +++ b/src/acpica/source/components/disassembler/dmresrc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrcl.c b/src/acpica/source/components/disassembler/dmresrcl.c index b30316b8..9aa6ac1f 100644 --- a/src/acpica/source/components/disassembler/dmresrcl.c +++ b/src/acpica/source/components/disassembler/dmresrcl.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrcl2.c b/src/acpica/source/components/disassembler/dmresrcl2.c index ae15e3d8..59d00f6c 100644 --- a/src/acpica/source/components/disassembler/dmresrcl2.c +++ b/src/acpica/source/components/disassembler/dmresrcl2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmresrcs.c b/src/acpica/source/components/disassembler/dmresrcs.c index f323329f..db5ce5db 100644 --- a/src/acpica/source/components/disassembler/dmresrcs.c +++ b/src/acpica/source/components/disassembler/dmresrcs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmutils.c b/src/acpica/source/components/disassembler/dmutils.c index 1c1e400e..2a7b7b33 100644 --- a/src/acpica/source/components/disassembler/dmutils.c +++ b/src/acpica/source/components/disassembler/dmutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/disassembler/dmwalk.c b/src/acpica/source/components/disassembler/dmwalk.c index 75d75eab..7d2429b7 100644 --- a/src/acpica/source/components/disassembler/dmwalk.c +++ b/src/acpica/source/components/disassembler/dmwalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -959,7 +959,15 @@ AcpiDmDescendingOp ( NextOp->Common.DisasmFlags |= ACPI_PARSEOP_IGNORE; ASL_CV_CLOSE_PAREN (Op, Level); - /* Emit description comment for Name() with a predefined ACPI name */ + if (Op->Asl.Parent->Common.AmlOpcode == AML_NAME_OP) + { + /* + * Emit description comment showing the full ACPI name + * of the ResourceTemplate only if it was defined using a + * Name statement. + */ + AcpiDmPredefinedDescription (Op->Asl.Parent); + } AcpiDmPredefinedDescription (Op->Asl.Parent); diff --git a/src/acpica/source/components/dispatcher/dsargs.c b/src/acpica/source/components/dispatcher/dsargs.c index 4a24160c..52246693 100644 --- a/src/acpica/source/components/dispatcher/dsargs.c +++ b/src/acpica/source/components/dispatcher/dsargs.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dscontrol.c b/src/acpica/source/components/dispatcher/dscontrol.c index 8b860a55..1d7d676c 100644 --- a/src/acpica/source/components/dispatcher/dscontrol.c +++ b/src/acpica/source/components/dispatcher/dscontrol.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsdebug.c b/src/acpica/source/components/dispatcher/dsdebug.c index 26504c5a..9111a215 100644 --- a/src/acpica/source/components/dispatcher/dsdebug.c +++ b/src/acpica/source/components/dispatcher/dsdebug.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsfield.c b/src/acpica/source/components/dispatcher/dsfield.c index bd2755ae..2d3851ff 100644 --- a/src/acpica/source/components/dispatcher/dsfield.c +++ b/src/acpica/source/components/dispatcher/dsfield.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsinit.c b/src/acpica/source/components/dispatcher/dsinit.c index 82857cb6..5f941f0c 100644 --- a/src/acpica/source/components/dispatcher/dsinit.c +++ b/src/acpica/source/components/dispatcher/dsinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsmethod.c b/src/acpica/source/components/dispatcher/dsmethod.c index fd56bd50..d5fc3038 100644 --- a/src/acpica/source/components/dispatcher/dsmethod.c +++ b/src/acpica/source/components/dispatcher/dsmethod.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsmthdat.c b/src/acpica/source/components/dispatcher/dsmthdat.c index ab0a9d11..af156790 100644 --- a/src/acpica/source/components/dispatcher/dsmthdat.c +++ b/src/acpica/source/components/dispatcher/dsmthdat.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsobject.c b/src/acpica/source/components/dispatcher/dsobject.c index 20dd20c1..5ffd198b 100644 --- a/src/acpica/source/components/dispatcher/dsobject.c +++ b/src/acpica/source/components/dispatcher/dsobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsopcode.c b/src/acpica/source/components/dispatcher/dsopcode.c index 579421fa..190be1b3 100644 --- a/src/acpica/source/components/dispatcher/dsopcode.c +++ b/src/acpica/source/components/dispatcher/dsopcode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dspkginit.c b/src/acpica/source/components/dispatcher/dspkginit.c index 06c03414..bd2bf2e3 100644 --- a/src/acpica/source/components/dispatcher/dspkginit.c +++ b/src/acpica/source/components/dispatcher/dspkginit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dsutils.c b/src/acpica/source/components/dispatcher/dsutils.c index 0bb4fb2d..b159b34c 100644 --- a/src/acpica/source/components/dispatcher/dsutils.c +++ b/src/acpica/source/components/dispatcher/dsutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswexec.c b/src/acpica/source/components/dispatcher/dswexec.c index 636067bf..686f03c8 100644 --- a/src/acpica/source/components/dispatcher/dswexec.c +++ b/src/acpica/source/components/dispatcher/dswexec.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -173,7 +173,7 @@ static ACPI_EXECUTE_OP AcpiGbl_OpTypeDispatch [] = AcpiExOpcode_0A_0T_1R, AcpiExOpcode_1A_0T_0R, AcpiExOpcode_1A_0T_1R, - AcpiExOpcode_1A_1T_0R, + NULL, /* Was: AcpiExOpcode_1A_0T_0R (Was for Load operator) */ AcpiExOpcode_1A_1T_1R, AcpiExOpcode_2A_0T_0R, AcpiExOpcode_2A_0T_1R, diff --git a/src/acpica/source/components/dispatcher/dswload.c b/src/acpica/source/components/dispatcher/dswload.c index a9b22dd1..4fdf955a 100644 --- a/src/acpica/source/components/dispatcher/dswload.c +++ b/src/acpica/source/components/dispatcher/dswload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswload2.c b/src/acpica/source/components/dispatcher/dswload2.c index 0311d0d9..496ee91f 100644 --- a/src/acpica/source/components/dispatcher/dswload2.c +++ b/src/acpica/source/components/dispatcher/dswload2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswscope.c b/src/acpica/source/components/dispatcher/dswscope.c index bc360b66..dad0c497 100644 --- a/src/acpica/source/components/dispatcher/dswscope.c +++ b/src/acpica/source/components/dispatcher/dswscope.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/dispatcher/dswstate.c b/src/acpica/source/components/dispatcher/dswstate.c index 9f79601f..68b7f3d1 100644 --- a/src/acpica/source/components/dispatcher/dswstate.c +++ b/src/acpica/source/components/dispatcher/dswstate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evevent.c b/src/acpica/source/components/events/evevent.c index b9359608..8b08338a 100644 --- a/src/acpica/source/components/events/evevent.c +++ b/src/acpica/source/components/events/evevent.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evglock.c b/src/acpica/source/components/events/evglock.c index 1eb740d9..79b519a0 100644 --- a/src/acpica/source/components/events/evglock.c +++ b/src/acpica/source/components/events/evglock.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evgpe.c b/src/acpica/source/components/events/evgpe.c index 45c506ab..b246567d 100644 --- a/src/acpica/source/components/events/evgpe.c +++ b/src/acpica/source/components/events/evgpe.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evgpeblk.c b/src/acpica/source/components/events/evgpeblk.c index 03bb0b05..4dac205e 100644 --- a/src/acpica/source/components/events/evgpeblk.c +++ b/src/acpica/source/components/events/evgpeblk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evgpeinit.c b/src/acpica/source/components/events/evgpeinit.c index 7a41fae0..6f0472cf 100644 --- a/src/acpica/source/components/events/evgpeinit.c +++ b/src/acpica/source/components/events/evgpeinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evgpeutil.c b/src/acpica/source/components/events/evgpeutil.c index 679ca698..1f66717d 100644 --- a/src/acpica/source/components/events/evgpeutil.c +++ b/src/acpica/source/components/events/evgpeutil.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evhandler.c b/src/acpica/source/components/events/evhandler.c index 763b294e..e0859c30 100644 --- a/src/acpica/source/components/events/evhandler.c +++ b/src/acpica/source/components/events/evhandler.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evmisc.c b/src/acpica/source/components/events/evmisc.c index 5052a1fd..b6c6eb6a 100644 --- a/src/acpica/source/components/events/evmisc.c +++ b/src/acpica/source/components/events/evmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evregion.c b/src/acpica/source/components/events/evregion.c index 6c73bc80..6cf77791 100644 --- a/src/acpica/source/components/events/evregion.c +++ b/src/acpica/source/components/events/evregion.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -320,14 +320,14 @@ AcpiEvAddressSpaceDispatch ( return_ACPI_STATUS (AE_NOT_EXIST); } - if (RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM) - { - ACPI_PCC_INFO *Ctx = HandlerDesc->AddressSpace.Context; + if (RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM) + { + ACPI_PCC_INFO *Ctx = HandlerDesc->AddressSpace.Context; - Ctx->InternalBuffer = FieldObj->Field.InternalPccBuffer; - Ctx->Length = (UINT16) RegionObj->Region.Length; - Ctx->SubspaceId = (UINT8) RegionObj->Region.Address; - } + Ctx->InternalBuffer = FieldObj->Field.InternalPccBuffer; + Ctx->Length = (UINT16) RegionObj->Region.Length; + Ctx->SubspaceId = (UINT8) RegionObj->Region.Address; + } /* * We must exit the interpreter because the region setup will diff --git a/src/acpica/source/components/events/evrgnini.c b/src/acpica/source/components/events/evrgnini.c index 6959ff98..7cbbe30c 100644 --- a/src/acpica/source/components/events/evrgnini.c +++ b/src/acpica/source/components/events/evrgnini.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evsci.c b/src/acpica/source/components/events/evsci.c index 47ac23f8..26891925 100644 --- a/src/acpica/source/components/events/evsci.c +++ b/src/acpica/source/components/events/evsci.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evxface.c b/src/acpica/source/components/events/evxface.c index 01d5f00f..245ca8a4 100644 --- a/src/acpica/source/components/events/evxface.c +++ b/src/acpica/source/components/events/evxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evxfevnt.c b/src/acpica/source/components/events/evxfevnt.c index a3454711..3384e098 100644 --- a/src/acpica/source/components/events/evxfevnt.c +++ b/src/acpica/source/components/events/evxfevnt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evxfgpe.c b/src/acpica/source/components/events/evxfgpe.c index 1fe27e75..87dab0f8 100644 --- a/src/acpica/source/components/events/evxfgpe.c +++ b/src/acpica/source/components/events/evxfgpe.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/events/evxfregn.c b/src/acpica/source/components/events/evxfregn.c index 3febc81c..ee44e10d 100644 --- a/src/acpica/source/components/events/evxfregn.c +++ b/src/acpica/source/components/events/evxfregn.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exconcat.c b/src/acpica/source/components/executer/exconcat.c index bd7374e8..335d78f1 100644 --- a/src/acpica/source/components/executer/exconcat.c +++ b/src/acpica/source/components/executer/exconcat.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exconfig.c b/src/acpica/source/components/executer/exconfig.c index ff26ade7..a87316ba 100644 --- a/src/acpica/source/components/executer/exconfig.c +++ b/src/acpica/source/components/executer/exconfig.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -244,6 +244,7 @@ AcpiExLoadTableOp ( ACPI_NAMESPACE_NODE *ParentNode; ACPI_NAMESPACE_NODE *StartNode; ACPI_NAMESPACE_NODE *ParameterNode = NULL; + ACPI_OPERAND_OBJECT *ReturnObj; ACPI_OPERAND_OBJECT *DdbHandle; UINT32 TableIndex; @@ -251,6 +252,16 @@ AcpiExLoadTableOp ( ACPI_FUNCTION_TRACE (ExLoadTableOp); + /* Create the return object */ + + ReturnObj = AcpiUtCreateIntegerObject ((UINT64) 0); + if (!ReturnObj) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } + + *ReturnDesc = ReturnObj; + /* Find the ACPI table in the RSDT/XSDT */ AcpiExExitInterpreter (); @@ -268,13 +279,6 @@ AcpiExLoadTableOp ( /* Table not found, return an Integer=0 and AE_OK */ - DdbHandle = AcpiUtCreateIntegerObject ((UINT64) 0); - if (!DdbHandle) - { - return_ACPI_STATUS (AE_NO_MEMORY); - } - - *ReturnDesc = DdbHandle; return_ACPI_STATUS (AE_OK); } @@ -365,7 +369,13 @@ AcpiExLoadTableOp ( } } - *ReturnDesc = DdbHandle; + /* Remove the reference to DdbHandle created by AcpiExAddTable above */ + + AcpiUtRemoveReference (DdbHandle); + + /* Return -1 (non-zero) indicates success */ + + ReturnObj->Integer.Value = 0xFFFFFFFFFFFFFFFF; return_ACPI_STATUS (Status); } @@ -423,7 +433,7 @@ AcpiExRegionRead ( * * PARAMETERS: ObjDesc - Region or Buffer/Field where the table will be * obtained - * Target - Where a handle to the table will be stored + * Target - Where the status of the load will be stored * WalkState - Current state * * RETURN: Status @@ -455,6 +465,18 @@ AcpiExLoadOp ( ACPI_FUNCTION_TRACE (ExLoadOp); + if (Target->Common.DescriptorType == ACPI_DESC_TYPE_NAMED) + { + Target = AcpiNsGetAttachedObject (ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, Target)); + } + if (Target->Common.Type != ACPI_TYPE_INTEGER) + { + fprintf (stderr, "Type not integer: %X\n", Target->Common.Type); + return_ACPI_STATUS (AE_AML_OPERAND_TYPE); + } + + Target->Integer.Value = 0; + /* Source Object can be either an OpRegion or a Buffer/Field */ switch (ObjDesc->Common.Type) @@ -616,8 +638,6 @@ AcpiExLoadOp ( Status = AcpiExAddTable (TableIndex, &DdbHandle); if (ACPI_FAILURE (Status)) { - /* On error, TablePtr was deallocated above */ - return_ACPI_STATUS (Status); } @@ -627,22 +647,13 @@ AcpiExLoadOp ( AcpiNsInitializeObjects (); AcpiExEnterInterpreter (); - /* Store the DdbHandle into the Target operand */ + /* Remove the reference to DdbHandle created by AcpiExAddTable above */ - Status = AcpiExStore (DdbHandle, Target, WalkState); - if (ACPI_FAILURE (Status)) - { - (void) AcpiExUnloadTable (DdbHandle); - - /* TablePtr was deallocated above */ - - AcpiUtRemoveReference (DdbHandle); - return_ACPI_STATUS (Status); - } + AcpiUtRemoveReference (DdbHandle); - /* Remove the reference by added by AcpiExStore above */ + /* Return -1 (non-zero) indicates success */ - AcpiUtRemoveReference (DdbHandle); + Target->Integer.Value = 0xFFFFFFFFFFFFFFFF; return_ACPI_STATUS (Status); } diff --git a/src/acpica/source/components/executer/exconvrt.c b/src/acpica/source/components/executer/exconvrt.c index 4f6077ff..c9572e90 100644 --- a/src/acpica/source/components/executer/exconvrt.c +++ b/src/acpica/source/components/executer/exconvrt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/excreate.c b/src/acpica/source/components/executer/excreate.c index 18a3af2f..e8381081 100644 --- a/src/acpica/source/components/executer/excreate.c +++ b/src/acpica/source/components/executer/excreate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exdebug.c b/src/acpica/source/components/executer/exdebug.c index 39fc7352..88f75966 100644 --- a/src/acpica/source/components/executer/exdebug.c +++ b/src/acpica/source/components/executer/exdebug.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exdump.c b/src/acpica/source/components/executer/exdump.c index b14cfe84..e72ac01f 100644 --- a/src/acpica/source/components/executer/exdump.c +++ b/src/acpica/source/components/executer/exdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exfield.c b/src/acpica/source/components/executer/exfield.c index b33ab5b3..2834e7b3 100644 --- a/src/acpica/source/components/executer/exfield.c +++ b/src/acpica/source/components/executer/exfield.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exfldio.c b/src/acpica/source/components/executer/exfldio.c index 6a5a5fe1..30d17c19 100644 --- a/src/acpica/source/components/executer/exfldio.c +++ b/src/acpica/source/components/executer/exfldio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -262,7 +262,7 @@ AcpiExSetupRegion ( #ifdef ACPI_UNDER_DEVELOPMENT /* * If the Field access is AnyAcc, we can now compute the optimal - * access (because we know know the length of the parent region) + * access (because we know the length of the parent region) */ if (!(ObjDesc->Common.Flags & AOPOBJ_DATA_VALID)) { diff --git a/src/acpica/source/components/executer/exmisc.c b/src/acpica/source/components/executer/exmisc.c index 220417b9..4a1e2ff2 100644 --- a/src/acpica/source/components/executer/exmisc.c +++ b/src/acpica/source/components/executer/exmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exmutex.c b/src/acpica/source/components/executer/exmutex.c index 010f5bdd..8b335680 100644 --- a/src/acpica/source/components/executer/exmutex.c +++ b/src/acpica/source/components/executer/exmutex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exnames.c b/src/acpica/source/components/executer/exnames.c index 02590728..6045bc6b 100644 --- a/src/acpica/source/components/executer/exnames.c +++ b/src/acpica/source/components/executer/exnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg1.c b/src/acpica/source/components/executer/exoparg1.c index 424e1e99..2d9bbddf 100644 --- a/src/acpica/source/components/executer/exoparg1.c +++ b/src/acpica/source/components/executer/exoparg1.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -323,6 +323,7 @@ AcpiExOpcode_1A_0T_0R ( } +#ifdef _OBSOLETE_CODE /* Was originally used for Load() operator */ /******************************************************************************* * * FUNCTION: AcpiExOpcode_1A_1T_0R @@ -352,10 +353,12 @@ AcpiExOpcode_1A_1T_0R ( switch (WalkState->Opcode) { +#ifdef _OBSOLETE_CODE case AML_LOAD_OP: Status = AcpiExLoadOp (Operand[0], Operand[1], WalkState); break; +#endif default: /* Unknown opcode */ @@ -370,7 +373,7 @@ Cleanup: return_ACPI_STATUS (Status); } - +#endif /******************************************************************************* * @@ -382,6 +385,8 @@ Cleanup: * * DESCRIPTION: Execute opcode with one argument, one target, and a * return value. + * January 2022: Added Load operator, with new ACPI 6.4 + * semantics. * ******************************************************************************/ @@ -411,6 +416,7 @@ AcpiExOpcode_1A_1T_1R ( case AML_FIND_SET_LEFT_BIT_OP: case AML_FIND_SET_RIGHT_BIT_OP: case AML_FROM_BCD_OP: + case AML_LOAD_OP: case AML_TO_BCD_OP: case AML_CONDITIONAL_REF_OF_OP: @@ -512,6 +518,18 @@ AcpiExOpcode_1A_1T_1R ( } break; + case AML_LOAD_OP: /* Result1 = Load (Operand[0], Result1) */ + + ReturnDesc->Integer.Value = 0; + Status = AcpiExLoadOp (Operand[0], ReturnDesc, WalkState); + if (ACPI_SUCCESS (Status)) + { + /* Return -1 (non-zero) indicates success */ + + ReturnDesc->Integer.Value = 0xFFFFFFFFFFFFFFFF; + } + break; + case AML_TO_BCD_OP: /* ToBcd (Operand, Result) */ ReturnDesc->Integer.Value = 0; diff --git a/src/acpica/source/components/executer/exoparg2.c b/src/acpica/source/components/executer/exoparg2.c index d1fc7c11..8b63d615 100644 --- a/src/acpica/source/components/executer/exoparg2.c +++ b/src/acpica/source/components/executer/exoparg2.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg3.c b/src/acpica/source/components/executer/exoparg3.c index 02e73bd4..7b74d32e 100644 --- a/src/acpica/source/components/executer/exoparg3.c +++ b/src/acpica/source/components/executer/exoparg3.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exoparg6.c b/src/acpica/source/components/executer/exoparg6.c index 23f8e295..5506b2c1 100644 --- a/src/acpica/source/components/executer/exoparg6.c +++ b/src/acpica/source/components/executer/exoparg6.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exprep.c b/src/acpica/source/components/executer/exprep.c index c7b55c54..6d239d7a 100644 --- a/src/acpica/source/components/executer/exprep.c +++ b/src/acpica/source/components/executer/exprep.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exregion.c b/src/acpica/source/components/executer/exregion.c index cd1fa2eb..01d49065 100644 --- a/src/acpica/source/components/executer/exregion.c +++ b/src/acpica/source/components/executer/exregion.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exresnte.c b/src/acpica/source/components/executer/exresnte.c index 445a1b5e..6801b25b 100644 --- a/src/acpica/source/components/executer/exresnte.c +++ b/src/acpica/source/components/executer/exresnte.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exresolv.c b/src/acpica/source/components/executer/exresolv.c index 78b26041..af5202ab 100644 --- a/src/acpica/source/components/executer/exresolv.c +++ b/src/acpica/source/components/executer/exresolv.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exresop.c b/src/acpica/source/components/executer/exresop.c index 619da90f..4abe9376 100644 --- a/src/acpica/source/components/executer/exresop.c +++ b/src/acpica/source/components/executer/exresop.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exserial.c b/src/acpica/source/components/executer/exserial.c index 776409db..4dfd6599 100644 --- a/src/acpica/source/components/executer/exserial.c +++ b/src/acpica/source/components/executer/exserial.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exstore.c b/src/acpica/source/components/executer/exstore.c index 79564db3..ba1a05d9 100644 --- a/src/acpica/source/components/executer/exstore.c +++ b/src/acpica/source/components/executer/exstore.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exstoren.c b/src/acpica/source/components/executer/exstoren.c index f43e67cd..df4a6f40 100644 --- a/src/acpica/source/components/executer/exstoren.c +++ b/src/acpica/source/components/executer/exstoren.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exstorob.c b/src/acpica/source/components/executer/exstorob.c index 1ed93734..56d048a7 100644 --- a/src/acpica/source/components/executer/exstorob.c +++ b/src/acpica/source/components/executer/exstorob.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exsystem.c b/src/acpica/source/components/executer/exsystem.c index cf10a5e7..62768bcf 100644 --- a/src/acpica/source/components/executer/exsystem.c +++ b/src/acpica/source/components/executer/exsystem.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -265,7 +265,7 @@ AcpiExSystemWaitMutex ( * * FUNCTION: AcpiExSystemDoStall * - * PARAMETERS: HowLong - The amount of time to stall, + * PARAMETERS: HowLongUs - The amount of time to stall, * in microseconds * * RETURN: Status @@ -280,7 +280,7 @@ AcpiExSystemWaitMutex ( ACPI_STATUS AcpiExSystemDoStall ( - UINT32 HowLong) + UINT32 HowLongUs) { ACPI_STATUS Status = AE_OK; @@ -288,21 +288,26 @@ AcpiExSystemDoStall ( ACPI_FUNCTION_ENTRY (); - if (HowLong > 255) /* 255 microseconds */ + if (HowLongUs > 255) { /* - * Longer than 255 usec, this is an error + * Longer than 255 microseconds, this is an error * * (ACPI specifies 100 usec as max, but this gives some slack in * order to support existing BIOSs) */ ACPI_ERROR ((AE_INFO, - "Time parameter is too large (%u)", HowLong)); + "Time parameter is too large (%u)", HowLongUs)); Status = AE_AML_OPERAND_VALUE; } else { - AcpiOsStall (HowLong); + if (HowLongUs > 100) + { + ACPI_WARNING ((AE_INFO, + "Time parameter %u us > 100 us violating ACPI spec, please fix the firmware.", HowLongUs)); + } + AcpiOsStall (HowLongUs); } return (Status); @@ -313,7 +318,7 @@ AcpiExSystemDoStall ( * * FUNCTION: AcpiExSystemDoSleep * - * PARAMETERS: HowLong - The amount of time to sleep, + * PARAMETERS: HowLongMs - The amount of time to sleep, * in milliseconds * * RETURN: None @@ -324,7 +329,7 @@ AcpiExSystemDoStall ( ACPI_STATUS AcpiExSystemDoSleep ( - UINT64 HowLong) + UINT64 HowLongMs) { ACPI_FUNCTION_ENTRY (); @@ -333,16 +338,28 @@ AcpiExSystemDoSleep ( AcpiExExitInterpreter (); + /* + * Warn users about excessive sleep times, so ASL code can be improved to + * use polling or similar techniques. + */ + if (HowLongMs > 10) + { + ACPI_WARNING ((AE_INFO, + "Firmware issue: Excessive sleep time (0x%8.8X%8.8X ms > 10 ms)" + " in ACPI Control Method", + ACPI_FORMAT_UINT64 (HowLongMs))); + } + /* * For compatibility with other ACPI implementations and to prevent * accidental deep sleeps, limit the sleep time to something reasonable. */ - if (HowLong > ACPI_MAX_SLEEP) + if (HowLongMs > ACPI_MAX_SLEEP) { - HowLong = ACPI_MAX_SLEEP; + HowLongMs = ACPI_MAX_SLEEP; } - AcpiOsSleep (HowLong); + AcpiOsSleep (HowLongMs); /* And now we must get the interpreter again */ diff --git a/src/acpica/source/components/executer/extrace.c b/src/acpica/source/components/executer/extrace.c index 22c2b8bb..a677393f 100644 --- a/src/acpica/source/components/executer/extrace.c +++ b/src/acpica/source/components/executer/extrace.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/executer/exutils.c b/src/acpica/source/components/executer/exutils.c index 86114c8e..e27f567b 100644 --- a/src/acpica/source/components/executer/exutils.c +++ b/src/acpica/source/components/executer/exutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwacpi.c b/src/acpica/source/components/hardware/hwacpi.c index 71b71cbc..8b322209 100644 --- a/src/acpica/source/components/hardware/hwacpi.c +++ b/src/acpica/source/components/hardware/hwacpi.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwesleep.c b/src/acpica/source/components/hardware/hwesleep.c index 19463e5a..85e4cb95 100644 --- a/src/acpica/source/components/hardware/hwesleep.c +++ b/src/acpica/source/components/hardware/hwesleep.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwgpe.c b/src/acpica/source/components/hardware/hwgpe.c index bf333a3f..7f9a5f05 100644 --- a/src/acpica/source/components/hardware/hwgpe.c +++ b/src/acpica/source/components/hardware/hwgpe.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwpci.c b/src/acpica/source/components/hardware/hwpci.c index 1b0721e3..b8e8aa9f 100644 --- a/src/acpica/source/components/hardware/hwpci.c +++ b/src/acpica/source/components/hardware/hwpci.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwregs.c b/src/acpica/source/components/hardware/hwregs.c index 712a0887..7b4ae88a 100644 --- a/src/acpica/source/components/hardware/hwregs.c +++ b/src/acpica/source/components/hardware/hwregs.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -633,7 +633,7 @@ AcpiHwGetBitRegisterInfo ( * RETURN: Status * * DESCRIPTION: Write the PM1 A/B control registers. These registers are - * different than than the PM1 A/B status and enable registers + * different than the PM1 A/B status and enable registers * in that different values can be written to the A/B registers. * Most notably, the SLP_TYP bits can be different, as per the * values returned from the _Sx predefined methods. diff --git a/src/acpica/source/components/hardware/hwsleep.c b/src/acpica/source/components/hardware/hwsleep.c index 4d581da3..45ff336a 100644 --- a/src/acpica/source/components/hardware/hwsleep.c +++ b/src/acpica/source/components/hardware/hwsleep.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwvalid.c b/src/acpica/source/components/hardware/hwvalid.c index 96b5ac7e..d297905b 100644 --- a/src/acpica/source/components/hardware/hwvalid.c +++ b/src/acpica/source/components/hardware/hwvalid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwxface.c b/src/acpica/source/components/hardware/hwxface.c index 5daed99a..8fd3561a 100644 --- a/src/acpica/source/components/hardware/hwxface.c +++ b/src/acpica/source/components/hardware/hwxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/hardware/hwxfsleep.c b/src/acpica/source/components/hardware/hwxfsleep.c index 106dea0d..5f8b7db0 100644 --- a/src/acpica/source/components/hardware/hwxfsleep.c +++ b/src/acpica/source/components/hardware/hwxfsleep.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsaccess.c b/src/acpica/source/components/namespace/nsaccess.c index 4286223e..2b810fac 100644 --- a/src/acpica/source/components/namespace/nsaccess.c +++ b/src/acpica/source/components/namespace/nsaccess.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsalloc.c b/src/acpica/source/components/namespace/nsalloc.c index 1deb87c6..560f6f36 100644 --- a/src/acpica/source/components/namespace/nsalloc.c +++ b/src/acpica/source/components/namespace/nsalloc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsarguments.c b/src/acpica/source/components/namespace/nsarguments.c index fe511565..2da06f2f 100644 --- a/src/acpica/source/components/namespace/nsarguments.c +++ b/src/acpica/source/components/namespace/nsarguments.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsconvert.c b/src/acpica/source/components/namespace/nsconvert.c index 7d68386d..2971f08e 100644 --- a/src/acpica/source/components/namespace/nsconvert.c +++ b/src/acpica/source/components/namespace/nsconvert.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsdump.c b/src/acpica/source/components/namespace/nsdump.c index 63a449ab..36cfbdf6 100644 --- a/src/acpica/source/components/namespace/nsdump.c +++ b/src/acpica/source/components/namespace/nsdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsdumpdv.c b/src/acpica/source/components/namespace/nsdumpdv.c index 55ab899d..0cc9b5a5 100644 --- a/src/acpica/source/components/namespace/nsdumpdv.c +++ b/src/acpica/source/components/namespace/nsdumpdv.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nseval.c b/src/acpica/source/components/namespace/nseval.c index 1b80202b..1cb07615 100644 --- a/src/acpica/source/components/namespace/nseval.c +++ b/src/acpica/source/components/namespace/nseval.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsinit.c b/src/acpica/source/components/namespace/nsinit.c index cc15644f..c523035f 100644 --- a/src/acpica/source/components/namespace/nsinit.c +++ b/src/acpica/source/components/namespace/nsinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsload.c b/src/acpica/source/components/namespace/nsload.c index 0a368ab3..c3423e55 100644 --- a/src/acpica/source/components/namespace/nsload.c +++ b/src/acpica/source/components/namespace/nsload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsnames.c b/src/acpica/source/components/namespace/nsnames.c index 4c0f6991..c8412c2e 100644 --- a/src/acpica/source/components/namespace/nsnames.c +++ b/src/acpica/source/components/namespace/nsnames.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsobject.c b/src/acpica/source/components/namespace/nsobject.c index 529d816f..82d735eb 100644 --- a/src/acpica/source/components/namespace/nsobject.c +++ b/src/acpica/source/components/namespace/nsobject.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsparse.c b/src/acpica/source/components/namespace/nsparse.c index 5f7973aa..0ac5efb4 100644 --- a/src/acpica/source/components/namespace/nsparse.c +++ b/src/acpica/source/components/namespace/nsparse.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nspredef.c b/src/acpica/source/components/namespace/nspredef.c index 410eaeb0..e28d6896 100644 --- a/src/acpica/source/components/namespace/nspredef.c +++ b/src/acpica/source/components/namespace/nspredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsprepkg.c b/src/acpica/source/components/namespace/nsprepkg.c index e56bcb5d..e6959dac 100644 --- a/src/acpica/source/components/namespace/nsprepkg.c +++ b/src/acpica/source/components/namespace/nsprepkg.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsrepair.c b/src/acpica/source/components/namespace/nsrepair.c index 24094714..59f7aa33 100644 --- a/src/acpica/source/components/namespace/nsrepair.c +++ b/src/acpica/source/components/namespace/nsrepair.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsrepair2.c b/src/acpica/source/components/namespace/nsrepair2.c index 40f0634d..bf76b7dd 100644 --- a/src/acpica/source/components/namespace/nsrepair2.c +++ b/src/acpica/source/components/namespace/nsrepair2.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nssearch.c b/src/acpica/source/components/namespace/nssearch.c index 408a38e6..706963c4 100644 --- a/src/acpica/source/components/namespace/nssearch.c +++ b/src/acpica/source/components/namespace/nssearch.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsutils.c b/src/acpica/source/components/namespace/nsutils.c index 1ce7fe40..f4208179 100644 --- a/src/acpica/source/components/namespace/nsutils.c +++ b/src/acpica/source/components/namespace/nsutils.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nswalk.c b/src/acpica/source/components/namespace/nswalk.c index 50c5ed5b..3d0fc639 100644 --- a/src/acpica/source/components/namespace/nswalk.c +++ b/src/acpica/source/components/namespace/nswalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -322,6 +322,10 @@ AcpiNsWalkNamespace ( if (StartNode == ACPI_ROOT_OBJECT) { StartNode = AcpiGbl_RootNode; + if (!StartNode) + { + return_ACPI_STATUS (AE_NO_NAMESPACE); + } } /* Null child means "get first node" */ diff --git a/src/acpica/source/components/namespace/nsxfeval.c b/src/acpica/source/components/namespace/nsxfeval.c index b067f6e8..9724d024 100644 --- a/src/acpica/source/components/namespace/nsxfeval.c +++ b/src/acpica/source/components/namespace/nsxfeval.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsxfname.c b/src/acpica/source/components/namespace/nsxfname.c index 7a7393b6..7d52330f 100644 --- a/src/acpica/source/components/namespace/nsxfname.c +++ b/src/acpica/source/components/namespace/nsxfname.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/namespace/nsxfobj.c b/src/acpica/source/components/namespace/nsxfobj.c index fb08e76f..2aa1fc17 100644 --- a/src/acpica/source/components/namespace/nsxfobj.c +++ b/src/acpica/source/components/namespace/nsxfobj.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psargs.c b/src/acpica/source/components/parser/psargs.c index 895feba0..f510623e 100644 --- a/src/acpica/source/components/parser/psargs.c +++ b/src/acpica/source/components/parser/psargs.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psloop.c b/src/acpica/source/components/parser/psloop.c index 478256f2..2b4c1f2a 100644 --- a/src/acpica/source/components/parser/psloop.c +++ b/src/acpica/source/components/parser/psloop.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psobject.c b/src/acpica/source/components/parser/psobject.c index c0c3e965..18a32ef3 100644 --- a/src/acpica/source/components/parser/psobject.c +++ b/src/acpica/source/components/parser/psobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psopcode.c b/src/acpica/source/components/parser/psopcode.c index 4f153303..540716af 100644 --- a/src/acpica/source/components/parser/psopcode.c +++ b/src/acpica/source/components/parser/psopcode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -375,7 +375,7 @@ const ACPI_OPCODE_INFO AcpiGbl_AmlOpInfo[AML_NUM_OPCODES] = /* 47 */ ACPI_OP ("Event", ARGP_EVENT_OP, ARGI_EVENT_OP, ACPI_TYPE_EVENT, AML_CLASS_NAMED_OBJECT, AML_TYPE_NAMED_SIMPLE, AML_NSOBJECT | AML_NSOPCODE | AML_NSNODE | AML_NAMED ), /* 48 */ ACPI_OP ("CondRefOf", ARGP_COND_REF_OF_OP, ARGI_COND_REF_OF_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R), /* 49 */ ACPI_OP ("CreateField", ARGP_CREATE_FIELD_OP, ARGI_CREATE_FIELD_OP, ACPI_TYPE_BUFFER_FIELD, AML_CLASS_CREATE, AML_TYPE_CREATE_FIELD, AML_HAS_ARGS | AML_NSOBJECT | AML_NSNODE | AML_DEFER | AML_FIELD | AML_CREATE), -/* 4A */ ACPI_OP ("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_0R, AML_FLAGS_EXEC_1A_1T_0R), +/* 4A */ ACPI_OP ("Load", ARGP_LOAD_OP, ARGI_LOAD_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_1T_1R, AML_FLAGS_EXEC_1A_1T_1R), /* 4B */ ACPI_OP ("Stall", ARGP_STALL_OP, ARGI_STALL_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R), /* 4C */ ACPI_OP ("Sleep", ARGP_SLEEP_OP, ARGI_SLEEP_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_1A_0T_0R, AML_FLAGS_EXEC_1A_0T_0R), /* 4D */ ACPI_OP ("Acquire", ARGP_ACQUIRE_OP, ARGI_ACQUIRE_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_2A_0T_1R, AML_FLAGS_EXEC_2A_0T_1R), diff --git a/src/acpica/source/components/parser/psopinfo.c b/src/acpica/source/components/parser/psopinfo.c index 30447c78..fcb080ca 100644 --- a/src/acpica/source/components/parser/psopinfo.c +++ b/src/acpica/source/components/parser/psopinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psparse.c b/src/acpica/source/components/parser/psparse.c index 3b2a3c4c..e0cd5915 100644 --- a/src/acpica/source/components/parser/psparse.c +++ b/src/acpica/source/components/parser/psparse.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psscope.c b/src/acpica/source/components/parser/psscope.c index cbe575dc..269410a6 100644 --- a/src/acpica/source/components/parser/psscope.c +++ b/src/acpica/source/components/parser/psscope.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/pstree.c b/src/acpica/source/components/parser/pstree.c index 7f92b773..92f62304 100644 --- a/src/acpica/source/components/parser/pstree.c +++ b/src/acpica/source/components/parser/pstree.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psutils.c b/src/acpica/source/components/parser/psutils.c index 223f68db..a9ea3536 100644 --- a/src/acpica/source/components/parser/psutils.c +++ b/src/acpica/source/components/parser/psutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/pswalk.c b/src/acpica/source/components/parser/pswalk.c index 0d5b78dd..31232fd4 100644 --- a/src/acpica/source/components/parser/pswalk.c +++ b/src/acpica/source/components/parser/pswalk.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/parser/psxface.c b/src/acpica/source/components/parser/psxface.c index 102033fe..295da1af 100644 --- a/src/acpica/source/components/parser/psxface.c +++ b/src/acpica/source/components/parser/psxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsaddr.c b/src/acpica/source/components/resources/rsaddr.c index 06f8c44a..93d45ca3 100644 --- a/src/acpica/source/components/resources/rsaddr.c +++ b/src/acpica/source/components/resources/rsaddr.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rscalc.c b/src/acpica/source/components/resources/rscalc.c index 2e878e80..c966636b 100644 --- a/src/acpica/source/components/resources/rscalc.c +++ b/src/acpica/source/components/resources/rscalc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rscreate.c b/src/acpica/source/components/resources/rscreate.c index 8443d752..6c230bce 100644 --- a/src/acpica/source/components/resources/rscreate.c +++ b/src/acpica/source/components/resources/rscreate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsdump.c b/src/acpica/source/components/resources/rsdump.c index 44b552ad..e8f13724 100644 --- a/src/acpica/source/components/resources/rsdump.c +++ b/src/acpica/source/components/resources/rsdump.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsdumpinfo.c b/src/acpica/source/components/resources/rsdumpinfo.c index 26f4993d..83b22caa 100644 --- a/src/acpica/source/components/resources/rsdumpinfo.c +++ b/src/acpica/source/components/resources/rsdumpinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsinfo.c b/src/acpica/source/components/resources/rsinfo.c index 9687bfb4..b9d4df46 100644 --- a/src/acpica/source/components/resources/rsinfo.c +++ b/src/acpica/source/components/resources/rsinfo.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsio.c b/src/acpica/source/components/resources/rsio.c index 4be6a7d1..29932623 100644 --- a/src/acpica/source/components/resources/rsio.c +++ b/src/acpica/source/components/resources/rsio.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsirq.c b/src/acpica/source/components/resources/rsirq.c index 1a44bdbe..9a8fc18f 100644 --- a/src/acpica/source/components/resources/rsirq.c +++ b/src/acpica/source/components/resources/rsirq.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rslist.c b/src/acpica/source/components/resources/rslist.c index 1867c0a9..fdd24688 100644 --- a/src/acpica/source/components/resources/rslist.c +++ b/src/acpica/source/components/resources/rslist.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsmemory.c b/src/acpica/source/components/resources/rsmemory.c index e5562a04..e527bad7 100644 --- a/src/acpica/source/components/resources/rsmemory.c +++ b/src/acpica/source/components/resources/rsmemory.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsmisc.c b/src/acpica/source/components/resources/rsmisc.c index f0f186b8..16c52134 100644 --- a/src/acpica/source/components/resources/rsmisc.c +++ b/src/acpica/source/components/resources/rsmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsserial.c b/src/acpica/source/components/resources/rsserial.c index d505ea94..3075b4c4 100644 --- a/src/acpica/source/components/resources/rsserial.c +++ b/src/acpica/source/components/resources/rsserial.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsutils.c b/src/acpica/source/components/resources/rsutils.c index 6aa28337..7110406f 100644 --- a/src/acpica/source/components/resources/rsutils.c +++ b/src/acpica/source/components/resources/rsutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/resources/rsxface.c b/src/acpica/source/components/resources/rsxface.c index 3f055af4..d3aaf1d0 100644 --- a/src/acpica/source/components/resources/rsxface.c +++ b/src/acpica/source/components/resources/rsxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbdata.c b/src/acpica/source/components/tables/tbdata.c index 6f3f7113..5e4f7ca7 100644 --- a/src/acpica/source/components/tables/tbdata.c +++ b/src/acpica/source/components/tables/tbdata.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbfadt.c b/src/acpica/source/components/tables/tbfadt.c index ff00c2f2..7ae35f19 100644 --- a/src/acpica/source/components/tables/tbfadt.c +++ b/src/acpica/source/components/tables/tbfadt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbfind.c b/src/acpica/source/components/tables/tbfind.c index 1bc21b3e..81ed2d97 100644 --- a/src/acpica/source/components/tables/tbfind.c +++ b/src/acpica/source/components/tables/tbfind.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbinstal.c b/src/acpica/source/components/tables/tbinstal.c index f628b460..9253bd1d 100644 --- a/src/acpica/source/components/tables/tbinstal.c +++ b/src/acpica/source/components/tables/tbinstal.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbprint.c b/src/acpica/source/components/tables/tbprint.c index 5985abdb..0b53e737 100644 --- a/src/acpica/source/components/tables/tbprint.c +++ b/src/acpica/source/components/tables/tbprint.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbutils.c b/src/acpica/source/components/tables/tbutils.c index 76d8ef3b..d2a30dc3 100644 --- a/src/acpica/source/components/tables/tbutils.c +++ b/src/acpica/source/components/tables/tbutils.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbxface.c b/src/acpica/source/components/tables/tbxface.c index d861d9e6..919ad138 100644 --- a/src/acpica/source/components/tables/tbxface.c +++ b/src/acpica/source/components/tables/tbxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbxfload.c b/src/acpica/source/components/tables/tbxfload.c index 9e90c91b..ddd9b795 100644 --- a/src/acpica/source/components/tables/tbxfload.c +++ b/src/acpica/source/components/tables/tbxfload.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/tables/tbxfroot.c b/src/acpica/source/components/tables/tbxfroot.c index ed33c9b6..bb90f605 100644 --- a/src/acpica/source/components/tables/tbxfroot.c +++ b/src/acpica/source/components/tables/tbxfroot.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utaddress.c b/src/acpica/source/components/utilities/utaddress.c index 92039cfa..5aa12832 100644 --- a/src/acpica/source/components/utilities/utaddress.c +++ b/src/acpica/source/components/utilities/utaddress.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utalloc.c b/src/acpica/source/components/utilities/utalloc.c index 276a5319..aa06339c 100644 --- a/src/acpica/source/components/utilities/utalloc.c +++ b/src/acpica/source/components/utilities/utalloc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utascii.c b/src/acpica/source/components/utilities/utascii.c index a375e44d..db238902 100644 --- a/src/acpica/source/components/utilities/utascii.c +++ b/src/acpica/source/components/utilities/utascii.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utbuffer.c b/src/acpica/source/components/utilities/utbuffer.c index 214ff20b..2cf097bf 100644 --- a/src/acpica/source/components/utilities/utbuffer.c +++ b/src/acpica/source/components/utilities/utbuffer.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utcache.c b/src/acpica/source/components/utilities/utcache.c index 4e5de96f..2ff1540c 100644 --- a/src/acpica/source/components/utilities/utcache.c +++ b/src/acpica/source/components/utilities/utcache.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utcopy.c b/src/acpica/source/components/utilities/utcopy.c index 32941648..e725d55b 100644 --- a/src/acpica/source/components/utilities/utcopy.c +++ b/src/acpica/source/components/utilities/utcopy.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utdebug.c b/src/acpica/source/components/utilities/utdebug.c index 6d8ab27b..f789e686 100644 --- a/src/acpica/source/components/utilities/utdebug.c +++ b/src/acpica/source/components/utilities/utdebug.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utdecode.c b/src/acpica/source/components/utilities/utdecode.c index 11818b4f..2a49cbd8 100644 --- a/src/acpica/source/components/utilities/utdecode.c +++ b/src/acpica/source/components/utilities/utdecode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utdelete.c b/src/acpica/source/components/utilities/utdelete.c index de114cb6..b36c4bb3 100644 --- a/src/acpica/source/components/utilities/utdelete.c +++ b/src/acpica/source/components/utilities/utdelete.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uterror.c b/src/acpica/source/components/utilities/uterror.c index 51ce8d59..2aee4d54 100644 --- a/src/acpica/source/components/utilities/uterror.c +++ b/src/acpica/source/components/utilities/uterror.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uteval.c b/src/acpica/source/components/utilities/uteval.c index 9e30ee8d..f4ccea68 100644 --- a/src/acpica/source/components/utilities/uteval.c +++ b/src/acpica/source/components/utilities/uteval.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utexcep.c b/src/acpica/source/components/utilities/utexcep.c index 4e7e3f55..279d33fc 100644 --- a/src/acpica/source/components/utilities/utexcep.c +++ b/src/acpica/source/components/utilities/utexcep.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utglobal.c b/src/acpica/source/components/utilities/utglobal.c index 65189ff2..7de4a9c3 100644 --- a/src/acpica/source/components/utilities/utglobal.c +++ b/src/acpica/source/components/utilities/utglobal.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uthex.c b/src/acpica/source/components/utilities/uthex.c index 5cbc8fa6..c64d3def 100644 --- a/src/acpica/source/components/utilities/uthex.c +++ b/src/acpica/source/components/utilities/uthex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utids.c b/src/acpica/source/components/utilities/utids.c index 4ef4fcca..498338a1 100644 --- a/src/acpica/source/components/utilities/utids.c +++ b/src/acpica/source/components/utilities/utids.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utinit.c b/src/acpica/source/components/utilities/utinit.c index 27f1e37b..0f2cf489 100644 --- a/src/acpica/source/components/utilities/utinit.c +++ b/src/acpica/source/components/utilities/utinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utlock.c b/src/acpica/source/components/utilities/utlock.c index a1501189..9357279b 100644 --- a/src/acpica/source/components/utilities/utlock.c +++ b/src/acpica/source/components/utilities/utlock.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utmath.c b/src/acpica/source/components/utilities/utmath.c index 2580cb6e..b534bb3e 100644 --- a/src/acpica/source/components/utilities/utmath.c +++ b/src/acpica/source/components/utilities/utmath.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utmisc.c b/src/acpica/source/components/utilities/utmisc.c index f2db74e8..1efe0afc 100644 --- a/src/acpica/source/components/utilities/utmisc.c +++ b/src/acpica/source/components/utilities/utmisc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utmutex.c b/src/acpica/source/components/utilities/utmutex.c index b723f5b2..1f1c1d82 100644 --- a/src/acpica/source/components/utilities/utmutex.c +++ b/src/acpica/source/components/utilities/utmutex.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utnonansi.c b/src/acpica/source/components/utilities/utnonansi.c index cf3763bc..e3c2f460 100644 --- a/src/acpica/source/components/utilities/utnonansi.c +++ b/src/acpica/source/components/utilities/utnonansi.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utobject.c b/src/acpica/source/components/utilities/utobject.c index 8b3dcd5f..52e02beb 100644 --- a/src/acpica/source/components/utilities/utobject.c +++ b/src/acpica/source/components/utilities/utobject.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utosi.c b/src/acpica/source/components/utilities/utosi.c index 756ca35c..700f30a6 100644 --- a/src/acpica/source/components/utilities/utosi.c +++ b/src/acpica/source/components/utilities/utosi.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -221,6 +221,7 @@ static ACPI_INTERFACE_INFO AcpiDefaultSupportedInterfaces[] = {"Windows 2018.2", NULL, 0, ACPI_OSI_WIN_10_RS5}, /* Windows 10 version 1809 - Added 11/2018 */ {"Windows 2019", NULL, 0, ACPI_OSI_WIN_10_19H1}, /* Windows 10 version 1903 - Added 08/2019 */ {"Windows 2020", NULL, 0, ACPI_OSI_WIN_10_20H1}, /* Windows 10 version 2004 - Added 08/2021 */ + {"Windows 2021", NULL, 0, ACPI_OSI_WIN_11}, /* Windows 11 - Added 01/2022 */ /* Feature Group Strings */ diff --git a/src/acpica/source/components/utilities/utownerid.c b/src/acpica/source/components/utilities/utownerid.c index 2bea3e57..30ba6b75 100644 --- a/src/acpica/source/components/utilities/utownerid.c +++ b/src/acpica/source/components/utilities/utownerid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utpredef.c b/src/acpica/source/components/utilities/utpredef.c index c9a830c2..7f97ee7c 100644 --- a/src/acpica/source/components/utilities/utpredef.c +++ b/src/acpica/source/components/utilities/utpredef.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utresdecode.c b/src/acpica/source/components/utilities/utresdecode.c index 561240f0..12ab6875 100644 --- a/src/acpica/source/components/utilities/utresdecode.c +++ b/src/acpica/source/components/utilities/utresdecode.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utresrc.c b/src/acpica/source/components/utilities/utresrc.c index 70e5119e..26c382d8 100644 --- a/src/acpica/source/components/utilities/utresrc.c +++ b/src/acpica/source/components/utilities/utresrc.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utstate.c b/src/acpica/source/components/utilities/utstate.c index ac85c002..f089ffea 100644 --- a/src/acpica/source/components/utilities/utstate.c +++ b/src/acpica/source/components/utilities/utstate.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utstring.c b/src/acpica/source/components/utilities/utstring.c index 5218ebab..5af4c4d3 100644 --- a/src/acpica/source/components/utilities/utstring.c +++ b/src/acpica/source/components/utilities/utstring.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utstrsuppt.c b/src/acpica/source/components/utilities/utstrsuppt.c index f2a02eab..0487a4f6 100644 --- a/src/acpica/source/components/utilities/utstrsuppt.c +++ b/src/acpica/source/components/utilities/utstrsuppt.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utstrtoul64.c b/src/acpica/source/components/utilities/utstrtoul64.c index 6a121c73..1ef50eac 100644 --- a/src/acpica/source/components/utilities/utstrtoul64.c +++ b/src/acpica/source/components/utilities/utstrtoul64.c @@ -9,7 +9,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/uttrack.c b/src/acpica/source/components/utilities/uttrack.c index b7928b15..7791fe9b 100644 --- a/src/acpica/source/components/utilities/uttrack.c +++ b/src/acpica/source/components/utilities/uttrack.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utuuid.c b/src/acpica/source/components/utilities/utuuid.c index 299353cc..8fd85d62 100644 --- a/src/acpica/source/components/utilities/utuuid.c +++ b/src/acpica/source/components/utilities/utuuid.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utxface.c b/src/acpica/source/components/utilities/utxface.c index 227d18ca..74a8ff48 100644 --- a/src/acpica/source/components/utilities/utxface.c +++ b/src/acpica/source/components/utilities/utxface.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utxferror.c b/src/acpica/source/components/utilities/utxferror.c index 0c6b1c76..77701dfe 100644 --- a/src/acpica/source/components/utilities/utxferror.c +++ b/src/acpica/source/components/utilities/utxferror.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/components/utilities/utxfinit.c b/src/acpica/source/components/utilities/utxfinit.c index 15756cb7..865fe9d2 100644 --- a/src/acpica/source/components/utilities/utxfinit.c +++ b/src/acpica/source/components/utilities/utxfinit.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acapps.h b/src/acpica/source/include/acapps.h index 3f1833c5..382ab170 100644 --- a/src/acpica/source/include/acapps.h +++ b/src/acpica/source/include/acapps.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -159,7 +159,7 @@ /* Common info for tool signons */ #define ACPICA_NAME "Intel ACPI Component Architecture" -#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2021 Intel Corporation" +#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2022 Intel Corporation" #if ACPI_MACHINE_WIDTH == 64 #define ACPI_WIDTH " (64-bit version)" diff --git a/src/acpica/source/include/acbuffer.h b/src/acpica/source/include/acbuffer.h index 1576afa6..0739feb5 100644 --- a/src/acpica/source/include/acbuffer.h +++ b/src/acpica/source/include/acbuffer.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/accommon.h b/src/acpica/source/include/accommon.h index 4ef3f5bc..210035cd 100644 --- a/src/acpica/source/include/accommon.h +++ b/src/acpica/source/include/accommon.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acconfig.h b/src/acpica/source/include/acconfig.h index a5808526..8ba7dc28 100644 --- a/src/acpica/source/include/acconfig.h +++ b/src/acpica/source/include/acconfig.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acconvert.h b/src/acpica/source/include/acconvert.h index b654b18b..048fd53e 100644 --- a/src/acpica/source/include/acconvert.h +++ b/src/acpica/source/include/acconvert.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acdebug.h b/src/acpica/source/include/acdebug.h index 434745d1..6716a094 100644 --- a/src/acpica/source/include/acdebug.h +++ b/src/acpica/source/include/acdebug.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acdisasm.h b/src/acpica/source/include/acdisasm.h index 17d70d4e..352417cb 100644 --- a/src/acpica/source/include/acdisasm.h +++ b/src/acpica/source/include/acdisasm.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -206,6 +206,7 @@ typedef enum ACPI_DMT_FLAGS0, ACPI_DMT_FLAGS1, ACPI_DMT_FLAGS2, + ACPI_DMT_FLAGS8_2, ACPI_DMT_FLAGS4, ACPI_DMT_FLAGS4_0, ACPI_DMT_FLAGS4_4, @@ -388,6 +389,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoAestGicError[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoAestXface[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoAestXrupt[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoAgdi[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoApmtNode[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf1a[]; @@ -402,6 +404,8 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoBert[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoBgrt[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedtHdr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedt0[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoCedt1_te[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoCpep[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoCpep0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoCsrt0[]; @@ -423,6 +427,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar3[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoDmar5[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoDrtm[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoDrtm0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoDrtm0a[]; @@ -529,6 +534,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt13[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt14[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt15[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadtHdr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMcfg[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoMcfg0[]; @@ -571,7 +577,6 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt6b[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7a[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt7b[]; -extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt8[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoNhlt9[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoPhatHdr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoPhat0[]; @@ -734,6 +739,10 @@ void AcpiDmDumpAest ( ACPI_TABLE_HEADER *Table); +void +AcpiDmDumpApmt ( + ACPI_TABLE_HEADER *Table); + void AcpiDmDumpAsf ( ACPI_TABLE_HEADER *Table); diff --git a/src/acpica/source/include/acdispat.h b/src/acpica/source/include/acdispat.h index 2047779f..2c44c9f1 100644 --- a/src/acpica/source/include/acdispat.h +++ b/src/acpica/source/include/acdispat.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acevents.h b/src/acpica/source/include/acevents.h index dda14495..f8c5d776 100644 --- a/src/acpica/source/include/acevents.h +++ b/src/acpica/source/include/acevents.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acexcep.h b/src/acpica/source/include/acexcep.h index 6312602e..92e94972 100644 --- a/src/acpica/source/include/acexcep.h +++ b/src/acpica/source/include/acexcep.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acglobal.h b/src/acpica/source/include/acglobal.h index 35426865..b8831b46 100644 --- a/src/acpica/source/include/acglobal.h +++ b/src/acpica/source/include/acglobal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/achware.h b/src/acpica/source/include/achware.h index 994e9767..256008c7 100644 --- a/src/acpica/source/include/achware.h +++ b/src/acpica/source/include/achware.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acinterp.h b/src/acpica/source/include/acinterp.h index c6e27cc2..d9cec345 100644 --- a/src/acpica/source/include/acinterp.h +++ b/src/acpica/source/include/acinterp.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/aclocal.h b/src/acpica/source/include/aclocal.h index e4f46b88..74eb6e27 100644 --- a/src/acpica/source/include/aclocal.h +++ b/src/acpica/source/include/aclocal.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acmacros.h b/src/acpica/source/include/acmacros.h index a7a79fc8..11fd47cc 100644 --- a/src/acpica/source/include/acmacros.h +++ b/src/acpica/source/include/acmacros.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acnames.h b/src/acpica/source/include/acnames.h index 9075ca74..846d192b 100644 --- a/src/acpica/source/include/acnames.h +++ b/src/acpica/source/include/acnames.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acnamesp.h b/src/acpica/source/include/acnamesp.h index 2edd99d7..7b8d069d 100644 --- a/src/acpica/source/include/acnamesp.h +++ b/src/acpica/source/include/acnamesp.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acobject.h b/src/acpica/source/include/acobject.h index 51a397f2..b2c9dd9b 100644 --- a/src/acpica/source/include/acobject.h +++ b/src/acpica/source/include/acobject.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acopcode.h b/src/acpica/source/include/acopcode.h index 91cce057..7e54a47f 100644 --- a/src/acpica/source/include/acopcode.h +++ b/src/acpica/source/include/acopcode.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acoutput.h b/src/acpica/source/include/acoutput.h index b72c9a94..cd3d26d5 100644 --- a/src/acpica/source/include/acoutput.h +++ b/src/acpica/source/include/acoutput.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acparser.h b/src/acpica/source/include/acparser.h index 94674d8c..4437d612 100644 --- a/src/acpica/source/include/acparser.h +++ b/src/acpica/source/include/acparser.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acpi.h b/src/acpica/source/include/acpi.h index 0a50a443..081e3b7d 100644 --- a/src/acpica/source/include/acpi.h +++ b/src/acpica/source/include/acpi.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acpiosxf.h b/src/acpica/source/include/acpiosxf.h index af90cb9c..67c11013 100644 --- a/src/acpica/source/include/acpiosxf.h +++ b/src/acpica/source/include/acpiosxf.h @@ -10,7 +10,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acpixf.h b/src/acpica/source/include/acpixf.h index c07d0de2..f62c16cb 100644 --- a/src/acpica/source/include/acpixf.h +++ b/src/acpica/source/include/acpixf.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -154,7 +154,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20211217 +#define ACPI_CA_VERSION 0x20220331 #include "acconfig.h" #include "actypes.h" diff --git a/src/acpica/source/include/acpredef.h b/src/acpica/source/include/acpredef.h index bc55155c..9ad8c0ff 100644 --- a/src/acpica/source/include/acpredef.h +++ b/src/acpica/source/include/acpredef.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acresrc.h b/src/acpica/source/include/acresrc.h index 816d4fa4..8214ed83 100644 --- a/src/acpica/source/include/acresrc.h +++ b/src/acpica/source/include/acresrc.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acrestyp.h b/src/acpica/source/include/acrestyp.h index 3c258de9..f045c200 100644 --- a/src/acpica/source/include/acrestyp.h +++ b/src/acpica/source/include/acrestyp.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acstruct.h b/src/acpica/source/include/acstruct.h index c07a319d..d50c7a1b 100644 --- a/src/acpica/source/include/acstruct.h +++ b/src/acpica/source/include/acstruct.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actables.h b/src/acpica/source/include/actables.h index d0845643..40b79a47 100644 --- a/src/acpica/source/include/actables.h +++ b/src/acpica/source/include/actables.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actbinfo.h b/src/acpica/source/include/actbinfo.h index 7402d97b..633f7349 100644 --- a/src/acpica/source/include/actbinfo.h +++ b/src/acpica/source/include/actbinfo.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -225,6 +225,7 @@ #define ACPI_AEST4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_AEST_GIC,f) #define ACPI_AEST0D_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_AEST_NODE_INTERFACE,f) #define ACPI_AEST0E_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_AEST_NODE_INTERRUPT,f) +#define ACPI_APMTN_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_APMT_NODE,f) #define ACPI_ASF0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_INFO,f) #define ACPI_ASF1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ALERT,f) #define ACPI_ASF1a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ALERT_DATA,f) @@ -234,6 +235,8 @@ #define ACPI_ASF4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_ASF_ADDRESS,f) #define ACPI_CEDT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_HEADER, f) #define ACPI_CEDT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_CHBS, f) +#define ACPI_CEDT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_CFMWS, f) +#define ACPI_CEDT1_TE_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CEDT_CFMWS_TARGET_ELEMENT, f) #define ACPI_CPEP0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CPEP_POLLING,f) #define ACPI_CSRT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CSRT_GROUP,f) #define ACPI_CSRT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_CSRT_SHARED_INFO,f) @@ -245,6 +248,7 @@ #define ACPI_DMAR2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ATSR,f) #define ACPI_DMAR3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_RHSA,f) #define ACPI_DMAR4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ANDD,f) +#define ACPI_DMAR5_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_SATC,f) #define ACPI_DRTM0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DRTM_VTABLE_LIST,f) #define ACPI_DRTM1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST,f) #define ACPI_DRTM1a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DRTM_RESOURCE,f) @@ -314,6 +318,7 @@ #define ACPI_MADT14_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_REDISTRIBUTOR,f) #define ACPI_MADT15_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_TRANSLATOR,f) #define ACPI_MADT16_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_MULTIPROC_WAKEUP,f) +#define ACPI_MADT17_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_OEM_DATA,f) #define ACPI_MADTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f) #define ACPI_MCFG0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MCFG_ALLOCATION,f) #define ACPI_MPST0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MPST_POWER_NODE,f) @@ -343,10 +348,8 @@ #define ACPI_NHLT6_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_VENDOR_MIC_CONFIG,f) #define ACPI_NHLT6A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_VENDOR_MIC_COUNT,f) #define ACPI_NHLT6B_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_RENDER_FEEDBACK_DEVICE_SPECIFIC_CONFIG,f) -#define ACPI_NHLT7_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_LINUX_SPECIFIC_COUNT,f) -#define ACPI_NHLT7A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_LINUX_SPECIFIC_DATA,f) -#define ACPI_NHLT7B_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_LINUX_SPECIFIC_DATA_B,f) -#define ACPI_NHLT8_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_TABLE_TERMINATOR,f) +#define ACPI_NHLT7_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_DEVICE_INFO_COUNT,f) +#define ACPI_NHLT7A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_DEVICE_INFO,f) #define ACPI_NHLT9_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_NHLT_MIC_SNR_SENSITIVITY_EXTENSION,f) #define ACPI_PCCT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PCCT_SUBSPACE,f) #define ACPI_PCCT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PCCT_HW_REDUCED,f) @@ -415,6 +418,7 @@ #define ACPI_AEST0D_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_AEST_NODE_INTERFACE,f,o) #define ACPI_AEST0E_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_AEST_NODE_INTERRUPT,f,o) #define ACPI_AGDI_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_AGDI,f,o) +#define ACPI_APMTN_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_APMT_NODE,f,o) #define ACPI_BGRT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_BGRT,f,o) #define ACPI_DRTM_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_DRTM,f,o) #define ACPI_DRTM1a_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_DRTM_RESOURCE,f,o) diff --git a/src/acpica/source/include/actbl.h b/src/acpica/source/include/actbl.h index f70f1b59..f23080fb 100644 --- a/src/acpica/source/include/actbl.h +++ b/src/acpica/source/include/actbl.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actbl1.h b/src/acpica/source/include/actbl1.h index 09e68293..3de78b0d 100644 --- a/src/acpica/source/include/actbl1.h +++ b/src/acpica/source/include/actbl1.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -574,17 +574,23 @@ typedef struct acpi_cedt_cfmws } ACPI_CEDT_CFMWS; +typedef struct acpi_cedt_cfmws_target_element +{ + UINT32 InterleaveTarget; + +} ACPI_CEDT_CFMWS_TARGET_ELEMENT; + /* Values for Interleave Arithmetic field above */ -#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0) +#define ACPI_CEDT_CFMWS_ARITHMETIC_MODULO (0) /* Values for Restrictions field above */ -#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1) -#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1) -#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2) -#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3) -#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4) +#define ACPI_CEDT_CFMWS_RESTRICT_TYPE2 (1) +#define ACPI_CEDT_CFMWS_RESTRICT_TYPE3 (1<<1) +#define ACPI_CEDT_CFMWS_RESTRICT_VOLATILE (1<<2) +#define ACPI_CEDT_CFMWS_RESTRICT_PMEM (1<<3) +#define ACPI_CEDT_CFMWS_RESTRICT_FIXED (1<<4) /******************************************************************************* @@ -847,7 +853,8 @@ enum AcpiDmarType ACPI_DMAR_TYPE_ROOT_ATS = 2, ACPI_DMAR_TYPE_HARDWARE_AFFINITY = 3, ACPI_DMAR_TYPE_NAMESPACE = 4, - ACPI_DMAR_TYPE_RESERVED = 5 /* 5 and greater are reserved */ + ACPI_DMAR_TYPE_SATC = 5, + ACPI_DMAR_TYPE_RESERVED = 6 /* 6 and greater are reserved */ }; @@ -962,6 +969,18 @@ typedef struct acpi_dmar_andd } ACPI_DMAR_ANDD; +/* 5: SoC Integrated Address Translation Cache (SATC) */ + +typedef struct acpi_dmar_satc +{ + ACPI_DMAR_HEADER Header; + UINT8 Flags; + UINT8 Reserved; + UINT16 Segment; + +} ACPI_DMAR_SATC + +; /******************************************************************************* * * DRTM - Dynamic Root of Trust for Measurement table diff --git a/src/acpica/source/include/actbl2.h b/src/acpica/source/include/actbl2.h index eaa2e243..3032c5e2 100644 --- a/src/acpica/source/include/actbl2.h +++ b/src/acpica/source/include/actbl2.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -169,6 +169,7 @@ * the wrong signature. */ #define ACPI_SIG_AGDI "AGDI" /* Arm Generic Diagnostic Dump and Reset Device Interface */ +#define ACPI_SIG_APMT "APMT" /* Arm Performance Monitoring Unit table */ #define ACPI_SIG_BDAT "BDAT" /* BIOS Data ACPI Table */ #define ACPI_SIG_IORT "IORT" /* IO Remapping Table */ #define ACPI_SIG_IVRS "IVRS" /* I/O Virtualization Reporting Structure */ @@ -424,6 +425,86 @@ typedef struct acpi_table_agdi #define ACPI_AGDI_SIGNALING_MODE (1) +/******************************************************************************* + * + * APMT - ARM Performance Monitoring Unit Table + * + * Conforms to: + * ARM Performance Monitoring Unit Architecture 1.0 Platform Design Document + * ARM DEN0117 v1.0 November 25, 2021 + * + ******************************************************************************/ + +typedef struct acpi_table_apmt { + ACPI_TABLE_HEADER Header; /* Common ACPI table header */ +} ACPI_TABLE_APMT; + +#define ACPI_APMT_NODE_ID_LENGTH 4 + +/* + * APMT subtables + */ +typedef struct acpi_apmt_node { + UINT16 Length; + UINT8 Flags; + UINT8 Type; + UINT32 Id; + UINT64 InstPrimary; + UINT32 InstSecondary; + UINT64 BaseAddress0; + UINT64 BaseAddress1; + UINT32 OvflwIrq; + UINT32 Reserved; + UINT32 OvflwIrqFlags; + UINT32 ProcAffinity; + UINT32 ImplId; +} ACPI_APMT_NODE; + +/* Masks for Flags field above */ + +#define ACPI_APMT_FLAGS_DUAL_PAGE (1<<0) +#define ACPI_APMT_FLAGS_AFFINITY (1<<1) +#define ACPI_APMT_FLAGS_ATOMIC (1<<2) + +/* Values for Flags dual page field above */ + +#define ACPI_APMT_FLAGS_DUAL_PAGE_NSUPP (0<<0) +#define ACPI_APMT_FLAGS_DUAL_PAGE_SUPP (1<<0) + +/* Values for Flags processor affinity field above */ +#define ACPI_APMT_FLAGS_AFFINITY_PROC (0<<1) +#define ACPI_APMT_FLAGS_AFFINITY_PROC_CONTAINER (1<<1) + +/* Values for Flags 64-bit atomic field above */ +#define ACPI_APMT_FLAGS_ATOMIC_NSUPP (0<<2) +#define ACPI_APMT_FLAGS_ATOMIC_SUPP (1<<2) + +/* Values for Type field above */ + +enum acpi_apmt_node_type { + ACPI_APMT_NODE_TYPE_MC = 0x00, + ACPI_APMT_NODE_TYPE_SMMU = 0x01, + ACPI_APMT_NODE_TYPE_PCIE_ROOT = 0x02, + ACPI_APMT_NODE_TYPE_ACPI = 0x03, + ACPI_APMT_NODE_TYPE_CACHE = 0x04, + ACPI_APMT_NODE_TYPE_COUNT +}; + +/* Masks for ovflw_irq_flags field above */ + +#define ACPI_APMT_OVFLW_IRQ_FLAGS_MODE (1<<0) +#define ACPI_APMT_OVFLW_IRQ_FLAGS_TYPE (1<<1) + +/* Values for ovflw_irq_flags mode field above */ + +#define ACPI_APMT_OVFLW_IRQ_FLAGS_MODE_LEVEL (0<<0) +#define ACPI_APMT_OVFLW_IRQ_FLAGS_MODE_EDGE (1<<0) + +/* Values for ovflw_irq_flags type field above */ + +#define ACPI_APMT_OVFLW_IRQ_FLAGS_TYPE_WIRED (0<<1) + + /******************************************************************************* * * BDAT - BIOS Data ACPI Table @@ -446,7 +527,7 @@ typedef struct acpi_table_bdat * IORT - IO Remapping Table * * Conforms to "IO Remapping Table System Software on ARM Platforms", - * Document number: ARM DEN 0049E.b, Feb 2021 + * Document number: ARM DEN 0049E.d, Feb 2022 * ******************************************************************************/ @@ -562,7 +643,8 @@ typedef struct acpi_iort_root_complex UINT32 AtsAttribute; UINT32 PciSegmentNumber; UINT8 MemoryAddressLimit; /* Memory address size limit */ - UINT8 Reserved[3]; /* Reserved, must be zero */ + UINT16 PasidCapabilities; /* PASID Capabilities */ + UINT8 Reserved[1]; /* Reserved, must be zero */ } ACPI_IORT_ROOT_COMPLEX; @@ -572,6 +654,8 @@ typedef struct acpi_iort_root_complex #define ACPI_IORT_PRI_SUPPORTED (1<<1) /* The root complex PRI support */ #define ACPI_IORT_PASID_FWD_SUPPORTED (1<<2) /* The root complex PASID forward support */ +/* Masks for PasidCapabilities field above */ +#define ACPI_IORT_PASID_MAX_WIDTH (0x1F) /* Bits 0-4 */ typedef struct acpi_iort_smmu { @@ -658,6 +742,25 @@ typedef struct acpi_iort_rmr { } ACPI_IORT_RMR; +/* Masks for Flags field above */ +#define ACPI_IORT_RMR_REMAP_PERMITTED (1) +#define ACPI_IORT_RMR_ACCESS_PRIVILEGE (1<<1) + +/* + * Macro to access the Access Attributes in flags field above: + * Access Attributes is encoded in bits 9:2 + */ +#define ACPI_IORT_RMR_ACCESS_ATTRIBUTES(flags) (((flags) >> 2) & 0xFF) + +/* Values for above Access Attributes */ + +#define ACPI_IORT_RMR_ATTR_DEVICE_NGNRNE 0x00 +#define ACPI_IORT_RMR_ATTR_DEVICE_NGNRE 0x01 +#define ACPI_IORT_RMR_ATTR_DEVICE_NGRE 0x02 +#define ACPI_IORT_RMR_ATTR_DEVICE_GRE 0x03 +#define ACPI_IORT_RMR_ATTR_NORMAL_NC 0x04 +#define ACPI_IORT_RMR_ATTR_NORMAL_IWB_OWB 0x05 + typedef struct acpi_iort_rmr_desc { UINT64 BaseAddress; UINT64 Length; @@ -1004,7 +1107,8 @@ enum AcpiMadtType ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR = 14, ACPI_MADT_TYPE_GENERIC_TRANSLATOR = 15, ACPI_MADT_TYPE_MULTIPROC_WAKEUP = 16, - ACPI_MADT_TYPE_RESERVED = 17 /* 17 and greater are reserved */ + ACPI_MADT_TYPE_RESERVED = 17, /* 17 to 0x7F are reserved */ + ACPI_MADT_TYPE_OEM_RESERVED = 0x80 /* 0x80 to 0xFF are reserved for OEM use */ }; @@ -1271,8 +1375,8 @@ typedef struct acpi_madt_multiproc_wakeup } ACPI_MADT_MULTIPROC_WAKEUP; -#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032 -#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048 +#define ACPI_MULTIPROC_WAKEUP_MB_OS_SIZE 2032 +#define ACPI_MULTIPROC_WAKEUP_MB_FIRMWARE_SIZE 2048 typedef struct acpi_madt_multiproc_wakeup_mailbox { @@ -1287,6 +1391,13 @@ typedef struct acpi_madt_multiproc_wakeup_mailbox #define ACPI_MP_WAKE_COMMAND_WAKEUP 1 +/* 17: OEM data */ + +typedef struct acpi_madt_oem_data +{ + UINT8 OemData[0]; +} ACPI_MADT_OEM_DATA; + /* * Common flags fields for MADT subtables @@ -2016,7 +2127,7 @@ typedef struct acpi_nhlt_mic_device_specific_config /* Values for ArrayTypeExt above */ -#define ACPI_NHLT_ARRAY_TYPE_RESERVED 0x09 // 9 and below are reserved +#define ACPI_NHLT_ARRAY_TYPE_RESERVED 0x09 /* 9 and below are reserved */ #define ACPI_NHLT_SMALL_LINEAR_2ELEMENT 0x0A #define ACPI_NHLT_BIG_LINEAR_2ELEMENT 0x0B #define ACPI_NHLT_FIRST_GEOMETRY_LINEAR_4ELEMENT 0x0C @@ -2039,17 +2150,17 @@ typedef struct acpi_nhlt_vendor_mic_config { UINT8 Type; UINT8 Panel; - UINT16 SpeakerPositionDistance; // mm - UINT16 HorizontalOffset; // mm - UINT16 VerticalOffset; // mm - UINT8 FrequencyLowBand; // 5*Hz - UINT8 FrequencyHighBand; // 500*Hz - UINT16 DirectionAngle; // -180 - + 180 - UINT16 ElevationAngle; // -180 - + 180 - UINT16 WorkVerticalAngleBegin; // -180 - + 180 with 2 deg step - UINT16 WorkVerticalAngleEnd; // -180 - + 180 with 2 deg step - UINT16 WorkHorizontalAngleBegin; // -180 - + 180 with 2 deg step - UINT16 WorkHorizontalAngleEnd; // -180 - + 180 with 2 deg step + UINT16 SpeakerPositionDistance; /* mm */ + UINT16 HorizontalOffset; /* mm */ + UINT16 VerticalOffset; /* mm */ + UINT8 FrequencyLowBand; /* 5*Hz */ + UINT8 FrequencyHighBand; /* 500*Hz */ + UINT16 DirectionAngle; /* -180 - + 180 */ + UINT16 ElevationAngle; /* -180 - + 180 */ + UINT16 WorkVerticalAngleBegin; /* -180 - + 180 with 2 deg step */ + UINT16 WorkVerticalAngleEnd; /* -180 - + 180 with 2 deg step */ + UINT16 WorkHorizontalAngleBegin; /* -180 - + 180 with 2 deg step */ + UINT16 WorkHorizontalAngleEnd; /* -180 - + 180 with 2 deg step */ } ACPI_NHLT_VENDOR_MIC_CONFIG; @@ -2061,9 +2172,9 @@ typedef struct acpi_nhlt_vendor_mic_config #define ACPI_NHLT_MIC_SUPER_CARDIOID 3 #define ACPI_NHLT_MIC_HYPER_CARDIOID 4 #define ACPI_NHLT_MIC_8_SHAPED 5 -#define ACPI_NHLT_MIC_RESERVED6 6 // 6 is reserved +#define ACPI_NHLT_MIC_RESERVED6 6 /* 6 is reserved */ #define ACPI_NHLT_MIC_VENDOR_DEFINED 7 -#define ACPI_NHLT_MIC_RESERVED 8 // 8 and above are reserved +#define ACPI_NHLT_MIC_RESERVED 8 /* 8 and above are reserved */ /* Values for Panel field above */ @@ -2073,13 +2184,13 @@ typedef struct acpi_nhlt_vendor_mic_config #define ACPI_NHLT_MIC_POSITION_RIGHT 3 #define ACPI_NHLT_MIC_POSITION_FRONT 4 #define ACPI_NHLT_MIC_POSITION_BACK 5 -#define ACPI_NHLT_MIC_POSITION_RESERVED 6 // 6 and above are reserved +#define ACPI_NHLT_MIC_POSITION_RESERVED 6 /* 6 and above are reserved */ typedef struct acpi_nhlt_vendor_mic_device_specific_config { ACPI_NHLT_MIC_DEVICE_SPECIFIC_CONFIG MicArrayDeviceConfig; UINT8 NumberOfMicrophones; - ACPI_NHLT_VENDOR_MIC_CONFIG MicConfig[]; // Indexed by NumberOfMicrophones + ACPI_NHLT_VENDOR_MIC_CONFIG MicConfig[]; /* Indexed by NumberOfMicrophones */ } ACPI_NHLT_VENDOR_MIC_DEVICE_SPECIFIC_CONFIG; @@ -2096,40 +2207,27 @@ typedef struct acpi_nhlt_mic_snr_sensitivity_extension typedef struct acpi_nhlt_render_feedback_device_specific_config { - UINT8 FeedbackVirtualSlot; // Render slot in case of capture - UINT16 FeedbackChannels; // Informative only + UINT8 FeedbackVirtualSlot; /* Render slot in case of capture */ + UINT16 FeedbackChannels; /* Informative only */ UINT16 FeedbackValidBitsPerSample; } ACPI_NHLT_RENDER_FEEDBACK_DEVICE_SPECIFIC_CONFIG; -/* Linux-specific structures */ +/* Non documented structures */ -typedef struct acpi_nhlt_linux_specific_count +typedef struct acpi_nhlt_device_info_count { UINT8 StructureCount; -} ACPI_NHLT_LINUX_SPECIFIC_COUNT; +} ACPI_NHLT_DEVICE_INFO_COUNT; -typedef struct acpi_nhlt_linux_specific_data +typedef struct acpi_nhlt_device_info { UINT8 DeviceId[16]; UINT8 DeviceInstanceId; UINT8 DevicePortId; -} ACPI_NHLT_LINUX_SPECIFIC_DATA; - -typedef struct acpi_nhlt_linux_specific_data_b -{ - UINT8 SpecificData[18]; - -} ACPI_NHLT_LINUX_SPECIFIC_DATA_B; - -typedef struct acpi_nhlt_table_terminator -{ - UINT32 TerminatorValue; - UINT32 TerminatorSignature; - -} ACPI_NHLT_TABLE_TERMINATOR; +} ACPI_NHLT_DEVICE_INFO; /******************************************************************************* @@ -2707,8 +2805,8 @@ typedef struct acpi_table_prmt_header typedef struct acpi_prmt_module_header { - UINT16 Revision; - UINT16 Length; + UINT16 Revision; + UINT16 Length; } ACPI_PRMT_MODULE_HEADER; @@ -2862,7 +2960,7 @@ typedef struct acpi_table_rgrt UINT16 Version; UINT8 ImageType; UINT8 Reserved; - UINT8 Image[0]; + UINT8 Image[]; } ACPI_TABLE_RGRT; diff --git a/src/acpica/source/include/actbl3.h b/src/acpica/source/include/actbl3.h index 40cf7130..7cc633a2 100644 --- a/src/acpica/source/include/actbl3.h +++ b/src/acpica/source/include/actbl3.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/actypes.h b/src/acpica/source/include/actypes.h index 6805b48f..99588f67 100644 --- a/src/acpica/source/include/actypes.h +++ b/src/acpica/source/include/actypes.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -658,8 +658,12 @@ typedef UINT64 ACPI_INTEGER; /* Pointer/Integer type conversions */ #define ACPI_TO_POINTER(i) ACPI_CAST_PTR (void, (ACPI_SIZE) (i)) +#ifndef ACPI_TO_INTEGER #define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0) +#endif +#ifndef ACPI_OFFSET #define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0) +#endif #define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i) /* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */ @@ -686,14 +690,14 @@ typedef UINT64 ACPI_INTEGER; * Can be used with AccessSize field of ACPI_GENERIC_ADDRESS and * ACPI_RESOURCE_GENERIC_REGISTER. */ -#define ACPI_ACCESS_BIT_SHIFT 2 -#define ACPI_ACCESS_BYTE_SHIFT -1 -#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT) -#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT) -#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT) -#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT) -#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT)) -#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT)) +#define ACPI_ACCESS_BIT_SHIFT 2 +#define ACPI_ACCESS_BYTE_SHIFT -1 +#define ACPI_ACCESS_BIT_MAX (31 - ACPI_ACCESS_BIT_SHIFT) +#define ACPI_ACCESS_BYTE_MAX (31 - ACPI_ACCESS_BYTE_SHIFT) +#define ACPI_ACCESS_BIT_DEFAULT (8 - ACPI_ACCESS_BIT_SHIFT) +#define ACPI_ACCESS_BYTE_DEFAULT (8 - ACPI_ACCESS_BYTE_SHIFT) +#define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BIT_SHIFT)) +#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) + ACPI_ACCESS_BYTE_SHIFT)) /******************************************************************************* * @@ -1550,6 +1554,7 @@ typedef enum #define ACPI_OSI_WIN_10_RS5 0x13 #define ACPI_OSI_WIN_10_19H1 0x14 #define ACPI_OSI_WIN_10_20H1 0x15 +#define ACPI_OSI_WIN_11 0x16 /* Definitions of getopt */ diff --git a/src/acpica/source/include/acutils.h b/src/acpica/source/include/acutils.h index 791b7d9c..f23ee559 100644 --- a/src/acpica/source/include/acutils.h +++ b/src/acpica/source/include/acutils.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/acuuid.h b/src/acpica/source/include/acuuid.h index 48f4c9a1..bc41fa40 100644 --- a/src/acpica/source/include/acuuid.h +++ b/src/acpica/source/include/acuuid.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/amlcode.h b/src/acpica/source/include/amlcode.h index f7ad22a1..25d591e5 100644 --- a/src/acpica/source/include/amlcode.h +++ b/src/acpica/source/include/amlcode.h @@ -10,7 +10,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/amlresrc.h b/src/acpica/source/include/amlresrc.h index a97a1c63..e89cd824 100644 --- a/src/acpica/source/include/amlresrc.h +++ b/src/acpica/source/include/amlresrc.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acenv.h b/src/acpica/source/include/platform/acenv.h index 740d4495..674c4c7d 100644 --- a/src/acpica/source/include/platform/acenv.h +++ b/src/acpica/source/include/platform/acenv.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acenvex.h b/src/acpica/source/include/platform/acenvex.h index 42bb4901..32db36c6 100644 --- a/src/acpica/source/include/platform/acenvex.h +++ b/src/acpica/source/include/platform/acenvex.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acgcc.h b/src/acpica/source/include/platform/acgcc.h index 148190a3..3ad22a1f 100644 --- a/src/acpica/source/include/platform/acgcc.h +++ b/src/acpica/source/include/platform/acgcc.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/acgccex.h b/src/acpica/source/include/platform/acgccex.h index 61d42852..035b999d 100644 --- a/src/acpica/source/include/platform/acgccex.h +++ b/src/acpica/source/include/platform/acgccex.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/include/platform/aclinux.h b/src/acpica/source/include/platform/aclinux.h index 17fd5113..1c55c659 100644 --- a/src/acpica/source/include/platform/aclinux.h +++ b/src/acpica/source/include/platform/aclinux.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -252,6 +252,11 @@ #define ACPI_SPINLOCK spinlock_t * #define ACPI_CPU_FLAGS unsigned long +#define ACPI_UINTPTR_T uintptr_t + +#define ACPI_TO_INTEGER(p) ((uintptr_t)(p)) +#define ACPI_OFFSET(d, f) offsetof(d, f) + /* Use native linux version of AcpiOsAllocateZeroed */ #define USE_NATIVE_ALLOCATE_ZEROED diff --git a/src/acpica/source/include/platform/aclinuxex.h b/src/acpica/source/include/platform/aclinuxex.h index f88559d2..4e84cd4b 100644 --- a/src/acpica/source/include/platform/aclinuxex.h +++ b/src/acpica/source/include/platform/aclinuxex.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/os_specific/service_layers/osunixxf.c b/src/acpica/source/os_specific/service_layers/osunixxf.c index 33fbb0ce..ef1651b6 100644 --- a/src/acpica/source/os_specific/service_layers/osunixxf.c +++ b/src/acpica/source/os_specific/service_layers/osunixxf.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aecommon.h b/src/acpica/source/tools/acpiexec/aecommon.h index c325d8f3..7bfdd278 100644 --- a/src/acpica/source/tools/acpiexec/aecommon.h +++ b/src/acpica/source/tools/acpiexec/aecommon.h @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aeexception.c b/src/acpica/source/tools/acpiexec/aeexception.c index df35aa86..f0903c1f 100644 --- a/src/acpica/source/tools/acpiexec/aeexception.c +++ b/src/acpica/source/tools/acpiexec/aeexception.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License @@ -334,7 +334,7 @@ AeSignalHandler ( SigintCount++; if (SigintCount >= ACPI_MAX_CONTROL_C) { - exit (0); + _exit (0); } /* Abort the application if there are no methods executing */ @@ -368,7 +368,7 @@ AeSignalHandler ( AcpiOsPrintf (AE_PREFIX "Terminating\n"); (void) AcpiOsTerminate (); - exit (0); + _exit (0); } diff --git a/src/acpica/source/tools/acpiexec/aehandlers.c b/src/acpica/source/tools/acpiexec/aehandlers.c index a1abdddd..9b12aa65 100644 --- a/src/acpica/source/tools/acpiexec/aehandlers.c +++ b/src/acpica/source/tools/acpiexec/aehandlers.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aeinitfile.c b/src/acpica/source/tools/acpiexec/aeinitfile.c index d568b50e..600f2c7d 100644 --- a/src/acpica/source/tools/acpiexec/aeinitfile.c +++ b/src/acpica/source/tools/acpiexec/aeinitfile.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aeinstall.c b/src/acpica/source/tools/acpiexec/aeinstall.c index 1d32443b..28d08d8a 100644 --- a/src/acpica/source/tools/acpiexec/aeinstall.c +++ b/src/acpica/source/tools/acpiexec/aeinstall.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License diff --git a/src/acpica/source/tools/acpiexec/aeregion.c b/src/acpica/source/tools/acpiexec/aeregion.c index decd17f7..400fd66e 100644 --- a/src/acpica/source/tools/acpiexec/aeregion.c +++ b/src/acpica/source/tools/acpiexec/aeregion.c @@ -8,7 +8,7 @@ * * 1. Copyright Notice * - * Some or all of this work - Copyright (c) 1999 - 2021, Intel Corp. + * Some or all of this work - Copyright (c) 1999 - 2022, Intel Corp. * All rights reserved. * * 2. License

ACPICA: Update to version 20220331

Commit Message

Comments

Patch