cpu: xbyak: yet another work around zeroed-out cpuid 0xb leaf

Roman Dubtsov · Roman Dubtsov · commit 301b088c106c · 2019-12-24T09:37:05.000-08:00
diff --git a/src/cpu/xbyak/xbyak_util.h b/src/cpu/xbyak/xbyak_util.h
@@ -177,6 +177,11 @@ class Cpu {
 					numCores_[level - 1] = extractBit(data[1], 0, 15);
 				}
 			}
+			/*
+			   Everybody lies, so we need some sane values to fall back on
+			*/
+			numCores_[SmtLevel - 1] = std::max(1u, numCores_[SmtLevel - 1]);
+			numCores_[CoreLevel - 1] = std::max(numCores_[SmtLevel - 1], numCores_[CoreLevel - 1]);
 		} else {
 			/*
 				Failed to deremine num of cores without x2APIC support.

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,11 @@ class Cpu {`
`177`	`177`	`numCores_[level - 1] = extractBit(data[1], 0, 15);`
`178`	`178`	`}`
`179`	`179`	`}`
	`180`	`+ /*`
	`181`	`+ Everybody lies, so we need some sane values to fall back on`
	`182`	`+ */`
	`183`	`+ numCores_[SmtLevel - 1] = std::max(1u, numCores_[SmtLevel - 1]);`
	`184`	`+ numCores_[CoreLevel - 1] = std::max(numCores_[SmtLevel - 1], numCores_[CoreLevel - 1]);`
`180`	`185`	`} else {`
`181`	`186`	`/*`
`182`	`187`	`Failed to deremine num of cores without x2APIC support.`