From patchwork Tue Dec 2 18:28:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 416962 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 2CF83140273 for ; Wed, 3 Dec 2014 05:30:39 +1100 (AEDT) Received: from localhost ([::1]:38248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvsDd-0007z3-Co for incoming@patchwork.ozlabs.org; Tue, 02 Dec 2014 13:30:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvsBh-0004sV-AE for qemu-devel@nongnu.org; Tue, 02 Dec 2014 13:28:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XvsBb-0004Qu-Dp for qemu-devel@nongnu.org; Tue, 02 Dec 2014 13:28:37 -0500 Received: from mail-wg0-f54.google.com ([74.125.82.54]:51915) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XvsBb-0004QF-7x for qemu-devel@nongnu.org; Tue, 02 Dec 2014 13:28:31 -0500 Received: by mail-wg0-f54.google.com with SMTP id l2so17885985wgh.27 for ; Tue, 02 Dec 2014 10:28:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Pe6GyA14rvMp3pWAxBu5A4TRo3e2LiJG4hzwaX9ZLX4=; b=E8cKc4r3tOmQoj/kF2EMNRdFpZN+4vXqAoT9tFo+NviRowgBgDG3cGdDK48Qxa8YNe oGZ7W36RgwCOfscNRL/h5fFAc+fZVWlKVzmCM6F7pzTvjTVj5yJmAQAEtH6UAh6l82lu VveeVwqSgA781SYLeN3Blm0e35gTVfRI0ZLdnu2tqneZ6FX2px56DN22XGLSmiex4fqP b7/IwAxWwk9tF0WLg5DTYh7T13oVy5f2mXiuRr8qx8JBafzXi+S9VFxc5NyIUlWH4UVg y74z7JmkWlDrV8Q9NFZoZCkyUsKuvxdIp445092+XMKOktS6grD15PMmAKW5JpWfqpHj 2MBg== X-Gm-Message-State: ALoCoQmBPd345kOvUoOa6kMf2wPEhBuE45xkKT+WKXPtsd52/Z8vtVErUMq1k8x8+p3ojj4HpqIX X-Received: by 10.180.97.195 with SMTP id ec3mr97098463wib.79.1417544910676; Tue, 02 Dec 2014 10:28:30 -0800 (PST) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id dm10sm47446829wib.18.2014.12.02.10.28.29 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Dec 2014 10:28:30 -0800 (PST) From: Eric Auger To: eric.auger@st.com, christoffer.dall@linaro.org, qemu-devel@nongnu.org, a.rigo@virtualopensystems.com, marc.zyngier@arm.com, ard.biesheuvel@linaro.org, agraf@suse.de, peter.maydell@linaro.org, pbonzini@redhat.com, afaerber@suse.de Date: Tue, 2 Dec 2014 18:28:14 +0000 Message-Id: <1417544894-2000-3-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1417544894-2000-1-git-send-email-eric.auger@linaro.org> References: <1417544894-2000-1-git-send-email-eric.auger@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.54 Cc: a.motakis@virtualopensystems.com, alex.williamson@redhat.com, patches@linaro.org, kvmarm@lists.cs.columbia.edu, eric.auger@linaro.org Subject: [Qemu-devel] [PATCH 2/2] hw/intc/arm_gic: Initialize the vgic on machine init done 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 With current implementation the vgic is instantiated very late, when the VM is started, on the first VCPU run execution. This patch forces its initialization in a machine init done notifier. This latter is registered in the vgic realize function. The notifier uses a new group/attribute that allows such operation. In practice, vgic initialization can be done as soon as those dimensioning parameters are known: - the number of IRQs, - the number of vcpus - start address of dist and CPU interface (set in a memory listener). This earlier initialization allows, for example, to setup VFIO signaling after vgic initialization, on a reset notifier. Signed-off-by: Eric Auger --- hw/intc/arm_gic_kvm.c | 21 +++++++++++++++++++++ include/hw/intc/arm_gic_common.h | 1 + 2 files changed, 22 insertions(+) diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c index 5038885..24fdf98 100644 --- a/hw/intc/arm_gic_kvm.c +++ b/hw/intc/arm_gic_kvm.c @@ -23,6 +23,7 @@ #include "sysemu/kvm.h" #include "kvm_arm.h" #include "gic_internal.h" +#include "sysemu/sysemu.h" //#define DEBUG_GIC_KVM @@ -511,6 +512,17 @@ static void kvm_arm_gic_reset(DeviceState *dev) kvm_arm_gic_put(s); } +static void kvm_arm_vgic_init_notify(Notifier *notifier, void *data) +{ + GICState *s = container_of(notifier, GICState, init_notifier); + struct kvm_device_attr attr = { + .group = KVM_DEV_ARM_VGIC_GRP_CTRL, + .attr = KVM_DEV_ARM_VGIC_CTRL_INIT}; + if (s->dev_fd >= 0) { + kvm_device_ioctl(s->dev_fd, KVM_SET_DEVICE_ATTR, &attr); + } +} + static void kvm_arm_gic_realize(DeviceState *dev, Error **errp) { int i; @@ -553,6 +565,15 @@ static void kvm_arm_gic_realize(DeviceState *dev, Error **errp) return; } + /* + * Register a notifier that will request the VGIC initialization. + * It will be executed after the notifier registered by + * kvm_arm_register_device whose role is to set dist and cpu interface + * base address. Also IRQ and VCPU number is known. + */ + s->init_notifier.notify = kvm_arm_vgic_init_notify; + qemu_add_machine_init_done_notifier(&s->init_notifier); + /* Distributor */ memory_region_init_reservation(&s->iomem, OBJECT(s), "kvm-gic_dist", 0x1000); diff --git a/include/hw/intc/arm_gic_common.h b/include/hw/intc/arm_gic_common.h index f6887ed..98653c9 100644 --- a/include/hw/intc/arm_gic_common.h +++ b/include/hw/intc/arm_gic_common.h @@ -105,6 +105,7 @@ typedef struct GICState { uint32_t num_irq; uint32_t revision; int dev_fd; /* kvm device fd if backed by kvm vgic support */ + Notifier init_notifier; /* notifier used to init the vgic */ } GICState; #define TYPE_ARM_GIC_COMMON "arm_gic_common"