UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/cpu: Get CPU topology and LLC ID for Hygon family 18h model 5h 

Add support to derive CPU topology for Hygon family 18h model 5h
processor, and calculate LLC ID for it from the number of threads
sharing the cache.

Signed-off-by: Pu Wen <puwen@hygon.cn>
Signed-off-by: Jinliang Zheng <alexjlzheng@tencent.com>
Reviewed-by: Bin Lai <robinlai@tencent.com>
Signed-off-by: Jinliang Zheng <alexjlzheng@tencent.com>
Reviewed-by: caelli <caelli@tencent.com>
Signed-off-by: Jianping Liu <frankjpliu@tencent.com>
This commit is contained in:
Pu Wen 2023-06-08 12:46:00 +08:00 committed by Jianping Liu
parent 6b45f25208
commit 9c869204b2
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/x86/kernel/cpu/cacheinfo.c
View File

@ -693,11 +693,30 @@ void cacheinfo_hygon_init_llc_id(struct cpuinfo_x86 *c, int cpu)
if (!cpuid_edx(0x80000006)) if (!cpuid_edx(0x80000006))
return; return;
if (c->x86_model < 0x5) {
/* /*
* LLC is at the core complex level. * LLC is at the core complex level.
* Core complex ID is ApicId[3] for these processors. * Core complex ID is ApicId[3] for these processors.
*/ */
per_cpu(cpu_llc_id, cpu) = c->apicid >> 3; per_cpu(cpu_llc_id, cpu) = c->apicid >> 3;
} else {
/*
* LLC ID is calculated from the number of threads
* sharing the cache.
*/
u32 eax, ebx, ecx, edx, num_sharing_cache = 0;
u32 llc_index = find_num_cache_leaves(c) - 1;
cpuid_count(0x8000001d, llc_index, &eax, &ebx, &ecx, &edx);
if (eax)
num_sharing_cache = ((eax >> 14) & 0xfff) + 1;
if (num_sharing_cache) {
int bits = get_count_order(num_sharing_cache);
per_cpu(cpu_llc_id, cpu) = c->apicid >> bits;
}
}
} }
void init_amd_cacheinfo(struct cpuinfo_x86 *c) void init_amd_cacheinfo(struct cpuinfo_x86 *c)

1
arch/x86/kernel/cpu/hygon.c
View File

@ -88,6 +88,7 @@ static void hygon_get_topology(struct cpuinfo_x86 *c)
c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT; c->phys_proc_id = c->apicid >> APICID_SOCKET_ID_BIT;
break; break;
case 0x4: case 0x4:
case 0x5:
/* /*
* In case leaf 0xB is available, use it to derive * In case leaf 0xB is available, use it to derive
* topology information. * topology information.