[3/3] fwts-test: sync up with new fwts_acpi_reserved_bits_check

Message ID 1504861633-20512-3-git-send-email-alex.hung@canonical.com
State Accepted
Headers show
Series
  • [1/3] lib: fwts_acpi_tables: add a new function to check reserved bits
Related show

Commit Message

Alex Hung Sept. 8, 2017, 9:07 a.m.
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 fwts-test/asf-0001/asf-0002.log   |  6 ++--
 fwts-test/drtm-0001/drtm-0002.log |  5 ++--
 fwts-test/facs-0001/facs-0002.log | 10 +++----
 fwts-test/hest-0001/hest-0002.log | 18 ++++++------
 fwts-test/hmat-0001/hmat-0002.log |  8 +++---
 fwts-test/iort-0001/iort-0002.log | 58 +++++++++++++++++----------------------
 fwts-test/nfit-0001/nfit-0002.log | 13 +++++----
 fwts-test/pmtt-0001/pmtt-0002.log |  4 +--
 fwts-test/pptt-0001/pptt-0002.log |  8 +++---
 fwts-test/srat-0001/srat-0002.log | 18 ++++++------
 fwts-test/waet-0001/waet-0002.log |  6 ++--
 fwts-test/wsmt-0001/wsmt-0002.log |  5 ++--
 fwts-test/xenv-0001/xenv-0002.log |  4 +--
 13 files changed, 78 insertions(+), 85 deletions(-)

Comments

