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 conflicts between 2021-06...



details:   https://anonhg.NetBSD.org/src/rev/1e518b97ef5a
branches:  trunk
changeset: 1024555:1e518b97ef5a
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Oct 28 14:53:08 2021 +0000

description:
merge conflicts between 2021-06-04 and 2021-09-30

diffstat:

 sys/external/bsd/acpica/dist/compiler/aslutils.c  |   6 +-
 sys/external/bsd/acpica/dist/compiler/dtfield.c   |   4 +-
 sys/external/bsd/acpica/dist/compiler/dtutils.c   |  12 +++++-
 sys/external/bsd/acpica/dist/hardware/hwesleep.c  |   7 +--
 sys/external/bsd/acpica/dist/hardware/hwsleep.c   |  10 +--
 sys/external/bsd/acpica/dist/hardware/hwxfsleep.c |   6 ++
 sys/external/bsd/acpica/dist/include/acdisasm.h   |  47 ++++++++++++++++++++++-
 sys/external/bsd/acpica/dist/include/acglobal.h   |   2 +
 sys/external/bsd/acpica/dist/include/acoutput.h   |   2 +-
 sys/external/bsd/acpica/dist/include/acpixf.h     |   2 +-
 sys/external/bsd/acpica/dist/include/actbl1.h     |  16 +++++++-
 sys/external/bsd/acpica/dist/include/actypes.h    |   1 +
 sys/external/bsd/acpica/dist/utilities/utosi.c    |   1 +
 13 files changed, 96 insertions(+), 20 deletions(-)

diffs (truncated from 398 to 300 lines):

diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/compiler/aslutils.c
--- a/sys/external/bsd/acpica/dist/compiler/aslutils.c  Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/aslutils.c  Thu Oct 28 14:53:08 2021 +0000
@@ -326,18 +326,20 @@
 
 
     printf ("\nACPI tables supported by iASL version %8.8X:\n"
-        "  (Compiler, Disassembler, Template Generator)\n\n",
+        "  (Compiler, Disassembler, Template Generator)\n",
         ACPI_CA_VERSION);
 
     /* All ACPI tables with the common table header */
 
-    printf ("\n  Supported ACPI tables:\n");
+    printf ("\nKnown/Supported ACPI tables:\n");
     for (TableData = AcpiGbl_SupportedTables, i = 1;
          TableData->Signature; TableData++, i++)
     {
         printf ("%8u) %s    %s\n", i,
             TableData->Signature, TableData->Description);
     }
