Commit 5fdb4671 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging 



X86 queue, 2015-10-05

# gpg: Signature made Mon 05 Oct 2015 17:04:38 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/x86-pull-request:
  icc_bus: drop the unused files
  cpu/apic: drop icc bus/bridge
  x86: use new method to correct reset sequence
  apic: move APIC's MMIO region mapping into APIC
  Correctly re-init EFER state during INIT IPI
  target-i386: add ABM to Haswell* and Broadwell* CPU models
  target-i386: get/put MSR_TSC_AUX across reset and migration
  target-i386: Make check_hw_breakpoints static
  target-i386: Move breakpoint related functions to new file
  target-i386: Convert kvm_default_*features to property/value pairs
  vl: Add another sanity check to smp_parse() function
  cpu: Introduce X86CPUTopoInfo structure for argument simplification

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 006d5c74 dfeb8679

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_LPC_ICH9=y 
CONFIG_PCI_Q35=y

CONFIG_APIC=y

CONFIG_IOAPIC=y

CONFIG_ICC_BUS=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_XIO3130=y

default-configs/x86_64-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_LPC_ICH9=y 
CONFIG_PCI_Q35=y

CONFIG_APIC=y

CONFIG_IOAPIC=y

CONFIG_ICC_BUS=y

CONFIG_PVPANIC=y

CONFIG_MEM_HOTPLUG=y

CONFIG_XIO3130=y

hw/cpu/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -2,5 +2,4 @@ obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o 
obj-$(CONFIG_REALVIEW) += realview_mpcore.o

obj-$(CONFIG_A9MPCORE) += a9mpcore.o

obj-$(CONFIG_A15MPCORE) += a15mpcore.o

obj-$(CONFIG_ICC_BUS) += icc_bus.o

hw/cpu/icc_bus.c

deleted100644 → 0
+0 −118
Original line number Diff line number Diff line 
/* icc_bus.c

 * emulate x86 ICC (Interrupt Controller Communications) bus

 *

 * Copyright (c) 2013 Red Hat, Inc

 *

 * Authors:

 *     Igor Mammedov <imammedo@redhat.com>

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>

 */

#include "hw/cpu/icc_bus.h"

#include "hw/sysbus.h"



/* icc-bridge implementation */



static const TypeInfo icc_bus_info = {

    .name = TYPE_ICC_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(ICCBus),

};





/* icc-device implementation */



static void icc_device_realize(DeviceState *dev, Error **errp)

{

    ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(dev);



    /* convert to QOM */

    if (idc->realize) {

        idc->realize(dev, errp);

    }



}



static void icc_device_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    dc->realize = icc_device_realize;

    dc->bus_type = TYPE_ICC_BUS;

}



static const TypeInfo icc_device_info = {

    .name = TYPE_ICC_DEVICE,

    .parent = TYPE_DEVICE,

    .abstract = true,

    .instance_size = sizeof(ICCDevice),

    .class_size = sizeof(ICCDeviceClass),

    .class_init = icc_device_class_init,

};





/*  icc-bridge implementation */



typedef struct ICCBridgeState {

    /*< private >*/

    SysBusDevice parent_obj;

    /*< public >*/



    ICCBus icc_bus;

    MemoryRegion apic_container;

} ICCBridgeState;



#define ICC_BRIDGE(obj) OBJECT_CHECK(ICCBridgeState, (obj), TYPE_ICC_BRIDGE)



static void icc_bridge_init(Object *obj)

{

    ICCBridgeState *s = ICC_BRIDGE(obj);

    SysBusDevice *sb = SYS_BUS_DEVICE(obj);



    qbus_create_inplace(&s->icc_bus, sizeof(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, obj, "icc-apic-container",

                       APIC_SPACE_SIZE);

    sysbus_init_mmio(sb, &s->apic_container);

    s->icc_bus.apic_address_space = &s->apic_container;

}



static void icc_bridge_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);

}



static const TypeInfo icc_bridge_info = {

    .name  = TYPE_ICC_BRIDGE,

    .parent = TYPE_SYS_BUS_DEVICE,

    .instance_init  = icc_bridge_init,

    .instance_size  = sizeof(ICCBridgeState),

    .class_init = icc_bridge_class_init,

};





static void icc_bus_register_types(void)

{

    type_register_static(&icc_bus_info);

    type_register_static(&icc_device_info);

    type_register_static(&icc_bridge_info);

}



type_init(icc_bus_register_types)

hw/i386/pc.c

+27 −25
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ 
#include "qemu/error-report.h"

#include "hw/acpi/acpi.h"

#include "hw/acpi/cpu_hotplug.h"

#include "hw/cpu/icc_bus.h"

#include "hw/boards.h"

#include "hw/pci/pci_host.h"

#include "acpi-build.h"
@@ -1052,23 +1051,16 @@ void pc_acpi_smi_interrupt(void *opaque, int irq, int level) 
}



static X86CPU *pc_new_cpu(const char *cpu_model, int64_t apic_id,

                          DeviceState *icc_bridge, Error **errp)

                          Error **errp)

{

    X86CPU *cpu = NULL;

    Error *local_err = NULL;



    if (icc_bridge == NULL) {

        error_setg(&local_err, "Invalid icc-bridge value");

        goto out;

    }



    cpu = cpu_x86_create(cpu_model, &local_err);

    if (local_err != NULL) {

        goto out;

    }



    qdev_set_parent_bus(DEVICE(cpu), qdev_get_child_bus(icc_bridge, "icc"));



    object_property_set_int(OBJECT(cpu), apic_id, "apic-id", &local_err);

    object_property_set_bool(OBJECT(cpu), true, "realized", &local_err);
@@ -1085,7 +1077,6 @@ static const char *current_cpu_model; 


void pc_hot_add_cpu(const int64_t id, Error **errp)

{

    DeviceState *icc_bridge;

    X86CPU *cpu;

    int64_t apic_id = x86_cpu_apic_id_from_index(id);

    Error *local_err = NULL;
@@ -1114,9 +1105,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp) 
        return;

    }



    icc_bridge = DEVICE(object_resolve_path_type("icc-bridge",

                                                 TYPE_ICC_BRIDGE, NULL));

    cpu = pc_new_cpu(current_cpu_model, apic_id, icc_bridge, &local_err);

    cpu = pc_new_cpu(current_cpu_model, apic_id, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;
@@ -1124,7 +1113,7 @@ void pc_hot_add_cpu(const int64_t id, Error **errp) 
    object_unref(OBJECT(cpu));

}



void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge)

void pc_cpus_init(const char *cpu_model)

{

    int i;

    X86CPU *cpu = NULL;
@@ -1150,7 +1139,7 @@ void pc_cpus_init(const char *cpu_model, DeviceState *icc_bridge) 


    for (i = 0; i < smp_cpus; i++) {

        cpu = pc_new_cpu(cpu_model, x86_cpu_apic_id_from_index(i),

                         icc_bridge, &error);

                         &error);

        if (error) {

            error_report_err(error);

            exit(1);
@@ -1158,13 +1147,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]);

}
@@ -1933,12 +1915,31 @@ static void pc_machine_initfn(Object *obj) 
                             NULL, &error_abort);

}



static void pc_machine_reset(void)

{

    CPUState *cs;

    X86CPU *cpu;



    qemu_devices_reset();



    /* Reset APIC after devices have been reset to cancel

     * any changes that qemu_devices_reset() might have done.

     */

    CPU_FOREACH(cs) {

        cpu = X86_CPU(cs);



        if (cpu->apic_state) {

            device_reset(cpu->apic_state);

        }

    }

}



static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index)

{

    unsigned pkg_id, core_id, smt_id;

    X86CPUTopoInfo topo;

    x86_topo_ids_from_idx(smp_cores, smp_threads, cpu_index,

                          &pkg_id, &core_id, &smt_id);

    return pkg_id;

                          &topo);

    return topo.pkg_id;

}



static void pc_machine_class_init(ObjectClass *oc, void *data)
@@ -1954,6 +1955,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    mc->default_boot_order = "cad";

    mc->hot_add_cpu = pc_hot_add_cpu;

    mc->max_cpus = 255;

    mc->reset = pc_machine_reset;

    hc->plug = pc_machine_device_plug_cb;

    hc->unplug_request = pc_machine_device_unplug_request_cb;

    hc->unplug = pc_machine_device_unplug_cb;