|
Mian Yousaf Kaukab |
3b93ec |
From: Wang Qing <wangqing@vivo.com>
|
|
Mian Yousaf Kaukab |
3b93ec |
Date: Sun, 10 Apr 2022 19:36:19 -0700
|
|
Mian Yousaf Kaukab |
3b93ec |
Subject: arch_topology: Do not set llc_sibling if llc_id is invalid
|
|
Mian Yousaf Kaukab |
3b93ec |
|
|
Mian Yousaf Kaukab |
3b93ec |
Git-commit: 1dc9f1a66e1718479e1c4f95514e1750602a3cb9
|
|
Mian Yousaf Kaukab |
3b93ec |
Patch-mainline: v5.18-rc5
|
|
Mian Yousaf Kaukab |
3b93ec |
References: git-fixes
|
|
Mian Yousaf Kaukab |
3b93ec |
|
|
Mian Yousaf Kaukab |
3b93ec |
When ACPI is not enabled, cpuid_topo->llc_id = cpu_topo->llc_id = -1, which
|
|
Mian Yousaf Kaukab |
3b93ec |
will set llc_sibling 0xff(...), this is misleading.
|
|
Mian Yousaf Kaukab |
3b93ec |
|
|
Mian Yousaf Kaukab |
3b93ec |
Don't set llc_sibling(default 0) if we don't know the cache topology.
|
|
Mian Yousaf Kaukab |
3b93ec |
|
|
Mian Yousaf Kaukab |
3b93ec |
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
|
|
Mian Yousaf Kaukab |
3b93ec |
Signed-off-by: Wang Qing <wangqing@vivo.com>
|
|
Mian Yousaf Kaukab |
3b93ec |
Fixes: 37c3ec2d810f ("arm64: topology: divorce MC scheduling domain from core_siblings")
|
|
Mian Yousaf Kaukab |
3b93ec |
Cc: stable <stable@vger.kernel.org>
|
|
Mian Yousaf Kaukab |
3b93ec |
Link: https://lore.kernel.org/r/1649644580-54626-1-git-send-email-wangqing@vivo.com
|
|
Mian Yousaf Kaukab |
3b93ec |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Mian Yousaf Kaukab |
3b93ec |
Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
|
|
Mian Yousaf Kaukab |
3b93ec |
---
|
|
Mian Yousaf Kaukab |
3b93ec |
arch/arm64/kernel/topology.c | 2 +-
|
|
Mian Yousaf Kaukab |
3b93ec |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Mian Yousaf Kaukab |
3b93ec |
|
|
Mian Yousaf Kaukab |
3b93ec |
--- a/arch/arm64/kernel/topology.c
|
|
Mian Yousaf Kaukab |
3b93ec |
+++ b/arch/arm64/kernel/topology.c
|
|
Mian Yousaf Kaukab |
3b93ec |
@@ -238,7 +238,7 @@ static void update_siblings_masks(unsign
|
|
Mian Yousaf Kaukab |
3b93ec |
for_each_possible_cpu(cpu) {
|
|
Mian Yousaf Kaukab |
3b93ec |
cpu_topo = &cpu_topology[cpu];
|
|
Mian Yousaf Kaukab |
3b93ec |
|
|
Mian Yousaf Kaukab |
3b93ec |
- if (cpuid_topo->llc_id == cpu_topo->llc_id) {
|
|
Mian Yousaf Kaukab |
3b93ec |
+ if (cpu_topo->llc_id != -1 && cpuid_topo->llc_id == cpu_topo->llc_id) {
|
|
Mian Yousaf Kaukab |
3b93ec |
cpumask_set_cpu(cpu, &cpuid_topo->llc_siblings);
|
|
Mian Yousaf Kaukab |
3b93ec |
cpumask_set_cpu(cpuid, &cpu_topo->llc_siblings);
|
|
Mian Yousaf Kaukab |
3b93ec |
}
|