ivanhu Sept. 22, 2017, 8:51 a.m. | #1
On 09/08/2017 05:07 PM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>   fwts-test/asf-0001/asf-0002.log   |  6 ++--
>   fwts-test/drtm-0001/drtm-0002.log |  5 ++--
>   fwts-test/facs-0001/facs-0002.log | 10 +++----
>   fwts-test/hest-0001/hest-0002.log | 18 ++++++------
>   fwts-test/hmat-0001/hmat-0002.log |  8 +++---
>   fwts-test/iort-0001/iort-0002.log | 58 +++++++++++++++++----------------------
>   fwts-test/nfit-0001/nfit-0002.log | 13 +++++----
>   fwts-test/pmtt-0001/pmtt-0002.log |  4 +--
>   fwts-test/pptt-0001/pptt-0002.log |  8 +++---
>   fwts-test/srat-0001/srat-0002.log | 18 ++++++------
>   fwts-test/waet-0001/waet-0002.log |  6 ++--
>   fwts-test/wsmt-0001/wsmt-0002.log |  5 ++--
>   fwts-test/xenv-0001/xenv-0002.log |  4 +--
>   13 files changed, 78 insertions(+), 85 deletions(-)
> 
> diff --git a/fwts-test/asf-0001/asf-0002.log b/fwts-test/asf-0001/asf-0002.log
> index b8212e7..bee1002 100644
> --- a/fwts-test/asf-0001/asf-0002.log
> +++ b/fwts-test/asf-0001/asf-0002.log
> @@ -8,9 +8,9 @@ asf             in the range 0x01..0xff
>   asf             FAILED [HIGH] ASF!InfoMinPollWaitTimeInvalid: Test 1, ASF!
>   asf             ASF_INFO Minimum Poll Wait Time is 0x0 and must be in the
>   asf             range 0x02..0xff
> -asf             FAILED [HIGH] ASF!InfoFeatureFlagsReserved: Test 1, ASF!
> -asf             ASF_INFO Feature Flags is 0xff, however reserved bits [7
> -asf             :1] must be zero
> +asf             FAILED [HIGH] ASF!ReservedBitsNonZero: Test 1, ASF!
> +asf             ASF_INFO Feature Flags Bits [7..1] must be zero, got 0xff
> +asf             instead
>   asf             FAILED [MEDIUM] ASF!ReservedNonZero: Test 1, ASF! ASF_INFO
>   asf             Reserved1 field must be zero, got 0x10 instead
>   asf             FAILED [MEDIUM] ASF!ReservedNonZero: Test 1, ASF! ASF_INFO
> diff --git a/fwts-test/drtm-0001/drtm-0002.log b/fwts-test/drtm-0001/drtm-0002.log
> index 01fe9e1..05ed80e 100644
> --- a/fwts-test/drtm-0001/drtm-0002.log
> +++ b/fwts-test/drtm-0001/drtm-0002.log
> @@ -11,8 +11,9 @@ drtm              Log_Area_Start:           0x0000000050000000
>   drtm              Log_Area_Length:          0x00006000
>   drtm              Architecture_Dependent:   0x0000000070000000
>   drtm              DRT_Flags:                0x00008000
> -drtm            FAILED [MEDIUM] DRTMBadFlagReservedNonZero: Test 1, DRTM
> -drtm            DRT_Flags Bits [31:4] are reserved, got 0x00008000 instead
> +drtm            FAILED [HIGH] DRTMReservedBitsNonZero: Test 1, DRTM
> +drtm            DRT_Flags Bits [31..4] must be zero, got 0x00008000
> +drtm            instead
>   drtm
>   drtm              VTL_Length:               0x00000002
>   drtm              Validated_Tables:         0x00000000a0000000
> diff --git a/fwts-test/facs-0001/facs-0002.log b/fwts-test/facs-0001/facs-0002.log
> index 6d7cb7c..68b2ee4 100644
> --- a/fwts-test/facs-0001/facs-0002.log
> +++ b/fwts-test/facs-0001/facs-0002.log
> @@ -21,12 +21,10 @@ facs              Reserved:                 0x00 0x00 0x00 0x00
>   facs              Reserved:                 0x00 0x00 0x00 0x00
>   facs            FAILED [LOW] FACSInvalidReserved1: Test 1, FACS: 1st
>   facs            Reserved field is non-zero
> -facs            FAILED [MEDIUM] FACSFlagsReservedBitsSet: Test 1, FACS:
> -facs            Flags field is 0xffffffff and some of the reserved bits
> -facs            [31:2] are set
> -facs            FAILED [MEDIUM] FACSFlagsReservedBitsSet: Test 1, FACS:
> -facs            OSPM Flags field is 0xefefefef and some of the reserved
> -facs            bits [31:1] are set
> +facs            FAILED [HIGH] FACSReservedBitsNonZero: Test 1, FACS Flags
> +facs            Bits [31..2] must be zero, got 0xffffffff instead
> +facs            FAILED [HIGH] FACSReservedBitsNonZero: Test 1, FACS OSPM
> +facs            Flags Bits [31..1] must be zero, got 0xefefefef instead
>   facs            FAILED [LOW] FACSInvalidReserved1: Test 1, FACS: 2nd
>   facs            Reserved field is non-zero
>   facs
> diff --git a/fwts-test/hest-0001/hest-0002.log b/fwts-test/hest-0001/hest-0002.log
> index 274c0cf..88aa45d 100644
> --- a/fwts-test/hest-0001/hest-0002.log
> +++ b/fwts-test/hest-0001/hest-0002.log
> @@ -23,9 +23,9 @@ hest              Correctable Error Mask:   0x000011c1
>   hest              Advanced Capabilities:    0x00000000
>   hest              Root Error Command:       0x00000006
>   hest
> -hest            FAILED [MEDIUM] HESTPciExpressRootPortFlagsReserved: Test
> -hest            1, HEST PCI Express Root Port Flags Reserved bits [2:7]
> -hest            must be zero, instead got 0x7
> +hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
> +hest            Express Root Port Flags Bits [7..2] must be zero, got 0x07
> +hest            instead
>   hest            HEST PCI Express Device AER:
>   hest              Type:                     0x07
>   hest              Source ID:                0x00ff
> @@ -43,9 +43,9 @@ hest              Uncorrectable Severity:   0x0017f011
>   hest              Correctable Error Mask:   0x000011c1
>   hest              Advanced Capabilities:    0x00000000
>   hest
> -hest            FAILED [MEDIUM] HESTPciExpressDeviceFlagsReserved: Test 1,
> -hest            HEST PCI Express Device Flags Reserved bits [2:7] must be
> -hest            zero, instead got 0x9
> +hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
> +hest            Express Device Flags Bits [7..2] must be zero, got 0x09
> +hest            instead
>   hest            FAILED [HIGH] HESTInvalidRecordsToPreallocate: Test 1,
>   hest            HEST PCI Express Device Number of Records to Preallocate
>   hest            is 0x0 and must be more than zero.
> @@ -70,9 +70,9 @@ hest              2nd Uncorrectable Mask:   0x00100020
>   hest              2nd Uncurrectable Svrity: 0x0017f011
>   hest              2nd Advanced Capabilities:0x00000000
>   hest
> -hest            FAILED [MEDIUM] HESTPciExpressBridgeFlagsReserved: Test 1,
> -hest            HEST PCI Express Bridge Flags Reserved bits [2:7] must be
> -hest            zero, instead got 0xf
> +hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
> +hest            Express Bridge Flags Bits [7..2] must be zero, got 0x0f
> +hest            instead
>   hest            FAILED [HIGH] HESTInvalidRecordsToPreallocate: Test 1,
>   hest            HEST PCI Express Bridge Number of Records to Preallocate
>   hest            is 0x0 and must be more than zero.
> diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
> index d90468b..953413c 100644
> --- a/fwts-test/hmat-0001/hmat-0002.log
> +++ b/fwts-test/hmat-0001/hmat-0002.log
> @@ -16,8 +16,8 @@ hmat                System Phy Addr Range Base:     0x0000000000000000
>   hmat                System Phy Addr Range Length:   0x0000000000000000
>   hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>   hmat            field must be zero, got 0x0001 instead
> -hmat            FAILED [HIGH] HMATBadFlags: Test 1, HMAT Flags's
> -hmat            Bits[15..3] must be zero, got 0x000f instead
> +hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> +hmat            Bits [15..3] must be zero, got 0x000f instead
>   hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>   hmat            field must be zero, got 0x0002 instead
>   hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
> @@ -36,8 +36,8 @@ hmat                Reserved:                       0x00000006
>   hmat                Entry Base Unit:                0x0000000000000000
>   hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>   hmat            field must be zero, got 0x0004 instead
> -hmat            FAILED [CRITICAL] HMATBadFlags: Test 1, HMAT Flags's
> -hmat            Bits[7..5] must be zero, got 0x3f instead
> +hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> +hmat            Bits [7..5] must be zero, got 0x3f instead
>   hmat            FAILED [CRITICAL] HMATBadFDataType: Test 1, HMAT Data Type
>   hmat            must be 0..5, got 0x06 instead
>   hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
> diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
> index 7a0746b..82eb3d0 100644
> --- a/fwts-test/iort-0001/iort-0002.log
> +++ b/fwts-test/iort-0001/iort-0002.log
> @@ -164,36 +164,28 @@ iort            FAILED [LOW] IORTNodeRevisionNonZero: Test 1, IORT Node
>   iort            Revision field is 0xa0 and should be zero.
>   iort            FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
>   iort            Reserved field must be zero, got 0x00008100 instead
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_NsgIrpt Flags field reserved bits [31:1] should
> -iort            be all zero, got 0x2
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_NsgCfgIrpt Flags field reserved bits [31:1]
> -iort            should be all zero, got 0x4
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x8
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x10
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x20
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x40
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0xaa
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0xab
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x92
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x4
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_NsgIrpt Bits [31..1] must be zero, got 0x00000002
> +iort            instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_NsgCfgIrpt Bits [31..1] must be zero, got 0x00000004
> +iort            instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000008 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000010 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000020 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000040 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x000000aa instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x000000ab instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000092 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000004 instead
>   iort            FAILED [HIGH] IORTSmmuInterruptsOutsideTable: Test 1, IORT
>   iort            SMMU Interrupt 4 is outside the IORT ACPI table. Either
>   iort            the offset is incorrect or the IORT table size is too
> @@ -204,9 +196,9 @@ iort            offset is incorrect or the IORT table size or the node is
>   iort            too small.
>   iort            FAILED [HIGH] IORTSmmuInvalidModel: Test 1, IORT SMMU
>   iort            Model is 0x4 and was expecting a model value 0 to 3.
> -iort            FAILED [HIGH] IORTSmmuReservedFlags: Test 1, IORT SMMU
> -iort            Reserved Flags is 0xaa and has some reserved bits [31:2]
> -iort            set when they should be zero.
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT SMMU
> +iort            Reserved Flags Bits [31..2] must be zero, got 0x000000aa
> +iort            instead
>   iort
>   iort            FAILED [HIGH] IORTInvalidType: Test 1, IORT Type 0xff is
>   iort            invalid, aborting check
> diff --git a/fwts-test/nfit-0001/nfit-0002.log b/fwts-test/nfit-0001/nfit-0002.log
> index 02fba5a..2b13fe4 100644
> --- a/fwts-test/nfit-0001/nfit-0002.log
> +++ b/fwts-test/nfit-0001/nfit-0002.log
> @@ -19,8 +19,8 @@ nfit                System Physical Address Range Length:   0x000000000c000000
>   nfit                Address Range Memory Mapping Attribute: 0x00000000000000ff
>   nfit            FAILED [HIGH] NFITBadRangeIndexZero: Test 1, NFIT SPA
>   nfit            Range Structure Index must not be zero
> -nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
> -nfit            Bits[15..2] must be zero, got 0x00000005 instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Flags
> +nfit            Bits [15..2] must be zero, got 0x0005 instead
>   nfit            FAILED [HIGH] NFITBadMemoryMappingAttribute: Test 1, NFIT
>   nfit            Memory Mapping Attribute must meet UEFI Spec, got
>   nfit            0x00000000000000ff instead
> @@ -42,8 +42,8 @@ nfit                Interleave Structure Index:             0x0001
>   nfit                Interleave Ways:                        0x0003
>   nfit                NVDIMM State Flags:                     0x00fa
>   nfit                Reserved:                               0x0000
> -nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
> -nfit            Bits[15..7] must be zero, got 0x000000fa instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
> +nfit            State Flags Bits [15..7] must be zero, got 0x00fa instead
>   nfit
>   nfit              NFIT Subtable:
>   nfit                Type:                                   0x0002
> @@ -101,8 +101,9 @@ nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
>   nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
>   nfit            FAILED [HIGH] NFITBadValidField: Test 1, NFIT Valid
>   nfit            Field's Bits[7..1] must be zero, got 0x03 instead
> -nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
> -nfit            Bits[15..1] must be zero, got 0x0003 instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
> +nfit            Control Region Flags Bits [15..1] must be zero, got 0x0003
> +nfit            instead
>   nfit            FAILED [MEDIUM] NFITReservedNonZero: Test 1, NFIT Reserved
>   nfit            field must be zero, got 0x0000000000000f00 instead
>   nfit
> diff --git a/fwts-test/pmtt-0001/pmtt-0002.log b/fwts-test/pmtt-0001/pmtt-0002.log
> index 2ce24a2..dfa1d00 100644
> --- a/fwts-test/pmtt-0001/pmtt-0002.log
> +++ b/fwts-test/pmtt-0001/pmtt-0002.log
> @@ -95,8 +95,8 @@ pmtt                Reserved:                       0x00
>   pmtt                Length:                         0x000c
>   pmtt                Flags:                          0x0013
>   pmtt                Reserved:                       0x0000
> -pmtt            FAILED [HIGH] PMTTBadFlags: Test 1, PMTT Flags's
> -pmtt            Bits[15..4] must be zero, got 0x0013 instead
> +pmtt            FAILED [HIGH] PMTTReservedBitsNonZero: Test 1, PMTT Flags
> +pmtt            Bits [15..4] must be zero, got 0x0013 instead
>   pmtt                Socket Identifier:              0x0002
>   pmtt                Reserved:                       0x0000
>   pmtt              PMTT Subtable:
> diff --git a/fwts-test/pptt-0001/pptt-0002.log b/fwts-test/pptt-0001/pptt-0002.log
> index 4b3f2a6..0c83c65 100644
> --- a/fwts-test/pptt-0001/pptt-0002.log
> +++ b/fwts-test/pptt-0001/pptt-0002.log
> @@ -40,8 +40,8 @@ pptt                Private Resources[0]:           0x00000000
>   pptt                Private Resources[1]:           0x00000000
>   pptt            FAILED [MEDIUM] PPTTReservedNonZero: Test 1, PPTT Reserved
>   pptt            field must be zero, got 0x0003 instead
> -pptt            FAILED [HIGH] PPTTBadFlags: Test 1, PPTT Flags's
> -pptt            Bits[31..2] must be zero, got 0x00000007 instead
> +pptt            FAILED [HIGH] PPTTReservedBitsNonZero: Test 1, PPTT Flags
> +pptt            Bits [31..2] must be zero, got 0x00000007 instead
>   pptt
>   pptt              Cache Type Structure (Type 1):
>   pptt                Type:                           0x01
> @@ -56,8 +56,8 @@ pptt                Attributes:                     0x00
>   pptt                Line size:                      0x0000
>   pptt            FAILED [MEDIUM] PPTTReservedNonZero: Test 1, PPTT Reserved
>   pptt            field must be zero, got 0x0004 instead
> -pptt            FAILED [HIGH] PPTTBadFlags: Test 1, PPTT Flags's
> -pptt            Bits[31..7] must be zero, got 0x000000ff instead
> +pptt            FAILED [HIGH] PPTTReservedBitsNonZero: Test 1, PPTT Flags
> +pptt            Bits [31..7] must be zero, got 0x000000ff instead
>   pptt
>   pptt              ID structure (Type 2):
>   pptt                Type:                           0x02
> diff --git a/fwts-test/srat-0001/srat-0002.log b/fwts-test/srat-0001/srat-0002.log
> index 2abc922..9d5b1ff 100644
> --- a/fwts-test/srat-0001/srat-0002.log
> +++ b/fwts-test/srat-0001/srat-0002.log
> @@ -15,9 +15,9 @@ srat              Proximity Domain: [16:23] 0x00
>   srat              Proximity Domain: [23:31] 0x00
>   srat              Clock Domain              0x00000000
>   srat
> -srat            FAILED [MEDIUM] SRATLocalApicSapicAffinityFlags: Test 1,
> -srat            SRAT Local APIC/SPAIC Affinity Flags field reserved bits
> -srat            1..31 should be zero, got 0x9
> +srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Local
> +srat            APIC/SPAIC Affinity Flags Bits [31..1] must be zero, got
> +srat            0x00000009 instead
>   srat            SRAT Local APIC/SAPIC Affinity Structure:
>   srat              Type:                     0x00
>   srat              Length:                   0x10
> @@ -76,9 +76,9 @@ srat              Reserved:                 0x0000000f
>   srat              Flags:                    0x000000ff
>   srat              Reserved:                 0x0000000000000000
>   srat
> -srat            FAILED [MEDIUM] SRATMemoryAffinityFlags: Test 1, SRAT
> -srat            Memory Affinity Flags field reserved bits 3..31 should be
> -srat            zero, got 0xff
> +srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Memory
> +srat            Affinity Flags Bits [31..3] must be zero, got 0x000000ff
> +srat            instead
>   srat            SRAT Memory Affinity Structure:
>   srat              Type:                     0x01
>   srat              Length:                   0x28
> @@ -90,9 +90,9 @@ srat              Reserved:                 0x00000001
>   srat              Flags:                    0x00000008
>   srat              Reserved:                 0x0000000000000000
>   srat
> -srat            FAILED [MEDIUM] SRATMemoryAffinityFlags: Test 1, SRAT
> -srat            Memory Affinity Flags field reserved bits 3..31 should be
> -srat            zero, got 0x8
> +srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Memory
> +srat            Affinity Flags Bits [31..3] must be zero, got 0x00000008
> +srat            instead
>   srat
>   srat            ==========================================================
>   srat            0 passed, 4 failed, 0 warning, 0 aborted, 0 skipped, 0
> diff --git a/fwts-test/waet-0001/waet-0002.log b/fwts-test/waet-0001/waet-0002.log
> index a8552c2..066ece2 100644
> --- a/fwts-test/waet-0001/waet-0002.log
> +++ b/fwts-test/waet-0001/waet-0002.log
> @@ -6,9 +6,9 @@ waet              Emulated Device Flags:    0xfffffffc
>   waet                Bit [0] RTC Good:       0
>   waet                Bit [1] PM Timer Good:  0
>   waet
> -waet            FAILED [HIGH] WAETFlagReservedNotZero: Test 1, WAET
> -waet            Emulated Device Flags was 0xfffffffc and so some of
> -waet            reserved bits [31:2] are not zero as expected.
> +waet            FAILED [HIGH] WAETReservedBitsNonZero: Test 1, WAET
> +waet            Emulated Device Flags Bits [31..2] must be zero, got
> +waet            0xfffffffc instead
>   waet
>   waet            ==========================================================
>   waet            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
> diff --git a/fwts-test/wsmt-0001/wsmt-0002.log b/fwts-test/wsmt-0001/wsmt-0002.log
> index b862a8f..52c45c2 100644
> --- a/fwts-test/wsmt-0001/wsmt-0002.log
> +++ b/fwts-test/wsmt-0001/wsmt-0002.log
> @@ -4,8 +4,9 @@ wsmt            Test 1 of 1: WSMT Windows SMM Security Mitigations Table
>   wsmt            test.
>   wsmt            WSMT Windows SMM Security Mitigations Table:
>   wsmt              Protection Flags:      0x00000009
> -wsmt            FAILED [MEDIUM] WSMTFlagsReserved: Test 1, WSMT Protection
> -wsmt            Flags reserved bits [3:31] must be zero, instead got 0x9
> +wsmt            FAILED [HIGH] WSMTReservedBitsNonZero: Test 1, WSMT
> +wsmt            Protection Flags Bits [31..3] must be zero, got 0x00000009
> +wsmt            instead
>   wsmt
>   wsmt
>   wsmt            ==========================================================
> diff --git a/fwts-test/xenv-0001/xenv-0002.log b/fwts-test/xenv-0001/xenv-0002.log
> index ca573a3..c25a0db 100644
> --- a/fwts-test/xenv-0001/xenv-0002.log
> +++ b/fwts-test/xenv-0001/xenv-0002.log
> @@ -6,8 +6,8 @@ xenv              GNT Start Address:               0x0000000010000000
>   xenv              GNT Size:                        0x0000000000002000
>   xenv              Evtchn Intr:                     0x25000000
>   xenv              Evtchn Intr Flags:               0x07
> -xenv            FAILED [HIGH] XENVBadEvtchnIntrFlags: Test 1, XENV Evtchn
> -xenv            Intr Flags was 0x07 and reserved bits [7:2] are not zero.
> +xenv            FAILED [HIGH] XENVReservedBitsNonZero: Test 1, XENV Evtchn
> +xenv            Intr Flags Bits [7..2] must be zero, got 0x07 instead
>   xenv
>   xenv            ==========================================================
>   xenv            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
> 

Acked-by: Ivan Hu <ivan.hu@canonical.com>
Colin King Sept. 25, 2017, 12:01 p.m. | #2
On 08/09/17 10:07, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/asf-0001/asf-0002.log   |  6 ++--
>  fwts-test/drtm-0001/drtm-0002.log |  5 ++--
>  fwts-test/facs-0001/facs-0002.log | 10 +++----
>  fwts-test/hest-0001/hest-0002.log | 18 ++++++------
>  fwts-test/hmat-0001/hmat-0002.log |  8 +++---
>  fwts-test/iort-0001/iort-0002.log | 58 +++++++++++++++++----------------------
>  fwts-test/nfit-0001/nfit-0002.log | 13 +++++----
>  fwts-test/pmtt-0001/pmtt-0002.log |  4 +--
>  fwts-test/pptt-0001/pptt-0002.log |  8 +++---
>  fwts-test/srat-0001/srat-0002.log | 18 ++++++------
>  fwts-test/waet-0001/waet-0002.log |  6 ++--
>  fwts-test/wsmt-0001/wsmt-0002.log |  5 ++--
>  fwts-test/xenv-0001/xenv-0002.log |  4 +--
>  13 files changed, 78 insertions(+), 85 deletions(-)
> 
> diff --git a/fwts-test/asf-0001/asf-0002.log b/fwts-test/asf-0001/asf-0002.log
> index b8212e7..bee1002 100644
> --- a/fwts-test/asf-0001/asf-0002.log
> +++ b/fwts-test/asf-0001/asf-0002.log
> @@ -8,9 +8,9 @@ asf             in the range 0x01..0xff
>  asf             FAILED [HIGH] ASF!InfoMinPollWaitTimeInvalid: Test 1, ASF!
>  asf             ASF_INFO Minimum Poll Wait Time is 0x0 and must be in the
>  asf             range 0x02..0xff
> -asf             FAILED [HIGH] ASF!InfoFeatureFlagsReserved: Test 1, ASF!
> -asf             ASF_INFO Feature Flags is 0xff, however reserved bits [7
> -asf             :1] must be zero
> +asf             FAILED [HIGH] ASF!ReservedBitsNonZero: Test 1, ASF!
> +asf             ASF_INFO Feature Flags Bits [7..1] must be zero, got 0xff
> +asf             instead
>  asf             FAILED [MEDIUM] ASF!ReservedNonZero: Test 1, ASF! ASF_INFO
>  asf             Reserved1 field must be zero, got 0x10 instead
>  asf             FAILED [MEDIUM] ASF!ReservedNonZero: Test 1, ASF! ASF_INFO
> diff --git a/fwts-test/drtm-0001/drtm-0002.log b/fwts-test/drtm-0001/drtm-0002.log
> index 01fe9e1..05ed80e 100644
> --- a/fwts-test/drtm-0001/drtm-0002.log
> +++ b/fwts-test/drtm-0001/drtm-0002.log
> @@ -11,8 +11,9 @@ drtm              Log_Area_Start:           0x0000000050000000
>  drtm              Log_Area_Length:          0x00006000
>  drtm              Architecture_Dependent:   0x0000000070000000
>  drtm              DRT_Flags:                0x00008000
> -drtm            FAILED [MEDIUM] DRTMBadFlagReservedNonZero: Test 1, DRTM
> -drtm            DRT_Flags Bits [31:4] are reserved, got 0x00008000 instead
> +drtm            FAILED [HIGH] DRTMReservedBitsNonZero: Test 1, DRTM
> +drtm            DRT_Flags Bits [31..4] must be zero, got 0x00008000
> +drtm            instead
>  drtm            
>  drtm              VTL_Length:               0x00000002
>  drtm              Validated_Tables:         0x00000000a0000000
> diff --git a/fwts-test/facs-0001/facs-0002.log b/fwts-test/facs-0001/facs-0002.log
> index 6d7cb7c..68b2ee4 100644
> --- a/fwts-test/facs-0001/facs-0002.log
> +++ b/fwts-test/facs-0001/facs-0002.log
> @@ -21,12 +21,10 @@ facs              Reserved:                 0x00 0x00 0x00 0x00
>  facs              Reserved:                 0x00 0x00 0x00 0x00
>  facs            FAILED [LOW] FACSInvalidReserved1: Test 1, FACS: 1st
>  facs            Reserved field is non-zero
> -facs            FAILED [MEDIUM] FACSFlagsReservedBitsSet: Test 1, FACS:
> -facs            Flags field is 0xffffffff and some of the reserved bits
> -facs            [31:2] are set
> -facs            FAILED [MEDIUM] FACSFlagsReservedBitsSet: Test 1, FACS:
> -facs            OSPM Flags field is 0xefefefef and some of the reserved
> -facs            bits [31:1] are set
> +facs            FAILED [HIGH] FACSReservedBitsNonZero: Test 1, FACS Flags
> +facs            Bits [31..2] must be zero, got 0xffffffff instead
> +facs            FAILED [HIGH] FACSReservedBitsNonZero: Test 1, FACS OSPM
> +facs            Flags Bits [31..1] must be zero, got 0xefefefef instead
>  facs            FAILED [LOW] FACSInvalidReserved1: Test 1, FACS: 2nd
>  facs            Reserved field is non-zero
>  facs            
> diff --git a/fwts-test/hest-0001/hest-0002.log b/fwts-test/hest-0001/hest-0002.log
> index 274c0cf..88aa45d 100644
> --- a/fwts-test/hest-0001/hest-0002.log
> +++ b/fwts-test/hest-0001/hest-0002.log
> @@ -23,9 +23,9 @@ hest              Correctable Error Mask:   0x000011c1
>  hest              Advanced Capabilities:    0x00000000
>  hest              Root Error Command:       0x00000006
>  hest            
> -hest            FAILED [MEDIUM] HESTPciExpressRootPortFlagsReserved: Test
> -hest            1, HEST PCI Express Root Port Flags Reserved bits [2:7]
> -hest            must be zero, instead got 0x7
> +hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
> +hest            Express Root Port Flags Bits [7..2] must be zero, got 0x07
> +hest            instead
>  hest            HEST PCI Express Device AER:
>  hest              Type:                     0x07
>  hest              Source ID:                0x00ff
> @@ -43,9 +43,9 @@ hest              Uncorrectable Severity:   0x0017f011
>  hest              Correctable Error Mask:   0x000011c1
>  hest              Advanced Capabilities:    0x00000000
>  hest            
> -hest            FAILED [MEDIUM] HESTPciExpressDeviceFlagsReserved: Test 1,
> -hest            HEST PCI Express Device Flags Reserved bits [2:7] must be
> -hest            zero, instead got 0x9
> +hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
> +hest            Express Device Flags Bits [7..2] must be zero, got 0x09
> +hest            instead
>  hest            FAILED [HIGH] HESTInvalidRecordsToPreallocate: Test 1,
>  hest            HEST PCI Express Device Number of Records to Preallocate
>  hest            is 0x0 and must be more than zero.
> @@ -70,9 +70,9 @@ hest              2nd Uncorrectable Mask:   0x00100020
>  hest              2nd Uncurrectable Svrity: 0x0017f011
>  hest              2nd Advanced Capabilities:0x00000000
>  hest            
> -hest            FAILED [MEDIUM] HESTPciExpressBridgeFlagsReserved: Test 1,
> -hest            HEST PCI Express Bridge Flags Reserved bits [2:7] must be
> -hest            zero, instead got 0xf
> +hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
> +hest            Express Bridge Flags Bits [7..2] must be zero, got 0x0f
> +hest            instead
>  hest            FAILED [HIGH] HESTInvalidRecordsToPreallocate: Test 1,
>  hest            HEST PCI Express Bridge Number of Records to Preallocate
>  hest            is 0x0 and must be more than zero.
> diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
> index d90468b..953413c 100644
> --- a/fwts-test/hmat-0001/hmat-0002.log
> +++ b/fwts-test/hmat-0001/hmat-0002.log
> @@ -16,8 +16,8 @@ hmat                System Phy Addr Range Base:     0x0000000000000000
>  hmat                System Phy Addr Range Length:   0x0000000000000000
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0001 instead
> -hmat            FAILED [HIGH] HMATBadFlags: Test 1, HMAT Flags's
> -hmat            Bits[15..3] must be zero, got 0x000f instead
> +hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> +hmat            Bits [15..3] must be zero, got 0x000f instead
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0002 instead
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
> @@ -36,8 +36,8 @@ hmat                Reserved:                       0x00000006
>  hmat                Entry Base Unit:                0x0000000000000000
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0004 instead
> -hmat            FAILED [CRITICAL] HMATBadFlags: Test 1, HMAT Flags's
> -hmat            Bits[7..5] must be zero, got 0x3f instead
> +hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> +hmat            Bits [7..5] must be zero, got 0x3f instead
>  hmat            FAILED [CRITICAL] HMATBadFDataType: Test 1, HMAT Data Type
>  hmat            must be 0..5, got 0x06 instead
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
> diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
> index 7a0746b..82eb3d0 100644
> --- a/fwts-test/iort-0001/iort-0002.log
> +++ b/fwts-test/iort-0001/iort-0002.log
> @@ -164,36 +164,28 @@ iort            FAILED [LOW] IORTNodeRevisionNonZero: Test 1, IORT Node
>  iort            Revision field is 0xa0 and should be zero.
>  iort            FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
>  iort            Reserved field must be zero, got 0x00008100 instead
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_NsgIrpt Flags field reserved bits [31:1] should
> -iort            be all zero, got 0x2
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_NsgCfgIrpt Flags field reserved bits [31:1]
> -iort            should be all zero, got 0x4
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x8
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x10
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x20
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x40
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0xaa
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0xab
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x92
> -iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
> -iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
> -iort            all zero, got 0x4
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_NsgIrpt Bits [31..1] must be zero, got 0x00000002
> +iort            instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_NsgCfgIrpt Bits [31..1] must be zero, got 0x00000004
> +iort            instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000008 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000010 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000020 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000040 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x000000aa instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x000000ab instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000092 instead
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
> +iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000004 instead
>  iort            FAILED [HIGH] IORTSmmuInterruptsOutsideTable: Test 1, IORT
>  iort            SMMU Interrupt 4 is outside the IORT ACPI table. Either
>  iort            the offset is incorrect or the IORT table size is too
> @@ -204,9 +196,9 @@ iort            offset is incorrect or the IORT table size or the node is
>  iort            too small.
>  iort            FAILED [HIGH] IORTSmmuInvalidModel: Test 1, IORT SMMU
>  iort            Model is 0x4 and was expecting a model value 0 to 3.
> -iort            FAILED [HIGH] IORTSmmuReservedFlags: Test 1, IORT SMMU
> -iort            Reserved Flags is 0xaa and has some reserved bits [31:2]
> -iort            set when they should be zero.
> +iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT SMMU
> +iort            Reserved Flags Bits [31..2] must be zero, got 0x000000aa
> +iort            instead
>  iort            
>  iort            FAILED [HIGH] IORTInvalidType: Test 1, IORT Type 0xff is
>  iort            invalid, aborting check
> diff --git a/fwts-test/nfit-0001/nfit-0002.log b/fwts-test/nfit-0001/nfit-0002.log
> index 02fba5a..2b13fe4 100644
> --- a/fwts-test/nfit-0001/nfit-0002.log
> +++ b/fwts-test/nfit-0001/nfit-0002.log
> @@ -19,8 +19,8 @@ nfit                System Physical Address Range Length:   0x000000000c000000
>  nfit                Address Range Memory Mapping Attribute: 0x00000000000000ff
>  nfit            FAILED [HIGH] NFITBadRangeIndexZero: Test 1, NFIT SPA
>  nfit            Range Structure Index must not be zero
> -nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
> -nfit            Bits[15..2] must be zero, got 0x00000005 instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Flags
> +nfit            Bits [15..2] must be zero, got 0x0005 instead
>  nfit            FAILED [HIGH] NFITBadMemoryMappingAttribute: Test 1, NFIT
>  nfit            Memory Mapping Attribute must meet UEFI Spec, got
>  nfit            0x00000000000000ff instead
> @@ -42,8 +42,8 @@ nfit                Interleave Structure Index:             0x0001
>  nfit                Interleave Ways:                        0x0003
>  nfit                NVDIMM State Flags:                     0x00fa
>  nfit                Reserved:                               0x0000
> -nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
> -nfit            Bits[15..7] must be zero, got 0x000000fa instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
> +nfit            State Flags Bits [15..7] must be zero, got 0x00fa instead
>  nfit            
>  nfit              NFIT Subtable:
>  nfit                Type:                                   0x0002
> @@ -101,8 +101,9 @@ nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
>  nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
>  nfit            FAILED [HIGH] NFITBadValidField: Test 1, NFIT Valid
>  nfit            Field's Bits[7..1] must be zero, got 0x03 instead
> -nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
> -nfit            Bits[15..1] must be zero, got 0x0003 instead
> +nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
> +nfit            Control Region Flags Bits [15..1] must be zero, got 0x0003
> +nfit            instead
>  nfit            FAILED [MEDIUM] NFITReservedNonZero: Test 1, NFIT Reserved
>  nfit            field must be zero, got 0x0000000000000f00 instead
>  nfit            
> diff --git a/fwts-test/pmtt-0001/pmtt-0002.log b/fwts-test/pmtt-0001/pmtt-0002.log
> index 2ce24a2..dfa1d00 100644
> --- a/fwts-test/pmtt-0001/pmtt-0002.log
> +++ b/fwts-test/pmtt-0001/pmtt-0002.log
> @@ -95,8 +95,8 @@ pmtt                Reserved:                       0x00
>  pmtt                Length:                         0x000c
>  pmtt                Flags:                          0x0013
>  pmtt                Reserved:                       0x0000
> -pmtt            FAILED [HIGH] PMTTBadFlags: Test 1, PMTT Flags's
> -pmtt            Bits[15..4] must be zero, got 0x0013 instead
> +pmtt            FAILED [HIGH] PMTTReservedBitsNonZero: Test 1, PMTT Flags
> +pmtt            Bits [15..4] must be zero, got 0x0013 instead
>  pmtt                Socket Identifier:              0x0002
>  pmtt                Reserved:                       0x0000
>  pmtt              PMTT Subtable:
> diff --git a/fwts-test/pptt-0001/pptt-0002.log b/fwts-test/pptt-0001/pptt-0002.log
> index 4b3f2a6..0c83c65 100644
> --- a/fwts-test/pptt-0001/pptt-0002.log
> +++ b/fwts-test/pptt-0001/pptt-0002.log
> @@ -40,8 +40,8 @@ pptt                Private Resources[0]:           0x00000000
>  pptt                Private Resources[1]:           0x00000000
>  pptt            FAILED [MEDIUM] PPTTReservedNonZero: Test 1, PPTT Reserved
>  pptt            field must be zero, got 0x0003 instead
> -pptt            FAILED [HIGH] PPTTBadFlags: Test 1, PPTT Flags's
> -pptt            Bits[31..2] must be zero, got 0x00000007 instead
> +pptt            FAILED [HIGH] PPTTReservedBitsNonZero: Test 1, PPTT Flags
> +pptt            Bits [31..2] must be zero, got 0x00000007 instead
>  pptt            
>  pptt              Cache Type Structure (Type 1):
>  pptt                Type:                           0x01
> @@ -56,8 +56,8 @@ pptt                Attributes:                     0x00
>  pptt                Line size:                      0x0000
>  pptt            FAILED [MEDIUM] PPTTReservedNonZero: Test 1, PPTT Reserved
>  pptt            field must be zero, got 0x0004 instead
> -pptt            FAILED [HIGH] PPTTBadFlags: Test 1, PPTT Flags's
> -pptt            Bits[31..7] must be zero, got 0x000000ff instead
> +pptt            FAILED [HIGH] PPTTReservedBitsNonZero: Test 1, PPTT Flags
> +pptt            Bits [31..7] must be zero, got 0x000000ff instead
>  pptt            
>  pptt              ID structure (Type 2):
>  pptt                Type:                           0x02
> diff --git a/fwts-test/srat-0001/srat-0002.log b/fwts-test/srat-0001/srat-0002.log
> index 2abc922..9d5b1ff 100644
> --- a/fwts-test/srat-0001/srat-0002.log
> +++ b/fwts-test/srat-0001/srat-0002.log
> @@ -15,9 +15,9 @@ srat              Proximity Domain: [16:23] 0x00
>  srat              Proximity Domain: [23:31] 0x00
>  srat              Clock Domain              0x00000000
>  srat            
> -srat            FAILED [MEDIUM] SRATLocalApicSapicAffinityFlags: Test 1,
> -srat            SRAT Local APIC/SPAIC Affinity Flags field reserved bits
> -srat            1..31 should be zero, got 0x9
> +srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Local
> +srat            APIC/SPAIC Affinity Flags Bits [31..1] must be zero, got
> +srat            0x00000009 instead
>  srat            SRAT Local APIC/SAPIC Affinity Structure:
>  srat              Type:                     0x00
>  srat              Length:                   0x10
> @@ -76,9 +76,9 @@ srat              Reserved:                 0x0000000f
>  srat              Flags:                    0x000000ff
>  srat              Reserved:                 0x0000000000000000
>  srat            
> -srat            FAILED [MEDIUM] SRATMemoryAffinityFlags: Test 1, SRAT
> -srat            Memory Affinity Flags field reserved bits 3..31 should be
> -srat            zero, got 0xff
> +srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Memory
> +srat            Affinity Flags Bits [31..3] must be zero, got 0x000000ff
> +srat            instead
>  srat            SRAT Memory Affinity Structure:
>  srat              Type:                     0x01
>  srat              Length:                   0x28
> @@ -90,9 +90,9 @@ srat              Reserved:                 0x00000001
>  srat              Flags:                    0x00000008
>  srat              Reserved:                 0x0000000000000000
>  srat            
> -srat            FAILED [MEDIUM] SRATMemoryAffinityFlags: Test 1, SRAT
> -srat            Memory Affinity Flags field reserved bits 3..31 should be
> -srat            zero, got 0x8
> +srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Memory
> +srat            Affinity Flags Bits [31..3] must be zero, got 0x00000008
> +srat            instead
>  srat            
>  srat            ==========================================================
>  srat            0 passed, 4 failed, 0 warning, 0 aborted, 0 skipped, 0
> diff --git a/fwts-test/waet-0001/waet-0002.log b/fwts-test/waet-0001/waet-0002.log
> index a8552c2..066ece2 100644
> --- a/fwts-test/waet-0001/waet-0002.log
> +++ b/fwts-test/waet-0001/waet-0002.log
> @@ -6,9 +6,9 @@ waet              Emulated Device Flags:    0xfffffffc
>  waet                Bit [0] RTC Good:       0
>  waet                Bit [1] PM Timer Good:  0
>  waet            
> -waet            FAILED [HIGH] WAETFlagReservedNotZero: Test 1, WAET
> -waet            Emulated Device Flags was 0xfffffffc and so some of
> -waet            reserved bits [31:2] are not zero as expected.
> +waet            FAILED [HIGH] WAETReservedBitsNonZero: Test 1, WAET
> +waet            Emulated Device Flags Bits [31..2] must be zero, got
> +waet            0xfffffffc instead
>  waet            
>  waet            ==========================================================
>  waet            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
> diff --git a/fwts-test/wsmt-0001/wsmt-0002.log b/fwts-test/wsmt-0001/wsmt-0002.log
> index b862a8f..52c45c2 100644
> --- a/fwts-test/wsmt-0001/wsmt-0002.log
> +++ b/fwts-test/wsmt-0001/wsmt-0002.log
> @@ -4,8 +4,9 @@ wsmt            Test 1 of 1: WSMT Windows SMM Security Mitigations Table
>  wsmt            test.
>  wsmt            WSMT Windows SMM Security Mitigations Table:
>  wsmt              Protection Flags:      0x00000009
> -wsmt            FAILED [MEDIUM] WSMTFlagsReserved: Test 1, WSMT Protection
> -wsmt            Flags reserved bits [3:31] must be zero, instead got 0x9
> +wsmt            FAILED [HIGH] WSMTReservedBitsNonZero: Test 1, WSMT
> +wsmt            Protection Flags Bits [31..3] must be zero, got 0x00000009
> +wsmt            instead
>  wsmt            
>  wsmt            
>  wsmt            ==========================================================
> diff --git a/fwts-test/xenv-0001/xenv-0002.log b/fwts-test/xenv-0001/xenv-0002.log
> index ca573a3..c25a0db 100644
> --- a/fwts-test/xenv-0001/xenv-0002.log
> +++ b/fwts-test/xenv-0001/xenv-0002.log
> @@ -6,8 +6,8 @@ xenv              GNT Start Address:               0x0000000010000000
>  xenv              GNT Size:                        0x0000000000002000
>  xenv              Evtchn Intr:                     0x25000000
>  xenv              Evtchn Intr Flags:               0x07
> -xenv            FAILED [HIGH] XENVBadEvtchnIntrFlags: Test 1, XENV Evtchn
> -xenv            Intr Flags was 0x07 and reserved bits [7:2] are not zero.
> +xenv            FAILED [HIGH] XENVReservedBitsNonZero: Test 1, XENV Evtchn
> +xenv            Intr Flags Bits [7..2] must be zero, got 0x07 instead
>  xenv            
>  xenv            ==========================================================
>  xenv            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
> 

