@@ -307,6 +307,14 @@ static uint32_t encode_cache_cpuid80000005(CPUCacheInfo *cache)
a == ASSOC_FULL ? 0xF : \
0 /* invalid value */)
+/* Definitions used on CPUID Leaf 0x8000001D */
+/* Number of logical cores in a complex */
+#define CORES_IN_CMPLX 4
+/* Number of logical processors sharing cache */
+#define NUM_SHARING_CACHE(threads) (threads ? \
+ (((CORES_IN_CMPLX - 1) * 2) + 1) : \
+ (CORES_IN_CMPLX - 1))
+
/*
* Encode cache info for CPUID[0x80000006].ECX and CPUID[0x80000006].EDX
* @l3 can be NULL.
@@ -336,6 +344,41 @@ static void encode_cache_cpuid80000006(CPUCacheInfo *l2,
}
}
+/* Encode cache info for CPUID[8000001D] */
+static void encode_cache_cpuid8000001d(CPUCacheInfo *cache, int nr_threads,
+ uint32_t *eax, uint32_t *ebx,
+ uint32_t *ecx, uint32_t *edx)
+{
+ assert(cache->size == cache->line_size * cache->associativity *
+ cache->partitions * cache->sets);
+
+ *eax = CACHE_TYPE(cache->type) | CACHE_LEVEL(cache->level) |
+ (cache->self_init ? CACHE_SELF_INIT_LEVEL : 0);
+
+ /* L3 is shared among multiple cores */
+ if (cache->level == 3) {
+ *eax |= (NUM_SHARING_CACHE(nr_threads - 1) << 14);
+ } else {
+ *eax |= ((nr_threads - 1) << 14);
+ }
+
+ assert(cache->line_size > 0);
+ assert(cache->partitions > 0);
+ assert(cache->associativity > 0);
+ /* We don't implement fully-associative caches */
+ assert(cache->associativity < cache->sets);
+ *ebx = (cache->line_size - 1) |
+ ((cache->partitions - 1) << 12) |
+ ((cache->associativity - 1) << 22);
+
+ assert(cache->sets > 0);
+ *ecx = cache->sets - 1;
+
+ *edx = (cache->no_invd_sharing ? CACHE_NO_INVD_SHARING : 0) |
+ (cache->inclusive ? CACHE_INCLUSIVE : 0) |
+ (cache->complex_indexing ? CACHE_COMPLEX_IDX : 0);
+}
+
/* Definitions of the hardcoded cache entries we expose: */
/* L1 data cache: */
@@ -4006,6 +4049,55 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,
*edx = 0;
}
break;
+ case 0x8000001D:
+ *eax = 0;
+ switch (count) {
+ case 0: /* L1 dcache info */
+ if (env->cache_info.valid && !cpu->legacy_cache) {
+ encode_cache_cpuid8000001d(&env->cache_info.l1d_cache,
+ cs->nr_threads,
+ eax, ebx, ecx, edx);
+ } else {
+ encode_cache_cpuid8000001d(&l1d_cache_amd, cs->nr_threads,
+ eax, ebx, ecx, edx);
+ }
+ break;
+ case 1: /* L1 icache info */
+ if (env->cache_info.valid && !cpu->legacy_cache) {
+ encode_cache_cpuid8000001d(&env->cache_info.l1i_cache,
+ cs->nr_threads,
+ eax, ebx, ecx, edx);
+ } else {
+ encode_cache_cpuid8000001d(&l1i_cache_amd,
+ cs->nr_threads,
+ eax, ebx, ecx, edx);
+ }
+ break;
+ case 2: /* L2 cache info */
+ if (env->cache_info.valid && !cpu->legacy_cache) {
+ encode_cache_cpuid8000001d(&env->cache_info.l2_cache,
+ cs->nr_threads,
+ eax, ebx, ecx, edx);
+ } else {
+ encode_cache_cpuid8000001d(&l2_cache_amd, cs->nr_threads,
+ eax, ebx, ecx, edx);
+ }
+ break;
+ case 3: /* L3 cache info */
+ if (env->cache_info.valid && !cpu->legacy_cache) {
+ encode_cache_cpuid8000001d(&env->cache_info.l3_cache,
+ cs->nr_threads,
+ eax, ebx, ecx, edx);
+ } else {
+ encode_cache_cpuid8000001d(&l3_cache, cs->nr_threads,
+ eax, ebx, ecx, edx);
+ }
+ break;
+ default: /* end of info */
+ *eax = *ebx = *ecx = *edx = 0;
+ break;
+ }
+ break;
case 0xC0000000:
*eax = env->cpuid_xlevel2;
*ebx = 0;
@@ -937,9 +937,32 @@ int kvm_arch_init_vcpu(CPUState *cs)
}
c = &cpuid_data.entries[cpuid_i++];
- c->function = i;
- c->flags = 0;
- cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
+ switch (i) {
+ case 0x8000001d:
+ /* Query for all AMD cache information leaves */
+ for (j = 0; ; j++) {
+ c->function = i;
+ c->flags = KVM_CPUID_FLAG_SIGNIFCANT_INDEX;
+ c->index = j;
+ cpu_x86_cpuid(env, i, j, &c->eax, &c->ebx, &c->ecx, &c->edx);
+
+ if (c->eax == 0) {
+ break;
+ }
+ if (cpuid_i == KVM_MAX_CPUID_ENTRIES) {
+ fprintf(stderr, "cpuid_data is full, no space for "
+ "cpuid(eax:0x%x,ecx:0x%x)\n", i, j);
+ abort();
+ }
+ c = &cpuid_data.entries[cpuid_i++];
+ }
+ break;
+ default:
+ c->function = i;
+ c->flags = 0;
+ cpu_x86_cpuid(env, i, 0, &c->eax, &c->ebx, &c->ecx, &c->edx);
+ break;
+ }
}
/* Call Centaur's CPUID instructions they are supported. */