From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: ivan@vmfacility.fr, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au
Subject: [PATCH v2 11/15] target/ppc: Put LPCR[GTSE] in hflags
Date: Fri, 12 Mar 2021 19:00:14 -0600 [thread overview]
Message-ID: <20210313010018.819153-12-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210313010018.819153-1-richard.henderson@linaro.org>
Because this bit was not in hflags, the privilege check
for tlb instructions was essentially random.
Recompute hflags when storing to LPCR.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/ppc/cpu.h | 1 +
target/ppc/helper_regs.c | 3 +++
target/ppc/mmu-hash64.c | 3 +++
target/ppc/translate.c | 2 +-
4 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
index 2abaf56869..07a4331eec 100644
--- a/target/ppc/cpu.h
+++ b/target/ppc/cpu.h
@@ -603,6 +603,7 @@ enum {
HFLAGS_TM = 8, /* computed from MSR_TM */
HFLAGS_BE = 9, /* MSR_BE -- from elsewhere on embedded ppc */
HFLAGS_SE = 10, /* MSR_SE -- from elsewhere on embedded ppc */
+ HFLAGS_GTSE = 11, /* computed from SPR_LPCR[GTSE] */
HFLAGS_FP = 13, /* MSR_FP */
HFLAGS_SA = 22, /* MSR_SA */
HFLAGS_AP = 23, /* MSR_AP */
diff --git a/target/ppc/helper_regs.c b/target/ppc/helper_regs.c
index c735540333..8479789e24 100644
--- a/target/ppc/helper_regs.c
+++ b/target/ppc/helper_regs.c
@@ -139,6 +139,9 @@ void hreg_compute_hflags(CPUPPCState *env)
if ((ppc_flags & POWERPC_FLAG_TM) && (msr & (1ull << MSR_TM))) {
hflags |= 1 << HFLAGS_TM;
}
+ if (env->spr[SPR_LPCR] & LPCR_GTSE) {
+ hflags |= 1 << HFLAGS_GTSE;
+ }
#ifndef CONFIG_USER_ONLY
if (!env->has_hv_mode || (msr & (1ull << MSR_HV))) {
diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index 0fabc10302..d517a99832 100644
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -30,6 +30,7 @@
#include "exec/log.h"
#include "hw/hw.h"
#include "mmu-book3s-v3.h"
+#include "helper_regs.h"
/* #define DEBUG_SLB */
@@ -1125,6 +1126,8 @@ void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val)
CPUPPCState *env = &cpu->env;
env->spr[SPR_LPCR] = val & pcc->lpcr_mask;
+ /* The gtse bit affects hflags */
+ hreg_compute_hflags(env);
}
void helper_store_lpcr(CPUPPCState *env, target_ulong val)
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index d48c554290..5e629291d3 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -7908,7 +7908,7 @@ static void ppc_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)
ctx->altivec_enabled = (hflags >> HFLAGS_VR) & 1;
ctx->vsx_enabled = (hflags >> HFLAGS_VSX) & 1;
ctx->tm_enabled = (hflags >> HFLAGS_TM) & 1;
- ctx->gtse = !!(env->spr[SPR_LPCR] & LPCR_GTSE);
+ ctx->gtse = (hflags >> HFLAGS_GTSE) & 1;
ctx->singlestep_enabled = 0;
if ((hflags >> HFLAGS_SE) & 1) {
--
2.25.1
next prev parent reply other threads:[~2021-03-13 1:11 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 ` Richard Henderson [this message]
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 ` [PATCH v2 14/15] hw/ppc: Use hreg_store_msr for msr updates Richard Henderson
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-12-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=david@gibson.dropbear.id.au \
--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).