Patchwork [FWTS-TEST] arg-table-path-0001: update test to keep in sync with fwts

login
register
mail settings
Submitter Colin King
Date Jan. 14, 2014, 5:24 p.m.
Message ID <1389720266-24236-1-git-send-email-colin.king@canonical.com>
Download mbox | patch
Permalink /patch/310824/
State Accepted
Headers show

Comments

Colin King - Jan. 14, 2014, 5:24 p.m.
From: Colin Ian King <colin.king@canonical.com>

fwts commit 41f8357992c4ce9dc4249ab94cf3d608f0a84c31 changed
the output of acpidump, so modify the test to sync with the
new output.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 arg-table-path-0001/acpidump-0001.log | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)
Alex Hung - Jan. 16, 2014, 8:16 a.m.
On 01/15/2014 01:24 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fwts commit 41f8357992c4ce9dc4249ab94cf3d608f0a84c31 changed
> the output of acpidump, so modify the test to sync with the
> new output.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   arg-table-path-0001/acpidump-0001.log | 17 +++++++++++++++--
>   1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arg-table-path-0001/acpidump-0001.log b/arg-table-path-0001/acpidump-0001.log
> index 58f85ca..c3c4c9b 100644
> --- a/arg-table-path-0001/acpidump-0001.log
> +++ b/arg-table-path-0001/acpidump-0001.log
> @@ -1,5 +1,5 @@
>   acpidump
> -acpidump        ---------------
> +acpidump        ----
>   acpidump        ----------------------------------------------------------
>   acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&.....PTLTD
>   acpidump          0010: 20 20 20 20 20 20 20 20 00 00 04 06 50 54 4c 20          ....PTL
> @@ -344,6 +344,7 @@ acpidump        [0x0f6 0246 128]                                Signature: e7 36
>   acpidump        [0x0f6 0246 128]                                Signature: f6 6b bb 5f a5 81 e2 ff
>   acpidump                                             32 bit PM timer (V1): 0x0
>   acpidump                                 8042 present on ports 60/64 (V2): 0x0
> +acpidump        acpidump: Dump ACPI tables.
>   acpidump                            ACPI hardware is not implemented (V5): 0x0
>   acpidump                                         All CPUs support C1 (V1): 0x1
>   acpidump        APIC @ bff00000 (104 bytes)
> @@ -368,27 +369,34 @@ acpidump        Contains 0x82 bytes of AML byte code
>   acpidump                                 Control Method Power Button (V1): 0x0
>   acpidump                                 Control Method Sleep Button (V1): 0x1
>   acpidump                                                   Count Size Cap: 0x1
> +acpidump        Differentiated System Description Table:
>   acpidump                                          Docking Capability (V1): 0x0
>   acpidump        DSDT @ bff00128 (24564 bytes)
> -acpidump        acpidump: Dump ACPI tables.
>   acpidump                                                          Enabled: 0x1
> +acpidump        Extended System Description Table:
>   acpidump        FACP @ bff0612c (244 bytes)
>   acpidump        FACS @ bff06230 (64 bytes)
> +acpidump        Firmware ACPI Control Structure:
> +acpidump        Fixed ACPI Description Table:
>   acpidump                                                     Hardware Rev: 0x01
>   acpidump                                          Headless, No Video (V3): 0x0
>   acpidump        HPET @ bff06280 (56 bytes)
> +acpidump        IA-PC High Precision Event Timer Table:
>   acpidump         Interrupt Source Override:
>   acpidump         I/O APIC:
>   acpidump                                                  IRQ Routing Cap: 0x1
>   acpidump                                    Legacy Devices Supported (V2): 0x0
>   acpidump         Local APIC NMI:
>   acpidump        MCFG @ bff062c8 (60 bytes)
> +acpidump        Microsoft Software License Table:
>   acpidump                                           MSI Not Supported (V4): 0x0
> +acpidump        Multiple APIC Description Table:
>   acpidump                                                  Num Comparitors: 0x02
>   acpidump                                                         OEM Attr: 0x0
>   acpidump                                                  Page Protection: 0x0
>   acpidump                                                      PCAT_COMPAT: 0x1
>   acpidump                                     PCIe ASPM Not supported (V4): 0x0
> +acpidump        PCI Express Memory Mapped Config Space Base Address Table:
>   acpidump                                  PCI_EXP_WAK bits supported (V4): 0x0
>   acpidump                                                    PCI Vendor ID: 0x8086
>   acpidump         Processor Local APIC:
> @@ -396,6 +404,8 @@ acpidump                                     Remote power on capable (V4): 0x0
>   acpidump                                                         Reserved: 0x0
>   acpidump                                                         RESERVED: 0x000
>   acpidump                                    Reset Register Supported (V2): 0x0
> +acpidump        Root System Description Pointer:
> +acpidump        Root System Description Table:
>   acpidump        RSDP @ bff06314 (36 bytes)
>   acpidump        RSDT @ bff070d1 (104 bytes)
>   acpidump                                 RTC can wake system from S4 (V1): 0x1
> @@ -403,6 +413,8 @@ acpidump                                 RTC_STS Valid after S4 wake (V4): 0x0
>   acpidump                             RTC wake not in fixed reg space (V1): 0x0
>   acpidump                S0 power savings are equal or better than S3 (V5): 0x0
>   acpidump                                                 Sealed Case (V3): 0x0
> +acpidump        Secondary System Description Table:
> +acpidump        Simple Boot Flag Table:
>   acpidump        SLIC @ bff06348 (374 bytes)
>   acpidump        SSDT @ bff064ce (685 bytes)
>   acpidump        SSDT @ bff0678b (163 bytes)
> @@ -412,6 +424,7 @@ acpidump        SSDT @ bff06b63 (1254 bytes)
>   acpidump        TCPA @ bff07059 (50 bytes)
>   acpidump        Test 1 of 1: Dump ACPI tables.
>   acpidump        TMOR @ bff0709b (38 bytes)
> +acpidump        Trusted Computing Platform Alliance Capabilities Table:
>   acpidump                                      Use APIC Cluster Model (V4): 0x0
>   acpidump                                Use APIC Physical Dest. Mode (V4): 0x0
>   acpidump                            Use native instr. after SLP_TYPx (V3): 0x0
>

Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu - Jan. 17, 2014, 5:54 a.m.
On 01/15/2014 01:24 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> fwts commit 41f8357992c4ce9dc4249ab94cf3d608f0a84c31 changed
> the output of acpidump, so modify the test to sync with the
> new output.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   arg-table-path-0001/acpidump-0001.log | 17 +++++++++++++++--
>   1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/arg-table-path-0001/acpidump-0001.log b/arg-table-path-0001/acpidump-0001.log
> index 58f85ca..c3c4c9b 100644
> --- a/arg-table-path-0001/acpidump-0001.log
> +++ b/arg-table-path-0001/acpidump-0001.log
> @@ -1,5 +1,5 @@
>   acpidump
> -acpidump        ---------------
> +acpidump        ----
>   acpidump        ----------------------------------------------------------
>   acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&.....PTLTD
>   acpidump          0010: 20 20 20 20 20 20 20 20 00 00 04 06 50 54 4c 20          ....PTL
> @@ -344,6 +344,7 @@ acpidump        [0x0f6 0246 128]                                Signature: e7 36
>   acpidump        [0x0f6 0246 128]                                Signature: f6 6b bb 5f a5 81 e2 ff
>   acpidump                                             32 bit PM timer (V1): 0x0
>   acpidump                                 8042 present on ports 60/64 (V2): 0x0
> +acpidump        acpidump: Dump ACPI tables.
>   acpidump                            ACPI hardware is not implemented (V5): 0x0
>   acpidump                                         All CPUs support C1 (V1): 0x1
>   acpidump        APIC @ bff00000 (104 bytes)
> @@ -368,27 +369,34 @@ acpidump        Contains 0x82 bytes of AML byte code
>   acpidump                                 Control Method Power Button (V1): 0x0
>   acpidump                                 Control Method Sleep Button (V1): 0x1
>   acpidump                                                   Count Size Cap: 0x1
> +acpidump        Differentiated System Description Table:
>   acpidump                                          Docking Capability (V1): 0x0
>   acpidump        DSDT @ bff00128 (24564 bytes)
> -acpidump        acpidump: Dump ACPI tables.
>   acpidump                                                          Enabled: 0x1
> +acpidump        Extended System Description Table:
>   acpidump        FACP @ bff0612c (244 bytes)
>   acpidump        FACS @ bff06230 (64 bytes)
> +acpidump        Firmware ACPI Control Structure:
> +acpidump        Fixed ACPI Description Table:
>   acpidump                                                     Hardware Rev: 0x01
>   acpidump                                          Headless, No Video (V3): 0x0
>   acpidump        HPET @ bff06280 (56 bytes)
> +acpidump        IA-PC High Precision Event Timer Table:
>   acpidump         Interrupt Source Override:
>   acpidump         I/O APIC:
>   acpidump                                                  IRQ Routing Cap: 0x1
>   acpidump                                    Legacy Devices Supported (V2): 0x0
>   acpidump         Local APIC NMI:
>   acpidump        MCFG @ bff062c8 (60 bytes)
> +acpidump        Microsoft Software License Table:
>   acpidump                                           MSI Not Supported (V4): 0x0
> +acpidump        Multiple APIC Description Table:
>   acpidump                                                  Num Comparitors: 0x02
>   acpidump                                                         OEM Attr: 0x0
>   acpidump                                                  Page Protection: 0x0
>   acpidump                                                      PCAT_COMPAT: 0x1
>   acpidump                                     PCIe ASPM Not supported (V4): 0x0
> +acpidump        PCI Express Memory Mapped Config Space Base Address Table:
>   acpidump                                  PCI_EXP_WAK bits supported (V4): 0x0
>   acpidump                                                    PCI Vendor ID: 0x8086
>   acpidump         Processor Local APIC:
> @@ -396,6 +404,8 @@ acpidump                                     Remote power on capable (V4): 0x0
>   acpidump                                                         Reserved: 0x0
>   acpidump                                                         RESERVED: 0x000
>   acpidump                                    Reset Register Supported (V2): 0x0
> +acpidump        Root System Description Pointer:
> +acpidump        Root System Description Table:
>   acpidump        RSDP @ bff06314 (36 bytes)
>   acpidump        RSDT @ bff070d1 (104 bytes)
>   acpidump                                 RTC can wake system from S4 (V1): 0x1
> @@ -403,6 +413,8 @@ acpidump                                 RTC_STS Valid after S4 wake (V4): 0x0
>   acpidump                             RTC wake not in fixed reg space (V1): 0x0
>   acpidump                S0 power savings are equal or better than S3 (V5): 0x0
>   acpidump                                                 Sealed Case (V3): 0x0
> +acpidump        Secondary System Description Table:
> +acpidump        Simple Boot Flag Table:
>   acpidump        SLIC @ bff06348 (374 bytes)
>   acpidump        SSDT @ bff064ce (685 bytes)
>   acpidump        SSDT @ bff0678b (163 bytes)
> @@ -412,6 +424,7 @@ acpidump        SSDT @ bff06b63 (1254 bytes)
>   acpidump        TCPA @ bff07059 (50 bytes)
>   acpidump        Test 1 of 1: Dump ACPI tables.
>   acpidump        TMOR @ bff0709b (38 bytes)
> +acpidump        Trusted Computing Platform Alliance Capabilities Table:
>   acpidump                                      Use APIC Cluster Model (V4): 0x0
>   acpidump                                Use APIC Physical Dest. Mode (V4): 0x0
>   acpidump                            Use native instr. after SLP_TYPx (V3): 0x0
>

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

