Commit cca00ebb authored by Janosch Frank's avatar Janosch Frank Committed by Christian Borntraeger
Browse files

KVM: s390: Cleanup initial cpu reset 



The code seems to be quite old and uses lots of unneeded spaces for
alignment, which doesn't really help with readability.

Let's:
* Get rid of the extra spaces
* Remove the ULs as they are not needed on 0s
* Define constants for the CR 0 and 14 initial values
* Use the sizeof of the gcr array to memset it to 0

Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Link: https://lore.kernel.org/r/20200131100205.74720-3-frankja@linux.ibm.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 55680890

arch/s390/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -122,6 +122,11 @@ struct mcck_volatile_info { 
	__u32 reserved;

};



#define CR0_INITIAL_MASK (CR0_UNUSED_56 | CR0_INTERRUPT_KEY_SUBMASK | \

			  CR0_MEASUREMENT_ALERT_SUBMASK)

#define CR14_INITIAL_MASK (CR14_UNUSED_32 | CR14_UNUSED_33 | \

			   CR14_EXTERNAL_DAMAGE_SUBMASK)



#define CPUSTAT_STOPPED    0x80000000

#define CPUSTAT_WAIT       0x10000000

#define CPUSTAT_ECALL_PEND 0x08000000

arch/s390/kvm/kvm-s390.c

+7 −11
Original line number Diff line number Diff line
@@ -2847,19 +2847,15 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
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->gpsw.mask = 0;

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

	kvm_s390_set_prefix(vcpu, 0);

	kvm_s390_set_cpu_timer(vcpu, 0);

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

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

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

	memset(vcpu->arch.sie_block->gcr, 0, 16 * sizeof(__u64));

	vcpu->arch.sie_block->gcr[0]  = CR0_UNUSED_56 |

					CR0_INTERRUPT_KEY_SUBMASK |

					CR0_MEASUREMENT_ALERT_SUBMASK;

	vcpu->arch.sie_block->gcr[14] = CR14_UNUSED_32 |

					CR14_UNUSED_33 |

					CR14_EXTERNAL_DAMAGE_SUBMASK;

	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;

	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