From patchwork Fri Apr 5 14:37:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 234182 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DF6752C00CF for ; Sat, 6 Apr 2013 02:43:21 +1100 (EST) Received: from localhost ([::1]:35394 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO7tu-0001x2-VR for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 10:45:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO7sO-0000Pt-A5 for qemu-devel@nongnu.org; Fri, 05 Apr 2013 10:44:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO7sI-0006E9-FC for qemu-devel@nongnu.org; Fri, 05 Apr 2013 10:44:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44319) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO7sI-0006Ca-7r for qemu-devel@nongnu.org; Fri, 05 Apr 2013 10:44:18 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r35EcmRM014699 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 5 Apr 2013 10:38:48 -0400 Received: from thinkpad.mammed.com (vpn-238-59.phx2.redhat.com [10.3.238.59]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r35EbKxO031798; Fri, 5 Apr 2013 10:38:44 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2013 16:37:12 +0200 Message-Id: <1365172636-28628-21-git-send-email-imammedo@redhat.com> In-Reply-To: <1365172636-28628-1-git-send-email-imammedo@redhat.com> References: <1365172636-28628-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, claudio.fontana@huawei.com, aderumier@odiso.com, lcapitulino@redhat.com, jfrei@linux.vnet.ibm.com, yang.z.zhang@intel.com, pbonzini@redhat.com, afaerber@suse.de, lig.fnst@cn.fujitsu.com, rth@twiddle.net Subject: [Qemu-devel] [PATCH 19/22] target-i386: move APIC to ICC bus 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 ... to allow it to be hotplugged * map APIC's mmio at board level if it is present Signed-off-by: Igor Mammedov --- hw/apic_common.c | 17 ++++++++++++----- hw/apic_internal.h | 6 +++--- hw/i386/kvmvapic.c | 1 + hw/i386/pc.c | 18 +++++++++++++++--- hw/icc_bus.c | 6 ++++++ hw/icc_bus.h | 2 +- target-i386/cpu.c | 16 +++------------- 7 files changed, 41 insertions(+), 25 deletions(-) diff --git a/hw/apic_common.c b/hw/apic_common.c index 3798509..b2e84e6 100644 --- a/hw/apic_common.c +++ b/hw/apic_common.c @@ -21,6 +21,8 @@ #include "hw/apic_internal.h" #include "trace.h" #include "sysemu/kvm.h" +#include "qdev.h" +#include "hw/sysbus.h" static int apic_irq_delivered; bool apic_report_tpr_access; @@ -282,12 +284,14 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) return 0; } -static int apic_init_common(SysBusDevice *dev) +static int apic_init_common(ICCDevice *dev) { APICCommonState *s = APIC_COMMON(dev); + DeviceState *d = DEVICE(dev); APICCommonClass *info; static DeviceState *vapic; static int apic_no; + static bool mmio_registered; if (apic_no >= MAX_APICS) { return -1; @@ -296,8 +300,11 @@ static int apic_init_common(SysBusDevice *dev) info = APIC_COMMON_GET_CLASS(s); info->init(s); - - sysbus_init_mmio(dev, &s->io_memory); + if (!mmio_registered) { + MemoryRegion *as = ICC_BUS(d->parent_bus)->apic_address_space; + memory_region_add_subregion(as, 0, &s->io_memory); + mmio_registered = true; + } /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && @@ -375,7 +382,7 @@ static Property apic_properties_common[] = { static void apic_common_class_init(ObjectClass *klass, void *data) { - SysBusDeviceClass *sc = SYS_BUS_DEVICE_CLASS(klass); + ICCDeviceClass *sc = ICC_DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass); dc->vmsd = &vmstate_apic_common; @@ -387,7 +394,7 @@ static void apic_common_class_init(ObjectClass *klass, void *data) static const TypeInfo apic_common_type = { .name = TYPE_APIC_COMMON, - .parent = TYPE_SYS_BUS_DEVICE, + .parent = TYPE_ICC_DEVICE, .instance_size = sizeof(APICCommonState), .class_size = sizeof(APICCommonClass), .class_init = apic_common_class_init, diff --git a/hw/apic_internal.h b/hw/apic_internal.h index aac6290..172fc91 100644 --- a/hw/apic_internal.h +++ b/hw/apic_internal.h @@ -21,7 +21,7 @@ #define QEMU_APIC_INTERNAL_H #include "exec/memory.h" -#include "hw/sysbus.h" +#include "hw/icc_bus.h" #include "qemu/timer.h" /* APIC Local Vector Table */ @@ -78,7 +78,7 @@ typedef struct APICCommonState APICCommonState; typedef struct APICCommonClass { - SysBusDeviceClass parent_class; + ICCDeviceClass parent_class; void (*init)(APICCommonState *s); void (*set_base)(APICCommonState *s, uint64_t val); @@ -92,7 +92,7 @@ typedef struct APICCommonClass } APICCommonClass; struct APICCommonState { - SysBusDevice busdev; + ICCDevice busdev; MemoryRegion io_memory; X86CPU *cpu; diff --git a/hw/i386/kvmvapic.c b/hw/i386/kvmvapic.c index c4be882..81e0a75 100644 --- a/hw/i386/kvmvapic.c +++ b/hw/i386/kvmvapic.c @@ -12,6 +12,7 @@ #include "sysemu/cpus.h" #include "sysemu/kvm.h" #include "hw/apic_internal.h" +#include "hw/sysbus.h" #define VAPIC_IO_PORT 0x7e diff --git a/hw/i386/pc.c b/hw/i386/pc.c index fbc0bcf..5c0dd4f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -869,13 +869,13 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) } } -static void pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp) +static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp) { X86CPU *cpu; cpu = cpu_x86_create(cpu_model, errp); if (!cpu) { - return; + return cpu; } object_property_set_int(OBJECT(cpu), apic_id, "apic-id", errp); @@ -884,14 +884,18 @@ static void pc_new_cpu(const char *cpu_model, int64_t apic_id, Error **errp) if (error_is_set(errp)) { if (cpu != NULL) { object_unref(OBJECT(cpu)); + cpu = NULL; } } + return cpu; } void pc_cpus_init(const char *cpu_model) { int i; + X86CPU *cpu; Error *error = NULL; + SysBusDevice *ib; /* init CPUs */ if (cpu_model == NULL) { @@ -902,14 +906,22 @@ void pc_cpus_init(const char *cpu_model) #endif } + ib = SYS_BUS_DEVICE(object_resolve_path_type("icc-bridge", + TYPE_ICC_BRIDGE, NULL)); + for (i = 0; i < smp_cpus; i++) { - pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), &error); + cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), &error); if (error) { fprintf(stderr, "%s\n", error_get_pretty(error)); error_free(error); exit(1); } } + + /* map APIC MMIO area if CPU has it */ + if (cpu->env.apic_state) { + sysbus_mmio_map_overlap(ib, 0, APIC_DEFAULT_ADDRESS, 0x1000); + } } void pc_acpi_init(const char *default_dsdt) diff --git a/hw/icc_bus.c b/hw/icc_bus.c index fc8d892..bfe2a30 100644 --- a/hw/icc_bus.c +++ b/hw/icc_bus.c @@ -60,6 +60,7 @@ static const TypeInfo icc_device_info = { typedef struct ICCBridgeState { SysBusDevice busdev; MemoryRegion ioapic_container; + MemoryRegion apic_container; } ICCBridgeState; #define ICC_BRIGDE(obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE) @@ -92,6 +93,11 @@ static void icc_bridge_initfn(Object *obj) memory_region_init(&s->ioapic_container, "icc-ioapic-container", 0x1000); sysbus_init_mmio(sb, &s->ioapic_container); ibus->ioapic_address_space = &s->ioapic_container; + + memory_region_init(&s->apic_container, "icc-apic-container", + APIC_SPACE_SIZE); + sysbus_init_mmio(sb, &s->apic_container); + ibus->apic_address_space = &s->apic_container; } static const TypeInfo icc_bridge_info = { diff --git a/hw/icc_bus.h b/hw/icc_bus.h index b8e2032..a3d9e0a 100644 --- a/hw/icc_bus.h +++ b/hw/icc_bus.h @@ -28,6 +28,7 @@ typedef struct ICCBus { BusState qbus; MemoryRegion *ioapic_address_space; + MemoryRegion *apic_address_space; } ICCBus; #define ICC_BUS(obj) OBJECT_CHECK(ICCBus, (obj), TYPE_ICC_BUS) @@ -50,4 +51,3 @@ typedef struct ICCDeviceClass { #endif /* CONFIG_USER_ONLY */ #endif - diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 2b3c1f3..32f7aea 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -41,10 +41,10 @@ #endif #include "sysemu/sysemu.h" +#include "hw/qdev-properties.h" #include "hw/icc_bus.h" #ifndef CONFIG_USER_ONLY #include "hw/xen.h" -#include "hw/sysbus.h" #include "hw/apic_internal.h" #endif @@ -2104,6 +2104,7 @@ static void mce_init(X86CPU *cpu) static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) { CPUX86State *env = &cpu->env; + DeviceState *dev = DEVICE(cpu); APICCommonState *apic; const char *apic_type = "apic"; @@ -2113,7 +2114,7 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) apic_type = "xen-apic"; } - env->apic_state = qdev_try_create(NULL, apic_type); + env->apic_state = qdev_try_create(dev->parent_bus, apic_type); if (env->apic_state == NULL) { error_setg(errp, "APIC device '%s' could not be created", apic_type); return; @@ -2130,7 +2131,6 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) { CPUX86State *env = &cpu->env; - static int apic_mapped; if (env->apic_state == NULL) { return; @@ -2141,16 +2141,6 @@ static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) object_get_typename(OBJECT(env->apic_state))); return; } - - /* XXX: mapping more APICs at the same memory location */ - if (apic_mapped == 0) { - /* NOTE: the APIC is directly connected to the CPU - it is not - on the global memory bus. */ - /* XXX: what if the base changes? */ - sysbus_mmio_map_overlap(SYS_BUS_DEVICE(env->apic_state), 0, - APIC_DEFAULT_ADDRESS, 0x1000); - apic_mapped = 1; - } } #else static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp)