Commit 8d42d2d3 authored by Chen Fan's avatar Chen Fan Committed by Eduardo Habkost
Browse files

apic: move APIC's MMIO region mapping into APIC 



When ICC bus/bridge is removed, APIC MMIO will be left
unmapped since it was mapped into system's address space
indirectly by ICC bridge.
Fix it by moving mapping into APIC code, so it would be
possible to remove ICC bus/bridge code later.

Signed-off-by: default avatarChen Fan <chen.fan.fnst@cn.fujitsu.com>
Signed-off-by: default avatarZhu Guihua <zhugh.fnst@cn.fujitsu.com>
Reviewed-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 2188cc52

hw/i386/pc.c

+0 −7
Original line number Diff line number Diff line
@@ -1158,13 +1158,6 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) 
        object_unref(OBJECT(cpu));

    }



    /* 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_EDX]);

}

hw/intc/apic_common.c

+0 −6
Original line number Diff line number Diff line
@@ -296,7 +296,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) 
    APICCommonClass *info;

    static DeviceState *vapic;

    static int apic_no;

    static bool mmio_registered;



    if (apic_no >= MAX_APICS) {

        error_setg(errp, "%s initialization failed.",
@@ -307,11 +306,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) 


    info = APIC_COMMON_GET_CLASS(s);

    info->realize(dev, errp);

    if (!mmio_registered) {

        ICCBus *b = ICC_BUS(qdev_get_parent_bus(dev));

        memory_region_add_subregion(b->apic_address_space, 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 &&

target-i386/cpu.c

+15 −0
Original line number Diff line number Diff line
@@ -2758,15 +2758,30 @@ static void x86_cpu_apic_create(X86CPU *cpu, Error **errp) 
    /* TODO: convert to link<> */

    apic = APIC_COMMON(cpu->apic_state);

    apic->cpu = cpu;

    apic->apicbase = APIC_DEFAULT_ADDRESS | MSR_IA32_APICBASE_ENABLE;

}



static void x86_cpu_apic_realize(X86CPU *cpu, Error **errp)

{

    APICCommonState *apic;

    static bool apic_mmio_map_once;



    if (cpu->apic_state == NULL) {

        return;

    }

    object_property_set_bool(OBJECT(cpu->apic_state), true, "realized",

                             errp);



    /* Map APIC MMIO area */

    apic = APIC_COMMON(cpu->apic_state);

    if (!apic_mmio_map_once) {

        memory_region_add_subregion_overlap(get_system_memory(),

                                            apic->apicbase &

                                            MSR_IA32_APICBASE_BASE,

                                            &apic->io_memory,

                                            0x1000);

        apic_mmio_map_once = true;

     }

}



static void x86_cpu_machine_done(Notifier *n, void *unused)