Commit 997224fe authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-5.6-1' of... 

Merge tag 'kvm-s390-master-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master

KVM: s390: Fully do the CPU resets as intended

With 7de3f142 ("KVM: s390: Add new reset vcpu API") we clarified
the meaning of the reset ioctl to fully reset the CPU and not only the
parts that can not be handled by userspace. Turns out that we missed
some parts.
parents 0c22056f e93fc7b4

arch/s390/kvm/kvm-s390.c

+17 −1
Original line number Diff line number Diff line
@@ -3268,7 +3268,10 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 
	/* Initial reset is a superset of the normal reset */

	kvm_arch_vcpu_ioctl_normal_reset(vcpu);



	/* this equals initial cpu reset in pop, but we don't switch to ESA */

	/*

	 * This equals initial cpu reset in pop, but we don't switch to ESA.

	 * We do not only reset the internal data, but also ...

	 */

	vcpu->arch.sie_block->gpsw.mask = 0;

	vcpu->arch.sie_block->gpsw.addr = 0;

	kvm_s390_set_prefix(vcpu, 0);
@@ -3278,6 +3281,19 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu) 
	memset(vcpu->arch.sie_block->gcr, 0, sizeof(vcpu->arch.sie_block->gcr));

	vcpu->arch.sie_block->gcr[0] = CR0_INITIAL_MASK;

	vcpu->arch.sie_block->gcr[14] = CR14_INITIAL_MASK;



	/* ... the data in sync regs */

	memset(vcpu->run->s.regs.crs, 0, sizeof(vcpu->run->s.regs.crs));

	vcpu->run->s.regs.ckc = 0;

	vcpu->run->s.regs.crs[0] = CR0_INITIAL_MASK;

	vcpu->run->s.regs.crs[14] = CR14_INITIAL_MASK;

	vcpu->run->psw_addr = 0;

	vcpu->run->psw_mask = 0;

	vcpu->run->s.regs.todpr = 0;

	vcpu->run->s.regs.cputm = 0;

	vcpu->run->s.regs.ckc = 0;

	vcpu->run->s.regs.pp = 0;

	vcpu->run->s.regs.gbea = 1;

	vcpu->run->s.regs.fpc = 0;

	vcpu->arch.sie_block->gbea = 1;

	vcpu->arch.sie_block->pp = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE