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

Commit 9f315690 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools: Sync kvm related header files for arm64 and s390 

From a quick look nothing stands out as requiring changes to kvm tools
such as tools/perf/arch/s390/util/kvm-stat.c.

Silences these header checking warnings:

  $ make -C tools/perf
  make: Entering directory '/home/acme/git/linux/tools/perf'
    BUILD:   Doing 'make -j4' parallel build
  Warning: tools/arch/s390/include/uapi/asm/kvm.h differs from kernel
  Warning: tools/arch/s390/include/uapi/asm/sie.h differs from kernel
  Warning: tools/arch/arm64/include/uapi/asm/kvm.h differs from kernel
  <SNIP>

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Yarygin <yarygin@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Scott  Wood <scottwood@freescale.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-btutge414g516qmh6r5ienlj@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 60ebc159

tools/arch/arm64/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ struct kvm_regs { 
/* Supported VGICv3 address types  */

#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3

#define KVM_VGIC_ITS_ADDR_TYPE		4



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)

#define KVM_VGIC_V3_ITS_SIZE		(2 * SZ_64K)



#define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */

#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

tools/arch/s390/include/uapi/asm/kvm.h

+41 −0
Original line number Diff line number Diff line
@@ -93,6 +93,47 @@ struct kvm_s390_vm_cpu_machine { 
	__u64 fac_list[256];

};



#define KVM_S390_VM_CPU_PROCESSOR_FEAT	2

#define KVM_S390_VM_CPU_MACHINE_FEAT	3



#define KVM_S390_VM_CPU_FEAT_NR_BITS	1024

#define KVM_S390_VM_CPU_FEAT_ESOP	0

#define KVM_S390_VM_CPU_FEAT_SIEF2	1

#define KVM_S390_VM_CPU_FEAT_64BSCAO	2

#define KVM_S390_VM_CPU_FEAT_SIIF	3

#define KVM_S390_VM_CPU_FEAT_GPERE	4

#define KVM_S390_VM_CPU_FEAT_GSLS	5

#define KVM_S390_VM_CPU_FEAT_IB		6

#define KVM_S390_VM_CPU_FEAT_CEI	7

#define KVM_S390_VM_CPU_FEAT_IBS	8

#define KVM_S390_VM_CPU_FEAT_SKEY	9

#define KVM_S390_VM_CPU_FEAT_CMMA	10

#define KVM_S390_VM_CPU_FEAT_PFMFI	11

#define KVM_S390_VM_CPU_FEAT_SIGPIF	12

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};



#define KVM_S390_VM_CPU_PROCESSOR_SUBFUNC	4

#define KVM_S390_VM_CPU_MACHINE_SUBFUNC		5

/* for "test bit" instructions MSB 0 bit ordering, for "query" raw blocks */

struct kvm_s390_vm_cpu_subfunc {

	__u8 plo[32];		/* always */

	__u8 ptff[16];		/* with TOD-clock steering */

	__u8 kmac[16];		/* with MSA */

	__u8 kmc[16];		/* with MSA */

	__u8 km[16];		/* with MSA */

	__u8 kimd[16];		/* with MSA */

	__u8 klmd[16];		/* with MSA */

	__u8 pckmo[16];		/* with MSA3 */

	__u8 kmctr[16];		/* with MSA4 */

	__u8 kmf[16];		/* with MSA4 */

	__u8 kmo[16];		/* with MSA4 */

	__u8 pcc[16];		/* with MSA4 */

	__u8 ppno[16];		/* with MSA5 */

	__u8 reserved[1824];

};



/* kvm attributes for crypto */

#define KVM_S390_VM_CRYPTO_ENABLE_AES_KW	0

#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1

tools/arch/s390/include/uapi/asm/sie.h

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
	exit_code_ipa0(0xB2, 0x4c, "TAR"),	\

	exit_code_ipa0(0xB2, 0x50, "CSP"),	\

	exit_code_ipa0(0xB2, 0x54, "MVPG"),	\

	exit_code_ipa0(0xB2, 0x56, "STHYI"),	\

	exit_code_ipa0(0xB2, 0x58, "BSG"),	\

	exit_code_ipa0(0xB2, 0x5a, "BSA"),	\

	exit_code_ipa0(0xB2, 0x5f, "CHSC"),	\