Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica merge conflicts
details: https://anonhg.NetBSD.org/src/rev/b3776ba5924f
branches: trunk
changeset: 803403:b3776ba5924f
user: christos <christos%NetBSD.org@localhost>
date: Sat Oct 25 21:00:06 2014 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/acpica2netbsd | 47 +
sys/external/bsd/acpica/conf/files.acpica | 10 +-
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 253 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 51 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 867 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 18 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.y | 3589 ----------
sys/external/bsd/acpica/dist/compiler/aslerror.c | 230 +-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 53 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 11 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 33 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 3 +-
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 12 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 73 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 20 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 28 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 109 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 7 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 212 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 17 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 38 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 8 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 249 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 187 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/prutils.c | 13 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 51 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 7 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 3 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 29 +-
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 210 +-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 3 +-
sys/external/bsd/acpica/dist/debugger/dbtest.c | 4 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 3 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 12 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c | 43 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c | 4 +
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 2 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 3 +-
sys/external/bsd/acpica/dist/events/evxface.c | 68 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 85 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 13 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 227 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 2 +-
sys/external/bsd/acpica/dist/include/acapps.h | 25 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 12 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 63 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 2 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 434 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 14 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 36 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 16 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 2 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 51 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 563 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 2 +-
sys/external/bsd/acpica/dist/include/actables.h | 99 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 101 +-
sys/external/bsd/acpica/dist/include/actypes.h | 76 +-
sys/external/bsd/acpica/dist/include/acutils.h | 105 +-
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 4 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsdump.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nseval.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 8 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 40 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 3 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 2 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 206 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 3 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 3 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 5 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 5 +-
sys/external/bsd/acpica/dist/resources/rsutils.c | 3 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 3 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 56 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 938 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 296 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 8 +-
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 39 +-
sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c | 135 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 32 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 112 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 190 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 3 +-
sys/external/bsd/acpica/dist/utilities/utmutex.c | 3 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 31 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 5 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 2 +-
97 files changed, 3996 insertions(+), 6671 deletions(-)
diffs (truncated from 15604 to 300 lines):
diff -r 5040f30d8ae7 -r b3776ba5924f sys/external/bsd/acpica/acpica2netbsd
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/acpica/acpica2netbsd Sat Oct 25 21:00:06 2014 +0000
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# $NetBSD: acpica2netbsd,v 1.1 2014/10/25 21:00:06 christos Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+# Execute this at the top of the acpica distribution
+# then import it.
+#
+# cvs import src/sys/external/bsd/acpica/dist intel acpica-YYYYMMDD
+
+if [ -z "$1" ]
+then
+ echo "Usage: $0 <dir>" 1>&2
+ exit 1
+fi
+cd $1
+echo -n "Shuffling things around"
+
+rmdir libraries
+mv source/* .
+mv components/* .
+rmdir source components
+echo; echo
diff -r 5040f30d8ae7 -r b3776ba5924f sys/external/bsd/acpica/conf/files.acpica
--- a/sys/external/bsd/acpica/conf/files.acpica Sat Oct 25 20:57:55 2014 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica Sat Oct 25 21:00:06 2014 +0000
@@ -1,8 +1,12 @@
-# $NetBSD: files.acpica,v 1.6 2013/12/27 20:55:03 christos Exp $
+# $NetBSD: files.acpica,v 1.7 2014/10/25 21:00:06 christos Exp $
define acpica
makeoptions acpi CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
+# common/
+file external/bsd/acpica/dist/common/ahids.c acpica
+file external/bsd/acpica/dist/common/ahuuids.c acpica
+
# debugger/
file external/bsd/acpica/dist/debugger/dbcmds.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbconvert.c acpica & acpi_debug & ddb
@@ -14,6 +18,7 @@
file external/bsd/acpica/dist/debugger/dbmethod.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbnames.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbstats.c acpica & acpi_debug & ddb
+file external/bsd/acpica/dist/debugger/dbtest.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbutils.c acpica & acpi_debug & ddb
file external/bsd/acpica/dist/debugger/dbxface.c acpica & acpi_debug & ddb
@@ -155,6 +160,7 @@
file external/bsd/acpica/dist/resources/rsxface.c acpica
# tables/
+file external/bsd/acpica/dist/tables/tbdata.c acpica
file external/bsd/acpica/dist/tables/tbfadt.c acpica
file external/bsd/acpica/dist/tables/tbfind.c acpica
file external/bsd/acpica/dist/tables/tbinstal.c acpica
@@ -177,6 +183,7 @@
file external/bsd/acpica/dist/utilities/uteval.c acpica
file external/bsd/acpica/dist/utilities/utexcep.c acpica
file external/bsd/acpica/dist/utilities/utglobal.c acpica
+file external/bsd/acpica/dist/utilities/uthex.c acpica
file external/bsd/acpica/dist/utilities/utids.c acpica
file external/bsd/acpica/dist/utilities/utinit.c acpica
file external/bsd/acpica/dist/utilities/utlock.c acpica
@@ -191,6 +198,7 @@
file external/bsd/acpica/dist/utilities/utstate.c acpica
file external/bsd/acpica/dist/utilities/utstring.c acpica
file external/bsd/acpica/dist/utilities/uttrack.c acpica
+file external/bsd/acpica/dist/utilities/utuuid.c acpica
file external/bsd/acpica/dist/utilities/utxface.c acpica
file external/bsd/acpica/dist/utilities/utxfinit.c acpica
file external/bsd/acpica/dist/utilities/utxferror.c acpica
diff -r 5040f30d8ae7 -r b3776ba5924f sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c Sat Oct 25 20:57:55 2014 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c Sat Oct 25 21:00:06 2014 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2013, Intel Corp.
+ * Copyright (C) 2000 - 2014, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -137,11 +137,16 @@
#define ACPI_DMAR1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_RESERVED_MEMORY,f)
#define ACPI_DMAR2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ATSR,f)
#define ACPI_DMAR3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_RHSA,f)
+#define ACPI_DMAR4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_DMAR_ANDD,f)
#define ACPI_EINJ0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
#define ACPI_ERST0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WHEA_HEADER,f)
#define ACPI_FPDTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_FPDT_HEADER,f)
#define ACPI_FPDT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_FPDT_BOOT,f)
#define ACPI_FPDT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_FPDT_S3PT_PTR,f)
+#define ACPI_GTDT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_TIMER_BLOCK,f)
+#define ACPI_GTDT0a_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_TIMER_ENTRY,f)
+#define ACPI_GTDT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_WATCHDOG,f)
+#define ACPI_GTDTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_HEADER,f)
#define ACPI_HEST0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_MACHINE_CHECK,f)
#define ACPI_HEST1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_CORRECTED,f)
#define ACPI_HEST2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_NMI,f)
@@ -158,6 +163,9 @@
#define ACPI_IVRS8A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IVRS_DEVICE8A,f)
#define ACPI_IVRS8B_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IVRS_DEVICE8B,f)
#define ACPI_IVRS8C_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_IVRS_DEVICE8C,f)
+#define ACPI_LPITH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_LPIT_HEADER,f)
+#define ACPI_LPIT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_LPIT_NATIVE,f)
+#define ACPI_LPIT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_LPIT_IO,f)
#define ACPI_MADT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_LOCAL_APIC,f)
#define ACPI_MADT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_IO_APIC,f)
#define ACPI_MADT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_INTERRUPT_OVERRIDE,f)
@@ -171,6 +179,8 @@
#define ACPI_MADT10_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_LOCAL_X2APIC_NMI,f)
#define ACPI_MADT11_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_INTERRUPT,f)
#define ACPI_MADT12_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_DISTRIBUTOR,f)
+#define ACPI_MADT13_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_MSI_FRAME,f)
+#define ACPI_MADT14_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MADT_GENERIC_REDISTRIBUTOR,f)
#define ACPI_MADTH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SUBTABLE_HEADER,f)
#define ACPI_MCFG0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MCFG_ALLOCATION,f)
#define ACPI_MPST0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MPST_POWER_NODE,f)
@@ -181,6 +191,7 @@
#define ACPI_MSCT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MSCT_PROXIMITY,f)
#define ACPI_MTMR0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_MTMR_ENTRY,f)
#define ACPI_PCCT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PCCT_SUBSPACE,f)
+#define ACPI_PCCT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PCCT_HW_REDUCED,f)
#define ACPI_PMTT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PMTT_SOCKET,f)
#define ACPI_PMTT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PMTT_CONTROLLER,f)
#define ACPI_PMTT1A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_PMTT_DOMAIN,f)
@@ -196,6 +207,7 @@
#define ACPI_SRAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_CPU_AFFINITY,f)
#define ACPI_SRAT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_MEM_AFFINITY,f)
#define ACPI_SRAT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f)
+#define ACPI_SRAT3_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_GICC_AFFINITY,f)
#define ACPI_VRTC0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_VRTC_ENTRY,f)
#define ACPI_WDAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_WDAT_ENTRY,f)
@@ -212,7 +224,11 @@
#define ACPI_SRAT0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_CPU_AFFINITY,f,o)
#define ACPI_SRAT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_MEM_AFFINITY,f,o)
#define ACPI_SRAT2_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_X2APIC_CPU_AFFINITY,f,o)
+#define ACPI_SRAT3_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_GICC_AFFINITY,f,o)
#define ACPI_GTDT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_GTDT,f,o)
+#define ACPI_GTDT0a_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_GTDT_TIMER_ENTRY,f,o)
+#define ACPI_GTDT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_GTDT_WATCHDOG,f,o)
+#define ACPI_LPITH_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_LPIT_HEADER,f,o)
#define ACPI_MADT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_MADT,f,o)
#define ACPI_MADT0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MADT_LOCAL_APIC,f,o)
#define ACPI_MADT2_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MADT_INTERRUPT_OVERRIDE,f,o)
@@ -223,9 +239,11 @@
#define ACPI_MADT9_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MADT_LOCAL_X2APIC,f,o)
#define ACPI_MADT10_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MADT_LOCAL_X2APIC_NMI,f,o)
#define ACPI_MADT11_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MADT_GENERIC_INTERRUPT,f,o)
+#define ACPI_MADT13_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MADT_GENERIC_MSI_FRAME,f,o)
#define ACPI_MPST0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MPST_POWER_NODE,f,o)
#define ACPI_MPST2_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_MPST_POWER_DATA,f,o)
#define ACPI_PCCT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_PCCT,f,o)
+#define ACPI_PCCT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_PCCT_HW_REDUCED,f,o)
#define ACPI_PMTTH_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_PMTT_HEADER,f,o)
#define ACPI_WDDT_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_TABLE_WDDT,f,o)
#define ACPI_EINJ0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_WHEA_HEADER,f,o)
@@ -436,17 +454,22 @@
{
{ACPI_DMT_GAS, ACPI_FADT_OFFSET (ResetRegister), "Reset Register", 0},
{ACPI_DMT_UINT8, ACPI_FADT_OFFSET (ResetValue), "Value to cause reset", 0},
- {ACPI_DMT_UINT24, ACPI_FADT_OFFSET (Reserved4[0]), "Reserved", 0},
+ {ACPI_DMT_UINT16, ACPI_FADT_OFFSET (ArmBootFlags), "Reserved", 0},
+ {ACPI_DMT_UINT8, ACPI_FADT_OFFSET (MinorRevision), "Reserved", 0},
ACPI_DMT_TERMINATOR
};
-/* ACPI 2.0+ Extensions (FADT version 3 and 4) */
+/* ACPI 2.0+ Extensions (FADT version 3, 4, and 5) */
ACPI_DMTABLE_INFO AcpiDmTableInfoFadt3[] =
{
{ACPI_DMT_GAS, ACPI_FADT_OFFSET (ResetRegister), "Reset Register", 0},
{ACPI_DMT_UINT8, ACPI_FADT_OFFSET (ResetValue), "Value to cause reset", 0},
- {ACPI_DMT_UINT24, ACPI_FADT_OFFSET (Reserved4[0]), "Reserved", 0},
+ {ACPI_DMT_UINT16, ACPI_FADT_OFFSET (ArmBootFlags), "ARM Flags (decoded below)", DT_FLAG},
+ {ACPI_DMT_FLAG0, ACPI_FADT_FLAG_OFFSET(ArmBootFlags,0), "PSCI Compliant", 0},
+ {ACPI_DMT_FLAG1, ACPI_FADT_FLAG_OFFSET(ArmBootFlags,0), "Must use HVC for PSCI", 0},
+ ACPI_DMT_NEW_LINE,
+ {ACPI_DMT_UINT8, ACPI_FADT_OFFSET (MinorRevision), "FADT Minor Revision", 0},
{ACPI_DMT_UINT64, ACPI_FADT_OFFSET (XFacs), "FACS Address", 0},
{ACPI_DMT_UINT64, ACPI_FADT_OFFSET (XDsdt), "DSDT Address", 0},
{ACPI_DMT_GAS, ACPI_FADT_OFFSET (XPm1aEventBlock), "PM1A Event Block", 0},
@@ -803,7 +826,7 @@
ACPI_DMTABLE_INFO AcpiDmTableInfoDmarScope[] =
{
- {ACPI_DMT_UINT8, ACPI_DMARS_OFFSET (EntryType), "Device Scope Entry Type", 0},
+ {ACPI_DMT_DMAR_SCOPE, ACPI_DMARS_OFFSET (EntryType), "Device Scope Type", 0},
{ACPI_DMT_UINT8, ACPI_DMARS_OFFSET (Length), "Entry Length", DT_LENGTH},
{ACPI_DMT_UINT16, ACPI_DMARS_OFFSET (Reserved), "Reserved", 0},
{ACPI_DMT_UINT8, ACPI_DMARS_OFFSET (EnumerationId), "Enumeration ID", 0},
@@ -855,6 +878,16 @@
ACPI_DMT_TERMINATOR
};
+/* 4: ACPI Namespace Device Declaration Structure */
+
+ACPI_DMTABLE_INFO AcpiDmTableInfoDmar4[] =
+{
+ {ACPI_DMT_UINT24, ACPI_DMAR4_OFFSET (Reserved[0]), "Reserved", 0},
+ {ACPI_DMT_UINT8, ACPI_DMAR4_OFFSET (DeviceNumber), "Device Number", 0},
+ {ACPI_DMT_STRING, ACPI_DMAR4_OFFSET (DeviceName[0]), "Device Name", 0},
+ ACPI_DMT_TERMINATOR
+};
+
/*******************************************************************************
*
@@ -994,29 +1027,89 @@
ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt[] =
{
- {ACPI_DMT_UINT64, ACPI_GTDT_OFFSET (Address), "Timer Address", 0},
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (Flags), "Flags (decoded below)", DT_FLAG},
- {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (Flags,0), "Memory Present", 0},
+ {ACPI_DMT_UINT64, ACPI_GTDT_OFFSET (CounterBlockAddresss), "Counter Block Address", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (Reserved), "Reserved", 0},
ACPI_DMT_NEW_LINE,
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (SecurePl1Interrupt), "Secure PL1 Interrupt", 0},
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (SecurePl1Flags), "SPL1 Flags (decoded below)", DT_FLAG},
- {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (SecurePl1Flags,0), "Trigger Mode", 0},
- {ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (SecurePl1Flags,0), "Polarity", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (SecureEl1Interrupt), "Secure EL1 Interrupt", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (SecureEl1Flags), "EL1 Flags (decoded below)", DT_FLAG},
+ {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (SecureEl1Flags,0), "Trigger Mode", 0},
+ {ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (SecureEl1Flags,0), "Polarity", 0},
+ {ACPI_DMT_FLAG2, ACPI_GTDT_FLAG_OFFSET (SecureEl1Flags,0), "Always On", 0},
ACPI_DMT_NEW_LINE,
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecurePl1Interrupt), "Non-Secure PL1 Interrupt", 0},
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecurePl1Flags), "NSPL1 Flags (decoded below)", DT_FLAG},
- {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (NonSecurePl1Flags,0),"Trigger Mode", 0},
- {ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (NonSecurePl1Flags,0),"Polarity", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecureEl1Interrupt), "Non-Secure EL1 Interrupt", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecureEl1Flags), "NEL1 Flags (decoded below)", DT_FLAG},
+ {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (NonSecureEl1Flags,0),"Trigger Mode", 0},
+ {ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (NonSecureEl1Flags,0),"Polarity", 0},
+ {ACPI_DMT_FLAG2, ACPI_GTDT_FLAG_OFFSET (NonSecureEl1Flags,0),"Always On", 0},
ACPI_DMT_NEW_LINE,
{ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (VirtualTimerInterrupt), "Virtual Timer Interrupt", 0},
{ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (VirtualTimerFlags), "VT Flags (decoded below)", DT_FLAG},
{ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (VirtualTimerFlags,0),"Trigger Mode", 0},
{ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (VirtualTimerFlags,0),"Polarity", 0},
+ {ACPI_DMT_FLAG2, ACPI_GTDT_FLAG_OFFSET (VirtualTimerFlags,0),"Always On", 0},
ACPI_DMT_NEW_LINE,
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecurePl2Interrupt), "Non-Secure PL2 Interrupt", 0},
- {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecurePl2Flags), "NSPL2 Flags (decoded below)", DT_FLAG},
- {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (NonSecurePl2Flags,0),"Trigger Mode", 0},
- {ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (NonSecurePl2Flags,0),"Polarity", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecureEl2Interrupt), "Non-Secure EL2 Interrupt", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (NonSecureEl2Flags), "NEL2 Flags (decoded below)", DT_FLAG},
+ {ACPI_DMT_FLAG0, ACPI_GTDT_FLAG_OFFSET (NonSecureEl2Flags,0),"Trigger Mode", 0},
+ {ACPI_DMT_FLAG1, ACPI_GTDT_FLAG_OFFSET (NonSecureEl2Flags,0),"Polarity", 0},
+ {ACPI_DMT_FLAG2, ACPI_GTDT_FLAG_OFFSET (NonSecureEl2Flags,0),"Always On", 0},
+ {ACPI_DMT_UINT64, ACPI_GTDT_OFFSET (CounterReadBlockAddress), "Counter Read Block Address", 0},
+ ACPI_DMT_NEW_LINE,
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (PlatformTimerCount), "Platform Timer Count", 0},
+ {ACPI_DMT_UINT32, ACPI_GTDT_OFFSET (PlatformTimerOffset), "Platform Timer Offset", 0},
+ ACPI_DMT_TERMINATOR
+};
+
+/* GTDT Subtable header (one per Subtable) */
+
+ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtHdr[] =
+{
+ {ACPI_DMT_GTDT, ACPI_GTDTH_OFFSET (Type), "Subtable Type", 0},
+ {ACPI_DMT_UINT16, ACPI_GTDTH_OFFSET (Length), "Length", DT_LENGTH},
+ ACPI_DMT_TERMINATOR
+};
Home |
Main Index |
Thread Index |
Old Index