summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorWang Qing <wangqing@vivo.com>2022-04-11 05:36:19 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-20 19:57:59 +0300
commit1dc9f1a66e1718479e1c4f95514e1750602a3cb9 (patch)
tree98f9f7d90d58c54e7b6c899a9a17035129dd1e2a /drivers/base
parentdb1e59483dfd8d4e956575302520bb8f7e20c79b (diff)
downloadlinux-1dc9f1a66e1718479e1c4f95514e1750602a3cb9.tar.xz
arch_topology: Do not set llc_sibling if llc_id is invalid
When ACPI is not enabled, cpuid_topo->llc_id = cpu_topo->llc_id = -1, which will set llc_sibling 0xff(...), this is misleading. Don't set llc_sibling(default 0) if we don't know the cache topology. Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Wang Qing <wangqing@vivo.com> Fixes: 37c3ec2d810f ("arm64: topology: divorce MC scheduling domain from core_siblings") Cc: stable <stable@vger.kernel.org> Link: https://lore.kernel.org/r/1649644580-54626-1-git-send-email-wangqing@vivo.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/arch_topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 5497c5ab7318..f73b836047cf 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -693,7 +693,7 @@ void update_siblings_masks(unsigned int cpuid)
for_each_online_cpu(cpu) {
cpu_topo = &cpu_topology[cpu];
- if (cpuid_topo->llc_id == cpu_topo->llc_id) {
+ if (cpu_topo->llc_id != -1 && cpuid_topo->llc_id == cpu_topo->llc_id) {
cpumask_set_cpu(cpu, &cpuid_topo->llc_sibling);
cpumask_set_cpu(cpuid, &cpu_topo->llc_sibling);
}