Thanks Alex

Acked-by: Colin Ian King <colin.king@canonical.com>

Patch

diff --git a/fwts-test/asf-0001/asf-0002.log b/fwts-test/asf-0001/asf-0002.log
index b8212e7..bee1002 100644
--- a/fwts-test/asf-0001/asf-0002.log
+++ b/fwts-test/asf-0001/asf-0002.log
@@ -8,9 +8,9 @@  asf             in the range 0x01..0xff
 asf             FAILED [HIGH] ASF!InfoMinPollWaitTimeInvalid: Test 1, ASF!
 asf             ASF_INFO Minimum Poll Wait Time is 0x0 and must be in the
 asf             range 0x02..0xff
-asf             FAILED [HIGH] ASF!InfoFeatureFlagsReserved: Test 1, ASF!
-asf             ASF_INFO Feature Flags is 0xff, however reserved bits [7
-asf             :1] must be zero
+asf             FAILED [HIGH] ASF!ReservedBitsNonZero: Test 1, ASF!
+asf             ASF_INFO Feature Flags Bits [7..1] must be zero, got 0xff
+asf             instead
 asf             FAILED [MEDIUM] ASF!ReservedNonZero: Test 1, ASF! ASF_INFO
 asf             Reserved1 field must be zero, got 0x10 instead
 asf             FAILED [MEDIUM] ASF!ReservedNonZero: Test 1, ASF! ASF_INFO
