[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v6 11/18] s390x: protvirt: Set guest IPL PSW
From: |
David Hildenbrand |
Subject: |
Re: [PATCH v6 11/18] s390x: protvirt: Set guest IPL PSW |
Date: |
Wed, 4 Mar 2020 18:51:11 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
On 04.03.20 12:42, Janosch Frank wrote:
> Handling of CPU reset and setting of the IPL psw from guest storage at
> offset 0 is done by a Ultravisor call. Let's only fetch it if
> necessary.
>
> Signed-off-by: Janosch Frank <address@hidden>
> Reviewed-by: Thomas Huth <address@hidden>
> ---
> target/s390x/cpu.c | 23 ++++++++++++++---------
> 1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 69b1cc5dfc..7840e784f1 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -78,16 +78,21 @@ static bool s390_cpu_has_work(CPUState *cs)
> static void s390_cpu_load_normal(CPUState *s)
> {
> S390CPU *cpu = S390_CPU(s);
> - uint64_t spsw = ldq_phys(s->as, 0);
> -
> - cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
> - /*
> - * Invert short psw indication, so SIE will report a specification
> - * exception if it was not set.
> - */
> - cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
> - cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
> + CPUS390XState *env = &cpu->env;
> + uint64_t spsw;
>
> + if (!env->pv) {
> + spsw = ldq_phys(s->as, 0);
> + cpu->env.psw.mask = spsw & PSW_MASK_SHORT_CTRL;
> + /*
> + * Invert short psw indication, so SIE will report a specification
> + * exception if it was not set.
> + */
> + cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;
> + cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;
> + } else {
> + s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);
> + }
> s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);
> }
> #endif
>
Reviewed-by: David Hildenbrand <address@hidden>
--
Thanks,
David / dhildenb
- Re: [PATCH v6 10/18] s390x: protvirt: SCLP interpretation, (continued)
[PATCH v6 13/18] s390x: protvirt: Disable address checks for PV guest IO emulation, Janosch Frank, 2020/03/04
[PATCH v6 11/18] s390x: protvirt: Set guest IPL PSW, Janosch Frank, 2020/03/04
- Re: [PATCH v6 11/18] s390x: protvirt: Set guest IPL PSW,
David Hildenbrand <=
[PATCH v6 09/18] s390x: protvirt: Move STSI data over SIDAD, Janosch Frank, 2020/03/04
[PATCH v6 14/18] s390x: protvirt: Move IO control structures over SIDA, Janosch Frank, 2020/03/04
[PATCH v6 12/18] s390x: protvirt: Move diag 308 data over SIDAD, Janosch Frank, 2020/03/04
[PATCH v6 16/18] s390x: Add unpack facility feature to GA1, Janosch Frank, 2020/03/04