Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d26cf7b authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Avi Kivity
Browse files

KVM: s390: rework code that sets the prefix 



There are several places in the kvm module, which set the prefix register.
Since we need to flush the cpu, lets combine this operation into a helper
function. This helper will also explicitely mask out the unused bits.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 2b036c6b

arch/s390/kvm/interrupt.c

+1 −2
Original line number Diff line number Diff line
@@ -236,8 +236,7 @@ static void __do_deliver_interrupt(struct kvm_vcpu *vcpu, 
		VCPU_EVENT(vcpu, 4, "interrupt: set prefix to %x",

			   inti->prefix.address);

		vcpu->stat.deliver_prefix_signal++;

		vcpu->arch.sie_block->prefix = inti->prefix.address;

		vcpu->arch.sie_block->ihcpu = 0xffff;

		kvm_s390_set_prefix(vcpu, inti->prefix.address);

		break;



	case KVM_S390_RESTART:

arch/s390/kvm/kvm-s390.c

+1 −2
Original line number Diff line number Diff line
@@ -322,8 +322,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) 
	/* this equals initial cpu reset in pop, but we don't switch to ESA */

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

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

	vcpu->arch.sie_block->prefix    = 0UL;

	vcpu->arch.sie_block->ihcpu     = 0xffff;

	kvm_s390_set_prefix(vcpu, 0);

	vcpu->arch.sie_block->cputm     = 0UL;

	vcpu->arch.sie_block->ckc       = 0UL;

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

arch/s390/kvm/kvm-s390.h

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ static inline int kvm_is_ucontrol(struct kvm *kvm) 
	return 0;

#endif

}



static inline void kvm_s390_set_prefix(struct kvm_vcpu *vcpu, u32 prefix)

{

	vcpu->arch.sie_block->prefix = prefix & 0x7fffe000u;

	vcpu->arch.sie_block->ihcpu  = 0xffff;

}



int kvm_s390_handle_wait(struct kvm_vcpu *vcpu);

enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);

void kvm_s390_tasklet(unsigned long parm);

arch/s390/kvm/priv.c

+1 −2
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ static int handle_set_prefix(struct kvm_vcpu *vcpu) 
		goto out;

	}



	vcpu->arch.sie_block->prefix = address;

	vcpu->arch.sie_block->ihcpu = 0xffff;

	kvm_s390_set_prefix(vcpu, address);



	VCPU_EVENT(vcpu, 5, "setting prefix to %x", address);

out: