Skip to content

Commit

Permalink
hw/isa/piix: Share PIIX3's base class with PIIX4
Browse files Browse the repository at this point in the history 
Having a common base class will allow for futher code sharing between PIIX3 and
PIIX4. Moreover, it makes PIIX4 implement the acpi-dev-aml-interface.

Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20231007123843.127151-24-shentey@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
  • Loading branch information
@shentok @mstsirkin
shentok authored and mstsirkin committed Oct 22, 2023
1 parent f97479c commit 7d6f265
Showing 1 changed file with 30 additions and 55 deletions.
85 changes: 30 additions & 55 deletions hw/isa/piix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,6 @@
#include "migration/vmstate.h"
#include "hw/acpi/acpi_aml_interface.h"

typedef struct PIIXState PIIX4State;

DECLARE_INSTANCE_CHECKER(PIIX4State, PIIX4_PCI_DEVICE, TYPE_PIIX4_PCI_DEVICE)

static void piix3_set_irq_pic(PIIXState *piix3, int pic_irq)
{
qemu_set_irq(piix3->isa_irqs_in[pic_irq],
Expand Down Expand Up @@ -88,7 +84,7 @@ static void piix3_set_irq(void *opaque, int pirq, int level)
static void piix4_set_irq(void *opaque, int irq_num, int level)
{
int i, pic_irq, pic_level;
PIIX4State *s = opaque;
PIIXState *s = opaque;
PCIBus *bus = pci_get_bus(&s->dev);

/* now we change the pic irq level according to the piix irq mappings */
Expand All @@ -108,7 +104,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level)

static void piix_request_i8259_irq(void *opaque, int irq, int level)
{
PIIX4State *s = opaque;
PIIXState *s = opaque;
qemu_set_irq(s->cpu_intr, level);
}

Expand Down Expand Up @@ -156,8 +152,9 @@ static void piix3_write_config(PCIDevice *dev,
}
}

static void piix_reset(PIIXState *d)
static void piix_reset(DeviceState *dev)
{
PIIXState *d = PIIX_PCI_DEVICE(dev);
uint8_t *pci_conf = d->dev.config;

pci_conf[0x04] = 0x07; /* master, memory and I/O */
Expand Down Expand Up @@ -196,13 +193,6 @@ static void piix_reset(PIIXState *d)
d->rcr = 0;
}

static void piix3_reset(DeviceState *dev)
{
PIIXState *d = PIIX_PCI_DEVICE(dev);

piix_reset(d);
}

static int piix3_post_load(void *opaque, int version_id)
{
PIIXState *piix3 = opaque;
Expand All @@ -227,7 +217,7 @@ static int piix3_post_load(void *opaque, int version_id)

static int piix4_post_load(void *opaque, int version_id)
{
PIIX4State *s = opaque;
PIIXState *s = opaque;

if (version_id == 2) {
s->rcr = 0;
Expand Down Expand Up @@ -291,8 +281,8 @@ static const VMStateDescription vmstate_piix4 = {
.minimum_version_id = 2,
.post_load = piix4_post_load,
.fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, PIIX4State),
VMSTATE_UINT8_V(rcr, PIIX4State, 3),
VMSTATE_PCI_DEVICE(dev, PIIXState),
VMSTATE_UINT8_V(rcr, PIIXState, 3),
VMSTATE_END_OF_LIST()
}
};
Expand Down Expand Up @@ -426,15 +416,14 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
qbus_build_aml(bus, scope);
}

static void pci_piix3_init(Object *obj)
static void pci_piix_init(Object *obj)
{
PIIXState *d = PIIX_PCI_DEVICE(obj);

qdev_init_gpio_out_named(DEVICE(obj), d->isa_irqs_in, "isa-irqs",
ISA_NUM_IRQS);

object_initialize_child(obj, "rtc", &d->rtc, TYPE_MC146818_RTC);
object_initialize_child(obj, "ide", &d->ide, TYPE_PIIX3_IDE);
}

static Property pci_piix3_props[] = {
Expand All @@ -447,37 +436,32 @@ static Property pci_piix3_props[] = {
DEFINE_PROP_END_OF_LIST(),
};

static void pci_piix3_class_init(ObjectClass *klass, void *data)
static void pci_piix_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
AcpiDevAmlIfClass *adevc = ACPI_DEV_AML_IF_CLASS(klass);

k->config_write = piix3_write_config;
dc->reset = piix3_reset;
dc->reset = piix_reset;
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix3;
dc->hotpluggable = false;
k->vendor_id = PCI_VENDOR_ID_INTEL;
/* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */
k->device_id = PCI_DEVICE_ID_INTEL_82371SB_0;
k->class_id = PCI_CLASS_BRIDGE_ISA;
/*
* Reason: part of PIIX3 southbridge, needs to be wired up by
* Reason: part of PIIX southbridge, needs to be wired up by e.g.
* pc_piix.c's pc_init1()
*/
dc->user_creatable = false;
device_class_set_props(dc, pci_piix3_props);
adevc->build_dev_aml = build_pci_isa_aml;
}

static const TypeInfo piix_pci_type_info = {
.name = TYPE_PIIX_PCI_DEVICE,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PIIXState),
.instance_init = pci_piix3_init,
.instance_init = pci_piix_init,
.abstract = true,
.class_init = pci_piix3_class_init,
.class_init = pci_piix_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
{ TYPE_ACPI_DEV_AML_IF },
Expand All @@ -500,22 +484,36 @@ static void piix3_realize(PCIDevice *dev, Error **errp)
pci_bus_set_route_irq_fn(pci_bus, piix3_route_intx_pin_to_irq);
}

