Module Name: src
Committed By: christos
Date: Fri Sep 1 18:37:33 UTC 2023
Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
dmtbinfo.c
src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
aslcompiler.h aslcompiler.l aslerror.c aslfileio.c aslfiles.c
aslload.c asllookup.c aslmain.c aslopcodes.c aslopt.c asloptions.c
aslpredef.c aslprepkg.c aslsupport.l asltree.c aslutils.c
aslwalks.c aslxref.c dtcompile.c dtcompilerparser.y dtfield.c
dtparser.y dtsubtable.c dttable.c dtutils.c prparser.y prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbcmds.c dbdisply.c dbexec.c
dbinput.c dbmethod.c dbnames.c dbtest.c dbutils.c
src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c dmcstyle.c
dmresrc.c dmresrcl.c dmresrcl2.c dmwalk.c
src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
dspkginit.c dsutils.c dswexec.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
evxface.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c exdebug.c
exdump.c exsystem.c
src/sys/external/bsd/acpica/dist/hardware: hwesleep.c hwregs.c
hwsleep.c hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acapps.h acdebug.h acdisasm.h
acexcep.h acglobal.h achware.h acinterp.h aclocal.h acmacros.h
acnamesp.h acoutput.h acpiosxf.h acpixf.h acresrc.h actables.h
actbl1.h actypes.h acutils.h amlresrc.h
src/sys/external/bsd/acpica/dist/include/platform: acgcc.h acnetbsd.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c nsrepair2.c nsxfeval.c nsxfname.c
src/sys/external/bsd/acpica/dist/os_specific/service_layers:
oslinuxtbl.c
src/sys/external/bsd/acpica/dist/parser: psopcode.c psopinfo.c
src/sys/external/bsd/acpica/dist/resources: rsdump.c rsdumpinfo.c
rsutils.c rsxface.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbfadt.c tbinstal.c
tbutils.c tbxface.c tbxfload.c tbxfroot.c
src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utcache.c utdebug.c
utdecode.c utdelete.c uteval.c utglobal.c utmisc.c utmutex.c
utnonansi.c utobject.c utosi.c utprint.c uttrack.c utuuid.c
utxferror.c
Log Message:
merge conflicts between 20230628 and 20221020
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c \
src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c \
src/sys/external/bsd/acpica/dist/compiler/aslwalks.c
cvs rdiff -u -r1.22 -r1.23 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/compiler/aslfileio.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/asllookup.c \
src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/compiler/aslmain.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/compiler/aslopt.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
src/sys/external/bsd/acpica/dist/compiler/asltree.c \
src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
src/sys/external/bsd/acpica/dist/compiler/dttable.c \
src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.32 -r1.33 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c \
src/sys/external/bsd/acpica/dist/debugger/dbutils.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/debugger/dbdisply.c \
src/sys/external/bsd/acpica/dist/debugger/dbexec.c
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/debugger/dbtest.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c \
src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \
src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c \
src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c \
src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/acpica/dist/dispatcher/dswexec.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/events/evrgnini.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/events/evxface.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/executer/exdebug.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/dist/executer/exdump.c
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/executer/exsystem.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/hardware/hwesleep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/hardware/hwregs.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/acpica/dist/include/acapps.h \
src/sys/external/bsd/acpica/dist/include/acmacros.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/include/acdebug.h \
src/sys/external/bsd/acpica/dist/include/acnamesp.h
cvs rdiff -u -r1.26 -r1.27 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/acglobal.h \
src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/include/acexcep.h \
src/sys/external/bsd/acpica/dist/include/acinterp.h \
src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.1.1.14 -r1.2 \
src/sys/external/bsd/acpica/dist/include/achware.h
cvs rdiff -u -r1.24 -r1.25 src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/acpiosxf.h
cvs rdiff -u -r1.34 -r1.35 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/include/acresrc.h
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/include/actables.h
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.28 -r1.29 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/acpica/dist/include/amlresrc.h
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/include/platform/acgcc.h
cvs rdiff -u -r1.25 -r1.26 \
src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
cvs rdiff -u -r1.22 -r1.23 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/namespace/nsdump.c \
src/sys/external/bsd/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/namespace/nseval.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/parser/psopcode.c \
src/sys/external/bsd/acpica/dist/parser/psopinfo.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/resources/rsdump.c \
src/sys/external/bsd/acpica/dist/resources/rsxface.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/resources/rsutils.c
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/acpica/dist/tables/tbdata.c \
src/sys/external/bsd/acpica/dist/tables/tbfadt.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/tables/tbinstal.c \
src/sys/external/bsd/acpica/dist/tables/tbxface.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/utilities/utcache.c \
src/sys/external/bsd/acpica/dist/utilities/utmisc.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/utilities/utdecode.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.c \
src/sys/external/bsd/acpica/dist/utilities/utobject.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/utilities/uteval.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/utilities/utglobal.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/utilities/utmutex.c
cvs rdiff -u -r1.6 -r1.7 \
src/sys/external/bsd/acpica/dist/utilities/utnonansi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/external/bsd/acpica/dist/utilities/utosi.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/utilities/utprint.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/utilities/uttrack.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/utilities/utuuid.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/acpica/dist/utilities/utxferror.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/acpica/dist/common/dmtables.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtables.c:1.7 src/sys/external/bsd/acpica/dist/common/dmtables.c:1.8
--- src/sys/external/bsd/acpica/dist/common/dmtables.c:1.7 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/common/dmtables.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/common/dmtbdump.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.15 src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.16
--- src/sys/external/bsd/acpica/dist/common/dmtbdump.c:1.15 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/common/dmtbdump.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
diff -u src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.21 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.22
--- src/sys/external/bsd/acpica/dist/common/dmtbinfo.c:1.21 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/common/dmtbinfo.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c:1.16 src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c:1.16 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/asloptions.c
diff -u src/sys/external/bsd/acpica/dist/compiler/asloptions.c:1.16 src/sys/external/bsd/acpica/dist/compiler/asloptions.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/asloptions.c:1.16 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/compiler/asloptions.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslpredef.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.16 src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslpredef.c:1.16 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslpredef.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c:1.16 src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslwalks.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslwalks.c:1.16 src/sys/external/bsd/acpica/dist/compiler/aslwalks.c:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslwalks.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslwalks.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompile.c:1.22 src/sys/external/bsd/acpica/dist/compiler/aslcompile.c:1.23
--- src/sys/external/bsd/acpica/dist/compiler/aslcompile.c:1.22 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompile.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslload.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.22 src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.23
--- src/sys/external/bsd/acpica/dist/compiler/aslload.c:1.22 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslload.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslxref.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.22 src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.23
--- src/sys/external/bsd/acpica/dist/compiler/aslxref.c:1.22 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslxref.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.20 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.21
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.20 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -1458,6 +1458,9 @@ ASL_RESOURCE_NODE *
RsDoPinGroupConfigDescriptor (
ASL_RESOURCE_INFO *Info);
+ASL_RESOURCE_NODE *
+RsDoClockInputDescriptor (
+ ASL_RESOURCE_INFO *Info);
/*
* aslrestype2d - DWord address descriptors
Index: src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.20 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.21
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l:1.20 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l Fri Sep 1 14:37:29 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -353,6 +353,7 @@ NamePathTail [.]{NameSeg}
"PinGroup" { count (1); return (PARSEOP_PINGROUP); }
"PinGroupConfig" { count (1); return (PARSEOP_PINGROUPCONFIG); }
"PinGroupFunction" { count (1); return (PARSEOP_PINGROUPFUNCTION); }
+"ClockInput" { count (1); return (PARSEOP_CLOCKINPUT); }
"QWordIO" { count (1); return (PARSEOP_QWORDIO); }
"QWordMemory" { count (1); return (PARSEOP_QWORDMEMORY); }
"QWordSpace" { count (1); return (PARSEOP_QWORDSPACE); }
@@ -557,6 +558,17 @@ NamePathTail [.]{NameSeg}
"PullDown" { count (0); return (PARSEOP_PIN_PULLDOWN); }
"PullNone" { count (0); return (PARSEOP_PIN_NOPULL); }
+ /* ClockScaleKeyword: Resource Descriptors (ACPI 6.5) */
+
+"Hz" { count (0); return (PARSEOP_CLOCK_HZ); }
+"KHz" { count (0); return (PARSEOP_CLOCK_KHZ); }
+"MHz" { count (0); return (PARSEOP_CLOCK_MHZ); }
+
+ /* ClockModeKeyword: Resource Descriptors (ACPI 6.5) */
+
+"Fixed" { count (0); return (PARSEOP_CLOCK_FIXED); }
+"Variable" { count (0); return (PARSEOP_CLOCK_VARIABLE); }
+
/* PolarityKeyword: Resource Descriptors (ACPI 5.0) */
"PolarityLow" { count (0); return (PARSEOP_DEVICEPOLARITY_LOW); }
Index: src/sys/external/bsd/acpica/dist/compiler/dtfield.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtfield.c:1.20 src/sys/external/bsd/acpica/dist/compiler/dtfield.c:1.21
--- src/sys/external/bsd/acpica/dist/compiler/dtfield.c:1.20 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dtfield.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -570,7 +570,7 @@ DtCompileFlag (
case ACPI_DMT_FLAGS8_2:
- BitPosition = 2;
+ BitPosition = 2;
BitLength = 8;
break;
Index: src/sys/external/bsd/acpica/dist/compiler/aslerror.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.19 src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.20
--- src/sys/external/bsd/acpica/dist/compiler/aslerror.c:1.19 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslerror.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.19 src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.20
--- src/sys/external/bsd/acpica/dist/compiler/aslfiles.c:1.19 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslfiles.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtcompile.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.19 src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.20
--- src/sys/external/bsd/acpica/dist/compiler/dtcompile.c:1.19 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dtcompile.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslfileio.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslfileio.c:1.13 src/sys/external/bsd/acpica/dist/compiler/aslfileio.c:1.14
--- src/sys/external/bsd/acpica/dist/compiler/aslfileio.c:1.13 Sat Aug 27 10:04:56 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslfileio.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/asllookup.c
diff -u src/sys/external/bsd/acpica/dist/compiler/asllookup.c:1.15 src/sys/external/bsd/acpica/dist/compiler/asllookup.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/asllookup.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/asllookup.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.15 src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/prutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.15 src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.16
--- src/sys/external/bsd/acpica/dist/compiler/prutils.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/prutils.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -176,6 +176,238 @@ PrError (
/*******************************************************************************
*
+ * FUNCTION: PrReplaceResizeSubstring
+ *
+ * PARAMETERS: Args - Struct containing name, offset & usecount
+ * Diff1 - Difference in lengths when new < old
+ * Diff2 - Difference in lengths when new > old
+* i - The curr. no. of iteration of replacement
+ * Token - Substring that replaces Args->Name
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Advanced substring replacement in a string using resized buffer.
+ *
+ ******************************************************************************/
+
+void
+PrReplaceResizeSubstring(
+ PR_MACRO_ARG *Args,
+ UINT32 Diff1,
+ UINT32 Diff2,
+ UINT32 i,
+ char *Token)
+{
+ UINT32 b, PrevOffset;
+ char *temp;
+ char macro_sep[64];
+
+
+ AslGbl_MacroTokenReplaceBuffer = (char *) realloc (AslGbl_MacroTokenReplaceBuffer,
+ (2 * (strlen (AslGbl_MacroTokenBuffer))));
+
+ strcpy (macro_sep, "~,() {}!*/%+-<>=&^|\"\t\n");
+
+ /*
+ * When the replacement argument (during invocation) length
+ * < replaced parameter (in the macro function definition
+ * and its expansion) length
+ */
+ if (Diff1 != 0)
+ {
+ /*
+ * We save the offset value to reset it after replacing each
+ * instance of each arg and setting the offset value to
+ * the start of the arg to be replaced since it changes
+ * with each iteration when arg length != token length
+ */
+ PrevOffset = Args->Offset[i];
+ temp = strstr (AslGbl_MacroTokenBuffer, Args->Name);
+
+ResetHere1:
+ temp = strstr (temp, Args->Name);
+ Args->Offset[i] = strlen (AslGbl_MacroTokenBuffer) -
+ strlen (temp);
+ if (Args->Offset[i] == 0)
+ {
+ goto JumpHere1;
+ }
+ if ((strchr (macro_sep, AslGbl_MacroTokenBuffer[(Args->Offset[i] - 1)])) &&
+ (strchr (macro_sep, AslGbl_MacroTokenBuffer[(Args->Offset[i] + strlen (Args->Name))])))
+ {
+ Args->Offset[i] += 0;
+ }
+ else
+ {
+ temp += strlen (Args->Name);
+ goto ResetHere1;
+ }
+
+ /*
+ * For now, we simply set the extra char positions (generated
+ * due to longer name replaced by shorter name) to whitespace
+ * chars so it will be ignored during compilation
+ */
+JumpHere1:
+ b = strlen (Token) + Args->Offset[i];
+ memset (&AslGbl_MacroTokenBuffer[b], ' ', Diff1);
+
+# if 0
+
+ /* Work in progress as of 03/08/2023 - experimental 'if' block
+ * to test code for removing extra whitespaces from the macro
+ * replacement when replacement arg < replaced param
+ */
+ char Buff[8192];
+ /* char* Replace; */
+ /* Replace = Buff; */
+
+ for (j = 0; j < strlen (AslGbl_MacroTokenBuffer); j++)
+ {
+ Buff[j] = AslGbl_MacroTokenBuffer[j];
+ }
+ Buff[strlen (AslGbl_MacroTokenBuffer)] = '\0';
+ //fprintf (stderr, "Buff: %s\n", Buff);
+
+ UINT32 len = strlen (Buff);
+
+ for (j = 0; j < len; j++)
+ {
+ if (Buff[0] == ' ')
+ {
+ for (j = 0; j < (len - 1); j++)
+ {
+ Buff[j] = Buff[j + 1];
+ }
+ Buff[j] = '\0';
+ len--;
+ j = -1;
+ continue;
+ }
+
+ if (Buff[j] == ' ' && Buff[j + 1] == ' ')
+ {
+ for (k = 0; k < (len - 1); k++)
+ {
+ Buff[j] = Buff[j + 1];
+ }
+ Buff[j] = '\0';
+ len--;
+ j--;
+ }
+ }
+ //fprintf(stderr, "Buff: %s\n", Buff);
+
+ for (k = 0; k < strlen (Buff); k++)
+ {
+ AslGbl_MacroTokenBuffer[k] = Buff[k];
+ }
+#endif
+
+ PrReplaceData (
+ &AslGbl_MacroTokenBuffer[Args->Offset[i]],
+ strlen (Token), Token, strlen (Token));
+
+ temp = NULL;
+ Args->Offset[i] = PrevOffset;
+ }
+
+ /*
+ * When the replacement argument (during invocation) length
+ * > replaced parameter (in the macro function definition
+ * and its expansion) length
+ */
+ else if (Diff2 != 0)
+ {
+ /* Doing the same thing with offset value as for prev case */
+
+ PrevOffset = Args->Offset[i];
+ temp = strstr (AslGbl_MacroTokenBuffer, Args->Name);
+
+ResetHere2:
+ temp = strstr (temp, Args->Name);
+ Args->Offset[i] = strlen (AslGbl_MacroTokenBuffer) -
+ strlen (temp);
+ if (Args->Offset[i] == 0)
+ {
+ goto JumpHere2;
+ }
+ if ((strchr (macro_sep, AslGbl_MacroTokenBuffer[(Args->Offset[i] - 1)])) &&
+ (strchr (macro_sep, AslGbl_MacroTokenBuffer[(Args->Offset[i] + strlen (Args->Name))])))
+ {
+ Args->Offset[i] += 0;
+ }
+ else
+ {
+ temp+= strlen (Args->Name);
+ goto ResetHere2;
+ }
+
+ /*
+ * We will need to allocate some extra space in our buffer to
+ * accommodate the increase in the replacement string length
+ * over the shorter outgoing arg string and do the replacement
+ * at the correct offset value which is resetted every iteration
+ */
+JumpHere2:
+ strncpy (AslGbl_MacroTokenReplaceBuffer, AslGbl_MacroTokenBuffer, Args->Offset[i]);
+ strcat (AslGbl_MacroTokenReplaceBuffer, Token);
+ strcat (AslGbl_MacroTokenReplaceBuffer, (AslGbl_MacroTokenBuffer +
+ (Args->Offset[i] + strlen (Args->Name))));
+
+ strcpy (AslGbl_MacroTokenBuffer, AslGbl_MacroTokenReplaceBuffer);
+
+ temp = NULL;
+ Args->Offset[i] = PrevOffset;
+ }
+
+ /*
+ * When the replacement argument (during invocation) length =
+ * replaced parameter (in the macro function definition and
+ * its expansion) length
+ */
+ else
+ {
+
+ /*
+ * We still need to reset the offset for each iteration even when
+ * arg and param lengths are same since any macro func invocation
+ * could use various cases for each separate arg-param pair
+ */
+ PrevOffset = Args->Offset[i];
+ temp = strstr (AslGbl_MacroTokenBuffer, Args->Name);
+
+ResetHere3:
+ temp = strstr (temp, Args->Name);
+ Args->Offset[i] = strlen (AslGbl_MacroTokenBuffer) -
+ strlen (temp);
+ if (Args->Offset[i] == 0)
+ {
+ goto JumpHere3;
+ }
+ if ((strchr (macro_sep, AslGbl_MacroTokenBuffer[(Args->Offset[i] - 1)])) &&
+ (strchr (macro_sep, AslGbl_MacroTokenBuffer[(Args->Offset[i] + strlen (Args->Name))])))
+ {
+ Args->Offset[i] += 0;
+ }
+ else
+ {
+ temp += strlen (Args->Name);
+ goto ResetHere3;
+ }
+
+JumpHere3:
+ PrReplaceData (
+ &AslGbl_MacroTokenBuffer[Args->Offset[i]],
+ strlen (Args->Name), Token, strlen (Token));
+ temp = NULL;
+ Args->Offset[i] = PrevOffset;
+ }
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: PrReplaceData
*
* PARAMETERS: Buffer - Original(target) buffer pointer
@@ -183,13 +415,13 @@ PrError (
* BufferToAdd - Data to be inserted into target buffer
* LengthToAdd - Length of BufferToAdd
*
- * RETURN: None
+ * RETURN: Pointer to where the buffer is replaced with data
*
* DESCRIPTION: Generic buffer data replacement.
*
******************************************************************************/
-void
+char *
PrReplaceData (
char *Buffer,
UINT32 LengthToRemove,
@@ -217,12 +449,14 @@ PrReplaceData (
}
}
+
/* Now we can move in the new data */
if (LengthToAdd > 0)
{
memmove (Buffer, BufferToAdd, LengthToAdd);
}
+ return (Buffer + LengthToAdd);
}
Index: src/sys/external/bsd/acpica/dist/compiler/aslmain.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslmain.c:1.2 src/sys/external/bsd/acpica/dist/compiler/aslmain.c:1.3
--- src/sys/external/bsd/acpica/dist/compiler/aslmain.c:1.2 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslmain.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslopt.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.11 src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.12
--- src/sys/external/bsd/acpica/dist/compiler/aslopt.c:1.11 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslopt.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslsupport.l
diff -u src/sys/external/bsd/acpica/dist/compiler/aslsupport.l:1.17 src/sys/external/bsd/acpica/dist/compiler/aslsupport.l:1.18
--- src/sys/external/bsd/acpica/dist/compiler/aslsupport.l:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslsupport.l Fri Sep 1 14:37:29 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -87,7 +87,7 @@ AslParserCleanup (
*
* DESCRIPTION: Handle #line directives emitted by the preprocessor.
*
- * The #line directive is emitted by the preprocesser, and is used to
+ * The #line directive is emitted by the preprocessor, and is used to
* pass through line numbers from the original source code file to the
* preprocessor output file (.i). This allows any compiler-generated
* error messages to be displayed with the correct line number.
Index: src/sys/external/bsd/acpica/dist/compiler/asltree.c
diff -u src/sys/external/bsd/acpica/dist/compiler/asltree.c:1.17 src/sys/external/bsd/acpica/dist/compiler/asltree.c:1.18
--- src/sys/external/bsd/acpica/dist/compiler/asltree.c:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/asltree.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -359,6 +359,7 @@ TrLinkOpChildren (
UINT32 i;
BOOLEAN FirstChild;
+ ACPI_FUNCTION_NAME (TrLinkOpChildren);
va_start (ap, NumChildren);
@@ -516,7 +517,7 @@ TrLinkOpChildren (
if (AcpiGbl_CaptureComments)
{
AslGbl_CommentState.LatestParseOp = Op;
- CvDbgPrint ("TrLinkOpChildren=====Set latest parse op to this op.\n");
+ CvDbgPrint ("%s=====Set latest parse op to this op.\n", ACPI_GET_FUNCTION_NAME);
}
return (Op);
Index: src/sys/external/bsd/acpica/dist/compiler/dtparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.17 src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.18
--- src/sys/external/bsd/acpica/dist/compiler/dtparser.y:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dtparser.y Fri Sep 1 14:37:29 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dttable.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.17 src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.18
--- src/sys/external/bsd/acpica/dist/compiler/dttable.c:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dttable.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/prparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.17 src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.18
--- src/sys/external/bsd/acpica/dist/compiler/prparser.y:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/prparser.y Fri Sep 1 14:37:29 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/aslutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.32 src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.33
--- src/sys/external/bsd/acpica/dist/compiler/aslutils.c:1.32 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/aslutils.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -502,7 +502,7 @@ UtSetParseOpName (
*
* FUNCTION: UtDisplayOneSummary
*
- * PARAMETERS: FileID - ID of outpout file
+ * PARAMETERS: FileID - ID of output file
*
* RETURN: None
*
@@ -625,7 +625,7 @@ UtDisplayOneSummary (
*
* FUNCTION: UtDisplayErrorSummary
*
- * PARAMETERS: FileID - ID of outpout file
+ * PARAMETERS: FileID - ID of output file
*
* RETURN: None
*
@@ -692,7 +692,7 @@ UtDisplayErrorSummary (
*
* FUNCTION: UtDisplaySummary
*
- * PARAMETERS: FileID - ID of outpout file
+ * PARAMETERS: FileID - ID of output file
*
* RETURN: None
*
Index: src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
diff -u src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y:1.6 src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y:1.7
--- src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y:1.6 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y Fri Sep 1 14:37:29 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c:1.14 src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c:1.15
--- src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c:1.14 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/compiler/dtutils.c
diff -u src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.21 src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.22
--- src/sys/external/bsd/acpica/dist/compiler/dtutils.c:1.21 Sat Dec 10 12:40:49 2022
+++ src/sys/external/bsd/acpica/dist/compiler/dtutils.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -476,6 +476,7 @@ DtGetFieldLength (
case ACPI_DMT_IVRS_DE:
case ACPI_DMT_GTDT:
case ACPI_DMT_MADT:
+ case ACPI_DMT_MPAM_LOCATOR:
case ACPI_DMT_NHLT1:
case ACPI_DMT_NHLT1a:
case ACPI_DMT_NHLT1b:
@@ -506,6 +507,7 @@ DtGetFieldLength (
ByteLength = 1;
break;
+ case ACPI_DMT_ASPT:
case ACPI_DMT_UINT16:
case ACPI_DMT_DMAR:
case ACPI_DMT_HEST:
Index: src/sys/external/bsd/acpica/dist/debugger/dbcmds.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.16 src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.17
--- src/sys/external/bsd/acpica/dist/debugger/dbcmds.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbcmds.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@
#include "acnamesp.h"
#include "acresrc.h"
#include "actables.h"
-
+#include "limits.h"
#define _COMPONENT ACPI_CA_DEBUGGER
ACPI_MODULE_NAME ("dbcmds")
@@ -1183,6 +1183,64 @@ AcpiDbDisplayResources (
}
+/*******************************************************************************
+ *
+ * FUNCTION: AcpiDbGenerateGed
+ *
+ * PARAMETERS: GedArg - Raw GED number, ascii string
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Simulate firing of a GED
+ *
+ ******************************************************************************/
+
+void
+AcpiDbGenerateInterrupt (
+ char *GsivArg)
+{
+ UINT32 GsivNumber;
+ ACPI_GED_HANDLER_INFO *GedInfo = AcpiGbl_GedHandlerList;
+
+ if (!GedInfo) {
+ AcpiOsPrintf ("No GED handling present\n");
+ }
+
+ GsivNumber = strtoul (GsivArg, NULL, 0);
+
+ while (GedInfo) {
+
+ if (GedInfo->IntId == GsivNumber) {
+ ACPI_OBJECT_LIST ArgList;
+ ACPI_OBJECT Arg0;
+ ACPI_HANDLE EvtHandle = GedInfo->EvtMethod;
+ ACPI_STATUS Status;
+
+ AcpiOsPrintf ("Evaluate GED _EVT (GSIV=%d)\n", GsivNumber);
+
+ if (!EvtHandle) {
+ AcpiOsPrintf ("Undefined _EVT method\n");
+ return;
+ }
+
+ Arg0.Integer.Type = ACPI_TYPE_INTEGER;
+ Arg0.Integer.Value = GsivNumber;
+
+ ArgList.Count = 1;
+ ArgList.Pointer = &Arg0;
+
+ Status = AcpiEvaluateObject (EvtHandle, NULL, &ArgList, NULL);
+ if (ACPI_FAILURE (Status))
+ {
+ AcpiOsPrintf ("Could not evaluate _EVT\n");
+ return;
+ }
+
+ }
+ GedInfo = GedInfo->Next;
+ }
+}
+
#if (!ACPI_REDUCED_HARDWARE)
/*******************************************************************************
*
Index: src/sys/external/bsd/acpica/dist/debugger/dbnames.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.16 src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.17
--- src/sys/external/bsd/acpica/dist/debugger/dbnames.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbnames.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -776,6 +776,9 @@ AcpiDbDisplayObjects (
{
ObjectInfo = ACPI_ALLOCATE_ZEROED (sizeof (ACPI_OBJECT_INFO));
+ if (!ObjectInfo)
+ return (AE_NO_MEMORY);
+
/* Walk the namespace from the root */
(void) AcpiWalkNamespace (ACPI_TYPE_ANY, ACPI_ROOT_OBJECT,
Index: src/sys/external/bsd/acpica/dist/debugger/dbutils.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbutils.c:1.16 src/sys/external/bsd/acpica/dist/debugger/dbutils.c:1.17
--- src/sys/external/bsd/acpica/dist/debugger/dbutils.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbutils.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.20 src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.21
--- src/sys/external/bsd/acpica/dist/debugger/dbdisply.c:1.20 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbexec.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.20 src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.21
--- src/sys/external/bsd/acpica/dist/debugger/dbexec.c:1.20 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbexec.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbinput.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.25 src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.26
--- src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.25 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbinput.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -156,6 +156,7 @@ enum AcpiExDebuggerCommands
CMD_THREADS,
CMD_TEST,
+ CMD_INTERRUPT,
#endif
};
@@ -237,6 +238,7 @@ static const ACPI_DB_COMMAND_INFO Acpi
{"THREADS", 3},
{"TEST", 1},
+ {"INTERRUPT", 1},
#endif
{NULL, 0}
};
@@ -353,6 +355,7 @@ static const ACPI_DB_COMMAND_HELP Acpi
{1, " Gpes", "Display info on all GPE devices\n"},
{1, " Sci", "Generate an SCI\n"},
{1, " Sleep [SleepState]", "Simulate sleep/wake sequence(s) (0-5)\n"},
+ {1, " Interrupt <GSIV>", "Simulate an interrupt\n"},
#endif
{0, NULL, NULL}
};
@@ -1155,6 +1158,11 @@ AcpiDbCommandDispatch (
AcpiOsPrintf ("Event command not implemented\n");
break;
+ case CMD_INTERRUPT:
+
+ AcpiDbGenerateInterrupt (AcpiGbl_DbArgs[1]);
+ break;
+
case CMD_GPE:
AcpiDbGenerateGpe (AcpiGbl_DbArgs[1], AcpiGbl_DbArgs[2]);
Index: src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.18 src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.19
--- src/sys/external/bsd/acpica/dist/debugger/dbmethod.c:1.18 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbmethod.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/debugger/dbtest.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.12 src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.13
--- src/sys/external/bsd/acpica/dist/debugger/dbtest.c:1.12 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/debugger/dbtest.c Fri Sep 1 14:37:29 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.15 src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.16
--- src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c:1.15 src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c:1.16
--- src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -95,6 +95,7 @@ static ACPI_RESOURCE_HANDLER AcpiGbl_
AcpiDmPinGroupDescriptor, /* 0x10, ACPI_RESOURCE_NAME_PIN_GROUP */
AcpiDmPinGroupFunctionDescriptor, /* 0x11, ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION */
AcpiDmPinGroupConfigDescriptor, /* 0x12, ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG */
+ AcpiDmClockInputDescriptor, /* 0x13, ACPI_RESOURCE_NAME_CLOCK_INPUT */
};
Index: src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c:1.15 src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c:1.16
--- src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c:1.14 src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c:1.15
--- src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c:1.14 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/disassembler/dmcstyle.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c:1.14 src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c:1.15
--- src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c:1.14 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c
diff -u src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.14 src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.15
--- src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c:1.14 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -419,6 +419,46 @@ AcpiDmGpioDescriptor (
}
}
+void
+AcpiDmClockInputDescriptor (
+ ACPI_OP_WALK_INFO *Info,
+ AML_RESOURCE *Resource,
+ UINT32 Length,
+ UINT32 Level)
+{
+ char *DeviceName = NULL;
+ UINT8 *ResourceIndex = NULL;
+ AcpiDmIndent (Level);
+
+ AcpiOsPrintf ("ClockInput (");
+
+ AcpiOsPrintf ("0x%8.8X, ", Resource->ClockInput.FrequencyNumerator);
+
+ AcpiOsPrintf ("0x%4.4X, ", Resource->ClockInput.FrequencyDivisor);
+
+ AcpiOsPrintf ("%s, ",
+ AcpiGbl_ClockInputScale [ACPI_EXTRACT_2BIT_FLAG (Resource->ClockInput.Flags, 1)]);
+
+ AcpiOsPrintf ("%s, ",
+ AcpiGbl_ClockInputMode [ACPI_GET_1BIT_FLAG (Resource->ClockInput.Flags)]);
+
+ if (Length > sizeof(Resource->ClockInput))
+ {
+ DeviceName = ACPI_ADD_PTR (char,
+ Resource, sizeof(Resource->ClockInput)+1),
+ AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
+
+ AcpiOsPrintf (", ");
+ ResourceIndex = ACPI_ADD_PTR (UINT8,
+ Resource, sizeof(Resource->ClockInput)),
+
+ AcpiOsPrintf ("0x%2.2X", *ResourceIndex);
+ }
+
+ AcpiOsPrintf (")\n");
+
+}
+
/*******************************************************************************
*
* FUNCTION: AcpiDmPinFunctionDescriptor
Index: src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c:1.15 src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c:1.16
--- src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c Fri Sep 1 14:37:30 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c:1.18 src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c:1.19
--- src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c:1.18 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c:1.7 src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c:1.8
--- src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c:1.7 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.16 src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.17
--- src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/dispatcher/dswexec.c
diff -u src/sys/external/bsd/acpica/dist/dispatcher/dswexec.c:1.2 src/sys/external/bsd/acpica/dist/dispatcher/dswexec.c:1.3
--- src/sys/external/bsd/acpica/dist/dispatcher/dswexec.c:1.2 Fri Sep 16 04:08:01 2022
+++ src/sys/external/bsd/acpica/dist/dispatcher/dswexec.c Fri Sep 1 14:37:30 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -461,11 +461,11 @@ AcpiDsExecEndOp (
/*
* All opcodes require operand resolution, with the only exceptions
- * being the ObjectType and SizeOf operators as well as operands that
- * take no arguments.
+ * being the ObjectType and SizeOf operators as well as opcodes that
+ * take no arguments.
*/
if (!(WalkState->OpInfo->Flags & AML_NO_OPERAND_RESOLVE) &&
- (WalkState->OpInfo->Flags & AML_HAS_ARGS))
+ (WalkState->OpInfo->Flags & AML_HAS_ARGS))
{
/* Resolve all operands */
Index: src/sys/external/bsd/acpica/dist/events/evregion.c
diff -u src/sys/external/bsd/acpica/dist/events/evregion.c:1.16 src/sys/external/bsd/acpica/dist/events/evregion.c:1.17
--- src/sys/external/bsd/acpica/dist/events/evregion.c:1.16 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/events/evregion.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/events/evrgnini.c
diff -u src/sys/external/bsd/acpica/dist/events/evrgnini.c:1.20 src/sys/external/bsd/acpica/dist/events/evrgnini.c:1.21
--- src/sys/external/bsd/acpica/dist/events/evrgnini.c:1.20 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/events/evrgnini.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/events/evxface.c
diff -u src/sys/external/bsd/acpica/dist/events/evxface.c:1.15 src/sys/external/bsd/acpica/dist/events/evxface.c:1.16
--- src/sys/external/bsd/acpica/dist/events/evxface.c:1.15 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/events/evxface.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exconfig.c
diff -u src/sys/external/bsd/acpica/dist/executer/exconfig.c:1.20 src/sys/external/bsd/acpica/dist/executer/exconfig.c:1.21
--- src/sys/external/bsd/acpica/dist/executer/exconfig.c:1.20 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/executer/exconfig.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exdebug.c
diff -u src/sys/external/bsd/acpica/dist/executer/exdebug.c:1.16 src/sys/external/bsd/acpica/dist/executer/exdebug.c:1.17
--- src/sys/external/bsd/acpica/dist/executer/exdebug.c:1.16 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/executer/exdebug.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exdump.c
diff -u src/sys/external/bsd/acpica/dist/executer/exdump.c:1.17 src/sys/external/bsd/acpica/dist/executer/exdump.c:1.18
--- src/sys/external/bsd/acpica/dist/executer/exdump.c:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/executer/exdump.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/executer/exsystem.c
diff -u src/sys/external/bsd/acpica/dist/executer/exsystem.c:1.2 src/sys/external/bsd/acpica/dist/executer/exsystem.c:1.3
--- src/sys/external/bsd/acpica/dist/executer/exsystem.c:1.2 Wed Dec 7 00:38:27 2022
+++ src/sys/external/bsd/acpica/dist/executer/exsystem.c Fri Sep 1 14:37:30 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -195,10 +195,10 @@ AcpiExSystemDoStall (
else
{
if (HowLongUs > 100)
- {
+ {
ACPI_WARNING ((AE_INFO,
"Time parameter %u us > 100 us violating ACPI spec, please fix the firmware.", HowLongUs));
- }
+ }
AcpiOsStall (HowLongUs);
}
Index: src/sys/external/bsd/acpica/dist/hardware/hwesleep.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwesleep.c:1.12 src/sys/external/bsd/acpica/dist/hardware/hwesleep.c:1.13
--- src/sys/external/bsd/acpica/dist/hardware/hwesleep.c:1.12 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/hardware/hwesleep.c Fri Sep 1 14:37:30 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -65,7 +65,7 @@
void
AcpiHwExecuteSleepMethod (
- char *MethodPathname,
+ const char *MethodPathname,
UINT32 IntegerArgument)
{
ACPI_OBJECT_LIST ArgList;
Index: src/sys/external/bsd/acpica/dist/hardware/hwregs.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwregs.c:1.11 src/sys/external/bsd/acpica/dist/hardware/hwregs.c:1.12
--- src/sys/external/bsd/acpica/dist/hardware/hwregs.c:1.11 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/hardware/hwregs.c Fri Sep 1 14:37:30 2023
@@ -6,7 +6,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwsleep.c:1.15 src/sys/external/bsd/acpica/dist/hardware/hwsleep.c:1.16
--- src/sys/external/bsd/acpica/dist/hardware/hwsleep.c:1.15 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/hardware/hwsleep.c Fri Sep 1 14:37:30 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -364,17 +364,7 @@ AcpiHwLegacyWake (
AcpiGbl_FixedEventInfo[ACPI_EVENT_SLEEP_BUTTON].StatusRegisterId,
ACPI_CLEAR_STATUS);
- /* Enable pcie wake event if support */
- if ((AcpiGbl_FADT.Flags & ACPI_FADT_PCI_EXPRESS_WAKE)) {
- (void) AcpiWriteBitRegister (
- AcpiGbl_FixedEventInfo[ACPI_EVENT_PCIE_WAKE].EnableRegisterId,
- ACPI_DISABLE_EVENT);
- (void) AcpiWriteBitRegister (
- AcpiGbl_FixedEventInfo[ACPI_EVENT_PCIE_WAKE].StatusRegisterId,
- ACPI_CLEAR_STATUS);
- }
-
- AcpiHwExecuteSleepMethod (__UNCONST(METHOD_PATHNAME__SST), ACPI_SST_WORKING);
+ AcpiHwExecuteSleepMethod (METHOD_PATHNAME__SST, ACPI_SST_WORKING);
return_ACPI_STATUS (Status);
}
Index: src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
diff -u src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c:1.17 src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c:1.18
--- src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c:1.17 Sat Aug 27 10:04:57 2022
+++ src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acapps.h
diff -u src/sys/external/bsd/acpica/dist/include/acapps.h:1.19 src/sys/external/bsd/acpica/dist/include/acapps.h:1.20
--- src/sys/external/bsd/acpica/dist/include/acapps.h:1.19 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acapps.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, 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 - 2022 Intel Corporation"
+#define ACPICA_COPYRIGHT "Copyright (c) 2000 - 2023 Intel Corporation"
#if ACPI_MACHINE_WIDTH == 64
#define ACPI_WIDTH " (64-bit version)"
Index: src/sys/external/bsd/acpica/dist/include/acmacros.h
diff -u src/sys/external/bsd/acpica/dist/include/acmacros.h:1.19 src/sys/external/bsd/acpica/dist/include/acmacros.h:1.20
--- src/sys/external/bsd/acpica/dist/include/acmacros.h:1.19 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acmacros.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acdebug.h
diff -u src/sys/external/bsd/acpica/dist/include/acdebug.h:1.20 src/sys/external/bsd/acpica/dist/include/acdebug.h:1.21
--- src/sys/external/bsd/acpica/dist/include/acdebug.h:1.20 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acdebug.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -511,4 +511,8 @@ AcpiDbUint32ToHexString (
UINT32 Value,
char *Buffer);
+void
+AcpiDbGenerateInterrupt (
+ char *GsivArg);
+
#endif /* __ACDEBUG_H__ */
Index: src/sys/external/bsd/acpica/dist/include/acnamesp.h
diff -u src/sys/external/bsd/acpica/dist/include/acnamesp.h:1.20 src/sys/external/bsd/acpica/dist/include/acnamesp.h:1.21
--- src/sys/external/bsd/acpica/dist/include/acnamesp.h:1.20 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acnamesp.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acdisasm.h
diff -u src/sys/external/bsd/acpica/dist/include/acdisasm.h:1.26 src/sys/external/bsd/acpica/dist/include/acdisasm.h:1.27
--- src/sys/external/bsd/acpica/dist/include/acdisasm.h:1.26 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/acdisasm.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -152,6 +152,7 @@ typedef enum
ACPI_DMT_AEST_XRUPT,
ACPI_DMT_AGDI,
ACPI_DMT_ASF,
+ ACPI_DMT_ASPT,
ACPI_DMT_CDAT,
ACPI_DMT_CEDT,
ACPI_DMT_DMAR,
@@ -172,6 +173,7 @@ typedef enum
ACPI_DMT_IVRS_UNTERMINATED_STRING,
ACPI_DMT_LPIT,
ACPI_DMT_MADT,
+ ACPI_DMT_MPAM_LOCATOR,
ACPI_DMT_NFIT,
ACPI_DMT_NHLT1,
ACPI_DMT_NHLT1a,
@@ -186,6 +188,7 @@ typedef enum
ACPI_DMT_PMTT_VENDOR,
ACPI_DMT_PPTT,
ACPI_DMT_RGRT,
+ ACPI_DMT_RHCT,
ACPI_DMT_SDEI,
ACPI_DMT_SDEV,
ACPI_DMT_SLIC,
@@ -291,6 +294,11 @@ extern ACPI_DMTABLE_INFO AcpiDmTa
extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf3[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsf4[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsfHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoAspt[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoAsptHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoAspt0[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoAspt1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoAspt2[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoBdat[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoBoot[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoBert[];
@@ -438,10 +446,32 @@ extern ACPI_DMTABLE_INFO AcpiDmTa
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt15[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt16[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt17[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt18[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt19[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt20[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt21[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt22[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt23[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt24[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt25[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt26[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt27[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadt128[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMadtHdr[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMcfg[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMcfg0[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMchi[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam0[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1A[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1B[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1C[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1D[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1E[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1F[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1G[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam1Deps[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpam2[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpst[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpst0[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoMpst0A[];
@@ -515,6 +545,14 @@ extern ACPI_DMTABLE_INFO AcpiDmTa
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRasf[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRgrt[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRgrt0[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhct[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctNodeHdr[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctIsa1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctIsaPad[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctCmo1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctMmu1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctHartInfo1[];
+extern ACPI_DMTABLE_INFO AcpiDmTableInfoRhctHartInfo2[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRsdp1[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoRsdp2[];
extern ACPI_DMTABLE_INFO AcpiDmTableInfoS3pt[];
@@ -651,6 +689,10 @@ AcpiDmDumpAsf (
ACPI_TABLE_HEADER *Table);
void
+AcpiDmDumpAspt (
+ ACPI_TABLE_HEADER *Table);
+
+void
AcpiDmDumpCcel (
ACPI_TABLE_HEADER *Table);
@@ -731,6 +773,10 @@ AcpiDmDumpMcfg (
ACPI_TABLE_HEADER *Table);
void
+AcpiDmDumpMpam (
+ ACPI_TABLE_HEADER *Table);
+
+void
AcpiDmDumpMpst (
ACPI_TABLE_HEADER *Table);
@@ -774,6 +820,10 @@ void
AcpiDmDumpRgrt (
ACPI_TABLE_HEADER *Table);
+void
+AcpiDmDumpRhct (
+ ACPI_TABLE_HEADER *Table);
+
UINT32
AcpiDmDumpRsdp (
ACPI_TABLE_HEADER *Table);
@@ -1215,6 +1265,12 @@ AcpiDmVendorCommon (
UINT32 Length,
UINT32 Level);
+void
+AcpiDmClockInputDescriptor (
+ ACPI_OP_WALK_INFO *Info,
+ AML_RESOURCE *Resource,
+ UINT32 Length,
+ UINT32 Level);
/*
* dmresrcs
Index: src/sys/external/bsd/acpica/dist/include/acglobal.h
diff -u src/sys/external/bsd/acpica/dist/include/acglobal.h:1.26 src/sys/external/bsd/acpica/dist/include/acglobal.h:1.27
--- src/sys/external/bsd/acpica/dist/include/acglobal.h:1.26 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/acglobal.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -160,6 +160,7 @@ ACPI_GLOBAL (ACPI_TABLE_HANDLER,
ACPI_GLOBAL (void *, AcpiGbl_TableHandlerContext);
ACPI_GLOBAL (ACPI_INTERFACE_HANDLER, AcpiGbl_InterfaceHandler);
ACPI_GLOBAL (ACPI_SCI_HANDLER_INFO *, AcpiGbl_SciHandlerList);
+ACPI_GLOBAL (ACPI_GED_HANDLER_INFO *, AcpiGbl_GedHandlerList);
/* Owner ID support */
Index: src/sys/external/bsd/acpica/dist/include/acutils.h
diff -u src/sys/external/bsd/acpica/dist/include/acutils.h:1.26 src/sys/external/bsd/acpica/dist/include/acutils.h:1.27
--- src/sys/external/bsd/acpica/dist/include/acutils.h:1.26 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/acutils.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,8 @@ extern const char
extern const char *AcpiGbl_FcDecode[];
extern const char *AcpiGbl_PtDecode[];
extern const char *AcpiGbl_PtypDecode[];
+extern const char *AcpiGbl_ClockInputMode[];
+extern const char *AcpiGbl_ClockInputScale[];
#endif
/*
Index: src/sys/external/bsd/acpica/dist/include/acexcep.h
diff -u src/sys/external/bsd/acpica/dist/include/acexcep.h:1.16 src/sys/external/bsd/acpica/dist/include/acexcep.h:1.17
--- src/sys/external/bsd/acpica/dist/include/acexcep.h:1.16 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acexcep.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acinterp.h
diff -u src/sys/external/bsd/acpica/dist/include/acinterp.h:1.16 src/sys/external/bsd/acpica/dist/include/acinterp.h:1.17
--- src/sys/external/bsd/acpica/dist/include/acinterp.h:1.16 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acinterp.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acoutput.h
diff -u src/sys/external/bsd/acpica/dist/include/acoutput.h:1.16 src/sys/external/bsd/acpica/dist/include/acoutput.h:1.17
--- src/sys/external/bsd/acpica/dist/include/acoutput.h:1.16 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acoutput.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/achware.h
diff -u src/sys/external/bsd/acpica/dist/include/achware.h:1.1.1.14 src/sys/external/bsd/acpica/dist/include/achware.h:1.2
--- src/sys/external/bsd/acpica/dist/include/achware.h:1.1.1.14 Fri Sep 1 13:48:15 2023
+++ src/sys/external/bsd/acpica/dist/include/achware.h Fri Sep 1 14:37:31 2023
@@ -130,7 +130,7 @@ AcpiHwLegacyWake (
*/
void
AcpiHwExecuteSleepMethod (
- char *MethodName,
+ const char *MethodName,
UINT32 IntegerArgument);
ACPI_STATUS
Index: src/sys/external/bsd/acpica/dist/include/aclocal.h
diff -u src/sys/external/bsd/acpica/dist/include/aclocal.h:1.24 src/sys/external/bsd/acpica/dist/include/aclocal.h:1.25
--- src/sys/external/bsd/acpica/dist/include/aclocal.h:1.24 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/aclocal.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -659,6 +659,15 @@ typedef struct acpi_field_info
} ACPI_FIELD_INFO;
+/* Information about the interrupt ID and _EVT of a GED device */
+
+typedef struct acpi_ged_handler_info
+{
+ struct acpi_ged_handler_info *Next;
+ UINT32 IntId; /* The interrupt ID that triggers the execution ofthe EvtMethod. */
+ ACPI_NAMESPACE_NODE *EvtMethod; /* The _EVT method to be executed when an interrupt with ID = IntID is received */
+
+} ACPI_GED_HANDLER_INFO;
/*****************************************************************************
*
@@ -678,13 +687,13 @@ typedef struct acpi_field_info
UINT8 DescriptorType; /* To differentiate various internal objs */\
UINT8 Flags; \
UINT16 Value; \
- UINT16 State;
+ UINT16 State
/* There are 2 bytes available here until the next natural alignment boundary */
typedef struct acpi_common_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
} ACPI_COMMON_STATE;
@@ -693,7 +702,7 @@ typedef struct acpi_common_state
*/
typedef struct acpi_update_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
union acpi_operand_object *Object;
} ACPI_UPDATE_STATE;
@@ -704,7 +713,7 @@ typedef struct acpi_update_state
*/
typedef struct acpi_pkg_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
UINT32 Index;
union acpi_operand_object *SourceObject;
union acpi_operand_object *DestObject;
@@ -721,7 +730,7 @@ typedef struct acpi_pkg_state
*/
typedef struct acpi_control_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
UINT16 Opcode;
union acpi_parse_object *PredicateOp;
UINT8 *AmlPredicateStart; /* Start of if/while predicate */
@@ -736,7 +745,7 @@ typedef struct acpi_control_state
*/
typedef struct acpi_scope_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
ACPI_NAMESPACE_NODE *Node;
} ACPI_SCOPE_STATE;
@@ -744,7 +753,7 @@ typedef struct acpi_scope_state
typedef struct acpi_pscope_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
UINT32 ArgCount; /* Number of fixed arguments */
union acpi_parse_object *Op; /* Current op being parsed */
UINT8 *ArgEnd; /* Current argument end */
@@ -760,7 +769,7 @@ typedef struct acpi_pscope_state
*/
typedef struct acpi_thread_state
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
UINT8 CurrentSyncLevel; /* Mutex Sync (nested acquire) level */
struct acpi_walk_state *WalkStateList; /* Head of list of WalkStates for this thread */
union acpi_operand_object *AcquiredMutexList; /* List of all currently acquired mutexes */
@@ -775,7 +784,7 @@ typedef struct acpi_thread_state
*/
typedef struct acpi_result_values
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
union acpi_operand_object *ObjDesc [ACPI_RESULTS_FRAME_OBJ_NUM];
} ACPI_RESULT_VALUES;
@@ -806,7 +815,7 @@ typedef struct acpi_global_notify_handle
*/
typedef struct acpi_notify_info
{
- ACPI_STATE_COMMON
+ ACPI_STATE_COMMON;
UINT8 HandlerListId;
ACPI_NAMESPACE_NODE *Node;
union acpi_operand_object *HandlerListHead;
@@ -1344,7 +1353,8 @@ typedef struct acpi_port_info
#define ACPI_RESOURCE_NAME_PIN_GROUP 0x90
#define ACPI_RESOURCE_NAME_PIN_GROUP_FUNCTION 0x91
#define ACPI_RESOURCE_NAME_PIN_GROUP_CONFIG 0x92
-#define ACPI_RESOURCE_NAME_LARGE_MAX 0x92
+#define ACPI_RESOURCE_NAME_CLOCK_INPUT 0x93
+#define ACPI_RESOURCE_NAME_LARGE_MAX 0x94
/*****************************************************************************
Index: src/sys/external/bsd/acpica/dist/include/acpiosxf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpiosxf.h:1.17 src/sys/external/bsd/acpica/dist/include/acpiosxf.h:1.18
--- src/sys/external/bsd/acpica/dist/include/acpiosxf.h:1.17 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acpiosxf.h Fri Sep 1 14:37:31 2023
@@ -7,7 +7,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/acpixf.h
diff -u src/sys/external/bsd/acpica/dist/include/acpixf.h:1.34 src/sys/external/bsd/acpica/dist/include/acpixf.h:1.35
--- src/sys/external/bsd/acpica/dist/include/acpixf.h:1.34 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/acpixf.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, 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 0x20221020
+#define ACPI_CA_VERSION 0x20230628
#include "acconfig.h"
#include "actypes.h"
@@ -662,7 +662,7 @@ ACPI_EXTERNAL_RETURN_STATUS (
ACPI_STATUS
AcpiGetHandle (
ACPI_HANDLE Parent,
- ACPI_CONST_STRING Pathname,
+ const char *Pathname,
ACPI_HANDLE *RetHandle))
ACPI_EXTERNAL_RETURN_STATUS (
@@ -836,6 +836,21 @@ AcpiInstallAddressSpaceHandler (
ACPI_EXTERNAL_RETURN_STATUS (
ACPI_STATUS
+AcpiInstallAddressSpaceHandlerNo_Reg(
+ ACPI_HANDLE Device,
+ ACPI_ADR_SPACE_TYPE SpaceId,
+ ACPI_ADR_SPACE_HANDLER Handler,
+ ACPI_ADR_SPACE_SETUP Setup,
+ void *Context))
+
+ACPI_EXTERNAL_RETURN_STATUS (
+ACPI_STATUS
+AcpiExecuteRegMethods (
+ ACPI_HANDLE Device,
+ ACPI_ADR_SPACE_TYPE SpaceId))
+
+ACPI_EXTERNAL_RETURN_STATUS (
+ACPI_STATUS
AcpiRemoveAddressSpaceHandler (
ACPI_HANDLE Device,
ACPI_ADR_SPACE_TYPE SpaceId,
Index: src/sys/external/bsd/acpica/dist/include/acresrc.h
diff -u src/sys/external/bsd/acpica/dist/include/acresrc.h:1.15 src/sys/external/bsd/acpica/dist/include/acresrc.h:1.16
--- src/sys/external/bsd/acpica/dist/include/acresrc.h:1.15 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/acresrc.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -397,6 +397,7 @@ extern ACPI_RSCONVERT_INFO AcpiRsCo
extern ACPI_RSCONVERT_INFO AcpiRsConvertPinGroup[];
extern ACPI_RSCONVERT_INFO AcpiRsConvertPinGroupFunction[];
extern ACPI_RSCONVERT_INFO AcpiRsConvertPinGroupConfig[];
+extern ACPI_RSCONVERT_INFO AcpiRsConvertClockInput[];
/* These resources require separate get/set tables */
@@ -453,6 +454,7 @@ extern ACPI_RSDUMP_INFO AcpiRsDu
extern ACPI_RSDUMP_INFO AcpiRsDumpPinGroup[];
extern ACPI_RSDUMP_INFO AcpiRsDumpPinGroupFunction[];
extern ACPI_RSDUMP_INFO AcpiRsDumpPinGroupConfig[];
+extern ACPI_RSDUMP_INFO AcpiRsDumpClockInput[];
#endif
#endif /* __ACRESRC_H__ */
Index: src/sys/external/bsd/acpica/dist/include/actables.h
diff -u src/sys/external/bsd/acpica/dist/include/actables.h:1.18 src/sys/external/bsd/acpica/dist/include/actables.h:1.19
--- src/sys/external/bsd/acpica/dist/include/actables.h:1.18 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/actables.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/include/actbl1.h
diff -u src/sys/external/bsd/acpica/dist/include/actbl1.h:1.21 src/sys/external/bsd/acpica/dist/include/actbl1.h:1.22
--- src/sys/external/bsd/acpica/dist/include/actbl1.h:1.21 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/actbl1.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,7 @@
*/
#define ACPI_SIG_AEST "AEST" /* Arm Error Source Table */
#define ACPI_SIG_ASF "ASF!" /* Alert Standard Format table */
+#define ACPI_SIG_ASPT "ASPT" /* AMD Secure Processor Table */
#define ACPI_SIG_BERT "BERT" /* Boot Error Record Table */
#define ACPI_SIG_BGRT "BGRT" /* Boot Graphics Resource Table */
#define ACPI_SIG_BOOT "BOOT" /* Simple Boot Flag Table */
@@ -290,6 +291,86 @@ typedef struct acpi_asf_address
} ACPI_ASF_ADDRESS;
+/*******************************************************************************
+ *
+ * ASPT - AMD Secure Processor Table (Signature "ASPT")
+ * Revision 0x1
+ *
+ * Conforms to AMD Socket SP5/SP6 Platform ASPT Rev1 Specification,
+ * 12 September 2022
+ *
+ ******************************************************************************/
+
+typedef struct acpi_table_aspt
+{
+ ACPI_TABLE_HEADER Header; /* Common ACPI table header */
+ UINT32 NumEntries;
+
+} ACPI_TABLE_ASPT;
+
+
+/* ASPT subtable header */
+
+typedef struct acpi_aspt_header
+{
+ UINT16 Type;
+ UINT16 Length;
+
+} ACPI_ASPT_HEADER;
+
+
+/* Values for Type field above */
+
+enum AcpiAsptType
+{
+ ACPI_ASPT_TYPE_GLOBAL_REGS = 0,
+ ACPI_ASPT_TYPE_SEV_MBOX_REGS = 1,
+ ACPI_ASPT_TYPE_ACPI_MBOX_REGS = 2,
+ ACPI_ASPT_TYPE_UNKNOWN = 3,
+};
+
+/*
+ * ASPT subtables
+ */
+
+/* 0: ASPT Global Registers */
+
+typedef struct acpi_aspt_global_regs
+{
+ ACPI_ASPT_HEADER Header;
+ UINT32 Reserved;
+ UINT64 FeatureRegAddr;
+ UINT64 IrqEnRegAddr;
+ UINT64 IrqStRegAddr;
+
+} ACPI_ASPT_GLOBAL_REGS;
+
+
+/* 1: ASPT SEV Mailbox Registers */
+
+typedef struct acpi_aspt_sev_mbox_regs
+{
+ ACPI_ASPT_HEADER Header;
+ UINT8 MboxIrqId;
+ UINT8 Reserved[3];
+ UINT64 CmdRespRegAddr;
+ UINT64 CmdBufLoRegAddr;
+ UINT64 CmdBufHiRegAddr;
+
+} ACPI_ASPT_SEV_MBOX_REGS;
+
+
+/* 2: ASPT ACPI Mailbox Registers */
+
+typedef struct acpi_aspt_acpi_mbox_regs
+{
+ ACPI_ASPT_HEADER Header;
+ UINT32 Reserved1;
+ UINT64 CmdRespRegAddr;
+ UINT64 Reserved2[2];
+
+} ACPI_ASPT_ACPI_MBOX_REGS;
+
/*******************************************************************************
*
@@ -387,7 +468,6 @@ typedef struct acpi_table_boot
} ACPI_TABLE_BOOT;
-
/*******************************************************************************
*
* CDAT - Coherent Device Attribute Table
@@ -435,7 +515,7 @@ enum AcpiCdatType
/* Subtable 0: Device Scoped Memory Affinity Structure (DSMAS) */
-typedef struct acpi_cadt_dsmas
+typedef struct acpi_cdat_dsmas
{
UINT8 DsmadHandle;
UINT8 Flags;
@@ -447,7 +527,7 @@ typedef struct acpi_cadt_dsmas
/* Flags for subtable above */
-#define ACPI_CEDT_DSMAS_NON_VOLATILE (1 << 2)
+#define ACPI_CDAT_DSMAS_NON_VOLATILE (1 << 2)
/* Subtable 1: Device scoped Latency and Bandwidth Information Structure (DSLBIS) */
@@ -1031,7 +1111,10 @@ typedef struct acpi_dmar_andd
ACPI_DMAR_HEADER Header;
UINT8 Reserved[3];
UINT8 DeviceNumber;
- char DeviceName[1];
+ union {
+ char __pad;
+ ACPI_FLEX_ARRAY(char, DeviceName);
+ };
} ACPI_DMAR_ANDD;
@@ -1084,7 +1167,7 @@ typedef struct acpi_table_drtm
typedef struct acpi_drtm_vtable_list
{
UINT32 ValidatedTableCount;
- UINT64 ValidatedTables[1];
+ UINT64 ValidatedTables[];
} ACPI_DRTM_VTABLE_LIST;
@@ -1103,7 +1186,7 @@ typedef struct acpi_drtm_resource
typedef struct acpi_drtm_resource_list
{
UINT32 ResourceCount;
- ACPI_DRTM_RESOURCE Resources[1];
+ ACPI_DRTM_RESOURCE Resources[];
} ACPI_DRTM_RESOURCE_LIST;
@@ -1131,7 +1214,7 @@ typedef struct acpi_table_ecdt
ACPI_GENERIC_ADDRESS Data; /* Address of EC data register */
UINT32 Uid; /* Unique ID - must be same as the EC _UID method */
UINT8 Gpe; /* The GPE for the EC */
- UINT8 Id[1]; /* Full namepath of the EC in the ACPI namespace */
+ UINT8 Id[]; /* Full namepath of the EC in the ACPI namespace */
} ACPI_TABLE_ECDT;
Index: src/sys/external/bsd/acpica/dist/include/actypes.h
diff -u src/sys/external/bsd/acpica/dist/include/actypes.h:1.28 src/sys/external/bsd/acpica/dist/include/actypes.h:1.29
--- src/sys/external/bsd/acpica/dist/include/actypes.h:1.28 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/include/actypes.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -770,8 +770,7 @@ typedef UINT32
#define ACPI_EVENT_POWER_BUTTON 2
#define ACPI_EVENT_SLEEP_BUTTON 3
#define ACPI_EVENT_RTC 4
-#define ACPI_EVENT_PCIE_WAKE 5
-#define ACPI_EVENT_MAX 5
+#define ACPI_EVENT_MAX 4
#define ACPI_NUM_FIXED_EVENTS ACPI_EVENT_MAX + 1
/*
@@ -1378,7 +1377,7 @@ typedef struct acpi_mem_space_context
} ACPI_MEM_SPACE_CONTEXT;
-typedef struct acpi_data_table_space_context
+typedef struct acpi_data_table_mapping
{
void *Pointer;
@@ -1470,4 +1469,8 @@ typedef enum
#define ACPI_FALLTHROUGH do {} while(0)
#endif
+#ifndef ACPI_FLEX_ARRAY
+#define ACPI_FLEX_ARRAY(TYPE, NAME) TYPE NAME[0]
+#endif
+
#endif /* __ACTYPES_H__ */
Index: src/sys/external/bsd/acpica/dist/include/amlresrc.h
diff -u src/sys/external/bsd/acpica/dist/include/amlresrc.h:1.5 src/sys/external/bsd/acpica/dist/include/amlresrc.h:1.6
--- src/sys/external/bsd/acpica/dist/include/amlresrc.h:1.5 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/amlresrc.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -105,6 +105,8 @@
#define ACPI_RESTAG_TYPE "_TTP" /* Translation(1), Static (0) */
#define ACPI_RESTAG_XFERTYPE "_SIZ" /* 8(0), 8And16(1), 16(2) */
#define ACPI_RESTAG_VENDORDATA "_VEN"
+#define ACPI_RESTAG_FQN "_FQN"
+#define ACPI_RESTAG_FQD "_FQD"
/* Default sizes for "small" resource descriptors */
@@ -393,7 +395,10 @@ typedef struct aml_resource_extended_irq
AML_RESOURCE_LARGE_HEADER_COMMON
UINT8 Flags;
UINT8 InterruptCount;
- UINT32 Interrupts[1];
+ union {
+ UINT32 Interrupt;
+ ACPI_FLEX_ARRAY(UINT32, Interrupts);
+ };
/* ResSourceIndex, ResSource optional fields follow */
} AML_RESOURCE_EXTENDED_IRQ;
@@ -595,6 +600,23 @@ typedef struct aml_resource_pin_config
} AML_RESOURCE_PIN_CONFIG;
+#define AML_RESOURCE_CLOCK_INPUT_REVISION 1 /* ACPI 6.5 */
+
+typedef struct aml_resource_clock_input
+{
+ AML_RESOURCE_LARGE_HEADER_COMMON
+ UINT8 RevisionId;
+ UINT16 Flags;
+ UINT16 FrequencyDivisor;
+ UINT32 FrequencyNumerator;
+ /*
+ * Optional fields follow immediately:
+ * 1) Resource Source index
+ * 2) Resource Source String
+ */
+} AML_RESOURCE_CLOCK_INPUT;
+
+
#define AML_RESOURCE_PIN_CONFIG_REVISION 1 /* ACPI 6.2 */
typedef struct aml_resource_pin_group
@@ -707,6 +729,7 @@ typedef union aml_resource
AML_RESOURCE_PIN_GROUP PinGroup;
AML_RESOURCE_PIN_GROUP_FUNCTION PinGroupFunction;
AML_RESOURCE_PIN_GROUP_CONFIG PinGroupConfig;
+ AML_RESOURCE_CLOCK_INPUT ClockInput;
/* Utility overlays */
Index: src/sys/external/bsd/acpica/dist/include/platform/acgcc.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acgcc.h:1.10 src/sys/external/bsd/acpica/dist/include/platform/acgcc.h:1.11
--- src/sys/external/bsd/acpica/dist/include/platform/acgcc.h:1.10 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/platform/acgcc.h Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -107,4 +107,15 @@ typedef __builtin_va_list va_list;
#define ACPI_FALLTHROUGH __attribute__((__fallthrough__))
#endif
+/*
+ * Flexible array members are not allowed to be part of a union under
+ * C99, but this is not for any technical reason. Work around the
+ * limitation.
+ */
+#define ACPI_FLEX_ARRAY(TYPE, NAME) \
+ struct { \
+ struct { } __Empty_ ## NAME; \
+ TYPE NAME[]; \
+ }
+
#endif /* __ACGCC_H__ */
Index: src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h
diff -u src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.25 src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.26
--- src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h:1.25 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/include/platform/acnetbsd.h Fri Sep 1 14:37:31 2023
@@ -1,12 +1,12 @@
/******************************************************************************
*
* Name: acnetbsd.h - OS specific defines, etc.
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.22 src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.23
--- src/sys/external/bsd/acpica/dist/namespace/nsaccess.c:1.22 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nsaccess.c Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsdump.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsdump.c:1.20 src/sys/external/bsd/acpica/dist/namespace/nsdump.c:1.21
--- src/sys/external/bsd/acpica/dist/namespace/nsdump.c:1.20 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nsdump.c Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsinit.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.20 src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.21
--- src/sys/external/bsd/acpica/dist/namespace/nsinit.c:1.20 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nsinit.c Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nseval.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nseval.c:1.18 src/sys/external/bsd/acpica/dist/namespace/nseval.c:1.19
--- src/sys/external/bsd/acpica/dist/namespace/nseval.c:1.18 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nseval.c Fri Sep 1 14:37:31 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c:1.19 src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c:1.20
--- src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c:1.19 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c Fri Sep 1 14:37:31 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -457,13 +457,6 @@ AcpiNsRepair_CID (
(*ElementPtr)->Common.ReferenceCount =
OriginalRefCount;
-
- /*
- * The OriginalElement holds a reference from the package object
- * that represents _HID. Since a new element was created by _HID,
- * remove the reference from the _CID package.
- */
- AcpiUtRemoveReference (OriginalElement);
}
ElementPtr++;
@@ -594,7 +587,7 @@ AcpiNsRepair_HID (
char *Dest;
- ACPI_FUNCTION_NAME (NsRepair_HID);
+ ACPI_FUNCTION_TRACE (NsRepair_HID);
/* We only care about string _HID objects (not integers) */
Index: src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.17 src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.18
--- src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.17 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c Fri Sep 1 14:37:31 2023
@@ -6,7 +6,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsxfname.c:1.15 src/sys/external/bsd/acpica/dist/namespace/nsxfname.c:1.16
--- src/sys/external/bsd/acpica/dist/namespace/nsxfname.c:1.15 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/namespace/nsxfname.c Fri Sep 1 14:37:31 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -84,7 +84,7 @@ AcpiNsCopyDeviceId (
ACPI_STATUS
AcpiGetHandle (
ACPI_HANDLE Parent,
- ACPI_CONST_STRING Pathname,
+ const char *Pathname,
ACPI_HANDLE *RetHandle)
{
ACPI_STATUS Status;
Index: src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c
diff -u src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.15 src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.16
--- src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c:1.15 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/parser/psopcode.c
diff -u src/sys/external/bsd/acpica/dist/parser/psopcode.c:1.15 src/sys/external/bsd/acpica/dist/parser/psopcode.c:1.16
--- src/sys/external/bsd/acpica/dist/parser/psopcode.c:1.15 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/parser/psopcode.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -328,7 +328,7 @@ const ACPI_OPCODE_INFO AcpiGbl_AmlOpI
/* ACPI 3.0 opcodes */
-/* 7E */ ACPI_OP ("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, AML_FLAGS_EXEC_0A_0T_1R),
+/* 7E */ ACPI_OP ("Timer", ARGP_TIMER_OP, ARGI_TIMER_OP, ACPI_TYPE_ANY, AML_CLASS_EXECUTE, AML_TYPE_EXEC_0A_0T_1R, AML_FLAGS_EXEC_0A_0T_1R | AML_NO_OPERAND_RESOLVE),
/* ACPI 5.0 opcodes */
Index: src/sys/external/bsd/acpica/dist/parser/psopinfo.c
diff -u src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.15 src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.16
--- src/sys/external/bsd/acpica/dist/parser/psopinfo.c:1.15 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/parser/psopinfo.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsdump.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.16 src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.17
--- src/sys/external/bsd/acpica/dist/resources/rsdump.c:1.16 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/resources/rsdump.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsxface.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.16 src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.17
--- src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.16 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/resources/rsxface.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.14 src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.15
--- src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c:1.14 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/resources/rsdumpinfo.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -266,6 +266,17 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinFun
{ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (PinFunction.VendorData), "VendorData", NULL},
};
+ACPI_RSDUMP_INFO AcpiRsDumpClockInput[7] =
+{
+ {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpClockInput), "ClockInput", NULL},
+ {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (ClockInput.RevisionId), "RevisionId", NULL},
+ {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (ClockInput.FrequencyNumerator), "FrequencyNumerator", NULL},
+ {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (ClockInput.FrequencyDivisor), "FrequencyDivisor", NULL},
+ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ClockInput.Scale), "Scale", AcpiGbl_ClockInputScale},
+ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ClockInput.Mode), "Mode", AcpiGbl_ClockInputMode},
+ {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (ClockInput.ResourceSource), "ResourceSource", NULL},
+};
+
ACPI_RSDUMP_INFO AcpiRsDumpPinConfig[11] =
{
{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinConfig), "PinConfig", NULL},
Index: src/sys/external/bsd/acpica/dist/resources/rsutils.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsutils.c:1.15 src/sys/external/bsd/acpica/dist/resources/rsutils.c:1.16
--- src/sys/external/bsd/acpica/dist/resources/rsutils.c:1.15 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/resources/rsutils.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbdata.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbdata.c:1.19 src/sys/external/bsd/acpica/dist/tables/tbdata.c:1.20
--- src/sys/external/bsd/acpica/dist/tables/tbdata.c:1.19 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbdata.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbfadt.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbfadt.c:1.19 src/sys/external/bsd/acpica/dist/tables/tbfadt.c:1.20
--- src/sys/external/bsd/acpica/dist/tables/tbfadt.c:1.19 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbfadt.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbinstal.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.18 src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.19
--- src/sys/external/bsd/acpica/dist/tables/tbinstal.c:1.18 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbinstal.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbxface.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.18 src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.19
--- src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.18 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbxface.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbutils.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.21 src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.22
--- src/sys/external/bsd/acpica/dist/tables/tbutils.c:1.21 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbutils.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -215,6 +215,7 @@ AcpiTbGetRootTableEntry (
UINT8 *TableEntry,
UINT32 TableEntrySize)
{
+ UINT32 Address32;
UINT64 Address64;
@@ -228,8 +229,8 @@ AcpiTbGetRootTableEntry (
* 32-bit platform, RSDT: Return 32-bit table entry
* 64-bit platform, RSDT: Expand 32-bit to 64-bit and return
*/
- return ((ACPI_PHYSICAL_ADDRESS) (*ACPI_CAST_PTR (
- UINT32, TableEntry)));
+ ACPI_MOVE_32_TO_32(&Address32, TableEntry);
+ return Address32;
}
else
{
Index: src/sys/external/bsd/acpica/dist/tables/tbxfload.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.16 src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.17
--- src/sys/external/bsd/acpica/dist/tables/tbxfload.c:1.16 Sat Aug 27 10:04:58 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbxfload.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tables/tbxfroot.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxfroot.c:1.15 src/sys/external/bsd/acpica/dist/tables/tbxfroot.c:1.16
--- src/sys/external/bsd/acpica/dist/tables/tbxfroot.c:1.15 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/tables/tbxfroot.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
diff -u src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c:1.15 src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c:1.16
--- src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c:1.15 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c Fri Sep 1 14:37:32 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
diff -u src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c:1.16 src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c:1.17
--- src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c:1.16 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c Fri Sep 1 14:37:33 2023
@@ -6,7 +6,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utcache.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utcache.c:1.17 src/sys/external/bsd/acpica/dist/utilities/utcache.c:1.18
--- src/sys/external/bsd/acpica/dist/utilities/utcache.c:1.17 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utcache.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utmisc.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.17 src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.18
--- src/sys/external/bsd/acpica/dist/utilities/utmisc.c:1.17 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utmisc.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utdebug.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.20 src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.21
--- src/sys/external/bsd/acpica/dist/utilities/utdebug.c:1.20 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utdebug.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -77,7 +77,12 @@ AcpiUtInitStackPtrTrace (
ACPI_SIZE CurrentSp;
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && __GNUC__ >= 12
+#pragma GCC diagnostic ignored "-Wdangling-pointer="
+#endif
AcpiGbl_EntryStackPointer = &CurrentSp;
+#pragma GCC diagnostic pop
}
Index: src/sys/external/bsd/acpica/dist/utilities/utdecode.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.19 src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.20
--- src/sys/external/bsd/acpica/dist/utilities/utdecode.c:1.19 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utdecode.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utdelete.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.9 src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.10
--- src/sys/external/bsd/acpica/dist/utilities/utdelete.c:1.9 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utdelete.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utobject.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utobject.c:1.9 src/sys/external/bsd/acpica/dist/utilities/utobject.c:1.10
--- src/sys/external/bsd/acpica/dist/utilities/utobject.c:1.9 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utobject.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/uteval.c
diff -u src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.14 src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.15
--- src/sys/external/bsd/acpica/dist/utilities/uteval.c:1.14 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/uteval.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utglobal.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utglobal.c:1.16 src/sys/external/bsd/acpica/dist/utilities/utglobal.c:1.17
--- src/sys/external/bsd/acpica/dist/utilities/utglobal.c:1.16 Sat Dec 10 12:40:50 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utglobal.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -179,7 +179,6 @@ ACPI_FIXED_EVENT_INFO AcpiGbl_Fixe
/* ACPI_EVENT_POWER_BUTTON */ {ACPI_BITREG_POWER_BUTTON_STATUS, ACPI_BITREG_POWER_BUTTON_ENABLE, ACPI_BITMASK_POWER_BUTTON_STATUS, ACPI_BITMASK_POWER_BUTTON_ENABLE},
/* ACPI_EVENT_SLEEP_BUTTON */ {ACPI_BITREG_SLEEP_BUTTON_STATUS, ACPI_BITREG_SLEEP_BUTTON_ENABLE, ACPI_BITMASK_SLEEP_BUTTON_STATUS, ACPI_BITMASK_SLEEP_BUTTON_ENABLE},
/* ACPI_EVENT_RTC */ {ACPI_BITREG_RT_CLOCK_STATUS, ACPI_BITREG_RT_CLOCK_ENABLE, ACPI_BITMASK_RT_CLOCK_STATUS, ACPI_BITMASK_RT_CLOCK_ENABLE},
- /* ACPI_EVENT_PCIE_WAKE */ {ACPI_BITREG_PCIEXP_WAKE_STATUS, ACPI_BITREG_PCIEXP_WAKE_DISABLE, ACPI_BITMASK_PCIEXP_WAKE_STATUS, ACPI_BITMASK_PCIEXP_WAKE_DISABLE},
};
#endif /* !ACPI_REDUCED_HARDWARE */
Index: src/sys/external/bsd/acpica/dist/utilities/utmutex.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utmutex.c:1.13 src/sys/external/bsd/acpica/dist/utilities/utmutex.c:1.14
--- src/sys/external/bsd/acpica/dist/utilities/utmutex.c:1.13 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utmutex.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utnonansi.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utnonansi.c:1.6 src/sys/external/bsd/acpica/dist/utilities/utnonansi.c:1.7
--- src/sys/external/bsd/acpica/dist/utilities/utnonansi.c:1.6 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utnonansi.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utosi.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utosi.c:1.18 src/sys/external/bsd/acpica/dist/utilities/utosi.c:1.19
--- src/sys/external/bsd/acpica/dist/utilities/utosi.c:1.18 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utosi.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utprint.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.12 src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.13
--- src/sys/external/bsd/acpica/dist/utilities/utprint.c:1.12 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utprint.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/uttrack.c
diff -u src/sys/external/bsd/acpica/dist/utilities/uttrack.c:1.21 src/sys/external/bsd/acpica/dist/utilities/uttrack.c:1.22
--- src/sys/external/bsd/acpica/dist/utilities/uttrack.c:1.21 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/uttrack.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utuuid.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utuuid.c:1.11 src/sys/external/bsd/acpica/dist/utilities/utuuid.c:1.12
--- src/sys/external/bsd/acpica/dist/utilities/utuuid.c:1.11 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utuuid.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Index: src/sys/external/bsd/acpica/dist/utilities/utxferror.c
diff -u src/sys/external/bsd/acpica/dist/utilities/utxferror.c:1.3 src/sys/external/bsd/acpica/dist/utilities/utxferror.c:1.4
--- src/sys/external/bsd/acpica/dist/utilities/utxferror.c:1.3 Sat Aug 27 10:04:59 2022
+++ src/sys/external/bsd/acpica/dist/utilities/utxferror.c Fri Sep 1 14:37:33 2023
@@ -5,7 +5,7 @@
******************************************************************************/
/*
- * Copyright (C) 2000 - 2022, Intel Corp.
+ * Copyright (C) 2000 - 2023, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
