[14/14] fwts-test: update test for HMAT changes

Message ID 20190208032314.15215-15-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 | 4 ++--
 fwts-test/hmat-0001/hmat-0001.log     | 2 +-
 fwts-test/hmat-0001/hmat-0002.log     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

Comments

Colin Ian King Feb. 8, 2019, 3:11 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 | 4 ++--
>  fwts-test/hmat-0001/hmat-0001.log     | 2 +-
>  fwts-test/hmat-0001/hmat-0002.log     | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fwts-test/hmat-0001/acpidump-0001.log b/fwts-test/hmat-0001/acpidump-0001.log
> index 48aecb3b..4656daf8 100644
> --- a/fwts-test/hmat-0001/acpidump-0001.log
> +++ b/fwts-test/hmat-0001/acpidump-0001.log
> @@ -24,12 +24,12 @@ FACP @ 0x00000000
>    00f0: 00 00 00 00                                      ....
>  
>  HMAT @ 0x0000000000000000
> -  0000: 48 4d 41 54 b6 00 00 00 00 59 49 4e 54 45 4c 20  HMAT.....YINTEL 
> +  0000: 48 4d 41 54 b6 00 00 00 00 69 49 4e 54 45 4c 20  HMAT.....iINTEL 
>    0010: 54 45 4d 50 4c 41 54 45 00 00 00 00 49 4e 54 4c  TEMPLATE....INTL
>    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  ....@...........
> +  0050: 01 00 00 00 40 00 00 00 0f 05 00 00 02 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 01 00 02 00 03 00 04 00 05 00 06 00  ................
> diff --git a/fwts-test/hmat-0001/hmat-0001.log b/fwts-test/hmat-0001/hmat-0001.log
> index c7a37d62..cf8c6513 100644
> --- a/fwts-test/hmat-0001/hmat-0001.log
> +++ b/fwts-test/hmat-0001/hmat-0001.log
> @@ -19,7 +19,7 @@ hmat              System Locality Latency and Bandwidth Information (Type 1):
>  hmat                Type:                           0x0001
>  hmat                Reserved:                       0x0000
>  hmat                Length:                         0x00000040
> -hmat                Flags:                          0x1f
> +hmat                Flags:                          0x0f
>  hmat                Data Type:                      0x05
>  hmat                Reserved:                       0x0000
>  hmat                Number of Initiator PDs:        0x00000002
> diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
> index 4a4c8c1d..b42006c7 100644
> --- a/fwts-test/hmat-0001/hmat-0002.log
> +++ b/fwts-test/hmat-0001/hmat-0002.log
> @@ -37,7 +37,7 @@ hmat                Entry Base Unit:                0x0000000000000000
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0004 instead
>  hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> -hmat            Bits [7..5] must be zero, got 0x3f instead
> +hmat            Bits [7..4] 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
> 
Acked-by: Colin Ian King <colin.king@canonical.com>
ivanhu Feb. 18, 2019, 10:47 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 | 4 ++--
>  fwts-test/hmat-0001/hmat-0001.log     | 2 +-
>  fwts-test/hmat-0001/hmat-0002.log     | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fwts-test/hmat-0001/acpidump-0001.log b/fwts-test/hmat-0001/acpidump-0001.log
> index 48aecb3b..4656daf8 100644
> --- a/fwts-test/hmat-0001/acpidump-0001.log
> +++ b/fwts-test/hmat-0001/acpidump-0001.log
> @@ -24,12 +24,12 @@ FACP @ 0x00000000
>    00f0: 00 00 00 00                                      ....
>  
>  HMAT @ 0x0000000000000000
> -  0000: 48 4d 41 54 b6 00 00 00 00 59 49 4e 54 45 4c 20  HMAT.....YINTEL 
> +  0000: 48 4d 41 54 b6 00 00 00 00 69 49 4e 54 45 4c 20  HMAT.....iINTEL 
>    0010: 54 45 4d 50 4c 41 54 45 00 00 00 00 49 4e 54 4c  TEMPLATE....INTL
>    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  ....@...........
> +  0050: 01 00 00 00 40 00 00 00 0f 05 00 00 02 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 01 00 02 00 03 00 04 00 05 00 06 00  ................
> diff --git a/fwts-test/hmat-0001/hmat-0001.log b/fwts-test/hmat-0001/hmat-0001.log
> index c7a37d62..cf8c6513 100644
> --- a/fwts-test/hmat-0001/hmat-0001.log
> +++ b/fwts-test/hmat-0001/hmat-0001.log
> @@ -19,7 +19,7 @@ hmat              System Locality Latency and Bandwidth Information (Type 1):
>  hmat                Type:                           0x0001
>  hmat                Reserved:                       0x0000
>  hmat                Length:                         0x00000040
> -hmat                Flags:                          0x1f
> +hmat                Flags:                          0x0f
>  hmat                Data Type:                      0x05
>  hmat                Reserved:                       0x0000
>  hmat                Number of Initiator PDs:        0x00000002
> diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
> index 4a4c8c1d..b42006c7 100644
> --- a/fwts-test/hmat-0001/hmat-0002.log
> +++ b/fwts-test/hmat-0001/hmat-0002.log
> @@ -37,7 +37,7 @@ hmat                Entry Base Unit:                0x0000000000000000
>  hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
>  hmat            field must be zero, got 0x0004 instead
>  hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
> -hmat            Bits [7..5] must be zero, got 0x3f instead
> +hmat            Bits [7..4] 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


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 48aecb3b..4656daf8 100644
--- a/fwts-test/hmat-0001/acpidump-0001.log
+++ b/fwts-test/hmat-0001/acpidump-0001.log
@@ -24,12 +24,12 @@  FACP @ 0x00000000
   00f0: 00 00 00 00                                      ....
 
 HMAT @ 0x0000000000000000
