diff mbox series

fwts-test: sync up with SMMU model updates

Message ID 20190222140125.20561-1-alex.hung@canonical.com
State Accepted
Headers show
Series fwts-test: sync up with SMMU model updates | expand

Commit Message

Alex Hung Feb. 22, 2019, 2:01 p.m. UTC
Signed-off-by: Alex Hung <alex.hung@canonical.com>
---
 fwts-test/iort-0001/acpidump-0002.log | 2 +-
 fwts-test/iort-0001/iort-0002.log     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Colin Ian King Feb. 22, 2019, 2:06 p.m. UTC | #1
On 22/02/2019 14:01, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/iort-0001/acpidump-0002.log | 2 +-
>  fwts-test/iort-0001/iort-0002.log     | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fwts-test/iort-0001/acpidump-0002.log b/fwts-test/iort-0001/acpidump-0002.log
> index 9729b068..91332aef 100644
> --- a/fwts-test/iort-0001/acpidump-0002.log
> +++ b/fwts-test/iort-0001/acpidump-0002.log
> @@ -40,7 +40,7 @@ IORT @ 0x00000000
>    00d0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>    00e0: 03 94 00 a0 00 81 00 00 01 00 00 00 90 00 00 00  ................
>    00f0: 00 80 90 20 c0 30 10 f0 00 00 00 20 00 00 00 00  ................
> -  0100: 04 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00  ................
> +  0100: 06 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00  ................
>    0110: 50 00 00 00 05 00 00 00 70 00 00 00 f0 00 00 00  ................
>    0120: 02 00 00 00 f1 00 00 00 04 00 00 00 00 00 00 00  ................
>    0130: 00 00 80 e0 08 00 00 00 00 00 70 d0 10 00 00 00  ................
> diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
> index 4935e6d8..830465d0 100644
> --- a/fwts-test/iort-0001/iort-0002.log
> +++ b/fwts-test/iort-0001/iort-0002.log
> @@ -130,7 +130,7 @@ iort              Number of ID mappings:    0x00000001
>  iort              Reference to ID Array:    0x00000090
>  iort              Base Address:             0xf01030c020908000
>  iort              Span:                     0x0000000020000000
> -iort              Model:                    0x00000004
> +iort              Model:                    0x00000006
>  iort              Flags:                    0x000000aa
>  iort              Global Intr. Offset:      0x0000003c
>  iort              Number of Context Intr.:  0x00000004
> @@ -195,7 +195,7 @@ iort            Mapping 0 is outside the IORT ACPI table. Either the
>  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            Model is 0x6 and was expecting a model value 0 to 5.
>  iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT SMMU
>  iort            Reserved Flags Bits [31..2] must be zero, got 0x000000aa
>  iort            instead
> 

thanks Alex for fixing this up.

Acked-by: Colin Ian King <colin.king@canonical.com>
Ivan Hu Feb. 22, 2019, 2:22 p.m. UTC | #2
On 2/22/19 10:01 PM, Alex Hung wrote:
> Signed-off-by: Alex Hung <alex.hung@canonical.com>
> ---
>  fwts-test/iort-0001/acpidump-0002.log | 2 +-
>  fwts-test/iort-0001/iort-0002.log     | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/fwts-test/iort-0001/acpidump-0002.log b/fwts-test/iort-0001/acpidump-0002.log
> index 9729b068..91332aef 100644
> --- a/fwts-test/iort-0001/acpidump-0002.log
> +++ b/fwts-test/iort-0001/acpidump-0002.log
> @@ -40,7 +40,7 @@ IORT @ 0x00000000
>    00d0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
>    00e0: 03 94 00 a0 00 81 00 00 01 00 00 00 90 00 00 00  ................
>    00f0: 00 80 90 20 c0 30 10 f0 00 00 00 20 00 00 00 00  ................
> -  0100: 04 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00  ................
> +  0100: 06 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00  ................
>    0110: 50 00 00 00 05 00 00 00 70 00 00 00 f0 00 00 00  ................
>    0120: 02 00 00 00 f1 00 00 00 04 00 00 00 00 00 00 00  ................
>    0130: 00 00 80 e0 08 00 00 00 00 00 70 d0 10 00 00 00  ................
> diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
> index 4935e6d8..830465d0 100644
> --- a/fwts-test/iort-0001/iort-0002.log
> +++ b/fwts-test/iort-0001/iort-0002.log
> @@ -130,7 +130,7 @@ iort              Number of ID mappings:    0x00000001
>  iort              Reference to ID Array:    0x00000090
>  iort              Base Address:             0xf01030c020908000
>  iort              Span:                     0x0000000020000000
> -iort              Model:                    0x00000004
> +iort              Model:                    0x00000006
>  iort              Flags:                    0x000000aa
>  iort              Global Intr. Offset:      0x0000003c
>  iort              Number of Context Intr.:  0x00000004
> @@ -195,7 +195,7 @@ iort            Mapping 0 is outside the IORT ACPI table. Either the
>  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            Model is 0x6 and was expecting a model value 0 to 5.
>  iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT SMMU
>  iort            Reserved Flags Bits [31..2] must be zero, got 0x000000aa
>  iort            instead


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

Patch

diff --git a/fwts-test/iort-0001/acpidump-0002.log b/fwts-test/iort-0001/acpidump-0002.log
index 9729b068..91332aef 100644
--- a/fwts-test/iort-0001/acpidump-0002.log
+++ b/fwts-test/iort-0001/acpidump-0002.log
@@ -40,7 +40,7 @@  IORT @ 0x00000000
   00d0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00  ................
   00e0: 03 94 00 a0 00 81 00 00 01 00 00 00 90 00 00 00  ................
   00f0: 00 80 90 20 c0 30 10 f0 00 00 00 20 00 00 00 00  ................
-  0100: 04 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00  ................
+  0100: 06 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00  ................
   0110: 50 00 00 00 05 00 00 00 70 00 00 00 f0 00 00 00  ................
   0120: 02 00 00 00 f1 00 00 00 04 00 00 00 00 00 00 00  ................
   0130: 00 00 80 e0 08 00 00 00 00 00 70 d0 10 00 00 00  ................
diff --git a/fwts-test/iort-0001/iort-0002.log b/fwts-test/iort-0001/iort-0002.log
index 4935e6d8..830465d0 100644
--- a/fwts-test/iort-0001/iort-0002.log
+++ b/fwts-test/iort-0001/iort-0002.log
@@ -130,7 +130,7 @@  iort              Number of ID mappings:    0x00000001
 iort              Reference to ID Array:    0x00000090
 iort              Base Address:             0xf01030c020908000
 iort              Span:                     0x0000000020000000
-iort              Model:                    0x00000004
+iort              Model:                    0x00000006
 iort              Flags:                    0x000000aa
 iort              Global Intr. Offset:      0x0000003c
 iort              Number of Context Intr.:  0x00000004
@@ -195,7 +195,7 @@  iort            Mapping 0 is outside the IORT ACPI table. Either the
 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            Model is 0x6 and was expecting a model value 0 to 5.
 iort            FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT SMMU
 iort            Reserved Flags Bits [31..2] must be zero, got 0x000000aa
 iort            instead