@@ -24,7 +24,7 @@ FACP @ 0x00000000
00f0: 00 00 00 00 ....
MPAM @ 0x00000000
- 0000: 4D 50 41 4D 54 01 00 00 02 34 48 49 53 49 20 20 MPAM.....4HISI
+ 0000: 4D 50 41 4D 6B 01 00 00 02 34 48 49 53 49 20 20 MPAM.....4HISI
0010: 54 45 4D 50 4C 41 54 45 02 00 00 00 49 4E 54 4C TEMPLATE....INTL
0020: 20 10 22 20 60 00 00 00 01 00 00 00 00 00 00 C0 ." `...........
0030: 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 ................
@@ -32,11 +32,11 @@ MPAM @ 0x00000000
0050: 00 00 00 00 00 00 00 00 32 00 00 00 00 00 00 00 ........2.......
0060: 00 00 00 00 00 00 00 00 01 00 00 00 11 00 00 00 ................
0070: 00 00 00 01 20 00 00 00 00 00 00 00 00 00 00 00 .... ...........
- 0080: 00 00 00 00 D0 00 00 00 02 00 00 00 00 00 00 D0 ....x...........
+ 0080: 00 00 00 00 08 01 00 00 02 00 00 00 00 00 00 D0 ....x...........
0090: 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 ................
00a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00b0: 00 00 00 00 00 00 00 00 32 00 00 00 00 00 00 00 ........2.......
- 00c0: 00 00 00 00 00 00 00 00 05 00 00 00 12 00 00 00 ................
+ 00c0: 00 00 00 00 00 00 00 00 06 00 00 00 12 00 00 00 ................
00d0: 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 00 ................
00e0: 00 00 00 00 13 00 00 00 01 00 00 FF 02 00 00 00 ................
00f0: 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 ................
@@ -45,4 +45,7 @@ MPAM @ 0x00000000
0120: 55 66 77 88 99 AA BB CC 00 00 00 00 16 00 00 00 ................
0130: 01 00 00 02 02 00 00 00 00 00 00 00 00 00 00 00 ................
0140: 02 00 00 00 11 22 33 44 00 00 00 00 AA BB CC DD ................
- 0150: 00 00 00 00 ....
+ 0150: 00 00 00 00 17 00 00 00 00 00 00 05 6C 01 00 00 ................
+ 0160: 00 00 00 00 00 00 00 00 00 00 00 00 45 D6 2B FE ................
+ 0170: 3B 03 E6 49 79 94 CD D1 21 8B 0B 2E 01 00 00 00 ................
+ 0180: 11 11 11 11 22 22 22 22 00 00 00 00 ............
@@ -24,7 +24,7 @@ FACP @ 0x00000000
00f0: 00 00 00 00 ....
MPAM @ 0x00000000
- 0000: 4D 50 41 4D 54 01 00 00 02 34 48 49 53 49 20 20 MPAM.....4HISI
+ 0000: 4D 50 41 4D 6B 01 00 00 02 34 48 49 53 49 20 20 MPAM.....4HISI
0010: 54 45 4D 50 4C 41 54 45 02 00 00 00 49 4E 54 4C TEMPLATE....INTL
0020: 20 10 22 20 60 00 01 02 01 00 00 00 00 00 00 C0 ." `...........
0030: 00 00 00 00 00 00 01 00 00 00 00 00 02 00 00 FF ................
@@ -32,11 +32,11 @@ MPAM @ 0x00000000
0050: 00 00 00 FF 00 00 00 00 32 00 00 00 00 00 00 00 ........2.......
0060: 00 00 00 00 00 00 00 00 01 00 00 00 11 00 00 00 ................
0070: 00 00 00 01 20 00 00 00 00 00 00 00 00 00 00 11 .... ...........
- 0080: 00 00 00 00 D0 00 00 00 02 00 00 00 00 00 00 D0 ....x...........
+ 0080: 00 00 00 00 08 01 00 00 02 00 00 00 00 00 00 D0 ....x...........
0090: 00 00 00 00 00 00 01 00 00 00 00 00 00 00 00 00 ................
00a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00b0: 00 00 00 00 00 00 00 00 32 00 00 00 00 00 00 00 ........2.......
- 00c0: 00 00 00 00 00 00 00 00 05 00 00 00 12 00 00 00 ................
+ 00c0: 00 00 00 00 00 00 00 00 06 00 00 00 12 00 00 00 ................
00d0: 00 00 00 00 01 00 00 00 00 00 00 00 00 00 02 00 ................
00e0: 00 00 00 00 13 00 00 00 01 00 00 FF 02 00 00 00 ................
00f0: 00 00 00 00 00 00 00 00 00 00 00 00 14 00 00 00 ................
@@ -45,4 +45,7 @@ MPAM @ 0x00000000
0120: 55 66 77 88 99 AA BB CC 00 00 00 00 16 00 00 00 ................
0130: 01 00 00 02 03 00 00 00 00 00 00 00 00 00 00 11 ................
0140: 02 00 00 00 11 22 33 44 00 00 00 00 AA BB CC DD ................
- 0150: 00 00 00 22 ....
+ 0150: 00 00 00 22 17 00 00 00 00 00 01 05 6C 01 00 00 ................
+ 0160: 00 00 00 00 00 00 00 11 00 00 00 00 45 D6 2B FE ................
+ 0170: 3B 03 E6 49 79 94 CD D1 21 8B 0B 2E 01 00 00 00 ................
+ 0180: 11 11 11 11 22 22 22 22 00 00 00 11 ............ ....
@@ -33,7 +33,7 @@ mpam 20 00 00 00 00 00 00 00 00 00 00 00
mpam Number of functional dependencies: 0x00000000
mpam
mpam MPAM MSC node:
-mpam Length: 0x00d0
+mpam Length: 0x0108
mpam Interface type: 0x00
mpam Reserved: 0x00
mpam Identifier: 0x00000002
@@ -50,7 +50,7 @@ mpam Error interrupt affinity: 0x00000000
mpam MAX_NRDY_USEC: 0x00000032
mpam Hardware ID of linked device: 0x0000000000000000
mpam Instance ID of linked device: 0x00000000
-mpam Number of resource nodes: 0x00000005
+mpam Number of resource nodes: 0x00000006
mpam List of resource nodes:
mpam Identifier: 0x00000012
mpam RIS Index: 0x00
@@ -102,6 +102,22 @@ mpam Reserved: 0x00000000
mpam Functional dependency descriptor:
mpam Producer: 0xddccbbaa
mpam Reserved: 0x00000000
+mpam List of resource nodes:
+mpam Identifier: 0x00000017
+mpam RIS Index: 0x00
+mpam Reserved1: 0x0000
+mpam Locator type: 0x05
+mpam Locator:
+mpam Interconnect locator:
+mpam 6C 01 00 00 00 00 00 00 00 00 00 00
+mpam Interconnect descriptor table:
+mpam Signature:
+mpam 45 D6 2B FE 3B 03 E6 49 79 94 CD D1 21 8B 0B 2E
+mpam Number of descriptors: 0x00000001
+mpam Number of functional dependencies: 0x00000000
+mpam Resource-specific data:
+mpam 45 D6 2B FE 3B 03 E6 49 79 94 CD D1 21 8B 0B 2E
+mpam 01 00 00 00 11 11 11 11 22 22 22 22 00 00 00 00
mpam
mpam PASSED: Test 1, No issues found in MPAM table.
mpam
@@ -60,7 +60,7 @@ mpam Locator [03] = 0x11
mpam Number of functional dependencies: 0x00000000
mpam
mpam MPAM MSC node:
-mpam Length: 0x00d0
+mpam Length: 0x0108
mpam Interface type: 0x00
mpam Reserved: 0x00
mpam Identifier: 0x00000002
@@ -77,7 +77,7 @@ mpam Error interrupt affinity: 0x00000000
mpam MAX_NRDY_USEC: 0x00000032
mpam Hardware ID of linked device: 0x0000000000000000
mpam Instance ID of linked device: 0x00000000
-mpam Number of resource nodes: 0x00000005
+mpam Number of resource nodes: 0x00000006
mpam List of resource nodes:
mpam Identifier: 0x00000012
mpam RIS Index: 0x00
@@ -152,9 +152,38 @@ mpam Producer: 0xddccbbaa
mpam Reserved: 0x22000000
mpam FAILED [MEDIUM] MPAMReservedNonZero: Test 1, MPAM
mpam Reserved1 field must be zero, got 0x22000000 instead
+mpam List of resource nodes:
+mpam Identifier: 0x00000017
+mpam RIS Index: 0x00
+mpam Reserved1: 0x0100
+mpam Locator type: 0x05
+mpam Locator:
+mpam Interconnect locator:
+mpam 6C 01 00 00 00 00 00 00 00 00 00 11
+mpam FAILED [MEDIUM] MPAMReservedNonZero: Test 1, MPAM Locator
+mpam field must be all zero, got below instead
+mpam Locator [00] = 0x00
+mpam Locator [01] = 0x00
+mpam Locator [02] = 0x00
+mpam Locator [03] = 0x11
+mpam Interconnect descriptor table:
+mpam Signature:
+mpam 45 D6 2B FE 3B 03 E6 49 79 94 CD D1 21 8B 0B 2E
+mpam Number of descriptors: 0x00000001
+mpam FAILED [MEDIUM] MPAMReservedNonZero: Test 1, MPAM reserved
+mpam field must be all zero, got below instead
+mpam reserved [00] = 0x00
+mpam reserved [01] = 0x00
+mpam reserved [02] = 0x11
+mpam Number of functional dependencies: 0x00000000
+mpam FAILED [MEDIUM] MPAMReservedNonZero: Test 1, MPAM
+mpam Reserved1 field must be zero, got 0x0100 instead
+mpam Resource-specific data:
+mpam 45 D6 2B FE 3B 03 E6 49 79 94 CD D1 21 8B 0B 2E
+mpam 01 00 00 00 11 11 11 11 22 22 22 22 00 00 00 11
mpam
mpam
mpam ==========================================================
-mpam 0 passed, 13 failed, 0 warning, 0 aborted, 0 skipped, 0
+mpam 0 passed, 16 failed, 0 warning, 0 aborted, 0 skipped, 0
mpam info only.
mpam ==========================================================
Signed-off-by: Ivan Hu <ivan.hu@canonical.com> --- fwts-test/mpam-0001/acpidump-0001.log | 11 ++++++--- fwts-test/mpam-0001/acpidump-0002.log | 11 ++++++--- fwts-test/mpam-0001/mpam-0001.log | 20 +++++++++++++-- fwts-test/mpam-0001/mpam-0002.log | 35 ++++++++++++++++++++++++--- 4 files changed, 64 insertions(+), 13 deletions(-)