Patch

diff --git a/arg-table-path-0001/acpidump-0001.log b/arg-table-path-0001/acpidump-0001.log
index 58f85ca..c3c4c9b 100644
--- a/arg-table-path-0001/acpidump-0001.log
+++ b/arg-table-path-0001/acpidump-0001.log
@@ -1,5 +1,5 @@ 
 acpidump        
-acpidump        ---------------
+acpidump        ----
 acpidump        ----------------------------------------------------------
 acpidump          0000: 54 4d 4f 52 26 00 00 00 01 eb 50 54 4c 54 44 20  TMOR&.....PTLTD 
 acpidump          0010: 20 20 20 20 20 20 20 20 00 00 04 06 50 54 4c 20          ....PTL 
@@ -344,6 +344,7 @@  acpidump        [0x0f6 0246 128]                                Signature: e7 36
 acpidump        [0x0f6 0246 128]                                Signature: f6 6b bb 5f a5 81 e2 ff 
 acpidump                                             32 bit PM timer (V1): 0x0
 acpidump                                 8042 present on ports 60/64 (V2): 0x0
+acpidump        acpidump: Dump ACPI tables.
 acpidump                            ACPI hardware is not implemented (V5): 0x0
 acpidump                                         All CPUs support C1 (V1): 0x1
 acpidump        APIC @ bff00000 (104 bytes)
