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 07/10] target/ppc: Use class fields to simplify LPCR masking
Date: Tue, 7 Jan 2020 14:41:24 +0100 [thread overview]
Message-ID: <821c4f90-fed0-cfbe-613f-34e6d57f3139@kaod.org> (raw)
In-Reply-To: <20200107044827.471355-8-david@gibson.dropbear.id.au>
On 1/7/20 5:48 AM, David Gibson wrote:
> When we store the Logical Partitioning Control Register (LPCR) we have a
> big switch statement to work out which are valid bits for the cpu model
> we're emulating.
>
> As well as being ugly, this isn't really conceptually correct, since it is
> based on the mmu_model variable, whereas the LPCR isn't (only) about the
> MMU, so mmu_model is basically just acting as a proxy for the cpu model.
>
> Handle this in a simpler way, by adding a suitable lpcr_mask to the QOM
> class.
>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
> ---
> target/ppc/cpu-qom.h | 1 +
> target/ppc/mmu-hash64.c | 37 ++-------------------------------
> target/ppc/translate_init.inc.c | 27 ++++++++++++++++++++----
> 3 files changed, 26 insertions(+), 39 deletions(-)
>
> diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h
> index e499575dc8..15d6b54a7d 100644
> --- a/target/ppc/cpu-qom.h
> +++ b/target/ppc/cpu-qom.h
> @@ -177,6 +177,7 @@ typedef struct PowerPCCPUClass {
> uint64_t insns_flags;
> uint64_t insns_flags2;
> uint64_t msr_mask;
> + uint64_t lpcr_mask; /* Available bits in the LPCR */
> uint64_t lpcr_pm; /* Power-saving mode Exit Cause Enable bits */
> powerpc_mmu_t mmu_model;
> powerpc_excp_t excp_model;
> diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
> index d7f9933e6d..127b7250ae 100644
> --- a/target/ppc/mmu-hash64.c
> +++ b/target/ppc/mmu-hash64.c
> @@ -1093,43 +1093,10 @@ static void ppc_hash64_update_vrma(PowerPCCPU *cpu)
>
> void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val)
> {
> + PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
> CPUPPCState *env = &cpu->env;
> - uint64_t lpcr = 0;
>
> - /* Filter out bits */
> - switch (env->mmu_model) {
> - case POWERPC_MMU_2_03: /* P5p */
> - lpcr = val & (LPCR_RMLS | LPCR_ILE |
> - LPCR_LPES0 | LPCR_LPES1 |
> - LPCR_RMI | LPCR_HDICE);
> - break;
> - case POWERPC_MMU_2_06: /* P7 */
> - lpcr = val & (LPCR_VPM0 | LPCR_VPM1 | LPCR_ISL | LPCR_DPFD |
> - LPCR_VRMASD | LPCR_RMLS | LPCR_ILE |
> - LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2 |
> - LPCR_MER | LPCR_TC |
> - LPCR_LPES0 | LPCR_LPES1 | LPCR_HDICE);
> - break;
> - case POWERPC_MMU_2_07: /* P8 */
> - lpcr = val & (LPCR_VPM0 | LPCR_VPM1 | LPCR_ISL | LPCR_KBV |
> - LPCR_DPFD | LPCR_VRMASD | LPCR_RMLS | LPCR_ILE |
> - LPCR_AIL | LPCR_ONL | LPCR_P8_PECE0 | LPCR_P8_PECE1 |
> - LPCR_P8_PECE2 | LPCR_P8_PECE3 | LPCR_P8_PECE4 |
> - LPCR_MER | LPCR_TC | LPCR_LPES0 | LPCR_HDICE);
> - break;
> - case POWERPC_MMU_3_00: /* P9 */
> - lpcr = val & (LPCR_VPM1 | LPCR_ISL | LPCR_KBV | LPCR_DPFD |
> - (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_AIL |
> - LPCR_UPRT | LPCR_EVIRT | LPCR_ONL | LPCR_HR | LPCR_LD |
> - (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);
> - break;
> - default:
> - g_assert_not_reached();
> - ;
> - }
> - env->spr[SPR_LPCR] = lpcr;
> + env->spr[SPR_LPCR] = val & pcc->lpcr_mask;
> ppc_hash64_update_rmls(cpu);
> ppc_hash64_update_vrma(cpu);
> }
> diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c
> index 893fb12e90..240ac00506 100644
> --- a/target/ppc/translate_init.inc.c
> +++ b/target/ppc/translate_init.inc.c
> @@ -8463,6 +8463,8 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data)
> (1ull << MSR_DR) |
> (1ull << MSR_PMM) |
> (1ull << MSR_RI);
> + pcc->lpcr_mask = LPCR_RMLS | LPCR_ILE | LPCR_LPES0 | LPCR_LPES1 |
> + LPCR_RMI | LPCR_HDICE;
> pcc->mmu_model = POWERPC_MMU_2_03;
> #if defined(CONFIG_SOFTMMU)
> pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault;
> @@ -8640,6 +8642,12 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
> (1ull << MSR_PMM) |
> (1ull << MSR_RI) |
> (1ull << MSR_LE);
> + pcc->lpcr_mask = LPCR_VPM0 | LPCR_VPM1 | LPCR_ISL | LPCR_DPFD |
> + LPCR_VRMASD | LPCR_RMLS | LPCR_ILE |
> + LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2 |
> + LPCR_MER | LPCR_TC |
> + LPCR_LPES0 | LPCR_LPES1 | LPCR_HDICE;
> + pcc->lpcr_pm = LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2;
> pcc->mmu_model = POWERPC_MMU_2_06;
> #if defined(CONFIG_SOFTMMU)
> pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault;
> @@ -8656,7 +8664,6 @@ POWERPC_FAMILY(POWER7)(ObjectClass *oc, void *data)
> pcc->l1_dcache_size = 0x8000;
> pcc->l1_icache_size = 0x8000;
> pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_lpcr;
> - pcc->lpcr_pm = LPCR_P7_PECE0 | LPCR_P7_PECE1 | LPCR_P7_PECE2;
> }
>
> static void init_proc_POWER8(CPUPPCState *env)
> @@ -8812,6 +8819,13 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
> (1ull << MSR_TS0) |
> (1ull << MSR_TS1) |
> (1ull << MSR_LE);
> + pcc->lpcr_mask = LPCR_VPM0 | LPCR_VPM1 | LPCR_ISL | LPCR_KBV |
> + LPCR_DPFD | LPCR_VRMASD | LPCR_RMLS | LPCR_ILE |
> + LPCR_AIL | LPCR_ONL | LPCR_P8_PECE0 | LPCR_P8_PECE1 |
> + LPCR_P8_PECE2 | LPCR_P8_PECE3 | LPCR_P8_PECE4 |
> + LPCR_MER | LPCR_TC | LPCR_LPES0 | LPCR_HDICE;
> + pcc->lpcr_pm = LPCR_P8_PECE0 | LPCR_P8_PECE1 | LPCR_P8_PECE2 |
> + LPCR_P8_PECE3 | LPCR_P8_PECE4;
> pcc->mmu_model = POWERPC_MMU_2_07;
> #if defined(CONFIG_SOFTMMU)
> pcc->handle_mmu_fault = ppc_hash64_handle_mmu_fault;
> @@ -8829,8 +8843,6 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data)
> pcc->l1_dcache_size = 0x8000;
> pcc->l1_icache_size = 0x8000;
> pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_lpcr;
> - pcc->lpcr_pm = LPCR_P8_PECE0 | LPCR_P8_PECE1 | LPCR_P8_PECE2 |
> - LPCR_P8_PECE3 | LPCR_P8_PECE4;
> }
>
> #ifdef CONFIG_SOFTMMU
> @@ -9023,6 +9035,14 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
> (1ull << MSR_PMM) |
> (1ull << MSR_RI) |
> (1ull << MSR_LE);
> + pcc->lpcr_mask = LPCR_VPM1 | LPCR_ISL | LPCR_KBV | LPCR_DPFD |
> + (LPCR_PECE_U_MASK & LPCR_HVEE) | LPCR_ILE | LPCR_AIL |
> + LPCR_UPRT | LPCR_EVIRT | LPCR_ONL | LPCR_HR | LPCR_LD |
> + (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;
> + pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
> pcc->mmu_model = POWERPC_MMU_3_00;
> #if defined(CONFIG_SOFTMMU)
> pcc->handle_mmu_fault = ppc64_v3_handle_mmu_fault;
> @@ -9042,7 +9062,6 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
> pcc->l1_dcache_size = 0x8000;
> pcc->l1_icache_size = 0x8000;
> pcc->interrupts_big_endian = ppc_cpu_interrupts_big_endian_lpcr;
> - pcc->lpcr_pm = LPCR_PDEE | LPCR_HDEE | LPCR_EEE | LPCR_DEE | LPCR_OEE;
> }
>
> #ifdef CONFIG_SOFTMMU
>
next prev parent reply other threads:[~2020-01-07 13:54 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
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 [this message]
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=821c4f90-fed0-cfbe-613f-34e6d57f3139@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).