+
+    printf ("\nTotal %u ACPI tables\n\n", i-1);
 }
 
 
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/compiler/dtfield.c
--- a/sys/external/bsd/acpica/dist/compiler/dtfield.c   Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/dtfield.c   Thu Oct 28 14:53:08 2021 +0000
@@ -326,14 +326,14 @@
         {
             if (Value != 1)
             {
-                DtError (ASL_WARNING, ASL_MSG_RESERVED_FIELD, Field,
+                DtError (ASL_ERROR, ASL_MSG_RESERVED_FIELD, Field,
                     "Must be one, setting to one");
                 Value = 1;
             }
         }
         else if (Value != 0)
         {
-            DtError (ASL_WARNING, ASL_MSG_RESERVED_FIELD, Field,
+            DtError (ASL_ERROR, ASL_MSG_RESERVED_FIELD, Field,
                 "Must be zero, setting to zero");
             Value = 0;
         }
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/compiler/dtutils.c
--- a/sys/external/bsd/acpica/dist/compiler/dtutils.c   Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/compiler/dtutils.c   Thu Oct 28 14:53:08 2021 +0000
@@ -344,6 +344,7 @@
         break;
 
     case ACPI_DMT_UNICODE:
+    case ACPI_DMT_WPBT_UNICODE:
 
         Type = DT_FIELD_TYPE_UNICODE;
         break;
@@ -472,12 +473,18 @@
     case ACPI_DMT_IVRS_DE:
     case ACPI_DMT_GTDT:
     case ACPI_DMT_MADT:
+    case ACPI_DMT_NHLT1:
+    case ACPI_DMT_NHLT1a:
     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_AEST:
+    case ACPI_DMT_AEST_RES:
+    case ACPI_DMT_AEST_XFACE:
+    case ACPI_DMT_AEST_XRUPT:
     case ACPI_DMT_ASF:
     case ACPI_DMT_HESTNTYP:
     case ACPI_DMT_FADTPM:
@@ -508,6 +515,8 @@
         break;
 
     case ACPI_DMT_UINT32:
+    case ACPI_DMT_AEST_CACHE:
+    case ACPI_DMT_AEST_GIC:
     case ACPI_DMT_NAME4:
     case ACPI_DMT_SIG:
     case ACPI_DMT_LPIT:
@@ -626,12 +635,13 @@
         break;
 
     case ACPI_DMT_UNICODE:
+    case ACPI_DMT_WPBT_UNICODE:
 
         Value = DtGetFieldValue (Field);
 
         /* TBD: error if Value is NULL? (as below?) */
 
-        ByteLength = (strlen (Value) + 1) * sizeof(UINT16);
+        ByteLength = (strlen (Value) + 1) * sizeof (UINT16);
         break;
 
     default:
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/hardware/hwesleep.c
--- a/sys/external/bsd/acpica/dist/hardware/hwesleep.c  Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/hardware/hwesleep.c  Thu Oct 28 14:53:08 2021 +0000
@@ -204,18 +204,15 @@
 AcpiHwExtendedWakePrep (
     UINT8                   SleepState)
 {
-    ACPI_STATUS             Status;
     UINT8                   SleepTypeValue;
 
 
     ACPI_FUNCTION_TRACE (HwExtendedWakePrep);
 
 
-    Status = AcpiGetSleepTypeData (ACPI_STATE_S0,
-        &AcpiGbl_SleepTypeA, &AcpiGbl_SleepTypeB);
-    if (ACPI_SUCCESS (Status))
+    if (AcpiGbl_SleepTypeAS0 != ACPI_SLEEP_TYPE_INVALID)
     {
-        SleepTypeValue = ((AcpiGbl_SleepTypeA << ACPI_X_SLEEP_TYPE_POSITION) &
+        SleepTypeValue = ((AcpiGbl_SleepTypeAS0 << ACPI_X_SLEEP_TYPE_POSITION) &
             ACPI_X_SLEEP_TYPE_MASK);
 
         (void) AcpiWrite ((UINT64) (SleepTypeValue | ACPI_X_SLEEP_ENABLE),
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/hardware/hwsleep.c
--- a/sys/external/bsd/acpica/dist/hardware/hwsleep.c   Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/hardware/hwsleep.c   Thu Oct 28 14:53:08 2021 +0000
@@ -231,7 +231,7 @@
 AcpiHwLegacyWakePrep (
     UINT8                   SleepState)
 {
-    ACPI_STATUS             Status;
+    ACPI_STATUS             Status = AE_OK;
     ACPI_BIT_REGISTER_INFO  *SleepTypeRegInfo;
     ACPI_BIT_REGISTER_INFO  *SleepEnableRegInfo;
     UINT32                  Pm1aControl;
@@ -245,9 +245,7 @@
      * This is unclear from the ACPI Spec, but it is required
      * by some machines.
      */
-    Status = AcpiGetSleepTypeData (ACPI_STATE_S0,
-        &AcpiGbl_SleepTypeA, &AcpiGbl_SleepTypeB);
-    if (ACPI_SUCCESS (Status))
+    if (AcpiGbl_SleepTypeAS0 != ACPI_SLEEP_TYPE_INVALID)
     {
         SleepTypeRegInfo =
             AcpiHwGetBitRegisterInfo (ACPI_BITREG_SLEEP_TYPE);
@@ -268,9 +266,9 @@
 
             /* Insert the SLP_TYP bits */
 
-            Pm1aControl |= (AcpiGbl_SleepTypeA <<
+            Pm1aControl |= (AcpiGbl_SleepTypeAS0 <<
                 SleepTypeRegInfo->BitPosition);
-            Pm1bControl |= (AcpiGbl_SleepTypeB <<
+            Pm1aControl |= (AcpiGbl_SleepTypeBS0 <<
                 SleepTypeRegInfo->BitPosition);
 
             /* Write the control registers and ignore any errors */
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
--- a/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c Thu Oct 28 14:53:08 2021 +0000
@@ -363,6 +363,12 @@
         return_ACPI_STATUS (Status);
     }
 
+    Status = AcpiGetSleepTypeData (ACPI_STATE_S0,
+        &AcpiGbl_SleepTypeAS0, &AcpiGbl_SleepTypeBS0);
+    if (ACPI_FAILURE (Status)) {
+        AcpiGbl_SleepTypeAS0 = ACPI_SLEEP_TYPE_INVALID;
+    }
+
     /* Execute the _PTS method (Prepare To Sleep) */
 
     ArgList.Count = 1;
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/include/acdisasm.h
--- a/sys/external/bsd/acpica/dist/include/acdisasm.h   Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/include/acdisasm.h   Thu Oct 28 14:53:08 2021 +0000
@@ -116,6 +116,7 @@
     ACPI_DMT_BUF10,
     ACPI_DMT_BUF12,
     ACPI_DMT_BUF16,
+    ACPI_DMT_BUF18,
     ACPI_DMT_BUF128,
     ACPI_DMT_SIG,
     ACPI_DMT_STRING,
@@ -142,6 +143,12 @@
 
     /* Types that are specific to particular ACPI tables */
 
+    ACPI_DMT_AEST,
+    ACPI_DMT_AEST_CACHE,
+    ACPI_DMT_AEST_GIC,
+    ACPI_DMT_AEST_RES,
+    ACPI_DMT_AEST_XFACE,
+    ACPI_DMT_AEST_XRUPT,
     ACPI_DMT_ASF,
     ACPI_DMT_CEDT,
     ACPI_DMT_DMAR,
@@ -163,6 +170,8 @@
     ACPI_DMT_LPIT,
     ACPI_DMT_MADT,
     ACPI_DMT_NFIT,
+    ACPI_DMT_NHLT1,
+    ACPI_DMT_NHLT1a,
     ACPI_DMT_PCCT,
     ACPI_DMT_PHAT,
     ACPI_DMT_PMTT,
@@ -175,6 +184,7 @@
     ACPI_DMT_SRAT,
     ACPI_DMT_TPM2,
     ACPI_DMT_VIOT,
+    ACPI_DMT_WPBT_UNICODE,
 
     /* Special opcodes */
 
@@ -252,6 +262,17 @@
 extern const char               *AcpiGbl_UpdateRules[];
 extern const char               *AcpiGbl_MatchOps[];
 
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestHdr[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestProcError[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestCacheRsrc[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestTlbRsrc[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestGenRsrc[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestMemError[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestSmmuError[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestVendorError[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestGicError[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestXface[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAestXrupt[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAsf0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAsf1[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoAsf1a[];
@@ -418,7 +439,21 @@
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNfit6[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNfit6a[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNfit7[];
-extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPdtt[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt0[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt1[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt2[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt3[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt3a[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt4[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt5[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt5a[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt5b[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt5c[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt6[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt7[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt7a[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoNhlt8[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPhatHdr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPhat0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPhat0a[];
@@ -439,6 +474,7 @@
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcct3[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcct4[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPcct5[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPdtt[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPdtt0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPptt0[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoPptt0a[];
@@ -483,6 +519,7 @@
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat3[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat4[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat5[];
+extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSrat6[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoStao[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoStaoStr[];
 extern ACPI_DMTABLE_INFO        AcpiDmTableInfoSvkl[];
@@ -574,6 +611,10 @@
     UINT32                  ByteLength);
 
 void
+AcpiDmDumpAest (
+    ACPI_TABLE_HEADER       *Table);
+
+void
 AcpiDmDumpAsf (
     ACPI_TABLE_HEADER       *Table);
 
@@ -662,6 +703,10 @@
     ACPI_TABLE_HEADER       *Table);
 
 void
+AcpiDmDumpNhlt (
+    ACPI_TABLE_HEADER       *Table);
+
+void
 AcpiDmDumpPcct (
     ACPI_TABLE_HEADER       *Table);
 
diff -r 15cd9f38fa9a -r 1e518b97ef5a sys/external/bsd/acpica/dist/include/acglobal.h
--- a/sys/external/bsd/acpica/dist/include/acglobal.h   Thu Oct 28 14:43:14 2021 +0000
+++ b/sys/external/bsd/acpica/dist/include/acglobal.h   Thu Oct 28 14:53:08 2021 +0000
@@ -257,6 +257,8 @@
 extern ACPI_BIT_REGISTER_INFO           AcpiGbl_BitRegisterInfo[ACPI_NUM_BITREG];



Home | Main Index | Thread Index | Old Index