From: "Cédric Le Goater" <clg@kaod.org>
To: Richard Henderson <richard.henderson@linaro.org>,
<qemu-devel@nongnu.org>
Cc: qemu-ppc@nongnu.org, david@gibson.dropbear.id.au
Subject: Re: [PATCH v4 03/17] target/ppc: Properly sync cpu state with new msr in cpu_load_old
Date: Tue, 16 Mar 2021 09:15:23 +0100 [thread overview]
Message-ID: <d54aebb1-59b6-cea2-556c-4434845bf0c3@kaod.org> (raw)
In-Reply-To: <20210315184615.1985590-4-richard.henderson@linaro.org>
On 3/15/21 7:46 PM, Richard Henderson wrote:
> Match cpu_post_load in using ppc_store_msr to set all of
> the cpu state implied by the value of msr. Do not restore
> hflags or hflags_nmsr, as we recompute them in ppc_store_msr.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Could we add a common routine used by cpu_post_load() and cpu_load_old() ?
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks,
C.
> ---
> target/ppc/machine.c | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/target/ppc/machine.c b/target/ppc/machine.c
> index 283db1d28a..87d7bffb86 100644
> --- a/target/ppc/machine.c
> +++ b/target/ppc/machine.c
> @@ -21,6 +21,7 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
> int32_t slb_nr;
> #endif
> target_ulong xer;
> + target_ulong msr;
>
> for (i = 0; i < 32; i++) {
> qemu_get_betls(f, &env->gpr[i]);
> @@ -111,11 +112,19 @@ static int cpu_load_old(QEMUFile *f, void *opaque, int version_id)
> qemu_get_betls(f, &env->ivpr_mask);
> qemu_get_betls(f, &env->hreset_vector);
> qemu_get_betls(f, &env->nip);
> - qemu_get_betls(f, &env->hflags);
> - qemu_get_betls(f, &env->hflags_nmsr);
> + qemu_get_sbetl(f); /* Discard unused hflags */
> + qemu_get_sbetl(f); /* Discard unused hflags_nmsr */
> qemu_get_sbe32(f); /* Discard unused mmu_idx */
> qemu_get_sbe32(f); /* Discard unused power_mode */
>
> + /*
> + * Invalidate all supported msr bits except MSR_TGPR/MSR_HVB
> + * before restoring. Note that this recomputes hflags and mem_idx.
> + */
> + msr = env->msr;
> + env->msr ^= env->msr_mask & ~((1ULL << MSR_TGPR) | MSR_HVB);
> + ppc_store_msr(env, msr);
> +
> /* Recompute mmu indices */
> hreg_compute_mem_idx(env);
>
>
next prev parent reply other threads:[~2021-03-16 8:20 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 18:45 [PATCH v4 00/17] target/ppc: Fix truncation of env->hflags Richard Henderson
2021-03-15 18:45 ` [PATCH v4 01/17] target/ppc: Move helper_regs.h functions out-of-line Richard Henderson
2021-03-16 8:12 ` Cédric Le Goater
2021-03-22 3:25 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 02/17] target/ppc: Move 601 hflags adjustment to hreg_compute_hflags Richard Henderson
2021-03-16 8:12 ` Cédric Le Goater
2021-03-22 3:35 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 03/17] target/ppc: Properly sync cpu state with new msr in cpu_load_old Richard Henderson
2021-03-16 8:15 ` Cédric Le Goater [this message]
2021-03-22 16:53 ` Richard Henderson
2021-03-22 23:19 ` David Gibson
2021-03-22 3:38 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 04/17] target/ppc: Do not call hreg_compute_mem_idx after ppc_store_msr Richard Henderson
2021-03-16 8:16 ` Cédric Le Goater
2021-03-22 3:39 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 05/17] target/ppc: Retain hflags_nmsr only for migration Richard Henderson
2021-03-16 8:16 ` Cédric Le Goater
2021-03-22 3:41 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 06/17] target/ppc: Fix comment for MSR_FE{0,1} Richard Henderson
2021-03-16 8:16 ` Cédric Le Goater
2021-03-22 3:42 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 07/17] target/ppc: Disconnect hflags from MSR Richard Henderson
2021-03-22 3:52 ` David Gibson
2021-03-22 16:55 ` Richard Henderson
2021-03-22 23:54 ` David Gibson
2021-03-23 17:04 ` Richard Henderson
2021-03-24 1:42 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 08/17] target/ppc: Reduce env->hflags to uint32_t Richard Henderson
2021-03-16 8:17 ` Cédric Le Goater
2021-03-22 3:53 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 09/17] target/ppc: Put dbcr0 single-step bits into hflags Richard Henderson
2021-03-22 3:55 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 10/17] target/ppc: Create helper_scv Richard Henderson
2021-03-22 4:00 ` David Gibson
2021-03-22 17:05 ` Richard Henderson
2021-03-22 23:55 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 11/17] target/ppc: Put LPCR[GTSE] in hflags Richard Henderson
2021-03-22 4:18 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 12/17] target/ppc: Remove MSR_SA and MSR_AP from hflags Richard Henderson
2021-03-22 4:20 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 13/17] target/ppc: Remove env->immu_idx and env->dmmu_idx Richard Henderson
2021-03-22 4:26 ` David Gibson
2021-03-22 17:27 ` Richard Henderson
2021-03-23 0:01 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 14/17] hw/ppc/pnv_core: Update hflags after setting msr Richard Henderson
2021-03-22 4:27 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 15/17] hw/ppc/spapr_rtas: " Richard Henderson
2021-03-22 4:27 ` David Gibson
2021-03-15 18:46 ` [PATCH v4 16/17] linux-user/ppc: Fix msr updates for signal handling Richard Henderson
2021-03-15 18:46 ` [PATCH v4 17/17] target/ppc: Validate hflags with CONFIG_DEBUG_TCG Richard Henderson
2021-03-16 8:11 ` [PATCH v4 00/17] target/ppc: Fix truncation of env->hflags 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=d54aebb1-59b6-cea2-556c-4434845bf0c3@kaod.org \
--to=clg@kaod.org \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.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).