Commit 9cbb6362 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

linux-headers: update 



Update headers against 4.15-rc9.

Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent b5e85329

include/standard-headers/asm-s390/virtio-ccw.h

+1 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */

/*

 * Definitions for virtio-ccw devices.

 *

 * Copyright IBM Corp. 2013

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License (version 2 only)

 * as published by the Free Software Foundation.

 *

 *  Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 */

#ifndef __KVM_VIRTIO_CCW_H

linux-headers/asm-powerpc/kvm.h

+25 −0
Original line number Diff line number Diff line
@@ -443,6 +443,31 @@ struct kvm_ppc_rmmu_info { 
	__u32	ap_encodings[8];

};



/* For KVM_PPC_GET_CPU_CHAR */

struct kvm_ppc_cpu_char {

	__u64	character;		/* characteristics of the CPU */

	__u64	behaviour;		/* recommended software behaviour */

	__u64	character_mask;		/* valid bits in character */

	__u64	behaviour_mask;		/* valid bits in behaviour */

};



/*

 * Values for character and character_mask.

 * These are identical to the values used by H_GET_CPU_CHARACTERISTICS.

 */

#define KVM_PPC_CPU_CHAR_SPEC_BAR_ORI31		(1ULL << 63)

#define KVM_PPC_CPU_CHAR_BCCTRL_SERIALISED	(1ULL << 62)

#define KVM_PPC_CPU_CHAR_L1D_FLUSH_ORI30	(1ULL << 61)

#define KVM_PPC_CPU_CHAR_L1D_FLUSH_TRIG2	(1ULL << 60)

#define KVM_PPC_CPU_CHAR_L1D_THREAD_PRIV	(1ULL << 59)

#define KVM_PPC_CPU_CHAR_BR_HINT_HONOURED	(1ULL << 58)

#define KVM_PPC_CPU_CHAR_MTTRIG_THR_RECONF	(1ULL << 57)

#define KVM_PPC_CPU_CHAR_COUNT_CACHE_DIS	(1ULL << 56)



#define KVM_PPC_CPU_BEHAV_FAVOUR_SECURITY	(1ULL << 63)

#define KVM_PPC_CPU_BEHAV_L1D_FLUSH_PR		(1ULL << 62)

#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR	(1ULL << 61)



/* Per-vcpu XICS interrupt controller state */

#define KVM_REG_PPC_ICP_STATE	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)

linux-headers/asm-s390/kvm.h

+4 −5
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ 
 *

 * Copyright IBM Corp. 2008

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License (version 2 only)

 * as published by the Free Software Foundation.

 *

 *    Author(s): Carsten Otte <cotte@de.ibm.com>

 *               Christian Borntraeger <borntraeger@de.ibm.com>

 */
@@ -228,6 +224,7 @@ struct kvm_guest_debug_arch { 
#define KVM_SYNC_RICCB  (1UL << 7)

#define KVM_SYNC_FPRS   (1UL << 8)

#define KVM_SYNC_GSCB   (1UL << 9)

#define KVM_SYNC_BPBC   (1UL << 10)

/* length and alignment of the sdnx as a power of two */

#define SDNXC 8

#define SDNXL (1UL << SDNXC)
@@ -251,7 +248,9 @@ struct kvm_sync_regs { 
	};

	__u8  reserved[512];	/* for future vector expansion */

	__u32 fpc;		/* valid on KVM_SYNC_VRS or KVM_SYNC_FPRS */

	__u8 padding1[52];	/* riccb needs to be 64byte aligned */

	__u8 bpbc : 1;		/* bp mode */

	__u8 reserved2 : 7;

	__u8 padding1[51];	/* riccb needs to be 64byte aligned */

	__u8 riccb[64];		/* runtime instrumentation controls block */

	__u8 padding2[192];	/* sdnx needs to be 256byte aligned */

	union {

linux-headers/asm-s390/kvm_para.h

+0 −4
Original line number Diff line number Diff line
@@ -4,9 +4,5 @@ 
 *

 * Copyright IBM Corp. 2008

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License (version 2 only)

 * as published by the Free Software Foundation.

 *

 *    Author(s): Christian Borntraeger <borntraeger@de.ibm.com>

 */

linux-headers/linux/kvm.h

+6 −2
Original line number Diff line number Diff line
@@ -630,9 +630,9 @@ struct kvm_s390_irq { 


struct kvm_s390_irq_state {

	__u64 buf;

	__u32 flags;

	__u32 flags;        /* will stay unused for compatibility reasons */

	__u32 len;

	__u32 reserved[4];

	__u32 reserved[4];  /* will stay unused for compatibility reasons */

};



/* for KVM_SET_GUEST_DEBUG */
@@ -932,6 +932,8 @@ struct kvm_ppc_resize_hpt { 
#define KVM_CAP_HYPERV_SYNIC2 148

#define KVM_CAP_HYPERV_VP_INDEX 149

#define KVM_CAP_S390_AIS_MIGRATION 150

#define KVM_CAP_PPC_GET_CPU_CHAR 151

#define KVM_CAP_S390_BPB 152



#ifdef KVM_CAP_IRQ_ROUTING
@@ -1261,6 +1263,8 @@ struct kvm_s390_ucas_mapping { 
#define KVM_PPC_CONFIGURE_V3_MMU  _IOW(KVMIO,  0xaf, struct kvm_ppc_mmuv3_cfg)

/* Available with KVM_CAP_PPC_RADIX_MMU */

#define KVM_PPC_GET_RMMU_INFO	  _IOW(KVMIO,  0xb0, struct kvm_ppc_rmmu_info)

/* Available with KVM_CAP_PPC_GET_CPU_CHAR */

#define KVM_PPC_GET_CPU_CHAR	  _IOR(KVMIO,  0xb1, struct kvm_ppc_cpu_char)



/* ioctl for vm fd */

#define KVM_CREATE_DEVICE	  _IOWR(KVMIO,  0xe0, struct kvm_create_device)