From: David Gibson <david@gibson.dropbear.id.au>
To: peter.maydell@linaro.org
Cc: Matheus Ferst <matheus.ferst@eldorado.org.br>,
Daniel Henrique Barboza <danielhb413@gmail.com>,
mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org,
groug@kaod.org, hpoussin@reactos.org, clg@kaod.org,
qemu-ppc@nongnu.org, philmd@redhat.com,
David Gibson <david@gibson.dropbear.id.au>
Subject: [PULL 24/44] target/ppc: Check privilege level based on PSR and LPCR[HR] in tlbie[l]
Date: Thu, 30 Sep 2021 15:44:06 +1000 [thread overview]
Message-ID: <20210930054426.357344-25-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20210930054426.357344-1-david@gibson.dropbear.id.au>
From: Matheus Ferst <matheus.ferst@eldorado.org.br>
PowerISA v3.0B made tlbie[l] hypervisor privileged when PSR=0 and HR=1.
To allow the check at translation time, we'll use the HR bit of LPCR to
check the MMU mode instead of the PATE.HR.
Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br>
Message-Id: <20210917114751.206845-3-matheus.ferst@eldorado.org.br>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
target/ppc/translate.c | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/target/ppc/translate.c b/target/ppc/translate.c
index 9af1624ad2..b985e9e55b 100644
--- a/target/ppc/translate.c
+++ b/target/ppc/translate.c
@@ -5517,7 +5517,15 @@ static void gen_tlbiel(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY)
GEN_PRIV;
#else
- CHK_SV;
+ bool psr = (ctx->opcode >> 17) & 0x1;
+
+ if (ctx->pr || (!ctx->hv && !psr && ctx->hr)) {
+ /*
+ * tlbiel is privileged except when PSR=0 and HR=1, making it
+ * hypervisor privileged.
+ */
+ GEN_PRIV;
+ }
gen_helper_tlbie(cpu_env, cpu_gpr[rB(ctx->opcode)]);
#endif /* defined(CONFIG_USER_ONLY) */
@@ -5529,12 +5537,20 @@ static void gen_tlbie(DisasContext *ctx)
#if defined(CONFIG_USER_ONLY)
GEN_PRIV;
#else
+ bool psr = (ctx->opcode >> 17) & 0x1;
TCGv_i32 t1;
- if (ctx->gtse) {
- CHK_SV; /* If gtse is set then tlbie is supervisor privileged */
- } else {
- CHK_HV; /* Else hypervisor privileged */
+ if (ctx->pr) {
+ /* tlbie is privileged... */
+ GEN_PRIV;
+ } else if (!ctx->hv) {
+ if (!ctx->gtse || (!psr && ctx->hr)) {
+ /*
+ * ... except when GTSE=0 or when PSR=0 and HR=1, making it
+ * hypervisor privileged.
+ */
+ GEN_PRIV;
+ }
}
if (NARROW_MODE(ctx)) {
--
2.31.1
next prev parent reply other threads:[~2021-09-30 6:04 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 5:43 [PULL 00/44] ppc-for-6.2 queue 20210930 David Gibson
2021-09-30 5:43 ` [PULL 01/44] host-utils: Fix overflow detection in divu128() David Gibson
2021-09-30 5:43 ` [PULL 02/44] host-utils: fix missing zero-extension in divs128 David Gibson
2021-09-30 5:43 ` [PULL 03/44] host-utils: introduce uabs64() David Gibson
2021-09-30 5:43 ` [PULL 04/44] i386/kvm: Replace abs64() with uabs64() from host-utils David Gibson
2021-09-30 5:43 ` [PULL 05/44] ppc/spapr: Add a POWER10 DD2 CPU David Gibson
2021-09-30 5:43 ` [PULL 06/44] ppc/pnv: Add a comment on the "primary-topology-index" property David Gibson
2021-09-30 5:43 ` [PULL 07/44] ppc/pnv: Remove useless variable David Gibson
2021-09-30 5:43 ` [PULL 08/44] ppc/xive: Export priority_to_ipb() helper David Gibson
2021-09-30 5:43 ` [PULL 09/44] ppc/xive: Export xive_tctx_word2() helper David Gibson
2021-09-30 5:43 ` [PULL 10/44] ppc/pnv: Rename "id" to "quad-id" in PnvQuad David Gibson
2021-09-30 5:43 ` [PULL 11/44] docs/system: ppc: Update the URL for OpenPOWER firmware images David Gibson
2021-09-30 5:43 ` [PULL 12/44] ppc/pnv: Add an assert when calculating the RAM distribution on chips David Gibson
2021-09-30 5:43 ` [PULL 13/44] target/ppc: fix setting of CR flags in bcdcfsq David Gibson
2021-09-30 5:43 ` [PULL 14/44] memory_hotplug.c: handle dev->id = NULL in acpi_memory_hotplug_write() David Gibson
2021-09-30 5:43 ` [PULL 15/44] spapr.c: handle dev->id in spapr_memory_unplug_rollback() David Gibson
2021-09-30 5:43 ` [PULL 16/44] spapr_drc.c: do not error_report() when drc->dev->id == NULL David Gibson
2021-09-30 5:43 ` [PULL 17/44] qapi/qdev.json: fix DEVICE_DELETED parameters doc David Gibson
2021-09-30 5:44 ` [PULL 18/44] qapi/qdev.json: add DEVICE_UNPLUG_GUEST_ERROR QAPI event David Gibson
2021-09-30 5:44 ` [PULL 19/44] spapr: use DEVICE_UNPLUG_GUEST_ERROR to report unplug errors David Gibson
2021-09-30 5:44 ` [PULL 20/44] memory_hotplug.c: send DEVICE_UNPLUG_GUEST_ERROR in acpi_memory_hotplug_write() David Gibson
2021-09-30 5:44 ` [PULL 21/44] target/ppc: Convert debug to trace events (exceptions) David Gibson
2021-09-30 5:44 ` [PULL 22/44] target/ppc: Replace debug messages by asserts for unknown IRQ pins David Gibson
2021-09-30 5:44 ` [PULL 23/44] target/ppc: add LPCR[HR] to DisasContext and hflags David Gibson
2021-09-30 5:44 ` David Gibson [this message]
2021-09-30 5:44 ` [PULL 25/44] spapr_numa.c: split FORM1 code into helpers David Gibson
2021-09-30 5:44 ` [PULL 26/44] spapr_numa.c: scrap 'legacy_numa' concept David Gibson
2021-09-30 5:44 ` [PULL 27/44] spapr_numa.c: parametrize FORM1 macros David Gibson
2021-09-30 5:44 ` [PULL 28/44] spapr_numa.c: rename numa_assoc_array to FORM1_assoc_array David Gibson
2021-09-30 5:44 ` [PULL 29/44] spapr: move FORM1 verifications to post CAS David Gibson
2021-09-30 5:44 ` [PULL 30/44] spapr_numa.c: FORM2 NUMA affinity support David Gibson
2021-09-30 5:44 ` [PULL 31/44] spapr_numa.c: handle auto NUMA node with no distance info David Gibson
2021-09-30 5:44 ` [PULL 32/44] target/ppc: Convert debug to trace events (decrementer and IRQ) David Gibson
2021-09-30 5:44 ` [PULL 33/44] target/ppc: Fix 64-bit decrementer David Gibson
2021-10-02 10:39 ` Peter Maydell
2021-10-04 6:54 ` Cédric Le Goater
2021-09-30 5:44 ` [PULL 34/44] hw/intc: openpic: Correct the reset value of IPIDR for FSL chipset David Gibson
2021-09-30 5:44 ` [PULL 35/44] hw/intc: openpic: Drop Raven related codes David Gibson
2021-09-30 5:44 ` [PULL 36/44] hw/intc: openpic: Clean up the styles David Gibson
2021-09-30 5:44 ` [PULL 37/44] spapr_numa.c: fixes in spapr_numa_FORM2_write_rtas_tables() David Gibson
2021-09-30 5:44 ` [PULL 38/44] spapr/xive: Fix kvm_xive_source_reset trace event David Gibson
2021-09-30 5:44 ` [PULL 39/44] MAINTAINERS: Remove machine specific files from ppc TCG CPUs entry David Gibson
2021-09-30 5:44 ` [PULL 40/44] MAINTAINERS: Remove David & Greg as reviewers for a number of boards David Gibson
2021-09-30 5:44 ` [PULL 41/44] MAINTAINERS: Orphan obscure ppc platforms David Gibson
2021-09-30 5:44 ` [PULL 42/44] MAINTAINERS: Remove David & Greg as reviewers/co-maintainers of powernv David Gibson
2021-09-30 5:44 ` [PULL 43/44] MAINTAINERS: Add information for OpenPIC David Gibson
2021-09-30 5:44 ` [PULL 44/44] MAINTAINERS: Demote sPAPR from "Supported" to "Maintained" David Gibson
2021-09-30 16:37 ` [PULL 00/44] ppc-for-6.2 queue 20210930 Peter Maydell
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=20210930054426.357344-25-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=clg@kaod.org \
--cc=danielhb413@gmail.com \
--cc=groug@kaod.org \
--cc=hpoussin@reactos.org \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=matheus.ferst@eldorado.org.br \
--cc=peter.maydell@linaro.org \
--cc=philmd@redhat.com \
--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).