diff --git a/.acpica-tools.metadata b/.acpica-tools.metadata index 2f5347c..9b60703 100644 --- a/.acpica-tools.metadata +++ b/.acpica-tools.metadata @@ -1,2 +1,2 @@ -f4a2c8e7afd7441e98b0878c1fff5ffaba2258bd SOURCES/acpica-unix2-20140926.tar.gz -5fd3e8641c38d672ff66dec958d73c2916e03365 SOURCES/acpitests-unix-20140926.tar.gz +283c594c4b89db8e3bef8fca25021c52938987ad SOURCES/acpica-unix2-20150619.tar.gz +d84d399a98cc1d3ff4c5eaf03ee1d9e01ad9be3a SOURCES/acpitests-unix-20150619.tar.gz diff --git a/.gitignore b/.gitignore index d3a0639..c1b4c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/acpica-unix2-20140926.tar.gz -SOURCES/acpitests-unix-20140926.tar.gz +SOURCES/acpica-unix2-20150619.tar.gz +SOURCES/acpitests-unix-20150619.tar.gz diff --git a/SOURCES/50bde98a82-acpica.patch b/SOURCES/50bde98a82-acpica.patch new file mode 100644 index 0000000..ea2d58c --- /dev/null +++ b/SOURCES/50bde98a82-acpica.patch @@ -0,0 +1,235 @@ +commit 50bde98a8268e940c0d072de0546685c5c2f893b +Author: Robert Moore +AuthorDate: Fri Jun 19 09:44:39 2015 -0700 +Commit: Robert Moore +CommitDate: Fri Jun 19 09:44:39 2015 -0700 + + iASL/Disassembler: Add status checks in the dmtbdump module. + + Error checking after calls to AcpiDmDumpTable was inconsistent. + ACPICA BZ 1169. + +diff --git a/source/common/dmtbdump.c b/source/common/dmtbdump.c +index 4711b68..bb9cf55 100644 +--- a/source/common/dmtbdump.c ++++ b/source/common/dmtbdump.c +@@ -208,11 +208,16 @@ AcpiDmDumpRsdp ( + ACPI_TABLE_RSDP *Rsdp = ACPI_CAST_PTR (ACPI_TABLE_RSDP, Table); + UINT32 Length = sizeof (ACPI_RSDP_COMMON); + UINT8 Checksum; ++ ACPI_STATUS Status; + + + /* Dump the common ACPI 1.0 portion */ + +- AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp1); ++ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp1); ++ if (ACPI_FAILURE (Status)) ++ { ++ return (Length); ++ } + + /* Validate the first checksum */ + +@@ -229,7 +234,11 @@ AcpiDmDumpRsdp ( + if (Rsdp->Revision > 0) + { + Length = Rsdp->Length; +- AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp2); ++ Status = AcpiDmDumpTable (Length, 0, Table, 0, AcpiDmTableInfoRsdp2); ++ if (ACPI_FAILURE (Status)) ++ { ++ return (Length); ++ } + + /* Validate the extended checksum over entire RSDP */ + +@@ -347,37 +356,59 @@ void + AcpiDmDumpFadt ( + ACPI_TABLE_HEADER *Table) + { ++ ACPI_STATUS Status; ++ + + /* Always dump the minimum FADT revision 1 fields (ACPI 1.0) */ + +- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1); ++ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt1); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + + /* Check for FADT revision 2 fields (ACPI 1.0B MS extensions) */ + + if ((Table->Length > ACPI_FADT_V1_SIZE) && + (Table->Length <= ACPI_FADT_V2_SIZE)) + { +- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt2); ++ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt2); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + } + + /* Check for FADT revision 3/4 fields and up (ACPI 2.0+ extended data) */ + + else if (Table->Length > ACPI_FADT_V2_SIZE) + { +- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt3); ++ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt3); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + + /* Check for FADT revision 5 fields and up (ACPI 5.0+) */ + + if (Table->Length > ACPI_FADT_V3_SIZE) + { +- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt5); ++ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt5); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + } + + /* Check for FADT revision 6 fields and up (ACPI 6.0+) */ + + if (Table->Length > ACPI_FADT_V3_SIZE) + { +- AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt6); ++ Status = AcpiDmDumpTable (Table->Length, 0, Table, 0, AcpiDmTableInfoFadt6); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + } + } + +@@ -1136,7 +1167,7 @@ AcpiDmDumpDrtm ( + AcpiDmTableInfoDrtm1); + if (ACPI_FAILURE (Status)) + { +- return; ++ return; + } + + Offset += ACPI_OFFSET (ACPI_DRTM_RESOURCE_LIST, Resources); +@@ -1164,13 +1195,9 @@ AcpiDmDumpDrtm ( + + DrtmDps = ACPI_ADD_PTR (ACPI_DRTM_DPS_ID, Table, Offset); + AcpiOsPrintf ("\n"); +- Status = AcpiDmDumpTable (Table->Length, Offset, ++ (void) AcpiDmDumpTable (Table->Length, Offset, + DrtmDps, sizeof (ACPI_DRTM_DPS_ID), + AcpiDmTableInfoDrtm2); +- if (ACPI_FAILURE (Status)) +- { +- return; +- } + } + + +@@ -1794,6 +1821,10 @@ AcpiDmDumpIort ( + Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset, + ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), + Length, AcpiDmTableInfoIort3a); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + + NodeOffset = IortSmmu->ContextInterruptOffset; + for (i = 0; i < IortSmmu->ContextInterruptCount; i++) +@@ -1801,6 +1832,10 @@ AcpiDmDumpIort ( + Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset, + ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), + 8, AcpiDmTableInfoIort3b); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + NodeOffset += 8; + } + +@@ -1810,6 +1845,10 @@ AcpiDmDumpIort ( + Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset, + ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), + 8, AcpiDmTableInfoIort3c); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + NodeOffset += 8; + } + } +@@ -1830,6 +1869,10 @@ AcpiDmDumpIort ( + Status = AcpiDmDumpTable (Table->Length, Offset + NodeOffset, + ACPI_ADD_PTR (ACPI_IORT_NODE, IortNode, NodeOffset), + Length, AcpiDmTableInfoIortMap); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + NodeOffset += Length; + } + +@@ -2004,6 +2047,10 @@ AcpiDmDumpIvrs ( + + Status = AcpiDmDumpTable (Table->Length, EntryOffset, + DeviceEntry, EntryLength, InfoTable); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } + + EntryOffset += EntryLength; + DeviceEntry = ACPI_ADD_PTR (ACPI_IVRS_DE_HEADER, DeviceEntry, +@@ -2687,6 +2734,11 @@ AcpiDmDumpNfit ( + Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset, + &Interleave->LineOffset[i], + sizeof (UINT32), AcpiDmTableInfoNfit2a); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } ++ + FieldOffset += sizeof (UINT32); + } + break; +@@ -2715,6 +2767,11 @@ AcpiDmDumpNfit ( + Status = AcpiDmDumpTable (Table->Length, Offset + FieldOffset, + &Hint->HintAddress[i], + sizeof (UINT64), AcpiDmTableInfoNfit6a); ++ if (ACPI_FAILURE (Status)) ++ { ++ return; ++ } ++ + FieldOffset += sizeof (UINT64); + } + break; +@@ -3126,7 +3183,7 @@ void + AcpiDmDumpSlic ( + ACPI_TABLE_HEADER *Table) + { +- AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table, ++ (void) AcpiDmDumpTable (Table->Length, sizeof (ACPI_TABLE_HEADER), Table, + Table->Length - sizeof (*Table), AcpiDmTableInfoSlic); + } + +@@ -3497,10 +3554,6 @@ AcpiDmDumpWpbt ( + + /* Dump the arguments buffer */ + +- AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength, ++ (void) AcpiDmDumpTable (Table->Length, 0, Table, ArgumentsLength, + AcpiDmTableInfoWpbt0); +- if (ACPI_FAILURE (Status)) +- { +- return; +- } + } diff --git a/SOURCES/aapits-linux.patch b/SOURCES/aapits-linux.patch index 3d5a89a..4ac8d2f 100644 --- a/SOURCES/aapits-linux.patch +++ b/SOURCES/aapits-linux.patch @@ -1,7 +1,8 @@ -diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapits/tests/aapits/atexec.c ---- acpica-unix2-20130626/tests/aapits/atexec.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atexec.c 2013-07-25 13:44:23.023894441 -0600 -@@ -639,6 +639,7 @@ +diff --git a/tests/aapits/atexec.c b/tests/aapits/atexec.c +index be86d00..fe47228 100644 +--- a/tests/aapits/atexec.c ++++ b/tests/aapits/atexec.c +@@ -639,6 +639,7 @@ AtBuildLocalFADT2 ( } @@ -9,7 +10,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi /******************************************************************************* * * FUNCTION: AtBuildLocalRSDT -@@ -757,8 +758,9 @@ +@@ -757,6 +758,7 @@ AtBuildLocalRSDT ( LocalRSDT->Header.Checksum = (UINT8)~LocalRSDT->Header.Checksum; } } @@ -17,9 +18,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi /******************************************************************************* - * - * FUNCTION: AtBuildLocalXSDT -@@ -1424,7 +1426,7 @@ +@@ -1424,7 +1426,7 @@ AeRegionHandler ( ACPI_WARNING ((AE_INFO, "Request on [%4.4s] is beyond region limit Req-%X+%X, Base=%X, Len-%X\n", (RegionObject->Region.Node)->Name.Ascii, (UINT32) Address, @@ -28,7 +27,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_AML_REGION_LIMIT); } -@@ -1799,7 +1801,9 @@ +@@ -1799,7 +1801,9 @@ AtCheckInteger( Path, Obj.Integer.Value, Value); #else printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", @@ -39,7 +38,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi #endif Status = AE_ERROR; } -@@ -1878,7 +1878,7 @@ +@@ -1878,7 +1882,7 @@ AtCheckString( { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", @@ -48,7 +47,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_NO_MEMORY); } Results.Pointer = Object; -@@ -1959,7 +1963,8 @@ +@@ -1959,7 +1963,8 @@ AtCheckBuffer( { printf ("AtCheckBuffer: unexpected length %d of Buffer vs" " calculated %d bytes\n", @@ -58,7 +57,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi } /* Initialize the return buffer structure */ -@@ -1968,7 +1973,7 @@ +@@ -1968,7 +1973,7 @@ AtCheckBuffer( { TestErrors++; printf ("Test Error: cannot allocate buffer of %d bytes\n", @@ -67,10 +66,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atexec.c acpica-unix2-20130626-aapi return (AE_NO_MEMORY); } Results.Pointer = Object; -diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapits/tests/aapits/atinit.c ---- acpica-unix2-20130626/tests/aapits/atinit.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atinit.c 2013-07-25 13:20:19.706705960 -0600 -@@ -3024,7 +3024,7 @@ +diff --git a/tests/aapits/atinit.c b/tests/aapits/atinit.c +index 0c74029..90cd137 100644 +--- a/tests/aapits/atinit.c ++++ b/tests/aapits/atinit.c +@@ -3024,7 +3024,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -79,7 +79,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } -@@ -3046,7 +3046,7 @@ +@@ -3046,7 +3046,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -88,7 +88,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } -@@ -3066,7 +3066,7 @@ +@@ -3066,7 +3066,7 @@ AtInitTest0041(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -97,7 +97,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } else if (OutBuffer.Pointer != &Info) -@@ -3149,7 +3149,7 @@ +@@ -3149,7 +3149,7 @@ AtInitTest0042(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -106,7 +106,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } else if (OutBuffer.Pointer != &Info) -@@ -3214,7 +3214,7 @@ +@@ -3214,7 +3214,7 @@ AtInitTest0043(void) AapiErrors++; printf ("API Error: AcpiGetSystemInfo() returned" " Length %d, expected %d\n", @@ -115,10 +115,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atinit.c acpica-unix2-20130626-aapi return (AE_ERROR); } else -diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapits/tests/aapits/atmain.c ---- acpica-unix2-20130626/tests/aapits/atmain.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atmain.c 2013-07-25 13:18:22.083323948 -0600 -@@ -336,7 +336,7 @@ +diff --git a/tests/aapits/atmain.c b/tests/aapits/atmain.c +index 12232c9..62230ef 100644 +--- a/tests/aapits/atmain.c ++++ b/tests/aapits/atmain.c +@@ -345,7 +345,7 @@ ExecuteTest ( { printf ("ACPICA API TS err: test num %ld of test case %ld" " is not implemented\n", @@ -127,7 +128,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi return (AtRetNotImpl); } -@@ -451,7 +451,7 @@ +@@ -460,7 +460,7 @@ main( if (test_case < 1 || test_case > AT_TEST_CASE_NUM) { printf ("ACPICA API TS err: test case %ld is out of range 1 - %d\n", @@ -136,7 +137,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi return (AtRetBadParam); } -@@ -459,7 +459,7 @@ +@@ -468,7 +468,7 @@ main( if (test_num < 0 || test_num > AtTestCase[test_case].TestsNum) { printf ("ACPICA API TS err: test num %ld is out of range 0 - %d\n", @@ -144,11 +145,12 @@ diff -urN acpica-unix2-20130626/tests/aapits/atmain.c acpica-unix2-20130626-aapi + (long int) test_num, AtTestCase[test_case].TestsNum); return (AtRetBadParam); } - -diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c ---- acpica-unix2-20130626/tests/aapits/atnamespace.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atnamespace.c 2013-07-25 13:24:15.366466707 -0600 -@@ -2535,7 +2535,8 @@ + +diff --git a/tests/aapits/atnamespace.c b/tests/aapits/atnamespace.c +index 06dd66d..9e0dcc1 100644 +--- a/tests/aapits/atnamespace.c ++++ b/tests/aapits/atnamespace.c +@@ -2535,7 +2535,8 @@ AtGetObjectInfoTypeCommon( #else printf ("API Error: Address of %s (0x%llX) != (0x%llX)\n", PathNames[2 * i + 1], @@ -158,7 +160,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 #endif #else printf ("API Error: Address of %s (0x%X) != (0x%X)\n", -@@ -2908,7 +2909,8 @@ +@@ -2908,7 +2909,8 @@ AtGetNextObjectTypeCommon( TestErrors++; printf ("AtGetNextObjectTypeCommon: different numbers of entities" "in TypesNames (%d) and LevelTypes0000 (%d)\n", @@ -168,7 +170,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 return (AE_ERROR); } -@@ -4192,7 +4194,9 @@ +@@ -4192,7 +4194,9 @@ AtCheckHandlePathMapping( Pathname, Obj.Integer.Value, Value); #else printf ("API Error: Value of %s is 0x%llx instead of expected 0x%llx\n", @@ -179,7 +181,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 #endif Status = AE_ERROR; } -@@ -5199,7 +5203,7 @@ +@@ -5199,7 +5203,7 @@ AtGetNameExceptionTest( { AapiErrors++; printf ("API Error: AcpiOsAllocate(%d) returned NULL\n", @@ -188,10 +190,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atnamespace.c acpica-unix2-20130626 return (AE_ERROR); } } -diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c ---- acpica-unix2-20130626/tests/aapits/atosxfctrl.c 2013-01-17 12:48:28.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atosxfctrl.c 2013-07-25 13:30:00.375492751 -0600 -@@ -737,13 +737,15 @@ +diff --git a/tests/aapits/atosxfctrl.c b/tests/aapits/atosxfctrl.c +index fe8b562..76f5310 100644 +--- a/tests/aapits/atosxfctrl.c ++++ b/tests/aapits/atosxfctrl.c +@@ -737,13 +737,15 @@ ACPI_OSXF_EMUL_REG #if ACPI_MACHINE_WIDTH == 64 #ifdef _MSC_VER printf("OsxfCtrlFingReg: unexpected Width %d of Reg 0x%I64x\n", @@ -208,7 +211,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- return (NULL); } -@@ -764,15 +766,19 @@ +@@ -764,15 +766,19 @@ ACPI_OSXF_EMUL_REG #ifdef _MSC_VER printf("OsxfCtrlFingReg: intersection Regs (0x%I64x: 0x%x)" " and (0x%I64x: 0x%x)\n", @@ -229,7 +232,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- return (NULL); } } -@@ -786,13 +792,15 @@ +@@ -786,13 +792,15 @@ ACPI_OSXF_EMUL_REG #if ACPI_MACHINE_WIDTH == 64 #ifdef _MSC_VER printf("OsxfCtrlFingReg: no memory for Reg (0x%I64x: 0x%x)\n", @@ -246,7 +249,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- return (NULL); } Reg->Type = Type; -@@ -932,14 +940,19 @@ +@@ -932,14 +940,19 @@ OsxfCtrlRegService(UINT32 ServiceFlag) #if ACPI_MACHINE_WIDTH == 64 #ifdef _MSC_VER printf("%.2u (%s Address 0x%I64x: Width %.2u) r/w counts: %u/%u\n", @@ -267,10 +270,11 @@ diff -urN acpica-unix2-20130626/tests/aapits/atosxfctrl.c acpica-unix2-20130626- Reg = Reg->Next; i++; } -diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626-aapits/tests/aapits/atresource.c ---- acpica-unix2-20130626/tests/aapits/atresource.c 2013-01-17 12:48:29.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/atresource.c 2013-07-25 13:25:49.423565947 -0600 -@@ -174,7 +174,7 @@ +diff --git a/tests/aapits/atresource.c b/tests/aapits/atresource.c +index b13dc67..d0570f8 100644 +--- a/tests/aapits/atresource.c ++++ b/tests/aapits/atresource.c +@@ -174,7 +174,7 @@ AtRsrcTest0000(void) AapiErrors++; printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," " expected %d\n", @@ -279,7 +283,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- return (AE_ERROR); } -@@ -490,7 +490,7 @@ +@@ -490,7 +490,7 @@ AtRsrcTest0005(void) AapiErrors++; printf ("API Error: AcpiGetCurrentResources(%s) returned Length %d," " expected %d\n", @@ -288,7 +292,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- return (AE_ERROR); } -@@ -689,7 +689,7 @@ +@@ -689,7 +689,7 @@ AtRsrcTest0007(void) AapiErrors++; printf ("Api Error: Resource->Length (%d) != %d\n", CurrentResource->Length, @@ -297,7 +301,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- } if (CurrentResource->Data.Irq.Triggering != 0) /* Level-Triggered */ -@@ -981,7 +981,7 @@ +@@ -981,7 +981,7 @@ AtRsrcTest0012(void) AapiErrors++; printf ("API Error: AcpiGetPossibleResources(%s) returned Length %d," " expected %d\n", @@ -306,7 +310,7 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- return (AE_ERROR); } -@@ -1923,7 +1923,7 @@ +@@ -1923,7 +1923,7 @@ AtRsrcTest0026(void) AapiErrors++; printf ("API Error: AcpiGetIrqRoutingTable(%s) returned Length %d," " expected %d\n", @@ -314,16 +318,4 @@ diff -urN acpica-unix2-20130626/tests/aapits/atresource.c acpica-unix2-20130626- + Pathname, (int) OutBuffer.Length, 0xA48); return (AE_ERROR); } - -diff -urN acpica-unix2-20130626/tests/aapits/Makefile acpica-unix2-20130626-aapits/tests/aapits/Makefile ---- acpica-unix2-20130626/tests/aapits/Makefile 2013-01-17 12:48:29.000000000 -0700 -+++ acpica-unix2-20130626-aapits/tests/aapits/Makefile 2013-07-25 15:17:09.309236422 -0600 -@@ -199,7 +199,7 @@ - CFLAGS+= -Wall -g -D_LINUX -DNDEBUG -D_CONSOLE -DACPI_APITS -DACPI_EXEC_APP -D_MULTI_THREADED -Wstrict-prototypes -I../../source/include - - --acpiexec : $(patsubst %.c,%.o, $(SRCS)) -+$(PROG) : $(patsubst %.c,%.o, $(SRCS)) - $(CC) $(LDFLAGS) $(patsubst %.c,%.o, $(SRCS)) -o $(PROG) - CLEANFILES= $(PROG) diff --git a/SOURCES/aapits-makefile.patch b/SOURCES/aapits-makefile.patch deleted file mode 100644 index cfba797..0000000 --- a/SOURCES/aapits-makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Naur acpica-unix2-20140724.orig/tests/aapits/Makefile acpica-unix2-20140724/tests/aapits/Makefile ---- acpica-unix2-20140724.orig/tests/aapits/Makefile 2014-07-28 14:32:23.884529332 -0600 -+++ acpica-unix2-20140724/tests/aapits/Makefile 2014-07-28 14:50:27.367982860 -0600 -@@ -16,6 +16,7 @@ - atosxfwrap.c \ - osunixxf.c \ - ../../source/common/ahids.c \ -+ ../../source/common/ahuuids.c \ - ../../source/common/cmfsize.c \ - ../../source/common/getopt.c \ - ../../source/components/hardware/hwtimer.c \ -@@ -174,6 +175,7 @@ - ../../source/components/utilities/utexcep.c \ - ../../source/components/utilities/utfileio.c \ - ../../source/components/utilities/utglobal.c \ -+ ../../source/components/utilities/uthex.c \ - ../../source/components/utilities/utids.c \ - ../../source/components/utilities/utinit.c \ - ../../source/components/utilities/utlock.c \ -@@ -189,6 +191,7 @@ - ../../source/components/utilities/utstate.c \ - ../../source/components/utilities/utstring.c \ - ../../source/components/utilities/uttrack.c \ -+ ../../source/components/utilities/utuuid.c \ - ../../source/components/utilities/utxface.c \ - ../../source/components/utilities/utxferror.c \ - ../../source/components/utilities/utxfinit.c \ diff --git a/SOURCES/acpidump.1 b/SOURCES/acpidump.1 index a3ab061..1228f4d 100644 --- a/SOURCES/acpidump.1 +++ b/SOURCES/acpidump.1 @@ -47,12 +47,12 @@ parameters can be used. .PP .TP .B \-b -Dump tables in binary format (versus the default human-readable form) +Dump tables in binary format (versus the default human-readable form). .PP .TP .B \-h | \-? -Display this help message +Display this help message. .PP .TP @@ -63,6 +63,11 @@ to examine the contents of the ACPI tables. .PP .TP +.B \-r
+Dump tables from specified RSDP. + +.PP +.TP .B \-s Print table summaries only. @@ -76,6 +81,7 @@ Print the version of this utility. .B \-z Verbose mode. +.SH TABLE OPTIONS .PP .TP .B \-a
@@ -85,6 +91,13 @@ for the various tables). .PP .TP +.B \-c +Turn on/off customized table dumping. If turned on, tables are dumped +from /sys/firmware/acpi/tables. If turned off, tables are dumped +from /dev/mem. The default is on. + +.PP +.TP .B \-f Get a table from a binary file (see the .B \-b @@ -95,6 +108,16 @@ option). .B \-n Get a table via it's name or signature (e.g., MADT or SSDT). +.PP +.TP +.B \-x +Do not use but dump XSDT. + +.PP +.TP +.B \-x \-x +Do not use or dump XSDT. + .SH SEE ALSO .B acpixtract(1) diff --git a/SOURCES/asllookup-miscompare.patch b/SOURCES/asllookup-miscompare.patch index 0067a22..fe55c9c 100644 --- a/SOURCES/asllookup-miscompare.patch +++ b/SOURCES/asllookup-miscompare.patch @@ -1,7 +1,8 @@ -diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-20140214-patch/source/compiler/asllookup.c ---- acpica-unix2-20140214/source/compiler/asllookup.c 2014-02-14 16:23:33.000000000 -0700 -+++ acpica-unix2-20140214-patch/source/compiler/asllookup.c 2014-02-27 11:50:52.168659866 -0700 -@@ -119,6 +119,7 @@ +diff --git a/source/compiler/asllookup.c b/source/compiler/asllookup.c +index 6114822..2da9f71 100644 +--- a/source/compiler/asllookup.c ++++ b/source/compiler/asllookup.c +@@ -119,6 +119,7 @@ LkIsObjectUsed ( { ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle); ACPI_NAMESPACE_NODE *Next; @@ -9,7 +10,7 @@ diff -urN acpica-unix2-20140214/source/compiler/asllookup.c acpica-unix2-2014021 /* Referenced flag is set during the namespace xref */ -@@ -162,8 +163,9 @@ +@@ -162,8 +163,9 @@ LkIsObjectUsed ( * Issue a remark even if it is a reserved name (starts * with an underscore). */ diff --git a/SOURCES/aslts-makefile-def.patch b/SOURCES/aslts-makefile-def.patch deleted file mode 100644 index d535b96..0000000 --- a/SOURCES/aslts-makefile-def.patch +++ /dev/null @@ -1,35 +0,0 @@ -This is a temporary workaround for some of the ASLTS tests failing to compile -due to acpica commit 73ddb40da6c4afdfe587 as described in... - - https://bugs.acpica.org/show_bug.cgi?id=1112 - -With regard to stdout and stderr, upstream wants to hide all errors reported by -the iASL compiler when the tests are compiled. And instead indicate their -occurrance through the errors encountered when the tests are run. The iASL -errors are written to tests/aslts/tmp/aml/-/error.txt. But that -only works if one is running interactively and can access the tmp directory. - -So this patch writes to stderr the iASL compiler error info that could normally -be found in compile.txt (also located in the tmp directory). It is not the -detailed error info, but it shows the number of errors encountered for the -named test. - -diff --git a/tests/aslts/Makefile.def b/tests/aslts/Makefile.def ---- a/tests/aslts/Makefile.def -+++ b/tests/aslts/Makefile.def -@@ -72,7 +72,14 @@ - "$(ASL)" $$CUR_ASLFLAGS "$(COMMON_ASL_FLAGS)" $(ADD_ASLFLAGS) $$j.asl >> $(COMPILER_LOG) 2>> $(COMPILER_ERROR_LOG); \ - ret=$$?; \ - echo "" >> $(COMPILER_LOG); \ -- if [ $$ret != 0 ]; then rval=1; echo "**** Unexpected iASL failure!"; exit 1; fi; \ -+ if [ $$ret != 0 ]; then \ -+ rval=1; \ -+ echo "---- Test path: $$dd" >> /dev/stderr; \ -+ echo "---- Test type: $$CUR_AMLDIR (Flags $(COMMON_ASL_FLAGS) $$CUR_ASLFLAGS $(ADD_ASLFLAGS))" >> /dev/stderr; \ -+ tail -2 $(COMPILER_LOG) >> /dev/stderr; \ -+ echo "**** Unexpected iASL failure!" >> /dev/stderr; \ -+ exit 1; \ -+ fi; \ - done; \ - if [ $$ret != 0 ]; then break; fi; \ - for j in ${AMLMOD}; do \ diff --git a/SOURCES/badcode.asl.result b/SOURCES/badcode.asl.result index a322adf..27a4125 100644 --- a/SOURCES/badcode.asl.result +++ b/SOURCES/badcode.asl.result @@ -70,25 +70,25 @@ Warning 3122 - ^ Called method may not always return a val badcode.asl 126: Method (MTH5) {Store (MTH4(), Local0)} Error 6080 - Called method returns no value ^ -badcode.asl 132: Name (_HID, "*PNP0C0A") +badcode.asl 132: Name (_HID, "*PNP0C0A") // Illegal leading asterisk Error 6061 - Invalid leading asterisk ^ (*PNP0C0A) -badcode.asl 136: Name (_HID, "PNP") +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") +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") +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") +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, "") +badcode.asl 152: Name (_HID, "") // Illegal Null HID Error 6091 - ^ Invalid zero-length (null) string -badcode.asl 153: Name (_CID, "") +badcode.asl 153: Name (_CID, "") // Illegal Null CID Error 6091 - ^ Invalid zero-length (null) string badcode.asl 158: Name (_PRW, 4) @@ -142,49 +142,49 @@ Error 6019 - ^ Dependent function macros can badcode.asl 225: }) Error 6070 - ^ Missing EndDependentFn() macro in dependent resource list -badcode.asl 242: 0x00002000, +badcode.asl 242: 0x00002000, // Length Error 6049 - ^ Length is larger than Min/Max window -badcode.asl 247: 0x00001001, +badcode.asl 247: 0x00001001, // Range Minimum Error 6001 - ^ Must be a multiple of alignment/granularity value -badcode.asl 248: 0x00002002, +badcode.asl 248: 0x00002002, // Range Maximum Error 6001 - ^ Must be a multiple of alignment/granularity value -badcode.asl 255: 0xFFFF, +badcode.asl 255: 0xFFFF, // Address Warning 3060 - ^ Maximum 10-bit ISA address (0x3FF) -badcode.asl 264: 0x05 +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, +badcode.asl 279: 0x0200, // Range Minimum Error 6051 - ^ Address Min is greater than Address Max -badcode.asl 291: 0x00001002, +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, +badcode.asl 305: 0x0000000000000B02, // Range Minimum Error 6001 - ^ Must be a multiple of alignment/granularity value -badcode.asl 315: 0x00000000002FFFFE, +badcode.asl 315: 0x00000000002FFFFE, // Range Maximum Error 6001 - ^ Must be a multiple of alignment/granularity value (-1) -badcode.asl 326: 0x00000000, +badcode.asl 326: 0x00000000, // Length Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags -badcode.asl 335: 0x00000100, +badcode.asl 335: 0x00000100, // Length Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags -badcode.asl 344: 0x00000200, +badcode.asl 344: 0x00000200, // Length Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags -badcode.asl 349: 0x0000000F, +badcode.asl 349: 0x0000000F, // Granularity Error 6047 - ^ Granularity must be zero for fixed Min/Max badcode.asl 358: DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange, @@ -237,12 +237,12 @@ Remark 2089 - Object is not referenced ^ (Name is with Intel ACPI Component Architecture -ASL Optimizing Compiler version VVVVVVVV-YYYY [XXXXXXXXXXX] -Copyright (c) 2000 - 2014 Intel Corporation +ASL+ Optimizing Compiler version VVVVVVVV-YYYY +Copyright (c) 2000 - 2015 Intel Corporation Ignoring all errors, forcing AML file generation -ASL Input: badcode.asl - 401 lines, 6935 bytes, 79 keywords +ASL Input: badcode.asl - 402 lines, 11480 bytes, 79 keywords AML Output: badcode.aml - 1184 bytes, 60 named objects, 19 executable opcodes -Compilation complete. 46 Errors, 22 Warnings, 11 Remarks, 16 Optimizations +Compilation complete. 46 Errors, 22 Warnings, 11 Remarks, 16 Optimizations, 1 Constants Folded diff --git a/SOURCES/cdacc71af1-acpica.patch b/SOURCES/cdacc71af1-acpica.patch new file mode 100644 index 0000000..1ce6b55 --- /dev/null +++ b/SOURCES/cdacc71af1-acpica.patch @@ -0,0 +1,26 @@ +commit cdacc71af14045c08d1b357981ba36ae722dd47e +Author: Robert Moore +AuthorDate: Fri Jun 19 09:43:28 2015 -0700 +Commit: Robert Moore +CommitDate: Fri Jun 19 09:43:28 2015 -0700 + + iASL: Add a status check after an fopen(). + + In FlCheckForAscii. ACPICA BZ 1170. + +diff --git a/source/compiler/aslascii.c b/source/compiler/aslascii.c +index 7ff1c4a..f164e98 100644 +--- a/source/compiler/aslascii.c ++++ b/source/compiler/aslascii.c +@@ -177,6 +177,11 @@ FlCheckForAscii ( + /* Open file in text mode so file offset is always accurate */ + + Handle = fopen (Filename, "rb"); ++ if (!Handle) ++ { ++ perror ("Could not open input file"); ++ return (AE_ERROR); ++ } + + Status.Line = 1; + Status.Offset = 0; diff --git a/SOURCES/debian-big_endian.patch b/SOURCES/debian-big_endian.patch index 4726e0b..bfa0b66 100644 --- a/SOURCES/debian-big_endian.patch +++ b/SOURCES/debian-big_endian.patch @@ -1,7 +1,8 @@ -diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslcodegen.c ---- acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian 2014-04-24 11:48:59.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslcodegen.c 2014-06-06 20:43:34.711825238 -0400 -@@ -237,16 +237,12 @@ CgWriteAmlOpcode ( +diff --git a/source/compiler/aslcodegen.c b/source/compiler/aslcodegen.c +index dc8b7d5..09c2910 100644 +--- a/source/compiler/aslcodegen.c ++++ b/source/compiler/aslcodegen.c +@@ -249,16 +249,12 @@ CgWriteAmlOpcode ( ACPI_PARSE_OBJECT *Op) { UINT8 PkgLenFirstByte; @@ -24,7 +25,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* We expect some DEFAULT_ARGs, just ignore them */ -@@ -269,51 +265,52 @@ CgWriteAmlOpcode ( +@@ -281,51 +277,52 @@ CgWriteAmlOpcode ( /* Special opcodes for within a field definition */ @@ -88,7 +89,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac break; } -@@ -324,8 +322,8 @@ CgWriteAmlOpcode ( +@@ -336,8 +333,8 @@ CgWriteAmlOpcode ( if (Op->Asl.AmlPkgLenBytes == 1) { /* Simplest case -- no bytes to follow, just write the count */ @@ -99,7 +100,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac } else if (Op->Asl.AmlPkgLenBytes != 0) { -@@ -335,7 +333,7 @@ CgWriteAmlOpcode ( +@@ -347,7 +344,7 @@ CgWriteAmlOpcode ( */ PkgLenFirstByte = (UINT8) (((UINT32) (Op->Asl.AmlPkgLenBytes - 1) << 6) | @@ -108,7 +109,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac CgLocalWriteAmlData (Op, &PkgLenFirstByte, 1); -@@ -343,37 +341,44 @@ CgWriteAmlOpcode ( +@@ -355,37 +352,44 @@ CgWriteAmlOpcode ( * Shift the length over by the 4 bits we just stuffed * in the first byte */ @@ -166,7 +167,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac break; case AML_STRING_OP: -@@ -407,6 +412,7 @@ CgWriteTableHeader ( +@@ -419,6 +423,7 @@ CgWriteTableHeader ( ACPI_PARSE_OBJECT *Op) { ACPI_PARSE_OBJECT *Child; @@ -174,7 +175,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* AML filename */ -@@ -443,7 +449,7 @@ CgWriteTableHeader ( +@@ -455,7 +460,7 @@ CgWriteTableHeader ( /* OEM Revision */ Child = Child->Asl.Next; @@ -183,12 +184,12 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* Compiler ID */ -@@ -451,11 +457,12 @@ CgWriteTableHeader ( +@@ -463,11 +468,12 @@ CgWriteTableHeader ( /* Compiler version */ -- TableHeader.AslCompilerRevision = ASL_REVISION; -+ DWord = ASL_REVISION; +- TableHeader.AslCompilerRevision = ACPI_CA_VERSION; ++ DWord = ACPI_CA_VERSION; + ACPI_MOVE_32_TO_32(&TableHeader.AslCompilerRevision, &DWord); /* Table length. Checksum zero for now, will rewrite later */ @@ -198,7 +199,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac TableHeader.Checksum = 0; CgLocalWriteAmlData (Op, &TableHeader, sizeof (ACPI_TABLE_HEADER)); -@@ -519,7 +526,10 @@ CgWriteNode ( +@@ -531,7 +537,10 @@ CgWriteNode ( ACPI_PARSE_OBJECT *Op) { ASL_RESOURCE_NODE *Rnode; @@ -210,7 +211,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac /* Always check for DEFAULT_ARG and other "Noop" nodes */ /* TBD: this may not be the best place for this check */ -@@ -537,13 +547,24 @@ CgWriteNode ( +@@ -549,13 +558,24 @@ CgWriteNode ( switch (Op->Asl.AmlOpcode) { case AML_RAW_DATA_BYTE: @@ -238,10 +239,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslcodegen.c.debian-big_endian ac case AML_RAW_DATA_BUFFER: -diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslopcodes.c ---- acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian 2014-04-24 11:48:59.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslopcodes.c 2014-06-06 20:43:34.711825238 -0400 -@@ -478,6 +478,7 @@ OpcDoUnicode ( +diff --git a/source/compiler/aslopcodes.c b/source/compiler/aslopcodes.c +index fa3d1fc..916145a 100644 +--- a/source/compiler/aslopcodes.c ++++ b/source/compiler/aslopcodes.c +@@ -531,6 +531,7 @@ OpcDoUnicode ( UINT32 i; UINT8 *AsciiString; UINT16 *UnicodeString; @@ -249,7 +251,7 @@ diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian ac ACPI_PARSE_OBJECT *BufferLengthOp; -@@ -504,7 +505,8 @@ OpcDoUnicode ( +@@ -557,7 +558,8 @@ OpcDoUnicode ( for (i = 0; i < Count; i++) { @@ -259,9 +261,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslopcodes.c.debian-big_endian ac } /* -diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype1.c ---- acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype1.c 2014-06-06 20:43:34.711825238 -0400 +diff --git a/source/compiler/aslrestype1.c b/source/compiler/aslrestype1.c +index 92c8730..68a1b76 100644 +--- a/source/compiler/aslrestype1.c ++++ b/source/compiler/aslrestype1.c @@ -142,6 +142,11 @@ RsDoMemory24Descriptor ( ACPI_PARSE_OBJECT *MaxOp = NULL; ACPI_PARSE_OBJECT *LengthOp = NULL; @@ -458,9 +461,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1.c.debian-big_endian a RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH, CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength)); break; -diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype1i.c ---- acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype1i.c 2014-06-06 20:43:34.711825238 -0400 +diff --git a/source/compiler/aslrestype1i.c b/source/compiler/aslrestype1i.c +index 7acdbbc..d24fe5a 100644 +--- a/source/compiler/aslrestype1i.c ++++ b/source/compiler/aslrestype1i.c @@ -197,6 +197,8 @@ RsDoFixedDmaDescriptor ( AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; @@ -597,9 +601,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype1i.c.debian-big_endian + ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask); return (Rnode); } -diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2.c ---- acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype2.c 2014-06-06 20:43:34.711825238 -0400 +diff --git a/source/compiler/aslrestype2.c b/source/compiler/aslrestype2.c +index 45bbe23..3894f09 100644 +--- a/source/compiler/aslrestype2.c ++++ b/source/compiler/aslrestype2.c @@ -75,6 +75,7 @@ RsDoGeneralRegisterDescriptor ( AML_RESOURCE *Descriptor; ACPI_PARSE_OBJECT *InitializerOp; @@ -695,9 +700,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2.c.debian-big_endian a /* Point to end-of-descriptor for vendor data */ -diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2d.c ---- acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype2d.c 2014-06-06 20:43:34.721825238 -0400 +diff --git a/source/compiler/aslrestype2d.c b/source/compiler/aslrestype2d.c +index c814f8c..75984b5 100644 +--- a/source/compiler/aslrestype2d.c ++++ b/source/compiler/aslrestype2d.c @@ -79,7 +79,13 @@ RsDoDwordIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1053,9 +1059,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2d.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) + OptionIndex + StringLength; return (Rnode); -diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2e.c ---- acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype2e.c 2014-06-06 20:43:34.721825238 -0400 +diff --git a/source/compiler/aslrestype2e.c b/source/compiler/aslrestype2e.c +index 07b7255..76ead49 100644 +--- a/source/compiler/aslrestype2e.c ++++ b/source/compiler/aslrestype2e.c @@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor ( ACPI_PARSE_OBJECT *GranOp = NULL; ASL_RESOURCE_NODE *Rnode; @@ -1371,10 +1378,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2e.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) + StringLength; return (Rnode); - } -diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2q.c ---- acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype2q.c 2014-06-06 20:43:34.721825238 -0400 +diff --git a/source/compiler/aslrestype2q.c b/source/compiler/aslrestype2q.c +index 6db3815..27b6c8f 100644 +--- a/source/compiler/aslrestype2q.c ++++ b/source/compiler/aslrestype2q.c @@ -80,7 +80,13 @@ RsDoQwordIoDescriptor ( ASL_RESOURCE_NODE *Rnode; UINT8 *OptionalFields; @@ -1713,9 +1720,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2q.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) + OptionIndex + StringLength; return (Rnode); -diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2s.c ---- acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype2s.c 2014-06-06 20:43:34.721825238 -0400 +diff --git a/source/compiler/aslrestype2s.c b/source/compiler/aslrestype2s.c +index 9fe03b7..83fdab9 100644 +--- a/source/compiler/aslrestype2s.c ++++ b/source/compiler/aslrestype2s.c @@ -290,6 +290,9 @@ RsDoGpioIntDescriptor ( UINT16 VendorLength; UINT16 InterruptLength; @@ -2030,9 +2038,10 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2s.c.debian-big_endian MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource); return (Rnode); } -diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian acpica-unix2-20140424/source/compiler/aslrestype2w.c ---- acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian 2014-04-24 11:49:00.000000000 -0400 -+++ acpica-unix2-20140424/source/compiler/aslrestype2w.c 2014-06-06 20:43:34.721825238 -0400 +diff --git a/source/compiler/aslrestype2w.c b/source/compiler/aslrestype2w.c +index 3b4cc10..851a590 100644 +--- a/source/compiler/aslrestype2w.c ++++ b/source/compiler/aslrestype2w.c @@ -81,6 +81,12 @@ RsDoWordIoDescriptor ( UINT8 *OptionalFields; UINT16 StringLength = 0; @@ -2376,10 +2385,11 @@ diff -up acpica-unix2-20140424/source/compiler/aslrestype2w.c.debian-big_endian Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) + OptionIndex + StringLength; return (Rnode); -diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpica-unix2-20140424/source/include/acmacros.h ---- acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian 2014-04-24 11:49:05.000000000 -0400 -+++ acpica-unix2-20140424/source/include/acmacros.h 2014-06-06 20:43:34.721825238 -0400 -@@ -111,7 +111,8 @@ +diff --git a/source/include/acmacros.h b/source/include/acmacros.h +index 35d53f6..83ef6fd 100644 +--- a/source/include/acmacros.h ++++ b/source/include/acmacros.h +@@ -100,7 +100,8 @@ /* 32-bit source, 16/32/64 destination */ @@ -2389,7 +2399,7 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic #define ACPI_MOVE_32_TO_32(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[3];\ (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[2];\ -@@ -126,9 +127,13 @@ +@@ -115,9 +116,13 @@ /* 64-bit source, 16/32/64 destination */ @@ -2405,7 +2415,7 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic #define ACPI_MOVE_64_TO_64(d, s) {(( UINT8 *)(void *)(d))[0] = ((UINT8 *)(void *)(s))[7];\ (( UINT8 *)(void *)(d))[1] = ((UINT8 *)(void *)(s))[6];\ -@@ -155,7 +160,9 @@ +@@ -144,7 +149,9 @@ /* 32-bit source, 16/32/64 destination */ @@ -2416,9 +2426,10 @@ diff -up acpica-unix2-20140424/source/include/acmacros.h.debian-big_endian acpic #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) -diff -up acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endian acpica-unix2-20140424/source/include/platform/aclinux.h ---- acpica-unix2-20140424/source/include/platform/aclinux.h.debian-big_endian 2014-04-24 11:49:06.000000000 -0400 -+++ acpica-unix2-20140424/source/include/platform/aclinux.h 2014-06-06 20:44:28.781825238 -0400 +diff --git a/source/include/platform/aclinux.h b/source/include/platform/aclinux.h +index 3a91691..aa89499 100644 +--- a/source/include/platform/aclinux.h ++++ b/source/include/platform/aclinux.h @@ -167,6 +167,7 @@ #include #include diff --git a/SOURCES/debian-unaligned.patch b/SOURCES/debian-unaligned.patch index 3580b81..f61de06 100644 --- a/SOURCES/debian-unaligned.patch +++ b/SOURCES/debian-unaligned.patch @@ -16,10 +16,10 @@ Signed-off-by: Paolo Bonzini 3 file modificati, 32 inserzioni(+), 21 rimozioni(-) diff --git a/source/compiler/asltree.c b/source/compiler/asltree.c -index ebf87f3..fd859d7 100644 +index c76720a..551a4c8 100644 --- a/source/compiler/asltree.c +++ b/source/compiler/asltree.c -@@ -589,28 +589,31 @@ TrCreateValuedLeafNode ( +@@ -862,28 +862,31 @@ TrCreateValuedLeafNode ( "\nCreateValuedLeafNode Ln/Col %u/%u NewNode %p Op %s Value %8.8X%8.8X ", Op->Asl.LineNumber, Op->Asl.Column, Op, UtGetOpName(ParseOpcode), ACPI_FORMAT_UINT64 (Value)); @@ -28,53 +28,54 @@ index ebf87f3..fd859d7 100644 switch (ParseOpcode) { case PARSEOP_STRING_LITERAL: - + - DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "STRING->%s", Op->Asl.Value.String); break; case PARSEOP_NAMESEG: - + - DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "NAMESEG->%s", Op->Asl.Value.String); break; case PARSEOP_NAMESTRING: - + - DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "NAMESTRING->%s", Op->Asl.Value.String); break; case PARSEOP_EISAID: - + - DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Value); + Op->Asl.Value.String = (ACPI_STRING) (ACPI_SIZE) Value; + DbgPrint (ASL_PARSE_OUTPUT, "EISAID->%s", Op->Asl.Value.String); break; case PARSEOP_METHOD: -@@ -620,11 +623,13 @@ TrCreateValuedLeafNode ( +@@ -893,12 +896,14 @@ TrCreateValuedLeafNode ( case PARSEOP_INTEGER: - + + Op->Asl.Value.Integer = Value; - DbgPrint (ASL_PARSE_OUTPUT, "INTEGER"); + DbgPrint (ASL_PARSE_OUTPUT, "INTEGER->%8.8X%8.8X", + ACPI_FORMAT_UINT64 (Value)); break; default: - + + Op->Asl.Value.Integer = Value; break; } diff --git a/source/components/executer/exoparg2.c b/source/components/executer/exoparg2.c -index e55f40c..ed5b1fd 100644 +index 419aa6d..bf1175d 100644 --- a/source/components/executer/exoparg2.c +++ b/source/components/executer/exoparg2.c -@@ -174,6 +176,8 @@ AcpiExOpcode_2A_2T_1R ( +@@ -172,6 +172,8 @@ AcpiExOpcode_2A_2T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc1 = NULL; ACPI_OPERAND_OBJECT *ReturnDesc2 = NULL; @@ -83,7 +84,7 @@ index e55f40c..ed5b1fd 100644 ACPI_STATUS Status; -@@ -207,8 +211,10 @@ AcpiExOpcode_2A_2T_1R ( +@@ -205,8 +207,10 @@ AcpiExOpcode_2A_2T_1R ( Status = AcpiUtDivide (Operand[0]->Integer.Value, Operand[1]->Integer.Value, @@ -96,7 +97,7 @@ index e55f40c..ed5b1fd 100644 if (ACPI_FAILURE (Status)) { goto Cleanup; -@@ -282,6 +285,7 @@ AcpiExOpcode_2A_1T_1R ( +@@ -280,6 +284,7 @@ AcpiExOpcode_2A_1T_1R ( ACPI_OPERAND_OBJECT **Operand = &WalkState->Operands[0]; ACPI_OPERAND_OBJECT *ReturnDesc = NULL; UINT64 Index; @@ -104,7 +105,7 @@ index e55f40c..ed5b1fd 100644 ACPI_STATUS Status = AE_OK; ACPI_SIZE Length = 0; -@@ -325,7 +333,8 @@ AcpiExOpcode_2A_1T_1R ( +@@ -323,7 +328,8 @@ AcpiExOpcode_2A_1T_1R ( Status = AcpiUtDivide (Operand[0]->Integer.Value, Operand[1]->Integer.Value, NULL, @@ -115,10 +116,10 @@ index e55f40c..ed5b1fd 100644 case AML_CONCAT_OP: /* Concatenate (Data1, Data2, Result) */ diff --git a/source/include/actypes.h b/source/include/actypes.h -index 07fb7d5..08bdf2f 100644 +index 0bee2a7..894f9c8 100644 --- a/source/include/actypes.h +++ b/source/include/actypes.h -@@ -143,6 +156,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64; +@@ -143,6 +143,19 @@ typedef COMPILER_DEPENDENT_INT64 INT64; */ #define ACPI_THREAD_ID UINT64 @@ -158,6 +159,3 @@ index 07fb7d5..08bdf2f 100644 /******************************************************************************* * --- -1.7.12.1 - diff --git a/SOURCES/grammar.asl.result b/SOURCES/grammar.asl.result index e7e454c..ee5b7f6 100644 --- a/SOURCES/grammar.asl.result +++ b/SOURCES/grammar.asl.result @@ -49,25 +49,25 @@ Remark 2098 - ^ Recursive method call (RCIV) grammar.asl 701: CreateField (\_SB_.SBUF, 148, 96, FLDV) Remark 2089 - Object is not referenced ^ (Name is within method [_INI]) -grammar.asl 715: MinFixed, +grammar.asl 715: MinFixed, // Range is notfixed Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) -grammar.asl 716: MaxFixed, +grammar.asl 716: MaxFixed, // Range is not fixed Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) -grammar.asl 717: SubDecode, +grammar.asl 717: SubDecode, // SubDecode Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) -grammar.asl 718: 0x0000, +grammar.asl 718: 0x0000, // Granularity Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) -grammar.asl 720: 0xfff2, +grammar.asl 720: 0xfff2, // Max Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) -grammar.asl 721: 0x0032, +grammar.asl 721: 0x0032, // Translation Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) -grammar.asl 722: 0x0002,,, +grammar.asl 722: 0x0002,,, // Range Length Remark 2089 - Object is not referenced ^ (Name is within method [_CRS]) grammar.asl 733: Method(_SRS) @@ -229,10 +229,10 @@ Warning 3046 - Invalid or unknown escape sequence ^ grammar.asl 6706: Device (BITI) Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope) -grammar.asl 6814: And (Local0, 1, Local0) +grammar.asl 6814: And (Local0, 1, Local0) // Local0 &= 1 Error 6066 - ^ Method local variable is not initialized (Local0) -grammar.asl 6900: Name (_HID, "*PNP0C0A") +grammar.asl 6900: Name (_HID, "*PNP0C0A") // Control Method Battey ID Error 6061 - Invalid leading asterisk ^ (*PNP0C0A) grammar.asl 6909: Device (IDX3) @@ -285,12 +285,12 @@ Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR i Intel ACPI Component Architecture -ASL Optimizing Compiler version VVVVVVVV-YYYY [XXXXXXXXXXX] -Copyright (c) 2000 - 2014 Intel Corporation +ASL+ Optimizing Compiler version VVVVVVVV-YYYY +Copyright (c) 2000 - 2015 Intel Corporation Ignoring all errors, forcing AML file generation -ASL Input: grammar.asl - 10281 lines, 228124 bytes, 4818 keywords +ASL Input: grammar.asl - 10282 lines, 322891 bytes, 4818 keywords AML Output: grammar.aml - 43476 bytes, 670 named objects, 4148 executable opcodes Compilation complete. 6 Errors, 64 Warnings, 25 Remarks, 1105 Optimizations diff --git a/SOURCES/name-miscompare.patch b/SOURCES/name-miscompare.patch index c7b136f..7d50e58 100644 --- a/SOURCES/name-miscompare.patch +++ b/SOURCES/name-miscompare.patch @@ -4,10 +4,11 @@ to be compared were being treated as 32-bit ints, and not strings. Hence, the characters were re-ordered incorrectly, mismatching the assumptions made in the remainder of the function. -diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-20130214-names/source/compiler/aslanalyze.c ---- acpica-unix2-20130214/source/compiler/aslanalyze.c 2013-03-21 17:31:25.803324990 -0600 -+++ acpica-unix2-20130214-names/source/compiler/aslanalyze.c 2013-03-21 17:43:45.357616802 -0600 -@@ -445,7 +445,7 @@ +diff --git a/source/compiler/aslanalyze.c b/source/compiler/aslanalyze.c +index 705cccf..dc8ae87 100644 +--- a/source/compiler/aslanalyze.c ++++ b/source/compiler/aslanalyze.c +@@ -445,7 +445,7 @@ ApCheckForGpeNameConflict ( /* Need a null-terminated string version of NameSeg */ @@ -16,7 +17,7 @@ diff -urN acpica-unix2-20130214/source/compiler/aslanalyze.c acpica-unix2-201302 Name[ACPI_NAME_SIZE] = 0; /* -@@ -472,7 +472,7 @@ +@@ -472,7 +472,7 @@ ApCheckForGpeNameConflict ( * We are now sure we have an _Lxx or _Exx. * Create the target name that would cause collision (Flip E/L) */ diff --git a/SOURCES/re-enable-big-endian.patch b/SOURCES/re-enable-big-endian.patch index d3a8601..64ea7c9 100644 --- a/SOURCES/re-enable-big-endian.patch +++ b/SOURCES/re-enable-big-endian.patch @@ -2,10 +2,11 @@ Re-enable use of these tools on big-endian machines. Al Stone -diff -Naur acpica-unix2-20140424/source/compiler/aslmain.c acpica-unix2-20140424-patch/source/compiler/aslmain.c ---- acpica-unix2-20140424/source/compiler/aslmain.c 2014-04-24 09:48:59.000000000 -0600 -+++ acpica-unix2-20140424-patch/source/compiler/aslmain.c 2014-05-22 12:55:47.634904320 -0600 -@@ -331,18 +331,6 @@ +diff --git a/source/compiler/aslmain.c b/source/compiler/aslmain.c +index 447b8cb..d8ada2c 100644 +--- a/source/compiler/aslmain.c ++++ b/source/compiler/aslmain.c +@@ -336,18 +336,6 @@ main ( int ReturnStatus = 0; diff --git a/SPECS/acpica-tools.spec b/SPECS/acpica-tools.spec index f1e0bf9..10c7124 100644 --- a/SPECS/acpica-tools.spec +++ b/SPECS/acpica-tools.spec @@ -1,6 +1,6 @@ Name: acpica-tools -Version: 20140926 -Release: 1%{?dist} +Version: 20150619 +Release: 3%{?dist} Summary: ACPICA tools for the development and debug of ACPI tables Group: Development/Languages @@ -28,9 +28,9 @@ Patch1: debian-unaligned.patch Patch2: name-miscompare.patch Patch3: aapits-linux.patch Patch4: asllookup-miscompare.patch -Patch5: aapits-makefile.patch -Patch6: re-enable-big-endian.patch -Patch7: aslts-makefile-def.patch +Patch5: re-enable-big-endian.patch +Patch6: cdacc71af1-acpica.patch +Patch7: 50bde98a82-acpica.patch BuildRequires: bison patchutils flex @@ -78,7 +78,6 @@ This version of the tools is being released under GPLv2 license. %prep %setup -q -n acpica-unix2-%{version} -%setup -q -T -D -a 1 -n acpica-unix2-%{version} gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch0 -p1 -b .debian-big_endian @@ -86,9 +85,9 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f - %patch2 -p1 -b .name-miscompare %patch3 -p1 -b .aapits-linux %patch4 -p1 -b .asllookup-miscompare -%patch5 -p1 -b .aapits-makefile -%patch6 -p1 -b .re-enable-big-endian -%patch7 -p1 -b .aslts-makefile-def +%patch5 -p1 -b .re-enable-big-endian +%patch6 -p1 -b .cdacc71af1-acpica +%patch7 -p1 -b .50bde98a82-acpica cp -p %{SOURCE2} README cp -p %{SOURCE3} iasl.1 @@ -105,9 +104,172 @@ cp -p %{SOURCE13} tests/run-misc-tests.sh chmod a+x tests/run-misc-tests.sh cp -p %{SOURCE14} COPYING -# spurious executable permissions on text files in upstream +# spurious write and executable permissions on a number of files in upstream chmod a-x changes.txt -chmod a-x source/compiler/new_table.txt +chmod a-x generate/lint/* +chmod a-x generate/unix/*/Makefile +chmod a-x generate/unix/Makefile* +chmod a-x generate/unix/readme.txt +chmod a-x Makefile +chmod a-x source/common/*.c +chmod a-x source/common/*.c.* +chmod a-x source/compiler/*.c +chmod a-x source/compiler/*.c.* +chmod a-x source/compiler/*.h +chmod a-x source/compiler/*.l +chmod a-x source/compiler/*.txt +chmod a-x source/compiler/*.y +chmod a-x source/components/*/*.c +chmod a-x source/components/*/*.c.* +chmod a-x source/include/*.h +chmod a-x source/include/*.h.* +chmod a-x source/include/platform/*.h +chmod a-x source/include/platform/*.h.* +chmod a-x source/os_specific/service_layers/*.c +chmod a-x source/tools/*/*.c +chmod a-x source/tools/*/*.h +chmod a-x tests/misc/*.asl +chmod g-w tests/misc/*.??l +chmod g-wx tests/templates/Makefile +chmod g-w tests/templates/templates.sh +chmod g-w tests/.cygwin +chmod g-w tests/.setup +chmod g-wx tests/aapits/AcpiApiTS.dsp +chmod g-wx tests/aapits/*.c +chmod g-wx tests/aapits/*.c.* +chmod g-wx tests/aapits/*.h +chmod g-wx tests/aapits/Makefile +chmod g-wx tests/aapits/README +chmod g-w,a-x tests/aapits/asl/*.asl +chmod g-w,a-x tests/aapits/asl/Makefile +chmod g-w,a-x tests/aapits/asl/README +chmod g-w tests/aapits/bin/* +chmod a-x tests/aapits/bin/0_WARNING.HTM +chmod a-x tests/aapits/bin/PWD +chmod a-x tests/aapits/bin/README +chmod g-w,a-x tests/aapits/spec/*.txt +chmod g-w,a-x tests/aapits/spec/*.xls +chmod g-w,a-x tests/aapits/spec/README +chmod g-w tests/aslts.sh +chmod g-wx tests/aslts/HOW_TO_INSTALL +chmod g-wx tests/aslts/HOW_TO_USE +chmod g-wx tests/aslts/Makefile +chmod g-wx tests/aslts/Makefile.def +chmod g-wx tests/aslts/Makefile.switch +chmod g-wx tests/aslts/NOTE +chmod g-wx tests/aslts/README +chmod g-wx tests/aslts/TESTS +chmod g-wx tests/aslts/adm/BugState/ALLBUGS +chmod g-wx tests/aslts/adm/BugState/ALLBUGS_DUP +chmod g-wx tests/aslts/adm/BugState/BugList_AML_KB_SUM0 +chmod g-wx tests/aslts/adm/BugState/BugList_AML_LB_SUM0 +chmod g-wx tests/aslts/adm/BugState/README +chmod g-wx tests/aslts/adm/BugState/ARX/*/BugList_AML_KB_SUM0 +chmod g-wx tests/aslts/adm/BugState/ARX/*/BugList_AML_LB_SUM0 +chmod g-w tests/aslts/bin/asltsdiffres +chmod g-w tests/aslts/bin/asltsrun +chmod g-w tests/aslts/bin/common +chmod g-w tests/aslts/bin/diffproc +chmod g-w tests/aslts/bin/Do +chmod g-w tests/aslts/bin/settings +chmod g-wx tests/aslts/bin/README +chmod g-wx tests/aslts/bin/bugstate/bdemosconc +chmod g-wx tests/aslts/bin/bugstate/bdemossum +chmod g-wx tests/aslts/bin/bugstate/bdemostabs +chmod g-wx tests/aslts/bin/bugstate/ERROR_OPCODES +chmod g-wx tests/aslts/bin/bugstate/HOW_TO_USE +chmod g-wx tests/aslts/bin/bugstate/parsebuglist +chmod g-wx tests/aslts/doc/CurrentState +chmod g-wx tests/aslts/doc/README +chmod g-wx tests/aslts/doc/docs/ConversionRules +chmod g-wx tests/aslts/doc/docs/ConversionTable +chmod g-wx tests/aslts/doc/docs/TestOfOperands +chmod g-wx tests/aslts/doc/plan/addition +chmod g-wx tests/aslts/doc/plan/OperatorsHaveNoSeparateTests +chmod g-wx tests/aslts/doc/plan/RemainingWork.htm +chmod g-wx tests/aslts/doc/StoreCopyTestPrototype/*.asl +chmod g-wx tests/aslts/src/Makefile +chmod g-wx tests/aslts/src/README +chmod g-wx tests/aslts/src/compilation/README +chmod g-wx tests/aslts/src/compilation/collection/README +chmod g-wx tests/aslts/src/compilation/collection/*.asl +chmod g-wx tests/aslts/src/runtime/Makefile +chmod g-wx tests/aslts/src/runtime/README +chmod g-wx tests/aslts/src/runtime/cntl/README +chmod g-wx tests/aslts/src/runtime/cntl/*.asl +chmod g-wx tests/aslts/src/runtime/collections/Makefile +chmod g-wx tests/aslts/src/runtime/collections/Makefile.install +chmod g-wx tests/aslts/src/runtime/collections/README +chmod g-wx tests/aslts/src/runtime/collections/bdemo/Makefile +chmod g-wx tests/aslts/src/runtime/collections/bdemo/README +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/Makefile +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/README +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/0277_ACTION_REQUIRED/Info.txt +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemo/Makefile +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/bdemof/Makefile +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/*/ssdt.c +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/bdemo/ACPICA/0062_ASL_RUNTIME/old_test/*.asl +chmod g-wx tests/aslts/src/runtime/collections/complex/Makefile +chmod g-wx tests/aslts/src/runtime/collections/complex/*/Makefile +chmod g-wx tests/aslts/src/runtime/collections/complex/*/tests/Makefile +chmod g-wx tests/aslts/src/runtime/collections/complex/*/tests/*/Makefile +chmod g-wx tests/aslts/src/runtime/collections/complex/README +chmod g-wx tests/aslts/src/runtime/collections/complex/*/tests/SPEC +chmod g-wx tests/aslts/src/runtime/collections/complex/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/complex/*/common/*.asl +chmod g-wx tests/aslts/src/runtime/collections/complex/*/tests/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/exceptions/Makefile +chmod g-wx tests/aslts/src/runtime/collections/exceptions/*/Makefile +chmod g-wx tests/aslts/src/runtime/collections/exceptions/*/*/Makefile +chmod g-wx tests/aslts/src/runtime/collections/exceptions/README +chmod g-wx tests/aslts/src/runtime/collections/exceptions/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/exceptions/*/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/FULL/FULL/MAIN.asl +chmod g-wx tests/aslts/src/runtime/collections/functional/Makefile +chmod g-wx tests/aslts/src/runtime/collections/functional/*/Makefile +chmod g-wx tests/aslts/src/runtime/collections/functional/README +chmod g-wx tests/aslts/src/runtime/collections/functional/*/SPEC +chmod g-wx tests/aslts/src/runtime/collections/functional/reference/TABLES +chmod g-wx tests/aslts/src/runtime/collections/functional/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/functional/control/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/Makefile +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/Makefile +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/README +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/SPEC +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/ToDo.txt +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/device/Info.txt +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/*_WARNING.HTM +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/AslCompiler.pdf +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/DSDT.AML +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/DSDT.dsl +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/DSDT.TAB +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/UTILITY/INSTALL.TXT +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/*.asl +chmod g-wx tests/aslts/src/runtime/collections/Identity2MS/abbu/*/*.asl +chmod g-wx tests/aslts/src/runtime/collections/IMPL/Makefile +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/Makefile +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/Makefile +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/Makefile +chmod g-wx tests/aslts/src/runtime/collections/IMPL/README +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/README +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/README +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/*.txt +chmod g-wx tests/aslts/src/runtime/collections/IMPL/ACPICA/tests/dynobj/*.asl +chmod g-wx tests/aslts/src/runtime/collections/mt/Makefile +chmod g-wx tests/aslts/src/runtime/collections/mt/mutex/Makefile +chmod g-wx tests/aslts/src/runtime/collections/mt/README +chmod g-wx tests/aslts/src/runtime/collections/mt/mutex/SPEC +chmod g-wx tests/aslts/src/runtime/collections/mt/mutex/*.asl +chmod g-wx tests/aslts/src/runtime/collections/service/Makefile +chmod g-wx tests/aslts/src/runtime/collections/service/condbranches/Makefile +chmod g-wx tests/aslts/src/runtime/collections/service/README +chmod g-wx tests/aslts/src/runtime/collections/service/condbranches/*.asl +chmod g-wx tests/aslts/src/runtime/collections/TMP/level/MAIN.asl +chmod g-wx tests/aslts/src/runtime/common/README +chmod g-wx tests/aslts/src/runtime/common/*.asl +chmod g-wx tests/aslts/src/runtime/common/conversion/*.asl +chmod g-wx tests/aslts/src/runtime/common/TCI/tcicmd.asl %build @@ -193,6 +355,21 @@ fi %changelog +* Wed Jul 15 2015 Dean Nelson - 20150619-3 +- Remove acpitests-unix-%{version} directory from the build because it was a + mistake that it was present and it complicated the fixing of the file + permissions done related to RHBZ 1211328's requested rebase. + +* Wed Jul 01 2015 Dean Nelson - 20150619-2 +- Fix the file permissions issue reported by rpmdiff related to RHBZ 1211328's + requested rebase. + +* Mon Jun 22 2015 Dean Nelson - 20150619-1 +- Update to the latest upstream version of acpica as requested by RHBZ 1211328. +- Refresh existing patches and add/delete ones to enable a clean build. +- Add missing return status checks after a few calls to AcpiDmDumpTable() and + one to fopen(). + * Mon Sep 29 2014 Dean Nelson - 20140926-1 - Update to the latest upstream version of acpica as requested by RHBZ 967963. - Refresh existing patches and add new ones to enable a clean build.