2020-05-12 10:31:40 +08:00
|
|
|
From 27a9f40b308efd8ddcb81e286441865b5a0cb541 Mon Sep 17 00:00:00 2001
|
2020-01-06 14:35:42 +08:00
|
|
|
From: Zenghui Yu <yuzenghui@huawei.com>
|
2020-05-12 10:31:40 +08:00
|
|
|
Date: Tue, 14 Apr 2020 21:52:42 +0800
|
|
|
|
|
Subject: [PATCH] linux headers: update against "KVM/ARM: Fix >256 vcpus"
|
2020-01-06 14:35:42 +08:00
|
|
|
|
|
|
|
|
This is part of upstream commit f363d039e883 ("linux headers: update
|
|
|
|
|
against v5.4-rc1"), authored by Eric Auger <eric.auger@redhat.com>.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
|
|
|
|
|
---
|
|
|
|
|
linux-headers/asm-arm/kvm.h | 4 +++-
|
|
|
|
|
linux-headers/asm-arm64/kvm.h | 4 +++-
|
|
|
|
|
linux-headers/linux/kvm.h | 1 +
|
|
|
|
|
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/linux-headers/asm-arm/kvm.h b/linux-headers/asm-arm/kvm.h
|
|
|
|
|
index e1f8b745..137a2730 100644
|
|
|
|
|
--- a/linux-headers/asm-arm/kvm.h
|
|
|
|
|
+++ b/linux-headers/asm-arm/kvm.h
|
|
|
|
|
@@ -254,8 +254,10 @@ struct kvm_vcpu_events {
|
|
|
|
|
#define KVM_DEV_ARM_ITS_CTRL_RESET 4
|
2020-05-12 10:31:40 +08:00
|
|
|
|
2020-01-06 14:35:42 +08:00
|
|
|
/* KVM_IRQ_LINE irq field index values */
|
|
|
|
|
+#define KVM_ARM_IRQ_VCPU2_SHIFT 28
|
|
|
|
|
+#define KVM_ARM_IRQ_VCPU2_MASK 0xf
|
|
|
|
|
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
|
|
|
|
-#define KVM_ARM_IRQ_TYPE_MASK 0xff
|
|
|
|
|
+#define KVM_ARM_IRQ_TYPE_MASK 0xf
|
|
|
|
|
#define KVM_ARM_IRQ_VCPU_SHIFT 16
|
|
|
|
|
#define KVM_ARM_IRQ_VCPU_MASK 0xff
|
|
|
|
|
#define KVM_ARM_IRQ_NUM_SHIFT 0
|
|
|
|
|
diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h
|
2020-05-12 10:31:40 +08:00
|
|
|
index 2431ec35..cdfd5f33 100644
|
2020-01-06 14:35:42 +08:00
|
|
|
--- a/linux-headers/asm-arm64/kvm.h
|
|
|
|
|
+++ b/linux-headers/asm-arm64/kvm.h
|
2020-05-12 10:31:40 +08:00
|
|
|
@@ -308,8 +308,10 @@ struct kvm_vcpu_events {
|
2020-01-06 14:35:42 +08:00
|
|
|
#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER 1
|
2020-05-12 10:31:40 +08:00
|
|
|
|
2020-01-06 14:35:42 +08:00
|
|
|
/* KVM_IRQ_LINE irq field index values */
|
|
|
|
|
+#define KVM_ARM_IRQ_VCPU2_SHIFT 28
|
|
|
|
|
+#define KVM_ARM_IRQ_VCPU2_MASK 0xf
|
|
|
|
|
#define KVM_ARM_IRQ_TYPE_SHIFT 24
|
|
|
|
|
-#define KVM_ARM_IRQ_TYPE_MASK 0xff
|
|
|
|
|
+#define KVM_ARM_IRQ_TYPE_MASK 0xf
|
|
|
|
|
#define KVM_ARM_IRQ_VCPU_SHIFT 16
|
|
|
|
|
#define KVM_ARM_IRQ_VCPU_MASK 0xff
|
|
|
|
|
#define KVM_ARM_IRQ_NUM_SHIFT 0
|
|
|
|
|
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
|
2020-05-12 10:31:40 +08:00
|
|
|
index c8423e76..744e888e 100644
|
2020-01-06 14:35:42 +08:00
|
|
|
--- a/linux-headers/linux/kvm.h
|
|
|
|
|
+++ b/linux-headers/linux/kvm.h
|
|
|
|
|
@@ -988,6 +988,7 @@ struct kvm_ppc_resize_hpt {
|
|
|
|
|
#define KVM_CAP_ARM_VM_IPA_SIZE 165
|
2020-05-12 10:31:40 +08:00
|
|
|
#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT 166 /* Obsolete */
|
2020-01-06 14:35:42 +08:00
|
|
|
#define KVM_CAP_HYPERV_CPUID 167
|
|
|
|
|
+#define KVM_CAP_ARM_IRQ_LINE_LAYOUT_2 174
|
2020-05-12 10:31:40 +08:00
|
|
|
#define KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 168
|
|
|
|
|
#define KVM_CAP_PPC_IRQ_XIVE 169
|
|
|
|
|
#define KVM_CAP_ARM_SVE 170
|
|
|
|
|
--
|
|
|
|
|
2.23.0
|