static void piix3_init(Object *obj)
{
PIIXState *d = PIIX_PCI_DEVICE(obj);

object_initialize_child(obj, "ide", &d->ide, TYPE_PIIX3_IDE);
}

static void piix3_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);

k->config_write = piix3_write_config;
k->realize = piix3_realize;
/* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */
k->device_id = PCI_DEVICE_ID_INTEL_82371SB_0;
dc->vmsd = &vmstate_piix3;
device_class_set_props(dc, pci_piix3_props);
}

static const TypeInfo piix3_info = {
.name = TYPE_PIIX3_DEVICE,
.parent = TYPE_PIIX_PCI_DEVICE,
.instance_init = piix3_init,
.class_init = piix3_class_init,
};

static void piix4_realize(PCIDevice *dev, Error **errp)
{
PIIX4State *s = PIIX4_PCI_DEVICE(dev);
PIIXState *s = PIIX_PCI_DEVICE(dev);
PCIBus *pci_bus = pci_get_bus(dev);
ISABus *isa_bus;
qemu_irq *i8259_out_irq;
Expand Down Expand Up @@ -584,18 +582,10 @@ static void piix4_realize(PCIDevice *dev, Error **errp)
pci_bus_irqs(pci_bus, piix4_set_irq, s, PIIX_NUM_PIRQS);
}

static void piix4_isa_reset(DeviceState *dev)
{
PIIX4State *s = PIIX4_PCI_DEVICE(dev);

piix_reset(s);
}

static void piix4_init(Object *obj)
{
PIIX4State *s = PIIX4_PCI_DEVICE(obj);
PIIXState *s = PIIX_PCI_DEVICE(obj);

object_initialize_child(obj, "rtc", &s->rtc, TYPE_MC146818_RTC);
object_initialize_child(obj, "ide", &s->ide, TYPE_PIIX4_IDE);
object_initialize_child(obj, "uhci", &s->uhci, TYPE_PIIX4_USB_UHCI);

Expand All @@ -610,30 +600,15 @@ static void piix4_class_init(ObjectClass *klass, void *data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);

k->realize = piix4_realize;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82371AB_0;
k->class_id = PCI_CLASS_BRIDGE_ISA;
dc->reset = piix4_isa_reset;
dc->desc = "ISA bridge";
dc->vmsd = &vmstate_piix4;
/*
* Reason: part of PIIX4 southbridge, needs to be wired up,
* e.g. by mips_malta_init()
*/
dc->user_creatable = false;
dc->hotpluggable = false;
}

static const TypeInfo piix4_info = {
.name = TYPE_PIIX4_PCI_DEVICE,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PIIX4State),
.parent = TYPE_PIIX_PCI_DEVICE,
.instance_init = piix4_init,
.class_init = piix4_class_init,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
{ },
},
};

static void piix3_register_types(void)
Expand Down

0 comments on commit 7d6f265

Please sign in to comment.