[PATCH 3/3] fwts-test: sync up with fwts_acpi_fixed_value_check
Alex Hung
alex.hung at canonical.com
Tue Jan 5 04:19:52 UTC 2021
Signed-off-by: Alex Hung <alex.hung at canonical.com>
---
fwts-test/bgrt-0001/bgrt-0002.log | 8 ++++----
fwts-test/cpep-0001/cpep-0002.log | 30 ++++++++++++------------------
fwts-test/dbg2-0001/dbg2-0002.log | 4 ++--
fwts-test/iort-0001/iort-0002.log | 8 ++++----
fwts-test/srat-0001/srat-0002.log | 4 ++--
fwts-test/tcpa-0001/tcpa-0002.log | 8 ++++----
fwts-test/wpbt-0001/wpbt-0002.log | 8 ++++----
7 files changed, 32 insertions(+), 38 deletions(-)
diff --git a/fwts-test/bgrt-0001/bgrt-0002.log b/fwts-test/bgrt-0001/bgrt-0002.log
index edbfd8dc..98059954 100644
--- a/fwts-test/bgrt-0001/bgrt-0002.log
+++ b/fwts-test/bgrt-0001/bgrt-0002.log
@@ -8,12 +8,12 @@ bgrt Image Type: 0x01
bgrt Image Memory Address: 0x035f701800000000
bgrt Image Offset X: 0x00000000
bgrt Image Offset Y: 0x00000000
-bgrt FAILED [MEDIUM] BGRTInvalidVersion: Test 1, BGRT: Version
-bgrt field is 0x2 and not the expected value of 0x01
+bgrt FAILED [MEDIUM] BGRTBadFieldValue: Test 1, BGRT Version
+bgrt field must be 1, got 2 instead.
bgrt FAILED [HIGH] BGRTReservedBitsNonZero: Test 1, BGRT BGRT
bgrt Status Bits [7..3] must be zero, got 0xff instead
-bgrt FAILED [MEDIUM] BGRTInvalidImageType: Test 1, BGRT: Image
-bgrt Type field is 0x1, the only allowed type is 0x00
+bgrt FAILED [MEDIUM] BGRTBadFieldValue: Test 1, BGRT Image Type
+bgrt field must be 0, got 1 instead.
bgrt
bgrt ==========================================================
bgrt 0 passed, 3 failed, 0 warning, 0 aborted, 0 skipped, 0
diff --git a/fwts-test/cpep-0001/cpep-0002.log b/fwts-test/cpep-0001/cpep-0002.log
index e65261c9..670e5839 100644
--- a/fwts-test/cpep-0001/cpep-0002.log
+++ b/fwts-test/cpep-0001/cpep-0002.log
@@ -4,27 +4,21 @@ cpep Test 1 of 1: CPEP Corrected Platform Error Polling Table
cpep test.
cpep CPEP Corrected Platform Error Polling Table:
cpep Reserved: 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00
-cpep FAILED [HIGH] CPEPInvalidProcStructureType: Test 1, CPEP:
-cpep Processor Structure 0 Type field is 0x1 and was expected
-cpep to be 0x00
-cpep FAILED [MEDIUM] CPEPInvalidProcStructureType: Test 1, CPEP
-cpep : Processor Structure 0 Length field is 0x10 and was
-cpep expected to be 0x08
+cpep FAILED [HIGH] CPEPBadFieldValue: Test 1, CPEP Processor
+cpep Structure 0 Type field must be 0, got 1 instead.
+cpep FAILED [MEDIUM] CPEPBadFieldValue: Test 1, CPEP Processor
+cpep Structure 0 Length field must be 8, got 16 instead.
cpep WARNING: Test 1, CPEP Processor Structure 0 Polling
cpep Interval of 0 milliseconds is relatively short and may
cpep cause excessive polling CPU load
-cpep FAILED [HIGH] CPEPInvalidProcStructureType: Test 1, CPEP:
-cpep Processor Structure 1 Type field is 0x2 and was expected
-cpep to be 0x00
-cpep FAILED [MEDIUM] CPEPInvalidProcStructureType: Test 1, CPEP
-cpep : Processor Structure 1 Length field is 0x0 and was
-cpep expected to be 0x08
-cpep FAILED [HIGH] CPEPInvalidProcStructureType: Test 1, CPEP:
-cpep Processor Structure 2 Type field is 0x23 and was expected
-cpep to be 0x00
-cpep FAILED [MEDIUM] CPEPInvalidProcStructureType: Test 1, CPEP
-cpep : Processor Structure 2 Length field is 0xff and was
-cpep expected to be 0x08
+cpep FAILED [HIGH] CPEPBadFieldValue: Test 1, CPEP Processor
+cpep Structure 1 Type field must be 0, got 2 instead.
+cpep FAILED [MEDIUM] CPEPBadFieldValue: Test 1, CPEP Processor
+cpep Structure 1 Length field must be 8, got 0 instead.
+cpep FAILED [HIGH] CPEPBadFieldValue: Test 1, CPEP Processor
+cpep Structure 2 Type field must be 0, got 35 instead.
+cpep FAILED [MEDIUM] CPEPBadFieldValue: Test 1, CPEP Processor
+cpep Structure 2 Length field must be 8, got 255 instead.
cpep WARNING: Test 1, CPEP Processor Structure 2 Polling
cpep Interval of 4 milliseconds is relatively short and may
cpep cause excessive polling CPU load
diff --git a/fwts-test/dbg2-0001/dbg2-0002.log b/fwts-test/dbg2-0001/dbg2-0002.log
index ba9ac24b..435e5a6c 100644
--- a/fwts-test/dbg2-0001/dbg2-0002.log
+++ b/fwts-test/dbg2-0001/dbg2-0002.log
@@ -19,8 +19,8 @@ dbg2 Reserved: 0x00f0
dbg2 Base Address Offset: 0x0016
dbg2 Address Size Offset: 0x3022
dbg2
-dbg2 FAILED [HIGH] DBG2NonZeroRevision: Test 1, DBG2 Info
-dbg2 Structure Revision is 0x01 and was expecting 0x00
+dbg2 FAILED [HIGH] DBG2BadFieldValue: Test 1, DBG2 Info
+dbg2 Structure Revision field must be 0, got 1 instead.
dbg2 FAILED [HIGH] DBG2PortSubTypeReserved: Test 1, DBG2 Info
dbg2 Structure Port Subtype is 0x0008 which is a reserved type.
dbg2 FAILED [MEDIUM] DBG2ReservedNonZero: Test 1, DBG2 Info
diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
index 830465d0..014b4648 100644
--- a/fwts-test/iort-0001/iort-0002.log
+++ b/fwts-test/iort-0001/iort-0002.log
@@ -18,8 +18,8 @@ iort FAILED [HIGH] IORTItsIdArrayOutsideTable: Test 1, IORT ITS
iort Identifier Array end is outside the IORT ACPI table.
iort Either the Number of ID mappings is too large or the IORT
iort table size or ITS Group Node is too small.
-iort FAILED [LOW] IORTNodeRevisionNonZero: Test 1, IORT Node
-iort Revision field is 0x03 and should be zero.
+iort FAILED [MEDIUM] IORTBadFieldValue: Test 1, IORT IORT Node
+iort Revision field must be 0, got 3 instead.
iort FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
iort Reserved field must be zero, got 0xffffffff instead
iort FAILED [LOW] IORTNodeMappingsCountNonZero: Test 1, IORT
@@ -98,8 +98,8 @@ iort ID Count: 0x00000003
iort Output Base: 0x00000004
iort Output Reference: 0x00000005
iort Flags: 0x00000001
-iort FAILED [LOW] IORTNodeRevisionNonZero: Test 1, IORT Node
-iort Revision field is 0x50 and should be zero.
+iort FAILED [MEDIUM] IORTBadFieldValue: Test 1, IORT IORT Node
+iort Revision field must be 0, got 80 instead.
iort FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
iort Reserved field must be zero, got 0x0000000f instead
iort FAILED [HIGH] IORTCPCIRootComplexAtsAttrInvalid: Test 1,
diff --git a/fwts-test/srat-0001/srat-0002.log b/fwts-test/srat-0001/srat-0002.log
index 9d5b1ffd..e5bc0433 100644
--- a/fwts-test/srat-0001/srat-0002.log
+++ b/fwts-test/srat-0001/srat-0002.log
@@ -1,8 +1,8 @@
srat srat: SRAT System Resource Affinity Table test.
srat ----------------------------------------------------------
srat Test 1 of 1: SRAT System Resource Affinity Table test.
-srat FAILED [MEDIUM] SRATInterfaceReserved: Test 1, SRAT
-srat reserved field 1 should be 1, instead was 0x7
+srat FAILED [MEDIUM] SRATBadFieldValue: Test 1, SRAT Revision1
+srat field must be 1, got 7 instead.
srat SRAT Local APIC/SAPIC Affinity Structure:
srat Type: 0x00
srat Length: 0x10
diff --git a/fwts-test/tcpa-0001/tcpa-0002.log b/fwts-test/tcpa-0001/tcpa-0002.log
index 05a905f4..63530ff5 100644
--- a/fwts-test/tcpa-0001/tcpa-0002.log
+++ b/fwts-test/tcpa-0001/tcpa-0002.log
@@ -2,10 +2,10 @@ tcpa tcpa: TCPA Trusted Computing Platform Alliance
tcpa Capabilities Table test.
tcpa ----------------------------------------------------------
tcpa Test 1 of 1: Validate TCPA table.
-tcpa FAILED [HIGH] TCPABadSize: Test 1, TCPA size is incorrect,
-tcpa expecting 0x32 bytes, instead got 0x00000064 bytes
-tcpa FAILED [HIGH] TCPABadRevision: Test 1, TCPA revision is
-tcpa incorrect, expecting 0x02, instead got 0x01
+tcpa FAILED [HIGH] TCPABadFieldValue: Test 1, TCPA Length field
+tcpa must be 50, got 100 instead.
+tcpa FAILED [HIGH] TCPABadFieldValue: Test 1, TCPA Revision
+tcpa field must be 2, got 1 instead.
tcpa TCPA Table:
tcpa Platform Class: 0x0000
tcpa Log Area Minimum Length: 0x00010000
diff --git a/fwts-test/wpbt-0001/wpbt-0002.log b/fwts-test/wpbt-0001/wpbt-0002.log
index 6acb79ba..5b1215fd 100644
--- a/fwts-test/wpbt-0001/wpbt-0002.log
+++ b/fwts-test/wpbt-0001/wpbt-0002.log
@@ -6,10 +6,10 @@ wpbt Handoff Memory Size: 0x12345678
wpbt Handoff Memory Location: 0xaa000000bb000000
wpbt Content Layout: 0x33
wpbt Content Type: 0x88
-wpbt FAILED [HIGH] WPBTBadLayout: Test 1, WPBT supports Content
-wpbt Layout 1 only, got 0x33 instead
-wpbt FAILED [HIGH] WPBTBadType: Test 1, WPBT supports Content
-wpbt Type 1 only, got 0x88 instead
+wpbt FAILED [HIGH] WPBTBadFieldValue: Test 1, WPBT Layout field
+wpbt must be 1, got 51 instead.
+wpbt FAILED [HIGH] WPBTBadFieldValue: Test 1, WPBT Type field
+wpbt must be 1, got 136 instead.
wpbt
wpbt
wpbt ==========================================================
--
2.25.1
More information about the fwts-devel
mailing list