Commit 59181010 authored by Janosch Frank's avatar Janosch Frank Committed by Cornelia Huck
Browse files

s390x: protvirt: Set guest IPL PSW 



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: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Message-Id: <20200319131921.2367-11-frankja@linux.ibm.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 0f73c5b3

target/s390x/cpu.c

+17 −9
Original line number Diff line number Diff line
@@ -77,8 +77,10 @@ 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);

    uint64_t spsw;



    if (!s390_is_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
@@ -86,7 +88,13 @@ static void s390_cpu_load_normal(CPUState *s) 
         */

        cpu->env.psw.mask ^= PSW_MASK_SHORTPSW;

        cpu->env.psw.addr = spsw & PSW_MASK_SHORT_ADDR;



    } else {

        /*

         * Firmware requires us to set the load state before we set

         * the cpu to operating on protected guests.

         */

        s390_cpu_set_state(S390_CPU_STATE_LOAD, cpu);

    }

    s390_cpu_set_state(S390_CPU_STATE_OPERATING, cpu);

}

#endif