Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Merge conflicts; STA methods and fields are not present anym...
details: https://anonhg.NetBSD.org/src/rev/9719b61f6040
branches: trunk
changeset: 321828:9719b61f6040
user: christos <christos%NetBSD.org@localhost>
date: Sat Apr 07 15:49:50 2018 +0000
description:
Merge conflicts; STA methods and fields are not present anymore.
diffstat:
external/bsd/acpica/bin/iasl/Makefile | 8 +-
sys/dev/acpi/acpi.c | 31 +-
sys/dev/acpi/acpi_i2c.c | 9 +-
sys/dev/acpi/acpi_pci.c | 7 +-
sys/dev/acpi/acpi_verbose.c | 9 +-
sys/external/bsd/acpica/dist/common/dmtbdump.c | 3832 +---------
sys/external/bsd/acpica/dist/common/dmtbinfo.c | 3171 +--------
sys/external/bsd/acpica/dist/compiler/aslanalyze.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompile.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.h | 2 +-
sys/external/bsd/acpica/dist/compiler/aslcompiler.l | 2 +-
sys/external/bsd/acpica/dist/compiler/aslerror.c | 9 +-
sys/external/bsd/acpica/dist/compiler/aslfileio.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslfiles.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslload.c | 14 +-
sys/external/bsd/acpica/dist/compiler/asllookup.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslopcodes.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslopt.c | 2 +-
sys/external/bsd/acpica/dist/compiler/asloptions.c | 22 +-
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 | 20 +-
sys/external/bsd/acpica/dist/compiler/asltree.c | 10 +-
sys/external/bsd/acpica/dist/compiler/aslutils.c | 4 +-
sys/external/bsd/acpica/dist/compiler/aslwalks.c | 2 +-
sys/external/bsd/acpica/dist/compiler/aslxref.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtcompile.c | 30 +-
sys/external/bsd/acpica/dist/compiler/dtfield.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dtparser.y | 102 +-
sys/external/bsd/acpica/dist/compiler/dtsubtable.c | 2 +-
sys/external/bsd/acpica/dist/compiler/dttable.c | 18 +-
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 | 7 +-
sys/external/bsd/acpica/dist/debugger/dbexec.c | 2 +-
sys/external/bsd/acpica/dist/debugger/dbinput.c | 2 +-
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 | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmcstyle.c | 2 +-
sys/external/bsd/acpica/dist/disassembler/dmresrc.c | 2 +-
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 | 8 +-
sys/external/bsd/acpica/dist/dispatcher/dscontrol.c | 2 +-
sys/external/bsd/acpica/dist/dispatcher/dsopcode.c | 6 +-
sys/external/bsd/acpica/dist/dispatcher/dspkginit.c | 2 +-
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 | 7 +-
sys/external/bsd/acpica/dist/events/evxface.c | 11 +-
sys/external/bsd/acpica/dist/executer/exconfig.c | 2 +-
sys/external/bsd/acpica/dist/executer/exdebug.c | 9 +-
sys/external/bsd/acpica/dist/executer/exdump.c | 8 +-
sys/external/bsd/acpica/dist/hardware/hwesleep.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwregs.c | 2 +-
sys/external/bsd/acpica/dist/hardware/hwsleep.c | 14 +-
sys/external/bsd/acpica/dist/hardware/hwxfsleep.c | 4 +-
sys/external/bsd/acpica/dist/include/acapps.h | 4 +-
sys/external/bsd/acpica/dist/include/acdebug.h | 2 +-
sys/external/bsd/acpica/dist/include/acdisasm.h | 2 +-
sys/external/bsd/acpica/dist/include/acexcep.h | 8 +-
sys/external/bsd/acpica/dist/include/acglobal.h | 125 +-
sys/external/bsd/acpica/dist/include/acinterp.h | 2 +-
sys/external/bsd/acpica/dist/include/aclocal.h | 4 +-
sys/external/bsd/acpica/dist/include/acmacros.h | 6 +-
sys/external/bsd/acpica/dist/include/acnamesp.h | 2 +-
sys/external/bsd/acpica/dist/include/acoutput.h | 2 +-
sys/external/bsd/acpica/dist/include/acpiosxf.h | 2 +-
sys/external/bsd/acpica/dist/include/acpixf.h | 25 +-
sys/external/bsd/acpica/dist/include/acresrc.h | 2 +-
sys/external/bsd/acpica/dist/include/actables.h | 2 +-
sys/external/bsd/acpica/dist/include/actbl1.h | 1894 ++--
sys/external/bsd/acpica/dist/include/actypes.h | 41 +-
sys/external/bsd/acpica/dist/include/acutils.h | 10 +-
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 | 37 +-
sys/external/bsd/acpica/dist/namespace/nsinit.c | 9 +-
sys/external/bsd/acpica/dist/namespace/nsrepair2.c | 2 +-
sys/external/bsd/acpica/dist/namespace/nsxfeval.c | 20 +-
sys/external/bsd/acpica/dist/namespace/nsxfname.c | 24 +-
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 | 20 +-
sys/external/bsd/acpica/dist/tables/tbfadt.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbinstal.c | 8 +-
sys/external/bsd/acpica/dist/tables/tbutils.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbxface.c | 2 +-
sys/external/bsd/acpica/dist/tables/tbxfload.c | 15 +-
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 | 5 +-
sys/external/bsd/acpica/dist/utilities/utcache.c | 7 +-
sys/external/bsd/acpica/dist/utilities/utdebug.c | 23 +-
sys/external/bsd/acpica/dist/utilities/utdecode.c | 2 +-
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 | 2 +-
sys/external/bsd/acpica/dist/utilities/utnonansi.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utobject.c | 2 +-
sys/external/bsd/acpica/dist/utilities/utosi.c | 51 +-
sys/external/bsd/acpica/dist/utilities/utprint.c | 2 +-
sys/external/bsd/acpica/dist/utilities/uttrack.c | 5 +-
sys/external/bsd/acpica/dist/utilities/utuuid.c | 2 +-
117 files changed, 1438 insertions(+), 8421 deletions(-)
diffs (truncated from 12224 to 300 lines):
diff -r 8d5e7813d932 -r 9719b61f6040 external/bsd/acpica/bin/iasl/Makefile
--- a/external/bsd/acpica/bin/iasl/Makefile Sat Apr 07 14:12:43 2018 +0000
+++ b/external/bsd/acpica/bin/iasl/Makefile Sat Apr 07 15:49:50 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2017/11/12 03:02:15 christos Exp $
+# $NetBSD: Makefile,v 1.18 2018/04/07 15:49:50 christos Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
PROG= iasl
@@ -122,7 +122,13 @@
dmtable.c \
dmtables.c \
dmtbdump.c \
+ dmtbdump1.c \
+ dmtbdump2.c \
+ dmtbdump3.c \
dmtbinfo.c \
+ dmtbinfo1.c \
+ dmtbinfo2.c \
+ dmtbinfo3.c \
getopt.c
.PATH: ${TOPDIR}/../debugger
diff -r 8d5e7813d932 -r 9719b61f6040 sys/dev/acpi/acpi.c
--- a/sys/dev/acpi/acpi.c Sat Apr 07 14:12:43 2018 +0000
+++ b/sys/dev/acpi/acpi.c Sat Apr 07 15:49:50 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.268 2018/03/04 16:34:20 scole Exp $ */
+/* $NetBSD: acpi.c,v 1.269 2018/04/07 15:49:52 christos Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.268 2018/03/04 16:34:20 scole Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.269 2018/04/07 15:49:52 christos Exp $");
#include "pci.h"
#include "opt_acpi.h"
@@ -898,21 +898,6 @@
di = ad->ad_devinfo;
- /*
- * We only attach devices which are present, enabled, and
- * functioning properly. However, if a device is enabled,
- * it is decoding resources and we should claim these,
- * if possible. This requires changes to bus_space(9).
- * Note: there is a possible race condition, because _STA
- * may have changed since di->CurrentStatus was set.
- */
- if (di->Type == ACPI_TYPE_DEVICE) {
-
- if ((di->Valid & ACPI_VALID_STA) != 0 &&
- (di->CurrentStatus & ACPI_STA_OK) != ACPI_STA_OK)
- continue;
- }
-
if (di->Type == ACPI_TYPE_POWER)
continue;
@@ -1808,10 +1793,9 @@
return;
}
#else
- static const int valid = ACPI_VALID_STA | ACPI_VALID_HID;
+ static const int valid = ACPI_VALID_HID;
ACPI_DEVICE_INFO *newdi;
ACPI_STATUS rv;
- uint32_t old;
/*
* If the device is valid and present,
@@ -1820,12 +1804,6 @@
if (((*di)->Valid & valid) != valid)
return;
- old = (*di)->CurrentStatus;
-
- if ((old & (ACPI_STA_DEVICE_PRESENT | ACPI_STA_DEVICE_ENABLED)) !=
- ACPI_STA_DEVICE_PRESENT)
- return;
-
rv = acpi_allocate_resources(handle);
if (ACPI_FAILURE(rv))
@@ -1840,8 +1818,7 @@
*di = newdi;
aprint_verbose_dev(acpi_softc->sc_dev,
- "%s activated, STA 0x%08X -> STA 0x%08X\n",
- (*di)->HardwareId.String, old, (*di)->CurrentStatus);
+ "%s activated\n", (*di)->HardwareId.String);
return;
diff -r 8d5e7813d932 -r 9719b61f6040 sys/dev/acpi/acpi_i2c.c
--- a/sys/dev/acpi/acpi_i2c.c Sat Apr 07 14:12:43 2018 +0000
+++ b/sys/dev/acpi/acpi_i2c.c Sat Apr 07 15:49:50 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.2 2017/12/11 08:40:45 bouyer Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.3 2018/04/07 15:49:52 christos Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.2 2017/12/11 08:40:45 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.3 2018/04/07 15:49:52 christos Exp $");
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
@@ -226,11 +226,6 @@
return NULL;
SIMPLEQ_FOREACH(ad, &devnode->ad_child_head, ad_child_list) {
- if ((ad->ad_devinfo->Valid & ACPI_VALID_STA) == 0)
- continue;
- if ((ad->ad_devinfo->CurrentStatus & ACPI_STA_OK) !=
- ACPI_STA_OK)
- continue;
if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
continue;
acpi_enter_i2c_device(ad, array);
diff -r 8d5e7813d932 -r 9719b61f6040 sys/dev/acpi/acpi_pci.c
--- a/sys/dev/acpi/acpi_pci.c Sat Apr 07 14:12:43 2018 +0000
+++ b/sys/dev/acpi/acpi_pci.c Sat Apr 07 15:49:50 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci.c,v 1.20 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: acpi_pci.c,v 1.21 2018/04/07 15:49:52 christos Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.20 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci.c,v 1.21 2018/04/07 15:49:52 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -184,9 +184,6 @@
*/
if (ad->ad_devinfo->Type != ACPI_TYPE_DEVICE)
goto rec;
- if ((ad->ad_devinfo->Valid & ACPI_VALID_STA) != 0 &&
- (ad->ad_devinfo->CurrentStatus & ACPI_STA_OK) != ACPI_STA_OK)
- goto rec;
if (ad->ad_devinfo->Flags & ACPI_PCI_ROOT_BRIDGE) {
diff -r 8d5e7813d932 -r 9719b61f6040 sys/dev/acpi/acpi_verbose.c
--- a/sys/dev/acpi/acpi_verbose.c Sat Apr 07 14:12:43 2018 +0000
+++ b/sys/dev/acpi/acpi_verbose.c Sat Apr 07 15:49:50 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_verbose.c,v 1.18 2016/10/14 11:11:01 nonaka Exp $ */
+/* $NetBSD: acpi_verbose.c,v 1.19 2018/04/07 15:49:52 christos Exp $ */
/*-
* Copyright (c) 2003, 2007, 2010 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.18 2016/10/14 11:11:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_verbose.c,v 1.19 2018/04/07 15:49:52 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -478,11 +478,6 @@
((di->Valid & ACPI_VALID_UID) != 0) ?
di->UniqueId.String : "-");
- if ((di->Valid & ACPI_VALID_STA) != 0)
- aprint_normal("STA 0x%08X ", di->CurrentStatus);
- else
- aprint_normal("STA %10s ", "-");
-
if ((di->Valid & ACPI_VALID_ADR) != 0)
aprint_normal("ADR 0x%016" PRIX64"", di->Address);
else
diff -r 8d5e7813d932 -r 9719b61f6040 sys/external/bsd/acpica/dist/common/dmtbdump.c
--- a/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Apr 07 14:12:43 2018 +0000
+++ b/sys/external/bsd/acpica/dist/common/dmtbdump.c Sat Apr 07 15:49:50 2018 +0000
@@ -5,7 +5,7 @@
*****************************************************************************/
/*
- * Copyright (C) 2000 - 2017, Intel Corp.
+ * Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -495,3833 +495,3 @@
"found %X expected %X\n",
Revision, Length, ExpectedLength);
}
-
-
-/*******************************************************************************
- *
- * FUNCTION: AcpiDmDumpAsf
- *
- * PARAMETERS: Table - A ASF table
- *
- * RETURN: None
- *
- * DESCRIPTION: Format the contents of a ASF table
- *
- ******************************************************************************/
-
-void
-AcpiDmDumpAsf (
- ACPI_TABLE_HEADER *Table)
-{
- ACPI_STATUS Status;
- UINT32 Offset = sizeof (ACPI_TABLE_HEADER);
- ACPI_ASF_INFO *Subtable;
- ACPI_DMTABLE_INFO *InfoTable;
- ACPI_DMTABLE_INFO *DataInfoTable = NULL;
- UINT8 *DataTable = NULL;
- UINT32 DataCount = 0;
- UINT32 DataLength = 0;
- UINT32 DataOffset = 0;
- UINT32 i;
- UINT8 Type;
-
-
- /* No main table, only subtables */
-
- Subtable = ACPI_ADD_PTR (ACPI_ASF_INFO, Table, Offset);
- while (Offset < Table->Length)
- {
- /* Common subtable header */
-
- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
- Subtable->Header.Length, AcpiDmTableInfoAsfHdr);
- if (ACPI_FAILURE (Status))
- {
- return;
- }
-
- /* The actual type is the lower 7 bits of Type */
-
- Type = (UINT8) (Subtable->Header.Type & 0x7F);
-
- switch (Type)
- {
- case ACPI_ASF_TYPE_INFO:
-
- InfoTable = AcpiDmTableInfoAsf0;
- break;
-
- case ACPI_ASF_TYPE_ALERT:
-
- InfoTable = AcpiDmTableInfoAsf1;
- DataInfoTable = AcpiDmTableInfoAsf1a;
- DataTable = ACPI_ADD_PTR (UINT8, Subtable, sizeof (ACPI_ASF_ALERT));
- DataCount = ACPI_CAST_PTR (ACPI_ASF_ALERT, Subtable)->Alerts;
- DataLength = ACPI_CAST_PTR (ACPI_ASF_ALERT, Subtable)->DataLength;
- DataOffset = Offset + sizeof (ACPI_ASF_ALERT);
- break;
-
- case ACPI_ASF_TYPE_CONTROL:
-
- InfoTable = AcpiDmTableInfoAsf2;
- DataInfoTable = AcpiDmTableInfoAsf2a;
- DataTable = ACPI_ADD_PTR (UINT8, Subtable, sizeof (ACPI_ASF_REMOTE));
- DataCount = ACPI_CAST_PTR (ACPI_ASF_REMOTE, Subtable)->Controls;
- DataLength = ACPI_CAST_PTR (ACPI_ASF_REMOTE, Subtable)->DataLength;
- DataOffset = Offset + sizeof (ACPI_ASF_REMOTE);
- break;
-
- case ACPI_ASF_TYPE_BOOT:
-
- InfoTable = AcpiDmTableInfoAsf3;
- break;
-
- case ACPI_ASF_TYPE_ADDRESS:
-
- InfoTable = AcpiDmTableInfoAsf4;
- DataTable = ACPI_ADD_PTR (UINT8, Subtable, sizeof (ACPI_ASF_ADDRESS));
- DataLength = ACPI_CAST_PTR (ACPI_ASF_ADDRESS, Subtable)->Devices;
- DataOffset = Offset + sizeof (ACPI_ASF_ADDRESS);
- break;
-
- default:
-
- AcpiOsPrintf ("\n**** Unknown ASF subtable type 0x%X\n",
- Subtable->Header.Type);
- return;
- }
-
- Status = AcpiDmDumpTable (Table->Length, Offset, Subtable,
- Subtable->Header.Length, InfoTable);
Home |
Main Index |
Thread Index |
Old Index