From patchwork Fri Jul 17 13:26:48 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Pavel Fedin
X-Patchwork-Id: 497142
Return-Path:
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])
(using TLSv1 with cipher AES256-SHA (256/256 bits))
(No client certificate requested)
by ozlabs.org (Postfix) with ESMTPS id 1516B140271
for ;
Fri, 17 Jul 2015 23:29:06 +1000 (AEST)
Received: from localhost ([::1]:44830 helo=lists.gnu.org)
by lists.gnu.org with esmtp (Exim 4.71) (envelope-from
)
id 1ZG5hH-0007Ya-MM
for incoming@patchwork.ozlabs.org; Fri, 17 Jul 2015 09:29:03 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37129)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZG5fG-0003Tr-Nv
for qemu-devel@nongnu.org; Fri, 17 Jul 2015 09:27:03 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZG5fD-0002Rp-FD
for qemu-devel@nongnu.org; Fri, 17 Jul 2015 09:26:58 -0400
Received: from mailout1.w1.samsung.com ([210.118.77.11]:35643)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZG5fD-0002Qj-6r
for qemu-devel@nongnu.org; Fri, 17 Jul 2015 09:26:55 -0400
Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244])
by mailout1.w1.samsung.com
(Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5
2014)) with ESMTP id <0NRM008IOW0S0680@mailout1.w1.samsung.com> for
qemu-devel@nongnu.org; Fri, 17 Jul 2015 14:26:52 +0100 (BST)
X-AuditID: cbfec7f4-f79c56d0000012ee-f9-55a9029c803c
Received: from eusync4.samsung.com ( [203.254.199.214])
by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 82.C5.04846.C9209A55;
Fri, 17 Jul 2015 14:26:52 +0100 (BST)
Received: from localhost ([106.109.131.169])
by eusync4.samsung.com (Oracle Communications Messaging Server
7.0.5.31.0 64bit (built May 5 2014))
with ESMTPA id <0NRM002B3W0SN510@eusync4.samsung.com>; Fri,
17 Jul 2015 14:26:52 +0100 (BST)
From: Pavel Fedin
To: qemu-devel@nongnu.org
Date: Fri, 17 Jul 2015 16:26:48 +0300
Message-id:
<041335b89aa5b82c196a805b3cc7467824dcebf0.1437139165.git.p.fedin@samsung.com>
X-Mailer: git-send-email 1.9.5.msysgit.0
In-reply-to:
References:
In-reply-to:
References:
X-Brightmail-Tracker:
H4sIAAAAAAAAA+NgFlrFLMWRmVeSWpSXmKPExsVy+t/xa7pzmFaGGkxpMrV48fofo8Wmz+dY
LOZvOcNqMefMAxaL4707WCzaPn9nt7j7+jOLA7vHv8P9TB47Z91l92g58pbV4861PWweT65t
ZgpgjeKySUnNySxLLdK3S+DKeDrtJ2PBfuWK7latBsaJ0l2MnBwSAiYSCz7fZ4KwxSQu3FvP
1sXIxSEksJRR4tPMzawgCSGBb4wSbV/NQGw2AXWJ018/sIDYIgKSEr+7TjODNDALTGSS2Di7
lQ0kISzgInHs9xkwm0VAVeLRg14wm1cgWuLRlRXMENs0JBZ9mQMU5+DgFDCX+L3JBGKXmcTx
389xCU9g5F/AyLCKUTS1NLmgOCk911CvODG3uDQvXS85P3cTIyQEv+xgXHzM6hCjAAejEg9v
g+uKUCHWxLLiytxDjBIczEoivL/+AYV4UxIrq1KL8uOLSnNSiw8xSnOwKInzzt31PkRIID2x
JDU7NbUgtQgmy8TBKdXAmJ77Iywh8HmQqPXt20xHmnbkx/Hvu930Ym5n0PNfATtj8ypjt+0K
8OmR2G5xrfHlX7uX3C7nd/H5nrZhrNOYqmctvPwY48qpXzTvP7n0s1Ty3La1Af9bP6gvrk7i
3rlhhkXfYuVpqcdN97Gd/nol9dNqN9nr3jNcPIK6ffRrhJcFVl7MOF50QYmlOCPRUIu5qDgR
ADT0+sg9AgAA
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 210.118.77.11
Cc: Peter Maydell ,
Eric Auger ,
Shlomo Pongratz ,
Shlomo Pongratz ,
Diana Craciun ,
Christoffer Dall
Subject: [Qemu-devel] [PATCH v5 3/5] Introduce irqchip type specification
for KVM
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
This patch introduces kernel_irqchip_type member in Machine class, which
it passed to kvm_arch_irqchip_create. It allows machine models to specify
correct GIC type during KVM capability verification. The variable is
defined as int in order to be architecture-agnostic for potential future
uses by other architectures.
Signed-off-by: Pavel Fedin
---
hw/arm/vexpress.c | 1 +
hw/arm/virt.c | 3 +++
include/hw/boards.h | 1 +
include/sysemu/kvm.h | 3 ++-
kvm-all.c | 2 +-
stubs/kvm.c | 2 +-
target-arm/kvm.c | 13 +++++++++++--
7 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index da21788..0675a00 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -556,6 +556,7 @@ static void vexpress_common_init(MachineState *machine)
const hwaddr *map = daughterboard->motherboard_map;
int i;
+ machine->kernel_irqchip_type = KVM_DEV_TYPE_ARM_VGIC_V2;
daughterboard->init(vms, machine->ram_size, machine->cpu_model, pic);
/*
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 4846892..2e7d858 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -945,6 +945,9 @@ static void virt_instance_init(Object *obj)
"Set on/off to enable/disable the ARM "
"Security Extensions (TrustZone)",
NULL);
+
+ /* Default GIC type is v2 */
+ vms->parent.kernel_irqchip_type = KVM_DEV_TYPE_ARM_VGIC_V2;
}
static void virt_class_init(ObjectClass *oc, void *data)
diff --git a/include/hw/boards.h b/include/hw/boards.h
index 2aec9cb..37eb767 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -127,6 +127,7 @@ struct MachineState {
char *accel;
bool kernel_irqchip_allowed;
bool kernel_irqchip_required;
+ int kernel_irqchip_type;
int kvm_shadow_mem;
char *dtb;
char *dumpdtb;
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 983e99e..8f4d485 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -434,6 +434,7 @@ void kvm_init_irq_routing(KVMState *s);
/**
* kvm_arch_irqchip_create:
* @KVMState: The KVMState pointer
+ * @type: irqchip type, architecture-specific
*
* Allow architectures to create an in-kernel irq chip themselves.
*
@@ -441,7 +442,7 @@ void kvm_init_irq_routing(KVMState *s);
* 0: irq chip was not created
* > 0: irq chip was created
*/
-int kvm_arch_irqchip_create(KVMState *s);
+int kvm_arch_irqchip_create(KVMState *s, int type);
/**
* kvm_set_one_reg - set a register value in KVM via KVM_SET_ONE_REG ioctl
diff --git a/kvm-all.c b/kvm-all.c
index 06e06f2..8df938d 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1395,7 +1395,7 @@ static void kvm_irqchip_create(MachineState *machine, KVMState *s)
/* First probe and see if there's a arch-specific hook to create the
* in-kernel irqchip for us */
- ret = kvm_arch_irqchip_create(s);
+ ret = kvm_arch_irqchip_create(s, machine->kernel_irqchip_type);
if (ret == 0) {
ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP);
}
diff --git a/stubs/kvm.c b/stubs/kvm.c
index e7c60b6..a8505ff 100644
--- a/stubs/kvm.c
+++ b/stubs/kvm.c
@@ -1,7 +1,7 @@
#include "qemu-common.h"
#include "sysemu/kvm.h"
-int kvm_arch_irqchip_create(KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s, int type)
{
return 0;
}
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 548bfd7..3992c1f 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -579,19 +579,28 @@ void kvm_arch_init_irq_routing(KVMState *s)
{
}
-int kvm_arch_irqchip_create(KVMState *s)
+int kvm_arch_irqchip_create(KVMState *s, int type)
{
int ret;
+ /* Failure here means forgotten initialization of
+ * machine->kernel_irqchip_type in model code
+ */
+ assert(type != 0);
+
/* If we can create the VGIC using the newer device control API, we
* let the device do this when it initializes itself, otherwise we
* fall back to the old API */
- ret = kvm_create_device(s, KVM_DEV_TYPE_ARM_VGIC_V2, true);
+ ret = kvm_create_device(s, type, true);
if (ret == 0) {
return 1;
}
+ /* Fallback will create VGIC v2 */
+ if (type != KVM_DEV_TYPE_ARM_VGIC_V2) {
+ return ret;
+ }
return 0;
}