Skip to content

Commit

Permalink
vt82c686: Make vt82c686b-pm an abstract base class and add vt8231-pm …
Browse files Browse the repository at this point in the history 
…based on it

The vt82c686b-pm model can be shared between VT82C686B and VT8231. The
only difference between the two is the device id in what we emulate so
make an abstract via-pm model by renaming appropriately and add types
for vt82c686b-pm and vt8231-pm based on it.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <34969fc7be984fa070479bfb9f748993a0aef31b.1610223397.git.balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
  • Loading branch information
@zbalaton @philmd
zbalaton authored and philmd committed Feb 21, 2021
1 parent 084bf4b commit e1a6973
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 29 deletions.
84 changes: 56 additions & 28 deletions hw/isa/vt82c686.c
View file
Expand Up @@ -27,17 +27,18 @@
#include "exec/address-spaces.h"
#include "trace.h"

OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM)
#define TYPE_VIA_PM "via-pm"
OBJECT_DECLARE_SIMPLE_TYPE(ViaPMState, VIA_PM)

struct VT686PMState {
struct ViaPMState {
PCIDevice dev;
MemoryRegion io;
ACPIREGS ar;
APMState apm;
PMSMBus smb;
};

static void pm_io_space_update(VT686PMState *s)
static void pm_io_space_update(ViaPMState *s)
{
uint32_t pmbase = pci_get_long(s->dev.config + 0x48) & 0xff80UL;

Expand All @@ -47,7 +48,7 @@ static void pm_io_space_update(VT686PMState *s)
memory_region_transaction_commit();
}

static void smb_io_space_update(VT686PMState *s)
static void smb_io_space_update(ViaPMState *s)
{
uint32_t smbase = pci_get_long(s->dev.config + 0x90) & 0xfff0UL;

Expand All @@ -59,7 +60,7 @@ static void smb_io_space_update(VT686PMState *s)

static int vmstate_acpi_post_load(void *opaque, int version_id)
{
VT686PMState *s = opaque;
ViaPMState *s = opaque;

pm_io_space_update(s);
smb_io_space_update(s);
Expand All @@ -72,20 +73,20 @@ static const VMStateDescription vmstate_acpi = {
.minimum_version_id = 1,
.post_load = vmstate_acpi_post_load,
.fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(dev, VT686PMState),
VMSTATE_UINT16(ar.pm1.evt.sts, VT686PMState),
VMSTATE_UINT16(ar.pm1.evt.en, VT686PMState),
VMSTATE_UINT16(ar.pm1.cnt.cnt, VT686PMState),
VMSTATE_STRUCT(apm, VT686PMState, 0, vmstate_apm, APMState),
VMSTATE_TIMER_PTR(ar.tmr.timer, VT686PMState),
VMSTATE_INT64(ar.tmr.overflow_time, VT686PMState),
VMSTATE_PCI_DEVICE(dev, ViaPMState),
VMSTATE_UINT16(ar.pm1.evt.sts, ViaPMState),
VMSTATE_UINT16(ar.pm1.evt.en, ViaPMState),
VMSTATE_UINT16(ar.pm1.cnt.cnt, ViaPMState),
VMSTATE_STRUCT(apm, ViaPMState, 0, vmstate_apm, APMState),
VMSTATE_TIMER_PTR(ar.tmr.timer, ViaPMState),
VMSTATE_INT64(ar.tmr.overflow_time, ViaPMState),
VMSTATE_END_OF_LIST()
}
};

static void pm_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int len)
{
VT686PMState *s = VT82C686B_PM(d);
ViaPMState *s = VIA_PM(d);

trace_via_pm_write(addr, val, len);
pci_default_write_config(d, addr, val, len);
Expand Down Expand Up @@ -127,7 +128,7 @@ static const MemoryRegionOps pm_io_ops = {
},
};

static void pm_update_sci(VT686PMState *s)
static void pm_update_sci(ViaPMState *s)
{
int sci_level, pmsts;

Expand All @@ -145,13 +146,13 @@ static void pm_update_sci(VT686PMState *s)

static void pm_tmr_timer(ACPIREGS *ar)
{
VT686PMState *s = container_of(ar, VT686PMState, ar);
ViaPMState *s = container_of(ar, ViaPMState, ar);
pm_update_sci(s);
}

static void vt82c686b_pm_reset(DeviceState *d)
static void via_pm_reset(DeviceState *d)
{
VT686PMState *s = VT82C686B_PM(d);
ViaPMState *s = VIA_PM(d);

memset(s->dev.config + PCI_CONFIG_HEADER_SIZE, 0,
PCI_CONFIG_SPACE_SIZE - PCI_CONFIG_HEADER_SIZE);
Expand All @@ -164,9 +165,9 @@ static void vt82c686b_pm_reset(DeviceState *d)
smb_io_space_update(s);
}

static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)
static void via_pm_realize(PCIDevice *dev, Error **errp)
{
VT686PMState *s = VT82C686B_PM(dev);
ViaPMState *s = VIA_PM(dev);

pci_set_word(dev->config + PCI_STATUS, PCI_STATUS_FAST_BACK |
PCI_STATUS_DEVSEL_MEDIUM);
Expand All @@ -177,8 +178,7 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)

apm_init(dev, &s->apm, NULL, s);

memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s,
"vt82c686-pm", 128);
memory_region_init_io(&s->io, OBJECT(dev), &pm_io_ops, s, "via-pm", 128);
memory_region_add_subregion(pci_address_space_io(dev), 0, &s->io);
memory_region_set_enabled(&s->io, false);

