[PATCH 1/9][FWTS-TEST] acpidump-0001: fixup test to match new acpidump output

Colin King colin.king at canonical.com
Mon Dec 17 10:57:08 UTC 2012


From: Colin Ian King <colin.king at canonical.com>

The acpidump has fixed a bug that was mis-formatting sub bitfields
by 1 char, this patch corrects the test to be in-sync with fwts.

See fwts commit 94f1ae5b2e1f958daaa52a2f4e9b9d8c7afe28a1

Signed-off-by: Colin Ian King <colin.king at canonical.com>
---
 acpidump-0001/acpidump-0001.log | 144 ++++++++++++++++++++--------------------
 1 file changed, 72 insertions(+), 72 deletions(-)

diff --git a/acpidump-0001/acpidump-0001.log b/acpidump-0001/acpidump-0001.log
index b3b1ccf..3444492 100644
--- a/acpidump-0001/acpidump-0001.log
+++ b/acpidump-0001/acpidump-0001.log
@@ -111,36 +111,36 @@ acpidump        [0x06a 0106   1]                      RTC Day Alarm Index: 0x0d
 acpidump        [0x06b 0107   1]                    RTC Month Alarm Index: 0x00
 acpidump        [0x06c 0108   1]                        RTC Century Index: 0x32
 acpidump        [0x06d 0109   2]             IA-PC Boot Flags (see below): 0x0000
-acpidump                                   Legacy Devices Supported (V2): 0x0
-acpidump                                8042 present on ports 60/64 (V2): 0x0
-acpidump                                            VGA Not Present (V4): 0x0
-acpidump                                          MSI Not Supported (V4): 0x0
-acpidump                                    PCIe ASPM Not supported (V4): 0x0
-acpidump                                       CMOS RTC Not Present (V5): 0x0
+acpidump                                    Legacy Devices Supported (V2): 0x0
+acpidump                                 8042 present on ports 60/64 (V2): 0x0
+acpidump                                             VGA Not Present (V4): 0x0
+acpidump                                           MSI Not Supported (V4): 0x0
+acpidump                                     PCIe ASPM Not supported (V4): 0x0
+acpidump                                        CMOS RTC Not Present (V5): 0x0
 acpidump        [0x070 0112   4]                        Flags (see below): 0x000080a5
-acpidump                                         WBINVD instruction (V1): 0x1
-acpidump                                  WBINVD flushes all caches (V1): 0x0
-acpidump                                        All CPUs support C1 (V1): 0x1
-acpidump                                      C2 works on MP system (V1): 0x0
-acpidump                                Control Method Power Button (V1): 0x0
-acpidump                                Control Method Sleep Button (V1): 0x1
-acpidump                            RTC wake not in fixed reg space (V1): 0x0
-acpidump                                RTC can wake system from S4 (V1): 0x1
-acpidump                                            32 bit PM timer (V1): 0x0
-acpidump                                         Docking Capability (V1): 0x0
-acpidump                                   Reset Register Supported (V2): 0x0
-acpidump                                                Sealed Case (V3): 0x0
-acpidump                                         Headless, No Video (V3): 0x0
-acpidump                           Use native instr. after SLP_TYPx (V3): 0x0
-acpidump                                 PCI_EXP_WAK bits supported (V4): 0x0
-acpidump                                          Use patform clock (V4): 0x1
-acpidump                                RTC_STS Valid after S4 wake (V4): 0x0
-acpidump                                    Remote power on capable (V4): 0x0
-acpidump                                     Use APIC Cluster Model (V4): 0x0
-acpidump                               Use APIC Physical Dest. Mode (V4): 0x0
-acpidump                           ACPI hardware is not implemented (V5): 0x0
-acpidump               S0 power savings are equal or better than S3 (V5): 0x0
-acpidump                                                        RESERVED: 0x000
+acpidump                                          WBINVD instruction (V1): 0x1
+acpidump                                   WBINVD flushes all caches (V1): 0x0
+acpidump                                         All CPUs support C1 (V1): 0x1
+acpidump                                       C2 works on MP system (V1): 0x0
+acpidump                                 Control Method Power Button (V1): 0x0
+acpidump                                 Control Method Sleep Button (V1): 0x1
+acpidump                             RTC wake not in fixed reg space (V1): 0x0
+acpidump                                 RTC can wake system from S4 (V1): 0x1
+acpidump                                             32 bit PM timer (V1): 0x0
+acpidump                                          Docking Capability (V1): 0x0
+acpidump                                    Reset Register Supported (V2): 0x0
+acpidump                                                 Sealed Case (V3): 0x0
+acpidump                                          Headless, No Video (V3): 0x0
+acpidump                            Use native instr. after SLP_TYPx (V3): 0x0
+acpidump                                  PCI_EXP_WAK bits supported (V4): 0x0
+acpidump                                           Use patform clock (V4): 0x1
+acpidump                                 RTC_STS Valid after S4 wake (V4): 0x0
+acpidump                                     Remote power on capable (V4): 0x0
+acpidump                                      Use APIC Cluster Model (V4): 0x0
+acpidump                                Use APIC Physical Dest. Mode (V4): 0x0
+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        ---------------
@@ -155,21 +155,21 @@ acpidump        [0x01c 0028   4]                               Creator ID: LOHR
 acpidump        [0x020 0032   4]                         Creator Revision: 0x0000005a
 acpidump        [0x024 0036   4]                       Local APIC Address: 0xfee00000
 acpidump        [0x028 0040   4]                                    Flags: 0x00000001