@@ -368,27 +369,34 @@  acpidump        Contains 0x82 bytes of AML byte code
 acpidump                                 Control Method Power Button (V1): 0x0
 acpidump                                 Control Method Sleep Button (V1): 0x1
 acpidump                                                   Count Size Cap: 0x1
+acpidump        Differentiated System Description Table:
 acpidump                                          Docking Capability (V1): 0x0
 acpidump        DSDT @ bff00128 (24564 bytes)
-acpidump        acpidump: Dump ACPI tables.
 acpidump                                                          Enabled: 0x1
+acpidump        Extended System Description Table:
 acpidump        FACP @ bff0612c (244 bytes)
 acpidump        FACS @ bff06230 (64 bytes)
+acpidump        Firmware ACPI Control Structure:
+acpidump        Fixed ACPI Description Table:
 acpidump                                                     Hardware Rev: 0x01
 acpidump                                          Headless, No Video (V3): 0x0
 acpidump        HPET @ bff06280 (56 bytes)
+acpidump        IA-PC High Precision Event Timer Table:
 acpidump         Interrupt Source Override:
 acpidump         I/O APIC:
 acpidump                                                  IRQ Routing Cap: 0x1
 acpidump                                    Legacy Devices Supported (V2): 0x0
 acpidump         Local APIC NMI:
 acpidump        MCFG @ bff062c8 (60 bytes)
