Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnaldo Carvalho de Melo <acme@redhat.com>

+44
+2
tools/arch/arm64/include/uapi/asm/kvm.h
··· 87 87 /* Supported VGICv3 address types */ 88 88 #define KVM_VGIC_V3_ADDR_TYPE_DIST 2 89 89 #define KVM_VGIC_V3_ADDR_TYPE_REDIST 3 90 + #define KVM_VGIC_ITS_ADDR_TYPE 4 90 91 91 92 #define KVM_VGIC_V3_DIST_SIZE SZ_64K 92 93 #define KVM_VGIC_V3_REDIST_SIZE (2 * SZ_64K) 94 + #define KVM_VGIC_V3_ITS_SIZE (2 * SZ_64K) 93 95 94 96 #define KVM_ARM_VCPU_POWER_OFF 0 /* CPU is started in OFF state */ 95 97 #define KVM_ARM_VCPU_EL1_32BIT 1 /* CPU running a 32bit VM */
+41
tools/arch/s390/include/uapi/asm/kvm.h
··· 93 93 __u64 fac_list[256]; 94 94 }; 95 95 96 + #define KVM_S390_VM_CPU_PROCESSOR_FEAT 2 97 + #define KVM_S390_VM_CPU_MACHINE_FEAT 3 98 + 99 + #define KVM_S390_VM_CPU_FEAT_NR_BITS 1024 100 + #define KVM_S390_VM_CPU_FEAT_ESOP 0 101 + #define KVM_S390_VM_CPU_FEAT_SIEF2 1 102 + #define KVM_S390_VM_CPU_FEAT_64BSCAO 2 103 + #define KVM_S390_VM_CPU_FEAT_SIIF 3 104 + #define KVM_S390_VM_CPU_FEAT_GPERE 4 105 + #define KVM_S390_VM_CPU_FEAT_GSLS 5 106 + #define KVM_S390_VM_CPU_FEAT_IB 6 107 + #define KVM_S390_VM_CPU_FEAT_CEI 7 108 + #define KVM_S390_VM_CPU_FEAT_IBS 8 109 + #define KVM_S390_VM_CPU_FEAT_SKEY 9 110 + #define KVM_S390_VM_CPU_FEAT_CMMA 10 111 + #define KVM_S390_VM_CPU_FEAT_PFMFI 11 112 + #define KVM_S390_VM_CPU_FEAT_SIGPIF 12 113 + struct kvm_s390_vm_cpu_feat { 114 + __u64 feat[16]; 115 + }; 116 + 117 + #define KVM_S390_VM_CPU_PROCESSOR_SUBFUNC 4 118 + #define KVM_S390_VM_CPU_MACHINE_SUBFUNC 5 119 + /* for "test bit" instructions MSB 0 bit ordering, for "query" raw blocks */ 120 + struct kvm_s390_vm_cpu_subfunc { 121 + __u8 plo[32]; /* always */ 122 + __u8 ptff[16]; /* with TOD-clock steering */ 123 + __u8 kmac[16]; /* with MSA */ 124 + __u8 kmc[16]; /* with MSA */ 125 + __u8 km[16]; /* with MSA */ 126 + __u8 kimd[16]; /* with MSA */ 127 + __u8 klmd[16]; /* with MSA */ 128 + __u8 pckmo[16]; /* with MSA3 */ 129 + __u8 kmctr[16]; /* with MSA4 */ 130 + __u8 kmf[16]; /* with MSA4 */ 131 + __u8 kmo[16]; /* with MSA4 */ 132 + __u8 pcc[16]; /* with MSA4 */ 133 + __u8 ppno[16]; /* with MSA5 */ 134 + __u8 reserved[1824]; 135 + }; 136 + 96 137 /* kvm attributes for crypto */ 97 138 #define KVM_S390_VM_CRYPTO_ENABLE_AES_KW 0 98 139 #define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW 1
+1
tools/arch/s390/include/uapi/asm/sie.h
··· 140 140 exit_code_ipa0(0xB2, 0x4c, "TAR"), \ 141 141 exit_code_ipa0(0xB2, 0x50, "CSP"), \ 142 142 exit_code_ipa0(0xB2, 0x54, "MVPG"), \ 143 + exit_code_ipa0(0xB2, 0x56, "STHYI"), \ 143 144 exit_code_ipa0(0xB2, 0x58, "BSG"), \ 144 145 exit_code_ipa0(0xB2, 0x5a, "BSA"), \ 145 146 exit_code_ipa0(0xB2, 0x5f, "CHSC"), \