diff --git a/fwts-test/drtm-0001/drtm-0002.log b/fwts-test/drtm-0001/drtm-0002.log
index 01fe9e1..05ed80e 100644
--- a/fwts-test/drtm-0001/drtm-0002.log
+++ b/fwts-test/drtm-0001/drtm-0002.log
@@ -11,8 +11,9 @@  drtm              Log_Area_Start:           0x0000000050000000
 drtm              Log_Area_Length:          0x00006000
 drtm              Architecture_Dependent:   0x0000000070000000
 drtm              DRT_Flags:                0x00008000
-drtm            FAILED [MEDIUM] DRTMBadFlagReservedNonZero: Test 1, DRTM
-drtm            DRT_Flags Bits [31:4] are reserved, got 0x00008000 instead
+drtm            FAILED [HIGH] DRTMReservedBitsNonZero: Test 1, DRTM
+drtm            DRT_Flags Bits [31..4] must be zero, got 0x00008000
+drtm            instead
 drtm            
 drtm              VTL_Length:               0x00000002
 drtm              Validated_Tables:         0x00000000a0000000
diff --git a/fwts-test/facs-0001/facs-0002.log b/fwts-test/facs-0001/facs-0002.log
index 6d7cb7c..68b2ee4 100644
--- a/fwts-test/facs-0001/facs-0002.log
+++ b/fwts-test/facs-0001/facs-0002.log
@@ -21,12 +21,10 @@  facs              Reserved:                 0x00 0x00 0x00 0x00
 facs              Reserved:                 0x00 0x00 0x00 0x00
 facs            FAILED [LOW] FACSInvalidReserved1: Test 1, FACS: 1st
 facs            Reserved field is non-zero
