Module Name: src
Committed By: christos
Date: Sun Aug 2 20:25:55 UTC 2020
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.l aslerror.c
aslload.c aslxref.c
src/sys/external/bsd/acpica/dist/debugger: dbdisply.c
src/sys/external/bsd/acpica/dist/include: acpixf.h actypes.h
src/sys/external/bsd/acpica/dist/os_specific/service_layers:
oslinuxtbl.c
src/sys/external/bsd/acpica/dist/utilities: utdecode.c utdelete.c
Removed Files:
src/sys/external/bsd/acpica/dist/generate/unix/acpinames: Makefile
src/sys/external/bsd/acpica/dist/tools/acpinames: acpinames.h anmain.c
anstubs.c antables.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
cvs rdiff -u -r1.1.1.10 -r0 \
src/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
cvs rdiff -u -r1.1.1.9 -r0 \
src/sys/external/bsd/acpica/dist/tools/acpinames/acpinames.h
cvs rdiff -u -r1.1.1.13 -r0 \
src/sys/external/bsd/acpica/dist/tools/acpinames/anmain.c \
src/sys/external/bsd/acpica/dist/tools/acpinames/anstubs.c
cvs rdiff -u -r1.1.1.10 -r0 \
src/sys/external/bsd/acpica/dist/tools/acpinames/antables.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/utilities/utdecode.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.16 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.16 Mon May 25 19:19:28 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Sun Aug 2 16:25:54 2020
@@ -585,6 +585,7 @@ NamePathTail [.]{NameSeg}
"GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */
"GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */
"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */
+"PlatformRtMechanism" { count (0); return (PARSEOP_REGIONSPACE_PRM); }
"FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); }
/* ResourceTypeKeyword: Resource Usage - Resource Descriptors */
Index: src/sys/external/bsd/acpica/dist/compiler/aslerror.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.15 src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.15 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslerror.c Sun Aug 2 16:25:54 2020
@@ -948,7 +948,7 @@ GetModifiedLevel (
UINT8 Level,
UINT16 MessageId)
{
- UINT16 i;
+ UINT32 i;
UINT16 ExceptionCode;
Index: src/sys/external/bsd/acpica/dist/compiler/aslload.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.18 src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.19
--- src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.18 Mon May 25 19:19:28 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslload.c Sun Aug 2 16:25:54 2020
@@ -1069,13 +1069,13 @@ LdAnalyzeExternals (
* previously declared External
*/
Node->Flags &= ~ANOBJ_IS_EXTERNAL;
- Node->Type = (UINT8) ExternalOpType;
+ Node->Type = (UINT8) ActualOpType;
/* Just retyped a node, probably will need to open a scope */
- if (AcpiNsOpensScope (ExternalOpType))
+ if (AcpiNsOpensScope (ActualOpType))
{
- Status = AcpiDsScopeStackPush (Node, ExternalOpType, WalkState);
+ Status = AcpiDsScopeStackPush (Node, ActualOpType, WalkState);
if (ACPI_FAILURE (Status))
{
return (Status);
@@ -1096,11 +1096,11 @@ LdAnalyzeExternals (
}
else if ((Node->Flags & ANOBJ_IS_EXTERNAL) &&
(Op->Asl.ParseOpcode == PARSEOP_EXTERNAL) &&
- (ExternalOpType == ACPI_TYPE_ANY))
+ (ActualOpType == ACPI_TYPE_ANY))
{
/* Allow update of externals of unknown type. */
- Node->Type = (UINT8) ExternalOpType;
+ Node->Type = (UINT8) ActualExternalOpType;
Status = AE_OK;
}
Index: src/sys/external/bsd/acpica/dist/compiler/aslxref.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.18 src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.19
--- src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.18 Mon May 25 19:19:28 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslxref.c Sun Aug 2 16:25:54 2020
@@ -713,9 +713,24 @@ XfNamespaceLocateBegin (
Node->Flags |= ANOBJ_IS_REFERENCED;
}
- /* Attempt to optimize the NamePath */
-
- OptOptimizeNamePath (Op, OpInfo->Flags, WalkState, Path, Node);
+ /*
+ * Attempt to optimize the NamePath
+ *
+ * One special case: CondRefOf operator - not all AML interpreter
+ * implementations expect optimized namepaths as a parameter to this
+ * operator. They require relative name paths with prefix operators or
+ * namepaths starting with the root scope.
+ *
+ * Other AML interpreter implementations do not perform the namespace
+ * search that starts at the current scope and recursively searching the
+ * parent scope until the root scope. The lack of search is only known to
+ * occur for the namestring parameter for the CondRefOf operator.
+ */
+ if ((Op->Asl.Parent) &&
+ (Op->Asl.Parent->Asl.ParseOpcode != PARSEOP_CONDREFOF))
+ {
+ OptOptimizeNamePath (Op, OpInfo->Flags, WalkState, Path, Node);
+ }
/*
* 1) Dereference an alias (A name reference that is an alias)
@@ -871,12 +886,14 @@ XfNamespaceLocateBegin (
* invocation of the method, it is simply a reference to the method.
*
* September 2016: Removed DeRefOf from this list
+ * July 2020: Added Alias to this list
*/
if ((Op->Asl.Parent) &&
((Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_REFOF) ||
(Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_PACKAGE) ||
(Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_VAR_PACKAGE)||
- (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_OBJECTTYPE)))
+ (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_OBJECTTYPE) ||
+ (Op->Asl.Parent->Asl.ParseOpcode == PARSEOP_ALIAS)))
{
return_ACPI_STATUS (AE_OK);
}
Index: src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.17 src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.18
--- src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.17 Sat Mar 28 15:49:26 2020
+++ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c Sun Aug 2 16:25:55 2020
@@ -96,6 +96,8 @@ static ACPI_ADR_SPACE_TYPE AcpiGbl_Spac
ACPI_ADR_SPACE_IPMI,
ACPI_ADR_SPACE_GPIO,
ACPI_ADR_SPACE_GSBUS,
+ ACPI_ADR_SPACE_PLATFORM_COMM,
+ ACPI_ADR_SPACE_PLATFORM_RT,
ACPI_ADR_SPACE_DATA_TABLE,
ACPI_ADR_SPACE_FIXED_HARDWARE
};
Index: src/sys/external/bsd/acpica/dist/include/acpixf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpixf.h:1.26 src/sys/external/bsd/acpica/dist/include/acpixf.h:1.27
--- src/sys/external/bsd/acpica/dist/include/acpixf.h:1.26 Mon May 25 19:19:28 2020
+++ src/sys/external/bsd/acpica/dist/include/acpixf.h Sun Aug 2 16:25:55 2020
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20200430
+#define ACPI_CA_VERSION 0x20200717
#include "acconfig.h"
#include "actypes.h"
Index: src/sys/external/bsd/acpica/dist/include/actypes.h
diff -u src/sys/external/bsd/acpica/dist/include/actypes.h:1.21 src/sys/external/bsd/acpica/dist/include/actypes.h:1.22
--- src/sys/external/bsd/acpica/dist/include/actypes.h:1.21 Sat Mar 28 15:49:27 2020
+++ src/sys/external/bsd/acpica/dist/include/actypes.h Sun Aug 2 16:25:55 2020
@@ -865,8 +865,9 @@ typedef UINT8
#define ACPI_ADR_SPACE_GPIO (ACPI_ADR_SPACE_TYPE) 8
#define ACPI_ADR_SPACE_GSBUS (ACPI_ADR_SPACE_TYPE) 9
#define ACPI_ADR_SPACE_PLATFORM_COMM (ACPI_ADR_SPACE_TYPE) 10
+#define ACPI_ADR_SPACE_PLATFORM_RT (ACPI_ADR_SPACE_TYPE) 11
-#define ACPI_NUM_PREDEFINED_REGIONS 11
+#define ACPI_NUM_PREDEFINED_REGIONS 12
/*
* Special Address Spaces
@@ -1275,7 +1276,7 @@ typedef struct acpi_pnp_device_id_list
{
UINT32 Count; /* Number of IDs in Ids array */
UINT32 ListSize; /* Size of list, including ID strings */
- ACPI_PNP_DEVICE_ID Ids[1]; /* ID array */
+ ACPI_PNP_DEVICE_ID Ids[]; /* ID array */
} ACPI_PNP_DEVICE_ID_LIST;
Index: src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
diff -u src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.11 src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.12
--- src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.11 Sat Mar 28 15:49:27 2020
+++ src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c Sun Aug 2 16:25:55 2020
@@ -84,7 +84,6 @@ static ACPI_STATUS
OslReadTableFromFile (
char *Filename,
ACPI_SIZE FileOffset,
- char *Signature,
ACPI_TABLE_HEADER **Table);
static ACPI_STATUS
@@ -1382,8 +1381,6 @@ OslTableNameFromFile (
*
* PARAMETERS: Filename - File that contains the desired table
* FileOffset - Offset of the table in file
- * Signature - Optional ACPI Signature for desired table.
- * A null terminated 4-character string.
* Table - Where a pointer to the table is returned
*
* RETURN: Status; Table buffer is returned if AE_OK.
@@ -1396,7 +1393,6 @@ static ACPI_STATUS
OslReadTableFromFile (
char *Filename,
ACPI_SIZE FileOffset,
- char *Signature,
ACPI_TABLE_HEADER **Table)
{
FILE *TableFile;
@@ -1428,6 +1424,8 @@ OslReadTableFromFile (
goto Exit;
}
+#ifdef ACPI_OBSOLETE_FUNCTIONS
+
/* If signature is specified, it must match the table */
if (Signature)
@@ -1449,6 +1447,7 @@ OslReadTableFromFile (
goto Exit;
}
}
+#endif
TableLength = ApGetTableLength (&Header);
if (TableLength == 0)
@@ -1582,7 +1581,7 @@ OslGetCustomizedTable (
/* There is no physical address saved for customized tables, use zero */
*Address = 0;
- Status = OslReadTableFromFile (TableFilename, 0, NULL, Table);
+ Status = OslReadTableFromFile (TableFilename, 0, Table);
return (Status);
}
Index: src/sys/external/bsd/acpica/dist/utilities/utdecode.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.16 src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.17
--- src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.16 Sat Mar 28 15:49:28 2020
+++ src/sys/external/bsd/acpica/dist/utilities/utdecode.c Sun Aug 2 16:25:55 2020
@@ -106,17 +106,18 @@ const UINT8 AcpiGbl_
const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] =
{
- "SystemMemory", /* 0x00 */
- "SystemIO", /* 0x01 */
- "PCI_Config", /* 0x02 */
- "EmbeddedControl", /* 0x03 */
- "SMBus", /* 0x04 */
- "SystemCMOS", /* 0x05 */
- "PCIBARTarget", /* 0x06 */
- "IPMI", /* 0x07 */
- "GeneralPurposeIo", /* 0x08 */
- "GenericSerialBus", /* 0x09 */
- "PCC" /* 0x0A */
+ "SystemMemory", /* 0x00 */
+ "SystemIO", /* 0x01 */
+ "PCI_Config", /* 0x02 */
+ "EmbeddedControl", /* 0x03 */
+ "SMBus", /* 0x04 */
+ "SystemCMOS", /* 0x05 */
+ "PCIBARTarget", /* 0x06 */
+ "IPMI", /* 0x07 */
+ "GeneralPurposeIo", /* 0x08 */
+ "GenericSerialBus", /* 0x09 */
+ "PCC", /* 0x0A */
+ "PlatformRtMechanism" /* 0x0B */
};
Index: src/sys/external/bsd/acpica/dist/utilities/utdelete.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.4 src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.5
--- src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.4 Sat Mar 28 15:49:28 2020
+++ src/sys/external/bsd/acpica/dist/utilities/utdelete.c Sun Aug 2 16:25:55 2020
@@ -641,11 +641,6 @@ AcpiUtUpdateObjectReference (
NextObject = Object->BufferField.BufferObj;
break;
- case ACPI_TYPE_LOCAL_REGION_FIELD:
-
- NextObject = Object->Field.RegionObj;
- break;
-
case ACPI_TYPE_LOCAL_BANK_FIELD:
NextObject = Object->BankField.BankObj;
@@ -681,6 +676,7 @@ AcpiUtUpdateObjectReference (
}
break;
+ case ACPI_TYPE_LOCAL_REGION_FIELD:
case ACPI_TYPE_REGION:
default:
