Add sensing of the VSIE Interpretation Extension Facility as vsie_sigpif from SCLP. This facility is introduced with IBM Z gen17. Signed-off-by: Christoph Schlameuss Reviewed-by: Janosch Frank Reviewed-by: Hendrik Brueckner Reviewed-by: David Hildenbrand --- arch/s390/include/asm/kvm_host.h | 1 + arch/s390/include/asm/sclp.h | 1 + arch/s390/kvm/kvm-s390.c | 1 + drivers/s390/char/sclp_early.c | 1 + 4 files changed, 4 insertions(+) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 22cedcaea4756be50dcd65bdd85b83cdb0386dbb..647014edd3de8abc15067e7203c4855c066c53ad 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -644,6 +644,7 @@ struct kvm_arch { int use_pfmfi; int use_skf; int use_zpci_interp; + int use_vsie_sigpif; int user_cpu_state_ctrl; int user_sigp; int user_stsi; diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h index 0f184dbdbe5e0748fcecbca38b9e55a56968dc79..e4545d96e4bf67243583f184c2d4e734a9605007 100644 --- a/arch/s390/include/asm/sclp.h +++ b/arch/s390/include/asm/sclp.h @@ -101,6 +101,7 @@ struct sclp_info { unsigned char has_dirq : 1; unsigned char has_iplcc : 1; unsigned char has_zpci_lsi : 1; + unsigned char has_vsie_sigpif : 1; unsigned char has_aisii : 1; unsigned char has_aeni : 1; unsigned char has_aisi : 1; diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 984baa5f5ded1e05e389abc485c63c0bf35eee4c..ab672aa93f758711af4defb13875fd49a6609758 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -3439,6 +3439,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) kvm->arch.use_pfmfi = sclp.has_pfmfi; kvm->arch.use_skf = sclp.has_skey; + kvm->arch.use_vsie_sigpif = sclp.has_vsie_sigpif; spin_lock_init(&kvm->arch.start_stop_lock); kvm_s390_vsie_init(kvm); if (use_gisa) diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c index bd5e5ba50c0acaedce899702433a7f075dc56258..7211d85a8d4e9c97745fd13955c742407c0ab22f 100644 --- a/drivers/s390/char/sclp_early.c +++ b/drivers/s390/char/sclp_early.c @@ -57,6 +57,7 @@ static void __init sclp_early_facilities_detect(void) sclp.has_diag318 = !!(sccb->byte_134 & 0x80); sclp.has_diag320 = !!(sccb->byte_134 & 0x04); sclp.has_iplcc = !!(sccb->byte_134 & 0x02); + sclp.has_vsie_sigpif = !!(sccb->byte_134 & 0x01); } if (sccb->cpuoff > 137) { sclp.has_sipl = !!(sccb->cbl & 0x4000); -- 2.51.1