Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist merge changes for acpica-20210604
details: https://anonhg.NetBSD.org/src/rev/1860ba7273dc
branches: trunk
changeset: 1022154:1860ba7273dc
user: christos <christos%NetBSD.org@localhost>
date: Tue Jul 06 12:23:46 2021 +0000
description:
merge changes for acpica-20210604
diffstat:
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 4 +
sys/external/bsd/acpica/dist/compiler/aslutils.c | 40 +++++++++++++++++
sys/external/bsd/acpica/dist/compiler/dtfield.c | 4 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 19 ++++++++
sys/external/bsd/acpica/dist/include/acdisasm.h | 37 ++++++++++++++--
sys/external/bsd/acpica/dist/include/acpixf.h | 2 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 43 ++++++++++++++++++-
sys/external/bsd/acpica/dist/include/acutils.h | 5 ++
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 7 +++
sys/external/bsd/acpica/dist/utilities/utdelete.c | 8 +++
sys/external/bsd/acpica/dist/utilities/utprint.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 48 +++++++++++++++++++++
12 files changed, 209 insertions(+), 10 deletions(-)
diffs (truncated from 426 to 300 lines):
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/compiler/aslcompiler.h
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Tue Jul 06 12:23:46 2021 +0000
@@ -1116,6 +1116,10 @@
#define ASL_PARSE_OUTPUT 1
#define ASL_TREE_OUTPUT 2
+BOOLEAN
+UtIsIdInteger (
+ UINT8 *Target);
+
UINT8
UtIsBigEndianMachine (
void);
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/compiler/aslutils.c
--- a/sys/external/bsd/acpica/dist/compiler/aslutils.c Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslutils.c Tue Jul 06 12:23:46 2021 +0000
@@ -98,6 +98,46 @@
}
+/*******************************************************************************
+ *
+ * FUNCTION: UtIsIdInteger
+ *
+ * PARAMETERS: Pointer to an ACPI ID (HID, CID) string
+ *
+ * RETURN: TRUE if string is an integer
+ * FALSE if string is not an integer
+ *
+ * DESCRIPTION: Determine whether the input ACPI ID string can be converted to
+ * an integer value.
+ *
+ ******************************************************************************/
+
+BOOLEAN
+UtIsIdInteger (
+ UINT8 *Target)
+{
+ UINT32 i;
+
+
+ /* The first three characters of the string must be alphabetic */
+
+ for (i = 0; i < 3; i++)
+ {
+ if (!isalpha ((int) Target[i]))
+ {
+ break;
+ }
+ }
+
+ if (i < 3)
+ {
+ return (TRUE);
+ }
+
+ return (FALSE);
+}
+
+
/******************************************************************************
*
* FUNCTION: UtQueryForOverwrite
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/compiler/dtfield.c
--- a/sys/external/bsd/acpica/dist/compiler/dtfield.c Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/dtfield.c Tue Jul 06 12:23:46 2021 +0000
@@ -326,14 +326,14 @@
{
if (Value != 1)
{
- DtError (ASL_WARNING, ASL_MSG_RESERVED_VALUE, Field,
+ DtError (ASL_WARNING, ASL_MSG_RESERVED_FIELD, Field,
"Must be one, setting to one");
Value = 1;
}
}
else if (Value != 0)
{
- DtError (ASL_WARNING, ASL_MSG_RESERVED_VALUE, Field,
+ DtError (ASL_WARNING, ASL_MSG_RESERVED_FIELD, Field,
"Must be zero, setting to zero");
Value = 0;
}
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/compiler/dtutils.c
--- a/sys/external/bsd/acpica/dist/compiler/dtutils.c Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/dtutils.c Tue Jul 06 12:23:46 2021 +0000
@@ -318,6 +318,7 @@
case ACPI_DMT_NAME6:
case ACPI_DMT_NAME8:
case ACPI_DMT_STRING:
+ case ACPI_DMT_IVRS_UNTERMINATED_STRING:
Type = DT_FIELD_TYPE_STRING;
break;
@@ -468,11 +469,13 @@
case ACPI_DMT_ACCWIDTH:
case ACPI_DMT_CEDT:
case ACPI_DMT_IVRS:
+ case ACPI_DMT_IVRS_DE:
case ACPI_DMT_GTDT:
case ACPI_DMT_MADT:
case ACPI_DMT_PCCT:
case ACPI_DMT_PMTT:
case ACPI_DMT_PPTT:
+ case ACPI_DMT_RGRT:
case ACPI_DMT_SDEV:
case ACPI_DMT_SRAT:
case ACPI_DMT_ASF:
@@ -552,6 +555,22 @@
}
break;
+ case ACPI_DMT_IVRS_UNTERMINATED_STRING:
+
+ Value = DtGetFieldValue (Field);
+ if (Value)
+ {
+ ByteLength = strlen (Value);
+ }
+ else
+ { /* At this point, this is a fatal error */
+
+ sprintf (AslGbl_MsgBuffer, "Expected \"%s\"", Info->Name);
+ DtFatal (ASL_MSG_COMPILER_INTERNAL, NULL, AslGbl_MsgBuffer);
+ return (0);
+ }
+ break;
+
case ACPI_DMT_GAS:
ByteLength = sizeof (ACPI_GENERIC_ADDRESS);
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/include/acdisasm.h
--- a/sys/external/bsd/acpica/dist/include/acdisasm.h Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/include/acdisasm.h Tue Jul 06 12:23:46 2021 +0000
@@ -158,6 +158,8 @@
ACPI_DMT_HMAT,
ACPI_DMT_IORTMEM,
ACPI_DMT_IVRS,
+ ACPI_DMT_IVRS_DE,
+ ACPI_DMT_IVRS_UNTERMINATED_STRING,
ACPI_DMT_LPIT,
ACPI_DMT_MADT,
ACPI_DMT_NFIT,
@@ -166,6 +168,7 @@
ACPI_DMT_PMTT,
ACPI_DMT_PMTT_VENDOR,
ACPI_DMT_PPTT,
+ ACPI_DMT_RGRT,
ACPI_DMT_SDEI,
ACPI_DMT_SDEV,
ACPI_DMT_SLIC,
@@ -257,6 +260,7 @@
extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf3[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf4[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsfHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoBdat[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoBoot[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoBert[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoBgrt[];
@@ -357,16 +361,20 @@
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIortMap[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIortPad[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs0[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs01[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHware1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHware23[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsMemory[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs4[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs8a[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs8b[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrs8c[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsCidString[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsCidInteger[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHid[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHid1[];
-extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsUidString[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsUidInteger[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHidString[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoIvrsHidInteger[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt0[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt1[];
@@ -438,7 +446,12 @@
extern ACPI_DMTABLE_INFO AcpiDmTableInfoPptt1a[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoPptt2[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoPpttHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoPrmtHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoPrmtModule[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoPrmtHandler[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRasf[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRgrt[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRgrt0[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRsdp1[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRsdp2[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoS3pt[];
@@ -472,6 +485,8 @@
extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat5[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoStao[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoStaoStr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoSvkl[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoSvkl0[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoTcpaHdr[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoTcpaClient[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoTcpaServer[];
@@ -666,6 +681,14 @@
AcpiDmDumpPptt (
ACPI_TABLE_HEADER *Table);
+void
+AcpiDmDumpPrmt (
+ ACPI_TABLE_HEADER *Table);
+
+void
+AcpiDmDumpRgrt (
+ ACPI_TABLE_HEADER *Table);
+
UINT32
AcpiDmDumpRsdp (
ACPI_TABLE_HEADER *Table);
@@ -699,6 +722,10 @@
ACPI_TABLE_HEADER *Table);
void
+AcpiDmDumpSvkl (
+ ACPI_TABLE_HEADER *Table);
+
+void
AcpiDmDumpTcpa (
ACPI_TABLE_HEADER *Table);
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/include/acpixf.h
--- a/sys/external/bsd/acpica/dist/include/acpixf.h Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/include/acpixf.h Tue Jul 06 12:23:46 2021 +0000
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
-#define ACPI_CA_VERSION 0x20210331
+#define ACPI_CA_VERSION 0x20210604
#include "acconfig.h"
#include "actypes.h"
diff -r 343780d9b89e -r 1860ba7273dc sys/external/bsd/acpica/dist/include/actbl1.h
--- a/sys/external/bsd/acpica/dist/include/actbl1.h Tue Jul 06 12:20:52 2021 +0000
+++ b/sys/external/bsd/acpica/dist/include/actbl1.h Tue Jul 06 12:23:46 2021 +0000
@@ -415,9 +415,19 @@
enum AcpiCedtType
{
ACPI_CEDT_TYPE_CHBS = 0,
- ACPI_CEDT_TYPE_RESERVED = 1
+ ACPI_CEDT_TYPE_CFMWS = 1,
+ ACPI_CEDT_TYPE_RESERVED = 2,
};
+/* Values for version field above */
+
+#define ACPI_CEDT_CHBS_VERSION_CXL11 (0)
+#define ACPI_CEDT_CHBS_VERSION_CXL20 (1)
+
+/* Values for length field above */
+
+#define ACPI_CEDT_CHBS_LENGTH_CXL11 (0x2000)
+#define ACPI_CEDT_CHBS_LENGTH_CXL20 (0x10000)
/*
* CEDT subtables
@@ -437,6 +447,37 @@
} ACPI_CEDT_CHBS;
+/* 1: CXL Fixed Memory Window Structure */
+
+typedef struct acpi_cedt_cfmws
+{
+ ACPI_CEDT_HEADER Header;
+ UINT32 Reserved1;
+ UINT64 BaseHpa;
+ UINT64 WindowSize;
+ UINT8 InterleaveWays;
+ UINT8 InterleaveArithmetic;
+ UINT16 Reserved2;
+ UINT32 Granularity;
+ UINT16 Restrictions;
+ UINT16 QtgId;
+ UINT32 InterleaveTargets[];
+
+} ACPI_CEDT_CFMWS;
+
+/* Values for Interleave Arithmetic field above */
+
+#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)
Home |
Main Index |
Thread Index |
Old Index