[10/14] fwts-test: update test for HMAT revision 2

Message ID 20190208032314.15215-11-alex.hung@canonical.com
State Accepted
Headers show
Series
  • Updates for ACPI 6.2b and 6.3
Related show

Commit Message

Alex Hung Feb. 8, 2019, 3:23 a.m.
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 fwts-test/hmat-0001/acpidump-0001.log | 11 ++++++-----
 fwts-test/hmat-0001/hmat-0001.log     | 16 ++++++++--------
 fwts-test/hmat-0001/hmat-0002.log     | 18 ++++++++++--------
 3 files changed, 24 insertions(+), 21 deletions(-)

Comments

Colin Ian King Feb. 8, 2019, 2:33 p.m. | #1
On 08/02/2019 03:23, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/hmat-0001/acpidump-0001.log | 11 ++++++-----
>  fwts-test/hmat-0001/hmat-0001.log     | 16 ++++++++--------
>  fwts-test/hmat-0001/hmat-0002.log     | 18 ++++++++++--------
>  3 files changed, 24 insertions(+), 21 deletions(-)
> 
> diff --git a/fwts-test/hmat-0001/acpidump-0001.log b/fwts-test/hmat-0001/acpidump-0001.log
> index 2d5c8359..48aecb3b 100644
> --- a/fwts-test/hmat-0001/acpidump-0001.log
> +++ b/fwts-test/hmat-0001/acpidump-0001.log
> @@ -24,15 +24,16 @@ FACP @ 0x00000000
>    00f0: 00 00 00 00                                      ....
>  
>  HMAT @ 0x0000000000000000
> -  0000: 48 4d 41 54 b6 00 00 00 00 60 49 4e 54 45 4c 20  HMAT.....`INTEL 
> +  0000: 48 4d 41 54 b6 00 00 00 00 59 49 4e 54 45 4c 20  HMAT.....YINTEL 
>    0010: 54 45 4d 50 4c 41 54 45 00 00 00 00 49 4e 54 4c  TEMPLATE....INTL
> -  0020: 29 06 17 20 00 00 00 00 00 00 00 00 28 00 00 00  ).. ........(...
> -  0030: 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0020: 13 12 18 20 00 00 00 00 00 00 00 00 28 00 00 00  ... ........(...
> +  0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>    0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>    0050: 01 00 00 00 40 00 00 00 1f 05 00 00 02 00 00 00  ....@...........
> -  0060: 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0060: 03 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00  ................
>    0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0080: 00 00 00 00 00 00 01 00 02 00 03 00 04 00 05 00  ................
> +  0080: 00 00 00 00 01 00 02 00 03 00 04 00 05 00 06 00  ................
>    0090: 02 00 00 00 26 00 00 00 00 00 00 00 00 00 00 00  ....&...........
>    00a0: 00 00 00 00 00 00 00 00 33 22 00 00 00 00 03 00  ........3"......
>    00b0: 00 00 01 00 02 00                                ......
> +
> diff --git a/fwts-test/hmat-0001/hmat-0001.log b/fwts-test/hmat-0001/hmat-0001.log
> index d78484b9..c7a37d62 100644
> --- a/fwts-test/hmat-0001/hmat-0001.log
> +++ b/fwts-test/hmat-0001/hmat-0001.log
> @@ -3,17 +3,17 @@ hmat            ----------------------------------------------------------
>  hmat            Test 1 of 1: Validate HMAT table.
>  hmat            HMAT Heterogeneous Memory Attribute Table:
>  hmat              Reserved:        0x00
> -hmat              Memory Subsystem Address Range (Type 0):
> +hmat              Memory Proximity Domain Attributes (Type 0):
>  hmat                Type:                           0x0000
>  hmat                Reserved:                       0x0000
>  hmat                Length:                         0x00000028
> -hmat                Flags:                          0x0007
> +hmat                Flags:                          0x0001
>  hmat                Reserved:                       0x0000
> -hmat                Processor Proximity Domain:     0x00000000
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Initiator: 0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000000
> -hmat                System Phy Addr Range Base:     0x0000000000000000
> -hmat                System Phy Addr Range Length:   0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
>  hmat            
>  hmat              System Locality Latency and Bandwidth Information (Type 1):
>  hmat                Type:                           0x0001
> @@ -25,13 +25,13 @@ hmat                Reserved:                       0x0000
>  hmat                Number of Initiator PDs:        0x00000002
>  hmat                Number of Target PDs:           0x00000003
>  hmat                Reserved:                       0x00000000
> -hmat                Entry Base Unit:                0x0000000000000000
> +hmat                Entry Base Unit:                0x0000000000000010
>  hmat            
>  hmat              Memory Side Cache Information (Type 2):
>  hmat                Type:                           0x0002
>  hmat                Reserved:                       0x0000
>  hmat                Length:                         0x00000026
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000000
>  hmat                Memory Side Cache Size:         0x0000000000000000
>  hmat                Cache Attributes:               0x00002233
> diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
> index 953413cf..4a4c8c1d 100644
> --- a/fwts-test/hmat-0001/hmat-0002.log
> +++ b/fwts-test/hmat-0001/hmat-0002.log
> @@ -3,21 +3,21 @@ hmat            ----------------------------------------------------------
>  hmat            Test 1 of 1: Validate HMAT table.
>  hmat            HMAT Heterogeneous Memory Attribute Table:
>  hmat              Reserved:        0x00
> -hmat              Memory Subsystem Address Range (Type 0):
> +hmat              Memory Proximity Domain Attributes (Type 0):
>  hmat                Type:                           0x0000
>  hmat                Reserved:                       0x0001
>  hmat                Length:                         0x00000028
>  hmat                Flags:                          0x000f
>  hmat                Reserved:                       0x0002
> -hmat                Processor Proximity Domain:     0x00000000
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Initiator: 0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000003
> -hmat                System Phy Addr Range Base:     0x0000000000000000
> -hmat                System Phy Addr Range Length:   0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0001 instead
>  hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> -hmat            Bits [15..3] must be zero, got 0x000f instead
> +hmat            Bits [15..1] 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
> @@ -44,12 +44,14 @@ hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0005 instead
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x00000006 instead
> +hmat            FAILED [CRITICAL] HMATBadBaseUnit: Test 1, HMAT Type 1
> +hmat            Entry Base Unit must be non-zero
>  hmat            
>  hmat              Memory Side Cache Information (Type 2):
>  hmat                Type:                           0x0002
>  hmat                Reserved:                       0x0007
>  hmat                Length:                         0x00000026
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000008
>  hmat                Memory Side Cache Size:         0x0000000000000000
>  hmat                Cache Attributes:               0x00002333
> @@ -68,6 +70,6 @@ hmat
>  hmat            
>  hmat            
>  hmat            ==========================================================
> -hmat            0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
> +hmat            0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
>  hmat            info only.
>  hmat            ==========================================================
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
ivanhu Feb. 18, 2019, 10:30 a.m. | #2
On 2/8/19 11:23 AM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/hmat-0001/acpidump-0001.log | 11 ++++++-----
>  fwts-test/hmat-0001/hmat-0001.log     | 16 ++++++++--------
>  fwts-test/hmat-0001/hmat-0002.log     | 18 ++++++++++--------
>  3 files changed, 24 insertions(+), 21 deletions(-)
>
> diff --git a/fwts-test/hmat-0001/acpidump-0001.log b/fwts-test/hmat-0001/acpidump-0001.log
> index 2d5c8359..48aecb3b 100644
> --- a/fwts-test/hmat-0001/acpidump-0001.log
> +++ b/fwts-test/hmat-0001/acpidump-0001.log
> @@ -24,15 +24,16 @@ FACP @ 0x00000000
>    00f0: 00 00 00 00                                      ....
>  
>  HMAT @ 0x0000000000000000
> -  0000: 48 4d 41 54 b6 00 00 00 00 60 49 4e 54 45 4c 20  HMAT.....`INTEL 
> +  0000: 48 4d 41 54 b6 00 00 00 00 59 49 4e 54 45 4c 20  HMAT.....YINTEL 
>    0010: 54 45 4d 50 4c 41 54 45 00 00 00 00 49 4e 54 4c  TEMPLATE....INTL
> -  0020: 29 06 17 20 00 00 00 00 00 00 00 00 28 00 00 00  ).. ........(...
> -  0030: 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0020: 13 12 18 20 00 00 00 00 00 00 00 00 28 00 00 00  ... ........(...
> +  0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>    0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>    0050: 01 00 00 00 40 00 00 00 1f 05 00 00 02 00 00 00  ....@...........
> -  0060: 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> +  0060: 03 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00  ................
>    0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
> -  0080: 00 00 00 00 00 00 01 00 02 00 03 00 04 00 05 00  ................
> +  0080: 00 00 00 00 01 00 02 00 03 00 04 00 05 00 06 00  ................
>    0090: 02 00 00 00 26 00 00 00 00 00 00 00 00 00 00 00  ....&...........
>    00a0: 00 00 00 00 00 00 00 00 33 22 00 00 00 00 03 00  ........3"......
>    00b0: 00 00 01 00 02 00                                ......
> +
> diff --git a/fwts-test/hmat-0001/hmat-0001.log b/fwts-test/hmat-0001/hmat-0001.log
> index d78484b9..c7a37d62 100644
> --- a/fwts-test/hmat-0001/hmat-0001.log
> +++ b/fwts-test/hmat-0001/hmat-0001.log
> @@ -3,17 +3,17 @@ hmat            ----------------------------------------------------------
>  hmat            Test 1 of 1: Validate HMAT table.
>  hmat            HMAT Heterogeneous Memory Attribute Table:
>  hmat              Reserved:        0x00
> -hmat              Memory Subsystem Address Range (Type 0):
> +hmat              Memory Proximity Domain Attributes (Type 0):
>  hmat                Type:                           0x0000
>  hmat                Reserved:                       0x0000
>  hmat                Length:                         0x00000028
> -hmat                Flags:                          0x0007
> +hmat                Flags:                          0x0001
>  hmat                Reserved:                       0x0000
> -hmat                Processor Proximity Domain:     0x00000000
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Initiator: 0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000000
> -hmat                System Phy Addr Range Base:     0x0000000000000000
> -hmat                System Phy Addr Range Length:   0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
>  hmat            
>  hmat              System Locality Latency and Bandwidth Information (Type 1):
>  hmat                Type:                           0x0001
> @@ -25,13 +25,13 @@ hmat                Reserved:                       0x0000
>  hmat                Number of Initiator PDs:        0x00000002
>  hmat                Number of Target PDs:           0x00000003
>  hmat                Reserved:                       0x00000000
> -hmat                Entry Base Unit:                0x0000000000000000
> +hmat                Entry Base Unit:                0x0000000000000010
>  hmat            
>  hmat              Memory Side Cache Information (Type 2):
>  hmat                Type:                           0x0002
>  hmat                Reserved:                       0x0000
>  hmat                Length:                         0x00000026
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000000
>  hmat                Memory Side Cache Size:         0x0000000000000000
>  hmat                Cache Attributes:               0x00002233
> diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
> index 953413cf..4a4c8c1d 100644
> --- a/fwts-test/hmat-0001/hmat-0002.log
> +++ b/fwts-test/hmat-0001/hmat-0002.log
> @@ -3,21 +3,21 @@ hmat            ----------------------------------------------------------
>  hmat            Test 1 of 1: Validate HMAT table.
>  hmat            HMAT Heterogeneous Memory Attribute Table:
>  hmat              Reserved:        0x00
> -hmat              Memory Subsystem Address Range (Type 0):
> +hmat              Memory Proximity Domain Attributes (Type 0):
>  hmat                Type:                           0x0000
>  hmat                Reserved:                       0x0001
>  hmat                Length:                         0x00000028
>  hmat                Flags:                          0x000f
>  hmat                Reserved:                       0x0002
> -hmat                Processor Proximity Domain:     0x00000000
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Initiator: 0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000003
> -hmat                System Phy Addr Range Base:     0x0000000000000000
> -hmat                System Phy Addr Range Length:   0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
> +hmat                Reserved:                       0x0000000000000000
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0001 instead
>  hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> -hmat            Bits [15..3] must be zero, got 0x000f instead
> +hmat            Bits [15..1] 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
> @@ -44,12 +44,14 @@ hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0005 instead
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x00000006 instead
> +hmat            FAILED [CRITICAL] HMATBadBaseUnit: Test 1, HMAT Type 1
> +hmat            Entry Base Unit must be non-zero
>  hmat            
>  hmat              Memory Side Cache Information (Type 2):
>  hmat                Type:                           0x0002
>  hmat                Reserved:                       0x0007
>  hmat                Length:                         0x00000026
> -hmat                Memory Proximity Domain:        0x00000000
> +hmat                Proximity Domain for Memory:    0x00000000
>  hmat                Reserved:                       0x00000008
>  hmat                Memory Side Cache Size:         0x0000000000000000
>  hmat                Cache Attributes:               0x00002333
> @@ -68,6 +70,6 @@ hmat
>  hmat            
>  hmat            
>  hmat            ==========================================================
> -hmat            0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
> +hmat            0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
>  hmat            info only.
>  hmat            ==========================================================


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

Patch

diff --git a/fwts-test/hmat-0001/acpidump-0001.log b/fwts-test/hmat-0001/acpidump-0001.log
index 2d5c8359..48aecb3b 100644
--- a/fwts-test/hmat-0001/acpidump-0001.log
+++ b/fwts-test/hmat-0001/acpidump-0001.log
@@ -24,15 +24,16 @@  FACP @ 0x00000000
   00f0: 00 00 00 00                                      ....
 
 HMAT @ 0x0000000000000000
-  0000: 48 4d 41 54 b6 00 00 00 00 60 49 4e 54 45 4c 20  HMAT.....`INTEL 
+  0000: 48 4d 41 54 b6 00 00 00 00 59 49 4e 54 45 4c 20  HMAT.....YINTEL 
   0010: 54 45 4d 50 4c 41 54 45 00 00 00 00 49 4e 54 4c  TEMPLATE....INTL
-  0020: 29 06 17 20 00 00 00 00 00 00 00 00 28 00 00 00  ).. ........(...
-  0030: 07 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0020: 13 12 18 20 00 00 00 00 00 00 00 00 28 00 00 00  ... ........(...
+  0030: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
   0040: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
   0050: 01 00 00 00 40 00 00 00 1f 05 00 00 02 00 00 00  ....@...........
-  0060: 03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
+  0060: 03 00 00 00 00 00 00 00 10 00 00 00 00 00 00 00  ................
   0070: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
-  0080: 00 00 00 00 00 00 01 00 02 00 03 00 04 00 05 00  ................
+  0080: 00 00 00 00 01 00 02 00 03 00 04 00 05 00 06 00  ................
   0090: 02 00 00 00 26 00 00 00 00 00 00 00 00 00 00 00  ....&...........
   00a0: 00 00 00 00 00 00 00 00 33 22 00 00 00 00 03 00  ........3"......
   00b0: 00 00 01 00 02 00                                ......
+
diff --git a/fwts-test/hmat-0001/hmat-0001.log b/fwts-test/hmat-0001/hmat-0001.log
index d78484b9..c7a37d62 100644
--- a/fwts-test/hmat-0001/hmat-0001.log
+++ b/fwts-test/hmat-0001/hmat-0001.log
@@ -3,17 +3,17 @@  hmat            ----------------------------------------------------------
 hmat            Test 1 of 1: Validate HMAT table.
 hmat            HMAT Heterogeneous Memory Attribute Table:
 hmat              Reserved:        0x00
-hmat              Memory Subsystem Address Range (Type 0):
+hmat              Memory Proximity Domain Attributes (Type 0):
 hmat                Type:                           0x0000
 hmat                Reserved:                       0x0000
 hmat                Length:                         0x00000028
-hmat                Flags:                          0x0007
+hmat                Flags:                          0x0001
 hmat                Reserved:                       0x0000
-hmat                Processor Proximity Domain:     0x00000000
-hmat                Memory Proximity Domain:        0x00000000
+hmat                Proximity Domain for Initiator: 0x00000000
+hmat                Proximity Domain for Memory:    0x00000000
 hmat                Reserved:                       0x00000000
-hmat                System Phy Addr Range Base:     0x0000000000000000
-hmat                System Phy Addr Range Length:   0x0000000000000000
+hmat                Reserved:                       0x0000000000000000
+hmat                Reserved:                       0x0000000000000000
 hmat            
 hmat              System Locality Latency and Bandwidth Information (Type 1):
 hmat                Type:                           0x0001
@@ -25,13 +25,13 @@  hmat                Reserved:                       0x0000
 hmat                Number of Initiator PDs:        0x00000002
 hmat                Number of Target PDs:           0x00000003
 hmat                Reserved:                       0x00000000
-hmat                Entry Base Unit:                0x0000000000000000
+hmat                Entry Base Unit:                0x0000000000000010
 hmat            
 hmat              Memory Side Cache Information (Type 2):
 hmat                Type:                           0x0002
 hmat                Reserved:                       0x0000
 hmat                Length:                         0x00000026
-hmat                Memory Proximity Domain:        0x00000000
+hmat                Proximity Domain for Memory:    0x00000000
 hmat                Reserved:                       0x00000000
 hmat                Memory Side Cache Size:         0x0000000000000000
 hmat                Cache Attributes:               0x00002233
diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
index 953413cf..4a4c8c1d 100644
--- a/fwts-test/hmat-0001/hmat-0002.log
+++ b/fwts-test/hmat-0001/hmat-0002.log
@@ -3,21 +3,21 @@  hmat            ----------------------------------------------------------
 hmat            Test 1 of 1: Validate HMAT table.
 hmat            HMAT Heterogeneous Memory Attribute Table:
 hmat              Reserved:        0x00
-hmat              Memory Subsystem Address Range (Type 0):
+hmat              Memory Proximity Domain Attributes (Type 0):
 hmat                Type:                           0x0000
 hmat                Reserved:                       0x0001
 hmat                Length:                         0x00000028
 hmat                Flags:                          0x000f
 hmat                Reserved:                       0x0002
-hmat                Processor Proximity Domain:     0x00000000
-hmat                Memory Proximity Domain:        0x00000000
+hmat                Proximity Domain for Initiator: 0x00000000
+hmat                Proximity Domain for Memory:    0x00000000
 hmat                Reserved:                       0x00000003
-hmat                System Phy Addr Range Base:     0x0000000000000000
-hmat                System Phy Addr Range Length:   0x0000000000000000
+hmat                Reserved:                       0x0000000000000000
+hmat                Reserved:                       0x0000000000000000
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x0001 instead
 hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
-hmat            Bits [15..3] must be zero, got 0x000f instead
+hmat            Bits [15..1] 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
@@ -44,12 +44,14 @@  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x0005 instead
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x00000006 instead
+hmat            FAILED [CRITICAL] HMATBadBaseUnit: Test 1, HMAT Type 1
+hmat            Entry Base Unit must be non-zero
 hmat            
 hmat              Memory Side Cache Information (Type 2):
 hmat                Type:                           0x0002
 hmat                Reserved:                       0x0007
 hmat                Length:                         0x00000026
-hmat                Memory Proximity Domain:        0x00000000
+hmat                Proximity Domain for Memory:    0x00000000
 hmat                Reserved:                       0x00000008
 hmat                Memory Side Cache Size:         0x0000000000000000
 hmat                Cache Attributes:               0x00002333
@@ -68,6 +70,6 @@  hmat
 hmat            
 hmat            
 hmat            ==========================================================
-hmat            0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
+hmat            0 passed, 14 failed, 0 warning, 0 aborted, 0 skipped, 0
 hmat            info only.
 hmat            ==========================================================