From: Fabiano Rosas <farosas@suse.de>
To: Nicholas Piggin <npiggin@gmail.com>, qemu-ppc@nongnu.org
Cc: Nicholas Piggin <npiggin@gmail.com>, qemu-devel@nongnu.org
Subject: Re: [PATCH 3/6] target/ppc: Fix instruction loading endianness in alignment interrupt
Date: Fri, 24 Mar 2023 10:30:59 -0300 [thread overview]
Message-ID: <87zg82ff8s.fsf@suse.de> (raw)
In-Reply-To: <20230323022237.1807512-3-npiggin@gmail.com>
Hi Nick,
> powerpc ifetch endianness depends on MSR[LE] so it has to byteswap
> after cpu_ldl_code(). This corrects DSISR bits in alignment
> interrupts when running in little endian mode.
>
Just a thought, we have these tests that perhaps could have caught
this: https://github.com/legoater/pnv-test
Despite the name they do have (some) support to pseries as well. Not
sure how the P8 support is these days though.
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> target/ppc/excp_helper.c | 27 ++++++++++++++++++++++++++-
> 1 file changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> index 287659c74d..5f0e363363 100644
> --- a/target/ppc/excp_helper.c
> +++ b/target/ppc/excp_helper.c
> @@ -133,6 +133,31 @@ static void dump_hcall(CPUPPCState *env)
> env->nip);
> }
>
> +/* Return true iff byteswap is needed in a scalar memop */
> +static inline bool need_byteswap(CPUArchState *env)
> +{
> +#if TARGET_BIG_ENDIAN
TARGET_BIG_ENDIAN is always set for softmmu mode. See
configs/targets/ppc64-softmmu.mak
> + return !!(env->msr & ((target_ulong)1 << MSR_LE));
> +#else
> + return !(env->msr & ((target_ulong)1 << MSR_LE));
> +#endif
> +}
> +
> +static uint32_t ppc_ldl_code(CPUArchState *env, abi_ptr addr)
> +{
> + uint32_t insn = cpu_ldl_code(env, addr);
> +#if TARGET_BIG_ENDIAN
> + if (env->msr & ((target_ulong)1 << MSR_LE)) {
> + insn = bswap32(insn);
> + }
> +#else
> + if (!(env->msr & ((target_ulong)1 << MSR_LE))) {
> + insn = bswap32(insn);
> + }
> +#endif
> + return insn;
> +}
> +
> static void ppc_excp_debug_sw_tlb(CPUPPCState *env, int excp)
> {
> const char *es;
> @@ -3097,7 +3122,7 @@ void ppc_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,
>
> /* Restore state and reload the insn we executed, for filling in DSISR. */
> cpu_restore_state(cs, retaddr);
> - insn = cpu_ldl_code(env, env->nip);
> + insn = ppc_ldl_code(env, env->nip);
>
> switch (env->mmu_model) {
> case POWERPC_MMU_SOFT_4xx:
next prev parent reply other threads:[~2023-03-24 15:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-23 2:22 [PATCH 1/6] target/ppc: Fix width of some 32-bit SPRs Nicholas Piggin
2023-03-23 2:22 ` [PATCH 2/6] target/ppc: Better CTRL SPR implementation Nicholas Piggin
2023-03-23 2:22 ` [PATCH 3/6] target/ppc: Fix instruction loading endianness in alignment interrupt Nicholas Piggin
2023-03-24 13:30 ` Fabiano Rosas [this message]
2023-03-27 4:25 ` Nicholas Piggin
2023-03-23 2:22 ` [PATCH 4/6] target/ppc: Alignment faults do not set DSISR in ISA v3.0 onward Nicholas Piggin
2023-03-24 13:39 ` Fabiano Rosas
2023-03-27 4:26 ` Nicholas Piggin
2023-03-23 2:22 ` [PATCH 5/6] target/ppc: Add SRR1 prefix indication to interrupt handlers Nicholas Piggin
2023-03-23 2:22 ` [PATCH 6/6] target/ppc: Implement HEIR SPR Nicholas Piggin
2023-05-09 9:51 ` Harsh Prateek Bora
2023-05-15 8:26 ` Nicholas Piggin
2023-05-15 8:32 ` Harsh Prateek Bora
2023-05-15 9:32 ` Harsh Prateek Bora
2023-05-15 10:45 ` Nicholas Piggin
2023-05-15 10:54 ` Harsh Prateek Bora
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=87zg82ff8s.fsf@suse.de \
--to=farosas@suse.de \
--cc=npiggin@gmail.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).