-facs            FAILED [MEDIUM] FACSFlagsReservedBitsSet: Test 1, FACS:
-facs            Flags field is 0xffffffff and some of the reserved bits
-facs            [31:2] are set
-facs            FAILED [MEDIUM] FACSFlagsReservedBitsSet: Test 1, FACS:
-facs            OSPM Flags field is 0xefefefef and some of the reserved
-facs            bits [31:1] are set
+facs            FAILED [HIGH] FACSReservedBitsNonZero: Test 1, FACS Flags
+facs            Bits [31..2] must be zero, got 0xffffffff instead
+facs            FAILED [HIGH] FACSReservedBitsNonZero: Test 1, FACS OSPM
+facs            Flags Bits [31..1] must be zero, got 0xefefefef instead
 facs            FAILED [LOW] FACSInvalidReserved1: Test 1, FACS: 2nd
 facs            Reserved field is non-zero
 facs            
diff --git a/fwts-test/hest-0001/hest-0002.log b/fwts-test/hest-0001/hest-0002.log
index 274c0cf..88aa45d 100644
--- a/fwts-test/hest-0001/hest-0002.log
+++ b/fwts-test/hest-0001/hest-0002.log
@@ -23,9 +23,9 @@  hest              Correctable Error Mask:   0x000011c1
 hest              Advanced Capabilities:    0x00000000
 hest              Root Error Command:       0x00000006
 hest            
