Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/acpica/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/9b2a1eae19f4
branches: trunk
changeset: 350879:9b2a1eae19f4
user: christos <christos%NetBSD.org@localhost>
date: Wed Jan 25 13:38:21 2017 +0000
description:
merge conflicts
diffstat:
sys/external/bsd/acpica/dist/common/dmtbdump.c | 196 +++--
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 30 +-
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 18 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 2 +-
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 | 2 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslpredef.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslprepkg.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslsupport.l | 2 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 8 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 15 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 15 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 72 +-
sys/external/bsd/acpica/dist/compiler/dtutils.c | 2 +-
sys/external/bsd/acpica/dist/compiler/prparser.y | 2 +-
sys/external/bsd/acpica/dist/compiler/prutils.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbcmds.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbdisply.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 113 +--
sys/external/bsd/acpica/dist/debugger/dbmethod.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbnames.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbtest.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbutils.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmbuffer.c | 29 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 354 +++++----
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 32 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmresrcl2.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmwalk.c | 33 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 4 +-
sys/external/bsd/acpica/dist/dispatcher/dsutils.c | 2 +-
sys/external/bsd/acpica/dist/events/evregion.c | 2 +-
sys/external/bsd/acpica/dist/events/evrgnini.c | 59 +-
sys/external/bsd/acpica/dist/events/evxface.c | 2 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 44 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 2 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 29 +-
sys/external/bsd/acpica/dist/hardware/hwregs.c | 232 +++++-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 12 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 2 +-
sys/external/bsd/acpica/dist/include/acapps.h | 14 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 5 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 13 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 10 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 7 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 2 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 9 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 87 ++-
sys/external/bsd/acpica/dist/include/acnamesp.h | 7 +-
sys/external/bsd/acpica/dist/include/acoutput.h | 2 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 36 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 22 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 2 +-
sys/external/bsd/acpica/dist/include/actables.h | 16 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 2 +-
sys/external/bsd/acpica/dist/include/actypes.h | 2 +-
sys/external/bsd/acpica/dist/include/acutils.h | 6 +-
sys/external/bsd/acpica/dist/include/platform/acgcc.h | 2 +-
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 | 2 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 46 +-
sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c | 2 +-
sys/external/bsd/acpica/dist/parser/psopcode.c | 2 +-
sys/external/bsd/acpica/dist/parser/psopinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdump.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsdumpinfo.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsutils.c | 2 +-
sys/external/bsd/acpica/dist/resources/rsxface.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbdata.c | 104 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 25 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 98 ++-
sys/external/bsd/acpica/dist/tables/tbxface.c | 139 +++-
sys/external/bsd/acpica/dist/tables/tbxfload.c | 37 +-
sys/external/bsd/acpica/dist/tables/tbxfroot.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c | 2 +-
sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c | 8 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 60 +-
sys/external/bsd/acpica/dist/utilities/uteval.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utglobal.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utmisc.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utmutex.c | 21 +-
sys/external/bsd/acpica/dist/utilities/utobject.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utprint.c | 2 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 2 +-
110 files changed, 1385 insertions(+), 834 deletions(-)
diffs (truncated from 4526 to 300 lines):
diff -r 94d810328719 -r 9b2a1eae19f4 sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Wed Jan 25 13:08:31 2017 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Wed Jan 25 13:38:21 2017 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2016, Intel Corp.
+ * Copyright (C) 2000 - 2017, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -52,31 +52,12 @@
ACPI_MODULE_NAME ("dmtbdump")
-/* Table of revision-dependent FADT sizes */
-
-static const UINT32 FadtRevisionLength [ACPI_FADT_MAX_VERSION + 1] =
-{
- 0, /* 0 - illegal */
- ACPI_FADT_V1_SIZE, /* 1 - ACPI 1.0 */
- 0, /* 2 - illegal */
- ACPI_FADT_V3_SIZE, /* 3 - ACPI 2.0 */
- ACPI_FADT_V4_SIZE, /* 4 - ACPI 3.0 and ACPI 4.0 */
- ACPI_FADT_V5_SIZE, /* 5 - ACPI 5.0 */
- ACPI_FADT_V6_SIZE /* 6 - ACPI 6.0 */
-};
-
-/* Table of revision-dependent FADT info tables */
-
-ACPI_DMTABLE_INFO *FadtRevisionInfo [ACPI_FADT_MAX_VERSION + 1] =
-{
- NULL, /* 0 - illegal */
- AcpiDmTableInfoFadt1, /* 1 - ACPI 1.0 */
- NULL, /* 2 - illegal */
- AcpiDmTableInfoFadt3, /* 3 - ACPI 2.0 */
- AcpiDmTableInfoFadt4, /* 4 - ACPI 3.0 and ACPI 4.0 */
- AcpiDmTableInfoFadt5, /* 5 - ACPI 5.0 */
- AcpiDmTableInfoFadt6 /* 6 - ACPI 6.0 */
-};
+/* Local prototypes */
+
+static void
+AcpiDmValidateFadtLength (
+ UINT32 Revision,
+ UINT32 Length);
/*******************************************************************************
@@ -366,11 +347,6 @@
*
* DESCRIPTION: Format the contents of a FADT
*
- * Check the FADT revision against the expected table length for
- * that revision. Issue a warning if the length is not what was
- * expected. This seems to be such a common BIOS bug that the
- * FADT revision has been rendered virtually meaningless.
- *
* NOTE: We cannot depend on the FADT version to indicate the actual
* contents of the FADT because of BIOS bugs. The table length
* is the only reliable indicator.
@@ -382,72 +358,142 @@
ACPI_TABLE_HEADER *Table)
{
ACPI_STATUS Status;
- UINT8 FadtRevision;
- UINT32 ExpectedLength;
- UINT32 i;
-
-
- FadtRevision = Table->Revision;
-
- /* FADT revision/length validation */
-
- if ((FadtRevision == 0) ||
- (FadtRevision == 2))
+
+
+ /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */
+
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt1);
+ if (ACPI_FAILURE (Status))
{
- AcpiOsPrintf (
- "// ACPI Warning: Invalid or unsupported FADT revision: %u\n",
- FadtRevision);
return;
}
- if (FadtRevision > ACPI_FADT_MAX_VERSION)
- {
- AcpiOsPrintf ("// ACPI Warning: Revision %u is not fully supported, "
- "disassembling known fields (up to revision %u)\n\n",
- FadtRevision, ACPI_FADT_MAX_VERSION);
- }
- else
+ /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */
+
+ if ((Table->Length > ACPI_FADT_V1_SIZE) &&
+ (Table->Length <= ACPI_FADT_V2_SIZE))
{
- ExpectedLength = FadtRevisionLength[FadtRevision];
- if (Table->Length != ExpectedLength)
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt2);
+ if (ACPI_FAILURE (Status))
{
- AcpiOsPrintf (
- "// ACPI Warning: Input FADT revision %X does not match "
- "expected length: found 0x%X expected 0x%X\n",
- FadtRevision, Table->Length, ExpectedLength);
+ return;
}
}
- /*
- * Dump the input table on a per-version basis, but is actually
- * based upon the length of the table. Table length must
- * be larger than the required length of the previous version.
- */
- for (i = 1; i <= ACPI_FADT_MAX_VERSION; i++)
+ /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */
+
+ else if (Table->Length > ACPI_FADT_V2_SIZE)
{
- if (!FadtRevisionLength[i]) /* Skip any empty slots */
- {
- continue;
- }
-
- /* Dump the fields specific to FADT revision[i] */
-
Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
- FadtRevisionInfo[i]);
+ AcpiDmTableInfoFadt3);
if (ACPI_FAILURE (Status))
{
return;
}
- if (Table->Length <= FadtRevisionLength[i])
+ /* Check for FADT revision 5 fields and up (ACPI 5.0+) */
+
+ if (Table->Length > ACPI_FADT_V3_SIZE)
{
- break; /* End of table */
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt5);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
+ }
+
+ /* Check for FADT revision 6 fields and up (ACPI 6.0+) */
+
+ if (Table->Length > ACPI_FADT_V3_SIZE)
+ {
+ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0,
+ AcpiDmTableInfoFadt6);
+ if (ACPI_FAILURE (Status))
+ {
+ return;
+ }
}
}
- /* Build a local FADT to test some FADT values */
+ /* Validate various fields in the FADT, including length */
AcpiTbCreateLocalFadt (Table, Table->Length);
+
+ /* Validate FADT length against the revision */
+
+ AcpiDmValidateFadtLength (Table->Revision, Table->Length);
+}
+
+
+/*******************************************************************************
+ *
+ * FUNCTION: AcpiDmValidateFadtLength
+ *
+ * PARAMETERS: Revision - FADT revision (Header->Revision)
+ * Length - FADT length (Header->Length
+ *
+ * RETURN: None
+ *
+ * DESCRIPTION: Check the FADT revision against the expected table length for
+ * that revision. Issue a warning if the length is not what was
+ * expected. This seems to be such a common BIOS bug that the
+ * FADT revision has been rendered virtually meaningless.
+ *
+ ******************************************************************************/
+
+static void
+AcpiDmValidateFadtLength (
+ UINT32 Revision,
+ UINT32 Length)
+{
+ UINT32 ExpectedLength;
+
+
+ switch (Revision)
+ {
+ case 0:
+
+ AcpiOsPrintf ("// ACPI Warning: Invalid FADT revision: 0\n");
+ return;
+
+ case 1:
+
+ ExpectedLength = ACPI_FADT_V1_SIZE;
+ break;
+
+ case 2:
+
+ ExpectedLength = ACPI_FADT_V2_SIZE;
+ break;
+
+ case 3:
+ case 4:
+
+ ExpectedLength = ACPI_FADT_V3_SIZE;
+ break;
+
+ case 5:
+
+ ExpectedLength = ACPI_FADT_V5_SIZE;
+ break;
+
+ default:
+
+ return;
+ }
+
+ if (Length == ExpectedLength)
+ {
+ return;
+ }
+
+ AcpiOsPrintf (
+ "\n// ACPI Warning: FADT revision %X does not match length: "
+ "found %X expected %X\n",
+ Revision, Length, ExpectedLength);
}
diff -r 94d810328719 -r 9b2a1eae19f4 sys/external/bsd/acpica/dist/common/dmtbinfo.c
--- a/sys/external/bsd/acpica/dist/common/dmtbinfo.c Wed Jan 25 13:08:31 2017 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbinfo.c Wed Jan 25 13:38:21 2017 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2016, Intel Corp.
+ * Copyright (C) 2000 - 2017, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -400,7 +400,7 @@
*
******************************************************************************/
-/* FADT version 1 (ACPI 1.0) */
+/* ACPI 1.0 FADT (Version 1) */
ACPI_DMTABLE_INFO AcpiDmTableInfoFadt1[] =
{
@@ -486,7 +486,18 @@
ACPI_DMT_TERMINATOR
};
-/* FADT version 3 (ACPI 2.0) */
+/* ACPI 1.0 MS Extensions (FADT version 2) */
+
+ACPI_DMTABLE_INFO AcpiDmTableInfoFadt2[] =
+{
+ {ACPI_DMT_GAS, ACPI_FADT_OFFSET (ResetRegister), "Reset Register", 0},
+ {ACPI_DMT_UINT8, ACPI_FADT_OFFSET (ResetValue), "Value to cause reset", 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, 4, and 5) */
ACPI_DMTABLE_INFO AcpiDmTableInfoFadt3[] =
{
@@ -510,23 +521,16 @@
ACPI_DMT_TERMINATOR
};
-/* FADT version 4 (ACPI 3.0 and ACPI 4.0) */
-
-ACPI_DMTABLE_INFO AcpiDmTableInfoFadt4[] =
-{
- {ACPI_DMT_GAS, ACPI_FADT_OFFSET (SleepControl), "Sleep Control Register", 0},
- ACPI_DMT_TERMINATOR
Home |
Main Index |
Thread Index |
Old Index