kvm-ppc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

From: "Cédric Le Goater" <clg@kaod.org>
To: Thomas Huth <thuth@redhat.com>, kvm@vger.kernel.org
Cc: kvm-ppc@vger.kernel.org, Laurent Vivier <lvivier@redhat.com>
Subject: Re: [kvm-unit-tests v2 PATCH] powerpc: Fix running the kvm-unit-tests with recent versions of QEMU
Date: Tue, 06 Dec 2022 11:43:46 +0000	[thread overview]
Message-ID: <738728ea-818e-2f2e-40e2-d27fdee729f9@kaod.org> (raw)
In-Reply-To: <20221206110851.154297-1-thuth@redhat.com>

On 12/6/22 12:08, Thomas Huth wrote:
> Starting with version 7.0, QEMU starts the pseries guests in 32-bit mode
> instead of 64-bit (see QEMU commit 6e3f09c28a - "spapr: Force 32bit when
> resetting a core"). This causes our test_64bit() in powerpc/emulator.c
> to fail. Let's switch to 64-bit in our startup code instead to fix the
> issue.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.

> ---
>   lib/powerpc/asm/ppc_asm.h | 3 +++
>   powerpc/cstart64.S        | 6 ++++++
>   2 files changed, 9 insertions(+)
> 
> diff --git a/lib/powerpc/asm/ppc_asm.h b/lib/powerpc/asm/ppc_asm.h
> index 39620a39..1b85f6bb 100644
> --- a/lib/powerpc/asm/ppc_asm.h
> +++ b/lib/powerpc/asm/ppc_asm.h
> @@ -35,4 +35,7 @@
>   
>   #endif /* __BYTE_ORDER__ */
>   
> +/* Machine State Register definitions: */
> +#define MSR_SF_BIT	63			/* 64-bit mode */
> +
>   #endif /* _ASMPOWERPC_PPC_ASM_H */
> diff --git a/powerpc/cstart64.S b/powerpc/cstart64.S
> index 972851f9..34e39341 100644
> --- a/powerpc/cstart64.S
> +++ b/powerpc/cstart64.S
> @@ -23,6 +23,12 @@
>   .globl start
>   start:
>   	FIXUP_ENDIAN
> +	/* Switch to 64-bit mode */
> +	mfmsr	r1
> +	li	r2,1
> +	sldi	r2,r2,MSR_SF_BIT
> +	or	r1,r1,r2
> +	mtmsrd	r1
>   	/*
>   	 * We were loaded at QEMU's kernel load address, but we're not
>   	 * allowed to link there due to how QEMU deals with linker VMAs,

     prev parent reply	other threads:[~2022-12-06 11:43 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-06 11:08 [kvm-unit-tests v2 PATCH] powerpc: Fix running the kvm-unit-tests with recent versions of QEMU Thomas Huth
2022-12-06 11:43 ` Cédric Le Goater [this message]

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=738728ea-818e-2f2e-40e2-d27fdee729f9@kaod.org \
    --to=clg@kaod.org \
    --cc=kvm-ppc@vger.kernel.org \
    --cc=kvm@vger.kernel.org \
    --cc=lvivier@redhat.com \
    --cc=thuth@redhat.com \
    /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

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 read-only IMAP folder(s) and NNTP newsgroup(s).