From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWr4Q-000632-Jx for qemu-devel@nongnu.org; Mon, 29 Apr 2013 12:36:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UWr4O-0004at-Dv for qemu-devel@nongnu.org; Mon, 29 Apr 2013 12:36:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:4018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UWr4O-0004aa-66 for qemu-devel@nongnu.org; Mon, 29 Apr 2013 12:36:52 -0400 Date: Mon, 29 Apr 2013 18:36:08 +0200 From: Igor Mammedov Message-ID: <20130429183608.625e49b7@thinkpad> In-Reply-To: <1367247776-7695-4-git-send-email-imammedo@redhat.com> References: <1367247776-7695-1-git-send-email-imammedo@redhat.com> <1367247776-7695-4-git-send-email-imammedo@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 3/7] target-i386: Move APIC to ICC bus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov Cc: aliguori@us.ibm.com, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, claudio.fontana@huawei.com, qemu-devel@nongnu.org, 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 On Mon, 29 Apr 2013 17:02:52 +0200 Igor Mammedov wrote: > It allows APIC to be hotplugged. >=20 > * map APIC's mmio at board level if it is present > * do not register mmio region for each APIC, since > only one is used/mapped >=20 > Signed-off-by: Igor Mammedov > Signed-off-by: Andreas F=E4rber > --- > v2: > - use icc-bridge from args instead of resolving it > --- > hw/cpu/icc_bus.c | 10 ++++++++++ > hw/i386/pc.c | 12 ++++++++++-- > hw/intc/apic_common.c | 18 ++++++++++++------ > include/hw/cpu/icc_bus.h | 3 +++ > include/hw/i386/apic_internal.h | 6 +++--- > target-i386/cpu.c | 16 +++------------- > 6 files changed, 41 insertions(+), 24 deletions(-) >=20 > diff --git a/hw/cpu/icc_bus.c b/hw/cpu/icc_bus.c > index 3ac8eeb..73a1dc9 100644 > --- a/hw/cpu/icc_bus.c > +++ b/hw/cpu/icc_bus.c > @@ -80,6 +80,7 @@ typedef struct ICCBridgeState { > /*< public >*/ > =20 > ICCBus icc_bus; > + MemoryRegion apic_container; > } ICCBridgeState; > =20 > #define ICC_BRIGDE(obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRI= DGE) > @@ -87,8 +88,17 @@ typedef struct ICCBridgeState { > static void icc_bridge_init(Object *obj) > { > ICCBridgeState *s =3D ICC_BRIGDE(obj); > + SysBusDevice *sb =3D SYS_BUS_DEVICE(obj); > =20 > qbus_create_inplace(&s->icc_bus, TYPE_ICC_BUS, DEVICE(s), "icc"); > + > + /* Do not change order of registering regions, > + * APIC must be first registered region, board maps it by 0 index > + */ > + memory_region_init(&s->apic_container, "icc-apic-container", > + APIC_SPACE_SIZE); > + sysbus_init_mmio(sb, &s->apic_container); > + s->icc_bus.apic_address_space =3D &s->apic_container; > } > =20 > static const TypeInfo icc_bridge_info =3D { > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 658ff6c..ce9357e 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -53,6 +53,7 @@ > #include "qemu/bitmap.h" > #include "qemu/config-file.h" > #include "hw/acpi/acpi.h" > +#include "hw/cpu/icc_bus.h" > =20 > /* debug PC/ISA interrupts */ > //#define DEBUG_IRQ > @@ -917,6 +918,7 @@ static X86CPU *pc_new_cpu(const char *cpu_model, int6= 4_t apic_id, > void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) > { > int i; > + X86CPU *cpu =3D NULL; > Error *error =3D NULL; > =20 > /* init CPUs */ > @@ -929,14 +931,20 @@ void pc_cpus_init(const char *cpu_model, DeviceStat= e *icc_bridge) > } > =20 > for (i =3D 0; i < smp_cpus; i++) { > - pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), > - icc_bridge, &error); > + cpu =3D pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i), > + icc_bridge, &error); > if (error) { > fprintf(stderr, "%s\n", error_get_pretty(error)); > error_free(error); > exit(1); > } > } > + > + /* map APIC MMIO area if CPU has APIC */ > + if (cpu && cpu->env.apic_state) { > + /* XXX: what if the base changes? */ > + sysbus_mmio_map_overlap(icc_bridge, 0, APIC_DEFAULT_ADDRESS, 0x1= 000); > + } hunk that makes icc_bridge SysBusDevice escaped into next patch, sorry. I'll resend it. --=20 Regards, Igor