summaryrefslogtreecommitdiff
path: root/sys/external
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2022-08-27 14:04:56 +0000
committerchristos <christos@NetBSD.org>2022-08-27 14:04:56 +0000
commitec12a2fa62823a2b2baf39e48f86eb37fd28ae2e (patch)
tree5d1ee8824a5cf07a73cdd4c420910f1de61b6385 /sys/external
parente56314416508d3390fbb6fb6defddffd061a437c (diff)
merge conflicts between acpica-20211217 and acpica-20220331
Diffstat (limited to 'sys/external')
-rw-r--r--sys/external/bsd/acpica/dist/common/dmtables.c2
-rw-r--r--sys/external/bsd/acpica/dist/common/dmtbdump.c2
-rw-r--r--sys/external/bsd/acpica/dist/common/dmtbinfo.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslanalyze.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslcompile.c5
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslcompiler.h2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslcompiler.l2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslerror.c5
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslfileio.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslfiles.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslload.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/asllookup.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslmain.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslopcodes.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslopt.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/asloptions.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslpredef.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslprepkg.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslsupport.l2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/asltree.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslutils.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslwalks.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/aslxref.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dtcompile.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dtfield.c8
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dtparser.y2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dtsubtable.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dttable.c2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/dtutils.c4
-rw-r--r--sys/external/bsd/acpica/dist/compiler/prparser.y2
-rw-r--r--sys/external/bsd/acpica/dist/compiler/prutils.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbcmds.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbdisply.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbexec.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbinput.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbmethod.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbnames.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbtest.c2
-rw-r--r--sys/external/bsd/acpica/dist/debugger/dbutils.c2
-rw-r--r--sys/external/bsd/acpica/dist/disassembler/dmbuffer.c2
-rw-r--r--sys/external/bsd/acpica/dist/disassembler/dmcstyle.c2
-rw-r--r--sys/external/bsd/acpica/dist/disassembler/dmresrc.c2
-rw-r--r--sys/external/bsd/acpica/dist/disassembler/dmresrcl.c2
-rw-r--r--sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c2
-rw-r--r--sys/external/bsd/acpica/dist/disassembler/dmwalk.c12
-rw-r--r--sys/external/bsd/acpica/dist/dispatcher/dscontrol.c2
-rw-r--r--sys/external/bsd/acpica/dist/dispatcher/dsopcode.c2
-rw-r--r--sys/external/bsd/acpica/dist/dispatcher/dspkginit.c2
-rw-r--r--sys/external/bsd/acpica/dist/dispatcher/dsutils.c2
-rw-r--r--sys/external/bsd/acpica/dist/events/evregion.c16
-rw-r--r--sys/external/bsd/acpica/dist/events/evrgnini.c2
-rw-r--r--sys/external/bsd/acpica/dist/events/evxface.c2
-rw-r--r--sys/external/bsd/acpica/dist/executer/exconfig.c62
-rw-r--r--sys/external/bsd/acpica/dist/executer/exdebug.c2
-rw-r--r--sys/external/bsd/acpica/dist/executer/exdump.c2
-rw-r--r--sys/external/bsd/acpica/dist/hardware/hwesleep.c2
-rw-r--r--sys/external/bsd/acpica/dist/hardware/hwregs.c4
-rw-r--r--sys/external/bsd/acpica/dist/hardware/hwsleep.c2
-rw-r--r--sys/external/bsd/acpica/dist/hardware/hwxfsleep.c2
-rw-r--r--sys/external/bsd/acpica/dist/include/acapps.h4
-rw-r--r--sys/external/bsd/acpica/dist/include/acdebug.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acdisasm.h13
-rw-r--r--sys/external/bsd/acpica/dist/include/acexcep.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acglobal.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acinterp.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/aclocal.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acmacros.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acnamesp.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acoutput.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acpiosxf.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/acpixf.h4
-rw-r--r--sys/external/bsd/acpica/dist/include/acresrc.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/actables.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/actbl1.h35
-rw-r--r--sys/external/bsd/acpica/dist/include/actypes.h19
-rw-r--r--sys/external/bsd/acpica/dist/include/acutils.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/amlresrc.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/platform/acgcc.h2
-rw-r--r--sys/external/bsd/acpica/dist/include/platform/acnetbsd.h4
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nsaccess.c2
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nsdump.c2
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nseval.c2
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nsinit.c2
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nsrepair2.c2
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nsxfeval.c2
-rw-r--r--sys/external/bsd/acpica/dist/namespace/nsxfname.c2
-rw-r--r--sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c2
-rw-r--r--sys/external/bsd/acpica/dist/parser/psopcode.c4
-rw-r--r--sys/external/bsd/acpica/dist/parser/psopinfo.c2
-rw-r--r--sys/external/bsd/acpica/dist/resources/rsdump.c2
-rw-r--r--sys/external/bsd/acpica/dist/resources/rsdumpinfo.c2
-rw-r--r--sys/external/bsd/acpica/dist/resources/rsutils.c2
-rw-r--r--sys/external/bsd/acpica/dist/resources/rsxface.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbdata.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbfadt.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbinstal.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbutils.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbxface.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbxfload.c2
-rw-r--r--sys/external/bsd/acpica/dist/tables/tbxfroot.c2
-rw-r--r--sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c2
-rw-r--r--sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utcache.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utdebug.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utdecode.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utdelete.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/uteval.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utglobal.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utmisc.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utmutex.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utnonansi.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utobject.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utosi.c3
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utprint.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/uttrack.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utuuid.c2
-rw-r--r--sys/external/bsd/acpica/dist/utilities/utxferror.c2
118 files changed, 237 insertions, 169 deletions
diff --git a/sys/external/bsd/acpica/dist/common/dmtables.c b/sys/external/bsd/acpica/dist/common/dmtables.c
index de57e0417ea..caaf93266a2 100644
--- a/sys/external/bsd/acpica/dist/common/dmtables.c
+++ b/sys/external/bsd/acpica/dist/common/dmtables.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/common/dmtbdump.c b/sys/external/bsd/acpica/dist/common/dmtbdump.c
index 32a30b66545..44ee1e030a0 100644
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/common/dmtbinfo.c b/sys/external/bsd/acpica/dist/common/dmtbinfo.c
index c8863f5b746..70b967fffef 100644
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c
index b8e3014812f..5a4282c7412 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslanalyze.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslanalyze.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslcompile.c b/sys/external/bsd/acpica/dist/compiler/aslcompile.c
index f23f481ad09..5492791cd28 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslcompile.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompile.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -807,10 +807,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/sys/external/bsd/acpica/dist/compiler/aslcompiler.h b/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
index 86b7593274a..7f27ae77649 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslcompiler.l b/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
index d00424fa3a2..493554fbb57 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
+++ b/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslerror.c b/sys/external/bsd/acpica/dist/compiler/aslerror.c
index 14019bc170c..4baef5b19f6 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslerror.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslerror.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -917,7 +917,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;
@@ -925,6 +925,7 @@ AslLogNewError (
exit(1);
}
+ AslGbl_ExceptionCount[ASL_ERROR] = 0;
return;
}
diff --git a/sys/external/bsd/acpica/dist/compiler/aslfileio.c b/sys/external/bsd/acpica/dist/compiler/aslfileio.c
index 365fe31d45b..3a684d11337 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslfileio.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslfileio.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslfiles.c b/sys/external/bsd/acpica/dist/compiler/aslfiles.c
index 012a721e174..0f9d3d2fc60 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslfiles.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslfiles.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslload.c b/sys/external/bsd/acpica/dist/compiler/aslload.c
index 6933ff648f3..18d4e1204b2 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslload.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslload.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/asllookup.c b/sys/external/bsd/acpica/dist/compiler/asllookup.c
index 2fd6616cd23..6cf758ed35f 100644
--- a/sys/external/bsd/acpica/dist/compiler/asllookup.c
+++ b/sys/external/bsd/acpica/dist/compiler/asllookup.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslmain.c b/sys/external/bsd/acpica/dist/compiler/aslmain.c
index 5907bbabe7c..36d3f5ea532 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslmain.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslmain.c
@@ -309,7 +309,7 @@ AslSignalHandler (
}
printf (ASL_PREFIX "Terminating\n");
- _exit (0);
+ exit (0);
}
diff --git a/sys/external/bsd/acpica/dist/compiler/aslopcodes.c b/sys/external/bsd/acpica/dist/compiler/aslopcodes.c
index 4008df80079..87fbf6191d4 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslopcodes.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslopcodes.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslopt.c b/sys/external/bsd/acpica/dist/compiler/aslopt.c
index 89f7208cc80..77949c10158 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslopt.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslopt.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/asloptions.c b/sys/external/bsd/acpica/dist/compiler/asloptions.c
index b5a102a5406..55cc39b284b 100644
--- a/sys/external/bsd/acpica/dist/compiler/asloptions.c
+++ b/sys/external/bsd/acpica/dist/compiler/asloptions.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslpredef.c b/sys/external/bsd/acpica/dist/compiler/aslpredef.c
index d3dbfca163d..f337a9c4b95 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslpredef.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslpredef.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslprepkg.c b/sys/external/bsd/acpica/dist/compiler/aslprepkg.c
index e76ee894f9a..ad53c2d3c6a 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslprepkg.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslprepkg.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslsupport.l b/sys/external/bsd/acpica/dist/compiler/aslsupport.l
index a0203597633..746125a70c2 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslsupport.l
+++ b/sys/external/bsd/acpica/dist/compiler/aslsupport.l
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/asltree.c b/sys/external/bsd/acpica/dist/compiler/asltree.c
index f4a8e02c575..a7046852ae9 100644
--- a/sys/external/bsd/acpica/dist/compiler/asltree.c
+++ b/sys/external/bsd/acpica/dist/compiler/asltree.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslutils.c b/sys/external/bsd/acpica/dist/compiler/aslutils.c
index b941b4c3851..07c7805d347 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslutils.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslutils.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslwalks.c b/sys/external/bsd/acpica/dist/compiler/aslwalks.c
index 3f187f71bc2..76ac2b1fa19 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslwalks.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslwalks.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/aslxref.c b/sys/external/bsd/acpica/dist/compiler/aslxref.c
index 6a4a200ab9e..6be6a216a92 100644
--- a/sys/external/bsd/acpica/dist/compiler/aslxref.c
+++ b/sys/external/bsd/acpica/dist/compiler/aslxref.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/dtcompile.c b/sys/external/bsd/acpica/dist/compiler/dtcompile.c
index 3684d003b25..d2f5aed27a7 100644
--- a/sys/external/bsd/acpica/dist/compiler/dtcompile.c
+++ b/sys/external/bsd/acpica/dist/compiler/dtcompile.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y b/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
index 7cf5a0cf1ab..e7ffd44c5d7 100644
--- a/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
+++ b/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/dtfield.c b/sys/external/bsd/acpica/dist/compiler/dtfield.c
index d707d845d03..bcfcd2bcdfd 100644
--- a/sys/external/bsd/acpica/dist/compiler/dtfield.c
+++ b/sys/external/bsd/acpica/dist/compiler/dtfield.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -568,6 +568,12 @@ DtCompileFlag (
BitLength = 2;
break;
+ case ACPI_DMT_FLAGS8_2:
+
+ BitPosition = 2;
+ BitLength = 8;
+ break;
+
case ACPI_DMT_FLAGS4:
BitPosition = 4;
diff --git a/sys/external/bsd/acpica/dist/compiler/dtparser.y b/sys/external/bsd/acpica/dist/compiler/dtparser.y
index dff57aca31b..a764d16cf28 100644
--- a/sys/external/bsd/acpica/dist/compiler/dtparser.y
+++ b/sys/external/bsd/acpica/dist/compiler/dtparser.y
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/dtsubtable.c b/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
index fc867aabcee..6848720fc2d 100644
--- a/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
+++ b/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/dttable.c b/sys/external/bsd/acpica/dist/compiler/dttable.c
index 2767cbae0ea..378a0980e13 100644
--- a/sys/external/bsd/acpica/dist/compiler/dttable.c
+++ b/sys/external/bsd/acpica/dist/compiler/dttable.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/dtutils.c b/sys/external/bsd/acpica/dist/compiler/dtutils.c
index 7548f507539..997e3b44a61 100644
--- a/sys/external/bsd/acpica/dist/compiler/dtutils.c
+++ b/sys/external/bsd/acpica/dist/compiler/dtutils.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -303,6 +303,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:
@@ -453,6 +454,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/sys/external/bsd/acpica/dist/compiler/prparser.y b/sys/external/bsd/acpica/dist/compiler/prparser.y
index 3d11607ba3f..05198adfc0d 100644
--- a/sys/external/bsd/acpica/dist/compiler/prparser.y
+++ b/sys/external/bsd/acpica/dist/compiler/prparser.y
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/compiler/prutils.c b/sys/external/bsd/acpica/dist/compiler/prutils.c
index 7ca17b80317..9d5583cbd96 100644
--- a/sys/external/bsd/acpica/dist/compiler/prutils.c
+++ b/sys/external/bsd/acpica/dist/compiler/prutils.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbcmds.c b/sys/external/bsd/acpica/dist/debugger/dbcmds.c
index b64bade8989..df9f70206c1 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbcmds.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbcmds.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbdisply.c b/sys/external/bsd/acpica/dist/debugger/dbdisply.c
index dd1c6363ce5..dc3616568bf 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbdisply.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbdisply.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbexec.c b/sys/external/bsd/acpica/dist/debugger/dbexec.c
index 653cc7db0dd..415fece3b33 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbexec.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbexec.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbinput.c b/sys/external/bsd/acpica/dist/debugger/dbinput.c
index 4dded7b882c..972d1335b85 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbinput.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbinput.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbmethod.c b/sys/external/bsd/acpica/dist/debugger/dbmethod.c
index cf383a9c8b3..1c58333a94e 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbmethod.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbmethod.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbnames.c b/sys/external/bsd/acpica/dist/debugger/dbnames.c
index 0d2cb7ad176..3eb8cc2f3d8 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbnames.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbnames.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbtest.c b/sys/external/bsd/acpica/dist/debugger/dbtest.c
index 4889508036d..0c24294ca44 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbtest.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbtest.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/debugger/dbutils.c b/sys/external/bsd/acpica/dist/debugger/dbutils.c
index 3ccbe3c46a4..b5ef45cc078 100644
--- a/sys/external/bsd/acpica/dist/debugger/dbutils.c
+++ b/sys/external/bsd/acpica/dist/debugger/dbutils.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c b/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
index 3b8888415c6..3fc0bfb8957 100644
--- a/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
+++ b/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c b/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c
index 222ea48c171..12d5f1ff213 100644
--- a/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c
+++ b/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/disassembler/dmresrc.c b/sys/external/bsd/acpica/dist/disassembler/dmresrc.c
index 7054fa7dd70..c0e43571b1b 100644
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrc.c
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrc.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c b/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
index 98060356017..7102d61a2eb 100644
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c b/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
index 99238784e00..a5f3ae98552 100644
--- a/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
+++ b/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/disassembler/dmwalk.c b/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
index 1b9813e8194..06a57429a38 100644
--- a/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
+++ b/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -851,7 +851,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/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c b/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
index 7e4019f7b68..a697a1acda1 100644
--- a/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
+++ b/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c b/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
index ee0564324d9..debde09c512 100644
--- a/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
+++ b/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c b/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
index 90507f80391..84a20e1287b 100644
--- a/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
+++ b/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/dispatcher/dsutils.c b/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
index ef5c36e9f3f..9a369c57ecf 100644
--- a/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
+++ b/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/events/evregion.c b/sys/external/bsd/acpica/dist/events/evregion.c
index 39e14a06338..52db8c5c97f 100644
--- a/sys/external/bsd/acpica/dist/events/evregion.c
+++ b/sys/external/bsd/acpica/dist/events/evregion.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -212,14 +212,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/sys/external/bsd/acpica/dist/events/evrgnini.c b/sys/external/bsd/acpica/dist/events/evrgnini.c
index 26795c44de1..dc41d4cc3aa 100644
--- a/sys/external/bsd/acpica/dist/events/evrgnini.c
+++ b/sys/external/bsd/acpica/dist/events/evrgnini.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/events/evxface.c b/sys/external/bsd/acpica/dist/events/evxface.c
index 875635d3157..67273bc11b3 100644
--- a/sys/external/bsd/acpica/dist/events/evxface.c
+++ b/sys/external/bsd/acpica/dist/events/evxface.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/executer/exconfig.c b/sys/external/bsd/acpica/dist/executer/exconfig.c
index bb02a98c784..7f7765a9187 100644
--- a/sys/external/bsd/acpica/dist/executer/exconfig.c
+++ b/sys/external/bsd/acpica/dist/executer/exconfig.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -135,6 +135,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;
@@ -142,6 +143,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 ();
@@ -159,13 +170,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);
}
@@ -256,7 +260,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);
}
@@ -314,7 +324,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
@@ -346,6 +356,19 @@ 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)
+ {
+ ACPI_DEBUG_PRINT ((ACPI_DB_EXEC,
+ "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)
@@ -507,8 +530,6 @@ AcpiExLoadOp (
Status = AcpiExAddTable (TableIndex, &DdbHandle);
if (ACPI_FAILURE (Status))
{
- /* On error, TablePtr was deallocated above */
-
return_ACPI_STATUS (Status);
}
@@ -518,22 +539,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/sys/external/bsd/acpica/dist/executer/exdebug.c b/sys/external/bsd/acpica/dist/executer/exdebug.c
index 5535862c16d..72d7c178725 100644
--- a/sys/external/bsd/acpica/dist/executer/exdebug.c
+++ b/sys/external/bsd/acpica/dist/executer/exdebug.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/executer/exdump.c b/sys/external/bsd/acpica/dist/executer/exdump.c
index 8d69f1bd678..56071f673eb 100644
--- a/sys/external/bsd/acpica/dist/executer/exdump.c
+++ b/sys/external/bsd/acpica/dist/executer/exdump.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/hardware/hwesleep.c b/sys/external/bsd/acpica/dist/hardware/hwesleep.c
index 9b4aa3888be..7005af9d772 100644
--- a/sys/external/bsd/acpica/dist/hardware/hwesleep.c
+++ b/sys/external/bsd/acpica/dist/hardware/hwesleep.c
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/hardware/hwregs.c b/sys/external/bsd/acpica/dist/hardware/hwregs.c
index 7fb1250397c..cd49e09fabb 100644
--- a/sys/external/bsd/acpica/dist/hardware/hwregs.c
+++ b/sys/external/bsd/acpica/dist/hardware/hwregs.c
@@ -6,7 +6,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -525,7 +525,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/sys/external/bsd/acpica/dist/hardware/hwsleep.c b/sys/external/bsd/acpica/dist/hardware/hwsleep.c
index b9b540a4098..8f171d847a0 100644
--- a/sys/external/bsd/acpica/dist/hardware/hwsleep.c
+++ b/sys/external/bsd/acpica/dist/hardware/hwsleep.c
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c b/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
index 967968ad21f..28ae526b25d 100644
--- a/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
+++ b/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acapps.h b/sys/external/bsd/acpica/dist/include/acapps.h
index 30b6576d5a8..2a919cf4c31 100644
--- a/sys/external/bsd/acpica/dist/include/acapps.h
+++ b/sys/external/bsd/acpica/dist/include/acapps.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -51,7 +51,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/sys/external/bsd/acpica/dist/include/acdebug.h b/sys/external/bsd/acpica/dist/include/acdebug.h
index 1cc292fc361..5ac494d84ad 100644
--- a/sys/external/bsd/acpica/dist/include/acdebug.h
+++ b/sys/external/bsd/acpica/dist/include/acdebug.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acdisasm.h b/sys/external/bsd/acpica/dist/include/acdisasm.h
index 739c3e57386..ce8c88a6397 100644
--- a/sys/external/bsd/acpica/dist/include/acdisasm.h
+++ b/sys/external/bsd/acpica/dist/include/acdisasm.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -98,6 +98,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,
@@ -280,6 +281,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[];
@@ -294,6 +296,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[];
@@ -315,6 +319,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[];
@@ -421,6 +426,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[];
@@ -463,7 +469,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[];
@@ -627,6 +632,10 @@ AcpiDmDumpAest (
ACPI_TABLE_HEADER *Table);
void
+AcpiDmDumpApmt (
+ ACPI_TABLE_HEADER *Table);
+
+void
AcpiDmDumpAsf (
ACPI_TABLE_HEADER *Table);
diff --git a/sys/external/bsd/acpica/dist/include/acexcep.h b/sys/external/bsd/acpica/dist/include/acexcep.h
index 8a5fbbfbd0c..da437e66c8d 100644
--- a/sys/external/bsd/acpica/dist/include/acexcep.h
+++ b/sys/external/bsd/acpica/dist/include/acexcep.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acglobal.h b/sys/external/bsd/acpica/dist/include/acglobal.h
index d465a806e56..ee4b0573adb 100644
--- a/sys/external/bsd/acpica/dist/include/acglobal.h
+++ b/sys/external/bsd/acpica/dist/include/acglobal.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acinterp.h b/sys/external/bsd/acpica/dist/include/acinterp.h
index d408c443311..eb26d615bd7 100644
--- a/sys/external/bsd/acpica/dist/include/acinterp.h
+++ b/sys/external/bsd/acpica/dist/include/acinterp.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/aclocal.h b/sys/external/bsd/acpica/dist/include/aclocal.h
index bdd8629b8bb..d469854af7a 100644
--- a/sys/external/bsd/acpica/dist/include/aclocal.h
+++ b/sys/external/bsd/acpica/dist/include/aclocal.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acmacros.h b/sys/external/bsd/acpica/dist/include/acmacros.h
index c4f92f80913..a2e2ea23e46 100644
--- a/sys/external/bsd/acpica/dist/include/acmacros.h
+++ b/sys/external/bsd/acpica/dist/include/acmacros.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acnamesp.h b/sys/external/bsd/acpica/dist/include/acnamesp.h
index b354e965d23..893dbe3df8e 100644
--- a/sys/external/bsd/acpica/dist/include/acnamesp.h
+++ b/sys/external/bsd/acpica/dist/include/acnamesp.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acoutput.h b/sys/external/bsd/acpica/dist/include/acoutput.h
index 5ec0ce91209..c6e0a4b08bf 100644
--- a/sys/external/bsd/acpica/dist/include/acoutput.h
+++ b/sys/external/bsd/acpica/dist/include/acoutput.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acpiosxf.h b/sys/external/bsd/acpica/dist/include/acpiosxf.h
index 717bf4d66e5..60cfe50104a 100644
--- a/sys/external/bsd/acpica/dist/include/acpiosxf.h
+++ b/sys/external/bsd/acpica/dist/include/acpiosxf.h
@@ -7,7 +7,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/acpixf.h b/sys/external/bsd/acpica/dist/include/acpixf.h
index 81170501fcf..70d195056ed 100644
--- a/sys/external/bsd/acpica/dist/include/acpixf.h
+++ b/sys/external/bsd/acpica/dist/include/acpixf.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,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/sys/external/bsd/acpica/dist/include/acresrc.h b/sys/external/bsd/acpica/dist/include/acresrc.h
index c2a60745f52..978cea25c5d 100644
--- a/sys/external/bsd/acpica/dist/include/acresrc.h
+++ b/sys/external/bsd/acpica/dist/include/acresrc.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/actables.h b/sys/external/bsd/acpica/dist/include/actables.h
index 93d9a914c1f..ca5082f26f2 100644
--- a/sys/external/bsd/acpica/dist/include/actables.h
+++ b/sys/external/bsd/acpica/dist/include/actables.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/actbl1.h b/sys/external/bsd/acpica/dist/include/actbl1.h
index 401dc6a9ada..6834241afbd 100644
--- a/sys/external/bsd/acpica/dist/include/actbl1.h
+++ b/sys/external/bsd/acpica/dist/include/actbl1.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -466,17 +466,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)
/*******************************************************************************
@@ -739,7 +745,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 */
};
@@ -854,6 +861,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/sys/external/bsd/acpica/dist/include/actypes.h b/sys/external/bsd/acpica/dist/include/actypes.h
index c7cacfe0faa..fcaf9728b16 100644
--- a/sys/external/bsd/acpica/dist/include/actypes.h
+++ b/sys/external/bsd/acpica/dist/include/actypes.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -555,9 +555,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)
-#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
+#endif
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)
/* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */
@@ -584,9 +587,14 @@ typedef UINT64 ACPI_INTEGER;
* Can be used with AccessSize field of ACPI_GENERIC_ADDRESS and
* ACPI_RESOURCE_GENERIC_REGISTER.
*/
-#define ACPI_ACCESS_BIT_WIDTH(AccessSize) (1 << ((AccessSize) + 2))
-#define ACPI_ACCESS_BYTE_WIDTH(AccessSize) (1 << ((AccessSize) - 1))
-
+#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))
/*******************************************************************************
*
@@ -1441,6 +1449,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/sys/external/bsd/acpica/dist/include/acutils.h b/sys/external/bsd/acpica/dist/include/acutils.h
index 3164577a926..663ee30d974 100644
--- a/sys/external/bsd/acpica/dist/include/acutils.h
+++ b/sys/external/bsd/acpica/dist/include/acutils.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/amlresrc.h b/sys/external/bsd/acpica/dist/include/amlresrc.h
index 7fc45fff978..01abf09b3cd 100644
--- a/sys/external/bsd/acpica/dist/include/amlresrc.h
+++ b/sys/external/bsd/acpica/dist/include/amlresrc.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/platform/acgcc.h b/sys/external/bsd/acpica/dist/include/platform/acgcc.h
index cb3a65efb9a..292bc476ecd 100644
--- a/sys/external/bsd/acpica/dist/include/platform/acgcc.h
+++ b/sys/external/bsd/acpica/dist/include/platform/acgcc.h
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h b/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
index 74258ffd748..c89d20cbf0a 100644
--- a/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
+++ b/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
@@ -1,12 +1,12 @@
/******************************************************************************
*
* Name: acnetbsd.h - OS specific defines, etc.
- * $Revision: 1.24 $
+ * $Revision: 1.25 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nsaccess.c b/sys/external/bsd/acpica/dist/namespace/nsaccess.c
index 14e5d59a716..906bbf47394 100644
--- a/sys/external/bsd/acpica/dist/namespace/nsaccess.c
+++ b/sys/external/bsd/acpica/dist/namespace/nsaccess.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nsdump.c b/sys/external/bsd/acpica/dist/namespace/nsdump.c
index b710923833e..1beee086537 100644
--- a/sys/external/bsd/acpica/dist/namespace/nsdump.c
+++ b/sys/external/bsd/acpica/dist/namespace/nsdump.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nseval.c b/sys/external/bsd/acpica/dist/namespace/nseval.c
index c0bc0b1ddcf..b4d48ac1f00 100644
--- a/sys/external/bsd/acpica/dist/namespace/nseval.c
+++ b/sys/external/bsd/acpica/dist/namespace/nseval.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nsinit.c b/sys/external/bsd/acpica/dist/namespace/nsinit.c
index 9654bdd05af..591c28a81b7 100644
--- a/sys/external/bsd/acpica/dist/namespace/nsinit.c
+++ b/sys/external/bsd/acpica/dist/namespace/nsinit.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nsrepair2.c b/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
index 5a43878fd36..97684acfa90 100644
--- a/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
+++ b/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nsxfeval.c b/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
index 00bcd578310..661b696c6c5 100644
--- a/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
+++ b/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
@@ -6,7 +6,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/namespace/nsxfname.c b/sys/external/bsd/acpica/dist/namespace/nsxfname.c
index eaead118116..c0a70be7712 100644
--- a/sys/external/bsd/acpica/dist/namespace/nsxfname.c
+++ b/sys/external/bsd/acpica/dist/namespace/nsxfname.c
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c b/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
index 479d27e584b..de3bd504116 100644
--- a/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
+++ b/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/parser/psopcode.c b/sys/external/bsd/acpica/dist/parser/psopcode.c
index db8023e0018..6a19240cbaf 100644
--- a/sys/external/bsd/acpica/dist/parser/psopcode.c
+++ b/sys/external/bsd/acpica/dist/parser/psopcode.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -267,7 +267,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/sys/external/bsd/acpica/dist/parser/psopinfo.c b/sys/external/bsd/acpica/dist/parser/psopinfo.c
index 964f843d429..ec61a95829c 100644
--- a/sys/external/bsd/acpica/dist/parser/psopinfo.c
+++ b/sys/external/bsd/acpica/dist/parser/psopinfo.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/resources/rsdump.c b/sys/external/bsd/acpica/dist/resources/rsdump.c
index 21654d3c73e..266302388bb 100644
--- a/sys/external/bsd/acpica/dist/resources/rsdump.c
+++ b/sys/external/bsd/acpica/dist/resources/rsdump.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c b/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
index f1ff8967b1c..0b708a5ff2b 100644
--- a/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
+++ b/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/resources/rsutils.c b/sys/external/bsd/acpica/dist/resources/rsutils.c
index aad45fa0e05..a772e4f3d1a 100644
--- a/sys/external/bsd/acpica/dist/resources/rsutils.c
+++ b/sys/external/bsd/acpica/dist/resources/rsutils.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/resources/rsxface.c b/sys/external/bsd/acpica/dist/resources/rsxface.c
index aab6ac3825a..add98dd39a8 100644
--- a/sys/external/bsd/acpica/dist/resources/rsxface.c
+++ b/sys/external/bsd/acpica/dist/resources/rsxface.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbdata.c b/sys/external/bsd/acpica/dist/tables/tbdata.c
index b58541cc44a..d8215f5de56 100644
--- a/sys/external/bsd/acpica/dist/tables/tbdata.c
+++ b/sys/external/bsd/acpica/dist/tables/tbdata.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbfadt.c b/sys/external/bsd/acpica/dist/tables/tbfadt.c
index 6e18fd67a2f..cb4ac806b97 100644
--- a/sys/external/bsd/acpica/dist/tables/tbfadt.c
+++ b/sys/external/bsd/acpica/dist/tables/tbfadt.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbinstal.c b/sys/external/bsd/acpica/dist/tables/tbinstal.c
index 782892750d7..22a9d8ec888 100644
--- a/sys/external/bsd/acpica/dist/tables/tbinstal.c
+++ b/sys/external/bsd/acpica/dist/tables/tbinstal.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbutils.c b/sys/external/bsd/acpica/dist/tables/tbutils.c
index d1d9aec1fde..422fb18db82 100644
--- a/sys/external/bsd/acpica/dist/tables/tbutils.c
+++ b/sys/external/bsd/acpica/dist/tables/tbutils.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbxface.c b/sys/external/bsd/acpica/dist/tables/tbxface.c
index 47698591561..40abf476740 100644
--- a/sys/external/bsd/acpica/dist/tables/tbxface.c
+++ b/sys/external/bsd/acpica/dist/tables/tbxface.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbxfload.c b/sys/external/bsd/acpica/dist/tables/tbxfload.c
index 02c06e15630..6052255d2ba 100644
--- a/sys/external/bsd/acpica/dist/tables/tbxfload.c
+++ b/sys/external/bsd/acpica/dist/tables/tbxfload.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tables/tbxfroot.c b/sys/external/bsd/acpica/dist/tables/tbxfroot.c
index 7ff049b2057..4195480d44a 100644
--- a/sys/external/bsd/acpica/dist/tables/tbxfroot.c
+++ b/sys/external/bsd/acpica/dist/tables/tbxfroot.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c b/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
index 7e230eba53b..0d55336a973 100644
--- a/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
+++ b/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c b/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
index 7b30d534944..e4fff697ee5 100644
--- a/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
+++ b/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utcache.c b/sys/external/bsd/acpica/dist/utilities/utcache.c
index df2df103ef6..19760c492ed 100644
--- a/sys/external/bsd/acpica/dist/utilities/utcache.c
+++ b/sys/external/bsd/acpica/dist/utilities/utcache.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utdebug.c b/sys/external/bsd/acpica/dist/utilities/utdebug.c
index 0060fdf7c7b..9f61f364a52 100644
--- a/sys/external/bsd/acpica/dist/utilities/utdebug.c
+++ b/sys/external/bsd/acpica/dist/utilities/utdebug.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utdecode.c b/sys/external/bsd/acpica/dist/utilities/utdecode.c
index 6564d089357..a5c5225e15c 100644
--- a/sys/external/bsd/acpica/dist/utilities/utdecode.c
+++ b/sys/external/bsd/acpica/dist/utilities/utdecode.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utdelete.c b/sys/external/bsd/acpica/dist/utilities/utdelete.c
index 894c66aa77d..79644b3f8ef 100644
--- a/sys/external/bsd/acpica/dist/utilities/utdelete.c
+++ b/sys/external/bsd/acpica/dist/utilities/utdelete.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/uteval.c b/sys/external/bsd/acpica/dist/utilities/uteval.c
index 4d33d68fa33..5da32a8c076 100644
--- a/sys/external/bsd/acpica/dist/utilities/uteval.c
+++ b/sys/external/bsd/acpica/dist/utilities/uteval.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utglobal.c b/sys/external/bsd/acpica/dist/utilities/utglobal.c
index 4dd2a704682..6126b8832aa 100644
--- a/sys/external/bsd/acpica/dist/utilities/utglobal.c
+++ b/sys/external/bsd/acpica/dist/utilities/utglobal.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utmisc.c b/sys/external/bsd/acpica/dist/utilities/utmisc.c
index c4330704f48..95516f7626d 100644
--- a/sys/external/bsd/acpica/dist/utilities/utmisc.c
+++ b/sys/external/bsd/acpica/dist/utilities/utmisc.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utmutex.c b/sys/external/bsd/acpica/dist/utilities/utmutex.c
index 18ce484a7cd..98e5533dce9 100644
--- a/sys/external/bsd/acpica/dist/utilities/utmutex.c
+++ b/sys/external/bsd/acpica/dist/utilities/utmutex.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utnonansi.c b/sys/external/bsd/acpica/dist/utilities/utnonansi.c
index d22400f08a8..1e359e6ae8e 100644
--- a/sys/external/bsd/acpica/dist/utilities/utnonansi.c
+++ b/sys/external/bsd/acpica/dist/utilities/utnonansi.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utobject.c b/sys/external/bsd/acpica/dist/utilities/utobject.c
index 76111a7f1cc..99cedacc75f 100644
--- a/sys/external/bsd/acpica/dist/utilities/utobject.c
+++ b/sys/external/bsd/acpica/dist/utilities/utobject.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utosi.c b/sys/external/bsd/acpica/dist/utilities/utosi.c
index f5575ee9df3..6081adae0de 100644
--- a/sys/external/bsd/acpica/dist/utilities/utosi.c
+++ b/sys/external/bsd/acpica/dist/utilities/utosi.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -113,6 +113,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/sys/external/bsd/acpica/dist/utilities/utprint.c b/sys/external/bsd/acpica/dist/utilities/utprint.c
index adae6dbad1f..d0646b4bb3d 100644
--- a/sys/external/bsd/acpica/dist/utilities/utprint.c
+++ b/sys/external/bsd/acpica/dist/utilities/utprint.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/uttrack.c b/sys/external/bsd/acpica/dist/utilities/uttrack.c
index b7d7782116c..dcfce232400 100644
--- a/sys/external/bsd/acpica/dist/utilities/uttrack.c
+++ b/sys/external/bsd/acpica/dist/utilities/uttrack.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utuuid.c b/sys/external/bsd/acpica/dist/utilities/utuuid.c
index add3043f4ca..adb2bc5df05 100644
--- a/sys/external/bsd/acpica/dist/utilities/utuuid.c
+++ b/sys/external/bsd/acpica/dist/utilities/utuuid.c
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/sys/external/bsd/acpica/dist/utilities/utxferror.c b/sys/external/bsd/acpica/dist/utilities/utxferror.c
index f06bf4fa407..4beddc043e5 100644
--- a/sys/external/bsd/acpica/dist/utilities/utxferror.c
+++ b/sys/external/bsd/acpica/dist/utilities/utxferror.c
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2021, Intel Corp.
+ * Copyright (C) 2000 - 2022, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without