libipt: support 6/186, 6/204 and 6/221

markus-metzger · markus-metzger · commit 45d74c4fc010 · 2023-10-12T07:39:11.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
@@ -104,6 +104,8 @@ int pt_cpu_errata(struct pt_errata *errata, const struct pt_cpu *cpu)
 		case 0xb5:
 		case 0xaa:
 		case 0xac:
+		case 0xba:
+		case 0xcc:
 			errata->bdm70 = 1;
 			errata->skl014 = 1;
 			errata->skd022 = 1;
@@ -122,6 +124,7 @@ int pt_cpu_errata(struct pt_errata *errata, const struct pt_cpu *cpu)
 		case 0x9c:
 		case 0xb6:
 		case 0xaf:
+		case 0xdd:
 			errata->apl11 = 1;
 			return 0;
 		}
diff --git a/test/src/apl11.ptt b/test/src/apl11.ptt
@@ -49,6 +49,9 @@
 ;  cpu 6/181
 ;  cpu 6/170
 ;  cpu 6/172
+;  cpu 6/186
+;  cpu 6/204
+;  cpu 6/221
 ;
 
 org 0x1000
diff --git a/test/src/bdm70-psb_fup-tip_pge.ptt b/test/src/bdm70-psb_fup-tip_pge.ptt
@@ -63,6 +63,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 ; 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
@@ -63,6 +63,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 ; Variant: sync at an earlier PSB.
 ;
diff --git a/test/src/skd022.ptt b/test/src/skd022.ptt
@@ -60,6 +60,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 
 org 0x1000
diff --git a/test/src/skl014-call.ptt b/test/src/skl014-call.ptt
@@ -64,6 +64,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 
 org 0x1000
diff --git a/test/src/skl014-jmp-jmp.ptt b/test/src/skl014-jmp-jmp.ptt
@@ -64,6 +64,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 
 org 0x1000
diff --git a/test/src/skl014-jmp.ptt b/test/src/skl014-jmp.ptt
@@ -64,6 +64,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 
 org 0x1000
diff --git a/test/src/skl014-no_filter.ptt b/test/src/skl014-no_filter.ptt
@@ -55,6 +55,8 @@
 ;   cpu 6/170
 ;   cpu 6/172
 ;   cpu 6/207
+;   cpu 6/186
+;   cpu 6/204
 ;
 
 org 0x100000

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@`
`49`	`49`	`; cpu 6/181`
`50`	`50`	`; cpu 6/170`
`51`	`51`	`; cpu 6/172`
	`52`	`+; cpu 6/186`
	`53`	`+; cpu 6/204`
	`54`	`+; cpu 6/221`
`52`	`55`	`;`
`53`	`56`
`54`	`57`	`org 0x1000`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@`
`63`	`63`	`; cpu 6/170`
`64`	`64`	`; cpu 6/172`
`65`	`65`	`; cpu 6/207`
	`66`	`+; cpu 6/186`
	`67`	`+; cpu 6/204`
`66`	`68`	`;`
`67`	`69`	`; Variant: sync at the PSB directly preceding the TIP.PGE.`
`68`	`70`	`;`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@`
`60`	`60`	`; cpu 6/170`
`61`	`61`	`; cpu 6/172`
`62`	`62`	`; cpu 6/207`
	`63`	`+; cpu 6/186`
	`64`	`+; cpu 6/204`
`63`	`65`	`;`
`64`	`66`
`65`	`67`	`org 0x1000`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@`
`64`	`64`	`; cpu 6/170`
`65`	`65`	`; cpu 6/172`
`66`	`66`	`; cpu 6/207`
	`67`	`+; cpu 6/186`
	`68`	`+; cpu 6/204`
`67`	`69`	`;`
`68`	`70`
`69`	`71`	`org 0x1000`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@`
`55`	`55`	`; cpu 6/170`
`56`	`56`	`; cpu 6/172`
`57`	`57`	`; cpu 6/207`
	`58`	`+; cpu 6/186`
	`59`	`+; cpu 6/204`
`58`	`60`	`;`
`59`	`61`
`60`	`62`	`org 0x100000`