[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/6] target/ppc: Fix THREAD_SIBLING_FOREACH for multi-socket
From: |
Nicholas Piggin |
Subject: |
[PULL 3/6] target/ppc: Fix THREAD_SIBLING_FOREACH for multi-socket |
Date: |
Wed, 27 Nov 2024 03:12:32 +1000 |
From: Glenn Miles <milesg@linux.ibm.com>
The THREAD_SIBLING_FOREACH macro wasn't excluding threads from other
chips. Add chip_index field to the thread state and add a check for the
new field in the macro.
Fixes: b769d4c8f4c6 ("target/ppc: Add initial flags and helpers for SMT
support")
Signed-off-by: Glenn Miles <milesg@linux.ibm.com>
[npiggin: set chip_index for spapr too]
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
hw/ppc/pnv_core.c | 2 ++
hw/ppc/spapr_cpu_core.c | 1 +
target/ppc/cpu.h | 7 +++++--
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index cbfac49862..e6b02294b1 100644
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -322,6 +322,8 @@ static void pnv_core_cpu_realize(PnvCore *pc, PowerPCCPU
*cpu, Error **errp,
pir_spr->default_value = pir;
tir_spr->default_value = tir;
+ env->chip_index = pc->chip->chip_id;
+
if (pc->big_core) {
/* 2 "small cores" get the same core index for SMT operations */
env->core_index = core_hwid >> 1;
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index ada439e831..135f86a622 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -313,6 +313,7 @@ static PowerPCCPU *spapr_create_vcpu(SpaprCpuCore *sc, int
i, Error **errp)
return NULL;
}
+ env->chip_index = sc->node_id;
env->core_index = cc->core_id;
cpu->node_id = sc->node_id;
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 0b4f1013b8..2ffac2ed03 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -1253,6 +1253,7 @@ struct CPUArchState {
/* For SMT processors */
bool has_smt_siblings;
int core_index;
+ int chip_index;
#if !defined(CONFIG_USER_ONLY)
/* MMU context, only relevant for full system emulation */
@@ -1412,8 +1413,10 @@ struct CPUArchState {
#define THREAD_SIBLING_FOREACH(cs, cs_sibling) \
CPU_FOREACH(cs_sibling) \
- if (POWERPC_CPU(cs)->env.core_index == \
- POWERPC_CPU(cs_sibling)->env.core_index)
+ if ((POWERPC_CPU(cs)->env.chip_index == \
+ POWERPC_CPU(cs_sibling)->env.chip_index) && \
+ (POWERPC_CPU(cs)->env.core_index == \
+ POWERPC_CPU(cs_sibling)->env.core_index))
#define SET_FIT_PERIOD(a_, b_, c_, d_) \
do { \
--
2.45.2
- [PULL 0/6] ppc-for-9.2-2 queue, Nicholas Piggin, 2024/11/26
- [PULL 1/6] target/ppc: Fix non-maskable interrupt while halted, Nicholas Piggin, 2024/11/26
- [PULL 2/6] ppc/pnv: Fix direct controls quiesce, Nicholas Piggin, 2024/11/26
- [PULL 4/6] ppc/pnv: Add xscom- prefix to pervasive-control region name, Nicholas Piggin, 2024/11/26
- [PULL 3/6] target/ppc: Fix THREAD_SIBLING_FOREACH for multi-socket,
Nicholas Piggin <=
- [PULL 6/6] hw/ppc/pegasos2: Fix IRQ routing from pci.0, Nicholas Piggin, 2024/11/26
- [PULL 5/6] ppc/spapr: fix drc index mismatch for partially enabled vcpus, Nicholas Piggin, 2024/11/26
- Re: [PULL 0/6] ppc-for-9.2-2 queue, Peter Maydell, 2024/11/26
- Re: [PULL 0/6] ppc-for-9.2-2 queue, Michael Tokarev, 2024/11/27