Commit f0513d2c authored by Igor Mammedov's avatar Igor Mammedov Committed by Andreas Färber
Browse files

target-i386: Introduce ICC bus/device/bridge 



Provides a hotpluggable bus for APIC and CPU.

* icc-bridge will serve as a parent for icc-bus and provide
  mmio mapping services to child icc-devices.
* icc-device will replace SysBusDevice as a parent of APIC
  and IOAPIC devices.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent c72bf468

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -644,6 +644,12 @@ F: qom/cpu.c 
F: include/qemu/cpu.h

F: target-i386/cpu.c



ICC Bus

M: Igor Mammedov <imammedo@redhat.com>

S: Supported

F: include/hw/cpu/icc_bus.h

F: hw/cpu/icc_bus.c



Device Tree

M: Peter Crosthwaite <peter.crosthwaite@petalogix.com>

M: Alexander Graf <agraf@suse.de>

default-configs/i386-softmmu.mak

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

CONFIG_APIC=y

CONFIG_IOAPIC=y

CONFIG_ICC_BUS=y

CONFIG_PVPANIC=y

default-configs/x86_64-softmmu.mak

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

CONFIG_APIC=y

CONFIG_IOAPIC=y

CONFIG_ICC_BUS=y

CONFIG_PVPANIC=y

hw/cpu/Makefile.objs

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o

obj-$(CONFIG_ARM9MPCORE) += a9mpcore.o

obj-$(CONFIG_ARM15MPCORE) += a15mpcore.o

obj-$(CONFIG_ICC_BUS) += icc_bus.o

hw/cpu/icc_bus.c

0 → 100644
+109 −0
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 void icc_bus_init(Object *obj)

{

    BusState *b = BUS(obj);



    b->allow_hotplug = true;

}



static const TypeInfo icc_bus_info = {

    .name = TYPE_ICC_BUS,

    .parent = TYPE_BUS,

    .instance_size = sizeof(ICCBus),

    .instance_init = icc_bus_init,

};





/* icc-device implementation */



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

{

    ICCDevice *id = ICC_DEVICE(dev);

    ICCDeviceClass *idc = ICC_DEVICE_GET_CLASS(id);



    if (idc->init) {

        if (idc->init(id) < 0) {

            error_setg(errp, "%s initialization failed.",

                       object_get_typename(OBJECT(dev)));

        }

    }

}



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;

} ICCBridgeState;



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



static void icc_bridge_init(Object *obj)

{

    ICCBridgeState *s = ICC_BRIGDE(obj);



    qbus_create_inplace(&s->icc_bus, TYPE_ICC_BUS, DEVICE(s), "icc");

}



static const TypeInfo icc_bridge_info = {

    .name  = TYPE_ICC_BRIDGE,

    .parent = TYPE_SYS_BUS_DEVICE,

    .instance_init  = icc_bridge_init,

    .instance_size  = sizeof(ICCBridgeState),

};





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)