Patch queue for s390 - 2014-11-05
Two simple bug fixes to enable slightly newer guest kernels and preliminary -M s390-ccw support for TCG (virtio doesn't work yet!) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJUWgOjAAoJECszeR4D/txgf9IQAI7L/qzhCWLJyY5SIMeI/W+M pNBYiPCIDmVhe+/E/cfUaU9guXo8K6kvGEMJ8xmMRdOvw6YzkPfGxAXu1wV0ljFg ZK+zeLtQjsSZ/MQiRFy0H2u6Vcepq4IxuaVjV0czvWGXfT+WesU831mUY45sOPY/ 9/C4oPpTKJwAdS5hYjCjlC/lnf5oH9qV+skEGvsNuRWzNYKPj06vVG6tvqVabu3I lk62VnujxXjTQiHcx7ME3S6ZM3IT4wipQvl8FZU5kLk/09ipwxeVECBysHrXLIpy 1UgdJccu4DlSVaE1dtKJ2LfBbkjZWzuewKFFndG4fvmuUHJClOfmnF6y8ULy5n41 MxK9pWRJmaz8Dith6y2Be+TERoP8W+Ws12jayafY+SnFYlCtW4sfJjKKKvwMe1ob h5Pz0DNMvoL7JTuJCejGMnpBF9TAP7EfooD5/gJChdT+R3a9S7RZDShQU+teS0W9 7QmEJXPMSGE8HYtsyiv3qqkVQjzJL7Fzq1ZjSz4WBmdjZuGmEclrftAlWHYbGIZF vQ7cardFYCZVnjNki8xBmQVcWA1hKFHNtL1wPebiEXo80BQPiIOV+sT0uN04t3UR zB+SxLIkiwLwOTFtqKylONHYf5ZUGpO/rt/TDpeF8AvoXroOt20rRdgV5bdElMtH 0mZ6r6WVTg7SFHKLfvWd =lHQg -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/agraf/tags/signed-s390-for-upstream' into staging Patch queue for s390 - 2014-11-05 Two simple bug fixes to enable slightly newer guest kernels and preliminary -M s390-ccw support for TCG (virtio doesn't work yet!) # gpg: Signature made Wed 05 Nov 2014 11:01:55 GMT using RSA key ID 03FEDC60 # gpg: Good signature from "Alexander Graf <agraf@suse.de>" # gpg: aka "Alexander Graf <alex@csgraf.de>" * remotes/agraf/tags/signed-s390-for-upstream: s390x: Implement SAM{24,31,64} s390x: Fix sclp console input Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
3752ac8932
|
@ -744,9 +744,9 @@
|
||||||
/* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */
|
/* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */
|
||||||
C(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0)
|
C(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0)
|
||||||
/* SET ADDRESSING MODE */
|
/* SET ADDRESSING MODE */
|
||||||
/* We only do 64-bit, so accept this as a no-op.
|
D(0x010c, SAM24, E, Z, 0, 0, 0, 0, sam, 0, 0)
|
||||||
Let SAM24 and SAM31 signal illegal instruction. */
|
D(0x010d, SAM31, E, Z, 0, 0, 0, 0, sam, 0, 1)
|
||||||
C(0x010e, SAM64, E, Z, 0, 0, 0, 0, 0, 0)
|
D(0x010e, SAM64, E, Z, 0, 0, 0, 0, sam, 0, 3)
|
||||||
/* SET ADDRESS SPACE CONTROL FAST */
|
/* SET ADDRESS SPACE CONTROL FAST */
|
||||||
C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0)
|
C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0)
|
||||||
/* SET CLOCK */
|
/* SET CLOCK */
|
||||||
|
|
|
@ -22,9 +22,7 @@ void s390_sclp_extint(uint32_t parm)
|
||||||
kvm_s390_service_interrupt(parm);
|
kvm_s390_service_interrupt(parm);
|
||||||
} else {
|
} else {
|
||||||
S390CPU *dummy_cpu = s390_cpu_addr2state(0);
|
S390CPU *dummy_cpu = s390_cpu_addr2state(0);
|
||||||
CPUS390XState *env = &dummy_cpu->env;
|
|
||||||
|
|
||||||
env->psw.addr += 4;
|
|
||||||
cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0);
|
cpu_inject_ext(dummy_cpu, EXT_SERVICE, parm, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2925,6 +2925,18 @@ static ExitStatus op_sacf(DisasContext *s, DisasOps *o)
|
||||||
/* Addressing mode has changed, so end the block. */
|
/* Addressing mode has changed, so end the block. */
|
||||||
return EXIT_PC_STALE;
|
return EXIT_PC_STALE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static ExitStatus op_sam(DisasContext *s, DisasOps *o)
|
||||||
|
{
|
||||||
|
int sam = s->insn->data;
|
||||||
|
TCGv_i64 tsam = tcg_const_i64(sam);
|
||||||
|
|
||||||
|
/* Overwrite PSW_MASK_64 and PSW_MASK_32 */
|
||||||
|
tcg_gen_deposit_i64(psw_mask, psw_mask, tsam, 31, 2);
|
||||||
|
|
||||||
|
tcg_temp_free_i64(tsam);
|
||||||
|
return EXIT_PC_STALE;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static ExitStatus op_sar(DisasContext *s, DisasOps *o)
|
static ExitStatus op_sar(DisasContext *s, DisasOps *o)
|
||||||
|
|
Loading…
Reference in a new issue