From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: ivan@vmfacility.fr, "Greg Kurz" <groug@kaod.org>,
qemu-ppc@nongnu.org, "Cédric Le Goater" <clg@kaod.org>,
david@gibson.dropbear.id.au
Subject: [PATCH v2 14/15] hw/ppc: Use hreg_store_msr for msr updates
Date: Fri, 12 Mar 2021 19:00:17 -0600 [thread overview]
Message-ID: <20210313010018.819153-15-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210313010018.819153-1-richard.henderson@linaro.org>
Only one of the three places in hw/ppc that modify msr updated
hflags. Even in that case, use the official interface instead
of a direct call to hreg_compute_hflags.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
Cc: Cédric Le Goater <clg@kaod.org>
Cc: Greg Kurz <groug@kaod.org>
---
hw/ppc/pnv_core.c | 3 ++-
hw/ppc/spapr_hcall.c | 3 +--
hw/ppc/spapr_rtas.c | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/pnv_core.c b/hw/ppc/pnv_core.c
index bd2bf2e044..31f041b9c7 100644
--- a/hw/ppc/pnv_core.c
+++ b/hw/ppc/pnv_core.c
@@ -29,6 +29,7 @@
#include "hw/ppc/pnv_xscom.h"
#include "hw/ppc/xics.h"
#include "hw/qdev-properties.h"
+#include "helper_regs.h"
static const char *pnv_core_cpu_typename(PnvCore *pc)
{
@@ -54,7 +55,7 @@ static void pnv_core_cpu_reset(PnvCore *pc, PowerPCCPU *cpu)
*/
env->gpr[3] = PNV_FDT_ADDR;
env->nip = 0x10;
- env->msr |= MSR_HVB; /* Hypervisor mode */
+ hreg_store_msr(env, env->msr | MSR_HVB, true); /* Hypervisor mode */
env->spr[SPR_HRMOR] = pc->hrmor;
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index 7b5cd3553c..a4f7a09ba8 100644
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1055,8 +1055,7 @@ static target_ulong h_cede(PowerPCCPU *cpu, SpaprMachineState *spapr,
CPUState *cs = CPU(cpu);
SpaprCpuState *spapr_cpu = spapr_cpu_state(cpu);
- env->msr |= (1ULL << MSR_EE);
- hreg_compute_hflags(env);
+ hreg_store_msr(env, env->msr | (1ULL << MSR_EE), false);
if (spapr_cpu->prod) {
spapr_cpu->prod = false;
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index 8a79f9c628..b9a6b7ef30 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -51,6 +51,7 @@
#include "target/ppc/mmu-hash64.h"
#include "target/ppc/mmu-book3s-v3.h"
#include "migration/blocker.h"
+#include "helper_regs.h"
static void rtas_display_character(PowerPCCPU *cpu, SpaprMachineState *spapr,
uint32_t token, uint32_t nargs,
@@ -162,7 +163,7 @@ static void rtas_start_cpu(PowerPCCPU *callcpu, SpaprMachineState *spapr,
cpu_synchronize_state(CPU(newcpu));
- env->msr = (1ULL << MSR_SF) | (1ULL << MSR_ME);
+ hreg_store_msr(env, (1ULL << MSR_SF) | (1ULL << MSR_ME), true);
/* Enable Power-saving mode Exit Cause exceptions for the new CPU */
lpcr = env->spr[SPR_LPCR];
--
2.25.1
next prev parent reply other threads:[~2021-03-13 1:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-13 1:00 [PATCH v2 00/15] target/ppc: Fix truncation of env->hflags Richard Henderson
2021-03-13 1:00 ` [PATCH v2 01/15] target/ppc: Move helper_regs.h functions out-of-line Richard Henderson
2021-03-13 1:00 ` [PATCH v2 02/15] target/ppc: Move 601 hflags adjustment to hreg_compute_hflags Richard Henderson
2021-03-13 1:00 ` [PATCH v2 03/15] target/ppc: Properly sync cpu state with new msr in cpu_load_old Richard Henderson
2021-03-13 1:00 ` [PATCH v2 04/15] target/ppc: Do not call hreg_compute_mem_idx after ppc_store_msr Richard Henderson
2021-03-13 1:00 ` [PATCH v2 05/15] target/ppc: Retain hflags_nmsr only for migration Richard Henderson
2021-03-13 1:00 ` [PATCH v2 06/15] target/ppc: Fix comment for MSR_FE{0,1} Richard Henderson
2021-03-13 1:00 ` [PATCH v2 07/15] target/ppc: Disconnect hflags from MSR Richard Henderson
2021-03-13 1:00 ` [PATCH v2 08/15] target/ppc: Reduce env->hflags to uint32_t Richard Henderson
2021-03-13 1:00 ` [PATCH v2 09/15] target/ppc: Put dbcr0 single-step bits into hflags Richard Henderson
2021-03-13 1:00 ` [PATCH v2 10/15] target/ppc: Create helper_scv Richard Henderson
2021-03-13 1:00 ` [PATCH v2 11/15] target/ppc: Put LPCR[GTSE] in hflags Richard Henderson
2021-03-13 1:00 ` [PATCH v2 12/15] target/ppc: Remove MSR_SA and MSR_AP from hflags Richard Henderson
2021-03-13 1:00 ` [PATCH v2 13/15] target/ppc: Remove env->immu_idx and env->dmmu_idx Richard Henderson
2021-03-13 1:00 ` Richard Henderson [this message]
2021-03-13 1:00 ` [PATCH v2 15/15] target/ppc: Validate hflags with CONFIG_DEBUG_TCG Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210313010018.819153-15-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=ivan@vmfacility.fr \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).