+acpidump        Microsoft Software License Table:
 acpidump                                           MSI Not Supported (V4): 0x0
+acpidump        Multiple APIC Description Table:
 acpidump                                                  Num Comparitors: 0x02
 acpidump                                                         OEM Attr: 0x0
 acpidump                                                  Page Protection: 0x0
 acpidump                                                      PCAT_COMPAT: 0x1
 acpidump                                     PCIe ASPM Not supported (V4): 0x0
+acpidump        PCI Express Memory Mapped Config Space Base Address Table:
 acpidump                                  PCI_EXP_WAK bits supported (V4): 0x0
 acpidump                                                    PCI Vendor ID: 0x8086
 acpidump         Processor Local APIC:
@@ -396,6 +404,8 @@  acpidump                                     Remote power on capable (V4): 0x0
 acpidump                                                         Reserved: 0x0
 acpidump                                                         RESERVED: 0x000
 acpidump                                    Reset Register Supported (V2): 0x0
+acpidump        Root System Description Pointer:
+acpidump        Root System Description Table:
 acpidump        RSDP @ bff06314 (36 bytes)
 acpidump        RSDT @ bff070d1 (104 bytes)
 acpidump                                 RTC can wake system from S4 (V1): 0x1
@@ -403,6 +413,8 @@  acpidump                                 RTC_STS Valid after S4 wake (V4): 0x0
 acpidump                             RTC wake not in fixed reg space (V1): 0x0
 acpidump                S0 power savings are equal or better than S3 (V5): 0x0
 acpidump                                                 Sealed Case (V3): 0x0
+acpidump        Secondary System Description Table:
+acpidump        Simple Boot Flag Table:
 acpidump        SLIC @ bff06348 (374 bytes)
 acpidump        SSDT @ bff064ce (685 bytes)
 acpidump        SSDT @ bff0678b (163 bytes)
@@ -412,6 +424,7 @@  acpidump        SSDT @ bff06b63 (1254 bytes)
 acpidump        TCPA @ bff07059 (50 bytes)
 acpidump        Test 1 of 1: Dump ACPI tables.
 acpidump        TMOR @ bff0709b (38 bytes)
+acpidump        Trusted Computing Platform Alliance Capabilities Table:
 acpidump                                      Use APIC Cluster Model (V4): 0x0
 acpidump                                Use APIC Physical Dest. Mode (V4): 0x0
 acpidump                            Use native instr. after SLP_TYPx (V3): 0x0