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/0c5ac1e1b531
branches: trunk
changeset: 826588:0c5ac1e1b531
user: christos <christos%NetBSD.org@localhost>
date: Fri Sep 15 17:10:30 2017 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/conf/files.acpica | 5 +-
sys/external/bsd/acpica/dist/common/dmtbdump.c | 350 ++
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 340 ++-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 3 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 154 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 11 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 183 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 108 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 12 +-
sys/external/bsd/acpica/dist/compiler/aslopt.c | 4 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 21 +-
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 15 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 1235 +--------
sys/external/bsd/acpica/dist/compiler/aslutils.c | 96 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 19 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 23 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 38 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 17 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 46 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 4 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 33 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 12 +
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 4 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 31 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c | 466 +++
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 25 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 17 +-
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 6 -
sys/external/bsd/acpica/dist/executer/exdebug.c | 4 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 68 +-
sys/external/bsd/acpica/dist/hardware/hwregs.c | 76 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 15 +-
sys/external/bsd/acpica/dist/include/acapps.h | 6 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 107 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 12 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 3 +
sys/external/bsd/acpica/dist/include/acinterp.h | 5 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 33 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 15 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 14 +-
sys/external/bsd/acpica/dist/include/actables.h | 8 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 332 ++-
sys/external/bsd/acpica/dist/include/actypes.h | 75 +-
sys/external/bsd/acpica/dist/include/acutils.h | 79 +-
sys/external/bsd/acpica/dist/include/platform/acgcc.h | 14 +
sys/external/bsd/acpica/dist/include/platform/acnetbsd.h | 4 +-
sys/external/bsd/acpica/dist/namespace/nsaccess.c | 53 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 14 +
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 43 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 93 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 47 +
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 68 +
sys/external/bsd/acpica/dist/resources/rsxface.c | 7 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 261 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 4 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 174 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 44 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 49 +-
sys/external/bsd/acpica/dist/tables/tbxfload.c | 4 +-
sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 5 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 13 +-
sys/external/bsd/acpica/dist/utilities/utobject.c | 4 +
sys/external/bsd/acpica/dist/utilities/utprint.c | 8 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 10 +-
70 files changed, 3356 insertions(+), 1707 deletions(-)
diffs (truncated from 8070 to 300 lines):
diff -r deaf6e08533f -r 0c5ac1e1b531 sys/external/bsd/acpica/conf/files.acpica
--- a/sys/external/bsd/acpica/conf/files.acpica Fri Sep 15 16:50:43 2017 +0000
+++ b/sys/external/bsd/acpica/conf/files.acpica Fri Sep 15 17:10:30 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpica,v 1.15 2016/11/11 21:11:30 christos Exp $
+# $NetBSD: files.acpica,v 1.16 2017/09/15 17:10:30 christos Exp $
define acpica
makeoptions acpi CPPFLAGS+="-I$S/external/bsd/acpica/dist/include"
@@ -47,6 +47,7 @@
file dispatcher/dsmthdat.c acpica
file dispatcher/dsobject.c acpica
file dispatcher/dsopcode.c acpica
+file dispatcher/dspkginit.c acpica
file dispatcher/dsutils.c acpica
file dispatcher/dswexec.c acpica
file dispatcher/dswload.c acpica
@@ -201,9 +202,11 @@
file utilities/utosi.c acpica
file utilities/utownerid.c acpica
file utilities/utpredef.c acpica
+file utilities/utresdecode.c acpica & acpi_debug & ddb
file utilities/utresrc.c acpica
file utilities/utstate.c acpica
file utilities/utstring.c acpica
+file utilities/utstrsuppt.c acpica
file utilities/utstrtoul64.c acpica
file utilities/uttrack.c acpica
file utilities/utuuid.c acpica
diff -r deaf6e08533f -r 0c5ac1e1b531 sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Fri Sep 15 16:50:43 2017 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Fri Sep 15 17:10:30 2017 +0000
@@ -1622,6 +1622,14 @@
SubTableLength = sizeof (ACPI_HEST_GENERIC_V2);
break;
+ case ACPI_HEST_TYPE_IA32_DEFERRED_CHECK:
+
+ InfoTable = AcpiDmTableInfoHest11;
+ SubTableLength = sizeof (ACPI_HEST_IA_DEFERRED_CHECK);
+ BankCount = (ACPI_CAST_PTR (ACPI_HEST_IA_DEFERRED_CHECK,
+ SubTable))->NumHardwareBanks;
+ break;
+
default:
/* Cannot continue on unknown type - no length */
@@ -1676,6 +1684,203 @@
/*******************************************************************************
*
+ * FUNCTION: AcpiDmDumpHmat
+ *
+ * PARAMETERS: Table - A HMAT table
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Format the contents of a HMAT.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpHmat (
+ ACPI_TABLE_HEADER *Table)
+{
+ ACPI_STATUS Status;
+ ACPI_HMAT_STRUCTURE *HmatStruct;
+ ACPI_HMAT_LOCALITY *HmatLocality;
+ ACPI_HMAT_CACHE *HmatCache;
+ UINT32 Offset;
+ UINT32 SubTableOffset;
+ UINT32 Length;
+ ACPI_DMTABLE_INFO *InfoTable;
+ UINT32 i, j;
+
+
+ /* Main table */
+
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoHmat);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+ Offset = sizeof (ACPI_TABLE_HMAT);
+
+ while (Offset < Table->Length)
+ {
+ AcpiOsPrintf ("\n");
+ SubTableOffset = 0;
+
+ /* Dump HMAT structure header */
+
+ HmatStruct = ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, Table, Offset);
+ if (HmatStruct->Length < sizeof (ACPI_HMAT_STRUCTURE))
+ {
+ AcpiOsPrintf ("Invalid HMAT structure length\n");
+ return;
+ }
+ Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
+ HmatStruct->Length, AcpiDmTableInfoHmatHdr);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ switch (HmatStruct->Type)
+ {
+ case ACPI_HMAT_TYPE_ADDRESS_RANGE:
+
+ InfoTable = AcpiDmTableInfoHmat0;
+ Length = sizeof (ACPI_HMAT_ADDRESS_RANGE);
+ break;
+
+ case ACPI_HMAT_TYPE_LOCALITY:
+
+ InfoTable = AcpiDmTableInfoHmat1;
+ Length = sizeof (ACPI_HMAT_LOCALITY);
+ break;
+
+ case ACPI_HMAT_TYPE_CACHE:
+
+ InfoTable = AcpiDmTableInfoHmat2;
+ Length = sizeof (ACPI_HMAT_CACHE);
+ break;
+
+ default:
+
+ AcpiOsPrintf ("\n**** Unknown HMAT structure type 0x%X\n",
+ HmatStruct->Type);
+
+ /* Attempt to continue */
+
+ goto NextSubTable;
+ }
+
+ /* Dump HMAT structure body */
+
+ if (HmatStruct->Length < Length)
+ {
+ AcpiOsPrintf ("Invalid HMAT structure length\n");
+ return;
+ }
+ Status = AcpiDmDumpTable (Table->Length, Offset, HmatStruct,
+ HmatStruct->Length, InfoTable);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+
+ /* Dump HMAT structure additionals */
+
+ switch (HmatStruct->Type)
+ {
+ case ACPI_HMAT_TYPE_LOCALITY:
+
+ HmatLocality = ACPI_CAST_PTR (ACPI_HMAT_LOCALITY, HmatStruct);
+ SubTableOffset = sizeof (ACPI_HMAT_LOCALITY);
+
+ /* Dump initiator proximity domains */
+
+ if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ (UINT32)(HmatLocality->NumberOfInitiatorPDs * 4))
+ {
+ AcpiOsPrintf ("Invalid initiator proximity domain number\n");
+ return;
+ }
+ for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
+ {
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ 4, AcpiDmTableInfoHmat1a);
+ SubTableOffset += 4;
+ }
+
+ /* Dump target proximity domains */
+
+ if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ (UINT32)(HmatLocality->NumberOfTargetPDs * 4))
+ {
+ AcpiOsPrintf ("Invalid target proximity domain number\n");
+ return;
+ }
+ for (i = 0; i < HmatLocality->NumberOfTargetPDs; i++)
+ {
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ 4, AcpiDmTableInfoHmat1b);
+ SubTableOffset += 4;
+ }
+
+ /* Dump latency/bandwidth entris */
+
+ if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ (UINT32)(HmatLocality->NumberOfInitiatorPDs *
+ HmatLocality->NumberOfTargetPDs * 2))
+ {
+ AcpiOsPrintf ("Invalid latency/bandwidth entry number\n");
+ return;
+ }
+ for (i = 0; i < HmatLocality->NumberOfInitiatorPDs; i++)
+ {
+ for (j = 0; j < HmatLocality->NumberOfTargetPDs; j++)
+ {
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ 2, AcpiDmTableInfoHmat1c);
+ SubTableOffset += 2;
+ }
+ }
+ break;
+
+ case ACPI_HMAT_TYPE_CACHE:
+
+ HmatCache = ACPI_CAST_PTR (ACPI_HMAT_CACHE, HmatStruct);
+ SubTableOffset = sizeof (ACPI_HMAT_CACHE);
+
+ /* Dump SMBIOS handles */
+
+ if ((UINT32)(HmatStruct->Length - SubTableOffset) <
+ (UINT32)(HmatCache->NumberOfSMBIOSHandles * 2))
+ {
+ AcpiOsPrintf ("Invalid SMBIOS handle number\n");
+ return;
+ }
+ for (i = 0; i < HmatCache->NumberOfSMBIOSHandles; i++)
+ {
+ Status = AcpiDmDumpTable (Table->Length, Offset + SubTableOffset,
+ ACPI_ADD_PTR (ACPI_HMAT_STRUCTURE, HmatStruct, SubTableOffset),
+ 2, AcpiDmTableInfoHmat2a);
+ SubTableOffset += 2;
+ }
+ break;
+
+ default:
+
+ break;
+ }
+
+NextSubTable:
+ /* Point to next HMAT structure subtable */
+
+ Offset += (HmatStruct->Length);
+ }
+}
+
+
+/*******************************************************************************
+ *
* FUNCTION: AcpiDmDumpIort
*
* PARAMETERS: Table - A IORT table
@@ -2902,6 +3107,16 @@
InfoTable = AcpiDmTableInfoPcct2;
break;
+ case ACPI_PCCT_TYPE_EXT_PCC_MASTER_SUBSPACE:
+
+ InfoTable = AcpiDmTableInfoPcct3;
+ break;
+
+ case ACPI_PCCT_TYPE_EXT_PCC_SLAVE_SUBSPACE:
+
+ InfoTable = AcpiDmTableInfoPcct4;
+ break;
+
default:
AcpiOsPrintf (
@@ -3134,6 +3349,136 @@
/*******************************************************************************
*
+ * FUNCTION: AcpiDmDumpPptt
+ *
+ * PARAMETERS: Table - A PMTT table
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Format the contents of a PPTT. This table type consists
+ * of an open-ended number of subtables.
+ *
+ ******************************************************************************/
+
+void
+AcpiDmDumpPptt (
+ ACPI_TABLE_HEADER *Table)
+{
+ ACPI_STATUS Status;
+ ACPI_SUBTABLE_HEADER *SubTable;
+ ACPI_PPTT_PROCESSOR *PpttProcessor;
+ UINT8 Length;
+ UINT8 SubTableOffset;
+ UINT32 Offset = sizeof (ACPI_TABLE_FPDT);
+ ACPI_DMTABLE_INFO *InfoTable;
+ UINT32 i;
+
+
+ /* There is no main table (other than the standard ACPI header) */
+
+ /* Subtables */
Home |
Main Index |
Thread Index |
Old Index