@@ -24,8 +24,8 @@ FACP @ 0x00000000
00f0: 00 00 00 00 ....
SRAT @ 0x00000000
- 0000: 53 52 41 54 08 01 00 00 03 9e 41 4d 44 20 20 20 SRAT......AMD
- 0010: 46 41 4d 5f 46 5f 31 30 02 00 00 00 41 4d 44 20 FAM_F_10....AMD
+ 0000: 53 52 41 54 1c 01 00 00 03 d0 41 4d 44 20 20 20 SRAT......AMD
+ 0010: 46 41 4d 5f 46 5f 31 30 02 00 00 00 41 4d 44 20 FAM_F_10....AMD
0020: 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 ................
0030: 00 10 00 00 01 00 00 00 00 00 00 00 00 00 00 00 ................
0040: 00 10 00 01 01 00 00 00 00 00 00 00 01 00 00 00 ................
@@ -38,6 +38,7 @@ SRAT @ 0x00000000
00b0: 01 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 ................
00c0: 01 28 00 00 00 00 00 00 00 00 00 00 01 00 00 00 .(..............
00d0: 00 00 00 30 01 00 00 00 01 00 00 00 01 00 00 00 ...0............
- 00e0: 00 00 00 00 00 00 00 00 06 20 00 00 00 00 00 00 ................
- 00f0: 00 11 22 33 44 55 66 77 00 11 22 33 00 00 00 00 ................
- 0100: 00 00 00 00 00 00 00 00 ................
+ 00e0: 00 00 00 00 00 00 00 00 06 20 00 00 00 00 00 00 ......... ......
+ 00f0: 00 11 22 33 44 55 66 77 00 11 22 33 00 00 00 00 .."3DUfw.."3....
+ 0100: 00 00 00 00 00 00 00 00 07 14 00 00 01 00 00 00 ................
+ 0110: 10 00 00 00 01 00 00 00 04 00 00 00 ............
@@ -24,7 +24,7 @@ FACP @ 0x00000000
00f0: 00 00 00 00 ....
SRAT @ 0x00000000
- 0000: 53 52 41 54 08 01 00 00 03 9e 41 4d 44 20 20 20 SRAT......AMD
+ 0000: 53 52 41 54 1c 01 00 00 03 9e 41 4d 44 20 20 20 SRAT......AMD
0010: 46 41 4d 5f 46 5f 31 30 02 00 00 00 41 4d 44 20 FAM_F_10....AMD
0020: 01 00 00 00 07 00 00 00 00 00 00 00 00 00 00 00 ................
0030: 00 10 00 00 09 00 00 00 00 00 00 00 00 00 00 00 ................
@@ -40,4 +40,5 @@ SRAT @ 0x00000000
00d0: 00 00 00 30 01 00 00 00 01 00 00 00 08 00 00 00 ...0............
00e0: 00 00 00 00 00 00 00 00 06 20 01 01 00 00 00 00 ................
00f0: 01 02 03 04 00 00 00 00 ff ff ff ff ff ff ff ff ................
- 0100: 00 00 00 00 00 00 00 ff ................
+ 0100: 00 00 00 00 00 00 00 ff 07 14 00 00 01 00 00 00 ................
+ 0110: 10 00 00 00 03 00 00 00 04 00 00 00 ............
@@ -95,6 +95,15 @@ srat Reserved: 0x00000000
srat Flags: 0x00000000
srat Reserved: 0x00000000
srat
+srat SRAT RINTC Affinity Structure:
+srat Type: 0x07
+srat Length: 0x14
+srat Reserved: 0x0000
+srat Proximity Domain: 0x00000001
+srat ACPI Processor UID: 0x00000010
+srat Flags: 0x00000001
+srat Clock Domain 0x00000004
+srat
srat PASSED: Test 1, No issues found in SRAT table.
srat
srat ==========================================================
@@ -127,8 +127,20 @@ srat
srat FAILED [MEDIUM] SRATReservedNonZero: Test 1, SRAT Port
srat Affinity Reserved field must be zero, got 0xff000000
srat instead
+srat SRAT RINTC Affinity Structure:
+srat Type: 0x07
+srat Length: 0x14
+srat Reserved: 0x0000
+srat Proximity Domain: 0x00000001
+srat ACPI Processor UID: 0x00000010
+srat Flags: 0x00000003
+srat Clock Domain 0x00000004
+srat
+srat FAILED [HIGH] SRATReservedBitsNonZero: Test 1, SRAT RINTC
+srat Affinity Flags Bits [31..1] must be zero, got 0x00000003
+srat instead
srat
srat ==========================================================
-srat 0 passed, 7 failed, 0 warning, 0 aborted, 0 skipped, 0
+srat 0 passed, 8 failed, 0 warning, 0 aborted, 0 skipped, 0
srat info only.
srat ==========================================================
Add a RINTC affinity entry to the SRAT golden dump to exercise the new parser. Update the expected log so the test validates the new output. Signed-off-by: Ivan Hu <ivan.hu@canonical.com> --- fwts-test/srat-0001/acpidump-0001.log | 11 ++++++----- fwts-test/srat-0001/acpidump-0002.log | 5 +++-- fwts-test/srat-0001/srat-0001.log | 9 +++++++++ fwts-test/srat-0001/srat-0002.log | 14 +++++++++++++- 4 files changed, 31 insertions(+), 8 deletions(-)