[PATCH 2/2][V2] fwts-test: sync up output with the latest ACPICA 20201008 release

Alex Hung alex.hung at canonical.com
Fri Oct 9 00:56:59 UTC 2020


On 2020-10-08 10:45 a.m., Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
> 
> The latest ACPICA is now annotating unknown UUIDs, so update the
> tests to reflect this change.
> 
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>  fwts-test/disassemble-0001/SSDT5.dsl.original   | 14 +++++++-------
>  fwts-test/syntaxcheck-0001/syntaxcheck-0001.log |  8 ++++----
>  2 files changed, 11 insertions(+), 11 deletions(-)
> 
> diff --git a/fwts-test/disassemble-0001/SSDT5.dsl.original b/fwts-test/disassemble-0001/SSDT5.dsl.original
> index 8d690221..1410955c 100644
> --- a/fwts-test/disassemble-0001/SSDT5.dsl.original
> +++ b/fwts-test/disassemble-0001/SSDT5.dsl.original
> @@ -1,11 +1,11 @@
>  /*
>   * Intel ACPI Component Architecture
> - * AML/ASL+ Disassembler version 20170531 (64-bit version)
> - * Copyright (c) 2000 - 2017 Intel Corporation
> + * AML/ASL+ Disassembler version 20200925 (64-bit version)
> + * Copyright (c) 2000 - 2020 Intel Corporation
>   * 
>   * Disassembling to non-symbolic legacy ASL operators
>   *
> - * Disassembly of /tmp/fwts_tmp_table_11901_SSDT_16.dsl, Thu Jun  1 11:20:40 2017
> + * Disassembly of /tmp/fwts_tmp_table_134815_SSDT_16.dsl, Thu Oct  8 17:07:40 2020
>   *
>   * Original Table Header:
>   *     Signature        "SSDT"
> @@ -64,7 +64,7 @@ DefinitionBlock ("", "SSDT", 1, "PmRef", "CpuPm", 0x00003000)
>                   0x00, 0x00, 0x00, 0x00                           // ....
>              })
>              Concatenate (STS0, TEMP, Local2)
> -            _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953"), REVS, SIZE, Local2)
> +            _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */, REVS, SIZE, Local2)
>          }
>  
>          Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities
> @@ -75,7 +75,7 @@ DefinitionBlock ("", "SSDT", 1, "PmRef", "CpuPm", 0x00003000)
>              CreateDWordField (Arg0, 0x04, IID1)
>              CreateDWordField (Arg0, 0x08, IID2)
>              CreateDWordField (Arg0, 0x0C, IID3)
> -            Name (UID0, ToUUID ("4077a616-290c-47be-9ebd-d87058713953"))
> +            Name (UID0, ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */)
>              CreateDWordField (UID0, 0x00, EID0)
>              CreateDWordField (UID0, 0x04, EID1)
>              CreateDWordField (UID0, 0x08, EID2)
> @@ -137,7 +137,7 @@ DefinitionBlock ("", "SSDT", 1, "PmRef", "CpuPm", 0x00003000)
>                   0x00, 0x00, 0x00, 0x00                           // ....
>              })
>              Concatenate (STS1, TEMP, Local2)
> -            _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953"), REVS, SIZE, Local2)
> +            _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */, REVS, SIZE, Local2)
>          }
>  
>          Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities
> @@ -148,7 +148,7 @@ DefinitionBlock ("", "SSDT", 1, "PmRef", "CpuPm", 0x00003000)
>              CreateDWordField (Arg0, 0x04, IID1)
>              CreateDWordField (Arg0, 0x08, IID2)
>              CreateDWordField (Arg0, 0x0C, IID3)
> -            Name (UID1, ToUUID ("4077a616-290c-47be-9ebd-d87058713953"))
> +            Name (UID1, ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */)
>              CreateDWordField (UID1, 0x00, EID0)
>              CreateDWordField (UID1, 0x04, EID1)
>              CreateDWordField (UID1, 0x08, EID2)
> diff --git a/fwts-test/syntaxcheck-0001/syntaxcheck-0001.log b/fwts-test/syntaxcheck-0001/syntaxcheck-0001.log
> index 8bc3e806..c9206380 100644
> --- a/fwts-test/syntaxcheck-0001/syntaxcheck-0001.log
> +++ b/fwts-test/syntaxcheck-0001/syntaxcheck-0001.log
> @@ -955,7 +955,7 @@ syntaxcheck     FAILED [LOW] AMLAsmASL_MSG_SERIALIZED_REQUIRED: Test 1,
>  syntaxcheck     Assembler remark in line 70
>  syntaxcheck     Line | AML source
>  syntaxcheck     ----------------------------------------------------------
> -syntaxcheck     00067|             _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953"), REVS, SIZE, Local2)
> +syntaxcheck     00067|             _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */, REVS, SIZE, Local2)
>  syntaxcheck     00068|         }
>  syntaxcheck     00069| 
>  syntaxcheck     00070|         Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities
> @@ -980,7 +980,7 @@ syntaxcheck     ----------------------------------------------------------
>  syntaxcheck     00075|             CreateDWordField (Arg0, 0x04, IID1)
>  syntaxcheck     00076|             CreateDWordField (Arg0, 0x08, IID2)
>  syntaxcheck     00077|             CreateDWordField (Arg0, 0x0C, IID3)
> -syntaxcheck     00078|             Name (UID0, ToUUID ("4077a616-290c-47be-9ebd-d87058713953"))
> +syntaxcheck     00078|             Name (UID0, ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */)
>  syntaxcheck          |                     ^
>  syntaxcheck          | Remark 2173: Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_PR.CPU0._OSC)
>  syntaxcheck     00079|             CreateDWordField (UID0, 0x00, EID0)
> @@ -1041,7 +1041,7 @@ syntaxcheck     FAILED [LOW] AMLAsmASL_MSG_SERIALIZED_REQUIRED: Test 1,
>  syntaxcheck     Assembler remark in line 143
>  syntaxcheck     Line | AML source
>  syntaxcheck     ----------------------------------------------------------
> -syntaxcheck     00140|             _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953"), REVS, SIZE, Local2)
> +syntaxcheck     00140|             _OSC (ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */, REVS, SIZE, Local2)
>  syntaxcheck     00141|         }
>  syntaxcheck     00142| 
>  syntaxcheck     00143|         Method (_OSC, 4, NotSerialized)  // _OSC: Operating System Capabilities
> @@ -1066,7 +1066,7 @@ syntaxcheck     ----------------------------------------------------------
>  syntaxcheck     00148|             CreateDWordField (Arg0, 0x04, IID1)
>  syntaxcheck     00149|             CreateDWordField (Arg0, 0x08, IID2)
>  syntaxcheck     00150|             CreateDWordField (Arg0, 0x0C, IID3)
> -syntaxcheck     00151|             Name (UID1, ToUUID ("4077a616-290c-47be-9ebd-d87058713953"))
> +syntaxcheck     00151|             Name (UID1, ToUUID ("4077a616-290c-47be-9ebd-d87058713953") /* Unknown UUID */)
>  syntaxcheck          |                     ^
>  syntaxcheck          | Remark 2173: Creation of named objects within a method is highly inefficient, use globals or method local variables instead (\_PR.CPU1._OSC)
>  syntaxcheck     00152|             CreateDWordField (UID1, 0x00, EID0)
> 


Acked-by: Alex Hung <alex.hung at canonical.com>



More information about the fwts-devel mailing list