From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44684) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyOes-0007EG-Bd for qemu-devel@nongnu.org; Fri, 29 May 2015 14:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YyOeq-000711-RJ for qemu-devel@nongnu.org; Fri, 29 May 2015 14:05:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41572) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YyOeq-000708-Jx for qemu-devel@nongnu.org; Fri, 29 May 2015 14:05:24 -0400 From: Eduardo Habkost Date: Fri, 29 May 2015 15:04:21 -0300 Message-Id: <1432922664-15129-3-git-send-email-ehabkost@redhat.com> In-Reply-To: <1432922664-15129-1-git-send-email-ehabkost@redhat.com> References: <1432922664-15129-1-git-send-email-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 2/5] apic: map APIC's MMIO region at each CPU's address space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Peter Maydell Cc: Chen Fan , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Richard Henderson From: Chen Fan Replace mapping APIC at global system address space with mapping it at per-CPU address spaces. Signed-off-by: Chen Fan Signed-off-by: Zhu Guihua Reviewed-by: Igor Mammedov Acked-by: Andreas F=C3=A4rber Signed-off-by: Eduardo Habkost --- exec.c | 5 +++++ hw/i386/pc.c | 7 ------- hw/intc/apic_common.c | 14 ++++++++------ include/exec/memory.h | 5 +++++ target-i386/cpu.c | 2 ++ 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/exec.c b/exec.c index e19ab22..71c02ed 100644 --- a/exec.c +++ b/exec.c @@ -2712,6 +2712,11 @@ void address_space_unmap(AddressSpace *as, void *b= uffer, hwaddr len, cpu_notify_map_clients(); } =20 +MemoryRegion *address_space_root_memory_region(AddressSpace *as) +{ + return as->root; +} + void *cpu_physical_memory_map(hwaddr addr, hwaddr *plen, int is_write) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 45028ea..185e748 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1096,13 +1096,6 @@ void pc_cpus_init(const char *cpu_model, DeviceSta= te *icc_bridge) object_unref(OBJECT(cpu)); } =20 - /* map APIC MMIO area if CPU has APIC */ - if (cpu && cpu->apic_state) { - /* XXX: what if the base changes? */ - sysbus_mmio_map_overlap(SYS_BUS_DEVICE(icc_bridge), 0, - APIC_DEFAULT_ADDRESS, 0x1000); - } - /* tell smbios about cpuid version and features */ smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_ED= X]); } diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index d595d63..f251787 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -296,7 +296,8 @@ static void apic_common_realize(DeviceState *dev, Err= or **errp) APICCommonClass *info; static DeviceState *vapic; static int apic_no; - static bool mmio_registered; + CPUState *cpu =3D CPU(s->cpu); + MemoryRegion *root; =20 if (apic_no >=3D MAX_APICS) { error_setg(errp, "%s initialization failed.", @@ -307,11 +308,12 @@ static void apic_common_realize(DeviceState *dev, E= rror **errp) =20 info =3D APIC_COMMON_GET_CLASS(s); info->realize(dev, errp); - if (!mmio_registered) { - ICCBus *b =3D ICC_BUS(qdev_get_parent_bus(dev)); - memory_region_add_subregion(b->apic_address_space, 0, &s->io_mem= ory); - mmio_registered =3D true; - } + + root =3D address_space_root_memory_region(cpu->as); + memory_region_add_subregion_overlap(root, + s->apicbase & MSR_IA32_APICBASE_= BASE, + &s->io_memory, + 0x1000); =20 /* Note: We need at least 1M to map the VAPIC option ROM */ if (!vapic && s->vapic_control & VAPIC_ENABLE_MASK && diff --git a/include/exec/memory.h b/include/exec/memory.h index b61c84f..a16650f 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -1295,6 +1295,11 @@ void *address_space_map(AddressSpace *as, hwaddr a= ddr, void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len, int is_write, hwaddr access_len); =20 +/* address_space_root_memory_region: get root memory region + * + * @as: #AddressSpace to be accessed + */ +MemoryRegion *address_space_root_memory_region(AddressSpace *as); =20 #endif =20 diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 3305e09..f83e526 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -2740,6 +2740,8 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error = **errp) /* TODO: convert to link<> */ apic =3D APIC_COMMON(cpu->apic_state); apic->cpu =3D cpu; + cpu_set_apic_base(cpu->apic_state, + APIC_DEFAULT_ADDRESS | MSR_IA32_APICBASE_ENABLE); } =20 static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp) --=20 2.1.0