From e30f0247b2fbc12e0ef8fd058e2987d07d7f4329 Mon Sep 17 00:00:00 2001 From: Al Stone Date: May 10 2019 21:04:59 +0000 Subject: New upstream version 20190215 --- diff --git a/changes.txt b/changes.txt index e139a5b..f2c099e 100644 --- a/changes.txt +++ b/changes.txt @@ -1,9 +1,98 @@ ---------------------------------------- -08 January 2019. Summary of changes for version 20190108: +15 February 2019. Summary of changes for version 20190215: This release is available at https://acpica.org/downloads +0) Support for ACPI specification version 6.3: + +Add PCC operation region support for the AML interpreter. This adds PCC +operation region support in the AML interpreter and a default handler for +acpiexec. The change also renames the PCC region address space keyword to +PlatformCommChannel. + +Support for new predefined methods _NBS, _NCH, _NIC, _NIH, and _NIG. +These methods provide OSPM with health information and device boot +status. + +PDTT: Add TriggerOrder to the PCC Identifier structure. The field value +defines if the trigger needs to be invoked by OSPM before or at the end +of kernel crash dump processing/handling operation. + +SRAT: Add Generic Affinity Structure subtable. This subtable in the SRAT +is used for describing devices such as heterogeneous processors, +accelerators, GPUs, and IO devices with integrated compute or DMA +engines. + +MADT: Add support for statistical profiling in GICC. Statistical +profiling extension (SPE) is an architecture-specific feature for ARM. + +MADT: Add online capable flag. If this bit is set, system hardware +supports enabling this processor during OS runtime. + +New Error Disconnect Recover Notification value. There are a number of +scenarios where system Firmware in collaboration with hardware may +disconnect one or more devices from the rest of the system for purposes +of error containment. Firmware can use this new notification value to +alert OSPM of such a removal. + +PPTT: New additional fields in Processor Structure Flags. These flags +provide more information about processor topology. + +NFIT/Disassembler: Change a field name from "Address Range" to "Region +Type". + +HMAT updates: make several existing fields to be reserved as well as +rename subtable 0 to "memory proximity domain attributes". + +GTDT: Add support for new GTDT Revision 3. This revision adds information +for the EL2 timer. + +iASL: Update the HMAT example template for new fields. + +iASL: Add support for the new revision of the GTDT (Rev 3). + + +1) ACPICA kernel-resident subsystem: + +AML Parser: fix the main AML parse loop to correctly skip erroneous +extended opcodes. AML opcodes come in two lengths: 1-byte opcodes and 2- +byte extended opcodes. If an error occurs during an AML table load, the +AML parser will continue loading the table by skipping the offending +opcode. This implements a "load table at any cost" philosophy. + + +2) iASL Compiler/Disassembler and Tools: + +iASL: Add checks for illegal object references, such as a reference +outside of method to an object within a method. Such an object is only +temporary. + +iASL: Emit error for creation of a zero-length operation region. Such a +region is rather pointless. If encountered, a runtime error is also +implemented in the interpeter. + +Debugger: Fix a possible fault with the "test objects" command. + +iASL: Makefile: support parent directory filenames containing embedded +spaces. + +iASL: Update the TPM2 template to revision 4. + +iASL: Add the ability to report specific warnings or remarks as errors. + +Disassembler: Disassemble OEMx tables as actual AML byte code. +Previously, these tables were treated as "unknown table". + +iASL: Add definition and disassembly for TPM2 revision 3. + +iASL: Add support for TPM2 rev 3 compilation. + + +---------------------------------------- +08 January 2019. Summary of changes for version 20190108: + + 1) ACPICA kernel-resident subsystem: Updated all copyrights to 2019. This affects all source code modules. @@ -1218,7 +1307,7 @@ internal cache) is detected and ignored via object poisoning. Debugger: Fixed an AML interpreter mutex issue during the single stepping of control methods. If certain debugger commands are executed during -stepping, a mutex aquire/release error could occur. Lv Zheng. +stepping, a mutex acquire/release error could occur. Lv Zheng. Fixed some issues generating ACPICA with the Intel C compiler by restoring the original behavior and compiler-specific include file in @@ -6760,7 +6849,7 @@ keyword is not standard across compilers, and this type allows inline to be configured on a per-compiler basis. Lin Ming. -Made the system global AcpiGbl_SystemAwakeAndRunning publically +Made the system global AcpiGbl_SystemAwakeAndRunning publicly available. Added an extern for this boolean in acpixf.h. Some hosts utilize this value @@ -11427,9 +11516,9 @@ Helgaas. Removed the length limit (200) on string objects as per the upcoming ACPI 3.0A specification. This affects the following areas of the interpreter: 1) -any implicit conversion of a Buffer to a String, 2) a String object +any implicit conversion of a Buffer to a String, 2) a String object result -of the ASL Concatentate operator, 3) the String object result of the ASL +of the ASL Concatenate operator, 3) the String object result of the ASL ToString operator. Fixed a problem in the Windows OS interface layer (OSL) where a @@ -13585,7 +13674,7 @@ next access width boundary (a common coding error.) Renamed OSD_HANDLER to ACPI_OSD_HANDLER, and OSD_EXECUTION_CALLBACK to ACPI_OSD_EXEC_CALLBACK for consistency with other ACPI symbols. Also, these -symbols are lowercased by the latest version of the AcpiSrc tool. +symbols are lowercase by the latest version of the AcpiSrc tool. The prototypes for the PCI interfaces in acpiosxf.h have been updated to rename "Register" to simply "Reg" to prevent certain compilers from @@ -14957,8 +15046,8 @@ with the Linux coding style. Removed the non-Linux SourceSafe module revision number from each module header. -Completed major overhaul of symbols to be lowercased for linux. -Doubled the number of symbols that are lowercased. +Completed major overhaul of symbols to be lowercase for linux. +Doubled the number of symbols that are lowercase. Fixed a problem where identifiers within procedure headers and within quotes were not fully lower cased (they were left with a @@ -16454,7 +16543,7 @@ Summary of changes for this label: 02_14_02 Implemented support in AcpiLoadTable to allow loading of FACS and FADT tables. -Suport for the now-obsolete interim 0.71 64-bit ACPI tables has +Support for the now-obsolete interim 0.71 64-bit ACPI tables has been removed. All 64-bit platforms should be migrated to the ACPI 2.0 tables. The actbl71.h header has been removed from the source tree. @@ -16804,7 +16893,7 @@ Updated all files to apply cleanly against 2.4.16. Added basic PCI Interrupt Routing Table (PRT) support for IA32 (acpi_pci.c), and unified the PRT code for IA32 and IA64. This -version supports both static and dyanmic PRT entries, but dynamic +version supports both static and dynamic PRT entries, but dynamic entries are treated as if they were static (not yet reconfigurable). Architecture- specific code to use this data is absent on IA32 but should be available shortly. @@ -16893,7 +16982,7 @@ power-down, and thermal passive cooling issues (coming soon). Added additional typechecking for Fields within restricted access Operation Regions. All fields within EC and CMOS regions must be -declared with ByteAcc. All fields withing SMBus regions must be +declared with ByteAcc. All fields within SMBus regions must be declared with the BufferAcc access type. Fixed a problem where the listing file output of control methods @@ -17066,7 +17155,7 @@ objects to not be deleted during subsystem termination. Fixed a problem with the external AcpiEvaluateObject interface where the subsystem would fault if the named object to be -evaluated refered to a constant such as Zero, Ones, etc. +evaluated referred to a constant such as Zero, Ones, etc. Fixed a problem with IndexFields and BankFields where the subsystem would fault if the index, data, or bank registers were @@ -17133,7 +17222,7 @@ sleeps.) The AcpiEnterSleepState and AcpiLeaveSleepState interfaces now support wake-enabled GPEs. This means that upon entering the sleep state, all GPEs that are not wake-enabled are disabled. -When leaving the sleep state, these GPEs are reenabled. +When leaving the sleep state, these GPEs are re-enabled. A local double-precision divide/modulo module has been added to enhance portability to OS kernels where a 64-bit math library is diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile index 98dac71..23ca16b 100644 --- a/generate/unix/iasl/Makefile +++ b/generate/unix/iasl/Makefile @@ -297,7 +297,7 @@ include ../Makefile.rules safe_yacc = \ _d=`mktemp -d $(OBJDIR)/$(1).XXXXXX` &&\ cd $$_d &&\ - $(YACC) $(YFLAGS) -v -d -p$(1) $(abspath $(2)) &&\ + $(YACC) $(YFLAGS) -v -d -p$(1) "$(abspath $(2))" &&\ cd - > /dev/null;\ mv $$_d/y.tab$(suffix $(3)) $(3);\ _r=$$?;\ diff --git a/source/common/ahpredef.c b/source/common/ahpredef.c index b42f046..2ccb043 100644 --- a/source/common/ahpredef.c +++ b/source/common/ahpredef.c @@ -197,6 +197,11 @@ const AH_PREDEFINED_NAME AslPredefinedInfo[] = AH_PREDEF ("_MSM", "Memory Set Monitoring", "Sets bandwidth monitoring parameters for a memory device"), AH_PREDEF ("_MTL", "Minimum Throttle Limit", "Returns the minimum throttle limit for a thermal zone"), AH_PREDEF ("_MTP", "Memory Type", "Resource Descriptor field"), + AH_PREDEF ("_NBS", "NVDIMM Boot Status", "Returns information about NVDIMM device’s status at boot time"), + AH_PREDEF ("_NCH", "NVDIMM Current Health Information", "Returns current health information of the NVDIMM device"), + AH_PREDEF ("_NIC", "NVDIMM Health Error Injection Capabilities", "Returns health error injection capabilities that are supported by the platform"), + AH_PREDEF ("_NIG", "NVDIMM Inject Health Error Status","Returns currently active health errors and their error attributes that are injected by _NIH"), + AH_PREDEF ("_NIH", "NVDIMM Inject/Clear Health Errors", "Returns the status of injecting or clearing Health Errors"), AH_PREDEF ("_NTT", "Notification Temperature Threshold", "Returns a threshold for device temperature change that requires platform notification"), AH_PREDEF ("_OFF", "Power Off", "Sets a power resource to the off state"), AH_PREDEF ("_ON_", "Power On", "Sets a power resource to the on state"), @@ -285,7 +290,7 @@ const AH_PREDEFINED_NAME AslPredefinedInfo[] = AH_PREDEF ("_SDD", "Set Device Data", "Sets data for a SATA device"), AH_PREDEF ("_SEG", "PCI Segment", "Returns a device's PCI Segment Group number"), AH_PREDEF ("_SHL", "Set Hardware Limit", "Sets the hardware limit enforced by the Power Meter"), - AH_PREDEF ("_SHR", "Sharable", "Interrupt share status, Resource Descriptor field"), + AH_PREDEF ("_SHR", "Shareable", "Interrupt share status, Resource Descriptor field"), AH_PREDEF ("_SI_", "System Indicators", "Predefined scope"), AH_PREDEF ("_SIZ", "Size", "DMA transfer size, Resource Descriptor field"), AH_PREDEF ("_SLI", "System Locality Information", "Returns a list of NUMA system localities"), diff --git a/source/common/ahuuids.c b/source/common/ahuuids.c index c10c402..f64dcf1 100644 --- a/source/common/ahuuids.c +++ b/source/common/ahuuids.c @@ -118,7 +118,7 @@ AcpiAhMatchUuid ( for (Info = Gbl_AcpiUuids; Info->Description; Info++) { - /* Null string means desciption is a UUID class */ + /* Null string means description is a UUID class */ if (!Info->String) { diff --git a/source/common/dmextern.c b/source/common/dmextern.c index 2431389..4826981 100644 --- a/source/common/dmextern.c +++ b/source/common/dmextern.c @@ -1108,7 +1108,7 @@ AcpiDmCreateSubobjectForExternal ( * * DESCRIPTION: Add one external to the namespace by resolvign the external * (by performing a namespace lookup) and annotating the resulting - * namespace node with the approperiate information if the type + * namespace node with the appropriate information if the type * is ACPI_TYPE_REGION or ACPI_TYPE_METHOD. * ******************************************************************************/ diff --git a/source/common/dmrestag.c b/source/common/dmrestag.c index cdb1544..6dd17e8 100644 --- a/source/common/dmrestag.c +++ b/source/common/dmrestag.c @@ -798,7 +798,7 @@ AcpiDmUpdateResourceName ( * * PARAMETERS: BitIndex - Index into the resource descriptor * Resource - Pointer to the raw resource data - * ResourceIndex - Index correspoinding to the resource type + * ResourceIndex - Index corresponding to the resource type * * RETURN: Pointer to the resource tag (ACPI_NAME). NULL if no match. * diff --git a/source/common/dmtable.c b/source/common/dmtable.c index 3e206b1..a872acc 100644 --- a/source/common/dmtable.c +++ b/source/common/dmtable.c @@ -212,7 +212,7 @@ static const char *AcpiDmHestNotifySubnames[] = static const char *AcpiDmHmatSubnames[] = { - "Memory Subystem Address Range", + "Memory Proximity Domain Attributes", "System Locality Latency and Bandwidth Information", "Memory Side Cache Information", "Unknown Structure Type" /* Reserved */ @@ -292,6 +292,7 @@ static const char *AcpiDmSratSubnames[] = "Processor Local x2APIC Affinity", "GICC Affinity", "GIC ITS Affinity", /* Acpi 6.2 */ + "Generic Initiator Affinity", /* Acpi 6.3 */ "Unknown Subtable Type" /* Reserved */ }; diff --git a/source/common/dmtbdump1.c b/source/common/dmtbdump1.c index 9ee56df..6de7f81 100644 --- a/source/common/dmtbdump1.c +++ b/source/common/dmtbdump1.c @@ -998,9 +998,26 @@ AcpiDmDumpGtdt ( return; } - /* Subtables */ + /* Rev 3 fields */ Subtable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset); + + if (Table->Revision > 2) + { + SubtableLength = sizeof (ACPI_GTDT_EL2); + Status = AcpiDmDumpTable (Length, Offset, Subtable, + SubtableLength, AcpiDmTableInfoGtdtEl2); + if (ACPI_FAILURE (Status)) + { + return; + } + Offset += SubtableLength; + } + + Subtable = ACPI_ADD_PTR (ACPI_GTDT_HEADER, Table, Offset); + + /* Subtables */ + while (Offset < Table->Length) { /* Common subtable header */ @@ -1298,7 +1315,7 @@ AcpiDmDumpHmat ( case ACPI_HMAT_TYPE_ADDRESS_RANGE: InfoTable = AcpiDmTableInfoHmat0; - Length = sizeof (ACPI_HMAT_ADDRESS_RANGE); + Length = sizeof (ACPI_HMAT_PROXIMITY_DOMAIN); break; case ACPI_HMAT_TYPE_LOCALITY: diff --git a/source/common/dmtbdump3.c b/source/common/dmtbdump3.c index 180e5f8..c7c1561 100644 --- a/source/common/dmtbdump3.c +++ b/source/common/dmtbdump3.c @@ -225,6 +225,11 @@ AcpiDmDumpSrat ( InfoTable = AcpiDmTableInfoSrat4; break; + case ACPI_SRAT_TYPE_GENERIC_AFFINITY: + + InfoTable = AcpiDmTableInfoSrat5; + break; + default: AcpiOsPrintf ("\n**** Unknown SRAT subtable type 0x%X\n", Subtable->Type); diff --git a/source/common/dmtbinfo1.c b/source/common/dmtbinfo1.c index 3ce89d2..f7f7c7e 100644 --- a/source/common/dmtbinfo1.c +++ b/source/common/dmtbinfo1.c @@ -706,6 +706,15 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt[] = ACPI_DMT_TERMINATOR }; +/* GDTD EL2 timer info. This table is appended to AcpiDmTableInfoGtdt for rev 3 and later */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtEl2[] = +{ + {ACPI_DMT_UINT32, ACPI_GTDT_EL2_OFFSET (VirtualEL2TimerGsiv), "Virtual EL2 Timer GSIV", 0}, + {ACPI_DMT_UINT32, ACPI_GTDT_EL2_OFFSET (VirtualEL2TimerFlags), "Virtual EL2 Timer Flags", 0}, + ACPI_DMT_TERMINATOR +}; + /* GTDT Subtable header (one per Subtable) */ ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtHdr[] = @@ -997,20 +1006,18 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoHmatHdr[] = /* HMAT subtables */ -/* 0x00: Memory Subsystem Address Range */ +/* 0x00: Memory proximity domain attributes */ ACPI_DMTABLE_INFO AcpiDmTableInfoHmat0[] = { {ACPI_DMT_UINT16, ACPI_HMAT0_OFFSET (Flags), "Flags (decoded below)", 0}, {ACPI_DMT_FLAG0, ACPI_HMAT0_FLAG_OFFSET (Flags,0), "Processor Proximity Domain Valid", 0}, - {ACPI_DMT_FLAG1, ACPI_HMAT0_FLAG_OFFSET (Flags,0), "Memory Proximity Domain Valid", 0}, - {ACPI_DMT_FLAG2, ACPI_HMAT0_FLAG_OFFSET (Flags,0), "Reservation Hint", 0}, {ACPI_DMT_UINT16, ACPI_HMAT0_OFFSET (Reserved1), "Reserved1", 0}, {ACPI_DMT_UINT32, ACPI_HMAT0_OFFSET (ProcessorPD), "Processor Proximity Domain", 0}, {ACPI_DMT_UINT32, ACPI_HMAT0_OFFSET (MemoryPD), "Memory Proximity Domain", 0}, {ACPI_DMT_UINT32, ACPI_HMAT0_OFFSET (Reserved2), "Reserved2", 0}, - {ACPI_DMT_UINT64, ACPI_HMAT0_OFFSET (PhysicalAddressBase), "Physical Address Range Base", 0}, - {ACPI_DMT_UINT64, ACPI_HMAT0_OFFSET (PhysicalAddressLength), "Physical Address Range Size", 0}, + {ACPI_DMT_UINT64, ACPI_HMAT0_OFFSET (Reserved3), "Reserved3", 0}, + {ACPI_DMT_UINT64, ACPI_HMAT0_OFFSET (Reserved4), "Reserved4", 0}, ACPI_DMT_TERMINATOR }; diff --git a/source/common/dmtbinfo2.c b/source/common/dmtbinfo2.c index 4978f4c..8539b19 100644 --- a/source/common/dmtbinfo2.c +++ b/source/common/dmtbinfo2.c @@ -427,6 +427,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt0[] = {ACPI_DMT_UINT8, ACPI_MADT0_OFFSET (Id), "Local Apic ID", 0}, {ACPI_DMT_UINT32, ACPI_MADT0_OFFSET (LapicFlags), "Flags (decoded below)", DT_FLAG}, {ACPI_DMT_FLAG0, ACPI_MADT0_FLAG_OFFSET (LapicFlags,0), "Processor Enabled", 0}, + {ACPI_DMT_FLAG1, ACPI_MADT0_FLAG_OFFSET (LapicFlags,0), "Runtime Online Capable", 0}, ACPI_DMT_TERMINATOR }; @@ -575,7 +576,8 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoMadt11[] = {ACPI_DMT_UINT64, ACPI_MADT11_OFFSET (GicrBaseAddress), "Redistributor Base Address", 0}, {ACPI_DMT_UINT64, ACPI_MADT11_OFFSET (ArmMpidr), "ARM MPIDR", 0}, {ACPI_DMT_UINT8, ACPI_MADT11_OFFSET (EfficiencyClass), "Efficiency Class", 0}, - {ACPI_DMT_UINT24, ACPI_MADT11_OFFSET (Reserved2[0]), "Reserved", 0}, + {ACPI_DMT_UINT8, ACPI_MADT11_OFFSET (Reserved2[0]), "Reserved", 0}, + {ACPI_DMT_UINT16, ACPI_MADT11_OFFSET (SpeInterrupt), "SPE Overflow Interrupt", 0}, ACPI_DMT_TERMINATOR }; @@ -838,7 +840,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoNfit0[] = {ACPI_DMT_FLAG1, ACPI_NFIT0_FLAG_OFFSET (Flags,0), "Proximity Domain Valid", 0}, {ACPI_DMT_UINT32, ACPI_NFIT0_OFFSET (Reserved), "Reserved", 0}, {ACPI_DMT_UINT32, ACPI_NFIT0_OFFSET (ProximityDomain), "Proximity Domain", 0}, - {ACPI_DMT_UUID, ACPI_NFIT0_OFFSET (RangeGuid[0]), "Address Range GUID", 0}, + {ACPI_DMT_UUID, ACPI_NFIT0_OFFSET (RangeGuid[0]), "Region Type GUID", 0}, {ACPI_DMT_UINT64, ACPI_NFIT0_OFFSET (Address), "Address Range Base", 0}, {ACPI_DMT_UINT64, ACPI_NFIT0_OFFSET (Length), "Address Range Length", 0}, {ACPI_DMT_UINT64, ACPI_NFIT0_OFFSET (MemoryMapping), "Memory Map Attribute", 0}, @@ -1138,6 +1140,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoPdtt0[] = {ACPI_DMT_UINT8, ACPI_PDTT0_OFFSET (Flags), "Flags (Decoded Below)", DT_FLAG}, {ACPI_DMT_FLAG0, ACPI_PDTT0_FLAG_OFFSET (Flags,0), "Runtime Trigger", 0}, {ACPI_DMT_FLAG1, ACPI_PDTT0_FLAG_OFFSET (Flags,0), "Wait for Completion", 0}, + {ACPI_DMT_FLAG2, ACPI_PDTT0_FLAG_OFFSET (Flags,0), "Trigger Order", 0}, ACPI_DMT_TERMINATOR }; @@ -1240,6 +1243,9 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoPptt0[] = {ACPI_DMT_UINT32, ACPI_PPTT0_OFFSET (Flags), "Flags (decoded below)", 0}, {ACPI_DMT_FLAG0, ACPI_PPTT0_FLAG_OFFSET (Flags,0), "Physical package", 0}, {ACPI_DMT_FLAG1, ACPI_PPTT0_FLAG_OFFSET (Flags,0), "ACPI Processor ID valid", 0}, + {ACPI_DMT_FLAG2, ACPI_PPTT0_FLAG_OFFSET (Flags,0), "Processor is a thread", 0}, + {ACPI_DMT_FLAG3, ACPI_PPTT0_FLAG_OFFSET (Flags,0), "Node is a leaf", 0}, + {ACPI_DMT_FLAG4, ACPI_PPTT0_FLAG_OFFSET (Flags,0), "Identical Implementation", 0}, {ACPI_DMT_UINT32, ACPI_PPTT0_OFFSET (Parent), "Parent", 0}, {ACPI_DMT_UINT32, ACPI_PPTT0_OFFSET (AcpiProcessorId), "ACPI Processor ID", 0}, {ACPI_DMT_UINT32, ACPI_PPTT0_OFFSET (NumberOfPrivResources), "Private Resource Number", 0}, @@ -1282,12 +1288,12 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoPptt1[] = ACPI_DMTABLE_INFO AcpiDmTableInfoPptt2[] = { {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (Reserved), "Reserved", 0}, - {ACPI_DMT_UINT32, ACPI_PPTT2_OFFSET (VendorId), "VENDOR_ID", 0}, - {ACPI_DMT_UINT64, ACPI_PPTT2_OFFSET (Level1Id), "LEVEL_1_ID", 0}, - {ACPI_DMT_UINT64, ACPI_PPTT2_OFFSET (Level2Id), "LEVEL_2_ID", 0}, - {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (MajorRev), "MAJOR_REV", 0}, - {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (MinorRev), "MINOR_REV", 0}, - {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (SpinRev), "SPIN_REV", 0}, + {ACPI_DMT_UINT32, ACPI_PPTT2_OFFSET (VendorId), "Vendor ID", 0}, + {ACPI_DMT_UINT64, ACPI_PPTT2_OFFSET (Level1Id), "Level1 ID", 0}, + {ACPI_DMT_UINT64, ACPI_PPTT2_OFFSET (Level2Id), "Level2 ID", 0}, + {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (MajorRev), "Major revision", 0}, + {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (MinorRev), "Minor revision", 0}, + {ACPI_DMT_UINT16, ACPI_PPTT2_OFFSET (SpinRev), "Spin revision", 0}, ACPI_DMT_TERMINATOR }; @@ -1365,7 +1371,7 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoSbst[] = /******************************************************************************* * - * SDEI - Software Delegated Execption Interface Descriptor Table + * SDEI - Software Delegated Exception Interface Descriptor Table * ******************************************************************************/ diff --git a/source/common/dmtbinfo3.c b/source/common/dmtbinfo3.c index 4605eaa..178d02e 100644 --- a/source/common/dmtbinfo3.c +++ b/source/common/dmtbinfo3.c @@ -260,6 +260,20 @@ ACPI_DMTABLE_INFO AcpiDmTableInfoSrat4[] = ACPI_DMT_TERMINATOR }; +/* 5: Generic Initiator Affinity Structure (ACPI 6.3) */ + +ACPI_DMTABLE_INFO AcpiDmTableInfoSrat5[] = +{ + {ACPI_DMT_UINT8, ACPI_SRAT5_OFFSET (Reserved), "Reserved1", 0}, + {ACPI_DMT_UINT8, ACPI_SRAT5_OFFSET (DeviceHandleType), "Device Handle Type", 0}, + {ACPI_DMT_UINT32, ACPI_SRAT5_OFFSET (ProximityDomain), "Proximity Domain", 0}, + {ACPI_DMT_BUF16, ACPI_SRAT5_OFFSET (DeviceHandle), "Device Handle", 0}, + {ACPI_DMT_UINT32, ACPI_SRAT5_OFFSET (Flags), "Flags (decoded below)", DT_FLAG}, + {ACPI_DMT_FLAG0, ACPI_SRAT5_FLAG_OFFSET (Flags,0), "Enabled", 0}, + {ACPI_DMT_UINT32, ACPI_SRAT5_OFFSET (Reserved1), "Reserved2", 0}, + ACPI_DMT_TERMINATOR +}; + /******************************************************************************* * diff --git a/source/compiler/aslcompile.c b/source/compiler/aslcompile.c index ff9c482..e178630 100644 --- a/source/compiler/aslcompile.c +++ b/source/compiler/aslcompile.c @@ -386,6 +386,7 @@ CmDoCompile ( UtEndEvent (Event); UtEndEvent (FullCompile); + AslCheckExpectedExceptions (); CmCleanupAndExit (); return (0); @@ -703,7 +704,6 @@ CmCleanupAndExit ( BOOLEAN DeleteAmlFile = FALSE; - AslCheckExpectedExceptions (); AePrintErrorLog (ASL_FILE_STDERR); if (AslGbl_DebugFlag) { diff --git a/source/compiler/aslcompiler.h b/source/compiler/aslcompiler.h index 21d931b..791ec81 100644 --- a/source/compiler/aslcompiler.h +++ b/source/compiler/aslcompiler.h @@ -594,7 +594,7 @@ OpnDoPackage ( /* - * aslopt - optmization + * aslopt - optimization */ void OptOptimizeNamePath ( @@ -1045,7 +1045,7 @@ OtXrefWalkPart1 ( /* - * aslutils - common compiler utilites + * aslutils - common compiler utilities */ void DbgPrint ( diff --git a/source/compiler/aslcompiler.l b/source/compiler/aslcompiler.l index 0e5ef1b..f6a06e8 100644 --- a/source/compiler/aslcompiler.l +++ b/source/compiler/aslcompiler.l @@ -584,7 +584,7 @@ NamePathTail [.]{NameSeg} "IPMI" { count (0); return (PARSEOP_REGIONSPACE_IPMI); } "GeneralPurposeIo" { count (0); return (PARSEOP_REGIONSPACE_GPIO); } /* ACPI 5.0 */ "GenericSerialBus" { count (0); return (PARSEOP_REGIONSPACE_GSBUS); } /* ACPI 5.0 */ -"PCC" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */ +"PlatformCommChannel" { count (0); return (PARSEOP_REGIONSPACE_PCC); } /* ACPI 5.0 */ "FFixedHW" { count (0); return (PARSEOP_REGIONSPACE_FFIXEDHW); } /* ResourceTypeKeyword: Resource Usage - Resource Descriptors */ @@ -708,6 +708,13 @@ NamePathTail [.]{NameSeg} s=UtLocalCacheCalloc (ACPI_NAME_SIZE + 1); if (strcmp (AslCompilertext, "\\")) { + /* + * According to the ACPI specification, + * NameSegments must have length of 4. If + * the NameSegment has length less than 4, + * they are padded with underscores to meet + * the required length. + */ strcpy (s, "____"); AcpiUtStrupr (AslCompilertext); } diff --git a/source/compiler/aslload.c b/source/compiler/aslload.c index c9f4842..e6a01a0 100644 --- a/source/compiler/aslload.c +++ b/source/compiler/aslload.c @@ -223,8 +223,8 @@ LdLoadFieldElements ( * The name already exists in this scope * But continue processing the elements */ - AslDualParseOpError (ASL_WARNING, ASL_MSG_EXTERN_COLLISION, Child, - Child->Asl.Value.String, ASL_MSG_EXTERN_FOUND_HERE, Node->Op, + AslDualParseOpError (ASL_WARNING, ASL_MSG_NAME_EXISTS, Child, + Child->Asl.Value.String, ASL_MSG_FOUND_HERE, Node->Op, Node->Op->Asl.ExternalName); } } @@ -467,7 +467,7 @@ LdNamespace1Begin ( if (Status == AE_NOT_FOUND) { /* - * This is either a foward reference or the object truly + * This is either a forward reference or the object truly * does not exist. The two cases can only be differentiated * during the cross-reference stage later. Mark the Op/Name * as not-found for now to indicate the need for further diff --git a/source/compiler/aslmessages.c b/source/compiler/aslmessages.c index 32f5ed7..074ccb1 100644 --- a/source/compiler/aslmessages.c +++ b/source/compiler/aslmessages.c @@ -245,15 +245,17 @@ const char *AslCompilerMsgs [] = /* ASL_MSG_NULL_RESOURCE_TEMPLATE */ "Empty Resource Template (END_TAG only)", /* ASL_MSG_FOUND_HERE */ "Original name creation/declaration below: ", /* ASL_MSG_ILLEGAL_RECURSION */ "Illegal recursive call to method that creates named objects", -/* ASL_MSG_EXTERN_COLLISION */ "A name cannot be defined and declared external in the same table", -/* ASL_MSG_FOUND_HERE_EXTERN */ "Remove one of the declarations indicated above or below:", +/* ASL_MSG_PLACE_HOLDER_00 */ "", /* TODO: fill in this slot with a new error message */ +/* ASL_MSG_PLACE_HOLDER_01 */ "", /* TODO: fill in this slot with a new error message */ /* ASL_MSG_OEM_TABLE_ID */ "Invalid OEM Table ID", /* ASL_MSG_OEM_ID */ "Invalid OEM ID", /* ASL_MSG_UNLOAD */ "Unload is not supported by all operating systems", /* ASL_MSG_OFFSET */ "Unnecessary/redundant use of Offset operator", /* ASL_MSG_LONG_SLEEP */ "Very long Sleep, greater than 1 second", /* ASL_MSG_PREFIX_NOT_EXIST */ "One or more prefix Scopes do not exist", -/* ASL_MSG_NAMEPATH_NOT_EXIST */ "One or more objects within the Pathname do not exist" +/* ASL_MSG_NAMEPATH_NOT_EXIST */ "One or more objects within the Pathname do not exist", +/* ASL_MSG_REGION_LENGTH */ "Operation Region declared with zero length", +/* ASL_MSG_TEMPORARY_OBJECT */ "Object is created temporarily in another method and cannot be accessed" }; /* Table compiler */ diff --git a/source/compiler/aslmessages.h b/source/compiler/aslmessages.h index 84148a4..4c5de61 100644 --- a/source/compiler/aslmessages.h +++ b/source/compiler/aslmessages.h @@ -247,8 +247,8 @@ typedef enum ASL_MSG_NULL_RESOURCE_TEMPLATE, ASL_MSG_FOUND_HERE, ASL_MSG_ILLEGAL_RECURSION, - ASL_MSG_EXTERN_COLLISION, - ASL_MSG_EXTERN_FOUND_HERE, + ASL_MSG_PLACE_HOLDER_00, + ASL_MSG_PLACE_HOLDER_01, ASL_MSG_OEM_TABLE_ID, ASL_MSG_OEM_ID, ASL_MSG_UNLOAD, @@ -256,6 +256,8 @@ typedef enum ASL_MSG_LONG_SLEEP, ASL_MSG_PREFIX_NOT_EXIST, ASL_MSG_NAMEPATH_NOT_EXIST, + ASL_MSG_REGION_LENGTH, + ASL_MSG_TEMPORARY_OBJECT, /* These messages are used by the Data Table compiler only */ diff --git a/source/compiler/asloperands.c b/source/compiler/asloperands.c index bf6ad01..a82000e 100644 --- a/source/compiler/asloperands.c +++ b/source/compiler/asloperands.c @@ -549,6 +549,7 @@ OpnDoRegion ( ACPI_PARSE_OBJECT *Op) { ACPI_PARSE_OBJECT *Next; + ACPI_ADR_SPACE_TYPE SpaceId; /* Opcode is parent node */ @@ -556,9 +557,10 @@ OpnDoRegion ( Next = Op->Asl.Child; - /* Second child is the space ID*/ + /* Second child is the space ID */ Next = Next->Asl.Next; + SpaceId = (ACPI_ADR_SPACE_TYPE) Next->Common.Value.Integer; /* Third child is the region offset */ @@ -569,7 +571,13 @@ OpnDoRegion ( Next = Next->Asl.Next; if (Next->Asl.ParseOpcode == PARSEOP_INTEGER) { + /* Check for zero length */ + Op->Asl.Value.Integer = Next->Asl.Value.Integer; + if (!Op->Asl.Value.Integer && (SpaceId < ACPI_NUM_PREDEFINED_REGIONS)) + { + AslError (ASL_ERROR, ASL_MSG_REGION_LENGTH, Op, NULL); + } } else { diff --git a/source/compiler/aslopt.c b/source/compiler/aslopt.c index e242b88..74c1667 100644 --- a/source/compiler/aslopt.c +++ b/source/compiler/aslopt.c @@ -706,7 +706,7 @@ OptOptimizeNamePath ( ACPI_FREE (ExternalNameString); /* - * Attempt an optmization depending on the type of namepath + * Attempt an optimization depending on the type of namepath */ if (Flags & (AML_NAMED | AML_CREATE)) { diff --git a/source/compiler/aslpredef.c b/source/compiler/aslpredef.c index 4a0d1f7..60a30bf 100644 --- a/source/compiler/aslpredef.c +++ b/source/compiler/aslpredef.c @@ -341,7 +341,7 @@ ApCheckPredefinedReturnValue ( * DESCRIPTION: Check for a predefined name for a static object (created via * the ASL Name operator). If it is a predefined ACPI name, ensure * that the name does not require any arguments (which would - * require a control method implemenation of the name), and that + * require a control method implementation of the name), and that * the type of the object is one of the expected types for the * predefined name. * diff --git a/source/compiler/aslprintf.c b/source/compiler/aslprintf.c index 124d66d..7b49ff6 100644 --- a/source/compiler/aslprintf.c +++ b/source/compiler/aslprintf.c @@ -131,7 +131,7 @@ OpcDoFprintf ( * RETURN: None * * DESCRIPTION: Convert printf macro to a Store AML operation. The printf - * macro parse tree is layed out as follows: + * macro parse tree is laid out as follows: * * Op - printf parse op * Op->Child - Format string diff --git a/source/compiler/aslresources.y b/source/compiler/aslresources.y index f73fb21..7cc1d19 100644 --- a/source/compiler/aslresources.y +++ b/source/compiler/aslresources.y @@ -758,7 +758,7 @@ UartSerialBusTerm OptionalBitsPerByte /* 05: BitsPerByte */ OptionalStopBits /* 06: StopBits */ ',' ByteConstExpr /* 08: LinesInUse */ - OptionalEndian /* 09: Endianess */ + OptionalEndian /* 09: Endianness */ OptionalParityType /* 10: Parity */ OptionalFlowControl /* 11: FlowControl */ ',' WordConstExpr /* 13: Rx BufferSize */ @@ -783,7 +783,7 @@ UartSerialBusTermV2 OptionalBitsPerByte /* 05: BitsPerByte */ OptionalStopBits /* 06: StopBits */ ',' ByteConstExpr /* 08: LinesInUse */ - OptionalEndian /* 09: Endianess */ + OptionalEndian /* 09: Endianness */ OptionalParityType /* 10: Parity */ OptionalFlowControl /* 11: FlowControl */ ',' WordConstExpr /* 13: Rx BufferSize */ diff --git a/source/compiler/aslsupport.l b/source/compiler/aslsupport.l index d99b96b..22939dd 100644 --- a/source/compiler/aslsupport.l +++ b/source/compiler/aslsupport.l @@ -502,7 +502,7 @@ loop: /* * Check for nested comment -- can help catch cases where a previous - * comment was accidently left unterminated + * comment was accidentally left unterminated */ if ((c1 == '/') && (c == '*')) { diff --git a/source/compiler/aslxref.c b/source/compiler/aslxref.c index 750b64c..699d560 100644 --- a/source/compiler/aslxref.c +++ b/source/compiler/aslxref.c @@ -66,6 +66,12 @@ XfNamespaceLocateEnd ( UINT32 Level, void *Context); +static BOOLEAN +XfValidateCrossReference ( + ACPI_PARSE_OBJECT *Op, + const ACPI_OPCODE_INFO *OpInfo, + ACPI_NAMESPACE_NODE *Node); + static ACPI_PARSE_OBJECT * XfGetParentMethod ( ACPI_PARSE_OBJECT *Op); @@ -300,6 +306,7 @@ XfGetParentMethod ( return (NULL); /* No parent method found */ } + /******************************************************************************* * * FUNCTION: XfNamespaceLocateBegin @@ -380,7 +387,7 @@ XfNamespaceLocateBegin ( Node->ArgCount = (UINT8) (((UINT8) NextOp->Asl.Value.Integer) & 0x07); - /* We will track all posible ArgXs */ + /* We will track all possible ArgXs */ for (i = 0; i < ACPI_METHOD_NUM_ARGS; i++) { @@ -668,6 +675,15 @@ XfNamespaceLocateBegin ( return_ACPI_STATUS (Status); } + /* Check for an attempt to access an object in another method */ + + if (!XfValidateCrossReference (Op, OpInfo, Node)) + { + AslError (ASL_ERROR, ASL_MSG_TEMPORARY_OBJECT, Op, + Op->Asl.ExternalName); + return_ACPI_STATUS (Status); + } + /* Object was found above, check for an illegal forward reference */ if (Op->Asl.CompileFlags & OP_NOT_FOUND_DURING_LOAD) @@ -1126,3 +1142,103 @@ XfNamespaceLocateEnd ( return_ACPI_STATUS (AE_OK); } + + +/******************************************************************************* + * + * FUNCTION: XfValidateCrossReference + * + * PARAMETERS: Op - Parse Op that references the object + * OpInfo - Parse Op info struct + * Node - Node for the referenced object + * + * RETURN: TRUE if the reference is legal, FALSE otherwise + * + * DESCRIPTION: Determine if a reference to another object is allowed. + * + * EXAMPLE: + * Method (A) {Name (INT1, 1)} Declaration of object INT1 + * Method (B) (Store (2, \A.INT1)} Illegal reference to object INT1 + * (INT1 is temporary, valid only during + * execution of A) + * + * NOTES: + * A null pointer returned by either XfGetParentMethod or + * UtGetParentMethod indicates that the parameter object is not + * within a control method. + * + * Five cases are handled: Case(Op, Node) + * 1) Case(0,0): Op is not within a method, Node is not --> OK + * 2) Case(0,1): Op is not within a method, but Node is --> Illegal + * 3) Case(1,0): Op is within a method, Node is not --> OK + * 4) Case(1,1): Both are within the same method --> OK + * 5) Case(1,1): Both are in methods, but not same method --> Illegal + * + ******************************************************************************/ + +static BOOLEAN +XfValidateCrossReference ( + ACPI_PARSE_OBJECT *Op, + const ACPI_OPCODE_INFO *OpInfo, + ACPI_NAMESPACE_NODE *Node) +{ + ACPI_PARSE_OBJECT *ReferencingMethodOp; + ACPI_NAMESPACE_NODE *ReferencedMethodNode; + + + /* Ignore actual named (and related) object declarations */ + + if (OpInfo->Flags & (AML_NAMED | AML_CREATE | AML_DEFER | AML_HAS_ARGS)) + { + return (TRUE); + } + + /* + * 1) Search upwards in parse tree for owner of the referencing object + * 2) Search upwards in namespace to find the owner of the referenced object + */ + ReferencingMethodOp = XfGetParentMethod (Op); + ReferencedMethodNode = UtGetParentMethod (Node); + + if (!ReferencingMethodOp && !ReferencedMethodNode) + { + /* + * 1) Case (0,0): Both Op and Node are not within methods + * --> OK + */ + return (TRUE); + } + + if (!ReferencingMethodOp && ReferencedMethodNode) + { + /* + * 2) Case (0,1): Op is not in a method, but Node is within a + * method --> illegal + */ + return (FALSE); + } + else if (ReferencingMethodOp && !ReferencedMethodNode) + { + /* + * 3) Case (1,0): Op is within a method, but Node is not + * --> OK + */ + return (TRUE); + } + else if (ReferencingMethodOp->Asl.Node == ReferencedMethodNode) + { + /* + * 4) Case (1,1): Both Op and Node are within the same method + * --> OK + */ + return (TRUE); + } + else + { + /* + * 5) Case (1,1), Op and Node are in different methods + * --> Illegal + */ + return (FALSE); + } +} diff --git a/source/compiler/cvcompiler.c b/source/compiler/cvcompiler.c index 2d6712d..feb9ff4 100644 --- a/source/compiler/cvcompiler.c +++ b/source/compiler/cvcompiler.c @@ -60,7 +60,7 @@ * * DESCRIPTION: Process a single line comment of a c Style comment. This * function captures a line of a c style comment in a char* and - * places the comment in the approperiate global buffer. + * places the comment in the appropriate global buffer. * ******************************************************************************/ @@ -186,7 +186,7 @@ CvProcessComment ( * RETURN: none * * DESCRIPTION: Process a single line comment. This function captures a comment - * in a char* and places the comment in the approperiate global + * in a char* and places the comment in the appropriate global * buffer through CvPlaceComment * ******************************************************************************/ @@ -225,7 +225,7 @@ CvProcessCommentType2 ( * * would be lexically analyzed as a single comment. * - * Create a new string with the approperiate spaces. Since we need + * Create a new string with the appropriate spaces. Since we need * to account for the proper spacing, the actual comment, * extra 2 spaces so that this comment can be converted to the "/ *" * style and the null terminator, the string would look something @@ -272,7 +272,7 @@ CvProcessCommentType2 ( * RETURN: TotalCommentLength - Length of all comments within this op. * * DESCRIPTION: Calculate the length that the each comment takes up within Op. - * Comments look like the follwoing: [0xA9 OptionBtye comment 0x00] + * Comments look like the following: [0xA9 OptionBtye comment 0x00] * therefore, we add 1 + 1 + strlen (comment) + 1 to get the actual * length of this comment. * @@ -855,7 +855,7 @@ CvAppendInlineComment ( * RETURN: None * * DESCRIPTION: Given type and CommentString, this function places the - * CommentString in the approperiate global comment list or char* + * CommentString in the appropriate global comment list or char* * ******************************************************************************/ diff --git a/source/compiler/cvparser.c b/source/compiler/cvparser.c index 0e62904..03148a7 100644 --- a/source/compiler/cvparser.c +++ b/source/compiler/cvparser.c @@ -168,7 +168,7 @@ CvInitFileTree ( AcpiGbl_FileTreeRoot->File = AcpiGbl_OutputFile; /* - * Set this to true because we dont need to output + * Set this to true because we don't need to output * an include statement for the topmost file */ AcpiGbl_FileTreeRoot->IncludeWritten = TRUE; @@ -406,7 +406,7 @@ CvFileAddressLookup( * RETURN: None * * DESCRIPTION: Takes a given parse op, looks up its Op->Common.Aml field - * within the file tree and fills in approperiate file information + * within the file tree and fills in appropriate file information * from a matching node within the tree. * This is referred as ASL_CV_LABEL_FILENODE. * @@ -897,7 +897,7 @@ CvCaptureComments ( * * RETURN: None * - * DESCRIPTION: Transfer all of the commments stored in global containers to the + * DESCRIPTION: Transfer all of the comments stored in global containers to the * given Op. This will be invoked shortly after the parser creates * a ParseOp. * This is referred as ASL_CV_TRANSFER_COMMENTS. diff --git a/source/compiler/dtexpress.c b/source/compiler/dtexpress.c index b796598..a6d18ec 100644 --- a/source/compiler/dtexpress.c +++ b/source/compiler/dtexpress.c @@ -264,7 +264,7 @@ DtDoOperator ( * * RETURN: Table offset associated with the label * - * DESCRIPTION: Lookup a lable and return its value. + * DESCRIPTION: Lookup a label and return its value. * *****************************************************************************/ diff --git a/source/compiler/dtio.c b/source/compiler/dtio.c index 4094003..a5422a2 100644 --- a/source/compiler/dtio.c +++ b/source/compiler/dtio.c @@ -267,7 +267,7 @@ DtParseLine ( return (AE_OK); } - /* All lines after "Raw Table Data" are ingored */ + /* All lines after "Raw Table Data" are ignored */ if (strstr (LineBuffer, ACPI_RAW_TABLE_DATA_HEADER)) { diff --git a/source/compiler/dttable1.c b/source/compiler/dttable1.c index 481bd5c..2768836 100644 --- a/source/compiler/dttable1.c +++ b/source/compiler/dttable1.c @@ -723,7 +723,7 @@ DtCompileDrtm ( DtInsertSubtable (ParentTable, Subtable); /* - * Using ACPI_SUB_PTR, We needn't define a seperate structure. Care + * Using ACPI_SUB_PTR, We needn't define a separate structure. Care * should be taken to avoid accessing ACPI_TABLE_HADER fields. */ #if 0 @@ -894,7 +894,14 @@ DtCompileGtdt ( ACPI_SUBTABLE_HEADER *GtdtHeader; ACPI_DMTABLE_INFO *InfoTable; UINT32 GtCount; + ACPI_TABLE_HEADER *Header; + + + ParentTable = DtPeekSubtable (); + Header = ACPI_CAST_PTR (ACPI_TABLE_HEADER, ParentTable->Buffer); + + /* Compile the main table */ Status = DtCompileTable (PFieldList, AcpiDmTableInfoGtdt, &Subtable); @@ -903,6 +910,21 @@ DtCompileGtdt ( return (Status); } + /* GTDT revision 3 later contains 2 extra fields before subtables */ + + if (Header->Revision > 2) + { + ParentTable = DtPeekSubtable (); + DtInsertSubtable (ParentTable, Subtable); + + Status = DtCompileTable (PFieldList, + AcpiDmTableInfoGtdtEl2, &Subtable); + if (ACPI_FAILURE (Status)) + { + return (Status); + } + } + ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); diff --git a/source/compiler/dttable2.c b/source/compiler/dttable2.c index 88c1665..c24bcbe 100644 --- a/source/compiler/dttable2.c +++ b/source/compiler/dttable2.c @@ -1625,6 +1625,11 @@ DtCompileSrat ( InfoTable = AcpiDmTableInfoSrat4; break; + case ACPI_SRAT_TYPE_GENERIC_AFFINITY: + + InfoTable = AcpiDmTableInfoSrat5; + break; + default: DtFatal (ASL_MSG_UNKNOWN_SUBTABLE, SubtableStart, "SRAT"); diff --git a/source/compiler/dttemplate.h b/source/compiler/dttemplate.h index 0428e55..41aaee8 100644 --- a/source/compiler/dttemplate.h +++ b/source/compiler/dttemplate.h @@ -437,34 +437,35 @@ const unsigned char TemplateFpdt[] = const unsigned char TemplateGtdt[] = { - 0x47,0x54,0x44,0x54,0xe0,0x00,0x00,0x00, /* 00000000 "GTDT...." */ - 0x02,0xb0,0x4c,0x49,0x4e,0x41,0x52,0x4f, /* 00000008 "..LINARO" */ - 0x52,0x54,0x53,0x4d,0x56,0x45,0x56,0x38, /* 00000010 "RTSMVEV8" */ - 0x01,0x00,0x00,0x00,0x49,0x4e,0x54,0x4c, /* 00000018 "....INTL" */ - 0x24,0x04,0x14,0x20,0x00,0x00,0x00,0x00, /* 00000020 "$.. ...." */ + 0x47,0x54,0x44,0x54,0xE8,0x00,0x00,0x00, /* 00000000 "GTDT...." */ + 0x03,0x5D,0x4C,0x49,0x4E,0x41,0x52,0x4F, /* 00000008 ".]LINARO" */ + 0x52,0x54,0x53,0x4D,0x56,0x45,0x56,0x38, /* 00000010 "RTSMVEV8" */ + 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ + 0x08,0x01,0x19,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */ - 0x1d,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000030 "........" */ - 0x1e,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000038 "........" */ - 0x1b,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000040 "........" */ - 0x1a,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000048 "........" */ + 0x1D,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000030 "........" */ + 0x1E,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000038 "........" */ + 0x1B,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000040 "........" */ + 0x1A,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000048 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000050 "........" */ 0x02,0x00,0x00,0x00,0x60,0x00,0x00,0x00, /* 00000058 "....`..." */ - 0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000060 ".d......" */ - 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, /* 00000068 "........" */ - 0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000070 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000078 "........" */ + 0x43,0x00,0x00,0x00,0x21,0x00,0x00,0x00, /* 00000060 "C...!..." */ + 0x00,0x64,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000068 ".d......" */ + 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00, /* 00000070 "........" */ + 0x14,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000078 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ - 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000088 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000088 "........" */ 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000090 "........" */ 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000098 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000a0 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000a8 "........" */ - 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000b0 "........" */ - 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000b8 "........" */ - 0x00,0x00,0x00,0x00,0x01,0x1c,0x00,0x00, /* 000000c0 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000c8 "........" */ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000d0 "........" */ - 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000d8 "........" */ + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000A0 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A8 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000B0 "........" */ + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000B8 "........" */ + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00, /* 000000C0 "........" */ + 0x00,0x00,0x00,0x00,0x01,0x1C,0x00,0x00, /* 000000C8 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000D0 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000D8 "........" */ + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00 /* 000000E0 "........" */ }; const unsigned char TemplateHest[] = @@ -554,10 +555,10 @@ const unsigned char TemplateHest[] = const unsigned char TemplateHmat[] = { 0x48,0x4D,0x41,0x54,0x9C,0x00,0x00,0x00, /* 00000000 "HMAT...." */ - 0x00,0x54,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 ".TINTEL " */ + 0x02,0x4D,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 ".MINTEL " */ 0x54,0x45,0x4D,0x50,0x4C,0x41,0x54,0x45, /* 00000010 "TEMPLATE" */ 0x00,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x03,0x03,0x17,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ + 0x08,0x01,0x19,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ 0x00,0x00,0x00,0x00,0x28,0x00,0x00,0x00, /* 00000028 "....(..." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ @@ -709,10 +710,10 @@ const unsigned char TemplateLpit[] = const unsigned char TemplateMadt[] = { 0x41,0x50,0x49,0x43,0x5A,0x01,0x00,0x00, /* 00000000 "APICZ..." */ - 0x03,0xEA,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ + 0x05,0xEF,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000010 "Template" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x10,0x04,0x15,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ + 0x08,0x01,0x19,0x20,0x00,0x00,0x00,0x00, /* 00000020 "... ...." */ 0x01,0x00,0x00,0x00,0x00,0x08,0x00,0x00, /* 00000028 "........" */ 0x01,0x00,0x00,0x00,0x01,0x0C,0x01,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ @@ -1267,11 +1268,11 @@ const unsigned char TemplateSpmi[] = const unsigned char TemplateSrat[] = { - 0x53,0x52,0x41,0x54,0x9E,0x00,0x00,0x00, /* 00000000 "SRAT...." */ - 0x03,0x55,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 ".UINTEL " */ + 0x53,0x52,0x41,0x54,0xBE,0x00,0x00,0x00, /* 00000000 "SRAT...." */ + 0x03,0xE6,0x49,0x4E,0x54,0x45,0x4C,0x20, /* 00000008 "..INTEL " */ 0x54,0x65,0x6D,0x70,0x6C,0x61,0x74,0x65, /* 00000010 "Template" */ 0x01,0x00,0x00,0x00,0x49,0x4E,0x54,0x4C, /* 00000018 "....INTL" */ - 0x03,0x03,0x17,0x20,0x01,0x00,0x00,0x00, /* 00000020 "... ...." */ + 0x29,0x06,0x18,0x20,0x01,0x00,0x00,0x00, /* 00000020 ").. ...." */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000028 "........" */ 0x00,0x10,0x00,0x00,0x01,0x00,0x00,0x00, /* 00000030 "........" */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000038 "........" */ @@ -1286,7 +1287,11 @@ const unsigned char TemplateSrat[] = 0x03,0x12,0x00,0x00,0x00,0x00,0x00,0x00, /* 00000080 "........" */ 0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, /* 00000088 "........" */ 0x00,0x00,0x04,0x0C,0x00,0x00,0x00,0x00, /* 00000090 "........" */ - 0x00,0x00,0x01,0x00,0x00,0x00 /* 00000098 "......" */ + 0x00,0x00,0x01,0x00,0x00,0x00,0x05,0x20, /* 00000098 "....... " */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A0 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000A8 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 000000B0 "........" */ + 0x00,0x00,0x00,0x00,0x00,0x00 /* 000000B8 "......" */ }; const unsigned char TemplateStao[] = diff --git a/source/components/debugger/dbdisply.c b/source/components/debugger/dbdisply.c index e5ef88b..da1214c 100644 --- a/source/components/debugger/dbdisply.c +++ b/source/components/debugger/dbdisply.c @@ -302,7 +302,7 @@ AcpiDbDecodeAndDisplayObject ( default: - /* Is not a recognizeable object */ + /* Is not a recognizable object */ AcpiOsPrintf ( "Not a known ACPI internal object, descriptor type %2.2X\n", @@ -758,7 +758,7 @@ AcpiDbDisplayObjectType ( * * DESCRIPTION: Display the result of an AML opcode * - * Note: Curently only displays the result object if we are single stepping. + * Note: Currently only displays the result object if we are single stepping. * However, this output may be useful in other contexts and could be enabled * to do so if needed. * diff --git a/source/components/debugger/dbexec.c b/source/components/debugger/dbexec.c index 7a836d4..3f3fa5c 100644 --- a/source/components/debugger/dbexec.c +++ b/source/components/debugger/dbexec.c @@ -223,12 +223,12 @@ AcpiDbExecuteMethod ( } ACPI_EXCEPTION ((AE_INFO, Status, - "while executing %s from debugger", Info->Pathname)); + "while executing %s from AML Debugger", Info->Pathname)); if (Status == AE_BUFFER_OVERFLOW) { ACPI_ERROR ((AE_INFO, - "Possible overflow of internal debugger " + "Possible buffer overflow within AML Debugger " "buffer (size 0x%X needed 0x%X)", ACPI_DEBUG_BUFFER_SIZE, (UINT32) ReturnObj->Length)); } diff --git a/source/components/debugger/dbnames.c b/source/components/debugger/dbnames.c index f7024d2..b73a370 100644 --- a/source/components/debugger/dbnames.c +++ b/source/components/debugger/dbnames.c @@ -1067,7 +1067,7 @@ AcpiDbBusWalk ( * * RETURN: None * - * DESCRIPTION: Display info about system busses. + * DESCRIPTION: Display info about system buses. * ******************************************************************************/ diff --git a/source/components/debugger/dbobject.c b/source/components/debugger/dbobject.c index e6250d5..9541f9b 100644 --- a/source/components/debugger/dbobject.c +++ b/source/components/debugger/dbobject.c @@ -312,7 +312,7 @@ AcpiDbDisplayInternalObject ( AcpiOsPrintf ("[%s] ", AcpiUtGetReferenceName (ObjDesc)); - /* Decode the refererence */ + /* Decode the reference */ switch (ObjDesc->Reference.Class) { diff --git a/source/components/debugger/dbtest.c b/source/components/debugger/dbtest.c index c2f05f5..b6b66ef 100644 --- a/source/components/debugger/dbtest.c +++ b/source/components/debugger/dbtest.c @@ -46,6 +46,7 @@ #include "acdebug.h" #include "acnamesp.h" #include "acpredef.h" +#include "acinterp.h" #define _COMPONENT ACPI_CA_DEBUGGER @@ -85,6 +86,10 @@ AcpiDbTestPackageType ( ACPI_NAMESPACE_NODE *Node); static ACPI_STATUS +AcpiDbTestFieldUnitType ( + ACPI_OPERAND_OBJECT *ObjDesc); + +static ACPI_STATUS AcpiDbReadFromObject ( ACPI_NAMESPACE_NODE *Node, ACPI_OBJECT_TYPE ExpectedType, @@ -133,7 +138,7 @@ static ACPI_DB_ARGUMENT_INFO AcpiDbTestTypes [] = static ACPI_HANDLE ReadHandle = NULL; static ACPI_HANDLE WriteHandle = NULL; -/* ASL Definitions of the debugger read/write control methods */ +/* ASL Definitions of the debugger read/write control methods. AML below. */ #if 0 DefinitionBlock ("ssdt.aml", "SSDT", 2, "Intel", "DEBUG", 0x00000001) @@ -299,10 +304,8 @@ AcpiDbTestAllObjects ( * RETURN: Status * * DESCRIPTION: Test one namespace object. Supported types are Integer, - * String, Buffer, BufferField, and FieldUnit. All other object - * types are simply ignored. - * - * Note: Support for Packages is not implemented. + * String, Buffer, Package, BufferField, and FieldUnit. + * All other object types are simply ignored. * ******************************************************************************/ @@ -315,7 +318,6 @@ AcpiDbTestOneObject ( { ACPI_NAMESPACE_NODE *Node; ACPI_OPERAND_OBJECT *ObjDesc; - ACPI_OPERAND_OBJECT *RegionObj; ACPI_OBJECT_TYPE LocalType; UINT32 BitLength = 0; UINT32 ByteLength = 0; @@ -358,19 +360,22 @@ AcpiDbTestOneObject ( break; case ACPI_TYPE_FIELD_UNIT: - case ACPI_TYPE_BUFFER_FIELD: case ACPI_TYPE_LOCAL_REGION_FIELD: case ACPI_TYPE_LOCAL_INDEX_FIELD: case ACPI_TYPE_LOCAL_BANK_FIELD: + LocalType = ACPI_TYPE_FIELD_UNIT; + break; + + case ACPI_TYPE_BUFFER_FIELD: + /* + * The returned object will be a Buffer if the field length + * is larger than the size of an Integer (32 or 64 bits + * depending on the DSDT version). + */ LocalType = ACPI_TYPE_INTEGER; if (ObjDesc) { - /* - * Returned object will be a Buffer if the field length - * is larger than the size of an Integer (32 or 64 bits - * depending on the DSDT version). - */ BitLength = ObjDesc->CommonField.BitLength; ByteLength = ACPI_ROUND_BITS_UP_TO_BYTES (BitLength); if (BitLength > AcpiGbl_IntegerBitWidth) @@ -380,9 +385,9 @@ AcpiDbTestOneObject ( } break; - default: +default: - /* Ignore all other types */ + /* Ignore all non-data types - Methods, Devices, Scopes, etc. */ return (AE_OK); } @@ -394,40 +399,10 @@ AcpiDbTestOneObject ( if (!ObjDesc) { - AcpiOsPrintf (" Ignoring, no attached object\n"); + AcpiOsPrintf (" No attached sub-object, ignoring\n"); return (AE_OK); } - /* - * Check for unsupported region types. Note: AcpiExec simulates - * access to SystemMemory, SystemIO, PCI_Config, and EC. - */ - switch (Node->Type) - { - case ACPI_TYPE_LOCAL_REGION_FIELD: - - RegionObj = ObjDesc->Field.RegionObj; - switch (RegionObj->Region.SpaceId) - { - case ACPI_ADR_SPACE_SYSTEM_MEMORY: - case ACPI_ADR_SPACE_SYSTEM_IO: - case ACPI_ADR_SPACE_PCI_CONFIG: - - break; - - default: - - AcpiOsPrintf (" %s space is not supported in this command [%4.4s]\n", - AcpiUtGetRegionName (RegionObj->Region.SpaceId), - RegionObj->Region.Node->Name.Ascii); - return (AE_OK); - } - break; - - default: - break; - } - /* At this point, we have resolved the object to one of the major types */ switch (LocalType) @@ -452,6 +427,11 @@ AcpiDbTestOneObject ( Status = AcpiDbTestPackageType (Node); break; + case ACPI_TYPE_FIELD_UNIT: + + Status = AcpiDbTestFieldUnitType (ObjDesc); + break; + default: AcpiOsPrintf (" Ignoring, type not implemented (%2.2X)", @@ -464,24 +444,8 @@ AcpiDbTestOneObject ( if (ACPI_FAILURE (Status)) { Status = AE_OK; - goto Exit; - } - - switch (Node->Type) - { - case ACPI_TYPE_LOCAL_REGION_FIELD: - - RegionObj = ObjDesc->Field.RegionObj; - AcpiOsPrintf (" (%s)", - AcpiUtGetRegionName (RegionObj->Region.SpaceId)); - - break; - - default: - break; } -Exit: AcpiOsPrintf ("\n"); return (Status); } @@ -531,7 +495,7 @@ AcpiDbTestIntegerType ( return (Status); } - AcpiOsPrintf (" (%4.4X/%3.3X) %8.8X%8.8X", + AcpiOsPrintf (ACPI_DEBUG_LENGTH_FORMAT " %8.8X%8.8X", BitLength, ACPI_ROUND_BITS_UP_TO_BYTES (BitLength), ACPI_FORMAT_UINT64 (Temp1->Integer.Value)); @@ -653,8 +617,8 @@ AcpiDbTestBufferType ( /* Emit a few bytes of the buffer */ - AcpiOsPrintf (" (%4.4X/%3.3X)", BitLength, Temp1->Buffer.Length); - for (i = 0; ((i < 4) && (i < ByteLength)); i++) + AcpiOsPrintf (ACPI_DEBUG_LENGTH_FORMAT, BitLength, Temp1->Buffer.Length); + for (i = 0; ((i < 8) && (i < ByteLength)); i++) { AcpiOsPrintf (" %2.2X", Temp1->Buffer.Pointer[i]); } @@ -768,7 +732,7 @@ AcpiDbTestStringType ( return (Status); } - AcpiOsPrintf (" (%4.4X/%3.3X) \"%s\"", (Temp1->String.Length * 8), + AcpiOsPrintf (ACPI_DEBUG_LENGTH_FORMAT " \"%s\"", (Temp1->String.Length * 8), Temp1->String.Length, Temp1->String.Pointer); /* Write a new value */ @@ -858,7 +822,7 @@ AcpiDbTestPackageType ( return (Status); } - AcpiOsPrintf (" %8.8X Elements", Temp1->Package.Count); + AcpiOsPrintf (" %.2X Elements", Temp1->Package.Count); AcpiOsFree (Temp1); return (Status); } @@ -866,6 +830,73 @@ AcpiDbTestPackageType ( /******************************************************************************* * + * FUNCTION: AcpiDbTestFieldUnitType + * + * PARAMETERS: ObjDesc - A field unit object + * + * RETURN: Status + * + * DESCRIPTION: Test read/write on a named field unit. + * + ******************************************************************************/ + +static ACPI_STATUS +AcpiDbTestFieldUnitType ( + ACPI_OPERAND_OBJECT *ObjDesc) +{ + ACPI_OPERAND_OBJECT *RegionObj; + UINT32 BitLength = 0; + UINT32 ByteLength = 0; + ACPI_STATUS Status = AE_OK; + ACPI_OPERAND_OBJECT *RetBufferDesc; + + + /* Supported spaces are memory/io/pci_config */ + + RegionObj = ObjDesc->Field.RegionObj; + switch (RegionObj->Region.SpaceId) + { + case ACPI_ADR_SPACE_SYSTEM_MEMORY: + case ACPI_ADR_SPACE_SYSTEM_IO: + case ACPI_ADR_SPACE_PCI_CONFIG: + + /* Need the interpreter to execute */ + + AcpiUtAcquireMutex (ACPI_MTX_INTERPRETER); + AcpiUtAcquireMutex (ACPI_MTX_NAMESPACE); + + /* Exercise read-then-write */ + + Status = AcpiExReadDataFromField (NULL, ObjDesc, &RetBufferDesc); + if (Status == AE_OK) + { + AcpiExWriteDataToField (RetBufferDesc, ObjDesc, NULL); + AcpiUtRemoveReference (RetBufferDesc); + } + + AcpiUtReleaseMutex (ACPI_MTX_NAMESPACE); + AcpiUtReleaseMutex (ACPI_MTX_INTERPRETER); + + BitLength = ObjDesc->CommonField.BitLength; + ByteLength = ACPI_ROUND_BITS_UP_TO_BYTES (BitLength); + + AcpiOsPrintf (ACPI_DEBUG_LENGTH_FORMAT " [%s]", BitLength, + ByteLength, AcpiUtGetRegionName (RegionObj->Region.SpaceId)); + return (Status); + + default: + + AcpiOsPrintf ( + " %s address space is not supported in this command [%4.4s]", + AcpiUtGetRegionName (RegionObj->Region.SpaceId), + RegionObj->Region.Node->Name.Ascii); + return (AE_OK); + } +} + + +/******************************************************************************* + * * FUNCTION: AcpiDbReadFromObject * * PARAMETERS: Node - Parent NS node for the object diff --git a/source/components/disassembler/dmbuffer.c b/source/components/disassembler/dmbuffer.c index 32cc8e9..3084c01 100644 --- a/source/components/disassembler/dmbuffer.c +++ b/source/components/disassembler/dmbuffer.c @@ -945,7 +945,7 @@ AcpiDmGetHardwareIdType ( } } - /* Mark this node as convertable to an EISA ID string */ + /* Mark this node as convertible to an EISA ID string */ Op->Common.DisasmOpcode = ACPI_DASM_EISAID; break; diff --git a/source/components/disassembler/dmcstyle.c b/source/components/disassembler/dmcstyle.c index 0409a20..414ff33 100644 --- a/source/components/disassembler/dmcstyle.c +++ b/source/components/disassembler/dmcstyle.c @@ -967,7 +967,7 @@ AcpiDmIsValidTarget ( * * DESCRIPTION: Determine if the Target duplicates the operand, in order to * detect if the expression can be converted to a compound - * assigment. (+=, *=, etc.) + * assignment. (+=, *=, etc.) * ******************************************************************************/ @@ -1023,7 +1023,7 @@ AcpiDmIsTargetAnOperand ( } } - /* Supress the duplicate operand at the top-level */ + /* Suppress the duplicate operand at the top-level */ if (TopLevel) { diff --git a/source/components/disassembler/dmnames.c b/source/components/disassembler/dmnames.c index 4e1e7d2..2059514 100644 --- a/source/components/disassembler/dmnames.c +++ b/source/components/disassembler/dmnames.c @@ -124,7 +124,7 @@ AcpiDmDumpName ( * * RETURN: Status * - * DESCRIPTION: Diplay the pathname associated with a named object. Two + * DESCRIPTION: Display the pathname associated with a named object. Two * versions. One searches the parse tree (for parser-only * applications suchas AcpiDump), and the other searches the * ACPI namespace (the parse tree is probably deleted) diff --git a/source/components/disassembler/dmresrc.c b/source/components/disassembler/dmresrc.c index 0443069..82fa618 100644 --- a/source/components/disassembler/dmresrc.c +++ b/source/components/disassembler/dmresrc.c @@ -234,7 +234,7 @@ AcpiDmBitList ( * * FUNCTION: AcpiDmResourceTemplate * - * PARAMETERS: Info - Curent parse tree walk info + * PARAMETERS: Info - Current parse tree walk info * ByteData - Pointer to the byte list data * ByteCount - Length of the byte list * @@ -447,7 +447,7 @@ AcpiDmIsResourceTemplate ( /* * Not a template if declared buffer length != actual length of the - * intialization byte list. Because the resource macros will create + * initialization byte list. Because the resource macros will create * a buffer of the exact required length (buffer length will be equal * to the actual length). * diff --git a/source/components/disassembler/dmresrcs.c b/source/components/disassembler/dmresrcs.c index 31f5b1b..16a2153 100644 --- a/source/components/disassembler/dmresrcs.c +++ b/source/components/disassembler/dmresrcs.c @@ -280,7 +280,7 @@ AcpiDmFixedIoDescriptor ( * * RETURN: None * - * DESCRIPTION: Decode a Start Dependendent functions descriptor + * DESCRIPTION: Decode a Start Dependent functions descriptor * ******************************************************************************/ diff --git a/source/components/dispatcher/dsfield.c b/source/components/dispatcher/dsfield.c index 44e2889..ec1c125 100644 --- a/source/components/dispatcher/dsfield.c +++ b/source/components/dispatcher/dsfield.c @@ -577,6 +577,12 @@ AcpiDsCreateField ( Info.RegionNode = RegionNode; Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); + if (Info.RegionNode->Type == ACPI_ADR_SPACE_PLATFORM_COMM && + !(RegionNode->Object->Field.InternalPccBuffer + = ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length))) + { + return_ACPI_STATUS (AE_NO_MEMORY); + } return_ACPI_STATUS (Status); } diff --git a/source/components/dispatcher/dsopcode.c b/source/components/dispatcher/dsopcode.c index 97d6b3f..1d35c5b 100644 --- a/source/components/dispatcher/dsopcode.c +++ b/source/components/dispatcher/dsopcode.c @@ -413,6 +413,7 @@ AcpiDsEvalRegionOperands ( ACPI_OPERAND_OBJECT *OperandDesc; ACPI_NAMESPACE_NODE *Node; ACPI_PARSE_OBJECT *NextOp; + ACPI_ADR_SPACE_TYPE SpaceId; ACPI_FUNCTION_TRACE_PTR (DsEvalRegionOperands, Op); @@ -422,11 +423,12 @@ AcpiDsEvalRegionOperands ( * This is where we evaluate the address and length fields of the * OpRegion declaration */ - Node = Op->Common.Node; + Node = Op->Common.Node; /* NextOp points to the op that holds the SpaceID */ NextOp = Op->Common.Value.Arg; + SpaceId = (ACPI_ADR_SPACE_TYPE) NextOp->Common.Value.Integer; /* NextOp points to address op */ @@ -464,6 +466,15 @@ AcpiDsEvalRegionOperands ( ObjDesc->Region.Length = (UINT32) OperandDesc->Integer.Value; AcpiUtRemoveReference (OperandDesc); + /* A zero-length operation region is unusable. Just warn */ + + if (!ObjDesc->Region.Length && (SpaceId < ACPI_NUM_PREDEFINED_REGIONS)) + { + ACPI_WARNING ((AE_INFO, + "Operation Region [%4.4s] has zero length (SpaceId %X)", + Node->Name.Ascii, SpaceId)); + } + /* * Get the address and save it * (at top of stack - 1) diff --git a/source/components/dispatcher/dswload2.c b/source/components/dispatcher/dswload2.c index 13677be..373e265 100644 --- a/source/components/dispatcher/dswload2.c +++ b/source/components/dispatcher/dswload2.c @@ -59,7 +59,7 @@ * FUNCTION: AcpiDsLoad2BeginOp * * PARAMETERS: WalkState - Current state of the parse tree walk - * OutOp - Wher to return op if a new one is created + * OutOp - Where to return op if a new one is created * * RETURN: Status * diff --git a/source/components/events/evgpe.c b/source/components/events/evgpe.c index bfef37a..7527a00 100644 --- a/source/components/events/evgpe.c +++ b/source/components/events/evgpe.c @@ -904,7 +904,7 @@ AcpiEvGpeDispatch ( GpeDevice, GpeNumber, GpeEventInfo->Dispatch.Handler->Context); - /* If requested, clear (if level-triggered) and reenable the GPE */ + /* If requested, clear (if level-triggered) and re-enable the GPE */ if (ReturnValue & ACPI_REENABLE_GPE) { diff --git a/source/components/events/evregion.c b/source/components/events/evregion.c index dd37eca..ea774e2 100644 --- a/source/components/events/evregion.c +++ b/source/components/events/evregion.c @@ -301,7 +301,7 @@ AcpiEvAddressSpaceDispatch ( /* * For handlers other than the default (supplied) handlers, we must * exit the interpreter because the handler *might* block -- we don't - * know what it will do, so we can't hold the lock on the intepreter. + * know what it will do, so we can't hold the lock on the interpreter. */ AcpiExExitInterpreter(); } diff --git a/source/components/events/evrgnini.c b/source/components/events/evrgnini.c index dc144e1..063afaa 100644 --- a/source/components/events/evrgnini.c +++ b/source/components/events/evrgnini.c @@ -616,24 +616,6 @@ AcpiEvInitializeRegion ( HandlerObj = ObjDesc->CommonNotify.Handler; break; - case ACPI_TYPE_METHOD: - /* - * If we are executing module level code, the original - * Node's object was replaced by this Method object and we - * saved the handler in the method object. - * - * Note: Only used for the legacy MLC support. Will - * be removed in the future. - * - * See AcpiNsExecModuleCode - */ - if (!AcpiGbl_ExecuteTablesAsMethods && - ObjDesc->Method.InfoFlags & ACPI_METHOD_MODULE_LEVEL) - { - HandlerObj = ObjDesc->Method.Dispatch.Handler; - } - break; - default: /* Ignore other objects */ diff --git a/source/components/events/evxfgpe.c b/source/components/events/evxfgpe.c index 1870d6a..161f3c7 100644 --- a/source/components/events/evxfgpe.c +++ b/source/components/events/evxfgpe.c @@ -777,9 +777,9 @@ ACPI_EXPORT_SYMBOL (AcpiGetGpeStatus) * * RETURN: Status * - * DESCRIPTION: Clear and conditionally reenable a GPE. This completes the GPE + * DESCRIPTION: Clear and conditionally re-enable a GPE. This completes the GPE * processing. Intended for use by asynchronous host-installed - * GPE handlers. The GPE is only reenabled if the EnableForRun bit + * GPE handlers. The GPE is only re-enabled if the EnableForRun bit * is set in the GPE info. * ******************************************************************************/ diff --git a/source/components/executer/exconvrt.c b/source/components/executer/exconvrt.c index 398a700..b32bb2f 100644 --- a/source/components/executer/exconvrt.c +++ b/source/components/executer/exconvrt.c @@ -600,7 +600,7 @@ AcpiExConvertToString ( { if (Base == 16) { - /* Emit 0x prefix for explict/implicit hex conversion */ + /* Emit 0x prefix for explicit/implicit hex conversion */ *NewBuf++ = '0'; *NewBuf++ = 'x'; diff --git a/source/components/executer/exfield.c b/source/components/executer/exfield.c index 917cd2f..f4c4139 100644 --- a/source/components/executer/exfield.c +++ b/source/components/executer/exfield.c @@ -79,6 +79,17 @@ const UINT8 AcpiProtocolLengths[] = 0xFF /* F - ATTRIB_RAW_PROCESS_BYTES */ }; +#define PCC_MASTER_SUBSPACE 3 + +/* + * The following macros determine a given offset is a COMD field. + * According to the specification, generic subspaces (types 0-2) contains a + * 2-byte COMD field at offset 4 and master subspaces (type 3) contains a 4-byte + * COMD field starting at offset 12. + */ +#define GENERIC_SUBSPACE_COMMAND(a) (4 == a || a == 5) +#define MASTER_SUBSPACE_COMMAND(a) (12 <= a && a <= 15) + /******************************************************************************* * @@ -229,6 +240,23 @@ AcpiExReadDataFromField ( Status = AcpiExReadGpio (ObjDesc, Buffer); goto Exit; } + else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) && + (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM)) + { + /* + * Reading from a PCC field unit does not require the handler because + * it only requires reading from the InternalPccBuffer. + */ + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + "PCC FieldRead bits %u\n", ObjDesc->Field.BitLength)); + + memcpy (Buffer, ObjDesc->Field.RegionObj->Field.InternalPccBuffer + + ObjDesc->Field.BaseByteOffset, (ACPI_SIZE) ACPI_ROUND_BITS_UP_TO_BYTES ( + ObjDesc->Field.BitLength)); + + *RetBufferDesc = BufferDesc; + return AE_OK; + } ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, "FieldRead [TO]: Obj %p, Type %X, Buf %p, ByteLen %X\n", @@ -285,6 +313,7 @@ AcpiExWriteDataToField ( { ACPI_STATUS Status; UINT32 BufferLength; + UINT32 DataLength; void *Buffer; @@ -331,6 +360,39 @@ AcpiExWriteDataToField ( Status = AcpiExWriteSerialBus (SourceDesc, ObjDesc, ResultDesc); return_ACPI_STATUS (Status); } + else if ((ObjDesc->Common.Type == ACPI_TYPE_LOCAL_REGION_FIELD) && + (ObjDesc->Field.RegionObj->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM)) + { + /* + * According to the spec a write to the COMD field will invoke the + * region handler. Otherwise, write to the PccInternal buffer. This + * implementation will use the offsets specified rather than the name + * of the field. This is considered safer because some firmware tools + * are known to obfiscate named objects. + */ + DataLength = (ACPI_SIZE) ACPI_ROUND_BITS_UP_TO_BYTES ( + ObjDesc->Field.BitLength); + memcpy (ObjDesc->Field.RegionObj->Field.InternalPccBuffer + + ObjDesc->Field.BaseByteOffset, + SourceDesc->Buffer.Pointer, DataLength); + + if ((ObjDesc->Field.RegionObj->Region.Address == PCC_MASTER_SUBSPACE && + MASTER_SUBSPACE_COMMAND (ObjDesc->Field.BaseByteOffset)) || + GENERIC_SUBSPACE_COMMAND (ObjDesc->Field.BaseByteOffset)) + { + /* Perform the write */ + + ACPI_DEBUG_PRINT ((ACPI_DB_BFIELD, + "PCC COMD field has been written. Invoking PCC handler now.\n")); + + Status = AcpiExAccessRegion ( + ObjDesc, 0, (UINT64 *) ObjDesc->Field.RegionObj->Field.InternalPccBuffer, + ACPI_WRITE); + return_ACPI_STATUS (Status); + } + return (AE_OK); + } + /* Get a pointer to the data to be written */ diff --git a/source/components/executer/exserial.c b/source/components/executer/exserial.c index 2c7bf8b..005e7d5 100644 --- a/source/components/executer/exserial.c +++ b/source/components/executer/exserial.c @@ -57,7 +57,7 @@ * FUNCTION: AcpiExReadGpio * * PARAMETERS: ObjDesc - The named field to read - * Buffer - Where the return data is returnd + * Buffer - Where the return data is returned * * RETURN: Status * diff --git a/source/components/executer/exutils.c b/source/components/executer/exutils.c index 0c2820b..1334471 100644 --- a/source/components/executer/exutils.c +++ b/source/components/executer/exutils.c @@ -217,7 +217,7 @@ AcpiExTruncateFor32bitTable ( * RETURN: None * * DESCRIPTION: Obtain the ACPI hardware Global Lock, only if the field - * flags specifiy that it is to be obtained before field access. + * flags specify that it is to be obtained before field access. * ******************************************************************************/ diff --git a/source/components/namespace/nsload.c b/source/components/namespace/nsload.c index c5a1921..07f5b6b 100644 --- a/source/components/namespace/nsload.c +++ b/source/components/namespace/nsload.c @@ -125,7 +125,7 @@ AcpiNsLoadTable ( /* * On error, delete any namespace objects created by this table. * We cannot initialize these objects, so delete them. There are - * a couple of expecially bad cases: + * a couple of especially bad cases: * AE_ALREADY_EXISTS - namespace collision. * AE_NOT_FOUND - the target of a Scope operator does not * exist. This target of Scope must already exist in the diff --git a/source/components/namespace/nsparse.c b/source/components/namespace/nsparse.c index 542c9c9..c7e3397 100644 --- a/source/components/namespace/nsparse.c +++ b/source/components/namespace/nsparse.c @@ -314,66 +314,18 @@ AcpiNsParseTable ( ACPI_FUNCTION_TRACE (NsParseTable); - if (AcpiGbl_ExecuteTablesAsMethods) - { - /* - * This case executes the AML table as one large control method. - * The point of this is to execute any module-level code in-place - * as the table is parsed. Some AML code depends on this behavior. - * - * It is a run-time option at this time, but will eventually become - * the default. - * - * Note: This causes the table to only have a single-pass parse. - * However, this is compatible with other ACPI implementations. - */ - ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE, - "%s: **** Start table execution pass\n", ACPI_GET_FUNCTION_NAME)); - - Status = AcpiNsExecuteTable (TableIndex, StartNode); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - } - else - { - /* - * AML Parse, pass 1 - * - * In this pass, we load most of the namespace. Control methods - * are not parsed until later. A parse tree is not created. - * Instead, each Parser Op subtree is deleted when it is finished. - * This saves a great deal of memory, and allows a small cache of - * parse objects to service the entire parse. The second pass of - * the parse then performs another complete parse of the AML. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 1\n")); - - Status = AcpiNsOneCompleteParse (ACPI_IMODE_LOAD_PASS1, - TableIndex, StartNode); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + /* + * Executes the AML table as one large control method. + * The point of this is to execute any module-level code in-place + * as the table is parsed. Some AML code depends on this behavior. + * + * Note: This causes the table to only have a single-pass parse. + * However, this is compatible with other ACPI implementations. + */ + ACPI_DEBUG_PRINT_RAW ((ACPI_DB_PARSE, + "%s: **** Start table execution pass\n", ACPI_GET_FUNCTION_NAME)); - /* - * AML Parse, pass 2 - * - * In this pass, we resolve forward references and other things - * that could not be completed during the first pass. - * Another complete parse of the AML is performed, but the - * overhead of this is compensated for by the fact that the - * parse objects are all cached. - */ - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, "**** Start pass 2\n")); - Status = AcpiNsOneCompleteParse (ACPI_IMODE_LOAD_PASS2, - TableIndex, StartNode); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - } + Status = AcpiNsExecuteTable (TableIndex, StartNode); return_ACPI_STATUS (Status); } diff --git a/source/components/namespace/nsutils.c b/source/components/namespace/nsutils.c index e234855..fe0fd35 100644 --- a/source/components/namespace/nsutils.c +++ b/source/components/namespace/nsutils.c @@ -453,7 +453,7 @@ AcpiNsInternalizeName ( * * FUNCTION: AcpiNsExternalizeName * - * PARAMETERS: InternalNameLength - Lenth of the internal name below + * PARAMETERS: InternalNameLength - Length of the internal name below * InternalName - Internal representation of name * ConvertedNameLength - Where the length is returned * ConvertedName - Where the resulting external name diff --git a/source/components/parser/psloop.c b/source/components/parser/psloop.c index 61ff2d1..3170992 100644 --- a/source/components/parser/psloop.c +++ b/source/components/parser/psloop.c @@ -70,13 +70,6 @@ AcpiPsGetArguments ( UINT8 *AmlOpStart, ACPI_PARSE_OBJECT *Op); -static void -AcpiPsLinkModuleCode ( - ACPI_PARSE_OBJECT *ParentOp, - UINT8 *AmlStart, - UINT32 AmlLength, - ACPI_OWNER_ID OwnerId); - /******************************************************************************* * @@ -100,7 +93,6 @@ AcpiPsGetArguments ( { ACPI_STATUS Status = AE_OK; ACPI_PARSE_OBJECT *Arg = NULL; - const ACPI_OPCODE_INFO *OpInfo; ACPI_FUNCTION_TRACE_PTR (PsGetArguments, WalkState); @@ -179,82 +171,6 @@ AcpiPsGetArguments ( "Final argument count: %8.8X pass %u\n", WalkState->ArgCount, WalkState->PassNumber)); - /* - * This case handles the legacy option that groups all module-level - * code blocks together and defers execution until all of the tables - * are loaded. Execute all of these blocks at this time. - * Execute any module-level code that was detected during the table - * load phase. - * - * Note: this option is deprecated and will be eliminated in the - * future. Use of this option can cause problems with AML code that - * depends upon in-order immediate execution of module-level code. - */ - if (!AcpiGbl_ExecuteTablesAsMethods && - (WalkState->PassNumber <= ACPI_IMODE_LOAD_PASS2) && - ((WalkState->ParseFlags & ACPI_PARSE_DISASSEMBLE) == 0)) - { - /* - * We want to skip If/Else/While constructs during Pass1 because we - * want to actually conditionally execute the code during Pass2. - * - * Except for disassembly, where we always want to walk the - * If/Else/While packages - */ - switch (Op->Common.AmlOpcode) - { - case AML_IF_OP: - case AML_ELSE_OP: - case AML_WHILE_OP: - /* - * Currently supported module-level opcodes are: - * IF/ELSE/WHILE. These appear to be the most common, - * and easiest to support since they open an AML - * package. - */ - if (WalkState->PassNumber == ACPI_IMODE_LOAD_PASS1) - { - AcpiPsLinkModuleCode (Op->Common.Parent, AmlOpStart, - (UINT32) (WalkState->ParserState.PkgEnd - AmlOpStart), - WalkState->OwnerId); - } - - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Pass1: Skipping an If/Else/While body\n")); - - /* Skip body of if/else/while in pass 1 */ - - WalkState->ParserState.Aml = WalkState->ParserState.PkgEnd; - WalkState->ArgCount = 0; - break; - - default: - /* - * Check for an unsupported executable opcode at module - * level. We must be in PASS1, the parent must be a SCOPE, - * The opcode class must be EXECUTE, and the opcode must - * not be an argument to another opcode. - */ - if ((WalkState->PassNumber == ACPI_IMODE_LOAD_PASS1) && - (Op->Common.Parent->Common.AmlOpcode == AML_SCOPE_OP)) - { - OpInfo = AcpiPsGetOpcodeInfo (Op->Common.AmlOpcode); - if ((OpInfo->Class == AML_CLASS_EXECUTE) && - (!Arg)) - { - ACPI_WARNING ((AE_INFO, - "Unsupported module-level executable opcode " - "0x%.2X at table offset 0x%.4X", - Op->Common.AmlOpcode, - (UINT32) (ACPI_PTR_DIFF (AmlOpStart, - WalkState->ParserState.AmlStart) + - sizeof (ACPI_TABLE_HEADER)))); - } - } - break; - } - } - /* Special processing for certain opcodes */ switch (Op->Common.AmlOpcode) @@ -328,117 +244,6 @@ AcpiPsGetArguments ( /******************************************************************************* * - * FUNCTION: AcpiPsLinkModuleCode - * - * PARAMETERS: ParentOp - Parent parser op - * AmlStart - Pointer to the AML - * AmlLength - Length of executable AML - * OwnerId - OwnerId of module level code - * - * RETURN: None. - * - * DESCRIPTION: Wrap the module-level code with a method object and link the - * object to the global list. Note, the mutex field of the method - * object is used to link multiple module-level code objects. - * - * NOTE: In this legacy option, each block of detected executable AML - * code that is outside of any control method is wrapped with a temporary - * control method object and placed on a global list below. - * - * This function executes the module-level code for all tables only after - * all of the tables have been loaded. It is a legacy option and is - * not compatible with other ACPI implementations. See AcpiNsLoadTable. - * - * This function will be removed when the legacy option is removed. - * - ******************************************************************************/ - -static void -AcpiPsLinkModuleCode ( - ACPI_PARSE_OBJECT *ParentOp, - UINT8 *AmlStart, - UINT32 AmlLength, - ACPI_OWNER_ID OwnerId) -{ - ACPI_OPERAND_OBJECT *Prev; - ACPI_OPERAND_OBJECT *Next; - ACPI_OPERAND_OBJECT *MethodObj; - ACPI_NAMESPACE_NODE *ParentNode; - - - ACPI_FUNCTION_TRACE (PsLinkModuleCode); - - - /* Get the tail of the list */ - - Prev = Next = AcpiGbl_ModuleCodeList; - while (Next) - { - Prev = Next; - Next = Next->Method.Mutex; - } - - /* - * Insert the module level code into the list. Merge it if it is - * adjacent to the previous element. - */ - if (!Prev || - ((Prev->Method.AmlStart + Prev->Method.AmlLength) != AmlStart)) - { - /* Create, initialize, and link a new temporary method object */ - - MethodObj = AcpiUtCreateInternalObject (ACPI_TYPE_METHOD); - if (!MethodObj) - { - return_VOID; - } - - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Create/Link new code block: %p\n", MethodObj)); - - if (ParentOp->Common.Node) - { - ParentNode = ParentOp->Common.Node; - } - else - { - ParentNode = AcpiGbl_RootNode; - } - - MethodObj->Method.AmlStart = AmlStart; - MethodObj->Method.AmlLength = AmlLength; - MethodObj->Method.OwnerId = OwnerId; - MethodObj->Method.InfoFlags |= ACPI_METHOD_MODULE_LEVEL; - - /* - * Save the parent node in NextObject. This is cheating, but we - * don't want to expand the method object. - */ - MethodObj->Method.NextObject = - ACPI_CAST_PTR (ACPI_OPERAND_OBJECT, ParentNode); - - if (!Prev) - { - AcpiGbl_ModuleCodeList = MethodObj; - } - else - { - Prev->Method.Mutex = MethodObj; - } - } - else - { - ACPI_DEBUG_PRINT ((ACPI_DB_PARSE, - "Appending to existing code block: %p\n", Prev)); - - Prev->Method.AmlLength += AmlLength; - } - - return_VOID; -} - -/******************************************************************************* - * * FUNCTION: AcpiPsParseLoop * * PARAMETERS: WalkState - Current state diff --git a/source/components/parser/psparse.c b/source/components/parser/psparse.c index f4181b9..dfd1469 100644 --- a/source/components/parser/psparse.c +++ b/source/components/parser/psparse.c @@ -572,12 +572,12 @@ AcpiPsParseAml ( if (Status == AE_ABORT_METHOD) { AcpiNsPrintNodePathname ( - WalkState->MethodNode, "Method aborted:"); + WalkState->MethodNode, "Aborting method"); AcpiOsPrintf ("\n"); } else { - ACPI_ERROR_METHOD ("Method parse/execution failed", + ACPI_ERROR_METHOD ("Aborting method", WalkState->MethodNode, NULL, Status); } AcpiExEnterInterpreter (); diff --git a/source/components/resources/rsdumpinfo.c b/source/components/resources/rsdumpinfo.c index bb6fe48..12bd7d0 100644 --- a/source/components/resources/rsdumpinfo.c +++ b/source/components/resources/rsdumpinfo.c @@ -72,7 +72,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpIrq[7] = {ACPI_RSD_UINT8 , ACPI_RSD_OFFSET (Irq.DescriptorLength), "Descriptor Length", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Irq.Polarity), "Polarity", AcpiGbl_LlDecode}, - {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Irq.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Irq.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT8 , ACPI_RSD_OFFSET (Irq.InterruptCount), "Interrupt Count", NULL}, {ACPI_RSD_SHORTLIST,ACPI_RSD_OFFSET (Irq.Interrupts[0]), "Interrupt List", NULL} }; @@ -216,7 +216,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[8] = {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.ProducerConsumer), "Type", AcpiGbl_ConsumeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Polarity), "Polarity", AcpiGbl_LlDecode}, - {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (ExtendedIrq.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (ExtendedIrq.ResourceSource), NULL, NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (ExtendedIrq.InterruptCount), "Interrupt Count", NULL}, {ACPI_RSD_DWORDLIST,ACPI_RSD_OFFSET (ExtendedIrq.Interrupts[0]), "Interrupt List", NULL} @@ -239,7 +239,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpGpio[16] = {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (Gpio.ConnectionType), "ConnectionType", AcpiGbl_CtDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Gpio.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (Gpio.PinConfig), "PinConfig", AcpiGbl_PpcDecode}, - {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.IoRestriction), "IoRestriction", AcpiGbl_IorDecode}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (Gpio.Triggering), "Triggering", AcpiGbl_HeDecode}, {ACPI_RSD_2BITFLAG, ACPI_RSD_OFFSET (Gpio.Polarity), "Polarity", AcpiGbl_LlDecode}, @@ -257,7 +257,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinFunction[10] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinFunction), "PinFunction", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinFunction.RevisionId), "RevisionId", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinFunction.PinConfig), "PinConfig", AcpiGbl_PpcDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinFunction.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinFunction.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (PinFunction.FunctionNumber), "FunctionNumber", NULL}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (PinFunction.ResourceSource), "ResourceSource", NULL}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (PinFunction.PinTableLength), "PinTableLength", NULL}, @@ -271,7 +271,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinConfig[11] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinConfig), "PinConfig", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinConfig.RevisionId), "RevisionId", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinConfig.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinConfig.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinConfig.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinConfig.PinConfigType), "PinConfigType", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (PinConfig.PinConfigValue), "PinConfigValue", NULL}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (PinConfig.ResourceSource), "ResourceSource", NULL}, @@ -298,7 +298,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinGroupFunction[9] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinGroupFunction), "PinGroupFunction", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinGroupFunction.RevisionId), "RevisionId", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupFunction.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupFunction.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupFunction.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT16, ACPI_RSD_OFFSET (PinGroupFunction.FunctionNumber), "FunctionNumber", NULL}, {ACPI_RSD_SOURCE_LABEL, ACPI_RSD_OFFSET (PinGroupFunction.ResourceSourceLabel), "ResourceSourceLabel", NULL}, {ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (PinGroupFunction.ResourceSource), "ResourceSource", NULL}, @@ -311,7 +311,7 @@ ACPI_RSDUMP_INFO AcpiRsDumpPinGroupConfig[10] = {ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE (AcpiRsDumpPinGroupConfig), "PinGroupConfig", NULL}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinGroupConfig.RevisionId), "RevisionId", NULL}, {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupConfig.ProducerConsumer), "ProducerConsumer", AcpiGbl_ConsumeDecode}, - {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupConfig.Sharable), "Sharing", AcpiGbl_ShrDecode}, + {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (PinGroupConfig.Shareable), "Sharing", AcpiGbl_ShrDecode}, {ACPI_RSD_UINT8, ACPI_RSD_OFFSET (PinGroupConfig.PinConfigType), "PinConfigType", NULL}, {ACPI_RSD_UINT32, ACPI_RSD_OFFSET (PinGroupConfig.PinConfigValue), "PinConfigValue", NULL}, {ACPI_RSD_SOURCE_LABEL, ACPI_RSD_OFFSET (PinGroupConfig.ResourceSourceLabel), "ResourceSourceLabel", NULL}, diff --git a/source/components/resources/rsirq.c b/source/components/resources/rsirq.c index 8514445..50a6001 100644 --- a/source/components/resources/rsirq.c +++ b/source/components/resources/rsirq.c @@ -93,7 +93,7 @@ ACPI_RSCONVERT_INFO AcpiRsGetIrq[9] = AML_OFFSET (Irq.Flags), 3}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Shareable), AML_OFFSET (Irq.Flags), 4}, @@ -133,7 +133,7 @@ ACPI_RSCONVERT_INFO AcpiRsSetIrq[14] = AML_OFFSET (Irq.Flags), 3}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Irq.Shareable), AML_OFFSET (Irq.Flags), 4}, @@ -180,7 +180,7 @@ ACPI_RSCONVERT_INFO AcpiRsSetIrq[14] = ACPI_ACTIVE_HIGH}, {ACPI_RSC_EXIT_NE, ACPI_RSC_COMPARE_VALUE, - ACPI_RS_OFFSET (Data.Irq.Sharable), + ACPI_RS_OFFSET (Data.Irq.Shareable), ACPI_EXCLUSIVE}, /* We can optimize to a 2-byte IrqNoFlags() descriptor */ @@ -221,7 +221,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertExtIrq[10] = AML_OFFSET (ExtendedIrq.Flags), 2}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.ExtendedIrq.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.ExtendedIrq.Shareable), AML_OFFSET (ExtendedIrq.Flags), 3}, diff --git a/source/components/resources/rsserial.c b/source/components/resources/rsserial.c index 31edd72..aed946b 100644 --- a/source/components/resources/rsserial.c +++ b/source/components/resources/rsserial.c @@ -78,7 +78,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertGpio[18] = AML_OFFSET (Gpio.Flags), 0}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Gpio.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.Gpio.Shareable), AML_OFFSET (Gpio.IntFlags), 3}, @@ -166,7 +166,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinFunction[13] = AML_OFFSET (PinFunction.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinFunction.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinFunction.Shareable), AML_OFFSET (PinFunction.Flags), 0}, @@ -531,7 +531,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinConfig[14] = AML_OFFSET (PinConfig.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinConfig.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinConfig.Shareable), AML_OFFSET (PinConfig.Flags), 0}, @@ -667,7 +667,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinGroupFunction[13] = AML_OFFSET (PinGroupFunction.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupFunction.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupFunction.Shareable), AML_OFFSET (PinGroupFunction.Flags), 0}, @@ -734,7 +734,7 @@ ACPI_RSCONVERT_INFO AcpiRsConvertPinGroupConfig[14] = AML_OFFSET (PinGroupConfig.RevisionId), 1}, - {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupConfig.Sharable), + {ACPI_RSC_1BITFLAG, ACPI_RS_OFFSET (Data.PinGroupConfig.Shareable), AML_OFFSET (PinGroupConfig.Flags), 0}, diff --git a/source/components/tables/tbfadt.c b/source/components/tables/tbfadt.c index f56d31e..7a1c82f 100644 --- a/source/components/tables/tbfadt.c +++ b/source/components/tables/tbfadt.c @@ -632,7 +632,7 @@ AcpiTbConvertFadt ( * 64-bit X length field. * Note: If the legacy length field is > 0xFF bits, ignore * this check. (GPE registers can be larger than the - * 64-bit GAS structure can accomodate, 0xFF bits). + * 64-bit GAS structure can accommodate, 0xFF bits). */ if ((ACPI_MUL_8 (Length) <= ACPI_UINT8_MAX) && (Address64->BitWidth != ACPI_MUL_8 (Length))) diff --git a/source/components/tables/tbxface.c b/source/components/tables/tbxface.c index 2ceb049..6974964 100644 --- a/source/components/tables/tbxface.c +++ b/source/components/tables/tbxface.c @@ -155,7 +155,7 @@ AcpiInitializeTables ( /* * Get the root table (RSDT or XSDT) and extract all entries to the local * Root Table Array. This array contains the information of the RSDT/XSDT - * in a common, more useable format. + * in a common, more usable format. */ Status = AcpiTbParseRootTable (RsdpAddress); return_ACPI_STATUS (Status); @@ -226,7 +226,7 @@ AcpiReallocateRootTable ( { /* * Now it's safe to do full table validation. We can do deferred - * table initilization here once the flag is set. + * table initialization here once the flag is set. */ AcpiGbl_EnableTableValidation = TRUE; for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) diff --git a/source/components/tables/tbxfload.c b/source/components/tables/tbxfload.c index ad2b766..32095dc 100644 --- a/source/components/tables/tbxfload.c +++ b/source/components/tables/tbxfload.c @@ -111,25 +111,19 @@ AcpiLoadTables ( "While loading namespace from ACPI tables")); } - if (AcpiGbl_ExecuteTablesAsMethods) + /* + * Initialize the objects in the namespace that remain uninitialized. + * This runs the executable AML that may be part of the declaration of + * these name objects: + * OperationRegions, BufferFields, Buffers, and Packages. + * + */ + Status = AcpiNsInitializeObjects (); + if (ACPI_SUCCESS (Status)) { - /* - * If the module-level code support is enabled, initialize the objects - * in the namespace that remain uninitialized. This runs the executable - * AML that may be part of the declaration of these name objects: - * OperationRegions, BufferFields, Buffers, and Packages. - * - * Note: The module-level code is optional at this time, but will - * become the default in the future. - */ - Status = AcpiNsInitializeObjects (); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + AcpiGbl_NamespaceInitialized = TRUE; } - AcpiGbl_NamespaceInitialized = TRUE; return_ACPI_STATUS (Status); } diff --git a/source/components/utilities/utclib.c b/source/components/utilities/utclib.c index d0547cf..2afe7f1 100644 --- a/source/components/utilities/utclib.c +++ b/source/components/utilities/utclib.c @@ -291,7 +291,7 @@ strlen ( * PARAMETERS: String - Null terminated string * Delimiters - Delimiters to match * - * RETURN: The first occurance in the string of any of the bytes in the + * RETURN: The first occurrence in the string of any of the bytes in the * delimiters * * DESCRIPTION: Search a string for any of a set of the delimiters @@ -681,7 +681,7 @@ strstr ( * FUNCTION: strtoul * * PARAMETERS: String - Null terminated string - * Terminater - Where a pointer to the terminating byte is + * Terminator - Where a pointer to the terminating byte is * returned * Base - Radix of the string * diff --git a/source/components/utilities/utdecode.c b/source/components/utilities/utdecode.c index d8423a9..9bd3d50 100644 --- a/source/components/utilities/utdecode.c +++ b/source/components/utilities/utdecode.c @@ -525,6 +525,7 @@ static const char *AcpiGbl_GenericNotify[ACPI_GENERIC_NOTIFY_MAX + 1] /* 0C */ "Reserved (was previously Shutdown Request)", /* Reserved in ACPI 6.0 */ /* 0D */ "System Resource Affinity Update", /* 0E */ "Heterogeneous Memory Attributes Update" /* ACPI 6.2 */ + /* 0F */ "Error Disconnect Recover" /* ACPI 6.3 */ }; static const char *AcpiGbl_DeviceNotify[5] = @@ -561,14 +562,14 @@ AcpiUtGetNotifyName ( ACPI_OBJECT_TYPE Type) { - /* 00 - 0D are "common to all object types" (from ACPI Spec) */ + /* 00 - 0F are "common to all object types" (from ACPI Spec) */ if (NotifyValue <= ACPI_GENERIC_NOTIFY_MAX) { return (AcpiGbl_GenericNotify[NotifyValue]); } - /* 0E - 7F are reserved */ + /* 10 - 7F are reserved */ if (NotifyValue <= ACPI_MAX_SYS_NOTIFY) { diff --git a/source/components/utilities/utdelete.c b/source/components/utilities/utdelete.c index 68fd650..ff41fac 100644 --- a/source/components/utilities/utdelete.c +++ b/source/components/utilities/utdelete.c @@ -304,6 +304,11 @@ AcpiUtDeleteInternalObj ( AcpiUtDeleteObjectDesc (SecondDesc); } + if (Object->Field.InternalPccBuffer) + { + ACPI_FREE(Object->Field.InternalPccBuffer); + } + break; case ACPI_TYPE_BUFFER_FIELD: diff --git a/source/components/utilities/uterror.c b/source/components/utilities/uterror.c index 1082009..7677894 100644 --- a/source/components/utilities/uterror.c +++ b/source/components/utilities/uterror.c @@ -245,19 +245,19 @@ AcpiUtPrefixedNamespaceError ( case AE_ALREADY_EXISTS: AcpiOsPrintf (ACPI_MSG_BIOS_ERROR); - Message = "Failure creating"; + Message = "Failure creating named object"; break; case AE_NOT_FOUND: AcpiOsPrintf (ACPI_MSG_BIOS_ERROR); - Message = "Could not resolve"; + Message = "Could not resolve symbol"; break; default: AcpiOsPrintf (ACPI_MSG_ERROR); - Message = "Failure resolving"; + Message = "Failure resolving symbol"; break; } @@ -392,7 +392,8 @@ AcpiUtMethodError ( } AcpiNsPrintNodePathname (Node, Message); - AcpiOsPrintf (", %s", AcpiFormatException (MethodStatus)); + AcpiOsPrintf (" due to previous error (%s)", + AcpiFormatException (MethodStatus)); ACPI_MSG_SUFFIX; ACPI_MSG_REDIRECT_END; diff --git a/source/include/acclib.h b/source/include/acclib.h index 6e23fc9..44f79d0 100644 --- a/source/include/acclib.h +++ b/source/include/acclib.h @@ -237,7 +237,7 @@ sprintf ( /* * NOTE: Currently we only need to update errno for file IOs. Other - * Clibrary invocations in ACPICA do not make descisions according to + * Clibrary invocations in ACPICA do not make decisions according to * the errno. */ extern int errno; diff --git a/source/include/acconfig.h b/source/include/acconfig.h index 12267bf..4a95e20 100644 --- a/source/include/acconfig.h +++ b/source/include/acconfig.h @@ -178,7 +178,7 @@ /* * Maximal number of elements the Result Stack can contain, - * it may be an arbitray value not exceeding the types of + * it may be an arbitrary value not exceeding the types of * ResultSize and ResultCount (now UINT8). */ #define ACPI_RESULTS_OBJ_NUM_MAX 255 diff --git a/source/include/acdebug.h b/source/include/acdebug.h index 4d9d3ac..6db3e36 100644 --- a/source/include/acdebug.h +++ b/source/include/acdebug.h @@ -51,7 +51,8 @@ #endif -#define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */ +#define ACPI_DEBUG_BUFFER_SIZE 0x4000 /* 16K buffer for return objects */ +#define ACPI_DEBUG_LENGTH_FORMAT " (%.4X bits, %.3X bytes)" typedef struct acpi_db_command_info { diff --git a/source/include/acdisasm.h b/source/include/acdisasm.h index 573f287..7e69251 100644 --- a/source/include/acdisasm.h +++ b/source/include/acdisasm.h @@ -301,6 +301,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoFpdt1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGas[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtHdr[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdtEl2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt0[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt0a[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoGtdt1[]; @@ -445,6 +446,7 @@ extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat1[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat2[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat3[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat4[]; +extern ACPI_DMTABLE_INFO AcpiDmTableInfoSrat5[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoStao[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoStaoStr[]; extern ACPI_DMTABLE_INFO AcpiDmTableInfoTcpaHdr[]; diff --git a/source/include/acexcep.h b/source/include/acexcep.h index fe2f19b..3b86b7d 100644 --- a/source/include/acexcep.h +++ b/source/include/acexcep.h @@ -326,7 +326,7 @@ static const ACPI_EXCEPTION_INFO AcpiGbl_ExceptionNames_Aml[] = EXCEP_TXT ("AE_AML_DIVIDE_BY_ZERO", "During execution of AML Divide operator"), EXCEP_TXT ("AE_AML_BAD_NAME", "An ACPI name contains invalid character(s)"), EXCEP_TXT ("AE_AML_NAME_NOT_FOUND", "Could not resolve a named reference"), - EXCEP_TXT ("AE_AML_INTERNAL", "An internal error within the interprete"), + EXCEP_TXT ("AE_AML_INTERNAL", "An internal error within the interpreter"), EXCEP_TXT ("AE_AML_INVALID_SPACE_ID", "An Operation Region SpaceID is invalid"), EXCEP_TXT ("AE_AML_STRING_LIMIT", "String is longer than 200 characters"), EXCEP_TXT ("AE_AML_NO_RETURN_VALUE", "A method did not return a required value"), diff --git a/source/include/aclocal.h b/source/include/aclocal.h index 37e3f7f..bd0a25d 100644 --- a/source/include/aclocal.h +++ b/source/include/aclocal.h @@ -997,7 +997,7 @@ typedef struct acpi_comment_addr_node /* * File node - used for "Include" operator file stack and - * depdendency tree for the -ca option + * dependency tree for the -ca option */ typedef struct acpi_file_node { diff --git a/source/include/acmacros.h b/source/include/acmacros.h index ddb96cb..c216ea2 100644 --- a/source/include/acmacros.h +++ b/source/include/acmacros.h @@ -502,7 +502,7 @@ /* - * Macors used for the ASL-/ASL+ converter utility + * Macros used for the ASL-/ASL+ converter utility */ #ifdef ACPI_ASL_COMPILER diff --git a/source/include/acobject.h b/source/include/acobject.h index 10bf5ef..150f6fb 100644 --- a/source/include/acobject.h +++ b/source/include/acobject.h @@ -345,6 +345,7 @@ typedef struct acpi_object_region_field union acpi_operand_object *RegionObj; /* Containing OpRegion object */ UINT8 *ResourceBuffer; /* ResourceTemplate for serial regions/fields */ UINT16 PinNumberIndex; /* Index relative to previous Connection/Template */ + UINT8 *InternalPccBuffer; /* Internal buffer for fields associated with PCC */ } ACPI_OBJECT_REGION_FIELD; diff --git a/source/include/acpixf.h b/source/include/acpixf.h index e8818bf..ba6b8bb 100644 --- a/source/include/acpixf.h +++ b/source/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190108 +#define ACPI_CA_VERSION 0x20190215 #include "acconfig.h" #include "actypes.h" @@ -193,14 +193,6 @@ ACPI_INIT_GLOBAL (UINT8, AcpiGbl_CopyDsdtLocally, FALSE); ACPI_INIT_GLOBAL (UINT8, AcpiGbl_DoNotUseXsdt, FALSE); /* - * Optionally support module level code by parsing an entire table as - * a method as it is loaded. Default is TRUE. - * NOTE, this is essentially obsolete and will be removed soon - * (01/2018). - */ -ACPI_INIT_GLOBAL (UINT8, AcpiGbl_ExecuteTablesAsMethods, TRUE); - -/* * Optionally use 32-bit FADT addresses if and when there is a conflict * (address mismatch) between the 32-bit and 64-bit versions of the * address. Although ACPICA adheres to the ACPI specification which diff --git a/source/include/acpredef.h b/source/include/acpredef.h index a42a6ab..58610ad 100644 --- a/source/include/acpredef.h +++ b/source/include/acpredef.h @@ -652,6 +652,21 @@ const ACPI_PREDEFINED_INFO AcpiGbl_PredefinedMethods[] = {{"_MTL", METHOD_0ARGS, /* ACPI 6.0 */ METHOD_RETURNS (ACPI_RTYPE_INTEGER)}}, + {{"_NBS", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NCH", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NIC", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NIG", METHOD_1ARGS (ACPI_TYPE_BUFFER), /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + + {{"_NIH", METHOD_0ARGS, /* ACPI 6.3 */ + METHOD_RETURNS (ACPI_RTYPE_BUFFER)}}, + {{"_NTT", METHOD_0ARGS, METHOD_RETURNS (ACPI_RTYPE_INTEGER)}}, diff --git a/source/include/acrestyp.h b/source/include/acrestyp.h index ab42a2a..847bc50 100644 --- a/source/include/acrestyp.h +++ b/source/include/acrestyp.h @@ -179,7 +179,7 @@ typedef struct acpi_resource_irq UINT8 DescriptorLength; UINT8 Triggering; UINT8 Polarity; - UINT8 Sharable; + UINT8 Shareable; UINT8 WakeCapable; UINT8 InterruptCount; UINT8 Interrupts[1]; @@ -426,7 +426,7 @@ typedef struct acpi_resource_extended_irq UINT8 ProducerConsumer; UINT8 Triggering; UINT8 Polarity; - UINT8 Sharable; + UINT8 Shareable; UINT8 WakeCapable; UINT8 InterruptCount; ACPI_RESOURCE_SOURCE ResourceSource; @@ -450,7 +450,7 @@ typedef struct acpi_resource_gpio UINT8 ConnectionType; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ UINT8 PinConfig; - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT8 WakeCapable; /* For values, see Interrupt Attributes above */ UINT8 IoRestriction; UINT8 Triggering; /* For values, see Interrupt Attributes above */ @@ -628,7 +628,7 @@ typedef struct acpi_resource_pin_function { UINT8 RevisionId; UINT8 PinConfig; - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT16 FunctionNumber; UINT16 PinTableLength; UINT16 VendorLength; @@ -642,7 +642,7 @@ typedef struct acpi_resource_pin_config { UINT8 RevisionId; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT8 PinConfigType; UINT32 PinConfigValue; UINT16 PinTableLength; @@ -686,7 +686,7 @@ typedef struct acpi_resource_pin_group_function { UINT8 RevisionId; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT16 FunctionNumber; UINT16 VendorLength; ACPI_RESOURCE_SOURCE ResourceSource; @@ -699,7 +699,7 @@ typedef struct acpi_resource_pin_group_config { UINT8 RevisionId; UINT8 ProducerConsumer; /* For values, see Producer/Consumer above */ - UINT8 Sharable; /* For values, see Interrupt Attributes above */ + UINT8 Shareable; /* For values, see Interrupt Attributes above */ UINT8 PinConfigType; /* For values, see PinConfigType above */ UINT32 PinConfigValue; UINT16 VendorLength; diff --git a/source/include/actbinfo.h b/source/include/actbinfo.h index 47e79f2..327c533 100644 --- a/source/include/actbinfo.h +++ b/source/include/actbinfo.h @@ -129,6 +129,7 @@ #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_GTDT_EL2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_GTDT_EL2,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) @@ -140,7 +141,7 @@ #define ACPI_HEST11_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_DEFERRED_CHECK,f) #define ACPI_HESTN_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_NOTIFY,f) #define ACPI_HESTB_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HEST_IA_ERROR_BANK,f) -#define ACPI_HMAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_ADDRESS_RANGE,f) +#define ACPI_HMAT0_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_PROXIMITY_DOMAIN,f) #define ACPI_HMAT1_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_LOCALITY,f) #define ACPI_HMAT2_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_CACHE,f) #define ACPI_HMATH_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_HMAT_STRUCTURE,f) @@ -226,6 +227,7 @@ #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_SRAT4_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_GIC_ITS_AFFINITY,f) +#define ACPI_SRAT5_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_SRAT_GENERIC_AFFINITY,f) #define ACPI_TCPA_CLIENT_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_CLIENT,f) #define ACPI_TCPA_SERVER_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TABLE_TCPA_SERVER,f) #define ACPI_TPM2A_OFFSET(f) (UINT16) ACPI_OFFSET (ACPI_TPM2_TRAILER,f) @@ -253,10 +255,11 @@ #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_SRAT5_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_SRAT_GENERIC_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_HMAT0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_ADDRESS_RANGE,f,o) +#define ACPI_HMAT0_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_PROXIMITY_DOMAIN,f,o) #define ACPI_HMAT1_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_LOCALITY,f,o) #define ACPI_HMAT2_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_HMAT_CACHE,f,o) #define ACPI_IORT3_FLAG_OFFSET(f,o) ACPI_FLAG_OFFSET (ACPI_IORT_SMMU,f,o) diff --git a/source/include/actbl1.h b/source/include/actbl1.h index 14b8ade..4c761c8 100644 --- a/source/include/actbl1.h +++ b/source/include/actbl1.h @@ -689,7 +689,7 @@ typedef struct acpi_dmar_hardware_unit #define ACPI_DMAR_INCLUDE_ALL (1) -/* 1: Reserved Memory Defininition */ +/* 1: Reserved Memory Definition */ typedef struct acpi_dmar_reserved_memory { @@ -1211,6 +1211,12 @@ typedef struct acpi_table_gtdt #define ACPI_GTDT_INTERRUPT_POLARITY (1<<1) #define ACPI_GTDT_ALWAYS_ON (1<<2) +typedef struct acpi_gtdt_el2 +{ + UINT32 VirtualEL2TimerGsiv; + UINT32 VirtualEL2TimerFlags; +} ACPI_GTDT_EL2; + /* Common GTDT subtable header */ @@ -1670,7 +1676,7 @@ typedef struct acpi_table_hmat enum AcpiHmatType { - ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subystem address range */ + ACPI_HMAT_TYPE_ADDRESS_RANGE = 0, /* Memory subsystem address range */ ACPI_HMAT_TYPE_LOCALITY = 1, /* System locality latency and bandwidth information */ ACPI_HMAT_TYPE_CACHE = 2, /* Memory side cache information */ ACPI_HMAT_TYPE_RESERVED = 3 /* 3 and greater are reserved */ @@ -1689,9 +1695,9 @@ typedef struct acpi_hmat_structure * HMAT Structures, correspond to Type in ACPI_HMAT_STRUCTURE */ -/* 0: Memory subystem address range */ +/* 0: Memory proximity domain attributes */ -typedef struct acpi_hmat_address_range +typedef struct acpi_hmat_proximity_domain { ACPI_HMAT_STRUCTURE Header; UINT16 Flags; @@ -1699,10 +1705,10 @@ typedef struct acpi_hmat_address_range UINT32 ProcessorPD; /* Processor proximity domain */ UINT32 MemoryPD; /* Memory proximity domain */ UINT32 Reserved2; - UINT64 PhysicalAddressBase; /* Physical address range base */ - UINT64 PhysicalAddressLength; /* Physical address range length */ + UINT64 Reserved3; + UINT64 Reserved4; -} ACPI_HMAT_ADDRESS_RANGE; +} ACPI_HMAT_PROXIMITY_DOMAIN; /* Masks for Flags field above */ diff --git a/source/include/actbl2.h b/source/include/actbl2.h index 3d2c070..330445f 100644 --- a/source/include/actbl2.h +++ b/source/include/actbl2.h @@ -195,7 +195,7 @@ typedef struct acpi_iort_memory_access typedef struct acpi_iort_its_group { UINT32 ItsCount; - UINT32 Identifiers[1]; /* GIC ITS identifier arrary */ + UINT32 Identifiers[1]; /* GIC ITS identifier array */ } ACPI_IORT_ITS_GROUP; @@ -765,7 +765,7 @@ typedef struct acpi_madt_local_x2apic_nmi } ACPI_MADT_LOCAL_X2APIC_NMI; -/* 11: Generic Interrupt (ACPI 5.0 + ACPI 6.0 changes) */ +/* 11: Generic Interrupt - GICC (ACPI 5.0 + ACPI 6.0 + ACPI 6.3 changes) */ typedef struct acpi_madt_generic_interrupt { @@ -784,7 +784,8 @@ typedef struct acpi_madt_generic_interrupt UINT64 GicrBaseAddress; UINT64 ArmMpidr; UINT8 EfficiencyClass; - UINT8 Reserved2[3]; + UINT8 Reserved2[1]; + UINT16 SpeInterrupt; /* ACPI 6.3 */ } ACPI_MADT_GENERIC_INTERRUPT; @@ -1629,6 +1630,7 @@ typedef struct acpi_pdtt_channel #define ACPI_PDTT_RUNTIME_TRIGGER (1) #define ACPI_PDTT_WAIT_COMPLETION (1<<1) +#define ACPI_PDTT_TRIGGER_ORDER (1<<2) /******************************************************************************* @@ -1765,8 +1767,11 @@ typedef struct acpi_pptt_processor /* Flags */ -#define ACPI_PPTT_PHYSICAL_PACKAGE (1) /* Physical package */ -#define ACPI_PPTT_ACPI_PROCESSOR_ID_VALID (2) /* ACPI Processor ID valid */ +#define ACPI_PPTT_PHYSICAL_PACKAGE (1) +#define ACPI_PPTT_ACPI_PROCESSOR_ID_VALID (1<<1) +#define ACPI_PPTT_ACPI_PROCESSOR_IS_THREAD (1<<2) /* ACPI 6.3 */ +#define ACPI_PPTT_ACPI_LEAF_NODE (1<<3) /* ACPI 6.3 */ +#define ACPI_PPTT_ACPI_IDENTICAL (1<<4) /* ACPI 6.3 */ /* 1: Cache Type Structure */ diff --git a/source/include/actbl3.h b/source/include/actbl3.h index 85d41d9..0f2743f 100644 --- a/source/include/actbl3.h +++ b/source/include/actbl3.h @@ -242,8 +242,9 @@ enum AcpiSratType ACPI_SRAT_TYPE_MEMORY_AFFINITY = 1, ACPI_SRAT_TYPE_X2APIC_CPU_AFFINITY = 2, ACPI_SRAT_TYPE_GICC_AFFINITY = 3, - ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */ - ACPI_SRAT_TYPE_RESERVED = 5 /* 5 and greater are reserved */ + ACPI_SRAT_TYPE_GIC_ITS_AFFINITY = 4, /* ACPI 6.2 */ + ACPI_SRAT_TYPE_GENERIC_AFFINITY = 5, /* ACPI 6.3 */ + ACPI_SRAT_TYPE_RESERVED = 6 /* 5 and greater are reserved */ }; /* @@ -339,6 +340,24 @@ typedef struct acpi_srat_gic_its_affinity } ACPI_SRAT_GIC_ITS_AFFINITY; +/* 5: Generic Initiator Affinity Structure (ACPI 6.3) */ + +typedef struct acpi_srat_generic_affinity +{ + ACPI_SUBTABLE_HEADER Header; + UINT8 Reserved; + UINT8 DeviceHandleType; + UINT32 ProximityDomain; + UINT8 DeviceHandle[16]; + UINT32 Flags; + UINT32 Reserved1; + +} ACPI_SRAT_GENERIC_AFFINITY; + +/* Flags for ACPI_SRAT_GENERIC_AFFINITY */ + +#define ACPI_SRAT_GENERIC_AFFINITY_ENABLED (1) /* 00: Use affinity structure */ + /******************************************************************************* * * STAO - Status Override Table (_STA override) - ACPI 6.0 diff --git a/source/include/actypes.h b/source/include/actypes.h index 0c96c82..b7c645f 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h @@ -659,8 +659,9 @@ typedef UINT64 ACPI_INTEGER; #define ACPI_NOTIFY_SHUTDOWN_REQUEST (UINT8) 0x0C #define ACPI_NOTIFY_AFFINITY_UPDATE (UINT8) 0x0D #define ACPI_NOTIFY_MEMORY_UPDATE (UINT8) 0x0E +#define ACPI_NOTIFY_DISCONNECT_RECOVER (UINT8) 0x0F -#define ACPI_GENERIC_NOTIFY_MAX 0x0E +#define ACPI_GENERIC_NOTIFY_MAX 0x0F #define ACPI_SPECIFIC_NOTIFY_MAX 0x84 /* diff --git a/source/include/platform/acefi.h b/source/include/platform/acefi.h index a879088..198e34d 100644 --- a/source/include/platform/acefi.h +++ b/source/include/platform/acefi.h @@ -52,7 +52,7 @@ #define DEBUGGER_THREADING DEBUGGER_SINGLE_THREADED #endif /* !DEBUGGER_THREADING */ -/* EDK2 EFI environemnt */ +/* EDK2 EFI environment */ #if defined(_EDK2_EFI) diff --git a/source/tools/acpiexec/aeinstall.c b/source/tools/acpiexec/aeinstall.c index 2dc0cbc..d200ba8 100644 --- a/source/tools/acpiexec/aeinstall.c +++ b/source/tools/acpiexec/aeinstall.c @@ -107,6 +107,7 @@ static ACPI_ADR_SPACE_TYPE SpaceIdList[] = ACPI_ADR_SPACE_IPMI, ACPI_ADR_SPACE_GPIO, ACPI_ADR_SPACE_GSBUS, + ACPI_ADR_SPACE_PLATFORM_COMM, ACPI_ADR_SPACE_FIXED_HARDWARE, ACPI_ADR_SPACE_USER_DEFINED1, ACPI_ADR_SPACE_USER_DEFINED2 diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c index 05dbb7d..9afa6ad 100644 --- a/source/tools/acpiexec/aemain.c +++ b/source/tools/acpiexec/aemain.c @@ -147,8 +147,6 @@ usage ( ACPI_OPTION ("-df", "Disable Local fault handler"); ACPI_OPTION ("-di", "Disable execution of STA/INI methods during init"); ACPI_OPTION ("-do", "Disable Operation Region address simulation"); - ACPI_OPTION ("-dp", "Disable loading DSDT/SSDT as a control method\n" - " (enable legacy grouping of module-level code)"); ACPI_OPTION ("-dr", "Disable repair of method return values"); ACPI_OPTION ("-ds", "Disable method auto-serialization"); ACPI_OPTION ("-dt", "Disable allocation tracking (performance)"); @@ -245,11 +243,6 @@ AeDoOptions ( AcpiGbl_DbOpt_NoRegionSupport = TRUE; break; - case 'p': - - AcpiGbl_ExecuteTablesAsMethods = FALSE; - break; - case 'r': AcpiGbl_DisableAutoRepair = TRUE; @@ -522,10 +515,6 @@ main ( AcpiDbgLevel = ACPI_NORMAL_DEFAULT; AcpiDbgLayer = 0xFFFFFFFF; - /* Module-level code. Use new architecture */ - - AcpiGbl_ExecuteTablesAsMethods = TRUE; - /* * Initialize ACPICA and start debugger thread. * diff --git a/source/tools/acpiexec/aeregion.c b/source/tools/acpiexec/aeregion.c index 972e050..a12d30a 100644 --- a/source/tools/acpiexec/aeregion.c +++ b/source/tools/acpiexec/aeregion.c @@ -256,7 +256,7 @@ AeRegionHandler ( ACPI_FREE (Resource); } - AcpiOsPrintf (" [AccessLength %.2X Connnection %p]", + AcpiOsPrintf (" [AccessLength %.2X Connection %p]", MyContext->AccessLength, MyContext->Connection); } @@ -332,6 +332,23 @@ AeRegionHandler ( /* Now perform the "normal" SystemMemory handling, for AcpiExec only */ break; + /* + * PCC operation region will write the entire subspace's data and expect + * a response from the hardware. For acpiexec, we'll fill the buffer with + * default values. Note: ASLTS will depend on these values. + */ + case ACPI_ADR_SPACE_PLATFORM_COMM: /* ACPI 6.3 */ + if (AcpiGbl_DisplayRegionAccess) + { + AcpiOsPrintf ("AcpiExec: PCC Write : Addr %.4X Width %X\n", + (UINT32) Address, BitWidth); + } + for (i = 0; i < Length; ++i) + { + Buffer[i] = (UINT8) i; + } + return (AE_OK); + default: break; } diff --git a/source/tools/acpihelp/ahdecode.c b/source/tools/acpihelp/ahdecode.c index 52d03f7..7f4c688 100644 --- a/source/tools/acpihelp/ahdecode.c +++ b/source/tools/acpihelp/ahdecode.c @@ -206,7 +206,7 @@ AhFindPredefinedNames ( return; } - /* Contruct a local name or name prefix */ + /* Construct a local name or name prefix */ AcpiUtStrupr (NamePrefix); if (*NamePrefix == '_') diff --git a/source/tools/acpinames/anmain.c b/source/tools/acpinames/anmain.c index 39f7f27..a99748b 100644 --- a/source/tools/acpinames/anmain.c +++ b/source/tools/acpinames/anmain.c @@ -131,8 +131,6 @@ main ( /* Set flags so that the interpreter is not used */ - AcpiGbl_ExecuteTablesAsMethods = FALSE; - Status = AcpiInitializeSubsystem (); ACPI_CHECK_OK (AcpiInitializeSubsystem, Status); if (ACPI_FAILURE (Status)) diff --git a/source/tools/acpisrc/astable.c b/source/tools/acpisrc/astable.c index e24897c..046eef5 100644 --- a/source/tools/acpisrc/astable.c +++ b/source/tools/acpisrc/astable.c @@ -636,7 +636,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_HEST_GENERIC_DATA", SRC_TYPE_STRUCT}, {"ACPI_HEST_GENERIC_DATA_V300", SRC_TYPE_STRUCT}, {"ACPI_HEST_IA_DEFERRED_CHECK", SRC_TYPE_STRUCT}, - {"ACPI_HMAT_ADDRESS_RANGE", SRC_TYPE_STRUCT}, + {"ACPI_HMAT_PROXIMITY_DOMAIN", SRC_TYPE_STRUCT}, {"ACPI_HMAT_CACHE", SRC_TYPE_STRUCT}, {"ACPI_HMAT_LOCALITY", SRC_TYPE_STRUCT}, {"ACPI_HMAT_STRUCTURE", SRC_TYPE_STRUCT}, @@ -721,6 +721,7 @@ ACPI_TYPED_IDENTIFIER_TABLE AcpiIdentifiers[] = { {"ACPI_SRAT_HEADER", SRC_TYPE_STRUCT}, {"ACPI_SRAT_GIC_ITS_AFFINITY", SRC_TYPE_STRUCT}, {"ACPI_SRAT_GICC_AFFINITY", SRC_TYPE_STRUCT}, + {"ACPI_SRAT_GENERIC_AFFINITY", SRC_TYPE_STRUCT}, {"ACPI_SRAT_MEM_AFFINITY", SRC_TYPE_STRUCT}, {"ACPI_SRAT_X2APIC_CPU_AFFINITY", SRC_TYPE_STRUCT}, {"ACPI_TABLE_TCPA_CLIENT", SRC_TYPE_STRUCT}, diff --git a/tests/aslts/HOW_TO_INSTALL b/tests/aslts/HOW_TO_INSTALL index 9c0cc76..78fdf65 100644 --- a/tests/aslts/HOW_TO_INSTALL +++ b/tests/aslts/HOW_TO_INSTALL @@ -41,7 +41,7 @@ SEE ALSO ENVIRONMENT - For test generation, the envirnoment variable 'ASL' should be set to the + For test generation, the environment variable 'ASL' should be set to the pathname of the iASL compiler. For example, for cygwin under windows: diff --git a/tests/aslts/HOW_TO_USE b/tests/aslts/HOW_TO_USE index d609458..c1716ab 100644 --- a/tests/aslts/HOW_TO_USE +++ b/tests/aslts/HOW_TO_USE @@ -83,7 +83,7 @@ How to execute the run-time tests aslts/tmp/RESULTS/ / - norm/ // normal interpeter mode, no slack + norm/ // normal interpreter mode, no slack 32/ // 32-bit table execution 64/ // 64-bit table execution slack/ // interpreter slack mode enabled diff --git a/tests/aslts/NOTE b/tests/aslts/NOTE index dba6c64..bb4839e 100644 --- a/tests/aslts/NOTE +++ b/tests/aslts/NOTE @@ -89,7 +89,7 @@ do the relevant RUNTIME tests! As well for Buffer Fields and Field Units. Many files contain SEE items at their tops. See them and fix what they require! |------------------------------------------------------------------------------| -Dont forget to uncomment ASL code relevant to bugs: y000,y0..., see runmode.asl +Don't forget to uncomment ASL code relevant to bugs: y000,y0..., see runmode.asl |------------------------------------------------------------------------------| UPDATE exc.m084: Implement this test for all the types of objects (see for example ref.asl files about objects) and diff --git a/tests/aslts/bin/Do b/tests/aslts/bin/Do index f4742ed..4b9737b 100755 --- a/tests/aslts/bin/Do +++ b/tests/aslts/bin/Do @@ -55,7 +55,7 @@ # # REMEMBER (To-Be-Done items) # -# 1. Dont forget to add testing of aml/nopt mode. +# 1. Don't forget to add testing of aml/nopt mode. # 2. Do make-install till the first error automatically # 3. Not implemented yet though announced in Usage: # - "Do 1 [n32 [n64 [s32 [s64]]]] [ [ [...]]]" @@ -667,7 +667,7 @@ EXECONLY=$3 RESULTDIR= # ################################################################## # -# ATTENTION: dont use yet here any common stuff till the next remark # +# ATTENTION: don't use yet here any common stuff till the next remark # # ################################################################## # # Only report USAGE diff --git a/tests/aslts/bin/asltsrun b/tests/aslts/bin/asltsrun index 5f44930..59c1f78 100755 --- a/tests/aslts/bin/asltsrun +++ b/tests/aslts/bin/asltsrun @@ -253,7 +253,7 @@ run_set_of_test_cases() total="$x $y" # Explanation of command below: - # For each testcase that we will run, we are goin to parallelize the + # For each testcase that we will run, we are going to parallelize the # execution with the number of available processors. printf '%s\n' "${test_case_arr[@]}" |\ xargs -n 1 -P $procs -I {} bash -c 'run_test_case $1 $2 > $3/$4/$1'\ @@ -1029,7 +1029,7 @@ fi TS_FMT_ENDTIME=$(date +%T) TS_FMT_RUNTIME=`get_cent_str_diff $TS_FMT_INITIME $TS_FMT_ENDTIME` # AcpiExec doesn't provide status of test execution, -# so dont report STATUS of AcpiExec execution here +# so don't report STATUS of AcpiExec execution here # not to mislead as it means STATUS of the tests # execution. # if [ $UTILSTATUS == 0 ]; then @@ -1077,7 +1077,7 @@ if [ $ENABLELOG != 0 ]; then fi if [ $AML_DONT_EXIST != 0 ]; then - msg="WARNING: some test cases dont have AML code! ($AML_DONT_EXIST)" + msg="WARNING: some test cases don't have AML code! ($AML_DONT_EXIST)" echo "$msg" multi_log "$msg" fi @@ -1101,7 +1101,7 @@ else do2path=$MULTIPATH/do2Output.txt Do 2 > $do2path if [ $? -ne 0 ]; then \ - echo "Detailed comparsion of previous 2 test runs in $do2path" + echo "Detailed comparison of previous 2 test runs in $do2path" fi fi fi diff --git a/tests/aslts/bin/bugstate/HOW_TO_USE b/tests/aslts/bin/bugstate/HOW_TO_USE index 097f560..09e65db 100644 --- a/tests/aslts/bin/bugstate/HOW_TO_USE +++ b/tests/aslts/bin/bugstate/HOW_TO_USE @@ -62,7 +62,7 @@ into STATE-MANUALLY of ALLBUGS file manually through the code that bug fix is actually integrated into ACPICA code. -2. If bug is fixed by other side we dont know where to look for +2. If bug is fixed by other side we don't know where to look for the relevant update and simply run the relevant bdemo test on the obtained release to ensure the bug-fix is already integrated. diff --git a/tests/aslts/bin/bugstate/bdemosconc b/tests/aslts/bin/bugstate/bdemosconc index 80d8ae8..ef52270 100644 --- a/tests/aslts/bin/bugstate/bdemosconc +++ b/tests/aslts/bin/bugstate/bdemosconc @@ -5,7 +5,7 @@ # Concatenate bdemo summary files (obtained by bdemossum) # of two multi-results. # -# Paremeters: +# Parameters: # # arg1 - the first multi-result directory # arg2 - the second multi-result directory diff --git a/tests/aslts/bin/bugstate/bdemossum b/tests/aslts/bin/bugstate/bdemossum index 9f18e22..6d210bf 100644 --- a/tests/aslts/bin/bugstate/bdemossum +++ b/tests/aslts/bin/bugstate/bdemossum @@ -12,7 +12,7 @@ # Each line of the summary files represents the state of the relevant bug # reported by the relevant bdemo test. # -# Paremeters: +# Parameters: # # arg1 - multi-result directory # diff --git a/tests/aslts/bin/bugstate/bdemostabs b/tests/aslts/bin/bugstate/bdemostabs index 66bfb13..3abc60e 100644 --- a/tests/aslts/bin/bugstate/bdemostabs +++ b/tests/aslts/bin/bugstate/bdemostabs @@ -5,7 +5,7 @@ # Calculate the current state of all bugs # and report the summary tables. # -# Paremeters: +# Parameters: # # arg1 - the first multi-result directory # arg2 - the second multi-result directory @@ -381,10 +381,10 @@ report_state_of_bugs() fi - # Check consistancy of bug-data. + # Check consistency of bug-data. # # Check that the state of bugs reported by local and kernel - # bugzilla dont contradict with the actual state of bugs + # bugzilla don't contradict with the actual state of bugs # reported by test runs and manually provided data. # Check STATE-MANUALLY (error # 1) diff --git a/tests/aslts/bin/bugstate/parsebuglist b/tests/aslts/bin/bugstate/parsebuglist index cba3dac..b43fcb7 100644 --- a/tests/aslts/bin/bugstate/parsebuglist +++ b/tests/aslts/bin/bugstate/parsebuglist @@ -4,7 +4,7 @@ # # Parse the Bug List output file (ID State Result Component) # -# Paremeters: +# Parameters: # # arg1 - pathname of file with the Bug List diff --git a/tests/aslts/bin/diffproc b/tests/aslts/bin/diffproc index 6c550ac..12acc5e 100755 --- a/tests/aslts/bin/diffproc +++ b/tests/aslts/bin/diffproc @@ -135,10 +135,10 @@ report_exceptions_stat_cmp() local rval=0 if [[ $3 -gt $4 ]]; then - echo "WARNING, $1, exceptions occurance number grown ($2): $3, $4" + echo "WARNING, $1, exceptions occurrence number grown ($2): $3, $4" rval=1 elif [[ $3 -lt $4 ]]; then - echo "INFO, $1, exceptions occurance number reduced ($2): $3, $4" + echo "INFO, $1, exceptions occurrence number reduced ($2): $3, $4" rval=2 fi return $rval @@ -517,7 +517,7 @@ cmp_result_opcode_to_str() $CMP_MISCMP_OP) msg=miscompared;; $CMP_NO_SECOND_OP) msg="- (the SUMMARY file of second run doesn't exist)";; $CMP_NO_FIRST_OP) msg="- (the SUMMARY file of first run doesn't exist)";; - $CMP_NO_BOTH_OP) msg="- (the SUMMARY files of both runs dont exist)";; + $CMP_NO_BOTH_OP) msg="- (the SUMMARY files of both runs don't exist)";; *) msg="???" esac diff --git a/tests/aslts/doc/README b/tests/aslts/doc/README index 567fc3c..d63c697 100644 --- a/tests/aslts/doc/README +++ b/tests/aslts/doc/README @@ -20,7 +20,7 @@ plan StoreCopyTestPrototype these demo programs may be considered as a prototypes - of separate functional tests for CopyObject ans Store + of separate functional tests for CopyObject and Store operators CurrentState diff --git a/tests/aslts/doc/docs/TestOfOperands b/tests/aslts/doc/docs/TestOfOperands index 8ad80a6..1c0d48e 100644 --- a/tests/aslts/doc/docs/TestOfOperands +++ b/tests/aslts/doc/docs/TestOfOperands @@ -185,7 +185,7 @@ REFERENCES Note: it was observed earlier that logical operators didn't cause exceptions when using references. This looks incorrect. Keep attention to that. - Dont forget to build the test for it. + Don't forget to build the test for it. Note: specification of Reference test contains more exact list. @@ -207,7 +207,7 @@ for operator in place of operand. Note: expressions in place of locations for results (Destinations) should be verified in this test - as vell, because together with the expressions + as well, because together with the expressions of operands they can influence each other. Issue: expressions in result, is that possible to use? @@ -267,7 +267,7 @@ operands and destinations: (one operator)/(several operators) (store result in it)/(don't store result in it)... - 2. Pass the object of upper level (or even global) accesible + 2. Pass the object of upper level (or even global) accessible statically by ArgX of sequence of calling methods (operand1) and specify the same object as another operand immediately by its NameX (operand2) and use them both in turn (operand1/operand2) as locations @@ -293,7 +293,7 @@ and thus should be verified are these: The more you mix these aspects the more comprehensive test you have. Each impact generated and verified by test is a function of -(N1,N2,N3,N4,N5,N6,N7,N8) parameters. So, to build the total absolut +(N1,N2,N3,N4,N5,N6,N7,N8) parameters. So, to build the total absolute comprehensive test we have to build and verify all the possible combinations of these input states. @@ -343,23 +343,23 @@ be provided by the test immediately also and can not be referred in cycle. particularities of Implicit Source Operand Conversion functionality which also restricts uniformity of test for different operators. - So, we cant run in cycle all the possible desirable combinations + So, we can't run in cycle all the possible desirable combinations (and aspects) of operands for all the ASL operators, because the ASL -limitations dont allow to achieve uniformity of the test building. +limitations don't allow to achieve uniformity of the test building. It is impossible to build the test which simply enumerates all combinations and so achieve the total coverage. One more, such the test will go during the huge boundless time. Thus, it is up to the skill of the designer of the test to choose the main points to be verified in order to build the test which would -achieve the worthy coverage for the acceptible time of execution. +achieve the worthy coverage for the acceptable time of execution. So, maybe, attempt to divide operators on groups according to the specific of their operands and one operator of each group verify comprehensively, while other members of groups verify in a simplified manner. Do that if the run time of the test increases extremely. - So, because of the ASL limitations described above we cant implement + So, because of the ASL limitations described above we can't implement the comprehencive test, which would be proven to approximate to the absolute test on coverage. But this specification and the tests adhered to it would allow us to feel ourselves to be on the firm way to achieve the worthy coverage @@ -502,7 +502,7 @@ Note: the Implicit Rules were a few changed since that! ========================== -This is a list of operators which are recomended +This is a list of operators which are recommended to be implemented in the first turn. List of operators which should be verified completely (all the @@ -747,7 +747,7 @@ be provided by the actions individual for the particular operators. 24. for the acceptable types of operands check particular unacceptable values (exception occur) 25. check that the result is of the same type as the benchmark - (use ObjectType, dont be satisfied with LEqual only) + (use ObjectType, don't be satisfied with LEqual only) 26. the second operands of Logical operators are converted to the type of the first ones; do the checkings which show and confirm that @@ -804,7 +804,7 @@ See: LocalX/ArgX - particular test: Store Buffer/Integer into String which (String) is far longer then Buffer/Integer. The String immage will be reduces. Then attempt to - work with the rest of String ouside of the new its + work with the rest of String outside of the new its contents (behind the null symbol of String). - reference as an element of Package - verify 64-bit values in 32-bit mode diff --git a/tests/aslts/doc/plan/RemainingWork.htm b/tests/aslts/doc/plan/RemainingWork.htm index 2d0d8c8..1c30683 100644 --- a/tests/aslts/doc/plan/RemainingWork.htm +++ b/tests/aslts/doc/plan/RemainingWork.htm @@ -818,7 +818,7 @@ The declaration complex test.

