30 Mar
2019
30 Mar
'19
1:58 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba1fb9ace9628d867abbf…
commit ba1fb9ace9628d867abbf83bb32f755bb05c961b
Author: Thomas Faber <thomas.faber(a)reactos.org>
AuthorDate: Sat Mar 30 11:18:50 2019 +0100
Commit: Thomas Faber <thomas.faber(a)reactos.org>
CommitDate: Sat Mar 30 14:57:35 2019 +0100
[ACPICA] Update to version 20190329. CORE-15900
---
drivers/bus/acpi/acpica/dispatcher/dsfield.c | 2 +-
drivers/bus/acpi/acpica/dispatcher/dsinit.c | 2 +-
drivers/bus/acpi/acpica/events/evgpeinit.c | 4 ++--
drivers/bus/acpi/acpica/executer/exnames.c | 6 ++---
drivers/bus/acpi/acpica/include/aclocal.h | 4 ++--
drivers/bus/acpi/acpica/include/acpixf.h | 2 +-
drivers/bus/acpi/acpica/include/actbl.h | 4 ++--
drivers/bus/acpi/acpica/include/actypes.h | 12 +++++-----
drivers/bus/acpi/acpica/include/platform/aclinux.h | 5 +++++
drivers/bus/acpi/acpica/namespace/nsaccess.c | 2 +-
drivers/bus/acpi/acpica/namespace/nsdump.c | 2 +-
drivers/bus/acpi/acpica/namespace/nsinit.c | 4 ++--
drivers/bus/acpi/acpica/namespace/nsnames.c | 8 +++----
drivers/bus/acpi/acpica/namespace/nsobject.c | 5 +++++
drivers/bus/acpi/acpica/namespace/nsparse.c | 2 +-
drivers/bus/acpi/acpica/namespace/nsrepair.c | 2 +-
drivers/bus/acpi/acpica/namespace/nsrepair2.c | 4 ++--
drivers/bus/acpi/acpica/namespace/nsutils.c | 12 +++++-----
drivers/bus/acpi/acpica/namespace/nsxfname.c | 4 ++--
drivers/bus/acpi/acpica/parser/psargs.c | 8 +++----
drivers/bus/acpi/acpica/resources/rsxface.c | 8 +++----
drivers/bus/acpi/acpica/tables/tbdata.c | 2 +-
drivers/bus/acpi/acpica/tables/tbfind.c | 6 ++---
drivers/bus/acpi/acpica/tables/tbinstal.c | 2 +-
drivers/bus/acpi/acpica/tables/tbprint.c | 10 ++++-----
drivers/bus/acpi/acpica/tables/tbutils.c | 2 +-
drivers/bus/acpi/acpica/tables/tbxface.c | 4 ++--
drivers/bus/acpi/acpica/tables/tbxfload.c | 10 ++++-----
drivers/bus/acpi/acpica/utilities/utascii.c | 2 +-
drivers/bus/acpi/acpica/utilities/utdecode.c | 26 +++++++++++-----------
drivers/bus/acpi/acpica/utilities/utmisc.c | 8 +++----
drivers/bus/acpi/acpica/utilities/utpredef.c | 4 ++--
drivers/bus/acpi/acpica/utilities/utstring.c | 6 ++---
media/doc/3rd Party Files.txt | 2 +-
34 files changed, 98 insertions(+), 88 deletions(-)
diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c
b/drivers/bus/acpi/acpica/dispatcher/dsfield.c
index ec1c125449..43c1fe4fa1 100644
--- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c
+++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c
@@ -577,7 +577,7 @@ AcpiDsCreateField (
Info.RegionNode = RegionNode;
Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next);
- if (Info.RegionNode->Type == ACPI_ADR_SPACE_PLATFORM_COMM &&
+ if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM
&&
!(RegionNode->Object->Field.InternalPccBuffer
= ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length)))
{
diff --git a/drivers/bus/acpi/acpica/dispatcher/dsinit.c
b/drivers/bus/acpi/acpica/dispatcher/dsinit.c
index b1300b7e82..8db132d5ad 100644
--- a/drivers/bus/acpi/acpica/dispatcher/dsinit.c
+++ b/drivers/bus/acpi/acpica/dispatcher/dsinit.c
@@ -251,7 +251,7 @@ AcpiDsInitializeObjects (
/* DSDT is always the first AML table */
- if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT))
+ if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT))
{
ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT,
"\nInitializing Namespace objects:\n"));
diff --git a/drivers/bus/acpi/acpica/events/evgpeinit.c
b/drivers/bus/acpi/acpica/events/evgpeinit.c
index ccdcff2a3c..9b2d5ce928 100644
--- a/drivers/bus/acpi/acpica/events/evgpeinit.c
+++ b/drivers/bus/acpi/acpica/events/evgpeinit.c
@@ -339,7 +339,7 @@ AcpiEvMatchGpeMethod (
ACPI_STATUS Status;
UINT32 GpeNumber;
UINT8 TempGpeNumber;
- char Name[ACPI_NAME_SIZE + 1];
+ char Name[ACPI_NAMESEG_SIZE + 1];
UINT8 Type;
@@ -360,7 +360,7 @@ AcpiEvMatchGpeMethod (
* 1) Extract the method name and null terminate it
*/
ACPI_MOVE_32_TO_32 (Name, &MethodNode->Name.Integer);
- Name[ACPI_NAME_SIZE] = 0;
+ Name[ACPI_NAMESEG_SIZE] = 0;
/* 2) Name must begin with an underscore */
diff --git a/drivers/bus/acpi/acpica/executer/exnames.c
b/drivers/bus/acpi/acpica/executer/exnames.c
index f730df2e21..a29901fc8c 100644
--- a/drivers/bus/acpi/acpica/executer/exnames.c
+++ b/drivers/bus/acpi/acpica/executer/exnames.c
@@ -99,11 +99,11 @@ AcpiExAllocateNameString (
{
/* Special case for root */
- SizeNeeded = 1 + (ACPI_NAME_SIZE * NumNameSegs) + 2 + 1;
+ SizeNeeded = 1 + (ACPI_NAMESEG_SIZE * NumNameSegs) + 2 + 1;
}
else
{
- SizeNeeded = PrefixCount + (ACPI_NAME_SIZE * NumNameSegs) + 2 + 1;
+ SizeNeeded = PrefixCount + (ACPI_NAMESEG_SIZE * NumNameSegs) + 2 + 1;
}
/*
@@ -202,7 +202,7 @@ AcpiExNameSegment (
}
for (Index = 0;
- (Index < ACPI_NAME_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0));
+ (Index < ACPI_NAMESEG_SIZE) && (AcpiUtValidNameChar (*AmlAddress,
0));
Index++)
{
CharBuf[Index] = *AmlAddress++;
diff --git a/drivers/bus/acpi/acpica/include/aclocal.h
b/drivers/bus/acpi/acpica/include/aclocal.h
index bd0a25d6d4..0d683460f9 100644
--- a/drivers/bus/acpi/acpica/include/aclocal.h
+++ b/drivers/bus/acpi/acpica/include/aclocal.h
@@ -372,7 +372,7 @@ ACPI_STATUS (*ACPI_INTERNAL_METHOD) (
*/
typedef struct acpi_name_info
{
- char Name[ACPI_NAME_SIZE];
+ char Name[ACPI_NAMESEG_SIZE];
UINT16 ArgumentList;
UINT8 ExpectedBtypes;
@@ -460,7 +460,7 @@ typedef ACPI_STATUS (*ACPI_OBJECT_CONVERTER) (
typedef struct acpi_simple_repair_info
{
- char Name[ACPI_NAME_SIZE];
+ char Name[ACPI_NAMESEG_SIZE];
UINT32 UnexpectedBtypes;
UINT32 PackageIndex;
ACPI_OBJECT_CONVERTER ObjectConverter;
diff --git a/drivers/bus/acpi/acpica/include/acpixf.h
b/drivers/bus/acpi/acpica/include/acpixf.h
index ba6b8bba90..d700786dc3 100644
--- a/drivers/bus/acpi/acpica/include/acpixf.h
+++ b/drivers/bus/acpi/acpica/include/acpixf.h
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20190215
+#define ACPI_CA_VERSION 0x20190329
#include "acconfig.h"
#include "actypes.h"
diff --git a/drivers/bus/acpi/acpica/include/actbl.h
b/drivers/bus/acpi/acpica/include/actbl.h
index 55d4b4826c..e65adcbc29 100644
--- a/drivers/bus/acpi/acpica/include/actbl.h
+++ b/drivers/bus/acpi/acpica/include/actbl.h
@@ -105,14 +105,14 @@
typedef struct acpi_table_header
{
- char Signature[ACPI_NAME_SIZE]; /* ASCII table signature
*/
+ char Signature[ACPI_NAMESEG_SIZE]; /* ASCII table signature
*/
UINT32 Length; /* Length of table in
bytes, including this header */
UINT8 Revision; /* ACPI Specification
minor version number */
UINT8 Checksum; /* To make sum of entire
table == 0 */
char OemId[ACPI_OEM_ID_SIZE]; /* ASCII OEM
identification */
char OemTableId[ACPI_OEM_TABLE_ID_SIZE]; /* ASCII OEM table
identification */
UINT32 OemRevision; /* OEM revision number
*/
- char AslCompilerId[ACPI_NAME_SIZE]; /* ASCII ASL compiler
vendor ID */
+ char AslCompilerId[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler
vendor ID */
UINT32 AslCompilerRevision; /* ASL compiler version
*/
} ACPI_TABLE_HEADER;
diff --git a/drivers/bus/acpi/acpica/include/actypes.h
b/drivers/bus/acpi/acpica/include/actypes.h
index b7c645f813..48a192a5b8 100644
--- a/drivers/bus/acpi/acpica/include/actypes.h
+++ b/drivers/bus/acpi/acpica/include/actypes.h
@@ -412,7 +412,7 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS;
/* Names within the namespace are 4 bytes long */
-#define ACPI_NAME_SIZE 4
+#define ACPI_NAMESEG_SIZE 4 /* Fixed by ACPI spec */
#define ACPI_PATH_SEGMENT_LENGTH 5 /* 4 chars for name + 1 char for
separator */
#define ACPI_PATH_SEPARATOR '.'
@@ -558,11 +558,11 @@ typedef UINT64 ACPI_INTEGER;
/* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */
#ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED
-#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR
(UINT32, (b)))
-#define ACPI_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR
(UINT32, (src)))
+#define ACPI_COMPARE_NAMESEG(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR
(UINT32, (b)))
+#define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR
(UINT32, (src)))
#else
-#define ACPI_COMPARE_NAME(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)),
ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE))
-#define ACPI_MOVE_NAME(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)),
ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE))
+#define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)),
ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE))
+#define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)),
ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE))
#endif
/* Support for the special RSDP signature (8 characters) */
@@ -572,7 +572,7 @@ typedef UINT64 ACPI_INTEGER;
/* Support for OEMx signature (x can be any character) */
#define ACPI_IS_OEM_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3)
&&\
- strnlen (a, ACPI_NAME_SIZE) == ACPI_NAME_SIZE)
+ strnlen (a, ACPI_NAMESEG_SIZE) ==
ACPI_NAMESEG_SIZE)
/*
* Algorithm to obtain access bit width.
diff --git a/drivers/bus/acpi/acpica/include/platform/aclinux.h
b/drivers/bus/acpi/acpica/include/platform/aclinux.h
index c93548b94c..0e7fe9de00 100644
--- a/drivers/bus/acpi/acpica/include/platform/aclinux.h
+++ b/drivers/bus/acpi/acpica/include/platform/aclinux.h
@@ -113,6 +113,11 @@
#define ACPI_NO_ERROR_MESSAGES
#undef ACPI_DEBUG_OUTPUT
+/* Use a specific bugging default separate from ACPICA */
+
+#undef ACPI_DEBUG_DEFAULT
+#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR)
+
/* External interface for __KERNEL__, stub is needed */
#define ACPI_EXTERNAL_RETURN_STATUS(Prototype) \
diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c
b/drivers/bus/acpi/acpica/namespace/nsaccess.c
index 59121b7b82..949e2e11b3 100644
--- a/drivers/bus/acpi/acpica/namespace/nsaccess.c
+++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c
@@ -743,7 +743,7 @@ AcpiNsLookup (
/* Point to next name segment and make this node current */
- Path += ACPI_NAME_SIZE;
+ Path += ACPI_NAMESEG_SIZE;
CurrentNode = ThisNode;
}
diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c
b/drivers/bus/acpi/acpica/namespace/nsdump.c
index 051f7dfeb5..cf03a110f3 100644
--- a/drivers/bus/acpi/acpica/namespace/nsdump.c
+++ b/drivers/bus/acpi/acpica/namespace/nsdump.c
@@ -127,7 +127,7 @@ AcpiNsPrintPathname (
AcpiOsPrintf ("?");
}
- Pathname += ACPI_NAME_SIZE;
+ Pathname += ACPI_NAMESEG_SIZE;
NumSegments--;
if (NumSegments)
{
diff --git a/drivers/bus/acpi/acpica/namespace/nsinit.c
b/drivers/bus/acpi/acpica/namespace/nsinit.c
index 9dac9d5a32..5866479d5a 100644
--- a/drivers/bus/acpi/acpica/namespace/nsinit.c
+++ b/drivers/bus/acpi/acpica/namespace/nsinit.c
@@ -554,7 +554,7 @@ AcpiNsFindIniMethods (
/* We are only looking for methods named _INI */
- if (!ACPI_COMPARE_NAME (Node->Name.Ascii, METHOD_NAME__INI))
+ if (!ACPI_COMPARE_NAMESEG (Node->Name.Ascii, METHOD_NAME__INI))
{
return (AE_OK);
}
@@ -731,7 +731,7 @@ AcpiNsInitOneDevice (
* Note: We know there is an _INI within this subtree, but it may not be
* under this particular device, it may be lower in the branch.
*/
- if (!ACPI_COMPARE_NAME (DeviceNode->Name.Ascii, "_SB_") ||
+ if (!ACPI_COMPARE_NAMESEG (DeviceNode->Name.Ascii, "_SB_") ||
DeviceNode->Parent != AcpiGbl_RootNode)
{
ACPI_DEBUG_EXEC (AcpiUtDisplayInitPathname (
diff --git a/drivers/bus/acpi/acpica/namespace/nsnames.c
b/drivers/bus/acpi/acpica/namespace/nsnames.c
index 847b59f000..6ab5cc6443 100644
--- a/drivers/bus/acpi/acpica/namespace/nsnames.c
+++ b/drivers/bus/acpi/acpica/namespace/nsnames.c
@@ -165,8 +165,8 @@ AcpiNsHandleToName (
/* Just copy the ACPI name from the Node and zero terminate it */
NodeName = AcpiUtGetNodeName (Node);
- ACPI_MOVE_NAME (Buffer->Pointer, NodeName);
- ((char *) Buffer->Pointer) [ACPI_NAME_SIZE] = 0;
+ ACPI_COPY_NAMESEG (Buffer->Pointer, NodeName);
+ ((char *) Buffer->Pointer) [ACPI_NAMESEG_SIZE] = 0;
ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%4.4s\n", (char *) Buffer->Pointer));
return_ACPI_STATUS (AE_OK);
@@ -266,7 +266,7 @@ AcpiNsBuildNormalizedPath (
BOOLEAN NoTrailing)
{
UINT32 Length = 0, i;
- char Name[ACPI_NAME_SIZE];
+ char Name[ACPI_NAMESEG_SIZE];
BOOLEAN DoNoTrailing;
char c, *Left, *Right;
ACPI_NAMESPACE_NODE *NextNode;
@@ -549,7 +549,7 @@ AcpiNsNormalizePathname (
{
/* Do one nameseg at a time */
- for (i = 0; (i < ACPI_NAME_SIZE) && *InputPath; i++)
+ for (i = 0; (i < ACPI_NAMESEG_SIZE) && *InputPath; i++)
{
if ((i == 0) || (*InputPath != '_')) /* First char is allowed to be
underscore */
{
diff --git a/drivers/bus/acpi/acpica/namespace/nsobject.c
b/drivers/bus/acpi/acpica/namespace/nsobject.c
index bca4193076..c327893ba4 100644
--- a/drivers/bus/acpi/acpica/namespace/nsobject.c
+++ b/drivers/bus/acpi/acpica/namespace/nsobject.c
@@ -244,6 +244,11 @@ AcpiNsDetachObject (
}
}
+ if (ObjDesc->Common.Type == ACPI_TYPE_REGION)
+ {
+ AcpiUtRemoveAddressRange(ObjDesc->Region.SpaceId, Node);
+ }
+
/* Clear the Node entry in all cases */
Node->Object = NULL;
diff --git a/drivers/bus/acpi/acpica/namespace/nsparse.c
b/drivers/bus/acpi/acpica/namespace/nsparse.c
index c7e33972a6..72e0537569 100644
--- a/drivers/bus/acpi/acpica/namespace/nsparse.c
+++ b/drivers/bus/acpi/acpica/namespace/nsparse.c
@@ -257,7 +257,7 @@ AcpiNsOneCompleteParse (
/* Found OSDT table, enable the namespace override feature */
- if (ACPI_COMPARE_NAME(Table->Signature, ACPI_SIG_OSDT) &&
+ if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_OSDT) &&
PassNumber == ACPI_IMODE_LOAD_PASS1)
{
WalkState->NamespaceOverride = TRUE;
diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair.c
b/drivers/bus/acpi/acpica/namespace/nsrepair.c
index b1fa63b2db..8c8a4e9ee2 100644
--- a/drivers/bus/acpi/acpica/namespace/nsrepair.c
+++ b/drivers/bus/acpi/acpica/namespace/nsrepair.c
@@ -362,7 +362,7 @@ AcpiNsMatchSimpleRepair (
ThisName = AcpiObjectRepairInfo;
while (ThisName->ObjectConverter)
{
- if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name))
+ if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii, ThisName->Name))
{
/* Check if we can actually repair this name/type combination */
diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair2.c
b/drivers/bus/acpi/acpica/namespace/nsrepair2.c
index 7f2c400621..6668ad1130 100644
--- a/drivers/bus/acpi/acpica/namespace/nsrepair2.c
+++ b/drivers/bus/acpi/acpica/namespace/nsrepair2.c
@@ -61,7 +61,7 @@ ACPI_STATUS (*ACPI_REPAIR_FUNCTION) (
typedef struct acpi_repair_info
{
- char Name[ACPI_NAME_SIZE];
+ char Name[ACPI_NAMESEG_SIZE];
ACPI_REPAIR_FUNCTION RepairFunction;
} ACPI_REPAIR_INFO;
@@ -250,7 +250,7 @@ AcpiNsMatchComplexRepair (
ThisName = AcpiNsRepairableNames;
while (ThisName->RepairFunction)
{
- if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name))
+ if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii, ThisName->Name))
{
return (ThisName);
}
diff --git a/drivers/bus/acpi/acpica/namespace/nsutils.c
b/drivers/bus/acpi/acpica/namespace/nsutils.c
index fe0fd35e05..2584dca6a2 100644
--- a/drivers/bus/acpi/acpica/namespace/nsutils.c
+++ b/drivers/bus/acpi/acpica/namespace/nsutils.c
@@ -243,7 +243,7 @@ AcpiNsGetInternalNameLength (
}
}
- Info->Length = (ACPI_NAME_SIZE * Info->NumSegments) +
+ Info->Length = (ACPI_NAMESEG_SIZE * Info->NumSegments) +
4 + Info->NumCarats;
Info->NextExternalChar = NextExternalChar;
@@ -335,7 +335,7 @@ AcpiNsBuildInternalName (
for (; NumSegments; NumSegments--)
{
- for (i = 0; i < ACPI_NAME_SIZE; i++)
+ for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{
if (ACPI_IS_PATH_SEPARATOR (*ExternalName) ||
(*ExternalName == 0))
@@ -364,7 +364,7 @@ AcpiNsBuildInternalName (
/* Move on the next segment */
ExternalName++;
- Result += ACPI_NAME_SIZE;
+ Result += ACPI_NAMESEG_SIZE;
}
/* Terminate the string */
@@ -613,12 +613,12 @@ AcpiNsExternalizeName (
/* Copy and validate the 4-char name segment */
- ACPI_MOVE_NAME (&(*ConvertedName)[j],
+ ACPI_COPY_NAMESEG (&(*ConvertedName)[j],
&InternalName[NamesIndex]);
AcpiUtRepairName (&(*ConvertedName)[j]);
- j += ACPI_NAME_SIZE;
- NamesIndex += ACPI_NAME_SIZE;
+ j += ACPI_NAMESEG_SIZE;
+ NamesIndex += ACPI_NAMESEG_SIZE;
}
}
diff --git a/drivers/bus/acpi/acpica/namespace/nsxfname.c
b/drivers/bus/acpi/acpica/namespace/nsxfname.c
index 6cdc9114a7..1d44670ef3 100644
--- a/drivers/bus/acpi/acpica/namespace/nsxfname.c
+++ b/drivers/bus/acpi/acpica/namespace/nsxfname.c
@@ -583,8 +583,8 @@ AcpiInstallMethod (
/* Table must be a DSDT or SSDT */
- if (!ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) &&
- !ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT))
+ if (!ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT) &&
+ !ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_SSDT))
{
return (AE_BAD_HEADER);
}
diff --git a/drivers/bus/acpi/acpica/parser/psargs.c
b/drivers/bus/acpi/acpica/parser/psargs.c
index 3189ea4d89..130bece424 100644
--- a/drivers/bus/acpi/acpica/parser/psargs.c
+++ b/drivers/bus/acpi/acpica/parser/psargs.c
@@ -206,21 +206,21 @@ AcpiPsGetNextNamestring (
/* Two name segments */
- End += 1 + (2 * ACPI_NAME_SIZE);
+ End += 1 + (2 * ACPI_NAMESEG_SIZE);
break;
case AML_MULTI_NAME_PREFIX:
/* Multiple name segments, 4 chars each, count in next byte */
- End += 2 + (*(End + 1) * ACPI_NAME_SIZE);
+ End += 2 + (*(End + 1) * ACPI_NAMESEG_SIZE);
break;
default:
/* Single name segment */
- End += ACPI_NAME_SIZE;
+ End += ACPI_NAMESEG_SIZE;
break;
}
@@ -600,7 +600,7 @@ AcpiPsGetNextField (
ACPI_MOVE_32_TO_32 (&Name, ParserState->Aml);
AcpiPsSetName (Field, Name);
- ParserState->Aml += ACPI_NAME_SIZE;
+ ParserState->Aml += ACPI_NAMESEG_SIZE;
ASL_CV_CAPTURE_COMMENTS_ONLY (ParserState);
diff --git a/drivers/bus/acpi/acpica/resources/rsxface.c
b/drivers/bus/acpi/acpica/resources/rsxface.c
index cfbabec405..dae2656122 100644
--- a/drivers/bus/acpi/acpica/resources/rsxface.c
+++ b/drivers/bus/acpi/acpica/resources/rsxface.c
@@ -717,10 +717,10 @@ AcpiWalkResources (
/* Parameter validation */
if (!DeviceHandle || !UserFunction || !Name ||
- (!ACPI_COMPARE_NAME (Name, METHOD_NAME__CRS) &&
- !ACPI_COMPARE_NAME (Name, METHOD_NAME__PRS) &&
- !ACPI_COMPARE_NAME (Name, METHOD_NAME__AEI) &&
- !ACPI_COMPARE_NAME (Name, METHOD_NAME__DMA)))
+ (!ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__CRS) &&
+ !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__PRS) &&
+ !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__AEI) &&
+ !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__DMA)))
{
return_ACPI_STATUS (AE_BAD_PARAMETER);
}
diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c
b/drivers/bus/acpi/acpica/tables/tbdata.c
index 6c210b38cb..63d3137ec6 100644
--- a/drivers/bus/acpi/acpica/tables/tbdata.c
+++ b/drivers/bus/acpi/acpica/tables/tbdata.c
@@ -568,7 +568,7 @@ AcpiTbVerifyTempTable (
/* If a particular signature is expected (DSDT/FACS), it must match */
if (Signature &&
- !ACPI_COMPARE_NAME (&TableDesc->Signature, Signature))
+ !ACPI_COMPARE_NAMESEG (&TableDesc->Signature, Signature))
{
ACPI_BIOS_ERROR ((AE_INFO,
"Invalid signature 0x%X for ACPI table, expected [%s]",
diff --git a/drivers/bus/acpi/acpica/tables/tbfind.c
b/drivers/bus/acpi/acpica/tables/tbfind.c
index e3e7c5c1e8..465c5fc13a 100644
--- a/drivers/bus/acpi/acpica/tables/tbfind.c
+++ b/drivers/bus/acpi/acpica/tables/tbfind.c
@@ -99,7 +99,7 @@ AcpiTbFindTable (
/* Normalize the input strings */
memset (&Header, 0, sizeof (ACPI_TABLE_HEADER));
- ACPI_MOVE_NAME (Header.Signature, Signature);
+ ACPI_COPY_NAMESEG (Header.Signature, Signature);
strncpy (Header.OemId, OemId, ACPI_OEM_ID_SIZE);
strncpy (Header.OemTableId, OemTableId, ACPI_OEM_TABLE_ID_SIZE);
@@ -109,7 +109,7 @@ AcpiTbFindTable (
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
{
if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature),
- Header.Signature, ACPI_NAME_SIZE))
+ Header.Signature, ACPI_NAMESEG_SIZE))
{
/* Not the requested table */
@@ -137,7 +137,7 @@ AcpiTbFindTable (
/* Check for table match on all IDs */
if (!memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->Signature,
- Header.Signature, ACPI_NAME_SIZE) &&
+ Header.Signature, ACPI_NAMESEG_SIZE) &&
(!OemId[0] ||
!memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->OemId,
Header.OemId, ACPI_OEM_ID_SIZE)) &&
diff --git a/drivers/bus/acpi/acpica/tables/tbinstal.c
b/drivers/bus/acpi/acpica/tables/tbinstal.c
index 969716b7fa..73bc45d069 100644
--- a/drivers/bus/acpi/acpica/tables/tbinstal.c
+++ b/drivers/bus/acpi/acpica/tables/tbinstal.c
@@ -166,7 +166,7 @@ AcpiTbInstallStandardTable (
*/
if (!Reload &&
AcpiGbl_DisableSsdtTableInstall &&
- ACPI_COMPARE_NAME (&NewTableDesc.Signature, ACPI_SIG_SSDT))
+ ACPI_COMPARE_NAMESEG (&NewTableDesc.Signature, ACPI_SIG_SSDT))
{
ACPI_INFO ((
"Ignoring installation of %4.4s at %8.8X%8.8X",
diff --git a/drivers/bus/acpi/acpica/tables/tbprint.c
b/drivers/bus/acpi/acpica/tables/tbprint.c
index 11bd00908d..99af47ab06 100644
--- a/drivers/bus/acpi/acpica/tables/tbprint.c
+++ b/drivers/bus/acpi/acpica/tables/tbprint.c
@@ -117,10 +117,10 @@ AcpiTbCleanupTableHeader (
memcpy (OutHeader, Header, sizeof (ACPI_TABLE_HEADER));
- AcpiTbFixString (OutHeader->Signature, ACPI_NAME_SIZE);
+ AcpiTbFixString (OutHeader->Signature, ACPI_NAMESEG_SIZE);
AcpiTbFixString (OutHeader->OemId, ACPI_OEM_ID_SIZE);
AcpiTbFixString (OutHeader->OemTableId, ACPI_OEM_TABLE_ID_SIZE);
- AcpiTbFixString (OutHeader->AslCompilerId, ACPI_NAME_SIZE);
+ AcpiTbFixString (OutHeader->AslCompilerId, ACPI_NAMESEG_SIZE);
}
@@ -145,7 +145,7 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER LocalHeader;
- if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS))
+ if (ACPI_COMPARE_NAMESEG (Header->Signature, ACPI_SIG_FACS))
{
/* FACS only has signature and length fields */
@@ -212,8 +212,8 @@ AcpiTbVerifyChecksum (
* They are the odd tables, have no standard ACPI header and no checksum
*/
- if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT) ||
- ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
+ if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT) ||
+ ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS))
{
return (AE_OK);
}
diff --git a/drivers/bus/acpi/acpica/tables/tbutils.c
b/drivers/bus/acpi/acpica/tables/tbutils.c
index e71596b66c..58d3027b17 100644
--- a/drivers/bus/acpi/acpica/tables/tbutils.c
+++ b/drivers/bus/acpi/acpica/tables/tbutils.c
@@ -395,7 +395,7 @@ AcpiTbParseRootTable (
ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex);
if (ACPI_SUCCESS (Status) &&
- ACPI_COMPARE_NAME (
+ ACPI_COMPARE_NAMESEG (
&AcpiGbl_RootTableList.Tables[TableIndex].Signature,
ACPI_SIG_FADT))
{
diff --git a/drivers/bus/acpi/acpica/tables/tbxface.c
b/drivers/bus/acpi/acpica/tables/tbxface.c
index 6974964033..7f709953ee 100644
--- a/drivers/bus/acpi/acpica/tables/tbxface.c
+++ b/drivers/bus/acpi/acpica/tables/tbxface.c
@@ -293,7 +293,7 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
{
- if (!ACPI_COMPARE_NAME (
+ if (!ACPI_COMPARE_NAMESEG (
&(AcpiGbl_RootTableList.Tables[i].Signature), Signature))
{
continue;
@@ -396,7 +396,7 @@ AcpiGetTable (
{
TableDesc = &AcpiGbl_RootTableList.Tables[i];
- if (!ACPI_COMPARE_NAME (&TableDesc->Signature, Signature))
+ if (!ACPI_COMPARE_NAMESEG (&TableDesc->Signature, Signature))
{
continue;
}
diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c
b/drivers/bus/acpi/acpica/tables/tbxfload.c
index 32095dccf8..723924ae5d 100644
--- a/drivers/bus/acpi/acpica/tables/tbxfload.c
+++ b/drivers/bus/acpi/acpica/tables/tbxfload.c
@@ -167,7 +167,7 @@ AcpiTbLoadNamespace (
Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex];
if (!AcpiGbl_RootTableList.CurrentTableCount ||
- !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
+ !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_DSDT) ||
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
Status = AE_NO_ACPI_TABLES;
@@ -226,9 +226,9 @@ AcpiTbLoadNamespace (
Table = &AcpiGbl_RootTableList.Tables[i];
if (!Table->Address ||
- (!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_SSDT) &&
- !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_PSDT) &&
- !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_OSDT)) ||
+ (!ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_SSDT) &&
+ !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_PSDT) &&
+ !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_OSDT)) ||
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
continue;
@@ -448,7 +448,7 @@ AcpiUnloadParentTable (
* only these types can contain AML and thus are the only types
* that can create namespace objects.
*/
- if (ACPI_COMPARE_NAME (
+ if (ACPI_COMPARE_NAMESEG (
AcpiGbl_RootTableList.Tables[i].Signature.Ascii,
ACPI_SIG_DSDT))
{
diff --git a/drivers/bus/acpi/acpica/utilities/utascii.c
b/drivers/bus/acpi/acpica/utilities/utascii.c
index 06a3586c49..259c91a10b 100644
--- a/drivers/bus/acpi/acpica/utilities/utascii.c
+++ b/drivers/bus/acpi/acpica/utilities/utascii.c
@@ -68,7 +68,7 @@ AcpiUtValidNameseg (
/* Validate each character in the signature */
- for (i = 0; i < ACPI_NAME_SIZE; i++)
+ for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{
if (!AcpiUtValidNameChar (Name[i], i))
{
diff --git a/drivers/bus/acpi/acpica/utilities/utdecode.c
b/drivers/bus/acpi/acpica/utilities/utdecode.c
index 9bd3d501fa..2002050836 100644
--- a/drivers/bus/acpi/acpica/utilities/utdecode.c
+++ b/drivers/bus/acpi/acpica/utilities/utdecode.c
@@ -106,17 +106,17 @@ const UINT8
AcpiGbl_NsProperties[ACPI_NUM_NS_TYPES] =
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 */
+ "PlatformCommChannel"/* 0x0A */
};
@@ -308,7 +308,7 @@ AcpiUtGetNodeName (
ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) Object;
- /* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */
+ /* Must return a string of exactly 4 characters == ACPI_NAMESEG_SIZE */
if (!Object)
{
@@ -524,7 +524,7 @@ static const char
*AcpiGbl_GenericNotify[ACPI_GENERIC_NOTIFY_MAX + 1]
/* 0B */ "System Locality Update",
/* 0C */ "Reserved (was previously Shutdown Request)", /* Reserved in ACPI
6.0 */
/* 0D */ "System Resource Affinity Update",
- /* 0E */ "Heterogeneous Memory Attributes Update" /* ACPI 6.2 */
+ /* 0E */ "Heterogeneous Memory Attributes Update", /* ACPI 6.2 */
/* 0F */ "Error Disconnect Recover" /* ACPI 6.3 */
};
diff --git a/drivers/bus/acpi/acpica/utilities/utmisc.c
b/drivers/bus/acpi/acpica/utilities/utmisc.c
index bbb384562d..6e43b68244 100644
--- a/drivers/bus/acpi/acpica/utilities/utmisc.c
+++ b/drivers/bus/acpi/acpica/utilities/utmisc.c
@@ -106,10 +106,10 @@ AcpiUtIsAmlTable (
/* These are the only tables that contain executable AML */
- if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) ||
- ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_PSDT) ||
- ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT) ||
- ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT) ||
+ if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT) ||
+ ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_PSDT) ||
+ ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_SSDT) ||
+ ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_OSDT) ||
ACPI_IS_OEM_SIG (Table->Signature))
{
return (TRUE);
diff --git a/drivers/bus/acpi/acpica/utilities/utpredef.c
b/drivers/bus/acpi/acpica/utilities/utpredef.c
index 3650dd7c67..17b68677ce 100644
--- a/drivers/bus/acpi/acpica/utilities/utpredef.c
+++ b/drivers/bus/acpi/acpica/utilities/utpredef.c
@@ -129,7 +129,7 @@ AcpiUtMatchPredefinedMethod (
ThisName = AcpiGbl_PredefinedMethods;
while (ThisName->Info.Name[0])
{
- if (ACPI_COMPARE_NAME (Name, ThisName->Info.Name))
+ if (ACPI_COMPARE_NAMESEG (Name, ThisName->Info.Name))
{
return (ThisName);
}
@@ -266,7 +266,7 @@ AcpiUtMatchResourceName (
ThisName = AcpiGbl_ResourceNames;
while (ThisName->Info.Name[0])
{
- if (ACPI_COMPARE_NAME (Name, ThisName->Info.Name))
+ if (ACPI_COMPARE_NAMESEG (Name, ThisName->Info.Name))
{
return (ThisName);
}
diff --git a/drivers/bus/acpi/acpica/utilities/utstring.c
b/drivers/bus/acpi/acpica/utilities/utstring.c
index b45e8f9a81..ba7b5adecd 100644
--- a/drivers/bus/acpi/acpica/utilities/utstring.c
+++ b/drivers/bus/acpi/acpica/utilities/utstring.c
@@ -195,16 +195,16 @@ AcpiUtRepairName (
* Special case for the root node. This can happen if we get an
* error during the execution of module-level code.
*/
- if (ACPI_COMPARE_NAME (Name, ACPI_ROOT_PATHNAME))
+ if (ACPI_COMPARE_NAMESEG (Name, ACPI_ROOT_PATHNAME))
{
return;
}
- ACPI_MOVE_NAME (&OriginalName, Name);
+ ACPI_COPY_NAMESEG (&OriginalName, Name);
/* Check each character in the name */
- for (i = 0; i < ACPI_NAME_SIZE; i++)
+ for (i = 0; i < ACPI_NAMESEG_SIZE; i++)
{
if (AcpiUtValidNameChar (Name[i], i))
{
diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt
index a74c79e744..e82f0aff3f 100644
--- a/media/doc/3rd Party Files.txt
+++ b/media/doc/3rd Party Files.txt
@@ -95,5 +95,5 @@ Used Version: 1.6.36
Website: http://libpng.sourceforge.net/
Title: ACPICA
-Used Version: 20190215
+Used Version: 20190329
Website: https://acpica.org/