-acpidump                                                     PCAT_COMPAT: 0x1
+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                                                         Enabled: 0x1
+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                                                         Enabled: 0x1
+acpidump                                                          Enabled: 0x1
 acpidump        
 acpidump        APIC Structure #3:
 acpidump         I/O APIC:
@@ -215,12 +215,12 @@ acpidump        [0x018 0024   4]                             OEM Revision: 0x060
 acpidump        [0x01c 0028   4]                               Creator ID: LOHR
 acpidump        [0x020 0032   4]                         Creator Revision: 0x0000005a
 acpidump        [0x024 0036   4]                           Event Timer ID: 0x8086a201
-acpidump                                                    Hardware Rev: 0x01
-acpidump                                                 Num Comparitors: 0x02
-acpidump                                                  Count Size Cap: 0x1
-acpidump                                                        Reserved: 0x0
-acpidump                                                 IRQ Routing Cap: 0x1
-acpidump                                                   PCI Vendor ID: 0x8086
+acpidump                                                     Hardware Rev: 0x01
+acpidump                                                  Num Comparitors: 0x02
+acpidump                                                   Count Size Cap: 0x1
+acpidump                                                         Reserved: 0x0
+acpidump                                                  IRQ Routing Cap: 0x1
+acpidump                                                    PCI Vendor ID: 0x8086
 acpidump        
 acpidump        [0x028 0040  12]                             Base Address: (Generic Address Structure)
 acpidump        [0x028 0040   1]                            addr_space_id: 0x00 (System Memory)
@@ -231,8 +231,8 @@ acpidump        [0x02c 0044   8]                                  address: 0x000
 acpidump        [0x034 0052   1]                              HPET Number: 0x00
 acpidump        [0x035 0053   2]                         Main Counter Min: 0x0080
 acpidump        [0x037 0055   1]                           Page Prot Attr: 0x00
-acpidump                                                 Page Protection: 0x0
-acpidump                                                        OEM Attr: 0x0
+acpidump                                                  Page Protection: 0x0
+acpidump                                                         OEM Attr: 0x0
 acpidump        
 acpidump        MCFG @ bf6dfd66 (60 bytes)
 acpidump        ---------------
@@ -359,21 +359,21 @@ acpidump        [0x01c 0028   4]                               Creator ID:  LTP
 acpidump        [0x020 0032   4]                         Creator Revision: 0x00000000
 acpidump        [0x024 0036   4]                       Local APIC Address: 0xfee00000
 acpidump        [0x028 0040   4]                                    Flags: 0x00000001
-acpidump                                                     PCAT_COMPAT: 0x1
+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                                                         Enabled: 0x1
+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                                                         Enabled: 0x1
+acpidump                                                          Enabled: 0x1
 acpidump        
 acpidump        APIC Structure #3:
 acpidump         I/O APIC:
@@ -544,36 +544,36 @@ acpidump        [0x06a 0106   1]                      RTC Day Alarm Index: 0x0d
 acpidump        [0x06b 0107   1]                    RTC Month Alarm Index: 0x00
 acpidump        [0x06c 0108   1]                        RTC Century Index: 0x32
 acpidump        [0x06d 0109   2]             IA-PC Boot Flags (see below): 0x0000
-acpidump                                   Legacy Devices Supported (V2): 0x0
-acpidump                                8042 present on ports 60/64 (V2): 0x0
-acpidump                                            VGA Not Present (V4): 0x0
-acpidump                                          MSI Not Supported (V4): 0x0
-acpidump                                    PCIe ASPM Not supported (V4): 0x0
-acpidump                                       CMOS RTC Not Present (V5): 0x0
+acpidump                                    Legacy Devices Supported (V2): 0x0
+acpidump                                 8042 present on ports 60/64 (V2): 0x0
+acpidump                                             VGA Not Present (V4): 0x0
+acpidump                                           MSI Not Supported (V4): 0x0
+acpidump                                     PCIe ASPM Not supported (V4): 0x0
+acpidump                                        CMOS RTC Not Present (V5): 0x0
 acpidump        [0x070 0112   4]                        Flags (see below): 0x000000a5
-acpidump                                         WBINVD instruction (V1): 0x1
-acpidump                                  WBINVD flushes all caches (V1): 0x0
-acpidump                                        All CPUs support C1 (V1): 0x1
-acpidump                                      C2 works on MP system (V1): 0x0
-acpidump                                Control Method Power Button (V1): 0x0
-acpidump                                Control Method Sleep Button (V1): 0x1
-acpidump                            RTC wake not in fixed reg space (V1): 0x0
-acpidump                                RTC can wake system from S4 (V1): 0x1
-acpidump                                            32 bit PM timer (V1): 0x0
-acpidump                                         Docking Capability (V1): 0x0
-acpidump                                   Reset Register Supported (V2): 0x0
-acpidump                                                Sealed Case (V3): 0x0
-acpidump                                         Headless, No Video (V3): 0x0
-acpidump                           Use native instr. after SLP_TYPx (V3): 0x0
-acpidump                                 PCI_EXP_WAK bits supported (V4): 0x0
-acpidump                                          Use patform clock (V4): 0x0
-acpidump                                RTC_STS Valid after S4 wake (V4): 0x0
-acpidump                                    Remote power on capable (V4): 0x0
-acpidump                                     Use APIC Cluster Model (V4): 0x0
-acpidump                               Use APIC Physical Dest. Mode (V4): 0x0
-acpidump                           ACPI hardware is not implemented (V5): 0x0
-acpidump               S0 power savings are equal or better than S3 (V5): 0x0
-acpidump                                                        RESERVED: 0x000
+acpidump                                          WBINVD instruction (V1): 0x1
+acpidump                                   WBINVD flushes all caches (V1): 0x0
+acpidump                                         All CPUs support C1 (V1): 0x1
+acpidump                                       C2 works on MP system (V1): 0x0
+acpidump                                 Control Method Power Button (V1): 0x0
+acpidump                                 Control Method Sleep Button (V1): 0x1
+acpidump                             RTC wake not in fixed reg space (V1): 0x0
+acpidump                                 RTC can wake system from S4 (V1): 0x1
+acpidump                                             32 bit PM timer (V1): 0x0
+acpidump                                          Docking Capability (V1): 0x0
+acpidump                                    Reset Register Supported (V2): 0x0
+acpidump                                                 Sealed Case (V3): 0x0
+acpidump                                          Headless, No Video (V3): 0x0
+acpidump                            Use native instr. after SLP_TYPx (V3): 0x0
+acpidump                                  PCI_EXP_WAK bits supported (V4): 0x0
+acpidump                                           Use patform clock (V4): 0x0
+acpidump                                 RTC_STS Valid after S4 wake (V4): 0x0
+acpidump                                     Remote power on capable (V4): 0x0
+acpidump                                      Use APIC Cluster Model (V4): 0x0
+acpidump                                Use APIC Physical Dest. Mode (V4): 0x0
+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        [0x074 0116  12]                                RESET_REG: (Generic Address Structure)
 acpidump        [0x074 0116   1]                            addr_space_id: 0x00 (System Memory)
-- 
1.8.0




More information about the fwts-devel mailing list