aboutsummaryrefslogtreecommitdiff
path: root/hw/misc/mips_cpc.c
diff options
context:
space:
mode:
authorMiodrag Dinic <miodrag.dinic@imgtec.com>2019-02-11 17:04:14 +0100
committerAleksandar Markovic <amarkovic@wavecomp.com>2019-02-14 17:47:28 +0100
commitf5117fd28552fe3fe32ef0495582b1caaef7a28d (patch)
tree04e68db1f1f1a4bc24d9dec027e847b4eb3bb12c /hw/misc/mips_cpc.c
parent41931c0137eeeff1303f254ed610217c0fa00313 (diff)
downloadqemu-f5117fd28552fe3fe32ef0495582b1caaef7a28d.zip
qemu-f5117fd28552fe3fe32ef0495582b1caaef7a28d.tar.gz
qemu-f5117fd28552fe3fe32ef0495582b1caaef7a28d.tar.bz2
hw/mips_cpc: kick a VP when putting it into Run statewq
While testing mttcg VP0 could get stuck in a loop waiting for other VPs to come up (which never actually happens). To fix this, kick VPs while they are being powered up by Cluster Power Controller in an async task which is triggered once the host thread is being spawned. Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com> Signed-off-by: Aleksandar Markovic <amarkovic@wavecomp.com> Acked-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'hw/misc/mips_cpc.c')
-rw-r--r--hw/misc/mips_cpc.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/hw/misc/mips_cpc.c b/hw/misc/mips_cpc.c
index 6d34574..712d842 100644
--- a/hw/misc/mips_cpc.c
+++ b/hw/misc/mips_cpc.c
@@ -30,6 +30,14 @@ static inline uint64_t cpc_vp_run_mask(MIPSCPCState *cpc)
return (1ULL << cpc->num_vp) - 1;
}
+static void mips_cpu_reset_async_work(CPUState *cs, run_on_cpu_data data)
+{
+ MIPSCPCState *cpc = (MIPSCPCState *) data.host_ptr;
+
+ cpu_reset(cs);
+ cpc->vp_running |= 1ULL << cs->cpu_index;
+}
+
static void cpc_run_vp(MIPSCPCState *cpc, uint64_t vp_run)
{
CPUState *cs = first_cpu;
@@ -37,8 +45,13 @@ static void cpc_run_vp(MIPSCPCState *cpc, uint64_t vp_run)
CPU_FOREACH(cs) {
uint64_t i = 1ULL << cs->cpu_index;
if (i & vp_run & ~cpc->vp_running) {
- cpu_reset(cs);
- cpc->vp_running |= i;
+ /*
+ * To avoid racing with a CPU we are just kicking off.
+ * We do the final bit of preparation for the work in
+ * the target CPUs context.
+ */
+ async_safe_run_on_cpu(cs, mips_cpu_reset_async_work,
+ RUN_ON_CPU_HOST_PTR(cpc));
}
}
}