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

Commit 88bf46bf authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

Merge branch 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux 

Pull facility mask patch from the KVM tree.

* tag 's390forkvm' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
  KVM: s390: generate facility mask from readable list
parents 2ccb5bf0 f6c1d359

arch/s390/include/asm/facilities_src.h

+24 −0
Original line number Diff line number Diff line
@@ -55,4 +55,28 @@ static struct facility_def facility_defs[] = { 
			-1 /* END */

		}

	},

	{

		.name = "FACILITIES_KVM",

		.bits = (int[]){

			0,  /* N3 instructions */

			1,  /* z/Arch mode installed */

			2,  /* z/Arch mode active */

			3,  /* DAT-enhancement */

			4,  /* idte segment table */

			5,  /* idte region table */

			6,  /* ASN-and-LX reuse */

			7,  /* stfle */

			8,  /* enhanced-DAT 1 */

			9,  /* sense-running-status */

			10, /* conditional sske */

			13, /* ipte-range */

			14, /* nonquiescing key-setting */

			73, /* transactional execution */

			75, /* access-exception-fetch/store indication */

			76, /* msa extension 3 */

			77, /* msa extension 4 */

			78, /* enhanced-DAT 2 */

			-1  /* END */

		}

	},

};

arch/s390/kvm/kvm-s390.c

+1 −4
Original line number Diff line number Diff line
@@ -132,10 +132,7 @@ module_param(nested, int, S_IRUGO); 
MODULE_PARM_DESC(nested, "Nested virtualization support");



/* upper facilities limit for kvm */

unsigned long kvm_s390_fac_list_mask[16] = {

	0xffe6000000000000UL,

	0x005e000000000000UL,

};

unsigned long kvm_s390_fac_list_mask[16] = { FACILITIES_KVM };



unsigned long kvm_s390_fac_list_mask_size(void)

{