diff --git a/.gitignore b/.gitignore index 16d793e..ac6ac44 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ /acpitests-unix-20170224.tar.gz /acpica-unix2-20170303.tar.gz /acpitests-unix-20170303.tar.gz +/acpica-unix2-20170531.tar.gz +/acpitests-unix-20170531.tar.gz diff --git a/acpica-tools.spec b/acpica-tools.spec index 27d2198..b4145a3 100644 --- a/acpica-tools.spec +++ b/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20170303 -Release: 5%{?dist} +Version: 20170531 +Release: 1%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -194,6 +194,9 @@ fi %changelog +* Fri Aug 11 2017 Al Stone - 20170531-1 +- Update to 20170531 source tree, including patch refeshes + * Wed Aug 02 2017 Fedora Release Engineering - 20170303-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/badcode.asl.result b/badcode.asl.result index d2b04bc..4cfcefc 100644 --- a/badcode.asl.result +++ b/badcode.asl.result @@ -85,25 +85,25 @@ Warning 3144 - Method Local is set but never used ^ (Local0) badcode.asl 126: Method (MTH5) {Store (MTH4(), Local0)} Error 6080 - Called method returns no value ^ -badcode.asl 132: Name (_HID, "*PNP0C0A") /* Illegal leading asterisk +badcode.asl 132: Name (_HID, "*PNP0C0A") // Illegal leading asterisk Error 6061 - Invalid leading asterisk ^ (*PNP0C0A) -badcode.asl 136: Name (_HID, "PNP") /* Too short, must be 7 or 8 chars +badcode.asl 136: Name (_HID, "PNP") // Too short, must be 7 or 8 chars Error 6033 - ^ _HID string must be exactly 7 or 8 characters (PNP) -badcode.asl 140: Name (_HID, "MYDEVICE01") /* Too long, must be 7 or 8 chars +badcode.asl 140: Name (_HID, "MYDEVICE01") // Too long, must be 7 or 8 chars Error 6033 - ^ _HID string must be exactly 7 or 8 characters (MYDEVICE01) -badcode.asl 144: Name (_HID, "acpi0001") /* non-hex chars must be uppercase +badcode.asl 144: Name (_HID, "acpi0001") // non-hex chars must be uppercase Error 6034 - ^ _HID prefix must be all uppercase or decimal digits (acpi0001) -badcode.asl 148: Name (_HID, "PNP-123") /* HID must be alphanumeric +badcode.asl 148: Name (_HID, "PNP-123") // HID must be alphanumeric Error 6002 - ^ String must be entirely alphanumeric (PNP-123) -badcode.asl 152: Name (_HID, "") /* Illegal Null HID +badcode.asl 152: Name (_HID, "") // Illegal Null HID Error 6091 - ^ Invalid zero-length (null) string -badcode.asl 153: Name (_CID, "") /* Illegal Null CID +badcode.asl 153: Name (_CID, "") // Illegal Null CID Error 6091 - ^ Invalid zero-length (null) string badcode.asl 158: Name (_PRW, 4) @@ -157,49 +157,49 @@ Error 6019 - ^ Dependent function macros can badcode.asl 225: }) Error 6070 - ^ Missing EndDependentFn() macro in dependent resource list -badcode.asl 242: 0x00002000, /* Length +badcode.asl 242: 0x00002000, // Length Error 6049 - ^ Length is larger than Min/Max window -badcode.asl 247: 0x00001001, /* Range Minimum +badcode.asl 247: 0x00001001, // Range Minimum Error 6001 - ^ Must be a multiple of alignment/granularity value -badcode.asl 248: 0x00002002, /* Range Maximum +badcode.asl 248: 0x00002002, // Range Maximum Error 6001 - ^ Must be a multiple of alignment/granularity value -badcode.asl 255: 0xFFFF, /* Address +badcode.asl 255: 0xFFFF, // Address Warning 3060 - ^ Maximum 10-bit ISA address (0x3FF) -badcode.asl 264: 0x05 /* Access Size +badcode.asl 264: 0x05 // Access Size Error 6042 - ^ Invalid AccessSize (Maximum is 4 - QWord access) badcode.asl 268: QWordSpace (0xB0, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xA5, Error 6139 - Constant out of range ^ (0xB0, allowable: 0xC0-0xFF) -badcode.asl 279: 0x0200, /* Range Minimum +badcode.asl 279: 0x0200, // Range Minimum Error 6051 - ^ Address Min is greater than Address Max -badcode.asl 291: 0x00001002, /* Length +badcode.asl 291: 0x00001002, // Length Error 6049 - ^ Length is larger than Min/Max window badcode.asl 296: 0x00000010, Error 6048 - ^ Granularity must be zero or a power of two minus one -badcode.asl 305: 0x0000000000000B02, /* Range Minimum +badcode.asl 305: 0x0000000000000B02, // Range Minimum Error 6001 - ^ Must be a multiple of alignment/granularity value -badcode.asl 315: 0x00000000002FFFFE, /* Range Maximum +badcode.asl 315: 0x00000000002FFFFE, // Range Maximum Error 6001 - ^ Must be a multiple of alignment/granularity value (-1) -badcode.asl 326: 0x00000000, /* Length +badcode.asl 326: 0x00000000, // Length Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags -badcode.asl 335: 0x00000100, /* Length +badcode.asl 335: 0x00000100, // Length Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags -badcode.asl 344: 0x00000200, /* Length +badcode.asl 344: 0x00000200, // Length Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags -badcode.asl 349: 0x0000000F, /* Granularity +badcode.asl 349: 0x0000000F, // Granularity Error 6047 - ^ Granularity must be zero for fixed Min/Max badcode.asl 358: DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange, diff --git a/debian-big_endian.patch b/debian-big_endian.patch index 19ac6cc..1db9379 100644 --- a/debian-big_endian.patch +++ b/debian-big_endian.patch @@ -18,10 +18,10 @@ support source/include/platform/aclinux.h | 8 ++ 12 files changed, 487 insertions(+), 283 deletions(-) -Index: acpica-unix2-20170224/source/compiler/aslcodegen.c +Index: acpica-unix2-20170531/source/compiler/aslcodegen.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslcodegen.c -+++ acpica-unix2-20170224/source/compiler/aslcodegen.c +--- acpica-unix2-20170531.orig/source/compiler/aslcodegen.c ++++ acpica-unix2-20170531/source/compiler/aslcodegen.c @@ -238,16 +238,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { @@ -263,10 +263,10 @@ Index: acpica-unix2-20170224/source/compiler/aslcodegen.c case AML_RAW_DATA_BUFFER: -Index: acpica-unix2-20170224/source/compiler/aslopcodes.c +Index: acpica-unix2-20170531/source/compiler/aslopcodes.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslopcodes.c -+++ acpica-unix2-20170224/source/compiler/aslopcodes.c +--- acpica-unix2-20170531.orig/source/compiler/aslopcodes.c ++++ acpica-unix2-20170531/source/compiler/aslopcodes.c @@ -485,6 +485,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; @@ -285,10 +285,10 @@ Index: acpica-unix2-20170224/source/compiler/aslopcodes.c } /* -Index: acpica-unix2-20170224/source/compiler/aslrestype1.c +Index: acpica-unix2-20170531/source/compiler/aslrestype1.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype1.c -+++ acpica-unix2-20170224/source/compiler/aslrestype1.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype1.c ++++ acpica-unix2-20170531/source/compiler/aslrestype1.c @@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *LengthOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -485,10 +485,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype1.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -Index: acpica-unix2-20170224/source/compiler/aslrestype1i.c +Index: acpica-unix2-20170531/source/compiler/aslrestype1i.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype1i.c -+++ acpica-unix2-20170224/source/compiler/aslrestype1i.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype1i.c ++++ acpica-unix2-20170531/source/compiler/aslrestype1i.c @@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -625,10 +625,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype1i.c + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -Index: acpica-unix2-20170224/source/compiler/aslrestype2.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20170224/source/compiler/aslrestype2.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2.c @@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor ( ACPI_PARSE_OBJECT *InitializerOp; ASL_RESOURCE_NODE *Rnode; @@ -725,10 +725,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2.c /* Point to end-of-descriptor for vendor data */ -Index: acpica-unix2-20170224/source/compiler/aslrestype2d.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2d.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype2d.c -+++ acpica-unix2-20170224/source/compiler/aslrestype2d.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2d.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1084,10 +1084,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2d.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20170224/source/compiler/aslrestype2e.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2e.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype2e.c -+++ acpica-unix2-20170224/source/compiler/aslrestype2e.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2e.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1193,10 +1193,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2e.c Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); -Index: acpica-unix2-20170224/source/compiler/aslrestype2q.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2q.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype2q.c -+++ acpica-unix2-20170224/source/compiler/aslrestype2q.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2q.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1535,11 +1535,11 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2q.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2s.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype2s.c -+++ acpica-unix2-20170224/source/compiler/aslrestype2s.c -@@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2s.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2s.c +@@ -340,6 +340,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; UINT16 DescriptorSize; @@ -1549,7 +1549,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c UINT32 CurrentByteOffset; UINT32 PinCount = 0; UINT32 i; -@@ -346,21 +349,21 @@ RsDoGpioIntDescriptor ( +@@ -396,21 +399,21 @@ RsDoGpioIntDescriptor ( { case 0: /* Interrupt Mode - edge/level [Flag] (_MOD) */ @@ -1574,7 +1574,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3, 2); break; -@@ -374,7 +377,7 @@ RsDoGpioIntDescriptor ( +@@ -424,7 +427,7 @@ RsDoGpioIntDescriptor ( case 4: /* Debounce Timeout [WORD] (_DBT) */ @@ -1583,7 +1583,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateWordField (InitializerOp, ACPI_RESTAG_DEBOUNCETIME, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.DebounceTimeout)); break; -@@ -401,7 +404,7 @@ RsDoGpioIntDescriptor ( +@@ -451,7 +454,7 @@ RsDoGpioIntDescriptor ( case 7: /* Resource Usage (consumer/producer) */ @@ -1592,7 +1592,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c break; case 8: /* Resource Tag (Descriptor Name) */ -@@ -466,6 +469,10 @@ RsDoGpioIntDescriptor ( +@@ -516,6 +519,10 @@ RsDoGpioIntDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1603,7 +1603,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource); return (Rnode); -@@ -499,6 +506,10 @@ RsDoGpioIoDescriptor ( +@@ -549,6 +556,10 @@ RsDoGpioIoDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; UINT16 DescriptorSize; @@ -1614,7 +1614,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c UINT32 CurrentByteOffset; UINT32 PinCount = 0; UINT32 i; -@@ -555,7 +566,7 @@ RsDoGpioIoDescriptor ( +@@ -605,7 +616,7 @@ RsDoGpioIoDescriptor ( { case 0: /* Share Type [Flags] (_SHR) */ @@ -1623,7 +1623,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateBitField (InitializerOp, ACPI_RESTAG_INTERRUPTSHARE, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 3); break; -@@ -569,21 +580,21 @@ RsDoGpioIoDescriptor ( +@@ -619,21 +630,21 @@ RsDoGpioIoDescriptor ( case 2: /* Debounce Timeout [WORD] (_DBT) */ @@ -1648,7 +1648,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_IORESTRICTION, CurrentByteOffset + ASL_RESDESC_OFFSET (Gpio.IntFlags), 0, 2); break; -@@ -609,7 +620,7 @@ RsDoGpioIoDescriptor ( +@@ -659,7 +670,7 @@ RsDoGpioIoDescriptor ( case 7: /* Resource Usage (consumer/producer) */ @@ -1657,7 +1657,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c break; case 8: /* Resource Tag (Descriptor Name) */ -@@ -673,6 +684,11 @@ RsDoGpioIoDescriptor ( +@@ -723,6 +734,11 @@ RsDoGpioIoDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1669,7 +1669,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c MpSaveGpioInfo (Info->MappingOp, Descriptor, PinCount, PinList, ResourceSource); return (Rnode); -@@ -703,6 +719,9 @@ RsDoI2cSerialBusDescriptor ( +@@ -753,6 +769,9 @@ RsDoI2cSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1679,7 +1679,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c UINT32 CurrentByteOffset; UINT32 i; -@@ -752,7 +771,7 @@ RsDoI2cSerialBusDescriptor ( +@@ -802,7 +821,7 @@ RsDoI2cSerialBusDescriptor ( { case 0: /* Slave Address [WORD] (_ADR) */ @@ -1688,7 +1688,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateWordField (InitializerOp, ACPI_RESTAG_ADDRESS, CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.SlaveAddress)); break; -@@ -766,14 +785,14 @@ RsDoI2cSerialBusDescriptor ( +@@ -816,14 +835,14 @@ RsDoI2cSerialBusDescriptor ( case 2: /* Connection Speed [DWORD] (_SPE) */ @@ -1705,7 +1705,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE, CurrentByteOffset + ASL_RESDESC_OFFSET (I2cSerialBus.TypeSpecificFlags), 0); break; -@@ -833,6 +852,9 @@ RsDoI2cSerialBusDescriptor ( +@@ -883,6 +902,9 @@ RsDoI2cSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1715,7 +1715,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -@@ -862,6 +884,9 @@ RsDoSpiSerialBusDescriptor ( +@@ -912,6 +934,9 @@ RsDoSpiSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1725,7 +1725,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c UINT32 CurrentByteOffset; UINT32 i; -@@ -912,21 +937,21 @@ RsDoSpiSerialBusDescriptor ( +@@ -962,21 +987,21 @@ RsDoSpiSerialBusDescriptor ( { case 0: /* Device Selection [WORD] (_ADR) */ @@ -1750,7 +1750,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateBitField (InitializerOp, ACPI_RESTAG_MODE, CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.TypeSpecificFlags), 0); break; -@@ -947,7 +972,7 @@ RsDoSpiSerialBusDescriptor ( +@@ -997,7 +1022,7 @@ RsDoSpiSerialBusDescriptor ( case 5: /* Connection Speed [DWORD] (_SPE) */ @@ -1759,7 +1759,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateDwordField (InitializerOp, ACPI_RESTAG_SPEED, CurrentByteOffset + ASL_RESDESC_OFFSET (SpiSerialBus.ConnectionSpeed)); break; -@@ -1021,6 +1046,10 @@ RsDoSpiSerialBusDescriptor ( +@@ -1071,6 +1096,10 @@ RsDoSpiSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1770,7 +1770,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -@@ -1050,6 +1079,10 @@ RsDoUartSerialBusDescriptor ( +@@ -1100,6 +1129,10 @@ RsDoUartSerialBusDescriptor ( UINT16 ResSourceLength; UINT16 VendorLength; UINT16 DescriptorSize; @@ -1781,7 +1781,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c UINT32 CurrentByteOffset; UINT32 i; -@@ -1099,21 +1132,21 @@ RsDoUartSerialBusDescriptor ( +@@ -1149,21 +1182,21 @@ RsDoUartSerialBusDescriptor ( { case 0: /* Connection Speed (Baud Rate) [DWORD] (_SPE) */ @@ -1806,7 +1806,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateMultiBitField (InitializerOp, ACPI_RESTAG_STOPBITS, CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 2, 2); break; -@@ -1127,7 +1160,7 @@ RsDoUartSerialBusDescriptor ( +@@ -1177,7 +1210,7 @@ RsDoUartSerialBusDescriptor ( case 4: /* Endianness [Flag] (_END) */ @@ -1815,7 +1815,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateBitField (InitializerOp, ACPI_RESTAG_ENDIANNESS, CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TypeSpecificFlags), 7); break; -@@ -1141,21 +1174,21 @@ RsDoUartSerialBusDescriptor ( +@@ -1191,21 +1224,21 @@ RsDoUartSerialBusDescriptor ( case 6: /* Flow Control [Flags] (_FLC) */ @@ -1840,7 +1840,7 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c RsCreateWordField (InitializerOp, ACPI_RESTAG_LENGTH_TX, CurrentByteOffset + ASL_RESDESC_OFFSET (UartSerialBus.TxFifoSize)); break; -@@ -1225,6 +1258,11 @@ RsDoUartSerialBusDescriptor ( +@@ -1275,6 +1308,11 @@ RsDoUartSerialBusDescriptor ( InitializerOp = RsCompleteNodeAndGetNext (InitializerOp); } @@ -1852,10 +1852,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2s.c MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -Index: acpica-unix2-20170224/source/compiler/aslrestype2w.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2w.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslrestype2w.c -+++ acpica-unix2-20170224/source/compiler/aslrestype2w.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2w.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2199,10 +2199,10 @@ Index: acpica-unix2-20170224/source/compiler/aslrestype2w.c Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -Index: acpica-unix2-20170224/source/include/acmacros.h +Index: acpica-unix2-20170531/source/include/acmacros.h =================================================================== ---- acpica-unix2-20170224.orig/source/include/acmacros.h -+++ acpica-unix2-20170224/source/include/acmacros.h +--- acpica-unix2-20170531.orig/source/include/acmacros.h ++++ acpica-unix2-20170531/source/include/acmacros.h @@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2240,10 +2240,10 @@ Index: acpica-unix2-20170224/source/include/acmacros.h #define ACPI_MOVE_32_TO_32(d, s) *(UINT32 *)(void *)(d) = *(UINT32 *)(void *)(s) #define ACPI_MOVE_32_TO_64(d, s) *(UINT64 *)(void *)(d) = *(UINT32 *)(void *)(s) -Index: acpica-unix2-20170224/source/include/platform/aclinux.h +Index: acpica-unix2-20170531/source/include/platform/aclinux.h =================================================================== ---- acpica-unix2-20170224.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20170224/source/include/platform/aclinux.h +--- acpica-unix2-20170531.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20170531/source/include/platform/aclinux.h @@ -185,6 +185,7 @@ #ifdef ACPI_USE_STANDARD_HEADERS diff --git a/debian-unaligned.patch b/debian-unaligned.patch index e6de0bd..2c87255 100644 --- a/debian-unaligned.patch +++ b/debian-unaligned.patch @@ -18,11 +18,11 @@ Signed-off-by: Paolo Bonzini source/include/actypes.h | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 21 deletions(-) -Index: acpica-unix2-20170224/source/compiler/asltree.c +Index: acpica-unix2-20170531/source/compiler/asltree.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/asltree.c -+++ acpica-unix2-20170224/source/compiler/asltree.c -@@ -998,28 +998,31 @@ TrCreateValuedLeafNode ( +--- acpica-unix2-20170531.orig/source/compiler/asltree.c ++++ acpica-unix2-20170531/source/compiler/asltree.c +@@ -995,28 +995,31 @@ TrCreateValuedLeafNode ( "Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), ACPI_FORMAT_UINT64 (Value)); @@ -59,7 +59,7 @@ Index: acpica-unix2-20170224/source/compiler/asltree.c break; case PARSEOP_METHOD: -@@ -1029,12 +1032,14 @@ TrCreateValuedLeafNode ( +@@ -1026,12 +1029,14 @@ TrCreateValuedLeafNode ( case PARSEOP_INTEGER: @@ -74,10 +74,10 @@ Index: acpica-unix2-20170224/source/compiler/asltree.c break; } -Index: acpica-unix2-20170224/source/components/executer/exoparg2.c +Index: acpica-unix2-20170531/source/components/executer/exoparg2.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/executer/exoparg2.c -+++ acpica-unix2-20170224/source/components/executer/exoparg2.c +--- acpica-unix2-20170531.orig/source/components/executer/exoparg2.c ++++ acpica-unix2-20170531/source/components/executer/exoparg2.c @@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; @@ -118,10 +118,10 @@ Index: acpica-unix2-20170224/source/components/executer/exoparg2.c break; case AML_CONCATENATE_OP: /* Concatenate (Data1, Data2, Result) */ -Index: acpica-unix2-20170224/source/include/actypes.h +Index: acpica-unix2-20170531/source/include/actypes.h =================================================================== ---- acpica-unix2-20170224.orig/source/include/actypes.h -+++ acpica-unix2-20170224/source/include/actypes.h +--- acpica-unix2-20170531.orig/source/include/actypes.h ++++ acpica-unix2-20170531/source/include/actypes.h @@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 */ #define ACPI_THREAD_ID UINT64 @@ -142,15 +142,16 @@ Index: acpica-unix2-20170224/source/include/actypes.h /******************************************************************************* * -@@ -169,19 +182,6 @@ typedef UINT64 +@@ -169,20 +182,6 @@ typedef UINT64 #define ACPI_SIZE_MAX ACPI_UINT64_MAX #define ACPI_USE_NATIVE_DIVIDE /* Has native 64-bit integer support */ -/* - * In the case of the Itanium Processor Family (IPF), the hardware does not -- * support misaligned memory transfers. Set the MISALIGNMENT_NOT_SUPPORTED flag -- * to indicate that special precautions must be taken to avoid alignment faults. -- * (IA64 or ia64 is currently used by existing compilers to indicate IPF.) +- * support misaligned memory transfers. Set the MISALIGNMENT_NOT_SUPPORTED +- * flag to indicate that special precautions must be taken to avoid alignment +- * faults. (IA64 or ia64 is currently used by existing compilers to indicate +- * IPF.) - * - * Note: EM64T and other X86-64 processors support misaligned transfers, - * so there is no need to define this flag. diff --git a/f23-harden.patch b/f23-harden.patch index 7b68476..bf795cc 100644 --- a/f23-harden.patch +++ b/f23-harden.patch @@ -8,10 +8,10 @@ From: Al Stone generate/unix/iasl/Makefile | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) -Index: acpica-unix2-20170303/generate/unix/Makefile.config +Index: acpica-unix2-20170531/generate/unix/Makefile.config =================================================================== ---- acpica-unix2-20170303.orig/generate/unix/Makefile.config -+++ acpica-unix2-20170303/generate/unix/Makefile.config +--- acpica-unix2-20170531.orig/generate/unix/Makefile.config ++++ acpica-unix2-20170531/generate/unix/Makefile.config @@ -180,6 +180,8 @@ ifneq ($(NOFORTIFY),TRUE) OPT_CFLAGS += -D_FORTIFY_SOURCE=2 endif @@ -21,35 +21,41 @@ Index: acpica-unix2-20170303/generate/unix/Makefile.config CFLAGS += \ -D$(HOST)\ -D_GNU_SOURCE\ -Index: acpica-unix2-20170303/generate/unix/iasl/Makefile +Index: acpica-unix2-20170531/generate/unix/iasl/Makefile =================================================================== ---- acpica-unix2-20170303.orig/generate/unix/iasl/Makefile -+++ acpica-unix2-20170303/generate/unix/iasl/Makefile -@@ -322,20 +322,21 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa +--- acpica-unix2-20170531.orig/generate/unix/iasl/Makefile ++++ acpica-unix2-20170531/generate/unix/iasl/Makefile +@@ -333,26 +333,27 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prpa # Cannot use the common compile warning flags since the C files are created # by the utilities above and they are not necessarily ANSI C, etc. # +HARDENING_FLAGS = -fPIC -pie $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c -- $(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ $(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< + @echo "- " "Intermediate" $< +- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< ++ @$(CC) -c $(CFLAGS) $(HARDENING_FLAGS) -Wall -Werror -o$@ $< diff --git a/grammar.asl.result b/grammar.asl.result index 9639088..0035bdf 100644 --- a/grammar.asl.result +++ b/grammar.asl.result @@ -256,7 +256,7 @@ Remark 2063 - ^ Initializer list shorter than grammar.asl 6190: Device (C19B) Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) -grammar.asl 6199: Divide (Local1, 10, Local0, Local2) /* Local0 = Local1 / 10 +grammar.asl 6199: Divide (Local1, 10, Local0, Local2) // Local0 = Local1 / 10 Warning 3144 - Method Local is set but never used ^ (Local0) grammar.asl 6244: Device (DWDF) @@ -307,10 +307,10 @@ Warning 3046 - Invalid or unknown escape sequence ^ grammar.asl 6709: Device (BITI) Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) -grammar.asl 6817: And (Local0, 1, Local0) /* Local0 &= 1 +grammar.asl 6817: And (Local0, 1, Local0) // Local0 &= 1 Error 6066 - ^ Method local variable is not initialized (Local0) -grammar.asl 6903: Name (_HID, "*PNP0C0A") /* Control Method Battey ID +grammar.asl 6903: Name (_HID, "*PNP0C0A") // Control Method Battey ID Error 6061 - Invalid leading asterisk ^ (*PNP0C0A) grammar.asl 6912: Device (IDX3) diff --git a/int-format.patch b/int-format.patch index 3d94243..267d45b 100644 --- a/int-format.patch +++ b/int-format.patch @@ -24,10 +24,10 @@ From: Al Stone source/tools/acpiexec/aemain.c | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) -Index: acpica-unix2-20170224/source/compiler/aslcompile.c +Index: acpica-unix2-20170531/source/compiler/aslcompile.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslcompile.c -+++ acpica-unix2-20170224/source/compiler/aslcompile.c +--- acpica-unix2-20170531.orig/source/compiler/aslcompile.c ++++ acpica-unix2-20170531/source/compiler/aslcompile.c @@ -750,7 +750,7 @@ CmCleanupAndExit ( if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -37,10 +37,10 @@ Index: acpica-unix2-20170224/source/compiler/aslcompile.c ASL_MAX_ERROR_COUNT); } -Index: acpica-unix2-20170224/source/compiler/aslerror.c +Index: acpica-unix2-20170531/source/compiler/aslerror.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslerror.c -+++ acpica-unix2-20170224/source/compiler/aslerror.c +--- acpica-unix2-20170531.orig/source/compiler/aslerror.c ++++ acpica-unix2-20170531/source/compiler/aslerror.c @@ -687,7 +687,7 @@ AslCommonError ( Gbl_ExceptionCount[Level]++; if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT) @@ -59,10 +59,10 @@ Index: acpica-unix2-20170224/source/compiler/aslerror.c ASL_MAX_DISABLED_MESSAGES); return (AE_LIMIT); } -Index: acpica-unix2-20170224/source/compiler/aslopt.c +Index: acpica-unix2-20170531/source/compiler/aslopt.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslopt.c -+++ acpica-unix2-20170224/source/compiler/aslopt.c +--- acpica-unix2-20170531.orig/source/compiler/aslopt.c ++++ acpica-unix2-20170531/source/compiler/aslopt.c @@ -584,7 +584,7 @@ OptOptimizeNamePath ( } @@ -72,10 +72,10 @@ Index: acpica-unix2-20170224/source/compiler/aslopt.c Op->Asl.LogicalLineNumber, AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode), AcpiPsGetOpcodeName (Op->Common.AmlOpcode))); -Index: acpica-unix2-20170224/source/compiler/aslpredef.c +Index: acpica-unix2-20170531/source/compiler/aslpredef.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslpredef.c -+++ acpica-unix2-20170224/source/compiler/aslpredef.c +--- acpica-unix2-20170531.orig/source/compiler/aslpredef.c ++++ acpica-unix2-20170531/source/compiler/aslpredef.c @@ -114,7 +114,7 @@ ApCheckForPredefinedMethod ( if (MethodInfo->NumArguments != 0) @@ -85,10 +85,10 @@ Index: acpica-unix2-20170224/source/compiler/aslpredef.c AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op, MsgBuffer); -Index: acpica-unix2-20170224/source/compiler/aslprepkg.c +Index: acpica-unix2-20170531/source/compiler/aslprepkg.c =================================================================== ---- acpica-unix2-20170224.orig/source/compiler/aslprepkg.c -+++ acpica-unix2-20170224/source/compiler/aslprepkg.c +--- acpica-unix2-20170531.orig/source/compiler/aslprepkg.c ++++ acpica-unix2-20170531/source/compiler/aslprepkg.c @@ -309,7 +309,7 @@ ApCheckPackage ( if (Count & 1) @@ -98,11 +98,11 @@ Index: acpica-unix2-20170224/source/compiler/aslprepkg.c Predefined->Info.Name, Count); AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH, -Index: acpica-unix2-20170224/source/components/debugger/dbexec.c +Index: acpica-unix2-20170531/source/components/debugger/dbexec.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/debugger/dbexec.c -+++ acpica-unix2-20170224/source/components/debugger/dbexec.c -@@ -214,7 +214,7 @@ AcpiDbExecuteMethod ( +--- acpica-unix2-20170531.orig/source/components/debugger/dbexec.c ++++ acpica-unix2-20170531/source/components/debugger/dbexec.c +@@ -226,7 +226,7 @@ AcpiDbExecuteMethod ( ACPI_ERROR ((AE_INFO, "Possible overflow of internal debugger " "buffer (size 0x%X needed 0x%X)", @@ -111,10 +111,10 @@ Index: acpica-unix2-20170224/source/components/debugger/dbexec.c } } -Index: acpica-unix2-20170224/source/components/dispatcher/dsmthdat.c +Index: acpica-unix2-20170531/source/components/dispatcher/dsmthdat.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/dispatcher/dsmthdat.c -+++ acpica-unix2-20170224/source/components/dispatcher/dsmthdat.c +--- acpica-unix2-20170531.orig/source/components/dispatcher/dsmthdat.c ++++ acpica-unix2-20170531/source/components/dispatcher/dsmthdat.c @@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode ( if (Index > ACPI_METHOD_MAX_LOCAL) { @@ -133,11 +133,11 @@ Index: acpica-unix2-20170224/source/components/dispatcher/dsmthdat.c Index, ACPI_METHOD_MAX_ARG)); return_ACPI_STATUS (AE_AML_INVALID_INDEX); } -Index: acpica-unix2-20170224/source/components/dispatcher/dsutils.c +Index: acpica-unix2-20170531/source/components/dispatcher/dsutils.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/dispatcher/dsutils.c -+++ acpica-unix2-20170224/source/components/dispatcher/dsutils.c -@@ -793,7 +793,7 @@ AcpiDsCreateOperands ( +--- acpica-unix2-20170531.orig/source/components/dispatcher/dsutils.c ++++ acpica-unix2-20170531/source/components/dispatcher/dsutils.c +@@ -787,7 +787,7 @@ AcpiDsCreateOperands ( } ACPI_DEBUG_PRINT ((ACPI_DB_DISPATCH, @@ -146,10 +146,10 @@ Index: acpica-unix2-20170224/source/components/dispatcher/dsutils.c WalkState->NumOperands, ArgCount, Index)); /* Create the interpreter arguments, in reverse order */ -Index: acpica-unix2-20170224/source/components/dispatcher/dswscope.c +Index: acpica-unix2-20170531/source/components/dispatcher/dswscope.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/dispatcher/dswscope.c -+++ acpica-unix2-20170224/source/components/dispatcher/dswscope.c +--- acpica-unix2-20170531.orig/source/components/dispatcher/dswscope.c ++++ acpica-unix2-20170531/source/components/dispatcher/dswscope.c @@ -149,7 +149,7 @@ AcpiDsScopeStackPush ( WalkState->ScopeDepth++; @@ -168,10 +168,10 @@ Index: acpica-unix2-20170224/source/components/dispatcher/dswscope.c (UINT32) WalkState->ScopeDepth, AcpiUtGetNodeName (ScopeInfo->Scope.Node), AcpiUtGetTypeName (ScopeInfo->Common.Value))); -Index: acpica-unix2-20170224/source/components/events/evgpe.c +Index: acpica-unix2-20170531/source/components/events/evgpe.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/events/evgpe.c -+++ acpica-unix2-20170224/source/components/events/evgpe.c +--- acpica-unix2-20170531.orig/source/components/events/evgpe.c ++++ acpica-unix2-20170531/source/components/events/evgpe.c @@ -494,7 +494,7 @@ AcpiEvGpeDetect ( "Ignore disabled registers for GPE %02X-%02X: " "RunEnable=%02X, WakeEnable=%02X\n", @@ -190,23 +190,23 @@ Index: acpica-unix2-20170224/source/components/events/evgpe.c StatusReg, EnableReg, GpeRegisterInfo->EnableForRun, GpeRegisterInfo->EnableForWake)); -Index: acpica-unix2-20170224/source/components/executer/exdump.c +Index: acpica-unix2-20170531/source/components/executer/exdump.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/executer/exdump.c -+++ acpica-unix2-20170224/source/components/executer/exdump.c +--- acpica-unix2-20170531.orig/source/components/executer/exdump.c ++++ acpica-unix2-20170531/source/components/executer/exdump.c @@ -668,7 +668,7 @@ AcpiExDumpOperand ( if (Depth > 0) { - ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p ", -- Depth, " ", Depth, ObjDesc)); -+ (int) Depth, " ", Depth, ObjDesc)); + ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%*s[%u] %p Refs=%u ", +- Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount)); ++ (int) Depth, " ", Depth, ObjDesc, ObjDesc->Common.ReferenceCount)); } else { -Index: acpica-unix2-20170224/source/components/executer/exfldio.c +Index: acpica-unix2-20170531/source/components/executer/exfldio.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/executer/exfldio.c -+++ acpica-unix2-20170224/source/components/executer/exfldio.c +--- acpica-unix2-20170531.orig/source/components/executer/exfldio.c ++++ acpica-unix2-20170531/source/components/executer/exfldio.c @@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule ( ACPI_ERROR ((AE_INFO, @@ -218,10 +218,10 @@ Index: acpica-unix2-20170224/source/components/executer/exfldio.c return_ACPI_STATUS (AE_AML_OPERAND_VALUE); } } -Index: acpica-unix2-20170224/source/components/executer/exnames.c +Index: acpica-unix2-20170531/source/components/executer/exnames.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/executer/exnames.c -+++ acpica-unix2-20170224/source/components/executer/exnames.c +--- acpica-unix2-20170531.orig/source/components/executer/exnames.c ++++ acpica-unix2-20170531/source/components/executer/exnames.c @@ -240,7 +240,7 @@ AcpiExNameSegment ( */ ACPI_DEBUG_PRINT ((ACPI_DB_INFO, @@ -240,10 +240,10 @@ Index: acpica-unix2-20170224/source/components/executer/exnames.c } *InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress); -Index: acpica-unix2-20170224/source/components/hardware/hwregs.c +Index: acpica-unix2-20170531/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20170224/source/components/hardware/hwregs.c +--- acpica-unix2-20170531.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20170531/source/components/hardware/hwregs.c @@ -464,7 +464,7 @@ AcpiHwClearAcpiStatus ( @@ -253,10 +253,10 @@ Index: acpica-unix2-20170224/source/components/hardware/hwregs.c ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address))); LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock); -Index: acpica-unix2-20170224/source/components/tables/tbfadt.c +Index: acpica-unix2-20170531/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20170224/source/components/tables/tbfadt.c +--- acpica-unix2-20170531.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20170531/source/components/tables/tbfadt.c @@ -233,7 +233,7 @@ AcpiTbInitGenericAddress ( if (!(Flags & ACPI_FADT_GPE_REGISTER)) { @@ -284,10 +284,10 @@ Index: acpica-unix2-20170224/source/components/tables/tbfadt.c Name, Address32, ACPI_FORMAT_UINT64 (Address64->Address), AcpiGbl_Use32BitFadtAddresses ? 32 : 64)); -Index: acpica-unix2-20170224/source/components/tables/tbxfroot.c +Index: acpica-unix2-20170531/source/components/tables/tbxfroot.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/tables/tbxfroot.c -+++ acpica-unix2-20170224/source/components/tables/tbxfroot.c +--- acpica-unix2-20170531.orig/source/components/tables/tbxfroot.c ++++ acpica-unix2-20170531/source/components/tables/tbxfroot.c @@ -177,7 +177,7 @@ AcpiFindRootPointer ( { ACPI_ERROR ((AE_INFO, @@ -315,11 +315,11 @@ Index: acpica-unix2-20170224/source/components/tables/tbxfroot.c return_ACPI_STATUS (AE_NO_MEMORY); } -Index: acpica-unix2-20170224/source/components/utilities/utownerid.c +Index: acpica-unix2-20170531/source/components/utilities/utownerid.c =================================================================== ---- acpica-unix2-20170224.orig/source/components/utilities/utownerid.c -+++ acpica-unix2-20170224/source/components/utilities/utownerid.c -@@ -231,7 +231,7 @@ AcpiUtReleaseOwnerId ( +--- acpica-unix2-20170531.orig/source/components/utilities/utownerid.c ++++ acpica-unix2-20170531/source/components/utilities/utownerid.c +@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId ( else { ACPI_ERROR ((AE_INFO, @@ -328,10 +328,10 @@ Index: acpica-unix2-20170224/source/components/utilities/utownerid.c } (void) AcpiUtReleaseMutex (ACPI_MTX_CACHES); -Index: acpica-unix2-20170224/source/tools/acpiexec/aemain.c +Index: acpica-unix2-20170531/source/tools/acpiexec/aemain.c =================================================================== ---- acpica-unix2-20170224.orig/source/tools/acpiexec/aemain.c -+++ acpica-unix2-20170224/source/tools/acpiexec/aemain.c +--- acpica-unix2-20170531.orig/source/tools/acpiexec/aemain.c ++++ acpica-unix2-20170531/source/tools/acpiexec/aemain.c @@ -203,7 +203,7 @@ AeDoOptions ( if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1)) diff --git a/re-enable-big-endian.patch b/re-enable-big-endian.patch index 7221ee5..1a2c683 100644 --- a/re-enable-big-endian.patch +++ b/re-enable-big-endian.patch @@ -7,13 +7,13 @@ Al Stone source/compiler/aslmain.c | 12 ------------ 1 file changed, 12 deletions(-) -Index: acpica-unix2-20161222/source/compiler/aslmain.c +Index: acpica-unix2-20170531/source/compiler/aslmain.c =================================================================== ---- acpica-unix2-20161222.orig/source/compiler/aslmain.c -+++ acpica-unix2-20161222/source/compiler/aslmain.c -@@ -99,18 +99,6 @@ main ( - int ReturnStatus = 0; - +--- acpica-unix2-20170531.orig/source/compiler/aslmain.c ++++ acpica-unix2-20170531/source/compiler/aslmain.c +@@ -102,18 +102,6 @@ main ( + signal (SIGINT, AslSignalHandler); + signal (SIGSEGV, AslSignalHandler); - /* - * Big-endian machines are not currently supported. ACPI tables must diff --git a/sources b/sources index 662053c..d815309 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (acpica-unix2-20170303.tar.gz) = 22478b2df4cebfcc09539c9f0d16175319de93dccfc4224cf0b3e0a61970f45b41690adae69ac192e614c02929db6b8a6be2b01b9a5f2c6b83dbcf13cdeb01e5 -SHA512 (acpitests-unix-20170303.tar.gz) = 251479440bc83b5cbcc21aea69d8bfec2aaa2429e87b2a9cd13b01ecc8f294a16d892a2fa02f5a4a8adad8777dad5daf1325aeacec97a0b63ad11677341e8bf0 +SHA512 (acpica-unix2-20170531.tar.gz) = 055563bbc7762fd18de4d1e3d59d5592485270ffd1b5f5ca09e4996f063b8478de3d142064a3f785d3fbfc1fd9c276751b7c3fcda914dec751cd1289de2d6ea5 +SHA512 (acpitests-unix-20170531.tar.gz) = 978f7fba5cd2498ef6c2eafe71836538ba909294eb3848972378e88487fa59a123076dd21761eb3e7630e44d8eb3359d10820ca9011a72473919e7e0c1fff5c2 diff --git a/update-big-endian.patch b/update-big-endian.patch index 4cb1b6d..be6b3e4 100644 --- a/update-big-endian.patch +++ b/update-big-endian.patch @@ -1,7 +1,7 @@ -Index: acpica-unix2-20170303/source/common/acfileio.c +Index: acpica-unix2-20170531/source/common/acfileio.c =================================================================== ---- acpica-unix2-20170303.orig/source/common/acfileio.c -+++ acpica-unix2-20170303/source/common/acfileio.c +--- acpica-unix2-20170531.orig/source/common/acfileio.c ++++ acpica-unix2-20170531/source/common/acfileio.c @@ -250,6 +250,7 @@ AcGetOneTableFromFile ( ACPI_TABLE_HEADER *Table; INT32 Count; @@ -48,7 +48,7 @@ Index: acpica-unix2-20170303/source/common/acfileio.c UINT32 i; -@@ -431,11 +434,12 @@ AcValidateTableHeader ( +@@ -429,11 +432,12 @@ AcValidateTableHeader ( /* Validate table length against bytes remaining in the file */ FileSize = CmGetFileSize (File); @@ -63,11 +63,11 @@ Index: acpica-unix2-20170303/source/common/acfileio.c (UINT32) (FileSize - TableOffset)); return (AE_BAD_HEADER); } -Index: acpica-unix2-20170303/source/common/dmtable.c +Index: acpica-unix2-20170531/source/common/dmtable.c =================================================================== ---- acpica-unix2-20170303.orig/source/common/dmtable.c -+++ acpica-unix2-20170303/source/common/dmtable.c -@@ -499,7 +499,7 @@ AcpiDmDumpDataTable ( +--- acpica-unix2-20170531.orig/source/common/dmtable.c ++++ acpica-unix2-20170531/source/common/dmtable.c +@@ -523,7 +523,7 @@ AcpiDmDumpDataTable ( */ if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) { @@ -76,7 +76,7 @@ Index: acpica-unix2-20170303/source/common/dmtable.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoFacs); if (ACPI_FAILURE (Status)) { -@@ -513,13 +513,14 @@ AcpiDmDumpDataTable ( +@@ -537,13 +537,14 @@ AcpiDmDumpDataTable ( else if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT)) { Length = AcpiDmDumpS3pt (Table); @@ -92,7 +92,7 @@ Index: acpica-unix2-20170303/source/common/dmtable.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoHeader); if (ACPI_FAILURE (Status)) { -@@ -730,6 +731,7 @@ AcpiDmDumpTable ( +@@ -754,6 +755,7 @@ AcpiDmDumpTable ( BOOLEAN LastOutputBlankLine = FALSE; ACPI_STATUS Status; char RepairedName[8]; @@ -100,7 +100,7 @@ Index: acpica-unix2-20170303/source/common/dmtable.c if (!Info) -@@ -1097,8 +1099,9 @@ AcpiDmDumpTable ( +@@ -1148,8 +1150,9 @@ AcpiDmDumpTable ( /* Checksum, display and validate */ AcpiOsPrintf ("%2.2X", *Target); @@ -112,7 +112,7 @@ Index: acpica-unix2-20170303/source/common/dmtable.c ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum); if (Temp8 != ACPI_CAST_PTR (ACPI_TABLE_HEADER, Table)->Checksum) -@@ -1163,14 +1166,14 @@ AcpiDmDumpTable ( +@@ -1214,14 +1217,14 @@ AcpiDmDumpTable ( /* DMAR subtable types */ @@ -130,7 +130,7 @@ Index: acpica-unix2-20170303/source/common/dmtable.c break; case ACPI_DMT_DMAR_SCOPE: -@@ -1261,14 +1264,14 @@ AcpiDmDumpTable ( +@@ -1312,14 +1315,14 @@ AcpiDmDumpTable ( /* HEST subtable types */ @@ -148,7 +148,7 @@ Index: acpica-unix2-20170303/source/common/dmtable.c break; case ACPI_DMT_HESTNTFY: -@@ -1334,13 +1337,14 @@ AcpiDmDumpTable ( +@@ -1399,13 +1402,14 @@ AcpiDmDumpTable ( /* NFIT subtable types */ @@ -165,10 +165,10 @@ Index: acpica-unix2-20170303/source/common/dmtable.c AcpiDmNfitSubnames[Temp16]); break; -Index: acpica-unix2-20170303/source/common/dmtables.c +Index: acpica-unix2-20170531/source/common/dmtables.c =================================================================== ---- acpica-unix2-20170303.orig/source/common/dmtables.c -+++ acpica-unix2-20170303/source/common/dmtables.c +--- acpica-unix2-20170531.orig/source/common/dmtables.c ++++ acpica-unix2-20170531/source/common/dmtables.c @@ -142,7 +142,9 @@ AdCreateTableHeader ( ACPI_TABLE_HEADER *Table) { @@ -234,10 +234,10 @@ Index: acpica-unix2-20170303/source/common/dmtables.c AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); -Index: acpica-unix2-20170303/source/common/dmtbdump.c +Index: acpica-unix2-20170531/source/common/dmtbdump.c =================================================================== ---- acpica-unix2-20170303.orig/source/common/dmtbdump.c -+++ acpica-unix2-20170303/source/common/dmtbdump.c +--- acpica-unix2-20170531.orig/source/common/dmtbdump.c ++++ acpica-unix2-20170531/source/common/dmtbdump.c @@ -277,6 +277,8 @@ AcpiDmDumpRsdt ( UINT32 Entries; UINT32 Offset; @@ -923,7 +923,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { case ACPI_HEST_TYPE_IA32_CHECK: -@@ -1697,15 +1741,21 @@ AcpiDmDumpIort ( +@@ -1902,15 +1946,21 @@ AcpiDmDumpIort ( ACPI_IORT_SMMU *IortSmmu = NULL; UINT32 Offset; UINT32 NodeOffset; @@ -947,7 +947,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -1716,18 +1766,19 @@ AcpiDmDumpIort ( +@@ -1921,18 +1971,19 @@ AcpiDmDumpIort ( /* Dump the OptionalPadding (optional) */ @@ -972,7 +972,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { /* Common subtable header */ -@@ -1763,7 +1814,8 @@ AcpiDmDumpIort ( +@@ -1968,7 +2019,8 @@ AcpiDmDumpIort ( case ACPI_IORT_NODE_PCI_ROOT_COMPLEX: InfoTable = AcpiDmTableInfoIort2; @@ -982,7 +982,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c break; case ACPI_IORT_NODE_SMMU: -@@ -1776,7 +1828,8 @@ AcpiDmDumpIort ( +@@ -1981,7 +2033,8 @@ AcpiDmDumpIort ( case ACPI_IORT_NODE_SMMU_V3: InfoTable = AcpiDmTableInfoIort4; @@ -992,7 +992,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c break; default: -@@ -1786,7 +1839,8 @@ AcpiDmDumpIort ( +@@ -1991,7 +2044,8 @@ AcpiDmDumpIort ( /* Attempt to continue */ @@ -1002,7 +1002,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { AcpiOsPrintf ("Invalid zero length IORT node\n"); return; -@@ -1797,7 +1851,7 @@ AcpiDmDumpIort ( +@@ -2002,7 +2056,7 @@ AcpiDmDumpIort ( /* Dump the node subtable header */ AcpiOsPrintf ("\n"); @@ -1011,7 +1011,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, InfoTable); if (ACPI_FAILURE (Status)) -@@ -1817,9 +1871,10 @@ AcpiDmDumpIort ( +@@ -2022,9 +2076,10 @@ AcpiDmDumpIort ( if (IortItsGroup) { @@ -1024,7 +1024,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 4, AcpiDmTableInfoIort0a); NodeOffset += 4; -@@ -1831,11 +1886,11 @@ AcpiDmDumpIort ( +@@ -2036,11 +2091,11 @@ AcpiDmDumpIort ( /* Dump the Padding (optional) */ @@ -1040,7 +1040,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -1852,8 +1907,8 @@ AcpiDmDumpIort ( +@@ -2057,8 +2112,8 @@ AcpiDmDumpIort ( if (IortSmmu) { Length = 2 * sizeof (UINT64); @@ -1051,7 +1051,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, AcpiDmTableInfoIort3a); if (ACPI_FAILURE (Status)) -@@ -1861,10 +1916,11 @@ AcpiDmDumpIort ( +@@ -2066,10 +2121,11 @@ AcpiDmDumpIort ( return; } @@ -1066,7 +1066,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 8, AcpiDmTableInfoIort3b); if (ACPI_FAILURE (Status)) -@@ -1875,10 +1931,11 @@ AcpiDmDumpIort ( +@@ -2080,10 +2136,11 @@ AcpiDmDumpIort ( NodeOffset += 8; } @@ -1081,7 +1081,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), 8, AcpiDmTableInfoIort3c); if (ACPI_FAILURE (Status)) -@@ -1898,12 +1955,13 @@ AcpiDmDumpIort ( +@@ -2103,12 +2160,13 @@ AcpiDmDumpIort ( /* Dump the ID mappings */ @@ -1098,7 +1098,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), Length, AcpiDmTableInfoIortMap); if (ACPI_FAILURE (Status)) -@@ -1917,8 +1975,9 @@ AcpiDmDumpIort ( +@@ -2122,8 +2180,9 @@ AcpiDmDumpIort ( NextSubTable: /* Point to next node subtable */ @@ -1110,7 +1110,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c } } -@@ -1949,11 +2008,14 @@ AcpiDmDumpIvrs ( +@@ -2154,11 +2213,14 @@ AcpiDmDumpIvrs ( ACPI_IVRS_DE_HEADER *DeviceEntry; ACPI_IVRS_HEADER *SubTable; ACPI_DMTABLE_INFO *InfoTable; @@ -1126,7 +1126,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -1962,13 +2024,14 @@ AcpiDmDumpIvrs ( +@@ -2167,13 +2229,14 @@ AcpiDmDumpIvrs ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_IVRS_HEADER, Table, Offset); @@ -1144,7 +1144,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -1995,7 +2058,7 @@ AcpiDmDumpIvrs ( +@@ -2200,7 +2263,7 @@ AcpiDmDumpIvrs ( /* Attempt to continue */ @@ -1153,7 +1153,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { AcpiOsPrintf ("Invalid zero length subtable\n"); return; -@@ -2006,8 +2069,8 @@ AcpiDmDumpIvrs ( +@@ -2211,8 +2274,8 @@ AcpiDmDumpIvrs ( /* Dump the subtable */ AcpiOsPrintf ("\n"); @@ -1164,7 +1164,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2021,7 +2084,7 @@ AcpiDmDumpIvrs ( +@@ -2226,7 +2289,7 @@ AcpiDmDumpIvrs ( DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, SubTable, sizeof (ACPI_IVRS_HARDWARE)); @@ -1173,7 +1173,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { AcpiOsPrintf ("\n"); /* -@@ -2083,7 +2146,7 @@ AcpiDmDumpIvrs ( +@@ -2288,7 +2351,7 @@ AcpiDmDumpIvrs ( /* Dump the Device Entry */ @@ -1182,7 +1182,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c DeviceEntry, EntryLength, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -2099,8 +2162,8 @@ AcpiDmDumpIvrs ( +@@ -2304,8 +2367,8 @@ AcpiDmDumpIvrs ( NextSubTable: /* Point to next subtable */ @@ -1193,7 +1193,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c } } -@@ -2126,7 +2189,7 @@ AcpiDmDumpLpit ( +@@ -2331,7 +2394,7 @@ AcpiDmDumpLpit ( { ACPI_STATUS Status; ACPI_LPIT_HEADER *SubTable; @@ -1202,7 +1202,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c UINT32 Offset = sizeof (ACPI_TABLE_LPIT); ACPI_DMTABLE_INFO *InfoTable; UINT32 SubTableLength; -@@ -2134,8 +2197,9 @@ AcpiDmDumpLpit ( +@@ -2339,8 +2402,9 @@ AcpiDmDumpLpit ( /* Subtables */ @@ -1213,7 +1213,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { /* Common subtable header */ -@@ -2199,13 +2263,14 @@ AcpiDmDumpMadt ( +@@ -2404,13 +2468,14 @@ AcpiDmDumpMadt ( { ACPI_STATUS Status; ACPI_SUBTABLE_HEADER *SubTable; @@ -1229,7 +1229,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoMadt); if (ACPI_FAILURE (Status)) { -@@ -2215,7 +2280,7 @@ AcpiDmDumpMadt ( +@@ -2420,7 +2485,7 @@ AcpiDmDumpMadt ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); @@ -1238,7 +1238,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { /* Common subtable header */ -@@ -2361,11 +2426,13 @@ AcpiDmDumpMcfg ( +@@ -2566,11 +2631,13 @@ AcpiDmDumpMcfg ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MCFG); ACPI_MCFG_ALLOCATION *SubTable; @@ -1253,7 +1253,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2374,17 +2441,17 @@ AcpiDmDumpMcfg ( +@@ -2579,17 +2646,17 @@ AcpiDmDumpMcfg ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_MCFG_ALLOCATION, Table, Offset); @@ -1275,7 +1275,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MCFG_ALLOCATION), AcpiDmTableInfoMcfg0); if (ACPI_FAILURE (Status)) { -@@ -2418,6 +2485,7 @@ AcpiDmDumpMpst ( +@@ -2623,6 +2690,7 @@ AcpiDmDumpMpst ( { ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MPST); @@ -1283,7 +1283,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c ACPI_MPST_POWER_NODE *SubTable0; ACPI_MPST_POWER_STATE *SubTable0A; ACPI_MPST_COMPONENT *SubTable0B; -@@ -2426,11 +2494,13 @@ AcpiDmDumpMpst ( +@@ -2631,11 +2699,13 @@ AcpiDmDumpMpst ( UINT16 SubtableCount; UINT32 PowerStateCount; UINT32 ComponentCount; @@ -1298,7 +1298,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2438,13 +2508,14 @@ AcpiDmDumpMpst ( +@@ -2643,13 +2713,14 @@ AcpiDmDumpMpst ( /* Subtable: Memory Power Node(s) */ @@ -1316,7 +1316,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MPST_POWER_NODE), AcpiDmTableInfoMpst0); if (ACPI_FAILURE (Status)) { -@@ -2453,8 +2524,8 @@ AcpiDmDumpMpst ( +@@ -2658,8 +2729,8 @@ AcpiDmDumpMpst ( /* Extract the sub-subtable counts */ @@ -1327,7 +1327,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Offset += sizeof (ACPI_MPST_POWER_NODE); /* Sub-subtables - Memory Power State Structure(s) */ -@@ -2465,7 +2536,7 @@ AcpiDmDumpMpst ( +@@ -2670,7 +2741,7 @@ AcpiDmDumpMpst ( while (PowerStateCount) { AcpiOsPrintf ("\n"); @@ -1336,7 +1336,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MPST_POWER_STATE), AcpiDmTableInfoMpst0A); if (ACPI_FAILURE (Status)) { -@@ -2475,7 +2546,7 @@ AcpiDmDumpMpst ( +@@ -2680,7 +2751,7 @@ AcpiDmDumpMpst ( SubTable0A++; PowerStateCount--; Offset += sizeof (ACPI_MPST_POWER_STATE); @@ -1345,7 +1345,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c /* Sub-subtables - Physical Component ID Structure(s) */ -@@ -2488,7 +2559,7 @@ AcpiDmDumpMpst ( +@@ -2693,7 +2764,7 @@ AcpiDmDumpMpst ( while (ComponentCount) { @@ -1354,7 +1354,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MPST_COMPONENT), AcpiDmTableInfoMpst0B); if (ACPI_FAILURE (Status)) { -@@ -2503,17 +2574,19 @@ AcpiDmDumpMpst ( +@@ -2708,17 +2779,19 @@ AcpiDmDumpMpst ( /* Point to next Memory Power Node subtable */ SubtableCount--; @@ -1377,7 +1377,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MPST_DATA_HDR), AcpiDmTableInfoMpst1); if (ACPI_FAILURE (Status)) { -@@ -2528,10 +2601,10 @@ AcpiDmDumpMpst ( +@@ -2733,10 +2806,10 @@ AcpiDmDumpMpst ( SubTable2 = ACPI_ADD_PTR (ACPI_MPST_POWER_DATA, SubTable1, sizeof (ACPI_MPST_DATA_HDR)); @@ -1390,7 +1390,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MPST_POWER_DATA), AcpiDmTableInfoMpst2); if (ACPI_FAILURE (Status)) { -@@ -2564,11 +2637,13 @@ AcpiDmDumpMsct ( +@@ -2769,11 +2842,13 @@ AcpiDmDumpMsct ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MSCT); ACPI_MSCT_PROXIMITY *SubTable; @@ -1405,7 +1405,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2577,12 +2652,12 @@ AcpiDmDumpMsct ( +@@ -2782,12 +2857,12 @@ AcpiDmDumpMsct ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_MSCT_PROXIMITY, Table, Offset); @@ -1420,7 +1420,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MSCT_PROXIMITY), AcpiDmTableInfoMsct0); if (ACPI_FAILURE (Status)) { -@@ -2617,11 +2692,13 @@ AcpiDmDumpMtmr ( +@@ -2822,11 +2897,13 @@ AcpiDmDumpMtmr ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_MTMR); ACPI_MTMR_ENTRY *SubTable; @@ -1435,7 +1435,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2630,12 +2707,12 @@ AcpiDmDumpMtmr ( +@@ -2835,12 +2912,12 @@ AcpiDmDumpMtmr ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_MTMR_ENTRY, Table, Offset); @@ -1450,7 +1450,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_MTMR_ENTRY), AcpiDmTableInfoMtmr0); if (ACPI_FAILURE (Status)) { -@@ -2677,11 +2754,17 @@ AcpiDmDumpNfit ( +@@ -2882,11 +2959,17 @@ AcpiDmDumpNfit ( ACPI_NFIT_SMBIOS *SmbiosInfo = NULL; ACPI_NFIT_FLUSH_ADDRESS *Hint = NULL; UINT32 i; @@ -1469,7 +1469,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2690,19 +2773,21 @@ AcpiDmDumpNfit ( +@@ -2895,19 +2978,21 @@ AcpiDmDumpNfit ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_NFIT_HEADER, Table, Offset); @@ -1495,7 +1495,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { case ACPI_NFIT_TYPE_SYSTEM_ADDRESS: -@@ -2754,7 +2839,7 @@ AcpiDmDumpNfit ( +@@ -2959,7 +3044,7 @@ AcpiDmDumpNfit ( /* Attempt to continue */ @@ -1504,7 +1504,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { AcpiOsPrintf ("Invalid zero length subtable\n"); return; -@@ -2763,8 +2848,8 @@ AcpiDmDumpNfit ( +@@ -2968,8 +3053,8 @@ AcpiDmDumpNfit ( } AcpiOsPrintf ("\n"); @@ -1515,7 +1515,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2772,13 +2857,14 @@ AcpiDmDumpNfit ( +@@ -2977,13 +3062,14 @@ AcpiDmDumpNfit ( /* Per-subtable variable-length fields */ @@ -1533,7 +1533,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c &Interleave->LineOffset[i], sizeof (UINT32), AcpiDmTableInfoNfit2a); if (ACPI_FAILURE (Status)) -@@ -2792,12 +2878,11 @@ AcpiDmDumpNfit ( +@@ -2997,12 +3083,11 @@ AcpiDmDumpNfit ( case ACPI_NFIT_TYPE_SMBIOS: @@ -1548,7 +1548,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_NFIT_SMBIOS) - sizeof (UINT8), SmbiosInfo, Length, AcpiDmTableInfoNfit3a); -@@ -2811,9 +2896,10 @@ AcpiDmDumpNfit ( +@@ -3016,9 +3101,10 @@ AcpiDmDumpNfit ( case ACPI_NFIT_TYPE_FLUSH_ADDRESS: @@ -1561,7 +1561,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c &Hint->HintAddress[i], sizeof (UINT64), AcpiDmTableInfoNfit6a); if (ACPI_FAILURE (Status)) -@@ -2832,8 +2918,8 @@ AcpiDmDumpNfit ( +@@ -3037,8 +3123,8 @@ AcpiDmDumpNfit ( NextSubTable: /* Point to next subtable */ @@ -1572,7 +1572,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c } } -@@ -2858,12 +2944,13 @@ AcpiDmDumpPcct ( +@@ -3063,12 +3149,13 @@ AcpiDmDumpPcct ( ACPI_STATUS Status; ACPI_PCCT_SUBSPACE *SubTable; ACPI_DMTABLE_INFO *InfoTable; @@ -1587,7 +1587,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPcct); if (ACPI_FAILURE (Status)) { -@@ -2873,7 +2960,7 @@ AcpiDmDumpPcct ( +@@ -3078,7 +3165,7 @@ AcpiDmDumpPcct ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_PCCT_SUBSPACE, Table, Offset); @@ -1596,7 +1596,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { /* Common subtable header */ -@@ -2949,16 +3036,21 @@ AcpiDmDumpPmtt ( +@@ -3164,16 +3251,21 @@ AcpiDmDumpPmtt ( ACPI_PMTT_HEADER *MemSubTable; ACPI_PMTT_HEADER *DimmSubTable; ACPI_PMTT_DOMAIN *DomainArray; @@ -1620,7 +1620,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoPmtt); if (ACPI_FAILURE (Status)) { -@@ -2968,13 +3060,14 @@ AcpiDmDumpPmtt ( +@@ -3183,13 +3275,14 @@ AcpiDmDumpPmtt ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, Table, Offset); @@ -1637,7 +1637,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -2993,7 +3086,7 @@ AcpiDmDumpPmtt ( +@@ -3208,7 +3301,7 @@ AcpiDmDumpPmtt ( /* Dump the fixed-length portion of the subtable */ Status = AcpiDmDumpTable (Length, Offset, SubTable, @@ -1646,7 +1646,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3005,15 +3098,16 @@ AcpiDmDumpPmtt ( +@@ -3220,15 +3313,16 @@ AcpiDmDumpPmtt ( MemSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, SubTable, sizeof (ACPI_PMTT_SOCKET)); @@ -1666,7 +1666,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3033,7 +3127,7 @@ AcpiDmDumpPmtt ( +@@ -3248,7 +3342,7 @@ AcpiDmDumpPmtt ( Status = AcpiDmDumpTable (Length, Offset + MemOffset, MemSubTable, @@ -1675,7 +1675,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3041,13 +3135,14 @@ AcpiDmDumpPmtt ( +@@ -3256,13 +3350,14 @@ AcpiDmDumpPmtt ( /* Walk the variable count of proximity domains */ @@ -1693,7 +1693,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c DomainCount) { Status = AcpiDmDumpTable (Length, -@@ -3075,15 +3170,16 @@ AcpiDmDumpPmtt ( +@@ -3290,15 +3385,16 @@ AcpiDmDumpPmtt ( DimmSubTable = ACPI_ADD_PTR (ACPI_PMTT_HEADER, MemSubTable, DomainOffset); @@ -1713,7 +1713,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3103,7 +3199,7 @@ AcpiDmDumpPmtt ( +@@ -3318,7 +3414,7 @@ AcpiDmDumpPmtt ( Status = AcpiDmDumpTable (Length, Offset + MemOffset + DimmOffset, DimmSubTable, @@ -1722,7 +1722,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3111,23 +3207,22 @@ AcpiDmDumpPmtt ( +@@ -3326,23 +3422,22 @@ AcpiDmDumpPmtt ( /* Point to next DIMM subtable */ @@ -1752,7 +1752,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c } } -@@ -3153,6 +3248,8 @@ AcpiDmDumpS3pt ( +@@ -3498,6 +3593,8 @@ AcpiDmDumpS3pt ( ACPI_FPDT_HEADER *SubTable; ACPI_DMTABLE_INFO *InfoTable; ACPI_TABLE_S3PT *S3ptTable = ACPI_CAST_PTR (ACPI_TABLE_S3PT, Tables); @@ -1761,7 +1761,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c /* Main table */ -@@ -3163,20 +3260,22 @@ AcpiDmDumpS3pt ( +@@ -3508,20 +3605,22 @@ AcpiDmDumpS3pt ( return 0; } @@ -1787,7 +1787,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { case ACPI_S3PT_TYPE_RESUME: -@@ -3191,7 +3290,7 @@ AcpiDmDumpS3pt ( +@@ -3536,7 +3635,7 @@ AcpiDmDumpS3pt ( default: AcpiOsPrintf ("\n**** Unknown S3PT subtable type 0x%X\n", @@ -1796,7 +1796,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c /* Attempt to continue */ -@@ -3204,7 +3303,7 @@ AcpiDmDumpS3pt ( +@@ -3549,7 +3648,7 @@ AcpiDmDumpS3pt ( } AcpiOsPrintf ("\n"); @@ -1805,7 +1805,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c SubTable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -3238,9 +3337,11 @@ void +@@ -3583,9 +3682,11 @@ void AcpiDmDumpSlic ( ACPI_TABLE_HEADER *Table) { @@ -1819,7 +1819,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c } -@@ -3263,14 +3364,17 @@ AcpiDmDumpSlit ( +@@ -3608,14 +3709,17 @@ AcpiDmDumpSlit ( ACPI_STATUS Status; UINT32 Offset; UINT8 *Row; @@ -1839,7 +1839,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3278,7 +3382,8 @@ AcpiDmDumpSlit ( +@@ -3623,7 +3727,8 @@ AcpiDmDumpSlit ( /* Display the Locality NxN Matrix */ @@ -1849,7 +1849,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Offset = ACPI_OFFSET (ACPI_TABLE_SLIT, Entry[0]); Row = (UINT8 *) ACPI_CAST_PTR (ACPI_TABLE_SLIT, Table)->Entry; -@@ -3291,7 +3396,7 @@ AcpiDmDumpSlit ( +@@ -3636,7 +3741,7 @@ AcpiDmDumpSlit ( { /* Check for beyond EOT */ @@ -1858,7 +1858,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { AcpiOsPrintf ( "\n**** Not enough room in table for all localities\n"); -@@ -3343,11 +3448,13 @@ AcpiDmDumpSrat ( +@@ -3688,11 +3793,13 @@ AcpiDmDumpSrat ( UINT32 Offset = sizeof (ACPI_TABLE_SRAT); ACPI_SUBTABLE_HEADER *SubTable; ACPI_DMTABLE_INFO *InfoTable; @@ -1873,7 +1873,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3356,12 +3463,12 @@ AcpiDmDumpSrat ( +@@ -3701,12 +3808,12 @@ AcpiDmDumpSrat ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_SUBTABLE_HEADER, Table, Offset); @@ -1888,7 +1888,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c SubTable->Length, AcpiDmTableInfoSratHdr); if (ACPI_FAILURE (Status)) { -@@ -3405,7 +3512,7 @@ AcpiDmDumpSrat ( +@@ -3755,7 +3862,7 @@ AcpiDmDumpSrat ( } AcpiOsPrintf ("\n"); @@ -1897,7 +1897,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c SubTable->Length, InfoTable); if (ACPI_FAILURE (Status)) { -@@ -3442,13 +3549,14 @@ AcpiDmDumpStao ( +@@ -3792,13 +3899,14 @@ AcpiDmDumpStao ( { ACPI_STATUS Status; char *Namepath; @@ -1913,7 +1913,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoStao); if (ACPI_FAILURE (Status)) { -@@ -3457,7 +3565,7 @@ AcpiDmDumpStao ( +@@ -3807,7 +3915,7 @@ AcpiDmDumpStao ( /* The rest of the table consists of Namepath strings */ @@ -1922,7 +1922,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c { Namepath = ACPI_ADD_PTR (char, Table, Offset); StringLength = strlen (Namepath) + 1; -@@ -3499,11 +3607,14 @@ AcpiDmDumpTcpa ( +@@ -3849,11 +3957,14 @@ AcpiDmDumpTcpa ( ACPI_TABLE_TCPA_HDR *SubTable = ACPI_ADD_PTR ( ACPI_TABLE_TCPA_HDR, Table, Offset); ACPI_STATUS Status; @@ -1938,7 +1938,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c 0, AcpiDmTableInfoTcpaHdr); if (ACPI_FAILURE (Status)) { -@@ -3514,18 +3625,19 @@ AcpiDmDumpTcpa ( +@@ -3864,18 +3975,19 @@ AcpiDmDumpTcpa ( * Examine the PlatformClass field to determine the table type. * Either a client or server table. Only one. */ @@ -1963,7 +1963,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c break; default: -@@ -3562,11 +3674,13 @@ AcpiDmDumpVrtc ( +@@ -3912,11 +4024,13 @@ AcpiDmDumpVrtc ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_VRTC); ACPI_VRTC_ENTRY *SubTable; @@ -1978,7 +1978,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3575,12 +3689,12 @@ AcpiDmDumpVrtc ( +@@ -3925,12 +4039,12 @@ AcpiDmDumpVrtc ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_VRTC_ENTRY, Table, Offset); @@ -1993,7 +1993,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_VRTC_ENTRY), AcpiDmTableInfoVrtc0); if (ACPI_FAILURE (Status)) { -@@ -3615,11 +3729,13 @@ AcpiDmDumpWdat ( +@@ -3965,11 +4079,13 @@ AcpiDmDumpWdat ( ACPI_STATUS Status; UINT32 Offset = sizeof (ACPI_TABLE_WDAT); ACPI_WDAT_ENTRY *SubTable; @@ -2008,7 +2008,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c if (ACPI_FAILURE (Status)) { return; -@@ -3628,12 +3744,12 @@ AcpiDmDumpWdat ( +@@ -3978,12 +4094,12 @@ AcpiDmDumpWdat ( /* Subtables */ SubTable = ACPI_ADD_PTR (ACPI_WDAT_ENTRY, Table, Offset); @@ -2023,7 +2023,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c sizeof (ACPI_WDAT_ENTRY), AcpiDmTableInfoWdat0); if (ACPI_FAILURE (Status)) { -@@ -3668,12 +3784,13 @@ AcpiDmDumpWpbt ( +@@ -4018,12 +4134,13 @@ AcpiDmDumpWpbt ( { ACPI_STATUS Status; ACPI_TABLE_WPBT *SubTable; @@ -2038,7 +2038,7 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoWpbt); if (ACPI_FAILURE (Status)) { -@@ -3683,10 +3800,10 @@ AcpiDmDumpWpbt ( +@@ -4033,10 +4150,10 @@ AcpiDmDumpWpbt ( /* Extract the arguments buffer length from the main table */ SubTable = ACPI_CAST_PTR (ACPI_TABLE_WPBT, Table); @@ -2051,10 +2051,10 @@ Index: acpica-unix2-20170303/source/common/dmtbdump.c + (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength, AcpiDmTableInfoWpbt0); } -Index: acpica-unix2-20170303/source/compiler/aslrestype2.c +Index: acpica-unix2-20170531/source/compiler/aslrestype2.c =================================================================== ---- acpica-unix2-20170303.orig/source/compiler/aslrestype2.c -+++ acpica-unix2-20170303/source/compiler/aslrestype2.c +--- acpica-unix2-20170531.orig/source/compiler/aslrestype2.c ++++ acpica-unix2-20170531/source/compiler/aslrestype2.c @@ -98,21 +98,33 @@ RsDoGeneralRegisterDescriptor ( { case 0: /* Address space */ @@ -2101,10 +2101,10 @@ Index: acpica-unix2-20170303/source/compiler/aslrestype2.c RsCreateByteField (InitializerOp, ACPI_RESTAG_ACCESSSIZE, CurrentByteOffset + ASL_RESDESC_OFFSET (GenericReg.AccessSize)); -Index: acpica-unix2-20170303/source/compiler/dtfield.c +Index: acpica-unix2-20170531/source/compiler/dtfield.c =================================================================== ---- acpica-unix2-20170303.orig/source/compiler/dtfield.c -+++ acpica-unix2-20170303/source/compiler/dtfield.c +--- acpica-unix2-20170531.orig/source/compiler/dtfield.c ++++ acpica-unix2-20170531/source/compiler/dtfield.c @@ -360,7 +360,27 @@ DtCompileInteger ( DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer); } @@ -2134,10 +2134,10 @@ Index: acpica-unix2-20170303/source/compiler/dtfield.c return; } -Index: acpica-unix2-20170303/source/compiler/dtsubtable.c +Index: acpica-unix2-20170531/source/compiler/dtsubtable.c =================================================================== ---- acpica-unix2-20170303.orig/source/compiler/dtsubtable.c -+++ acpica-unix2-20170303/source/compiler/dtsubtable.c +--- acpica-unix2-20170531.orig/source/compiler/dtsubtable.c ++++ acpica-unix2-20170531/source/compiler/dtsubtable.c @@ -379,6 +379,21 @@ DtSetSubtableLength ( return; } @@ -2162,10 +2162,10 @@ Index: acpica-unix2-20170303/source/compiler/dtsubtable.c + Subtable->SizeOfLengthField); + } } -Index: acpica-unix2-20170303/source/compiler/dttable1.c +Index: acpica-unix2-20170531/source/compiler/dttable1.c =================================================================== ---- acpica-unix2-20170303.orig/source/compiler/dttable1.c -+++ acpica-unix2-20170303/source/compiler/dttable1.c +--- acpica-unix2-20170531.orig/source/compiler/dttable1.c ++++ acpica-unix2-20170531/source/compiler/dttable1.c @@ -282,6 +282,8 @@ DtCompileCsrt ( DT_FIELD **PFieldList = (DT_FIELD **) List; UINT32 DescriptorCount; @@ -2388,7 +2388,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c switch (Type) { case ACPI_HEST_TYPE_IA32_CHECK: -@@ -1225,11 +1250,13 @@ DtCompileIort ( +@@ -1453,11 +1478,13 @@ DtCompileIort ( ACPI_IORT_SMMU *IortSmmu; UINT32 NodeNumber; UINT32 NodeLength; @@ -2402,7 +2402,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c ParentTable = DtPeekSubtable (); -@@ -1255,7 +1282,7 @@ DtCompileIort ( +@@ -1483,7 +1510,7 @@ DtCompileIort ( * Optionally allows the generic data types to be used for filling * this field. */ @@ -2411,7 +2411,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c Status = DtCompileTable (PFieldList, AcpiDmTableInfoIortPad, &Subtable, TRUE); if (ACPI_FAILURE (Status)) -@@ -1265,7 +1292,7 @@ DtCompileIort ( +@@ -1493,7 +1520,7 @@ DtCompileIort ( if (Subtable) { DtInsertSubtable (ParentTable, Subtable); @@ -2420,7 +2420,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c } else { -@@ -1275,8 +1302,9 @@ DtCompileIort ( +@@ -1503,8 +1530,9 @@ DtCompileIort ( { return (Status); } @@ -2431,7 +2431,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c NodeNumber = 0; while (*PFieldList) -@@ -1330,7 +1358,7 @@ DtCompileIort ( +@@ -1558,7 +1586,7 @@ DtCompileIort ( ItsNumber++; } @@ -2440,7 +2440,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c break; case ACPI_IORT_NODE_NAMED_COMPONENT: -@@ -1364,15 +1392,16 @@ DtCompileIort ( +@@ -1592,15 +1620,16 @@ DtCompileIort ( } else { @@ -2460,7 +2460,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c &Subtable); if (ACPI_FAILURE (Status)) { -@@ -1380,7 +1409,8 @@ DtCompileIort ( +@@ -1608,7 +1637,8 @@ DtCompileIort ( } DtInsertSubtable (ParentTable, Subtable); @@ -2470,7 +2470,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c } } break; -@@ -1413,7 +1443,7 @@ DtCompileIort ( +@@ -1641,7 +1671,7 @@ DtCompileIort ( /* Compile global interrupt array */ @@ -2479,7 +2479,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3a, &Subtable, TRUE); if (ACPI_FAILURE (Status)) -@@ -1427,7 +1457,7 @@ DtCompileIort ( +@@ -1655,7 +1685,7 @@ DtCompileIort ( /* Compile context interrupt array */ ContextIrptNumber = 0; @@ -2488,7 +2488,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c while (*PFieldList) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3b, -@@ -1447,12 +1477,12 @@ DtCompileIort ( +@@ -1675,12 +1705,12 @@ DtCompileIort ( ContextIrptNumber++; } @@ -2503,7 +2503,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c while (*PFieldList) { Status = DtCompileTable (PFieldList, AcpiDmTableInfoIort3c, -@@ -1472,7 +1502,7 @@ DtCompileIort ( +@@ -1700,7 +1730,7 @@ DtCompileIort ( PmuIrptNumber++; } @@ -2512,7 +2512,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c break; case ACPI_IORT_NODE_SMMU_V3: -@@ -1496,7 +1526,7 @@ DtCompileIort ( +@@ -1724,7 +1754,7 @@ DtCompileIort ( /* Compile Array of ID mappings */ @@ -2521,7 +2521,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c IdMappingNumber = 0; while (*PFieldList) { -@@ -1517,7 +1547,7 @@ DtCompileIort ( +@@ -1745,7 +1775,7 @@ DtCompileIort ( IdMappingNumber++; } @@ -2530,7 +2530,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c if (!IdMappingNumber) { IortNode->MappingOffset = 0; -@@ -1532,7 +1562,7 @@ DtCompileIort ( +@@ -1760,7 +1790,7 @@ DtCompileIort ( NodeNumber++; } @@ -2539,10 +2539,10 @@ Index: acpica-unix2-20170303/source/compiler/dttable1.c return (AE_OK); } -Index: acpica-unix2-20170303/source/compiler/dttable2.c +Index: acpica-unix2-20170531/source/compiler/dttable2.c =================================================================== ---- acpica-unix2-20170303.orig/source/compiler/dttable2.c -+++ acpica-unix2-20170303/source/compiler/dttable2.c +--- acpica-unix2-20170531.orig/source/compiler/dttable2.c ++++ acpica-unix2-20170531/source/compiler/dttable2.c @@ -346,7 +346,7 @@ DtCompileMpst ( DtPushSubtable (Subtable); @@ -2608,7 +2608,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c DtPopSubtable (); break; -@@ -885,7 +887,7 @@ DtCompilePmtt ( +@@ -895,7 +897,7 @@ DtCompilePmtt ( PmttController = ACPI_CAST_PTR (ACPI_PMTT_CONTROLLER, (Subtable->Buffer - sizeof (ACPI_PMTT_HEADER))); @@ -2617,7 +2617,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c while (DomainCount) { -@@ -986,6 +988,7 @@ DtCompileS3pt ( +@@ -1115,6 +1117,7 @@ DtCompileS3pt ( DT_SUBTABLE *ParentTable; ACPI_DMTABLE_INFO *InfoTable; DT_FIELD *SubtableStart; @@ -2625,7 +2625,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c Status = DtCompileTable (PFieldList, AcpiDmTableInfoS3pt, -@@ -1013,7 +1016,8 @@ DtCompileS3pt ( +@@ -1142,7 +1145,8 @@ DtCompileS3pt ( S3ptHeader = ACPI_CAST_PTR (ACPI_FPDT_HEADER, Subtable->Buffer); @@ -2635,7 +2635,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c { case ACPI_S3PT_TYPE_RESUME: -@@ -1110,6 +1114,7 @@ DtCompileSlit ( +@@ -1239,6 +1243,7 @@ DtCompileSlit ( DT_FIELD *FieldList; UINT32 Localities; UINT8 *LocalityBuffer; @@ -2643,7 +2643,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c Status = DtCompileTable (PFieldList, AcpiDmTableInfoSlit, -@@ -1122,7 +1127,8 @@ DtCompileSlit ( +@@ -1251,7 +1256,8 @@ DtCompileSlit ( ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); @@ -2653,7 +2653,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c LocalityBuffer = UtLocalCalloc (Localities); /* Compile each locality buffer */ -@@ -1311,6 +1317,7 @@ DtCompileTcpa ( +@@ -1445,6 +1451,7 @@ DtCompileTcpa ( ACPI_TABLE_TCPA_HDR *TcpaHeader; DT_SUBTABLE *ParentTable; ACPI_STATUS Status; @@ -2661,7 +2661,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c /* Compile the main table */ -@@ -1331,7 +1338,8 @@ DtCompileTcpa ( +@@ -1465,7 +1472,8 @@ DtCompileTcpa ( */ TcpaHeader = ACPI_CAST_PTR (ACPI_TABLE_TCPA_HDR, ParentTable->Buffer); @@ -2671,7 +2671,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c { case ACPI_TCPA_CLIENT_TABLE: -@@ -1527,6 +1535,9 @@ DtCompileWpbt ( +@@ -1661,6 +1669,9 @@ DtCompileWpbt ( ACPI_TABLE_WPBT *Table; ACPI_STATUS Status; UINT16 Length; @@ -2681,7 +2681,7 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c /* Compile the main table */ -@@ -1554,7 +1565,16 @@ DtCompileWpbt ( +@@ -1688,7 +1699,16 @@ DtCompileWpbt ( Length = (UINT16) Subtable->TotalLength; Table = ACPI_CAST_PTR (ACPI_TABLE_WPBT, ParentTable->Buffer); @@ -2699,10 +2699,10 @@ Index: acpica-unix2-20170303/source/compiler/dttable2.c ParentTable = DtPeekSubtable (); DtInsertSubtable (ParentTable, Subtable); -Index: acpica-unix2-20170303/source/components/disassembler/dmbuffer.c +Index: acpica-unix2-20170531/source/components/disassembler/dmbuffer.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/disassembler/dmbuffer.c -+++ acpica-unix2-20170303/source/components/disassembler/dmbuffer.c +--- acpica-unix2-20170531.orig/source/components/disassembler/dmbuffer.c ++++ acpica-unix2-20170531/source/components/disassembler/dmbuffer.c @@ -204,7 +204,7 @@ AcpiDmByteList ( @@ -2778,11 +2778,11 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmbuffer.c NextOp = AcpiPsGetDepthNext (NULL, Op); if (!NextOp) -Index: acpica-unix2-20170303/source/components/disassembler/dmopcode.c +Index: acpica-unix2-20170531/source/components/disassembler/dmopcode.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/disassembler/dmopcode.c -+++ acpica-unix2-20170303/source/components/disassembler/dmopcode.c -@@ -253,6 +253,7 @@ AcpiDmPredefinedDescription ( +--- acpica-unix2-20170531.orig/source/components/disassembler/dmopcode.c ++++ acpica-unix2-20170531/source/components/disassembler/dmopcode.c +@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription ( char *NameString; int LastCharIsDigit; int LastCharsAreHex; @@ -2790,7 +2790,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmopcode.c if (!Op) -@@ -270,7 +271,9 @@ AcpiDmPredefinedDescription ( +@@ -261,7 +262,9 @@ AcpiDmPredefinedDescription ( /* Predefined name must start with an underscore */ @@ -2801,7 +2801,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmopcode.c if (NameString[0] != '_') { return; -@@ -884,25 +887,29 @@ AcpiDmDisassembleOneOp ( +@@ -875,25 +878,29 @@ AcpiDmDisassembleOneOp ( AcpiDmNamestring (Op->Common.Value.Name); break; @@ -2836,10 +2836,10 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmopcode.c Info->BitOffset += Offset; if (Info->BitOffset % 8 == 0) -Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c +Index: acpica-unix2-20170531/source/components/disassembler/dmresrcl2.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/disassembler/dmresrcl2.c -+++ acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c +--- acpica-unix2-20170531.orig/source/components/disassembler/dmresrcl2.c ++++ acpica-unix2-20170531/source/components/disassembler/dmresrcl2.c @@ -191,22 +191,24 @@ AcpiDmGpioCommon ( char *DeviceName = NULL; UINT32 PinCount; @@ -2987,7 +2987,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c /* Dump the GpioInt/GpioIo common portion of the descriptor */ -@@ -427,6 +446,7 @@ AcpiDmDumpSerialBusVendorData ( +@@ -533,6 +552,7 @@ AcpiDmDumpSerialBusVendorData ( { UINT8 *VendorData; UINT32 VendorLength; @@ -2995,7 +2995,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c /* Get the (optional) vendor data and length */ -@@ -435,8 +455,8 @@ AcpiDmDumpSerialBusVendorData ( +@@ -541,8 +561,8 @@ AcpiDmDumpSerialBusVendorData ( { case AML_RESOURCE_I2C_SERIALBUSTYPE: @@ -3006,7 +3006,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c VendorData = ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_I2C_SERIALBUS)); -@@ -444,8 +464,8 @@ AcpiDmDumpSerialBusVendorData ( +@@ -550,8 +570,8 @@ AcpiDmDumpSerialBusVendorData ( case AML_RESOURCE_SPI_SERIALBUSTYPE: @@ -3017,7 +3017,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c VendorData = ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_SPI_SERIALBUS)); -@@ -453,8 +473,8 @@ AcpiDmDumpSerialBusVendorData ( +@@ -559,8 +579,8 @@ AcpiDmDumpSerialBusVendorData ( case AML_RESOURCE_UART_SERIALBUSTYPE: @@ -3028,7 +3028,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c VendorData = ACPI_ADD_PTR (UINT8, Resource, sizeof (AML_RESOURCE_UART_SERIALBUS)); -@@ -495,15 +515,19 @@ AcpiDmI2cSerialBusDescriptor ( +@@ -601,15 +621,19 @@ AcpiDmI2cSerialBusDescriptor ( { UINT32 ResourceSourceOffset; char *DeviceName; @@ -3050,7 +3050,7 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c AcpiDmIndent (Level + 1); AcpiOsPrintf ("%s, ", -@@ -511,8 +535,8 @@ AcpiDmI2cSerialBusDescriptor ( +@@ -617,8 +641,8 @@ AcpiDmI2cSerialBusDescriptor ( /* ResourceSource is a required field */ @@ -3061,10 +3061,10 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl2.c DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset); AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX); -Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl.c +Index: acpica-unix2-20170531/source/components/disassembler/dmresrcl.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/disassembler/dmresrcl.c -+++ acpica-unix2-20170303/source/components/disassembler/dmresrcl.c +--- acpica-unix2-20170531.orig/source/components/disassembler/dmresrcl.c ++++ acpica-unix2-20170531/source/components/disassembler/dmresrcl.c @@ -141,7 +141,8 @@ AcpiDmMemoryFields ( UINT32 Level) { @@ -3213,10 +3213,10 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcl.c } AcpiDmIndent (Level); -Index: acpica-unix2-20170303/source/components/disassembler/dmresrcs.c +Index: acpica-unix2-20170531/source/components/disassembler/dmresrcs.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/disassembler/dmresrcs.c -+++ acpica-unix2-20170303/source/components/disassembler/dmresrcs.c +--- acpica-unix2-20170531.orig/source/components/disassembler/dmresrcs.c ++++ acpica-unix2-20170531/source/components/disassembler/dmresrcs.c @@ -72,6 +72,7 @@ AcpiDmIrqDescriptor ( UINT32 Length, UINT32 Level) @@ -3273,10 +3273,10 @@ Index: acpica-unix2-20170303/source/components/disassembler/dmresrcs.c AcpiDmIndent (Level + 1); AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length"); -Index: acpica-unix2-20170303/source/components/dispatcher/dsfield.c +Index: acpica-unix2-20170531/source/components/dispatcher/dsfield.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/dispatcher/dsfield.c -+++ acpica-unix2-20170303/source/components/dispatcher/dsfield.c +--- acpica-unix2-20170531.orig/source/components/dispatcher/dsfield.c ++++ acpica-unix2-20170531/source/components/dispatcher/dsfield.c @@ -318,6 +318,7 @@ AcpiDsGetFieldNames ( ACPI_STATUS Status; UINT64 Position; @@ -3321,10 +3321,10 @@ Index: acpica-unix2-20170303/source/components/dispatcher/dsfield.c if (ACPI_FAILURE (Status)) { ACPI_ERROR_NAMESPACE ((char *) &Arg->Named.Name, Status); -Index: acpica-unix2-20170303/source/components/events/evgpeblk.c +Index: acpica-unix2-20170531/source/components/events/evgpeblk.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/events/evgpeblk.c -+++ acpica-unix2-20170303/source/components/events/evgpeblk.c +--- acpica-unix2-20170531.orig/source/components/events/evgpeblk.c ++++ acpica-unix2-20170531/source/components/events/evgpeblk.c @@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock ( ACPI_STATUS Status; ACPI_GPE_BLOCK_INFO *GpeBlock; @@ -3357,10 +3357,10 @@ Index: acpica-unix2-20170303/source/components/events/evgpeblk.c InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : "")); /* Update global count of currently available GPEs */ -Index: acpica-unix2-20170303/source/components/hardware/hwregs.c +Index: acpica-unix2-20170531/source/components/hardware/hwregs.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/hardware/hwregs.c -+++ acpica-unix2-20170303/source/components/hardware/hwregs.c +--- acpica-unix2-20170531.orig/source/components/hardware/hwregs.c ++++ acpica-unix2-20170531/source/components/hardware/hwregs.c @@ -197,7 +197,7 @@ AcpiHwValidateRegister ( * Address must not be null. A null address also indicates an optional * ACPI register that is not supported, so no error message. @@ -3370,10 +3370,10 @@ Index: acpica-unix2-20170303/source/components/hardware/hwregs.c if (!(*Address)) { return (AE_BAD_ADDRESS); -Index: acpica-unix2-20170303/source/components/hardware/hwvalid.c +Index: acpica-unix2-20170531/source/components/hardware/hwvalid.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/hardware/hwvalid.c -+++ acpica-unix2-20170303/source/components/hardware/hwvalid.c +--- acpica-unix2-20170531.orig/source/components/hardware/hwvalid.c ++++ acpica-unix2-20170531/source/components/hardware/hwvalid.c @@ -135,6 +135,8 @@ AcpiHwValidateIoRequest ( UINT32 ByteWidth; ACPI_IO_ADDRESS LastAddress; @@ -3395,11 +3395,11 @@ Index: acpica-unix2-20170303/source/components/hardware/hwvalid.c { ACPI_ERROR ((AE_INFO, "Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X", -Index: acpica-unix2-20170303/source/components/namespace/nsaccess.c +Index: acpica-unix2-20170531/source/components/namespace/nsaccess.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/namespace/nsaccess.c -+++ acpica-unix2-20170303/source/components/namespace/nsaccess.c -@@ -309,6 +309,7 @@ AcpiNsLookup ( +--- acpica-unix2-20170531.orig/source/components/namespace/nsaccess.c ++++ acpica-unix2-20170531/source/components/namespace/nsaccess.c +@@ -312,6 +312,7 @@ AcpiNsLookup ( ACPI_OBJECT_TYPE ThisSearchType; UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT; UINT32 LocalFlags; @@ -3407,7 +3407,7 @@ Index: acpica-unix2-20170303/source/components/namespace/nsaccess.c ACPI_FUNCTION_TRACE (NsLookup); -@@ -657,9 +658,10 @@ AcpiNsLookup ( +@@ -684,9 +685,10 @@ AcpiNsLookup ( { /* Complain about a type mismatch */ @@ -3419,10 +3419,10 @@ Index: acpica-unix2-20170303/source/components/namespace/nsaccess.c AcpiUtGetTypeName (ThisNode->Type), AcpiUtGetTypeName (TypeToCheckFor))); } -Index: acpica-unix2-20170303/source/components/namespace/nsparse.c +Index: acpica-unix2-20170531/source/components/namespace/nsparse.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/namespace/nsparse.c -+++ acpica-unix2-20170303/source/components/namespace/nsparse.c +--- acpica-unix2-20170531.orig/source/components/namespace/nsparse.c ++++ acpica-unix2-20170531/source/components/namespace/nsparse.c @@ -196,13 +196,14 @@ AcpiNsOneCompleteParse ( /* Table must consist of at least a complete header */ @@ -3440,10 +3440,10 @@ Index: acpica-unix2-20170303/source/components/namespace/nsparse.c Status = AcpiTbGetOwnerId (TableIndex, &OwnerId); if (ACPI_FAILURE (Status)) -Index: acpica-unix2-20170303/source/components/tables/tbdata.c +Index: acpica-unix2-20170531/source/components/tables/tbdata.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbdata.c -+++ acpica-unix2-20170303/source/components/tables/tbdata.c +--- acpica-unix2-20170531.orig/source/components/tables/tbdata.c ++++ acpica-unix2-20170531/source/components/tables/tbdata.c @@ -407,6 +407,7 @@ AcpiTbVerifyTempTable ( char *Signature) { @@ -3462,10 +3462,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbdata.c if (ACPI_FAILURE (Status)) { ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY, -Index: acpica-unix2-20170303/source/components/tables/tbfadt.c +Index: acpica-unix2-20170531/source/components/tables/tbfadt.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbfadt.c -+++ acpica-unix2-20170303/source/components/tables/tbfadt.c +--- acpica-unix2-20170531.orig/source/components/tables/tbfadt.c ++++ acpica-unix2-20170531/source/components/tables/tbfadt.c @@ -520,6 +520,8 @@ AcpiTbConvertFadt ( UINT8 Length; UINT8 Flags; @@ -3545,10 +3545,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbfadt.c "PmRegisters", 0); } } -Index: acpica-unix2-20170303/source/components/tables/tbfind.c +Index: acpica-unix2-20170531/source/components/tables/tbfind.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbfind.c -+++ acpica-unix2-20170303/source/components/tables/tbfind.c +--- acpica-unix2-20170531.orig/source/components/tables/tbfind.c ++++ acpica-unix2-20170531/source/components/tables/tbfind.c @@ -108,8 +108,11 @@ AcpiTbFindTable ( (void) AcpiUtAcquireMutex (ACPI_MTX_TABLES); for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) @@ -3562,10 +3562,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbfind.c { /* Not the requested table */ -Index: acpica-unix2-20170303/source/components/tables/tbprint.c +Index: acpica-unix2-20170531/source/components/tables/tbprint.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbprint.c -+++ acpica-unix2-20170303/source/components/tables/tbprint.c +--- acpica-unix2-20170531.orig/source/components/tables/tbprint.c ++++ acpica-unix2-20170531/source/components/tables/tbprint.c @@ -143,15 +143,18 @@ AcpiTbPrintTableHeader ( ACPI_TABLE_HEADER *Header) { @@ -3607,10 +3607,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbprint.c } } -Index: acpica-unix2-20170303/source/components/tables/tbutils.c +Index: acpica-unix2-20170531/source/components/tables/tbutils.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbutils.c -+++ acpica-unix2-20170303/source/components/tables/tbutils.c +--- acpica-unix2-20170531.orig/source/components/tables/tbutils.c ++++ acpica-unix2-20170531/source/components/tables/tbutils.c @@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry ( * 64-bit platform, XSDT: Move (unaligned) 64-bit to local, * return 64-bit @@ -3670,10 +3670,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbutils.c { AcpiGbl_FadtIndex = TableIndex; AcpiTbParseFadt (); -Index: acpica-unix2-20170303/source/components/tables/tbxface.c +Index: acpica-unix2-20170531/source/components/tables/tbxface.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbxface.c -+++ acpica-unix2-20170303/source/components/tables/tbxface.c +--- acpica-unix2-20170531.orig/source/components/tables/tbxface.c ++++ acpica-unix2-20170531/source/components/tables/tbxface.c @@ -263,8 +263,11 @@ AcpiGetTableHeader ( for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) @@ -3687,10 +3687,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbxface.c { continue; } -Index: acpica-unix2-20170303/source/components/tables/tbxfload.c +Index: acpica-unix2-20170531/source/components/tables/tbxfload.c =================================================================== ---- acpica-unix2-20170303.orig/source/components/tables/tbxfload.c -+++ acpica-unix2-20170303/source/components/tables/tbxfload.c +--- acpica-unix2-20170531.orig/source/components/tables/tbxfload.c ++++ acpica-unix2-20170531/source/components/tables/tbxfload.c @@ -156,6 +156,7 @@ AcpiTbLoadNamespace ( ACPI_TABLE_DESC *Table; UINT32 TablesLoaded = 0; @@ -3710,10 +3710,10 @@ Index: acpica-unix2-20170303/source/components/tables/tbxfload.c ACPI_FAILURE (AcpiTbValidateTable (Table))) { Status = AE_NO_ACPI_TABLES; -Index: acpica-unix2-20170303/source/include/acmacros.h +Index: acpica-unix2-20170531/source/include/acmacros.h =================================================================== ---- acpica-unix2-20170303.orig/source/include/acmacros.h -+++ acpica-unix2-20170303/source/include/acmacros.h +--- acpica-unix2-20170531.orig/source/include/acmacros.h ++++ acpica-unix2-20170531/source/include/acmacros.h @@ -98,7 +98,9 @@ ((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\ ((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];} @@ -3777,10 +3777,10 @@ Index: acpica-unix2-20170303/source/include/acmacros.h #define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */ -Index: acpica-unix2-20170303/source/include/platform/aclinux.h +Index: acpica-unix2-20170531/source/include/platform/aclinux.h =================================================================== ---- acpica-unix2-20170303.orig/source/include/platform/aclinux.h -+++ acpica-unix2-20170303/source/include/platform/aclinux.h +--- acpica-unix2-20170531.orig/source/include/platform/aclinux.h ++++ acpica-unix2-20170531/source/include/platform/aclinux.h @@ -219,6 +219,10 @@ #define __cdecl #endif @@ -3792,10 +3792,10 @@ Index: acpica-unix2-20170303/source/include/platform/aclinux.h #endif /* __KERNEL__ */ #endif /* __ACLINUX_H__ */ -Index: acpica-unix2-20170303/source/tools/acpiexec/aetables.c +Index: acpica-unix2-20170531/source/tools/acpiexec/aetables.c =================================================================== ---- acpica-unix2-20170303.orig/source/tools/acpiexec/aetables.c -+++ acpica-unix2-20170303/source/tools/acpiexec/aetables.c +--- acpica-unix2-20170531.orig/source/tools/acpiexec/aetables.c ++++ acpica-unix2-20170531/source/tools/acpiexec/aetables.c @@ -146,21 +146,25 @@ AeInitializeTableHeader ( char *Signature, UINT32 Length)