-hest            FAILED [MEDIUM] HESTPciExpressRootPortFlagsReserved: Test
-hest            1, HEST PCI Express Root Port Flags Reserved bits [2:7]
-hest            must be zero, instead got 0x7
+hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
+hest            Express Root Port Flags Bits [7..2] must be zero, got 0x07
+hest            instead
 hest            HEST PCI Express Device AER:
 hest              Type:                     0x07
 hest              Source ID:                0x00ff
@@ -43,9 +43,9 @@  hest              Uncorrectable Severity:   0x0017f011
 hest              Correctable Error Mask:   0x000011c1
 hest              Advanced Capabilities:    0x00000000
 hest            
-hest            FAILED [MEDIUM] HESTPciExpressDeviceFlagsReserved: Test 1,
-hest            HEST PCI Express Device Flags Reserved bits [2:7] must be
-hest            zero, instead got 0x9
+hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
+hest            Express Device Flags Bits [7..2] must be zero, got 0x09
+hest            instead
 hest            FAILED [HIGH] HESTInvalidRecordsToPreallocate: Test 1,
 hest            HEST PCI Express Device Number of Records to Preallocate
 hest            is 0x0 and must be more than zero.
@@ -70,9 +70,9 @@  hest              2nd Uncorrectable Mask:   0x00100020
 hest              2nd Uncurrectable Svrity: 0x0017f011
 hest              2nd Advanced Capabilities:0x00000000
 hest            
-hest            FAILED [MEDIUM] HESTPciExpressBridgeFlagsReserved: Test 1,
-hest            HEST PCI Express Bridge Flags Reserved bits [2:7] must be
-hest            zero, instead got 0xf
+hest            FAILED [HIGH] HESTReservedBitsNonZero: Test 1, HEST PCI
+hest            Express Bridge Flags Bits [7..2] must be zero, got 0x0f
+hest            instead
 hest            FAILED [HIGH] HESTInvalidRecordsToPreallocate: Test 1,
 hest            HEST PCI Express Bridge Number of Records to Preallocate
 hest            is 0x0 and must be more than zero.
diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
index d90468b..953413c 100644
--- a/fwts-test/hmat-0001/hmat-0002.log
+++ b/fwts-test/hmat-0001/hmat-0002.log
@@ -16,8 +16,8 @@  hmat                System Phy Addr Range Base:     0x0000000000000000
 hmat                System Phy Addr Range Length:   0x0000000000000000
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x0001 instead
-hmat            FAILED [HIGH] HMATBadFlags: Test 1, HMAT Flags's
-hmat            Bits[15..3] must be zero, got 0x000f instead
+hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
+hmat            Bits [15..3] must be zero, got 0x000f instead
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x0002 instead
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
@@ -36,8 +36,8 @@  hmat                Reserved:                       0x00000006
 hmat                Entry Base Unit:                0x0000000000000000
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x0004 instead
-hmat            FAILED [CRITICAL] HMATBadFlags: Test 1, HMAT Flags's
-hmat            Bits[7..5] must be zero, got 0x3f instead
+hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
+hmat            Bits [7..5] must be zero, got 0x3f instead
 hmat            FAILED [CRITICAL] HMATBadFDataType: Test 1, HMAT Data Type
 hmat            must be 0..5, got 0x06 instead
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
index 7a0746b..82eb3d0 100644
--- a/fwts-test/iort-0001/iort-0002.log
+++ b/fwts-test/iort-0001/iort-0002.log
@@ -164,36 +164,28 @@  iort            FAILED [LOW] IORTNodeRevisionNonZero: Test 1, IORT Node
 iort            Revision field is 0xa0 and should be zero.
 iort            FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
 iort            Reserved field must be zero, got 0x00008100 instead
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_NsgIrpt Flags field reserved bits [31:1] should
-iort            be all zero, got 0x2
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_NsgCfgIrpt Flags field reserved bits [31:1]
-iort            should be all zero, got 0x4
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0x8
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0x10
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0x20
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0x40
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0xaa
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0xab
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0x92
-iort            FAILED [MEDIUM] IORTSMMUIntrFlagsReservedNonZero: Test 1,
-iort            IORT SMMU_GSV Flags field reserved bits [31:1] should be
-iort            all zero, got 0x4
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_NsgIrpt Bits [31..1] must be zero, got 0x00000002
+iort            instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_NsgCfgIrpt Bits [31..1] must be zero, got 0x00000004
+iort            instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000008 instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000010 instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000020 instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000040 instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x000000aa instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x000000ab instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000092 instead
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
+iort            SMMU_GSV Bits [31..1] must be zero, got 0x00000004 instead
 iort            FAILED [HIGH] IORTSmmuInterruptsOutsideTable: Test 1, IORT
 iort            SMMU Interrupt 4 is outside the IORT ACPI table. Either
 iort            the offset is incorrect or the IORT table size is too
@@ -204,9 +196,9 @@  iort            offset is incorrect or the IORT table size or the node is
 iort            too small.
 iort            FAILED [HIGH] IORTSmmuInvalidModel: Test 1, IORT SMMU
 iort            Model is 0x4 and was expecting a model value 0 to 3.
-iort            FAILED [HIGH] IORTSmmuReservedFlags: Test 1, IORT SMMU
-iort            Reserved Flags is 0xaa and has some reserved bits [31:2]
-iort            set when they should be zero.
+iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT SMMU
+iort            Reserved Flags Bits [31..2] must be zero, got 0x000000aa
+iort            instead
 iort            
 iort            FAILED [HIGH] IORTInvalidType: Test 1, IORT Type 0xff is
 iort            invalid, aborting check
diff --git a/fwts-test/nfit-0001/nfit-0002.log b/fwts-test/nfit-0001/nfit-0002.log
index 02fba5a..2b13fe4 100644
--- a/fwts-test/nfit-0001/nfit-0002.log
+++ b/fwts-test/nfit-0001/nfit-0002.log
@@ -19,8 +19,8 @@  nfit                System Physical Address Range Length:   0x000000000c000000
 nfit                Address Range Memory Mapping Attribute: 0x00000000000000ff
 nfit            FAILED [HIGH] NFITBadRangeIndexZero: Test 1, NFIT SPA
 nfit            Range Structure Index must not be zero
-nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
-nfit            Bits[15..2] must be zero, got 0x00000005 instead
+nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT Flags
+nfit            Bits [15..2] must be zero, got 0x0005 instead
 nfit            FAILED [HIGH] NFITBadMemoryMappingAttribute: Test 1, NFIT
 nfit            Memory Mapping Attribute must meet UEFI Spec, got
 nfit            0x00000000000000ff instead
@@ -42,8 +42,8 @@  nfit                Interleave Structure Index:             0x0001
 nfit                Interleave Ways:                        0x0003
 nfit                NVDIMM State Flags:                     0x00fa
 nfit                Reserved:                               0x0000
-nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
-nfit            Bits[15..7] must be zero, got 0x000000fa instead
+nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
+nfit            State Flags Bits [15..7] must be zero, got 0x00fa instead
 nfit            
 nfit              NFIT Subtable:
 nfit                Type:                                   0x0002
@@ -101,8 +101,9 @@  nfit            FAILED [HIGH] NFITBadRevisionId: Test 1, NFIT Subsystem
 nfit            Revision ID's BYTE 1 must be zero, got 0xaa01 instead
 nfit            FAILED [HIGH] NFITBadValidField: Test 1, NFIT Valid
 nfit            Field's Bits[7..1] must be zero, got 0x03 instead
-nfit            FAILED [HIGH] NFITBadFlags: Test 1, NFIT Flags's
-nfit            Bits[15..1] must be zero, got 0x0003 instead
+nfit            FAILED [HIGH] NFITReservedBitsNonZero: Test 1, NFIT NVDIMM
+nfit            Control Region Flags Bits [15..1] must be zero, got 0x0003
+nfit            instead
 nfit            FAILED [MEDIUM] NFITReservedNonZero: Test 1, NFIT Reserved
 nfit            field must be zero, got 0x0000000000000f00 instead
 nfit            