style="FONT-SIZE: 10pt; FONT-FAMILY: 'Courier New'"> 

      -Important and dont clear from ACPI specs.

+Important and don't clear from ACPI specs.

 

Buffer.Length - 32-bit while "ACPI_SIZE Length" - 16/32/64. Bug 124 was about something like that. diff --git a/tests/aslts/src/compilation/collection/reference.asl b/tests/aslts/src/compilation/collection/reference.asl index d7a94c7..a261ad7 100644 --- a/tests/aslts/src/compilation/collection/reference.asl +++ b/tests/aslts/src/compilation/collection/reference.asl @@ -32,7 +32,7 @@ // !!!!!!!!!!!!!!!!!!!!!!!!!!!!! -// ????? dont forget to remove DefinitionBlock from there !!!!!!!!!!! +// ????? don't forget to remove DefinitionBlock from there !!!!!!!!!!! // ??????????????????????????????? DefinitionBlock( diff --git a/tests/aslts/src/runtime/cntl/common.asl b/tests/aslts/src/runtime/cntl/common.asl index f91eb2c..a6a5999 100644 --- a/tests/aslts/src/runtime/cntl/common.asl +++ b/tests/aslts/src/runtime/cntl/common.asl @@ -44,7 +44,7 @@ Name (TRCF, 0x00) /* Trace enabling flag */ Name (TRCH, "ASLTS") /* Head of trace message */ Name (STST, "STST") /* Head of summary status message of test run */ - Name (CTST, "CTST") /* Head of curent status message of test run */ + Name (CTST, "CTST") /* Head of current status message of test run */ Name (PR01, 0x01) /* Printing starts of sub-tests */ Name (PR02, 0x01) /* More detailed printing */ /* Start time (Timer-time) of running test */ @@ -250,7 +250,7 @@ * the checking". This is possible due to SET0 as well. * * Note: - * Dont attempt to set up the zero "index of checking" + * Don't attempt to set up the zero "index of checking" * by this Method. It will be ignored and overwritten * by arg4 of err(). * @@ -331,7 +331,7 @@ * * For example, the test can be run only in 64-bit mode, in * 32-bit mode the result of the test is undefined, so in - * 32-bit mode, dont run it but only report the status of + * 32-bit mode, don't run it but only report the status of * test as skipped. */ Name (FLG5, 0x00) @@ -394,7 +394,7 @@ Name (B000, Buffer (0x04){}) If (SizeOf (NRMT)) { - /* Analize previous run of root Method */ + /* Analyze previous run of root Method */ Concatenate (":", TCN0 (TCLL), Local1) Concatenate (Local1, ":", Local0) @@ -707,7 +707,7 @@ /* ERR2 (Local5) - index of checking */ Local4 = ERR0 /* \ERR0 */ Local3 = ERR1 /* \ERR1 */ - /* Dont attempt to set up the zero "index of checking" */ + /* Don't attempt to set up the zero "index of checking" */ /* by SET0. It will be ignored and overwritten by arg4 */ /* of err(). */ If (ERR2) @@ -843,7 +843,7 @@ } ElseIf ((Arg0 == ZFFF)) { - /* ATTENTION: dont use zFFF in tests other than TCLD */ + /* ATTENTION: don't use zFFF in tests other than TCLD */ Local1 = SB00 (TIND, 0x00) } @@ -862,7 +862,7 @@ { If ((Arg2 == ZFFF)) { - /* ATTENTION: dont use zFFF in tests other than TCLD */ + /* ATTENTION: don't use zFFF in tests other than TCLD */ Local1 = SB00 (TIND, 0x00) } @@ -1961,7 +1961,7 @@ If ((Local2 == ZFFF)) { - /* ATTENTION: dont use zFFF in tests other than TCLD */ + /* ATTENTION: don't use zFFF in tests other than TCLD */ /* m - in case of TCLD tests there is an index of bug */ Local0 = (Arg1 >> 0x17) Local2 = (Local0 & 0x01FF) @@ -1989,7 +1989,7 @@ Local3 = (Arg1 & 0x0FFF) If ((Local2 == ZFFF)) { - /* ATTENTION: dont use zFFF in tests other than TCLD */ + /* ATTENTION: don't use zFFF in tests other than TCLD */ /* m - in case of TCLD tests there is an index of bug */ Local0 = (Arg1 >> 0x17) Local2 = (Local0 & 0x01FF) diff --git a/tests/aslts/src/runtime/cntl/ehandle.asl b/tests/aslts/src/runtime/cntl/ehandle.asl index b595f97..ec0bd7f 100644 --- a/tests/aslts/src/runtime/cntl/ehandle.asl +++ b/tests/aslts/src/runtime/cntl/ehandle.asl @@ -811,11 +811,11 @@ * arg0 - diagnostic message * arg1 - * zero means: - * - check that only one exception has arisen (curent number is equal to 1) + * - check that only one exception has arisen (current number is equal to 1) * - check that opcode is equal to that specified by arg2 * non-zero means: * - check that the number of exception arisen is not less than 1 - * (curent number is equal to 1 or greater) + * (current number is equal to 1 or greater) * 1: check that the first opcode is equal to that specified by arg2 * 2: check that the last opcode is equal to that specified by arg2 * diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobctl.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobctl.asl index d91262a..c30f1d1 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobctl.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobctl.asl @@ -43,7 +43,7 @@ Name (PP02, Package (0x01){}) /* Package for _TCI-begin statistics */ - /* (use NamedX, dont use ArgX/LocalX). */ + /* (use NamedX, don't use ArgX/LocalX). */ Name (PP0A, Package (0x01){}) /* Objects for verified operators */ diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobdecl.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobdecl.asl index 5fcc225..fa92874 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobdecl.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobdecl.asl @@ -43,7 +43,7 @@ Name (PP02, Package (0x01){}) /* Package for _TCI-begin statistics */ - /* (use NamedX, dont use ArgX/LocalX). */ + /* (use NamedX, don't use ArgX/LocalX). */ Name (PP0A, Package (0x01){}) /* Objects for verified operators */ diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl index f102686..7786975 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexceptions.asl @@ -34,7 +34,7 @@ Method (M374, 0, Serialized) { /* Package for _TCI-begin statistics */ - /* (use NamedX, dont use ArgX/LocalX). */ + /* (use NamedX, don't use ArgX/LocalX). */ Name (PP0A, Package (0x01){}) Method (M000, 1, NotSerialized) { diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl index f152bc3..126c818 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobexec.asl @@ -83,7 +83,7 @@ 0x00 }) /* Package for _TCI-begin statistics */ - /* (use NamedX, dont use ArgX/LocalX). */ + /* (use NamedX, don't use ArgX/LocalX). */ Name (PP0A, Package (0x01){}) /* Auxiliary objects for ASL-construction */ /* being investigated: */ @@ -168,7 +168,7 @@ Name (PP02, Package (0x01){}) /* Package for _TCI-begin statistics */ - /* (use NamedX, dont use ArgX/LocalX). */ + /* (use NamedX, don't use ArgX/LocalX). */ Name (PP0A, Package (0x01){}) /* Objects for verified operators */ @@ -2220,7 +2220,7 @@ If (RN01) { - /* Investigate and analize the logic of */ + /* Investigate and analyze the logic of */ /* crreating/deleting objects while processing */ /* the Store operator (the number of objects in */ /* different cases applying the Store operator). */ diff --git a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl index 4239b4f..53037f7 100644 --- a/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl +++ b/tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/dobmisc.asl @@ -41,7 +41,7 @@ Name (PP02, Package (0x01){}) /* Package for _TCI-begin statistics */ - /* (use NamedX, dont use ArgX/LocalX). */ + /* (use NamedX, don't use ArgX/LocalX). */ Name (PP0A, Package (0x01){}) /* Create and initialize the Memory Consumption Statistics Packages */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile b/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile index fd57143..e9fc579 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile @@ -6,6 +6,7 @@ COLL= ../.. ADD_ASLFLAGS=-vx 6142 #illegal forward reference ADD_ASLFLAGS+=-vx 6152 #recursive method call +ADD_ASLFLAGS+=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/INSTALL.TXT b/tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/INSTALL.TXT index 9f838f2..c093e67 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/INSTALL.TXT +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/INSTALL.TXT @@ -68,7 +68,7 @@ Use Method(TEST) as a template to create new methods. TO UNINSTALL: ============= -- Use Device Manager to uninstall the 'Intel ACPI Black Box Utlity Control Device' under 'System Devices' +- Use Device Manager to uninstall the 'Intel ACPI Black Box Utility Control Device' under 'System Devices' - Use Regedit and delete the following Keys: - HKLM\System\CurrentControlSet\Services\Acpi\Parameters\DSDT diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl index 2113df4..187d298 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv10.asl @@ -15,7 +15,7 @@ Name(z164, 164) /* * - * Read/write access to elemens of Package passed to method. + * Read/write access to elements of Package passed to method. * */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl index b7e12d8..1dc1d6d 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/device/ns_dv30.asl @@ -9,7 +9,7 @@ Name(z166, 166) /* * - * Read/write access to elemens of Package passed to method. + * Read/write access to elements of Package passed to method. * */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl index 8006b6a..7e48283 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in10.asl @@ -43,7 +43,7 @@ Name(z164, 164) /* * - * Read/write access to elemens of Package passed to method. + * Read/write access to elements of Package passed to method. * */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl index 75689f7..46ef2ad 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in30.asl @@ -37,7 +37,7 @@ Name(z166, 166) /* * - * Read/write access to elemens of Package passed to method. + * Read/write access to elements of Package passed to method. * */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl index be47818..9574cd8 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/initial/ns_in40.asl @@ -3163,7 +3163,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) */ /* @@ -3389,7 +3389,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) * * Note: * in the checking above the locals (Local1, Local3, Local5) @@ -3618,7 +3618,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) * * Note: * in the checkings above the locals (Arg0-Arg5) @@ -3842,7 +3842,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) * * Note: * in the checkings above the locals (Arg0-Arg5) @@ -4059,7 +4059,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) * * Note: no Args for this checking (see comment above). */ @@ -4270,7 +4270,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) * * Note: no Args for this checking (see comment above). */ @@ -4481,7 +4481,7 @@ Method(in41, 7, Serialized) /* * Modification 2: * - * Some params are intermediately stored to Args (efectively local) + * Some params are intermediately stored to Args (effectively local) * * Note: no Args for this checking (see comment above). */ diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl index be947bd..1abae77 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/misc/ms1.asl @@ -983,7 +983,7 @@ Method(ms17, 1, Serialized) Name(i001, 0) - OUTP("m001 started, DONT apply DerefOf()") + OUTP("m001 started, DON'T apply DerefOf()") Store(arg0, Local0) OUTP("Before Add") @@ -1188,7 +1188,7 @@ Method(ms19, 1, Serialized) } // When an invocation of a Method tries to return a Package, - // where some reference was saved, the AE_TYPE exeption occurs. + // where some reference was saved, the AE_TYPE exception occurs. //OUTP(ref0) Store(DerefOf(ref0), Local1) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl index 21cbbf6..a4c851c 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_abbu.asl @@ -28,9 +28,9 @@ /* * Tests to check recursive calls of methods for different structure of - * sub-trees containig the point from where the call is made and the point + * sub-trees containing the point from where the call is made and the point * which is just the invoked method, and different relative disposition of - * those sub-trees containig the points. + * those sub-trees containing the points. */ Name(z171, 171) diff --git a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl index 46c423f..96fad20 100644 --- a/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl +++ b/tests/aslts/src/runtime/collections/Identity2MS/abbu/recursion/rec_aslts.asl @@ -28,9 +28,9 @@ /* * Tests to check recursive calls of methods for different structure of - * sub-trees containig the point from where the call is made and the point + * sub-trees containing the point from where the call is made and the point * which is just the invoked method, and different relative disposition of - * those sub-trees containig the points. + * those sub-trees containing the points. */ Name(z172, 172) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl index 0b4c743..bb49fe7 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0031_ASL_RUNTIME/DECL.asl @@ -37,7 +37,7 @@ * Note 1: This test now is a run-time test because the ASL compiler doesn't * actually detect and prohibit (my mistake) use of object before its * declaration. After this bug of ASL compiler is fixed move this bdemo - * to non-run-time bug tests but dont forget to move all positive checkings + * to non-run-time bug tests but don't forget to move all positive checkings * of it in other run-time tests. * * Note 2: Since the ability itself to tun this test is error diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/RUN.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/RUN.asl index 2b04eec..c43b93e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/RUN.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0098/RUN.asl @@ -33,7 +33,7 @@ { /* * Method me52 is enough to identify this bug, - * so dont set up BLOCKED for this me58. + * so don't set up BLOCKED for this me58. * me58 will be added after bug-176 fixing. */ SRMT ("me58") diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl index 6612f9c..b67759f 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0126/DECL.asl @@ -51,7 +51,7 @@ Method (MF10, 1, Serialized) { Name (I001, 0x00) - Debug = "m001 started, DONT apply DerefOf()" + Debug = "m001 started, DON'T apply DerefOf()" Local7 = (Arg0 + 0x01) If ((Arg0 != 0x07)) { diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl index b255a5f..f47d2b0 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Common.asl @@ -4108,7 +4108,7 @@ Method(mfcc, 6, Serialized) * arg0 - Package to be verified * arg1 - index inside of Package * arg2 - how many elements to check - * arg3 - excpected value of element + * arg3 - expected value of element * arg4 - type of access through the IRefs * arg5 - index of error (inside the file) */ @@ -4149,7 +4149,7 @@ Method(mfce, 6, Serialized) * Verifying the contents of value pointed to by Reference. * * arg0 - Index reference - * arg1 - excpected value of element + * arg1 - expected value of element * arg2 - index of error (inside the file) */ Method(mfd8, 3) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl index ecec7f3..651a6ef 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0135/Misc1.asl @@ -2436,7 +2436,7 @@ Method(mf01,, Serialized) Index(DerefOf(Index(DerefOf(Index(p000, 135)), 4)), 0)) m002(p000, 135, 0x1074) - /* Restore the intial state of Packages */ + /* Restore the initial state of Packages */ m001(p000, 72, 0x0084) m001(p000, 81, 0x0094) @@ -2456,7 +2456,7 @@ Method(mf01,, Serialized) m001(p001, 126, 0x10e4) m001(p001, 135, 0x10f4) - /* Check the intial state of Packages */ + /* Check the initial state of Packages */ m000(p000, 0, 0x0004) m000(p000, 9, 0x0014) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl index bb58c87..344adbf 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0198/DECL.0000.asl @@ -122,7 +122,7 @@ Method(m002) ToBCD(Local0, Local2) - // These dont cause the effect: + // These don't cause the effect: // Divide(1, Local1, Local2) // Divide(1, Local1, Local7, Local2) // Store(SizeOf(d9Z0), Local2) diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0239_ACTION_REQUIRED/DECL.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0239_ACTION_REQUIRED/DECL.asl index a6ea606..fd42b85 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0239_ACTION_REQUIRED/DECL.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0239_ACTION_REQUIRED/DECL.asl @@ -36,7 +36,7 @@ * Run this in a slack mode (use AcpiExec -s ) * by the Threads debug operation on more than one thread * (use command). In this case the example - * causes crash of AcpiExec for any exception occured during + * causes crash of AcpiExec for any exception occurred during * execution of methods (m000, m001). */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl index 987aa87..cffadb3 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/0251_ACTION_REQUIRED/MAIN.asl @@ -85,7 +85,7 @@ DefinitionBlock( * in case of Threads command * the arguments passed to method are: * - * arg0 - total number of threads created by Threads commmand + * arg0 - total number of threads created by Threads command * arg1 - ID of the current thread * arg2 - index of the current thread (0, 1, 2 ... ) */ diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile b/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile index 5bc5138..f9fe7de 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile @@ -5,6 +5,7 @@ COLL= ../../.. ADD_ASLFLAGS=-vx 6142 #illegal forward reference ADD_ASLFLAGS+=-vx 6152 #recursive method call - +ADD_ASLFLAGS+=-vx 6163 #illegal reference in method + TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/data.asl b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/data.asl index 283b570..118890e 100644 --- a/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/data.asl +++ b/tests/aslts/src/runtime/collections/bdemo/ACPICA/common/data.asl @@ -442,7 +442,7 @@ Name (BD10, Buffer (0x09){}) /* It is used in b198 Name(id24, 0) */ /* Name(id25, 0) */ - /* Dont use this name bd13! */ + /* Don't use this name bd13! */ /* Name(bd13, Buffer(9){}) */ Name (ID29, 0x00) Name (ID2A, 0x00) diff --git a/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl b/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl index 051d148..aeb1993 100644 --- a/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl +++ b/tests/aslts/src/runtime/collections/complex/badasl/badasl.asl @@ -65,8 +65,8 @@ Method(m101,, Serialized) * in Package is greater than the value of NumElements. But, * ACPICA ASL Compiler run with -f option replaces the specified * value of NumElements by the actual number of elements in - * PackageList. So - no exceptions. We cant specify the ASL - * test - because we cant obtain AML code of Package with the + * PackageList. So - no exceptions. We can't specify the ASL + * test - because we can't obtain AML code of Package with the * actual number of elements in it greater than the value of * NumElements. * diff --git a/tests/aslts/src/runtime/collections/complex/misc/Makefile b/tests/aslts/src/runtime/collections/complex/misc/Makefile index cc9b931..fc8d8e3 100644 --- a/tests/aslts/src/runtime/collections/complex/misc/Makefile +++ b/tests/aslts/src/runtime/collections/complex/misc/Makefile @@ -2,6 +2,6 @@ AMLMOD= misc COLL= ../.. - +ADD_ASLFLAGS+=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/namespace/Makefile b/tests/aslts/src/runtime/collections/complex/namespace/Makefile index 0eee156..67d4708 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/Makefile +++ b/tests/aslts/src/runtime/collections/complex/namespace/Makefile @@ -3,5 +3,6 @@ AMLMOD= namespace COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/namespace/ns7.asl b/tests/aslts/src/runtime/collections/complex/namespace/ns7.asl index 4ca78de..203e5c2 100644 --- a/tests/aslts/src/runtime/collections/complex/namespace/ns7.asl +++ b/tests/aslts/src/runtime/collections/complex/namespace/ns7.asl @@ -1,3 +1,3 @@ // in progress -dont forget -- start the separate test for CopyObject \ No newline at end of file +don't forget -- start the separate test for CopyObject \ No newline at end of file diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/Makefile index 43c2931..dea56c9 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oarg/Makefile @@ -3,5 +3,6 @@ AMLMOD= oarg COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/Makefile index 2534509..8b8b14b 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oconst/Makefile @@ -3,5 +3,6 @@ AMLMOD= oconst COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/Makefile index 5bc9903..893feca 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/olocal/Makefile @@ -3,5 +3,6 @@ AMLMOD= olocal COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/Makefile index b99513d..d85013f 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedglob/Makefile @@ -3,5 +3,6 @@ AMLMOD= onamedglob COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/Makefile index f7c32cb..cc30e37 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/onamedloc/Makefile @@ -3,5 +3,6 @@ AMLMOD= onamedloc COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/Makefile index 7cc2a77..472f478 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/opackageel/Makefile @@ -3,5 +3,6 @@ AMLMOD= opackageel COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/Makefile index 48e4849..5cc91e6 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftonamed/Makefile @@ -3,5 +3,6 @@ AMLMOD= oreftonamed COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/Makefile index 9c1129a..a773074 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreftopackageel/Makefile @@ -3,5 +3,6 @@ AMLMOD= oreftopackageel COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/Makefile b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/Makefile index 4a35e03..4087580 100644 --- a/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/Makefile +++ b/tests/aslts/src/runtime/collections/complex/operand/tests/oreturn/Makefile @@ -3,5 +3,6 @@ AMLMOD= oreturn COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/SPEC b/tests/aslts/src/runtime/collections/complex/result/tests/SPEC index 781815e..7bb7c0e 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/SPEC +++ b/tests/aslts/src/runtime/collections/complex/result/tests/SPEC @@ -3,7 +3,7 @@ I. Test goals The intention of the test is to verify all the ASL grammar -rules of specifying, receiving and proccessing of Result objects +rules of specifying, receiving and processing of Result objects in ASL operators. The main goal of the test is checking that saving of Result objects in target (destination) ones for the next use is provided as determined by the Advanced Configuration and Power Interface @@ -17,7 +17,7 @@ is based on are enumerated in the Appendix I. The document represents a wide range of testing aspects and describes using of them in tests. - There are the following main issues in Result object proccessing: + There are the following main issues in Result object processing: - intermediate creation of an object of a specified type as a copy of the immediate Source Object or the result either of some operator @@ -314,7 +314,7 @@ using of them in tests. Thus the storing of a copy of an Object will be verified for all possible conditions that could appear in valid AML code. -The only problem is that implementaion of all testing aspects +The only problem is that implementation of all testing aspects can require too much efforts. So, the minimal set of testing aspects to verify should be determined. This set must include verifying of the following issues: diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/Makefile b/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/Makefile index e86d224..d9f0451 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/Makefile +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/Makefile @@ -3,5 +3,6 @@ AMLMOD= rcopyobject COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/RUN.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/RUN.asl index 64387ee..38fe97f 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/RUN.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/RUN.asl @@ -25,7 +25,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - If (STTT ("Result Object proccessing in CopyObject()", TCLC, 0x0F, W011)) + If (STTT ("Result Object processing in CopyObject()", TCLC, 0x0F, W011)) { RES1 () } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/rcopyobject.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/rcopyobject.asl index 035f7a8..ae16f44 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/rcopyobject.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rcopyobject/rcopyobject.asl @@ -26,7 +26,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Check Result Object proccessing on CopyObject + * Check Result Object processing on CopyObject */ Name (Z124, 0x7C) /* Run-method */ diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/Makefile b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/Makefile index 8649e57..f811afe 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/Makefile +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/Makefile @@ -3,5 +3,6 @@ AMLMOD= rexplicitconv COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl index 3a2a105..a9f4d59 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rexplicitconv/rexplicitconv.asl @@ -26,7 +26,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Check Result Object proccessing on optional storing + * Check Result Object processing on optional storing * in the explicit conversion operators */ Name (Z126, 0x7E) diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/Makefile b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/Makefile index 38aba9a..e0e2980 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/Makefile +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/Makefile @@ -3,5 +3,6 @@ AMLMOD= rindecrement COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/RUN.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/RUN.asl index 544c6a2..db33c64 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/RUN.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/RUN.asl @@ -25,7 +25,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - If (STTT ("Result Object proccessing in Increment/Decrement", TCLC, 0x10, W011)) + If (STTT ("Result Object processing in Increment/Decrement", TCLC, 0x10, W011)) { RES2 () } diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl index 7bdbf6a..a33a220 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rindecrement/rindecrement.asl @@ -26,7 +26,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Check Result Object proccessing on Increment/Decrement + * Check Result Object processing on Increment/Decrement */ Name (Z125, 0x7D) /* Test verifying Result Object processing on storing of the resilt */ @@ -1180,7 +1180,7 @@ /* Output statistics */ - M002 (Concatenate ("Result Object proccessing with ", DerefOf (PAC4 [Arg0]))) + M002 (Concatenate ("Result Object processing with ", DerefOf (PAC4 [Arg0]))) Return (0x00) } @@ -1188,7 +1188,7 @@ Method (RES2, 0, NotSerialized) { - Debug = "TEST: RES2, Result Object proccessing on Increment/Decrement" + Debug = "TEST: RES2, Result Object processing on Increment/Decrement" /* Increment */ M692 (0x00, 0x00) diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/Makefile b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/Makefile index 9873a64..9dd873b 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/roptional/Makefile +++ b/tests/aslts/src/runtime/collections/complex/result/tests/roptional/Makefile @@ -3,5 +3,6 @@ AMLMOD= roptional COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/Makefile b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/Makefile index 8c69825..21f562d 100644 --- a/tests/aslts/src/runtime/collections/complex/result/tests/rstore/Makefile +++ b/tests/aslts/src/runtime/collections/complex/result/tests/rstore/Makefile @@ -3,5 +3,6 @@ AMLMOD= rstore COLL= ../../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl index 76eac91..17b6ab3 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc/exc.asl @@ -639,7 +639,7 @@ CH04 (__METHOD__, 0x01, 0x37, Z058, __LINE__, 0x00, 0x00) /* AE_AML_PACKAGE_LIMIT */ } - /* Exeptional conditions of ConcatenateResTemplate */ + /* Exceptional conditions of ConcatenateResTemplate */ Method (M154, 0, Serialized) { diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/Makefile b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/Makefile index b3d99fd..4616b0d 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/Makefile +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/Makefile @@ -3,5 +3,6 @@ AMLMOD= exc_operand2 COLL= ../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl index fc93938..25c84e5 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl +++ b/tests/aslts/src/runtime/collections/exceptions/exc_operand/exc_operand2/exc_04_pckg.asl @@ -48,7 +48,7 @@ Event (E000) Name (I000, 0x00) /* Local Named Object */ - /* ASL compiler prohibits to use Pakage */ + /* ASL compiler prohibits to use Package */ /* Named Objects in the most of operators */ Method (M000, 1, Serialized) { diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_ref/Makefile b/tests/aslts/src/runtime/collections/exceptions/exc_ref/Makefile index 52de81c..eda0be8 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_ref/Makefile +++ b/tests/aslts/src/runtime/collections/exceptions/exc_ref/Makefile @@ -3,5 +3,6 @@ AMLMOD= exc_ref COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_result/exc_result2/Makefile b/tests/aslts/src/runtime/collections/exceptions/exc_result/exc_result2/Makefile index ad07086..32b9449 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_result/exc_result2/Makefile +++ b/tests/aslts/src/runtime/collections/exceptions/exc_result/exc_result2/Makefile @@ -3,5 +3,6 @@ AMLMOD= exc_result2 COLL= ../../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/exceptions/exc_tbl/Makefile b/tests/aslts/src/runtime/collections/exceptions/exc_tbl/Makefile index fcbc113..d8e91e0 100644 --- a/tests/aslts/src/runtime/collections/exceptions/exc_tbl/Makefile +++ b/tests/aslts/src/runtime/collections/exceptions/exc_tbl/Makefile @@ -3,5 +3,6 @@ AMLMOD= exc_tbl COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/control/Makefile b/tests/aslts/src/runtime/collections/functional/control/Makefile index d15caa5..6ac2db4 100644 --- a/tests/aslts/src/runtime/collections/functional/control/Makefile +++ b/tests/aslts/src/runtime/collections/functional/control/Makefile @@ -3,6 +3,6 @@ AMLMOD= control COLL= ../.. -ADD_ASLFLAGS=-vx 6152 +ADD_ASLFLAGS=-vx 6152 -vx 6163 TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/control/timing.asl b/tests/aslts/src/runtime/collections/functional/control/timing.asl index 7b0652a..4ebc2b2 100644 --- a/tests/aslts/src/runtime/collections/functional/control/timing.asl +++ b/tests/aslts/src/runtime/collections/functional/control/timing.asl @@ -41,7 +41,7 @@ Name(MSLP, 2000) // Max sleep (ms) defined in acconfig.h, Oct 2013 // // Local0 - argument passed by test (MilliSeconds) // Local4 - specified time to be delayed (in Timer units) -// Local6 - time actualy was delayed (measured by Timer, in Timer units) +// Local6 - time actually was delayed (measured by Timer, in Timer units) // Local7 - delta == (actual - specified) (in Timer units) // Method(m0c8, 6) diff --git a/tests/aslts/src/runtime/collections/functional/control/while.asl b/tests/aslts/src/runtime/collections/functional/control/while.asl index 8e4c41d..f23b748 100644 --- a/tests/aslts/src/runtime/collections/functional/control/while.asl +++ b/tests/aslts/src/runtime/collections/functional/control/while.asl @@ -330,7 +330,7 @@ Method(m0fa, 2, Serialized) // ln0x - next level // c00x - flag of Continue // b00x - flag of Break - // i00x - currrent index of iteration + // i00x - current index of iteration // n00x - number of iterations // //////////////// diff --git a/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl b/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl index 4168847..e28e6e6 100644 --- a/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl +++ b/tests/aslts/src/runtime/collections/functional/descriptor/irq.asl @@ -148,7 +148,7 @@ Byte 1 (IRQ mask bits[7:0]): IRQ0 <=> bit[0] Byte 2 (IRQ mask bits[15:8]): IRQ8 <=> bit[0] Byte 3 (IRQ Information): - Bit[4] Interrupt is sharable, _SHR + Bit[4] Interrupt is shareable, _SHR Bit[3] Interrupt Polarity, _LL 0 Active-High - This interrupt is sampled when the signal is high, or true 1 Active-Low - This interrupt is sampled when the signal is low, or false. diff --git a/tests/aslts/src/runtime/collections/functional/name/Makefile b/tests/aslts/src/runtime/collections/functional/name/Makefile index eaf0f5d..de62dcf 100644 --- a/tests/aslts/src/runtime/collections/functional/name/Makefile +++ b/tests/aslts/src/runtime/collections/functional/name/Makefile @@ -3,5 +3,6 @@ AMLMOD= name COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/reference/Makefile b/tests/aslts/src/runtime/collections/functional/reference/Makefile index b086b34..3040a2b 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/Makefile +++ b/tests/aslts/src/runtime/collections/functional/reference/Makefile @@ -3,5 +3,6 @@ AMLMOD= reference COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl index 330826d..55be81f 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref00.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref00.asl @@ -41,10 +41,10 @@ Store(\d900.i900, Debug) */ Name (Z076, 0x4C) - /* Check Boolen (CondRefOf) and the type of value */ + /* Check Boolean (CondRefOf) and the type of value */ /* arg0 - reference to the value of arbitrary type */ /* arg1 - expected type of value */ - /* arg2 - returned Boolen */ + /* arg2 - returned Boolean */ /* arg3 - index of checking (inside the file) */ Method (M1A0, 4, NotSerialized) { @@ -100,7 +100,7 @@ /* if(c089) */ /* ATTENTION: exactly the same in m1a0 and m1a2 */ - /* (but, dont replace it by call to Method) */ + /* (but, don't replace it by call to Method) */ Method (M002, 1, NotSerialized) { Arg0 = 0xABCD001A @@ -359,7 +359,7 @@ /* if(c084) */ /* ATTENTION: exactly the same in m1a0 and m1a2 */ - /* (but, dont replace it by call to Method) */ + /* (but, don't replace it by call to Method) */ Method (M002, 1, NotSerialized) { Arg0 = 0xABCD001A @@ -479,8 +479,8 @@ RST0 () } - /* Check only Boolen (CondRefOf) */ - /* arg0 - returned Boolen */ + /* Check only Boolean (CondRefOf) */ + /* arg0 - returned Boolean */ /* arg1 - index of checking (inside the file) */ Method (M1A4, 2, NotSerialized) { diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref02.asl b/tests/aslts/src/runtime/collections/functional/reference/ref02.asl index 88b7e27..456d98b 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref02.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref02.asl @@ -823,7 +823,7 @@ If (Arg1) { /* Data are unchanged, because writings were made */ - /* into the new objects assosiated with Local7. */ + /* into the new objects associated with Local7. */ M1A6 () Return (Zero) } @@ -1201,7 +1201,7 @@ If (Arg1) { /* Data are unchanged, because writings were made */ - /* into the new objects assosiated with Local7. */ + /* into the new objects associated with Local7. */ M1A6 () Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref03.asl b/tests/aslts/src/runtime/collections/functional/reference/ref03.asl index 3f4adf8..b0c9437 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref03.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref03.asl @@ -823,7 +823,7 @@ If (Arg2) { /* Data are unchanged, because writings were made */ - /* into the new objects assosiated with arg1. */ + /* into the new objects associated with arg1. */ M1A6 () Return (Zero) } @@ -1201,7 +1201,7 @@ If (Arg2) { /* Data are unchanged, because writings were made */ - /* into the new objects assosiated with arg1. */ + /* into the new objects associated with arg1. */ M1A6 () Return (Zero) } diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl index 12d885a..fd34efd 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref50.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref50.asl @@ -43,7 +43,7 @@ SEE: CURRENTLY: compiler failed, Too few arguments (M002 requires X) SEE: test ref70 now works in accordance with the current behaviour - expects exceptions when dealing with ArgX-ORef & ArgX-IRef. - should be re-dericted: when read autimatic dereference will + should be re-dericted: when read automatic dereference will be done properly. ?????????????????????? */ @@ -4884,7 +4884,7 @@ M391 (I050, C00A, 0x00, __LINE__) M000 (RefOf (B050), C00A, C00B) M391 (I050, C00A, 0x00, __LINE__) - /* Write Bufer */ + /* Write Buffer */ M000 (RefOf (I060), C00B, C009) M391 (I060, C00B, 0x00, __LINE__) @@ -5496,7 +5496,7 @@ !!!!!!!!!!!!!!!!!!!!!!! Do this test, like this - run Derefof for the chain of references (IR/OR) and for ring of them. - I dont remember if we have already such test. + I don't remember if we have already such test. !!!!!!!!!!!!!!!!!!!!!!! Method(m000) { @@ -5761,7 +5761,7 @@ } 2. do many enclosed method calls to show that index to Str,Buf,Pckg - changes the intial object nevertheless + changes the initial object nevertheless */ /* Method (M001) diff --git a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl index 1a6b7f2..3f26f87 100644 --- a/tests/aslts/src/runtime/collections/functional/reference/ref70.asl +++ b/tests/aslts/src/runtime/collections/functional/reference/ref70.asl @@ -875,7 +875,7 @@ { /* Run simple test only for some particular ways of */ /* obtaining references. */ - C086 = 0x00 /* dont break testing on error appearance */ + C086 = 0x00 /* don't break testing on error appearance */ SRMT ("m1a9") M1A9 () } diff --git a/tests/aslts/src/runtime/collections/functional/region/Makefile b/tests/aslts/src/runtime/collections/functional/region/Makefile index af1008e..a08f74b 100644 --- a/tests/aslts/src/runtime/collections/functional/region/Makefile +++ b/tests/aslts/src/runtime/collections/functional/region/Makefile @@ -3,5 +3,6 @@ AMLMOD= region COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/Makefile b/tests/aslts/src/runtime/collections/functional/synchronization/Makefile index 6ae0e75..0e3fe36 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/Makefile +++ b/tests/aslts/src/runtime/collections/functional/synchronization/Makefile @@ -3,5 +3,6 @@ AMLMOD= synchronization COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/SPEC b/tests/aslts/src/runtime/collections/functional/synchronization/SPEC index f3556ce..7f8a29e 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/SPEC +++ b/tests/aslts/src/runtime/collections/functional/synchronization/SPEC @@ -15,11 +15,11 @@ then Release them all in the inverse order (keep the exactly inverse order for Releasing mutexes of the same level too). m36a: -Exactly m301 but additioanlly: +Exactly m301 but additionally: all Release opreations are located into separate method. m36b: -Exactly m301 but additioanlly: +Exactly m301 but additionally: all Acquire and Release opreations are located into separate methods. m36c: diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/event.asl b/tests/aslts/src/runtime/collections/functional/synchronization/event.asl index 7450ea4..002c473 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/event.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/event.asl @@ -30,7 +30,7 @@ */ /* !!!!!!!!!!!!!!!!!!!!!!!!!!!! - SEE: shouls be a few updated + SEE: should be a few updated !!!!!!!!!!!!!!!!!!!!!!!!!!!! */ /* The test for ASL-Events to be run on a single invocation only */ diff --git a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl index de56ee0..adff437 100644 --- a/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl +++ b/tests/aslts/src/runtime/collections/functional/synchronization/mutex2.asl @@ -612,7 +612,7 @@ * on level 0 too) for all available levels from 0 up to 15, * then Release them all in the inverse order. * - * Exactly m301 but additioanlly: + * Exactly m301 but additionally: * all Release opreations are located into separate method. */ Method (M36A, 0, Serialized) @@ -809,7 +809,7 @@ * on level 0 too) for all available levels from 0 up to 15, * then Release them all in the inverse order. * - * Exactly m301 but additioanlly: + * Exactly m301 but additionally: * all Acquire and Release opreations are located into separate methods. */ Method (M36B, 0, Serialized) @@ -1313,7 +1313,7 @@ /* AE_AML_MUTEX_ORDER */ /* * Break for the first bunch of errors encountered, - * dont waste log. + * don't waste log. */ BR00 = 0x01 } @@ -2051,7 +2051,7 @@ CN00++ If (!Y242) { - /* Always inverse order untill the bug 242 is fixes */ + /* Always inverse order until the bug 242 is fixes */ Local0 = 0x01 } diff --git a/tests/aslts/src/runtime/collections/functional/table/Makefile b/tests/aslts/src/runtime/collections/functional/table/Makefile index 9e82720..5eff032 100644 --- a/tests/aslts/src/runtime/collections/functional/table/Makefile +++ b/tests/aslts/src/runtime/collections/functional/table/Makefile @@ -3,5 +3,6 @@ AMLMOD= table COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/collections/functional/table/load.asl b/tests/aslts/src/runtime/collections/functional/table/load.asl index 4c46cd9..687d6ec 100644 --- a/tests/aslts/src/runtime/collections/functional/table/load.asl +++ b/tests/aslts/src/runtime/collections/functional/table/load.asl @@ -1454,7 +1454,7 @@ Local2 = Buffer (0x0A) Return (0x01) } - /* Uninitialized: it can not be aplied to Load which */ + /* Uninitialized: it can not be applied to Load which */ /* allows NameString only to be used as Object parameter */ /* Integer */ Load (\AUXD.INT0, DDBH) /* \DTM0.TSTB.DDBH */ @@ -2125,7 +2125,7 @@ Local2 = Buffer (0x0A) Load (RFU3, DDB3) /* \DTM0.TSTH.DDB3 */ } - /* Futher 1 Method can be called */ + /* Further 1 Method can be called */ Unload (DDB1) CH04 (Arg0, 0x00, 0x56, Z174, __LINE__, 0x00, 0x00) /* AE_OWNER_ID_LIMIT */ diff --git a/tests/aslts/src/runtime/collections/mt/mutex/SPEC b/tests/aslts/src/runtime/collections/mt/mutex/SPEC index ca9434f..671b516 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/SPEC +++ b/tests/aslts/src/runtime/collections/mt/mutex/SPEC @@ -28,7 +28,7 @@ Active agents of subject of mt-testing - invocation (?) -- is not thread (?) - can invocation have several different threads? - "interpretation of the current invocation could not be - transfered to different invocation until the current says + transferred to different invocation until the current says - 'ok I complete'" ======================== @@ -105,7 +105,7 @@ DETAILS: 1. The Slave threads do the same actions described below: - acquire one by one mutexes of all levels from 0 up to 15 (N mutexes per level) - - after aquiring the mutex of 15-th level start releaseng them in the inverse order + - after acquiring the mutex of 15-th level start releaseng them in the inverse order - do the control actions with the flags and counters of mutexes (see comment to mf01) # ========================= # @@ -420,7 +420,7 @@ Similar to test 016 check for non-serialized method. ========================================= XXXXX: -acquire mutex on a global level but dont release it - +acquire mutex on a global level but don't release it - check that it is released automatically ??? (code in initialization of global variables) @@ -438,10 +438,10 @@ calls to other methods inside the serialized method) 1) access to different type data inside serialized method ========================================= XXXXX, serialized-method: -try to Acq/Rel mutex of inappropreate level LL from method MT0 of synclevel NN. +try to Acq/Rel mutex of inappropriate level LL from method MT0 of synclevel NN. - immediately from that method -- from invoking more the intermittant methods - enclosed statically or only dinamically in that method +- from invoking more the intermittent methods + enclosed statically or only dynamically in that method ========================================= XXXXX: check blocked: check that when one thread fall to sleep another can own that mutex ????????????? diff --git a/tests/aslts/src/runtime/collections/mt/mutex/common.asl b/tests/aslts/src/runtime/collections/mt/mutex/common.asl index 228c3b5..c4d8600 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/common.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/common.asl @@ -48,7 +48,7 @@ * as a number of threads parameter. * * Number of threads actually in work - - * number of threads actually participating the relevent test. + * number of threads actually participating the relevant test. * Note: this value includes the Control Thread too. */ Name (Z147, 0x93) @@ -358,7 +358,7 @@ * arg1 - ID of current thread (0, can be used for control only) * arg2 - Index of current thread * arg3 - cammand - index of the test strategy to be - * managed and controled by the Control Thread + * managed and controlled by the Control Thread * and fulfilled by the Slave Threads (Slaves). * * Arguments of the command arg3: @@ -856,7 +856,7 @@ } /* - * Run and analize result of m10e() + * Run and analyze result of m10e() * * arg0, * arg1 - see m10e @@ -1146,7 +1146,7 @@ } } - /* Analize opcode of exception to be generated */ + /* Analyze opcode of exception to be generated */ Switch (Arg2) { diff --git a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl index 536ea7d..5db52f7 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/mxs.asl @@ -792,18 +792,18 @@ * * 1) before to run operation: * - * check absence of any exception occured on this thread + * check absence of any exception occurred on this thread * * 2) after the operation is completed depending on X0: * * EX0E (particular undefined opcode of exception): * - * check that no any exception occured on this thread + * check that no any exception occurred on this thread * * otherwise: * * check that exception with opcode equal to X0 - * has occured on this thread + * has occurred on this thread * * arg3 - Levels of mutexes (buffer/Integer). * diff --git a/tests/aslts/src/runtime/collections/mt/mutex/service.asl b/tests/aslts/src/runtime/collections/mt/mutex/service.asl index 822ebfb..00be9db 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/service.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/service.asl @@ -225,7 +225,7 @@ } /* - * Fulfil and report Sleep + * Fulfill and report Sleep * * arg0 - Index of current thread * arg1 - number of milliseconds to sleep @@ -244,7 +244,7 @@ } /* - * Fulfil and report Stall + * Fulfill and report Stall * * arg0 - Index of current thread * arg1 - number of MicroSeconds to Stall diff --git a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl index b9549a7..9a8ad9b 100644 --- a/tests/aslts/src/runtime/collections/mt/mutex/tests.asl +++ b/tests/aslts/src/runtime/collections/mt/mutex/tests.asl @@ -26,7 +26,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * The test strategies to be managed and controled by the + * The test strategies to be managed and controlled by the * Control Thread and fulfilled by the Slave Threads (Slaves). */ Name (Z152, 0x98) diff --git a/tests/aslts/src/runtime/collections/service/condbranches/Makefile b/tests/aslts/src/runtime/collections/service/condbranches/Makefile index ef2eb78..73a096a 100644 --- a/tests/aslts/src/runtime/collections/service/condbranches/Makefile +++ b/tests/aslts/src/runtime/collections/service/condbranches/Makefile @@ -3,5 +3,6 @@ AMLMOD= condbranches COLL= ../.. +ADD_ASLFLAGS=-vx 6163 #illegal reference in method TOP= $(COLL)/../../.. include $(COLL)/Makefile.install diff --git a/tests/aslts/src/runtime/common/conversion/oproc.asl b/tests/aslts/src/runtime/common/conversion/oproc.asl index 892560f..7751a22 100644 --- a/tests/aslts/src/runtime/common/conversion/oproc.asl +++ b/tests/aslts/src/runtime/common/conversion/oproc.asl @@ -49,11 +49,11 @@ /* (low number of available arguments {Arg0-Arg6} complicates algorithms). */ /* */ /* Currently from the mask of exceptions to be forced are excluded bits */ - /* corresponding to the following types ("dont know how" have to be added): */ + /* corresponding to the following types ("don't know how" have to be added): */ /* */ - /* - Method (dont know how) */ - /* - Thermal Zones (dont know how) */ - /* - DDB Handle (dont know how) */ + /* - Method (don't know how) */ + /* - Thermal Zones (don't know how) */ + /* - DDB Handle (don't know how) */ /* - Debug Object (impossible, Compiler refuses) */ /* - Uninitialized (update needed, currently the test is implemented incorrectly. */ /* Uninitialized type have to be passed immediately as operands */ @@ -75,7 +75,7 @@ /* */ Name (Z064, 0x40) /* Commutative two operands operation */ - /* (CAUTION: dont forget to clean it) */ + /* (CAUTION: don't forget to clean it) */ Name (COM2, 0x00) /* Flags exception expected */ /* (needed due to the lack of Arguments number) */ @@ -1013,7 +1013,7 @@ Return (Local7) } - /* Initiate exception by inappropreate operand */ + /* Initiate exception by inappropriate operand */ Method (M488, 6, Serialized) { diff --git a/tests/aslts/src/runtime/common/conversion/otest.asl b/tests/aslts/src/runtime/common/conversion/otest.asl index 08c35c9..dcb7392 100644 --- a/tests/aslts/src/runtime/common/conversion/otest.asl +++ b/tests/aslts/src/runtime/common/conversion/otest.asl @@ -3568,7 +3568,7 @@ If (Arg0) { M486 () - /* Error: CondRefOf failes with the Unitialized type */ + /* Error: CondRefOf failes with the Uninitialized type */ Local7 = M488 (OP, 0x01, 0x00, 0x00, 0x00, 0x00) } @@ -3590,7 +3590,7 @@ If (Arg0) { M486 () - /* Error: CopyObject failes with the Unitialized type */ + /* Error: CopyObject failes with the Uninitialized type */ Local7 = M488 (OP, 0x01, 0x00, 0x00, 0x00, 0x00) } @@ -8462,7 +8462,7 @@ If (Arg0) { M486 () - /* Error: ObjectType failes with the Unitialized type */ + /* Error: ObjectType failes with the Uninitialized type */ Local7 = M488 (OP, 0x01, 0x00, 0x00, 0x00, 0x00) } @@ -8508,7 +8508,7 @@ If (Arg0) { M486 () - /* Error: RefOf failes with the Unitialized type */ + /* Error: RefOf failes with the Uninitialized type */ Local7 = M488 (OP, 0x01, 0x00, 0x00, 0x00, 0x00) } @@ -8570,7 +8570,7 @@ If (Arg0) { M486 () - /* Error: Return failes with the Unitialized type */ + /* Error: Return failes with the Uninitialized type */ Local7 = M488 (OP, 0x01, 0x00, 0x00, 0x00, 0x00) } @@ -8720,7 +8720,7 @@ If (Arg0) { M486 () - /* Error: Store failes with the Unitialized type */ + /* Error: Store failes with the Uninitialized type */ Local7 = M488 (OP, 0x01, 0x00, 0x00, 0x00, 0x00) } diff --git a/tests/aslts/src/runtime/common/conversion/rtest.asl b/tests/aslts/src/runtime/common/conversion/rtest.asl index 45c2bd1..83dca74 100644 --- a/tests/aslts/src/runtime/common/conversion/rtest.asl +++ b/tests/aslts/src/runtime/common/conversion/rtest.asl @@ -435,7 +435,7 @@ 0x61, 0x62, 0x63, 0x64, 0x65, 0x66 // abcdef }, - /* ============= Result omited */ + /* ============= Result omitted */ 0x00, 0x00, @@ -469,7 +469,7 @@ 0x61, 0x62, 0x63, 0x64, 0x65, 0x66 // abcdef }, - /* ============= Store omited */ + /* ============= Store omitted */ 0x00ABCDEF12345678, 0x12345678, @@ -988,7 +988,7 @@ 0x61, 0x62, 0x63, 0x64, 0x65, 0x66 // abcdef }, - /* ============= Result omited */ + /* ============= Result omitted */ /* ,i */ 0x00, 0x00, @@ -1030,7 +1030,7 @@ 0x61, 0x62, 0x63, 0x64, 0x65, 0x66 // abcdef }, - /* ============= Store omited */ + /* ============= Store omitted */ /* i, */ 0x3231666564636261, 0x64636261, @@ -1413,7 +1413,7 @@ BF11 = Concatenate (Arg1, Arg2, BF01) /* \BF01 */ M4C1 (Arg0, Arg3, 0x18, 0x01, 0x01, BF01, BF11) - /* ============= Result omited */ + /* ============= Result omitted */ /* ,i,s,b,bf */ /* ,i */ II10 = Concatenate (Arg1, Arg2) @@ -1434,7 +1434,7 @@ BF11 = Concatenate (Arg1, Arg2) M4C1 (Arg0, Arg3, 0x1D, 0x00, 0x01, 0x00, BF11) - /* ============= Store omited */ + /* ============= Store omitted */ /* i,s,b,bf, */ /* i, */ Concatenate (Arg1, Arg2, II00) /* \II00 */ diff --git a/tests/aslts/src/runtime/common/operations.asl b/tests/aslts/src/runtime/common/operations.asl index 0033e38..f03fbcf 100644 --- a/tests/aslts/src/runtime/common/operations.asl +++ b/tests/aslts/src/runtime/common/operations.asl @@ -88,7 +88,7 @@ /* Flag - it is expected that operation will cause exception */ Name (FLG3, 0x00) - /* Flag - dont do further checkings */ + /* Flag - don't do further checkings */ Name (FLG4, 0x00) /* Collect calls to all operators */ @@ -452,7 +452,7 @@ If (FLG4) { - /* Dont do further checkings. */ + /* Don't do further checkings. */ Return (0x01) } diff --git a/tests/misc/grammar.aml b/tests/misc/grammar.aml index eab8e5f..162eee9 100755 Binary files a/tests/misc/grammar.aml and b/tests/misc/grammar.aml differ diff --git a/tests/misc/grammar.asl b/tests/misc/grammar.asl index 3b7422b..1119ba9 100644 --- a/tests/misc/grammar.asl +++ b/tests/misc/grammar.asl @@ -28,7 +28,7 @@ // // -// Grammar.asl - Minimally excercises most ASL constructs +// Grammar.asl - Minimally exercises most ASL constructs // // NOTE -- use: iasl -f -of grammar.asl to compile // @@ -723,7 +723,7 @@ DefinitionBlock ( BUS0 ) } )// PRT0 - CreateWordField(PRT0, BUS0._MIN, BMIN) //Minimum bus number suported under this bridge. + CreateWordField(PRT0, BUS0._MIN, BMIN) //Minimum bus number supported under this bridge. Store(3, BMIN) Return(PRT0) @@ -3818,7 +3818,7 @@ DefinitionBlock ( Method(LSGR,2) {//LSGR - //Test on arguements passed + //Test on arguments passed //in test data, Arg1 > Arg0 if(LEqual(Ones,LNot(LGreater(Arg1,Arg0)))) @@ -5025,7 +5025,7 @@ DefinitionBlock ( { Store ("++++++++ CrBytFld Test", Debug) - // Local0 is unitialized buffer with 4 elements + // Local0 is uninitialized buffer with 4 elements Store (Buffer (4) {}, Local0) // create Byte Field named BF0 based on Local0 element 0 @@ -6590,7 +6590,7 @@ DefinitionBlock ( Store ("++++++++ IndexOp Test", Debug) // test storing into uninitialized package elements - Name (PBUF, Package(4) {}) // leave unitialized + Name (PBUF, Package(4) {}) // leave uninitialized Store (0x01234567, Index (PBUF,0)) Store (0x89ABCDEF, Index (PBUF,1)) Store (0xFEDCBA98, Index (PBUF,2))