@@ -24,20 +24,20 @@ FACP @ 0x00000000
00f0: 00 00 00 00 ....
IORT @ 0x00000000
- 0000: 49 4f 52 54 84 01 00 00 01 06 50 54 4c 20 20 20 IORT............
+ 0000: 49 4f 52 54 84 01 00 00 05 06 50 54 4c 20 20 20 IORT............
0010: 57 48 45 41 50 54 4c 20 00 00 04 06 50 54 4c 20 ................
0020: 01 00 00 00 04 00 00 00 30 00 00 00 00 00 00 00 ................
- 0030: 00 20 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+ 0030: 00 20 00 01 00 00 00 00 00 00 00 00 00 00 00 00 ................
0040: 03 00 00 00 04 03 02 01 08 07 06 05 0c 0b 0a 09 ................
- 0050: 01 50 00 00 00 00 00 00 02 00 00 00 24 00 00 00 ................
+ 0050: 01 50 00 04 00 00 00 00 02 00 00 00 24 00 00 00 ................
0060: 00 00 00 00 01 00 00 00 0f 00 00 03 20 54 45 53 .............TES
0070: 54 00 00 00 01 00 00 00 01 00 00 00 02 00 00 00 T...............
0080: ff ff ff ff 01 00 00 00 02 00 00 00 02 00 00 00 ................
0090: 03 00 00 00 88 88 88 88 01 00 00 00 00 00 00 00 ................
- 00a0: 02 40 00 00 00 00 00 00 01 00 00 00 20 00 00 00 ................
+ 00a0: 02 40 00 04 00 00 00 00 01 00 00 00 28 00 00 00 ................
00b0: 01 00 00 00 0e 00 00 03 01 00 00 00 ff ee bb c0 ................
- 00c0: 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00 ................
- 00d0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+ 00c0: 08 00 00 00 00 00 00 00 02 00 00 00 03 00 00 00 ................
+ 00d0: 04 00 00 00 05 00 00 00 01 00 00 00 00 00 00 00 ................
00e0: 03 a4 00 00 00 00 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: 02 00 00 00 01 00 00 00 3c 00 00 00 04 00 00 00 ................
@@ -24,20 +24,20 @@ FACP @ 0x00000000
00f0: 00 00 00 00 ....
IORT @ 0x00000000
- 0000: 49 4f 52 54 84 01 00 00 01 06 50 54 4c 20 20 20 IORT............
+ 0000: 49 4f 52 54 84 01 00 00 05 06 50 54 4c 20 20 20 IORT............
0010: 57 48 45 41 50 54 4c 20 00 00 04 06 50 54 4c 20 ................
0020: 01 00 00 00 05 00 00 00 30 00 00 00 00 00 00 00 ................
- 0030: 00 20 00 03 ff ff ff ff 80 00 00 00 e0 00 00 00 ................
+ 0030: 00 20 00 03 00 00 00 00 80 00 00 00 e0 00 00 00 ................
0040: 04 00 00 00 04 03 02 01 08 07 06 05 0c 0b 0a 09 ................
- 0050: 01 50 00 02 01 f0 00 00 03 00 00 00 24 00 00 00 ................
- 0060: ff ff ff ff 04 00 00 00 0f ad de 03 20 54 45 53 .............TES
+ 0050: 01 50 00 05 00 00 00 00 03 00 00 00 24 00 00 00 ................
+ 0060: 00 00 00 00 04 00 00 00 0f ad de 03 20 54 45 53 .............TES
0070: 54 00 00 00 01 00 00 00 01 00 00 00 02 00 00 00 T...............
0080: ff ff ff ff 01 00 00 00 02 00 00 00 02 00 00 00 ................
0090: 03 00 00 00 88 88 88 88 01 00 00 00 00 00 00 00 ................
- 00a0: 02 40 00 50 0f 00 00 00 10 00 00 00 20 00 00 00 ................
+ 00a0: 02 40 00 50 0f 00 00 00 10 00 00 00 28 00 00 00 ................
00b0: d1 00 00 00 fe 00 80 03 03 00 00 00 ff ee bb c0 ................
- 00c0: 02 00 00 00 03 00 00 00 04 00 00 00 05 00 00 00 ................
- 00d0: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
+ 00c0: 08 00 00 00 00 00 00 00 02 00 00 00 03 00 00 00 ................
+ 00d0: 04 00 00 00 05 00 00 00 01 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: 06 00 00 00 aa 00 00 00 3c 00 00 00 04 00 00 00 ................
@@ -9,8 +9,8 @@ iort
iort IORT ITS Group Node:
iort Type: 0x00
iort Length: 0x0020
-iort Revision: 0x00
-iort Reserved: 0x00000000
+iort Revision: 0x01
+iort Identifier: 0x00000000
iort Number of ID mappings: 0x00000000
iort Reference to ID Array: 0x00000000
iort Number of ITSs: 0x00000003
@@ -21,8 +21,8 @@ iort
iort IORT Named Component Node:
iort Type: 0x01
iort Length: 0x0050
-iort Revision: 0x00
-iort Reserved: 0x00000000
+iort Revision: 0x04
+iort Identifier: 0x00000000
iort Number of ID mappings: 0x00000002
iort Reference to ID Array: 0x00000024
iort Node Flags: 0x00000000
@@ -48,16 +48,20 @@ iort
iort IORT PCI Root Complex Node:
iort Type: 0x02
iort Length: 0x0040
-iort Revision: 0x00
-iort Reserved: 0x00000000
+iort Revision: 0x04
+iort Identifier: 0x00000000
iort Number of ID mappings: 0x00000001
-iort Reference to ID Array: 0x00000020
+iort Reference to ID Array: 0x00000028
iort Cache Coherent Attribute: 0x00000001
iort Allocation Hints: 0x0e
iort Reserved: 0x0000
iort Memory Access Flags 0x03
iort ATS Attribute: 0x00000001
iort PCI Segment Number: 0xc0bbeeff
+iort Memory addr. size limit: 0x08
+iort PASID capabilities: 0x0000
+iort Reserved: 0x00
+iort Flags: 0x00000000
iort ID Mapping 0
iort Input Base: 0x00000002
iort ID Count: 0x00000003
@@ -69,7 +73,7 @@ iort IORT SMMU node:
iort Type: 0x03
iort Length: 0x00a4
iort Revision: 0x00
-iort Reserved: 0x00000000
+iort Identifier: 0x00000000
iort Number of ID mappings: 0x00000001
iort Reference to ID Array: 0x00000090
iort Base Address: 0xf01030c020908000
@@ -10,7 +10,7 @@ iort IORT ITS Group Node:
iort Type: 0x00
iort Length: 0x0020
iort Revision: 0x03
-iort Reserved: 0xffffffff
+iort Identifier: 0x00000000
iort Number of ID mappings: 0x00000080
iort Reference to ID Array: 0x000000e0
iort Number of ITSs: 0x00000004
@@ -18,10 +18,8 @@ iort FAILED [HIGH] IORTItsIdArrayOutsideTable: Test 1, IORT ITS
iort Identifier Array end is outside the IORT ACPI table.
iort Either the Number of ID mappings is too large or the IORT
iort table size or ITS Group Node is too small.
-iort FAILED [MEDIUM] IORTBadFieldValue: Test 1, IORT IORT Node
-iort Revision field must be 0, got 3 instead.
-iort FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
-iort Reserved field must be zero, got 0xffffffff instead
+iort FAILED [LOW] IORTNodeRevisionInvalid: Test 1, IORT Node
+iort Revision field is 0x03 and should be zero or one.
iort FAILED [LOW] IORTNodeMappingsCountNonZero: Test 1, IORT
iort Node Number of ID Mappings field is 0x000000080 and should
iort be zero for this node type.
@@ -32,11 +30,11 @@ iort
iort IORT Named Component Node:
iort Type: 0x01
iort Length: 0x0050
-iort Revision: 0x02
-iort Reserved: 0x0000f001
+iort Revision: 0x05
+iort Identifier: 0x00000000
iort Number of ID mappings: 0x00000003
iort Reference to ID Array: 0x00000024
-iort Node Flags: 0xffffffff
+iort Node Flags: 0x00000000
iort Cache Coherent Attribute: 0x00000004
iort Allocation Hints: 0x0f
iort Reserved: 0xdead
@@ -56,12 +54,7 @@ iort Output Base: 0x00000003
iort Output Reference: 0x88888888
iort Flags: 0x00000001
iort FAILED [LOW] IORTNodeRevisionInvalid: Test 1, IORT Node
-iort Revision field is 0x02 and should be zero or one.
-iort FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
-iort Reserved field must be zero, got 0x0000f001 instead
-iort FAILED [HIGH] IORTNamedComponentNodeFlagsNonZero: Test 1,
-iort IORT Named Component Node Flags is 0xffffffff and is
-iort reserved and should be zero.
+iort Revision field is 0x05 and should be less than 5.
iort FAILED [HIGH] IORTCacheCoherentAttrInvalid: Test 1, IORT
iort Named Component Node Coherent Attribute is 0x4 and should
iort be either 0 (device is fully coherent) or 1 (device is not
@@ -83,29 +76,27 @@ iort IORT PCI Root Complex Node:
iort Type: 0x02
iort Length: 0x0040
iort Revision: 0x50
-iort Reserved: 0x0000000f
+iort Identifier: 0x0000000f
iort Number of ID mappings: 0x00000010
-iort Reference to ID Array: 0x00000020
+iort Reference to ID Array: 0x00000028
iort Cache Coherent Attribute: 0x000000d1
iort Allocation Hints: 0xfe
iort Reserved: 0x8000
iort Memory Access Flags 0x03
iort ATS Attribute: 0x00000003
iort PCI Segment Number: 0xc0bbeeff
+iort Memory addr. size limit: 0x08
+iort PASID capabilities: 0x0000
+iort Reserved: 0x00
+iort Flags: 0x00000000
iort ID Mapping 0
iort Input Base: 0x00000002
iort ID Count: 0x00000003
iort Output Base: 0x00000004
iort Output Reference: 0x00000005
iort Flags: 0x00000001
-iort FAILED [MEDIUM] IORTBadFieldValue: Test 1, IORT IORT Node
-iort Revision field must be 0, got 80 instead.
-iort FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
-iort Reserved field must be zero, got 0x0000000f instead
-iort FAILED [HIGH] IORTCPCIRootComplexAtsAttrInvalid: Test 1,
-iort IORT PCI Root Complex Node ATS Attribute is 0x3 and was
-iort expecting either 0 (root complex supports ATS) or 1 (root
-iort complex does not support ATS).
+iort FAILED [LOW] IORTNodeRevisionInvalid: Test 1, IORT Node
+iort Revision field is 0x50 and should be less than 5.
iort FAILED [HIGH] IORTCacheCoherentAttrInvalid: Test 1, IORT
iort PCI Root Complex Node Coherent Attribute is 0xd1 and
iort should be either 0 (device is fully coherent) or 1 (device
@@ -125,7 +116,7 @@ iort IORT SMMU node:
iort Type: 0x03
iort Length: 0x0094
iort Revision: 0xa0
-iort Reserved: 0x00008100
+iort Identifier: 0x00008100
iort Number of ID mappings: 0x00000001
iort Reference to ID Array: 0x00000090
iort Base Address: 0xf01030c020908000
@@ -161,9 +152,7 @@ iort Interrupt Flags: 0x00000092
iort GSIV: 0xf0008000
iort Interrupt Flags: 0x00000004
iort FAILED [LOW] IORTNodeRevisionInvalid: Test 1, IORT Node
-iort Revision field is 0xa0 and should be zero or one.
-iort FAILED [MEDIUM] IORTReservedNonZero: Test 1, IORT Node
-iort Reserved field must be zero, got 0x00008100 instead
+iort Revision field is 0xa0 and should be less than 4.
iort FAILED [HIGH] IORTReservedBitsNonZero: Test 1, IORT
iort SMMU_NsgIrpt Bits [31..1] must be zero, got 0x00000002
iort instead
@@ -204,6 +193,6 @@ iort FAILED [HIGH] IORTInvalidType: Test 1, IORT Type 0xff is
iort invalid, aborting check
iort
iort ==========================================================
-iort 0 passed, 36 failed, 0 warning, 0 aborted, 0 skipped, 0
+iort 0 passed, 30 failed, 0 warning, 0 aborted, 0 skipped, 0
iort info only.
iort ==========================================================
Signed-off-by: Ivan Hu <ivan.hu@canonical.com> --- fwts-test/iort-0001/acpidump-0001.log | 12 +++---- fwts-test/iort-0001/acpidump-0002.log | 14 ++++---- fwts-test/iort-0001/iort-0001.log | 20 +++++++----- fwts-test/iort-0001/iort-0002.log | 47 ++++++++++----------------- 4 files changed, 43 insertions(+), 50 deletions(-)