ACK: [PATCH 01/13] fwts-test: update acpidump-0001

IvanHu ivan.hu at canonical.com
Wed Mar 5 08:16:34 UTC 2014


On 03/05/2014 04:28 AM, Colin King wrote:
> From: Colin Ian King <colin.king at canonical.com>
>
> fwts commits 389b59ceee21d567347cf1849aca2bbeb45b3ed7 and
> 5a8ce18059de2d1c5cdd25437c572949d6536b48 added table provenance
> and modified the output of sub-table information. This change
> sync's the tests to the acpidump output.
>
> Signed-off-by: Colin Ian King <colin.king at canonical.com>
> ---
>   fwts-test/acpidump-0001/acpidump-0001.log | 198 ++++++++++++++++--------------
>   1 file changed, 103 insertions(+), 95 deletions(-)
>
> diff --git a/fwts-test/acpidump-0001/acpidump-0001.log b/fwts-test/acpidump-0001/acpidump-0001.log
> index d0f25b3..01dc25b 100644
> --- a/fwts-test/acpidump-0001/acpidump-0001.log
> +++ b/fwts-test/acpidump-0001/acpidump-0001.log
> @@ -1,7 +1,7 @@
>   acpidump        acpidump: Dump ACPI tables.
>   acpidump        ----------------------------------------------------------
>   acpidump        Test 1 of 1: Dump ACPI tables.
> -acpidump        RSDP @ f7240 (36 bytes)
> +acpidump        RSDP @ f7240 (36 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Root System Description Pointer:
>   acpidump
> @@ -17,7 +17,7 @@ acpidump        [0x021 0033   3]                                 Reserved: 0x00
>   acpidump        [0x021 0033   3]                                 Reserved: 0x00 [1]
>   acpidump        [0x021 0033   3]                                 Reserved: 0x00 [2]
>   acpidump
> -acpidump        RSDT @ bf6d8794 (88 bytes)
> +acpidump        RSDT @ bf6d8794 (88 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Root System Description Table:
>   acpidump
> @@ -44,7 +44,7 @@ acpidump        [0x04c 0076   4]                            Entry 10 SSDT: 0xbf6
>   acpidump        [0x050 0080   4]                            Entry 11 SSDT: 0xbf6d8d6a
>   acpidump        [0x054 0084   4]                            Entry 12 SSDT: 0xbf6d8884
>   acpidump
> -acpidump        DSDT @ bf6d9b6a (24564 bytes)
> +acpidump        DSDT @ bf6d9b6a (24564 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Differentiated System Description Table:
>   acpidump
> @@ -59,7 +59,7 @@ acpidump        [0x01c 0028   4]                               Creator ID: INTL
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x20060608
>   acpidump        Contains 0x5fd0 bytes of AML byte code
>   acpidump
> -acpidump        FACS @ bf6e2fc0 (64 bytes)
> +acpidump        FACS @ bf6e2fc0 (64 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Firmware ACPI Control Structure:
>   acpidump
> @@ -73,7 +73,7 @@ acpidump        [0x018 0024   8]                          X Waking Vector: 0x000
>   acpidump        [0x020 0032   1]                                  Version: 0x01
>   acpidump        [0x024 0036   4]                               OSPM Flags: 0x00000000
>   acpidump
> -acpidump        FACP @ bf6dfb5e (116 bytes)
> +acpidump        FACP @ bf6dfb5e (116 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Fixed ACPI Description Table:
>   acpidump
> @@ -152,7 +152,7 @@ acpidump                            ACPI hardware is not implemented (V5): 0x0
>   acpidump                S0 power savings are equal or better than S3 (V5): 0x0
>   acpidump                                                         RESERVED: 0x000
>   acpidump
> -acpidump        APIC @ bf6dfcc6 (104 bytes)
> +acpidump        APIC @ bf6dfcc6 (104 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Multiple APIC Description Table:
>   acpidump
> @@ -168,54 +168,58 @@ acpidump        [0x020 0032   4]                         Creator Revision: 0x000
>   acpidump        [0x024 0036   4]                       Local APIC Address: 0xfee00000
>   acpidump        [0x028 0040   4]                                    Flags: 0x00000001
>   acpidump                                                      PCAT_COMPAT: 0x1
> -acpidump
>   acpidump        APIC Structure #1:
> -acpidump         Processor Local APIC:
> -acpidump        [0x002 0002   1]                              ACPI CPU ID: 0x00
> -acpidump        [0x003 0003   1]                                  APIC ID: 0x00
> -acpidump        [0x004 0004   4]                                    Flags: 0x00000001
> +acpidump        [0x02c 0044   1]                                     Type: 0x00 (Processor Local APIC)
> +acpidump        [0x02d 0045   1]                                   Length: 0x08
> +acpidump        [0x02e 0046   1]                              ACPI CPU ID: 0x00
> +acpidump        [0x02f 0047   1]                                  APIC ID: 0x00
> +acpidump        [0x030 0048   4]                                    Flags: 0x00000001
>   acpidump                                                          Enabled: 0x1
> -acpidump
>   acpidump        APIC Structure #2:
> -acpidump         Processor Local APIC:
> -acpidump        [0x00a 0010   1]                              ACPI CPU ID: 0x01
> -acpidump        [0x00b 0011   1]                                  APIC ID: 0x01
> -acpidump        [0x00c 0012   4]                                    Flags: 0x00000001
> +acpidump        [0x034 0052   1]                                     Type: 0x00 (Processor Local APIC)
> +acpidump        [0x035 0053   1]                                   Length: 0x08
> +acpidump        [0x036 0054   1]                              ACPI CPU ID: 0x01
> +acpidump        [0x037 0055   1]                                  APIC ID: 0x01
> +acpidump        [0x038 0056   4]                                    Flags: 0x00000001
>   acpidump                                                          Enabled: 0x1
> -acpidump
>   acpidump        APIC Structure #3:
> -acpidump         I/O APIC:
> -acpidump        [0x012 0018   1]                              I/O APIC ID: 0x01
> -acpidump        [0x014 0020   4]                            I/O APIC Addr: 0xfec00000
> -acpidump        [0x018 0024   4]                          Global IRQ Base: 0x00000000
> -acpidump
> +acpidump        [0x03c 0060   1]                                     Type: 0x01 (I/O APIC)
> +acpidump        [0x03d 0061   1]                                   Length: 0x0c
> +acpidump        [0x03e 0062   1]                              I/O APIC ID: 0x01
> +acpidump        [0x040 0064   4]                            I/O APIC Addr: 0xfec00000
> +acpidump        [0x044 0068   4]                          Global IRQ Base: 0x00000000
>   acpidump        APIC Structure #4:
> -acpidump         Interrupt Source Override:
> -acpidump        [0x01e 0030   1]                                      Bus: 0x00
> -acpidump        [0x01f 0031   1]                                   Source: 0x00
> -acpidump        [0x020 0032   4]                              Gbl Sys Int: 0x00000002
> -acpidump        [0x024 0036   2]                                    Flags: 0x0000
> -acpidump
> +acpidump        [0x048 0072   1]                                     Type: 0x02 (Interrupt Source Override)
> +acpidump        [0x049 0073   1]                                   Length: 0x0a
> +acpidump        [0x04a 0074   1]                                      Bus: 0x00
> +acpidump        [0x04b 0075   1]                                   Source: 0x00
> +acpidump        [0x04c 0076   4]                              Gbl Sys Int: 0x00000002
> +acpidump        [0x050 0080   2]                                    Flags: 0x0000
> +acpidump                                                         Polarity: 0x0
> +acpidump                                                     Trigger Mode: 0x0
>   acpidump        APIC Structure #5:
> -acpidump         Interrupt Source Override:
> -acpidump        [0x028 0040   1]                                      Bus: 0x00
> -acpidump        [0x029 0041   1]                                   Source: 0x09
> -acpidump        [0x02a 0042   4]                              Gbl Sys Int: 0x00000009
> -acpidump        [0x02e 0046   2]                                    Flags: 0x000d
> -acpidump
> +acpidump        [0x052 0082   1]                                     Type: 0x02 (Interrupt Source Override)
> +acpidump        [0x053 0083   1]                                   Length: 0x0a
> +acpidump        [0x054 0084   1]                                      Bus: 0x00
> +acpidump        [0x055 0085   1]                                   Source: 0x09
> +acpidump        [0x056 0086   4]                              Gbl Sys Int: 0x00000009
> +acpidump        [0x05a 0090   2]                                    Flags: 0x000d
> +acpidump                                                         Polarity: 0x1
> +acpidump                                                     Trigger Mode: 0x3
>   acpidump        APIC Structure #6:
> -acpidump         Local APIC NMI:
> -acpidump        [0x032 0050   1]                              ACPI CPU ID: 0x00
> -acpidump        [0x033 0051   2]                                    Flags: 0x0005
> -acpidump        [0x035 0053   1]                          Local APIC LINT: 0x01
> -acpidump
> +acpidump        [0x05c 0092   1]                                     Type: 0x04 (Local APIC NMI)
> +acpidump        [0x05d 0093   1]                                   Length: 0x06
> +acpidump        [0x05e 0094   1]                              ACPI CPU ID: 0x00
> +acpidump        [0x05f 0095   2]                                    Flags: 0x0005
> +acpidump        [0x061 0097   1]                          Local APIC LINT: 0x01
>   acpidump        APIC Structure #7:
> -acpidump         Local APIC NMI:
> -acpidump        [0x038 0056   1]                              ACPI CPU ID: 0x01
> -acpidump        [0x039 0057   2]                                    Flags: 0x0005
> -acpidump        [0x03b 0059   1]                          Local APIC LINT: 0x01
> +acpidump        [0x062 0098   1]                                     Type: 0x04 (Local APIC NMI)
> +acpidump        [0x063 0099   1]                                   Length: 0x06
> +acpidump        [0x064 0100   1]                              ACPI CPU ID: 0x01
> +acpidump        [0x065 0101   2]                                    Flags: 0x0005
> +acpidump        [0x067 0103   1]                          Local APIC LINT: 0x01
>   acpidump
> -acpidump        HPET @ bf6dfd2e (56 bytes)
> +acpidump        HPET @ bf6dfd2e (56 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        IA-PC High Precision Event Timer Table:
>   acpidump
> @@ -248,7 +252,7 @@ acpidump        [0x037 0055   1]                           Page Prot Attr: 0x00
>   acpidump                                                  Page Protection: 0x0
>   acpidump                                                         OEM Attr: 0x0
>   acpidump
> -acpidump        MCFG @ bf6dfd66 (60 bytes)
> +acpidump        MCFG @ bf6dfd66 (60 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        PCI Express Memory Mapped Config Space Base Address Table:
>   acpidump
> @@ -270,7 +274,7 @@ acpidump        [0x00a 0010   1]                            Start Bus Num: 0x00
>   acpidump        [0x00b 0011   1]                              End Bus Num: 0xff
>   acpidump        [0x00c 0012   4]                                 Reserved: 0x00000000
>   acpidump
> -acpidump        BOOT @ bf6dffd8 (40 bytes)
> +acpidump        BOOT @ bf6dffd8 (40 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Simple Boot Flag Table:
>   acpidump
> @@ -285,7 +289,7 @@ acpidump        [0x01c 0028   4]                               Creator ID:  LTP
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x00000001
>   acpidump        [0x024 0036   1]                              CMOS offset: 0x36
>   acpidump
> -acpidump        TMOR @ bf6dfdd4 (38 bytes)
> +acpidump        TMOR @ bf6dfdd4 (38 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        [0x000 0000   4]                                Signature: TMOR
>   acpidump        [0x004 0004   4]                                   Length: 0x00000026
> @@ -301,7 +305,7 @@ acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&..
>   acpidump          0010: 20 20 20 20 20 20 20 20 00 00 04 06 50 54 4c 20          ....PTL
>   acpidump          0020: 03 00 00 00 f3 f4                                ......
>   acpidump
> -acpidump        SLIC @ bf6dfdfa (374 bytes)
> +acpidump        SLIC @ bf6dfdfa (374 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Microsoft Software License Table:
>   acpidump
> @@ -366,7 +370,7 @@ acpidump        [0x0f6 0246 128]                                Signature: 04 07
>   acpidump        [0x0f6 0246 128]                                Signature: 7f 4c 09 ff 19 11 a9 d4
>   acpidump        [0x0f6 0246 128]                                Signature: 74 ca 11 9e dc 54 39 bf
>   acpidump
> -acpidump        APIC @ bf6dff70 (104 bytes)
> +acpidump        APIC @ bf6dff70 (104 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Multiple APIC Description Table:
>   acpidump
> @@ -382,54 +386,58 @@ acpidump        [0x020 0032   4]                         Creator Revision: 0x000
>   acpidump        [0x024 0036   4]                       Local APIC Address: 0xfee00000
>   acpidump        [0x028 0040   4]                                    Flags: 0x00000001
>   acpidump                                                      PCAT_COMPAT: 0x1
> -acpidump
>   acpidump        APIC Structure #1:
> -acpidump         Processor Local APIC:
> -acpidump        [0x002 0002   1]                              ACPI CPU ID: 0x00
> -acpidump        [0x003 0003   1]                                  APIC ID: 0x00
> -acpidump        [0x004 0004   4]                                    Flags: 0x00000001
> +acpidump        [0x02c 0044   1]                                     Type: 0x00 (Processor Local APIC)
> +acpidump        [0x02d 0045   1]                                   Length: 0x08
> +acpidump        [0x02e 0046   1]                              ACPI CPU ID: 0x00
> +acpidump        [0x02f 0047   1]                                  APIC ID: 0x00
> +acpidump        [0x030 0048   4]                                    Flags: 0x00000001
>   acpidump                                                          Enabled: 0x1
> -acpidump
>   acpidump        APIC Structure #2:
> -acpidump         Processor Local APIC:
> -acpidump        [0x00a 0010   1]                              ACPI CPU ID: 0x01
> -acpidump        [0x00b 0011   1]                                  APIC ID: 0x01
> -acpidump        [0x00c 0012   4]                                    Flags: 0x00000001
> +acpidump        [0x034 0052   1]                                     Type: 0x00 (Processor Local APIC)
> +acpidump        [0x035 0053   1]                                   Length: 0x08
> +acpidump        [0x036 0054   1]                              ACPI CPU ID: 0x01
> +acpidump        [0x037 0055   1]                                  APIC ID: 0x01
> +acpidump        [0x038 0056   4]                                    Flags: 0x00000001
>   acpidump                                                          Enabled: 0x1
> -acpidump
>   acpidump        APIC Structure #3:
> -acpidump         I/O APIC:
> -acpidump        [0x012 0018   1]                              I/O APIC ID: 0x02
> -acpidump        [0x014 0020   4]                            I/O APIC Addr: 0xfec00000
> -acpidump        [0x018 0024   4]                          Global IRQ Base: 0x00000000
> -acpidump
> +acpidump        [0x03c 0060   1]                                     Type: 0x01 (I/O APIC)
> +acpidump        [0x03d 0061   1]                                   Length: 0x0c
> +acpidump        [0x03e 0062   1]                              I/O APIC ID: 0x02
> +acpidump        [0x040 0064   4]                            I/O APIC Addr: 0xfec00000
> +acpidump        [0x044 0068   4]                          Global IRQ Base: 0x00000000
>   acpidump        APIC Structure #4:
> -acpidump         Local APIC NMI:
> -acpidump        [0x01e 0030   1]                              ACPI CPU ID: 0x00
> -acpidump        [0x01f 0031   2]                                    Flags: 0x0005
> -acpidump        [0x021 0033   1]                          Local APIC LINT: 0x01
> -acpidump
> +acpidump        [0x048 0072   1]                                     Type: 0x04 (Local APIC NMI)
> +acpidump        [0x049 0073   1]                                   Length: 0x06
> +acpidump        [0x04a 0074   1]                              ACPI CPU ID: 0x00
> +acpidump        [0x04b 0075   2]                                    Flags: 0x0005
> +acpidump        [0x04d 0077   1]                          Local APIC LINT: 0x01
>   acpidump        APIC Structure #5:
> -acpidump         Local APIC NMI:
> -acpidump        [0x024 0036   1]                              ACPI CPU ID: 0x01
> -acpidump        [0x025 0037   2]                                    Flags: 0x0005
> -acpidump        [0x027 0039   1]                          Local APIC LINT: 0x01
> -acpidump
> +acpidump        [0x04e 0078   1]                                     Type: 0x04 (Local APIC NMI)
> +acpidump        [0x04f 0079   1]                                   Length: 0x06
> +acpidump        [0x050 0080   1]                              ACPI CPU ID: 0x01
> +acpidump        [0x051 0081   2]                                    Flags: 0x0005
> +acpidump        [0x053 0083   1]                          Local APIC LINT: 0x01
>   acpidump        APIC Structure #6:
> -acpidump         Interrupt Source Override:
> -acpidump        [0x02a 0042   1]                                      Bus: 0x00
> -acpidump        [0x02b 0043   1]                                   Source: 0x00
> -acpidump        [0x02c 0044   4]                              Gbl Sys Int: 0x00000002
> -acpidump        [0x030 0048   2]                                    Flags: 0x0005
> -acpidump
> +acpidump        [0x054 0084   1]                                     Type: 0x02 (Interrupt Source Override)
> +acpidump        [0x055 0085   1]                                   Length: 0x0a
> +acpidump        [0x056 0086   1]                                      Bus: 0x00
> +acpidump        [0x057 0087   1]                                   Source: 0x00
> +acpidump        [0x058 0088   4]                              Gbl Sys Int: 0x00000002
> +acpidump        [0x05c 0092   2]                                    Flags: 0x0005
> +acpidump                                                         Polarity: 0x1
> +acpidump                                                     Trigger Mode: 0x1
>   acpidump        APIC Structure #7:
> -acpidump         Interrupt Source Override:
> -acpidump        [0x034 0052   1]                                      Bus: 0x00
> -acpidump        [0x035 0053   1]                                   Source: 0x09
> -acpidump        [0x036 0054   4]                              Gbl Sys Int: 0x00000009
> -acpidump        [0x03a 0058   2]                                    Flags: 0x000d
> -acpidump
> -acpidump        SSDT @ bf6d98bd (685 bytes)
> +acpidump        [0x05e 0094   1]                                     Type: 0x02 (Interrupt Source Override)
> +acpidump        [0x05f 0095   1]                                   Length: 0x0a
> +acpidump        [0x060 0096   1]                                      Bus: 0x00
> +acpidump        [0x061 0097   1]                                   Source: 0x09
> +acpidump        [0x062 0098   4]                              Gbl Sys Int: 0x00000009
> +acpidump        [0x066 0102   2]                                    Flags: 0x000d
> +acpidump                                                         Polarity: 0x1
> +acpidump                                                     Trigger Mode: 0x3
> +acpidump
> +acpidump        SSDT @ bf6d98bd (685 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Secondary System Description Table:
>   acpidump
> @@ -444,7 +452,7 @@ acpidump        [0x01c 0028   4]                               Creator ID: INTL
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x20050624
>   acpidump        Contains 0x289 bytes of AML byte code
>   acpidump
> -acpidump        SSDT @ bf6d981a (163 bytes)
> +acpidump        SSDT @ bf6d981a (163 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Secondary System Description Table:
>   acpidump
> @@ -459,7 +467,7 @@ acpidump        [0x01c 0028   4]                               Creator ID: INTL
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x20050624
>   acpidump        Contains 0x7f bytes of AML byte code
>   acpidump
> -acpidump        SSDT @ bf6d8e10 (607 bytes)
> +acpidump        SSDT @ bf6d8e10 (607 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Secondary System Description Table:
>   acpidump
> @@ -474,7 +482,7 @@ acpidump        [0x01c 0028   4]                               Creator ID: INTL
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x20050624
>   acpidump        Contains 0x23b bytes of AML byte code
>   acpidump
> -acpidump        SSDT @ bf6d8d6a (166 bytes)
> +acpidump        SSDT @ bf6d8d6a (166 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Secondary System Description Table:
>   acpidump
> @@ -489,7 +497,7 @@ acpidump        [0x01c 0028   4]                               Creator ID: INTL
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x20050624
>   acpidump        Contains 0x82 bytes of AML byte code
>   acpidump
> -acpidump        SSDT @ bf6d8884 (1254 bytes)
> +acpidump        SSDT @ bf6d8884 (1254 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Secondary System Description Table:
>   acpidump
> @@ -504,7 +512,7 @@ acpidump        [0x01c 0028   4]                               Creator ID: INTL
>   acpidump        [0x020 0032   4]                         Creator Revision: 0x20050624
>   acpidump        Contains 0x4c2 bytes of AML byte code
>   acpidump
> -acpidump        XSDT @ bf6d87f0 (148 bytes)
> +acpidump        XSDT @ bf6d87f0 (148 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Extended System Description Table:
>   acpidump
> @@ -532,7 +540,7 @@ acpidump        [0x07c 0124   8]                            Entry 11 SSDT: 0x000
>   acpidump        [0x084 0132   8]                            Entry 12 SSDT: 0x00000000bf6d8d6a
>   acpidump        [0x08c 0140   8]                            Entry 13 SSDT: 0x00000000bf6d8884
>   acpidump
> -acpidump        FACP @ bf6dfbd2 (244 bytes)
> +acpidump        FACP @ bf6dfbd2 (244 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Fixed ACPI Description Table:
>   acpidump
> @@ -677,7 +685,7 @@ acpidump        [0x0ea 0234   1]                           reg_bit_offset: 0x00
>   acpidump        [0x0eb 0235   1]                             access_width: 0x00 (Undefined (legacy reasons))
>   acpidump        [0x0ec 0236   8]                                  address: 0x0000000000000000
>   acpidump
> -acpidump        TCPA @ bf6dfda2 (50 bytes)
> +acpidump        TCPA @ bf6dfda2 (50 bytes) (loaded from file)
>   acpidump        ----
>   acpidump        Trusted Computing Platform Alliance Capabilities Table:
>   acpidump
>


Acked-by: Ivan Hu <ivan.hu at canonical.com>



More information about the fwts-devel mailing list