libipt: support 18/1, 18/3, and 6/213

markus-metzger · markus-metzger · commit e0c517b99d4c · 2025-11-20T10:38:52.000Z
We do not know about the errata for this microarchitecture but let's
assume that we carry forward existing errata until we know more.

Signed-off-by: Markus Metzger &lt;markus.t.metzger@intel.com&gt;
diff --git a/libipt/src/pt_config.c b/libipt/src/pt_config.c
@@ -114,6 +114,7 @@ int pt_cpu_errata(struct pt_errata *errata, const struct pt_cpu *cpu)
 		case 0xac:
 		case 0xbd:
 		case 0xcc:
+		case 0xd5:
 			errata->bdm70 = 1;
 			errata->skd022 = 1;
 			errata->apl11 = 1;
@@ -137,6 +138,17 @@ int pt_cpu_errata(struct pt_errata *errata, const struct pt_cpu *cpu)
 		}
 		break;
 
+	case 0x12:
+		switch (cpu->model) {
+		case 0x01:
+		case 0x03:
+			errata->bdm70 = 1;
+			errata->skd022 = 1;
+			errata->apl11 = 1;
+			return 0;
+		}
+		break;
+
 	case 0x13:
 		switch (cpu->model) {
 		case 0x01:
diff --git a/test/src/apl11.ptt b/test/src/apl11.ptt
@@ -55,6 +55,9 @@
 ;  cpu 6/189
 ;  cpu 6/197
 ;  cpu 6/198
+;  cpu 18/1
+;  cpu 18/3
+;  cpu 6/213
 ;
 
 org 0x1000
diff --git a/test/src/bdm70-psb_fup-tip_pge.ptt b/test/src/bdm70-psb_fup-tip_pge.ptt
@@ -69,6 +69,9 @@
 ;   cpu 6/197
 ;   cpu 6/198
 ;   cpu 19/1
+;   cpu 18/1
+;   cpu 18/3
+;   cpu 6/213
 ;
 ; Variant: sync at the PSB directly preceding the TIP.PGE.
 ;
diff --git a/test/src/bdm70-tip_pgd-psb_fup-tip_pge.ptt b/test/src/bdm70-tip_pgd-psb_fup-tip_pge.ptt
@@ -69,6 +69,9 @@
 ;   cpu 6/197
 ;   cpu 6/198
 ;   cpu 19/1
+;   cpu 18/1
+;   cpu 18/3
+;   cpu 6/213
 ;
 ; Variant: sync at an earlier PSB.
 ;
diff --git a/test/src/skd022.ptt b/test/src/skd022.ptt
@@ -66,6 +66,9 @@
 ;   cpu 6/197
 ;   cpu 6/198
 ;   cpu 19/1
+;   cpu 18/1
+;   cpu 18/3
+;   cpu 6/213
 ;
 
 org 0x1000

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@`
`55`	`55`	`; cpu 6/189`
`56`	`56`	`; cpu 6/197`
`57`	`57`	`; cpu 6/198`
	`58`	`+; cpu 18/1`
	`59`	`+; cpu 18/3`
	`60`	`+; cpu 6/213`
`58`	`61`	`;`
`59`	`62`
`60`	`63`	`org 0x1000`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@`
`69`	`69`	`; cpu 6/197`
`70`	`70`	`; cpu 6/198`
`71`	`71`	`; cpu 19/1`
	`72`	`+; cpu 18/1`
	`73`	`+; cpu 18/3`
	`74`	`+; cpu 6/213`
`72`	`75`	`;`
`73`	`76`	`; Variant: sync at the PSB directly preceding the TIP.PGE.`
`74`	`77`	`;`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@`
`66`	`66`	`; cpu 6/197`
`67`	`67`	`; cpu 6/198`
`68`	`68`	`; cpu 19/1`
	`69`	`+; cpu 18/1`
	`70`	`+; cpu 18/3`
	`71`	`+; cpu 6/213`
`69`	`72`	`;`
`70`	`73`
`71`	`74`	`org 0x1000`