-  0000: 48 4d 41 54 b6 00 00 00 00 59 49 4e 54 45 4c 20  HMAT.....YINTEL 
+  0000: 48 4d 41 54 b6 00 00 00 00 69 49 4e 54 45 4c 20  HMAT.....iINTEL 
   0010: 54 45 4d 50 4c 41 54 45 00 00 00 00 49 4e 54 4c  TEMPLATE....INTL
   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  ....@...........
+  0050: 01 00 00 00 40 00 00 00 0f 05 00 00 02 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 01 00 02 00 03 00 04 00 05 00 06 00  ................
diff --git a/fwts-test/hmat-0001/hmat-0001.log b/fwts-test/hmat-0001/hmat-0001.log
index c7a37d62..cf8c6513 100644
--- a/fwts-test/hmat-0001/hmat-0001.log
+++ b/fwts-test/hmat-0001/hmat-0001.log
@@ -19,7 +19,7 @@  hmat              System Locality Latency and Bandwidth Information (Type 1):
 hmat                Type:                           0x0001
 hmat                Reserved:                       0x0000
 hmat                Length:                         0x00000040
-hmat                Flags:                          0x1f
+hmat                Flags:                          0x0f
 hmat                Data Type:                      0x05
 hmat                Reserved:                       0x0000
 hmat                Number of Initiator PDs:        0x00000002
diff --git a/fwts-test/hmat-0001/hmat-0002.log b/fwts-test/hmat-0001/hmat-0002.log
index 4a4c8c1d..b42006c7 100644
--- a/fwts-test/hmat-0001/hmat-0002.log
+++ b/fwts-test/hmat-0001/hmat-0002.log
@@ -37,7 +37,7 @@  hmat                Entry Base Unit:                0x0000000000000000
 hmat            FAILED [MEDIUM] HMATReservedNonZero: Test 1, HMAT Reserved
 hmat            field must be zero, got 0x0004 instead
 hmat            FAILED [HIGH] HMATReservedBitsNonZero: Test 1, HMAT Flags
-hmat            Bits [7..5] must be zero, got 0x3f instead
+hmat            Bits [7..4] 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