applied to next (with Connys language fixes)
On 08/29/2017 04:31 PM, David Hildenbrand wrote:
> Indepenent of the underlying hardware, kvm will now always handle
> SIGP SET ARCHITECTURE as if czam is enabled. Therefore, let's not
> only forward that bit but always set it.
>
> While at it, add a comment regarding STHYI.
>
> Signed-off-by: David Hildenbrand <david@xxxxxxxxxx>
> ---
> arch/s390/kvm/kvm-s390.c | 4 ++++
> arch/s390/tools/gen_facilities.c | 1 -
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index 84c069afc02f..39115f5a38df 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -1927,6 +1927,10 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
> memcpy(kvm->arch.model.fac_list, kvm->arch.model.fac_mask,
> S390_ARCH_FAC_LIST_SIZE_BYTE);
>
> + /* we are always in czam mode - even on pre z14 machines */
> + set_kvm_facility(kvm->arch.model.fac_mask, 138);
> + set_kvm_facility(kvm->arch.model.fac_list, 138);
> + /* we emulate STHYI in kvm */
> set_kvm_facility(kvm->arch.model.fac_mask, 74);
> set_kvm_facility(kvm->arch.model.fac_list, 74);
> if (MACHINE_HAS_TLB_GUEST) {
> diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
> index 601bfcf99e2a..19f12cef5bdf 100644
> --- a/arch/s390/tools/gen_facilities.c
> +++ b/arch/s390/tools/gen_facilities.c
> @@ -80,7 +80,6 @@ static struct facility_def facility_defs[] = {
> 78, /* enhanced-DAT 2 */
> 130, /* instruction-execution-protection */
> 131, /* enhanced-SOP 2 and side-effect */
> - 138, /* configuration z/architecture mode (czam) */
> 139, /* multiple epoch facility */
> 146, /* msa extension 8 */
> -1 /* END */
>