diff --git a/fwts-test/pmtt-0001/pmtt-0002.log b/fwts-test/pmtt-0001/pmtt-0002.log
index 2ce24a2..dfa1d00 100644
--- a/fwts-test/pmtt-0001/pmtt-0002.log
+++ b/fwts-test/pmtt-0001/pmtt-0002.log
@@ -95,8 +95,8 @@  pmtt                Reserved:                       0x00
 pmtt                Length:                         0x000c
 pmtt                Flags:                          0x0013
 pmtt                Reserved:                       0x0000
-pmtt            FAILED [HIGH] PMTTBadFlags: Test 1, PMTT Flags's
-pmtt            Bits[15..4] must be zero, got 0x0013 instead
+pmtt            FAILED [HIGH] PMTTReservedBitsNonZero: Test 1, PMTT Flags
+pmtt            Bits [15..4] must be zero, got 0x0013 instead
 pmtt                Socket Identifier:              0x0002
 pmtt                Reserved:                       0x0000
 pmtt              PMTT Subtable:
diff --git a/fwts-test/pptt-0001/pptt-0002.log b/fwts-test/pptt-0001/pptt-0002.log
index 4b3f2a6..0c83c65 100644
--- a/fwts-test/pptt-0001/pptt-0002.log
+++ b/fwts-test/pptt-0001/pptt-0002.log
@@ -40,8 +40,8 @@  pptt                Private Resources[0]:           0x00000000
 pptt                Private Resources[1]:           0x00000000
 pptt            FAILED [MEDIUM] PPTTReservedNonZero: Test 1, PPTT Reserved
 pptt            field must be zero, got 0x0003 instead
-pptt            FAILED [HIGH] PPTTBadFlags: Test 1, PPTT Flags's
-pptt            Bits[31..2] must be zero, got 0x00000007 instead
+pptt            FAILED [HIGH] PPTTReservedBitsNonZero: Test 1, PPTT Flags
+pptt            Bits [31..2] must be zero, got 0x00000007 instead
 pptt            
 pptt              Cache Type Structure (Type 1):
 pptt                Type:                           0x01
@@ -56,8 +56,8 @@  pptt                Attributes:                     0x00
 pptt                Line size:                      0x0000
 pptt            FAILED [MEDIUM] PPTTReservedNonZero: Test 1, PPTT Reserved
 pptt            field must be zero, got 0x0004 instead
-pptt            FAILED [HIGH] PPTTBadFlags: Test 1, PPTT Flags's
-pptt            Bits[31..7] must be zero, got 0x000000ff instead
+pptt            FAILED [HIGH] PPTTReservedBitsNonZero: Test 1, PPTT Flags
+pptt            Bits [31..7] must be zero, got 0x000000ff instead
 pptt            
 pptt              ID structure (Type 2):
 pptt                Type:                           0x02
diff --git a/fwts-test/srat-0001/srat-0002.log b/fwts-test/srat-0001/srat-0002.log
index 2abc922..9d5b1ff 100644
--- a/fwts-test/srat-0001/srat-0002.log
+++ b/fwts-test/srat-0001/srat-0002.log
@@ -15,9 +15,9 @@  srat              Proximity Domain: [16:23] 0x00
 srat              Proximity Domain: [23:31] 0x00
 srat              Clock Domain              0x00000000
 srat            
-srat            FAILED [MEDIUM] SRATLocalApicSapicAffinityFlags: Test 1,
-srat            SRAT Local APIC/SPAIC Affinity Flags field reserved bits
-srat            1..31 should be zero, got 0x9
+srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Local
+srat            APIC/SPAIC Affinity Flags Bits [31..1] must be zero, got
+srat            0x00000009 instead
 srat            SRAT Local APIC/SAPIC Affinity Structure:
 srat              Type:                     0x00
 srat              Length:                   0x10
@@ -76,9 +76,9 @@  srat              Reserved:                 0x0000000f
 srat              Flags:                    0x000000ff
 srat              Reserved:                 0x0000000000000000
 srat            
-srat            FAILED [MEDIUM] SRATMemoryAffinityFlags: Test 1, SRAT
-srat            Memory Affinity Flags field reserved bits 3..31 should be
-srat            zero, got 0xff
+srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Memory
+srat            Affinity Flags Bits [31..3] must be zero, got 0x000000ff
+srat            instead
 srat            SRAT Memory Affinity Structure:
 srat              Type:                     0x01
 srat              Length:                   0x28
@@ -90,9 +90,9 @@  srat              Reserved:                 0x00000001
 srat              Flags:                    0x00000008
 srat              Reserved:                 0x0000000000000000
 srat            
-srat            FAILED [MEDIUM] SRATMemoryAffinityFlags: Test 1, SRAT
-srat            Memory Affinity Flags field reserved bits 3..31 should be
-srat            zero, got 0x8
+srat            FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT Memory
+srat            Affinity Flags Bits [31..3] must be zero, got 0x00000008
+srat            instead
 srat            
 srat            ==========================================================
 srat            0 passed, 4 failed, 0 warning, 0 aborted, 0 skipped, 0
diff --git a/fwts-test/waet-0001/waet-0002.log b/fwts-test/waet-0001/waet-0002.log
index a8552c2..066ece2 100644
--- a/fwts-test/waet-0001/waet-0002.log
+++ b/fwts-test/waet-0001/waet-0002.log
@@ -6,9 +6,9 @@  waet              Emulated Device Flags:    0xfffffffc
 waet                Bit [0] RTC Good:       0
 waet                Bit [1] PM Timer Good:  0
 waet            
-waet            FAILED [HIGH] WAETFlagReservedNotZero: Test 1, WAET
-waet            Emulated Device Flags was 0xfffffffc and so some of
-waet            reserved bits [31:2] are not zero as expected.
+waet            FAILED [HIGH] WAETReservedBitsNonZero: Test 1, WAET
+waet            Emulated Device Flags Bits [31..2] must be zero, got
+waet            0xfffffffc instead
 waet            
 waet            ==========================================================
 waet            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0
diff --git a/fwts-test/wsmt-0001/wsmt-0002.log b/fwts-test/wsmt-0001/wsmt-0002.log
index b862a8f..52c45c2 100644
--- a/fwts-test/wsmt-0001/wsmt-0002.log
+++ b/fwts-test/wsmt-0001/wsmt-0002.log
@@ -4,8 +4,9 @@  wsmt            Test 1 of 1: WSMT Windows SMM Security Mitigations Table
 wsmt            test.
 wsmt            WSMT Windows SMM Security Mitigations Table:
 wsmt              Protection Flags:      0x00000009
-wsmt            FAILED [MEDIUM] WSMTFlagsReserved: Test 1, WSMT Protection
-wsmt            Flags reserved bits [3:31] must be zero, instead got 0x9
+wsmt            FAILED [HIGH] WSMTReservedBitsNonZero: Test 1, WSMT
+wsmt            Protection Flags Bits [31..3] must be zero, got 0x00000009
+wsmt            instead
 wsmt            
 wsmt            
 wsmt            ==========================================================
diff --git a/fwts-test/xenv-0001/xenv-0002.log b/fwts-test/xenv-0001/xenv-0002.log
index ca573a3..c25a0db 100644
--- a/fwts-test/xenv-0001/xenv-0002.log
+++ b/fwts-test/xenv-0001/xenv-0002.log
@@ -6,8 +6,8 @@  xenv              GNT Start Address:               0x0000000010000000
 xenv              GNT Size:                        0x0000000000002000
 xenv              Evtchn Intr:                     0x25000000
 xenv              Evtchn Intr Flags:               0x07
-xenv            FAILED [HIGH] XENVBadEvtchnIntrFlags: Test 1, XENV Evtchn
-xenv            Intr Flags was 0x07 and reserved bits [7:2] are not zero.
+xenv            FAILED [HIGH] XENVReservedBitsNonZero: Test 1, XENV Evtchn
+xenv            Intr Flags Bits [7..2] must be zero, got 0x07 instead
 xenv            
 xenv            ==========================================================
 xenv            0 passed, 1 failed, 0 warning, 0 aborted, 0 skipped, 0