Expand All @@ -187,35 +187,61 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)
acpi_pm1_cnt_init(&s->ar, &s->io, false, false, 2);
}

typedef struct via_pm_init_info {
uint16_t device_id;
} ViaPMInitInfo;

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

k->realize = vt82c686b_pm_realize;
k->realize = via_pm_realize;
k->config_write = pm_write_config;
k->vendor_id = PCI_VENDOR_ID_VIA;
k->device_id = PCI_DEVICE_ID_VIA_ACPI;
k->device_id = info->device_id;
k->class_id = PCI_CLASS_BRIDGE_OTHER;
k->revision = 0x40;
dc->reset = vt82c686b_pm_reset;
dc->desc = "PM";
dc->reset = via_pm_reset;
/* Reason: part of VIA south bridge, does not exist stand alone */
dc->user_creatable = false;
dc->vmsd = &vmstate_acpi;
}

static const TypeInfo via_pm_info = {
.name = TYPE_VT82C686B_PM,
.name = TYPE_VIA_PM,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(VT686PMState),
.class_init = via_pm_class_init,
.instance_size = sizeof(ViaPMState),
.abstract = true,
.interfaces = (InterfaceInfo[]) {
{ INTERFACE_CONVENTIONAL_PCI_DEVICE },
{ },
},
};

static const ViaPMInitInfo vt82c686b_pm_init_info = {
.device_id = PCI_DEVICE_ID_VIA_82C686B_PM,
};

static const TypeInfo vt82c686b_pm_info = {
.name = TYPE_VT82C686B_PM,
.parent = TYPE_VIA_PM,
.class_init = via_pm_class_init,
.class_data = (void *)&vt82c686b_pm_init_info,
};

static const ViaPMInitInfo vt8231_pm_init_info = {
.device_id = PCI_DEVICE_ID_VIA_8231_PM,
};

static const TypeInfo vt8231_pm_info = {
.name = TYPE_VT8231_PM,
.parent = TYPE_VIA_PM,
.class_init = via_pm_class_init,
.class_data = (void *)&vt8231_pm_init_info,
};


typedef struct SuperIOConfig {
uint8_t regs[0x100];
Expand Down Expand Up @@ -424,6 +450,8 @@ static const TypeInfo via_superio_info = {
static void vt82c686b_register_types(void)
{
type_register_static(&via_pm_info);
type_register_static(&vt82c686b_pm_info);
type_register_static(&vt8231_pm_info);
type_register_static(&via_info);
type_register_static(&via_superio_info);
}
Expand Down
1 change: 1 addition & 0 deletions include/hw/isa/vt82c686.h
View file
Expand Up @@ -4,6 +4,7 @@
#define TYPE_VT82C686B_ISA "vt82c686b-isa"
#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"
#define TYPE_VT82C686B_PM "vt82c686b-pm"
#define TYPE_VT8231_PM "vt8231-pm"
#define TYPE_VIA_AC97 "via-ac97"
#define TYPE_VIA_MC97 "via-mc97"

Expand Down
3 changes: 2 additions & 1 deletion include/hw/pci/pci_ids.h
View file
Expand Up @@ -207,9 +207,10 @@
#define PCI_DEVICE_ID_VIA_ISA_BRIDGE 0x0686
#define PCI_DEVICE_ID_VIA_IDE 0x0571
#define PCI_DEVICE_ID_VIA_UHCI 0x3038
#define PCI_DEVICE_ID_VIA_ACPI 0x3057
#define PCI_DEVICE_ID_VIA_82C686B_PM 0x3057
#define PCI_DEVICE_ID_VIA_AC97 0x3058
#define PCI_DEVICE_ID_VIA_MC97 0x3068
#define PCI_DEVICE_ID_VIA_8231_PM 0x8235

#define PCI_VENDOR_ID_MARVELL 0x11ab

Expand Down

0 comments on commit e1a6973

Please sign in to comment.