From 170662bb45c6a4290391c8f896e437b5dc67e229 Mon Sep 17 00:00:00 2001

From: Thomas Huth <thuth@redhat.com>

Date: Tue, 23 Jan 2018 19:12:44 +0100

Subject: [PATCH 2/8] linux-headers: update

RH-Author: Thomas Huth <thuth@redhat.com>

Message-id: <1516734766-12075-2-git-send-email-thuth@redhat.com>

Patchwork-id: 78699

O-Subject: [RHEL-7.5 qemu-kvm-ma PATCH 1/3] linux-headers: update

Bugzilla: 1535606

RH-Acked-by: David Hildenbrand <david@redhat.com>

RH-Acked-by: Cornelia Huck <cohuck@redhat.com>

RH-Acked-by: Jens Freimann <jfreimann@redhat.com>

From: Cornelia Huck <cohuck@redhat.com>

Update headers against 4.15-rc9.

Signed-off-by: Cornelia Huck <cohuck@redhat.com>

(cherry picked from commit 9cbb636270b4df6f0a548e5c34b895330db5df8b)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

Conflicts:

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

	linux-headers/linux/kvm.h

	(simple conflicts since commit dd8739669f95b3065 was missing)

Signed-off-by: Thomas Huth <thuth@redhat.com>

---

 include/standard-headers/asm-s390/virtio-ccw.h |  5 +----

 linux-headers/asm-powerpc/kvm.h                | 25 +++++++++++++++++++++++++

 linux-headers/asm-s390/kvm.h                   |  9 ++++-----

 linux-headers/asm-s390/kvm_para.h              |  4 ----

 linux-headers/linux/kvm.h                      |  9 +++++++--

 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/include/standard-headers/asm-s390/virtio-ccw.h b/include/standard-headers/asm-s390/virtio-ccw.h

index a9a4ebf..2b605f7 100644

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

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

@@ -1,12 +1,9 @@

+/* 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

diff --git a/linux-headers/asm-powerpc/kvm.h b/linux-headers/asm-powerpc/kvm.h

index 8cf8f0c..a1cb407 100644

--- a/linux-headers/asm-powerpc/kvm.h

+++ b/linux-headers/asm-powerpc/kvm.h

@@ -442,6 +442,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)

diff --git a/linux-headers/asm-s390/kvm.h b/linux-headers/asm-s390/kvm.h

index 8387d71..08ee46a 100644

--- a/linux-headers/asm-s390/kvm.h

+++ b/linux-headers/asm-s390/kvm.h

@@ -5,10 +5,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>

  */

@@ -221,6 +217,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)

@@ -244,7 +241,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 {

diff --git a/linux-headers/asm-s390/kvm_para.h b/linux-headers/asm-s390/kvm_para.h

index ff1f4e7..1a81ec9 100644

--- a/linux-headers/asm-s390/kvm_para.h

+++ b/linux-headers/asm-s390/kvm_para.h

@@ -3,9 +3,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>

  */

diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h

index 7971a4f..fabd075 100644

--- a/linux-headers/linux/kvm.h

+++ b/linux-headers/linux/kvm.h

@@ -629,9 +629,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 */

@@ -929,6 +929,9 @@ struct kvm_ppc_resize_hpt {

 #define KVM_CAP_PPC_SMT_POSSIBLE 147

 #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

@@ -1258,6 +1261,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)

-- 

1.8.3.1