Skip to contentSkip to conversation

ARM64: KVM: Fix VGIC compile error for Linux-3.14-rc1

PATCH New Anup Patel 2 participants 3 messages Feb 4, 2014

Subsystems (2)
lore
Share & tools
lore

Anup Patel

author
#0 lore raw

PATCH 1/1 ARM64: KVM: Fix VGIC compile error for Linux-3.14-rc1

This patch fixes VGIC compilation for Linux-3.14-rc1 ARM64 kernel.

---
 arch/arm64/include/uapi/asm/kvm.h |    9 +++++++++
 virt/kvm/arm/vgic.c               |    1 +
 2 files changed, 10 insertions(+)
arch/arm64/include/uapi/asm/kvm.h +9 -0
index 31c2f54..cadc318 100644
@@ -149,6 +149,15 @@ struct kvm_arch_memory_slot {
 #define KVM_REG_ARM_TIMER_CNT		ARM64_SYS_REG(3, 3, 14, 3, 2)
 #define KVM_REG_ARM_TIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 0, 2)
 
+/* Device Control API: ARM VGIC */
+#define KVM_DEV_ARM_VGIC_GRP_ADDR	0
+#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1
+#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2
+#define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32
+#define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
+#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0
+#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
+
 /* KVM_IRQ_LINE irq field index values */
 #define KVM_ARM_IRQ_TYPE_SHIFT		24
 #define KVM_ARM_IRQ_TYPE_MASK		0xff
virt/kvm/arm/vgic.c +1 -0
index be456ce..55b0609 100644
@@ -21,6 +21,7 @@
 #include <linux/kvm_host.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/uaccess.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 ARM64: KVM: Fix VGIC compile error for Linux-3.14-rc1

Quoted 4 lines · Anup Patel

This patch fixes VGIC compilation for Linux-3.14-rc1 ARM64 kernel.

Already posted by Christoffer, and hopefully on its way to mainline.

	M.
Quoted 38 lines
---
 arch/arm64/include/uapi/asm/kvm.h |    9 +++++++++
 virt/kvm/arm/vgic.c               |    1 +
 2 files changed, 10 insertions(+)
arch/arm64/include/uapi/asm/kvm.h +9 -0
index 31c2f54..cadc318 100644
@@ -149,6 +149,15 @@ struct kvm_arch_memory_slot {
 #define KVM_REG_ARM_TIMER_CNT		ARM64_SYS_REG(3, 3, 14, 3, 2)
 #define KVM_REG_ARM_TIMER_CVAL		ARM64_SYS_REG(3, 3, 14, 0, 2)
 
+/* Device Control API: ARM VGIC */
+#define KVM_DEV_ARM_VGIC_GRP_ADDR	0
+#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS	1
+#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS	2
+#define   KVM_DEV_ARM_VGIC_CPUID_SHIFT	32
+#define   KVM_DEV_ARM_VGIC_CPUID_MASK	(0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
+#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT	0
+#define   KVM_DEV_ARM_VGIC_OFFSET_MASK	(0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
+
 /* KVM_IRQ_LINE irq field index values */
 #define KVM_ARM_IRQ_TYPE_SHIFT		24
 #define KVM_ARM_IRQ_TYPE_MASK		0xff
virt/kvm/arm/vgic.c +1 -0
index be456ce..55b0609 100644
@@ -21,6 +21,7 @@
 #include <linux/kvm_host.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/uaccess.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
Signature · 1 line
Jazz is not dead. It just smells funny...
author
#2 lore raw

PATCH 1/1 ARM64: KVM: Fix VGIC compile error for Linux-3.14-rc1

Quoted 7 lines · Marc Zyngier
Quoted 4 lines · Anup Patel

This patch fixes VGIC compilation for Linux-3.14-rc1 ARM64 kernel.

Already posted by Christoffer, and hopefully on its way to mainline.

Thanks,
Anup

Quoted 45 lines
        M.
Quoted 31 lines
---
 arch/arm64/include/uapi/asm/kvm.h |    9 +++++++++
 virt/kvm/arm/vgic.c               |    1 +
 2 files changed, 10 insertions(+)
arch/arm64/include/uapi/asm/kvm.h +9 -0
index 31c2f54..cadc318 100644
@@ -149,6 +149,15 @@ struct kvm_arch_memory_slot {
 #define KVM_REG_ARM_TIMER_CNT                ARM64_SYS_REG(3, 3, 14, 3, 2)
 #define KVM_REG_ARM_TIMER_CVAL               ARM64_SYS_REG(3, 3, 14, 0, 2)
 
+/* Device Control API: ARM VGIC */
+#define KVM_DEV_ARM_VGIC_GRP_ADDR    0
+#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS       1
+#define KVM_DEV_ARM_VGIC_GRP_CPU_REGS        2
+#define   KVM_DEV_ARM_VGIC_CPUID_SHIFT       32
+#define   KVM_DEV_ARM_VGIC_CPUID_MASK        (0xffULL << KVM_DEV_ARM_VGIC_CPUID_SHIFT)
+#define   KVM_DEV_ARM_VGIC_OFFSET_SHIFT      0
+#define   KVM_DEV_ARM_VGIC_OFFSET_MASK       (0xffffffffULL << KVM_DEV_ARM_VGIC_OFFSET_SHIFT)
+
 /* KVM_IRQ_LINE irq field index values */
 #define KVM_ARM_IRQ_TYPE_SHIFT               24
 #define KVM_ARM_IRQ_TYPE_MASK                0xff
virt/kvm/arm/vgic.c +0 -0
index be456ce..55b0609 100644

virt/kvm/arm/vgic.c line 27

Quoted 7 lines
virt/kvm/arm/vgic.c +1 -0
@@ -21,6 +21,7 @@
 #include <linux/kvm_host.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/uaccess.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>

--
Jazz is not dead. It just smells funny...