From: "Cédric Le Goater" <clg@kaod.org>
To: David Gibson <david@gibson.dropbear.id.au>,
qemu-devel@nongnu.org, groug@kaod.org, philmd@redhat.com
Cc: aik@ozlabs.ru, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
qemu-ppc@nongnu.org, lvivier@redhat.com, paulus@samba.org
Subject: Re: [PATCH v2 05/10] spapr, ppc: Remove VPM0/RMLS hacks for POWER9
Date: Tue, 7 Jan 2020 15:35:33 +0100 [thread overview]
Message-ID: <0e3fa283-fa6e-61bb-f94e-c5b9dc780bad@kaod.org> (raw)
In-Reply-To: <20200107044827.471355-6-david@gibson.dropbear.id.au>
On 1/7/20 5:48 AM, David Gibson wrote:
> For the "pseries" machine, we use "virtual hypervisor" mode where we only
> model the CPU in non-hypervisor privileged mode. This means that we need
> guest physical addresses within the modelled within the cpu to be treated
> as absolute physical addresses.
>
> We used to do that by clearing LPCR[VPM0] and setting LPCR[RMLS] to a high
> limit so that the old offset based translation for guest mode applied,
> which does what we need. However, POWER9 has removed support for that
> translation mode, which meant we had some ugly hacks to keep it working.
>
> We now explicitly handle this sort of translation for virtual hypervisor
> mode, so the hacks aren't necessary. We don't need to set VPM0 and RMLS
> from the machine type code - they're now ignored in vhyp mode. On the cpu
> side we don't need to allow LPCR[RMLS] to be set on POWER9 in vhyp mode -
> that was only there to allow the hack on the machine side.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> hw/ppc/spapr_cpu_core.c | 6 +-----
> target/ppc/mmu-hash64.c | 8 --------
> 2 files changed, 1 insertion(+), 13 deletions(-)
>
> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
> index 8339c4c0f8..daebcd9f38 100644
> --- a/hw/ppc/spapr_cpu_core.c
> +++ b/hw/ppc/spapr_cpu_core.c
> @@ -58,14 +58,10 @@ static void spapr_reset_vcpu(PowerPCCPU *cpu)
> * we don't get spurious wakups before an RTAS start-cpu call.
> * For the same reason, set PSSCR_EC.
> */
> - lpcr &= ~(LPCR_VPM0 | LPCR_VPM1 | LPCR_ISL | LPCR_KBV | pcc->lpcr_pm);
> + lpcr &= ~(LPCR_VPM1 | LPCR_ISL | LPCR_KBV | pcc->lpcr_pm);
> lpcr |= LPCR_LPES0 | LPCR_LPES1;
> env->spr[SPR_PSSCR] |= PSSCR_EC;
>
> - /* Set RMLS to the max (ie, 16G) */
> - lpcr &= ~LPCR_RMLS;
> - lpcr |= 1ull << LPCR_RMLS_SHIFT;
> -
> ppc_store_lpcr(cpu, lpcr);
>
> /* Set a full AMOR so guest can use the AMR as it sees fit */
> diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
> index d878180df5..d7f9933e6d 100644
> --- a/target/ppc/mmu-hash64.c
> +++ b/target/ppc/mmu-hash64.c
> @@ -1124,14 +1124,6 @@ void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val)
> (LPCR_PECE_L_MASK & (LPCR_PDEE | LPCR_HDEE | LPCR_EEE |
> LPCR_DEE | LPCR_OEE)) | LPCR_MER | LPCR_GTSE | LPCR_TC |
> LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | LPCR_HDICE);
> - /*
> - * If we have a virtual hypervisor, we need to bring back RMLS. It
> - * doesn't exist on an actual P9 but that's all we know how to
> - * configure with softmmu at the moment
> - */
> - if (cpu->vhyp) {
> - lpcr |= (val & LPCR_RMLS);
> - }
> break;
> default:
> g_assert_not_reached();
>
next prev parent reply other threads:[~2020-01-07 15:08 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 4:48 [PATCH v2 00/10] target/ppc: Correct some errors with real mode handling David Gibson
2020-01-07 4:48 ` [PATCH v2 01/10] ppc: Drop PPC_EMULATE_32BITS_HYPV stub David Gibson
2020-01-07 12:52 ` Cédric Le Goater
2020-01-07 17:05 ` Greg Kurz
2020-01-07 4:48 ` [PATCH v2 02/10] ppc: Remove stub of PPC970 HID4 implementation David Gibson
2020-01-07 12:51 ` Cédric Le Goater
2020-01-07 17:32 ` Greg Kurz
2020-01-07 17:36 ` Greg Kurz
2020-01-07 18:05 ` BALATON Zoltan
2020-01-08 1:09 ` David Gibson
2020-01-08 8:29 ` Thomas Huth
2020-01-08 1:08 ` David Gibson
2020-01-08 8:11 ` Greg Kurz
2020-01-08 2:17 ` Paul Mackerras
2020-01-08 13:35 ` Greg Kurz
2020-01-07 4:48 ` [PATCH v2 03/10] target/ppc: Correct handling of real mode accesses with vhyp on hash MMU David Gibson
2020-01-14 10:22 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 04/10] target/ppc: Introduce ppc_hash64_use_vrma() helper David Gibson
2020-01-07 13:24 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 05/10] spapr, ppc: Remove VPM0/RMLS hacks for POWER9 David Gibson
2020-01-07 14:35 ` Cédric Le Goater [this message]
2020-01-09 7:33 ` Alexey Kardashevskiy
2020-01-13 3:38 ` David Gibson
2020-01-07 4:48 ` [PATCH v2 06/10] target/ppc: Remove RMOR register from POWER9 & POWER10 David Gibson
2020-01-07 13:39 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 07/10] target/ppc: Use class fields to simplify LPCR masking David Gibson
2020-01-07 13:41 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 08/10] target/ppc: Streamline calculation of RMA limit from LPCR[RMLS] David Gibson
2020-01-07 13:43 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 09/10] target/ppc: Correct RMLS table David Gibson
2020-01-07 14:21 ` Cédric Le Goater
2020-01-08 1:06 ` David Gibson
2020-01-08 8:29 ` Cédric Le Goater
2020-01-09 7:46 ` Alexey Kardashevskiy
2020-01-13 3:46 ` David Gibson
2020-01-08 8:28 ` Cédric Le Goater
2020-01-07 4:48 ` [PATCH v2 10/10] target/ppc: Only calculate RMLS derived RMA limit on demand David Gibson
2020-01-08 8:31 ` Cédric Le Goater
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=0e3fa283-fa6e-61bb-f94e-c5b9dc780bad@kaod.org \
--to=clg@kaod.org \
--cc=aik@ozlabs.ru \
--cc=david@gibson.dropbear.id.au \
--cc=groug@kaod.org \
--cc=lvivier@redhat.com \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=paulus@samba.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).