projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
03cab84
)
arch_topology: Do not set llc_sibling if llc_id is invalid
author
Wang Qing
<wangqing@vivo.com>
Mon, 11 Apr 2022 02:36:19 +0000
(19:36 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Mon, 9 May 2022 07:14:30 +0000
(09:14 +0200)
commit
1dc9f1a66e1718479e1c4f95514e1750602a3cb9
upstream.
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>
drivers/base/arch_topology.c
patch
|
blob
|
history
diff --git
a/drivers/base/arch_topology.c
b/drivers/base/arch_topology.c
index
4340766
..
ef4fc89
100644
(file)
--- a/
drivers/base/arch_topology.c
+++ b/
drivers/base/arch_topology.c
@@
-609,7
+609,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 && cpu
id_topo->llc_id == cpu_topo->llc_id) {
cpumask_set_cpu(cpu, &cpuid_topo->llc_sibling);
cpumask_set_cpu(cpuid, &cpu_topo->llc_sibling);
}