vt82c686b clean ups and vt8231 emulation - all in one
cover vt82c686b clean ups and vt8231 emulation - all in one
Hello,
This is an all in one series containing all the patches from my previous part I and part II vt82c686b clean up series plus the end of it to finally add vt8231 emulation that will be used by subsequent ppc/pegasos2 emulation. I consider this finished for now and good enough to get in also cleaning up and improving fuloong2e emulation a bit but previous disclaimer is still valid: It does not aim to fix all existing bugs or make the model perfectly emulate the real chip just reach the level where we can have working emulation to boot guests which can then be improved later. (E.g. I think state saving was broken before and it remains broken after because I don't know all the details how to add vmstate for all kinds of data structures and this could be addressed separately when fixing the already broken state saving if someone wants to test and fix it.) With this it boots at least MorphOS on pegasos2 and works with the pmon_2e.bin for fuloong2e which needs more fixes for Linux that are currently under review. More testing is welcome.
It still needs the Bonito BONITO_PCICONF_REG_MASK fix for fuloong2e because it no longer maps SMBus but due to the Bonito bug guest cannot write register 0xd2 to map it. With that fix pmon_2e.bin from here:
http://www.anheng.com.cn/loongson/pmon/ works for me with this
command: qemu-system-mips64el -M fuloong2e -net none -bios pmon_2e.bin
After rolling this for two years now I hope it can finally be merged and eventually also get pegasos2 emulation that will need this.
Regards,
BALATON Zoltan
BALATON Zoltan (24):
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
vt82c686: Remove unnecessary _DEVICE suffix from type macros
vt82c686b: Rename VT82C686B to VT82C686B_ISA
vt82c686: Remove vt82c686b_[am]c97_init() functions
vt82c686: Split off via-[am]c97 into separate file in hw/audio audio/via-ac97: Simplify code and set user_creatable to false
vt82c686: Remove legacy vt82c686b_isa_init() function
vt82c686: Remove legacy vt82c686b_pm_init() function
vt82c686: Convert debug printf to trace points
vt82c686: Remove unneeded includes and defines
vt82c686: Use shorter name for local variable holding object state
vt82c686: Rename superio config related parts
vt82c686: Move superio memory region to SuperIOConfig struct
vt82c686: Reorganise code
vt82c686: Fix SMBus IO base and configuration registers
vt82c686: Fix up power management io base and config
vt82c686: Make vt82c686b-pm an abstract base class and add vt8231-pm
based on it
vt82c686: Simplify vt82c686b_realize()
vt82c686: Move creation of ISA devices to the ISA bridge
vt82c686: Fix superio_cfg_{read,write}() functions
vt82c686: Implement control of serial port io ranges via config regs
vt82c686: QOM-ify superio related functionality
vt82c686: Add VT8231_SUPERIO based on VIA_SUPERIO
vt82c686: Add emulation of VT8231 south bridge
hw/audio/meson.build | 1 + hw/audio/via-ac97.c | 93 ++++ hw/isa/trace-events | 8 + hw/isa/vt82c686.c | 1000 ++++++++++++++++++++++++------------- hw/mips/fuloong2e.c | 38 +- include/hw/isa/vt82c686.h | 15 +- 6 files changed, 761 insertions(+), 394 deletions(-) create mode 100644 hw/audio/via-ac97.c
Signature · 1 line
2.21.3
PATCH 1/24 vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
These parts are common between VT82C686B and VT8231 so can be shared in the future. Rename them to VIA prefix accordingly.
--- hw/isa/vt82c686.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
hw/isa/vt82c686.c +14 -14
@@ -168,22 +168,22 @@ struct VT686PMState {uint32_t smb_io_base; }; -struct VT686AC97State { +struct VIAAC97State {PCIDevice dev; }; -struct VT686MC97State { +struct VIAMC97State {PCIDevice dev; };#define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE) -#define TYPE_VT82C686B_MC97_DEVICE "VT82C686B_MC97" -OBJECT_DECLARE_SIMPLE_TYPE(VT686MC97State, VT82C686B_MC97_DEVICE) +#define TYPE_VIA_MC97_DEVICE "VIA_MC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE) -#define TYPE_VT82C686B_AC97_DEVICE "VT82C686B_AC97" -OBJECT_DECLARE_SIMPLE_TYPE(VT686AC97State, VT82C686B_AC97_DEVICE) +#define TYPE_VIA_AC97_DEVICE "VIA_AC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE)static void pm_update_sci (VT686PMState *s) {
@@ -260,7 +260,7 @@ static const VMStateDescription vmstate_acpi = {static void vt82c686b_ac97_realize (PCIDevice *dev,Error **errp) { -VT686AC97State *s =VT82C686B_AC97_DEVICE (dev); +VIAAC97State *s =VIA_AC97_DEVICE (dev);uint8_t *pci_conf = s->dev.config; pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn) {PCIDevice *dev; - dev =pci_new (devfn,TYPE_VT82C686B_AC97_DEVICE ); + dev =pci_new (devfn,TYPE_VIA_AC97_DEVICE );pci_realize_and_unref (dev, bus, &error_fatal); }
@@ -293,9 +293,9 @@ static void via_ac97_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_ac97_info = { - .name =TYPE_VT82C686B_AC97_DEVICE , + .name =TYPE_VIA_AC97_DEVICE , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (VT686AC97State), + .instance_size =sizeof (VIAAC97State), .class_init = via_ac97_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE },
@@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info = {static void vt82c686b_mc97_realize (PCIDevice *dev,Error **errp) { -VT686MC97State *s =VT82C686B_MC97_DEVICE (dev); +VIAMC97State *s =VIA_MC97_DEVICE (dev);uint8_t *pci_conf = s->dev.config; pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn) {PCIDevice *dev; - dev =pci_new (devfn,TYPE_VT82C686B_MC97_DEVICE ); + dev =pci_new (devfn,TYPE_VIA_MC97_DEVICE );pci_realize_and_unref (dev, bus, &error_fatal); }
@@ -337,9 +337,9 @@ static void via_mc97_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_mc97_info = { - .name =TYPE_VT82C686B_MC97_DEVICE , + .name =TYPE_VIA_MC97_DEVICE , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (VT686MC97State), + .instance_size =sizeof (VIAMC97State), .class_init = via_mc97_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE },
Signature · 1 line
2.21.3
PATCH 2/24 vt82c686: Remove unnecessary _DEVICE suffix from type macros
In reply to BALATON Zoltan viaThere's no reason to suffix everything with _DEVICE when the names are already unique without it and shorter names are more readable.
--- hw/isa/vt82c686.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 23 insertions(+), 25 deletions(-)
hw/isa/vt82c686.c +23 -25
@@ -49,8 +49,8 @@ struct VT82C686BState {SuperIOConfig superio_conf; }; -#define TYPE_VT82C686B_DEVICE "VT82C686B" -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B_DEVICE) +#define TYPE_VT82C686B "VT82C686B" +OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B)static void superio_ioport_writeb (void *opaque,hwaddr addr,uint64_t data,unsigned size)
@@ -117,7 +117,7 @@ static const MemoryRegionOps superio_ops = {static void vt82c686b_isa_reset (DeviceState *dev) { -VT82C686BState *vt82c =VT82C686B_DEVICE (dev); +VT82C686BState *vt82c =VT82C686B (dev);uint8_t *pci_conf = vt82c->dev.config;pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 );
@@ -146,7 +146,7 @@ static void vt82c686b_isa_reset(DeviceState *dev)static void vt82c686b_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -VT82C686BState *vt686 =VT82C686B_DEVICE (d); +VT82C686BState *vt686 =VT82C686B (d);DPRINTF ("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n" , address, val, len);
@@ -176,14 +176,14 @@ struct VIAMC97State {PCIDevice dev; }; -#define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM" -OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE) +#define TYPE_VT82C686B_PM "VT82C686B_PM" +OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) -#define TYPE_VIA_MC97_DEVICE "VIA_MC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE) +#define TYPE_VIA_MC97 "VIA_MC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) -#define TYPE_VIA_AC97_DEVICE "VIA_AC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE) +#define TYPE_VIA_AC97 "VIA_AC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97)static void pm_update_sci (VT686PMState *s) {
@@ -260,7 +260,7 @@ static const VMStateDescription vmstate_acpi = {static void vt82c686b_ac97_realize (PCIDevice *dev,Error **errp) { -VIAAC97State *s =VIA_AC97_DEVICE (dev); +VIAAC97State *s =VIA_AC97 (dev);uint8_t *pci_conf = s->dev.config; pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn) {PCIDevice *dev; - dev =pci_new (devfn,TYPE_VIA_AC97_DEVICE ); + dev =pci_new (devfn,TYPE_VIA_AC97 );pci_realize_and_unref (dev, bus, &error_fatal); }
@@ -293,7 +293,7 @@ static void via_ac97_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_ac97_info = { - .name =TYPE_VIA_AC97_DEVICE , + .name =TYPE_VIA_AC97 , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (VIAAC97State), .class_init = via_ac97_class_init,
@@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info = {static void vt82c686b_mc97_realize (PCIDevice *dev,Error **errp) { -VIAMC97State *s =VIA_MC97_DEVICE (dev); +VIAMC97State *s =VIA_MC97 (dev);uint8_t *pci_conf = s->dev.config; pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE |
@@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn) {PCIDevice *dev; - dev =pci_new (devfn,TYPE_VIA_MC97_DEVICE ); + dev =pci_new (devfn,TYPE_VIA_MC97 );pci_realize_and_unref (dev, bus, &error_fatal); }
@@ -337,7 +337,7 @@ static void via_mc97_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_mc97_info = { - .name =TYPE_VIA_MC97_DEVICE , + .name =TYPE_VIA_MC97 , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (VIAMC97State), .class_init = via_mc97_class_init,
@@ -350,7 +350,7 @@ static const TypeInfo via_mc97_info = {/* vt82c686 pm init */ static void vt82c686b_pm_realize (PCIDevice *dev,Error **errp) { -VT686PMState *s =VT82C686B_PM_DEVICE (dev); +VT686PMState *s =VT82C686B_PM (dev);uint8_t *pci_conf; pci_conf = s->dev.config;
@@ -386,10 +386,10 @@ I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,PCIDevice *dev;VT686PMState *s; - dev =pci_new (devfn,TYPE_VT82C686B_PM_DEVICE ); + dev =pci_new (devfn,TYPE_VT82C686B_PM );qdev_prop_set_uint32 (&dev->qdev,"smb_io_base" , smb_io_base); - s =VT82C686B_PM_DEVICE (dev); + s =VT82C686B_PM (dev);pci_realize_and_unref (dev, bus, &error_fatal);
@@ -419,7 +419,7 @@ static void via_pm_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_pm_info = { - .name =TYPE_VT82C686B_PM_DEVICE , + .name =TYPE_VT82C686B_PM , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (VT686PMState), .class_init = via_pm_class_init,
@@ -442,7 +442,7 @@ static const VMStateDescription vmstate_via = {/* init the PCI-to-ISA bridge */ static void vt82c686b_realize (PCIDevice *d,Error **errp) { -VT82C686BState *vt82c =VT82C686B_DEVICE (d); +VT82C686BState *vt82c =VT82C686B (d);uint8_t *pci_conf;ISABus *isa_bus;uint8_t *wmask;
@@ -479,9 +479,7 @@ ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) {PCIDevice *d; - d =pci_create_simple_multifunction (bus, devfn, true, -TYPE_VT82C686B_DEVICE ); - + d =pci_create_simple_multifunction (bus, devfn, true,TYPE_VT82C686B );return ISA_BUS (qdev_get_child_bus (DEVICE (d),"isa.0" )); }
@@ -507,7 +505,7 @@ static void via_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_info = { - .name =TYPE_VT82C686B_DEVICE , + .name =TYPE_VT82C686B , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (VT82C686BState), .class_init = via_class_init,
Signature · 1 line
2.21.3
PATCH 3/24 vt82c686b: Rename VT82C686B to VT82C686B_ISA
In reply to BALATON Zoltan viaThis is really the ISA bridge part so name the type accordingly.
--- hw/isa/vt82c686.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
hw/isa/vt82c686.c +10 -10
@@ -43,14 +43,14 @@ typedef struct SuperIOConfig {uint8_t data; } SuperIOConfig; -struct VT82C686BState { +struct VT82C686BISAState {PCIDevice dev;MemoryRegion superio;SuperIOConfig superio_conf; }; -#define TYPE_VT82C686B "VT82C686B" -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B) +#define TYPE_VT82C686B_ISA "vt82c686b-isa" +OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)static void superio_ioport_writeb (void *opaque,hwaddr addr,uint64_t data,unsigned size)
@@ -117,7 +117,7 @@ static const MemoryRegionOps superio_ops = {static void vt82c686b_isa_reset (DeviceState *dev) { -VT82C686BState *vt82c =VT82C686B (dev); +VT82C686BISAState *vt82c =VT82C686B_ISA (dev);uint8_t *pci_conf = vt82c->dev.config;pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 );
@@ -146,7 +146,7 @@ static void vt82c686b_isa_reset(DeviceState *dev)static void vt82c686b_write_config (PCIDevice *d,uint32_t address,uint32_t val,int len) { -VT82C686BState *vt686 =VT82C686B (d); +VT82C686BISAState *vt686 =VT82C686B_ISA (d);DPRINTF ("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n" , address, val, len);
@@ -434,7 +434,7 @@ static const VMStateDescription vmstate_via = { .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField []) { -VMSTATE_PCI_DEVICE (dev, VT82C686BState), +VMSTATE_PCI_DEVICE (dev, VT82C686BISAState),VMSTATE_END_OF_LIST () } };
@@ -442,7 +442,7 @@ static const VMStateDescription vmstate_via = {/* init the PCI-to-ISA bridge */ static void vt82c686b_realize (PCIDevice *d,Error **errp) { -VT82C686BState *vt82c =VT82C686B (d); +VT82C686BISAState *vt82c =VT82C686B_ISA (d);uint8_t *pci_conf;ISABus *isa_bus;uint8_t *wmask;
@@ -479,7 +479,7 @@ ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) {PCIDevice *d; - d =pci_create_simple_multifunction (bus, devfn, true,TYPE_VT82C686B ); + d =pci_create_simple_multifunction (bus, devfn, true,TYPE_VT82C686B_ISA );return ISA_BUS (qdev_get_child_bus (DEVICE (d),"isa.0" )); }
@@ -505,9 +505,9 @@ static void via_class_init(ObjectClass *klass, void *data) }static const TypeInfo via_info = { - .name =TYPE_VT82C686B , + .name =TYPE_VT82C686B_ISA , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (VT82C686BState), + .instance_size =sizeof (VT82C686BISAState), .class_init = via_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE },
Signature · 1 line
2.21.3
PATCH 4/24 vt82c686: Remove vt82c686b_[am]c97_init() functions
In reply to BALATON Zoltan viaThese are legacy init functions that are just equivalent to directly calling pci_create_simple so do that instead. Also rename objects to lower case via-ac97 and via-mc97 matching naming of other devices.
--- hw/isa/vt82c686.c | 27 ++++----------------------- hw/mips/fuloong2e.c | 4 ++-- include/hw/isa/vt82c686.h | 4 ++-- 3 files changed, 8 insertions(+), 27 deletions(-)
hw/isa/vt82c686.c +4 -23
@@ -179,12 +179,6 @@ struct VIAMC97State {#define TYPE_VT82C686B_PM "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) -#define TYPE_VIA_MC97 "VIA_MC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) - -#define TYPE_VIA_AC97 "VIA_AC97" -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) -static void pm_update_sci (VT686PMState *s) {int sci_level, pmsts;
@@ -254,10 +248,13 @@ static const VMStateDescription vmstate_acpi = { };/* -* TODO: vt82c686b_ac97_init() and vt82c686b_mc97_init() +* TODO: VIA_AC97 and VIA_MC97 * just register a PCI device now, functionalities will be implemented later. */ +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) +static void vt82c686b_ac97_realize (PCIDevice *dev,Error **errp) {VIAAC97State *s =VIA_AC97 (dev);
@@ -270,14 +267,6 @@ static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp)pci_set_long (pci_conf +PCI_INTERRUPT_PIN ,0x03 ); } -void vt82c686b_ac97_init (PCIBus *bus,int devfn) -{ -PCIDevice *dev; - - dev =pci_new (devfn,TYPE_VIA_AC97 ); -pci_realize_and_unref (dev, bus, &error_fatal); -} -static void via_ac97_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -314,14 +303,6 @@ static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp)pci_set_long (pci_conf +PCI_INTERRUPT_PIN ,0x03 ); } -void vt82c686b_mc97_init (PCIBus *bus,int devfn) -{ -PCIDevice *dev; - - dev =pci_new (devfn,TYPE_VIA_MC97 ); -pci_realize_and_unref (dev, bus, &error_fatal); -} -static void via_mc97_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
hw/mips/fuloong2e.c +2 -2
@@ -264,8 +264,8 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, *i2c_bus =vt82c686b_pm_init (pci_bus,PCI_DEVFN (slot,4 ),0xeee1 ,NULL );/* Audio support */ -vt82c686b_ac97_init (pci_bus,PCI_DEVFN (slot,5 )); -vt82c686b_mc97_init (pci_bus,PCI_DEVFN (slot,6 )); +pci_create_simple (pci_bus,PCI_DEVFN (slot,5 ),TYPE_VIA_AC97 ); +pci_create_simple (pci_bus,PCI_DEVFN (slot,6 ),TYPE_VIA_MC97 ); }/* Network support */
include/hw/isa/vt82c686.h +2 -2
@@ -3,11 +3,11 @@#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" +#define TYPE_VIA_AC97 "via-ac97" +#define TYPE_VIA_MC97 "via-mc97"/* vt82c686.c */ ISABus *vt82c686b_isa_init (PCIBus * bus,int devfn); -void vt82c686b_ac97_init (PCIBus *bus,int devfn); -void vt82c686b_mc97_init (PCIBus *bus,int devfn);I2CBus *vt82c686b_pm_init (PCIBus *bus,int devfn,uint32_t smb_io_base,qemu_irq sci_irq);
Signature · 1 line
2.21.3
PATCH 5/24 vt82c686: Split off via-[am]c97 into separate file in hw/audio
In reply to BALATON Zoltan viaThe via-[am]c97 code is supposed to implement the audio part of VIA south bridge chips so it is better placed under hw/audio/. Split it off into a separate file.
--- hw/audio/meson.build | 1 + hw/audio/via-ac97.c | 106 +++++++++++++++++++++++++++++++++++++++++++ hw/isa/vt82c686.c | 91 ------------------------------------- 3 files changed, 107 insertions(+), 91 deletions(-) create mode 100644 hw/audio/via-ac97.c
hw/audio/meson.build +1 -0
@@ -11,4 +11,5 @@ softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-ac97.c')) softmmu_ss.add(when: 'CONFIG_PCSPK', if_true: files('pcspk.c')) softmmu_ss.add(when: 'CONFIG_PL041', if_true: files('pl041.c', 'lm4549.c')) softmmu_ss.add(when: 'CONFIG_SB16', if_true: files('sb16.c')) +softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('via-ac97.c')) softmmu_ss.add(when: 'CONFIG_WM8750', if_true: files('wm8750.c'))
hw/audio/via-ac97.c new file +106 -0
106 lines not on this page · raw message
hw/isa/vt82c686.c +0 -91
109 lines not on this page · raw message
Signature · 1 line
2.21.3
PATCH 6/24 audio/via-ac97: Simplify code and set user_creatable to false
In reply to BALATON Zoltan viaRemove some unneded, empty code and set user_creatable to false (besides being not implemented yet, so does nothing anyway) it's also normally part of VIA south bridge chips so no need to confuse users showing them these devices.
--- hw/audio/via-ac97.c | 51 +++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 32 deletions(-)
hw/audio/via-ac97.c +19 -32
@@ -13,27 +13,13 @@#include "hw/isa/vt82c686.h" #include "hw/pci/pci.h" -struct VIAAC97State { -PCIDevice dev; -}; - -struct VIAMC97State { -PCIDevice dev; -}; - -OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97) -OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97) - -static void via_ac97_realize (PCIDevice *dev,Error **errp) +static void via_ac97_realize (PCIDevice *pci_dev,Error **errp) { -VIAAC97State *s =VIA_AC97 (dev); -uint8_t *pci_conf = s->dev.config; - -pci_set_word (pci_conf +PCI_COMMAND ,PCI_COMMAND_INVALIDATE | -PCI_COMMAND_PARITY ); -pci_set_word (pci_conf +PCI_STATUS ,PCI_STATUS_CAP_LIST | -PCI_STATUS_DEVSEL_MEDIUM ); -pci_set_long (pci_conf +PCI_INTERRUPT_PIN ,0x03 ); +pci_set_word (pci_dev->config +PCI_COMMAND , +PCI_COMMAND_INVALIDATE |PCI_COMMAND_PARITY ); +pci_set_word (pci_dev->config +PCI_STATUS , +PCI_STATUS_CAP_LIST |PCI_STATUS_DEVSEL_MEDIUM ); +pci_set_long (pci_dev->config +PCI_INTERRUPT_PIN ,0x03 ); }static void via_ac97_class_init (ObjectClass *klass,void *data)
@@ -47,13 +33,15 @@ static void via_ac97_class_init(ObjectClass *klass, void *data) k->revision =0x50 ; k->class_id =PCI_CLASS_MULTIMEDIA_AUDIO ;set_bit (DEVICE_CATEGORY_SOUND , dc->categories); - dc->desc ="AC97" ; + dc->desc ="VIA AC97" ; +/* Reason: Part of a south bridge chip */ + dc->user_creatable = false; }static const TypeInfo via_ac97_info = { .name =TYPE_VIA_AC97 , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (VIAAC97State), + .instance_size =sizeof (PCIDevice), .class_init = via_ac97_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE },
@@ -61,15 +49,12 @@ static const TypeInfo via_ac97_info = { }, }; -static void via_mc97_realize (PCIDevice *dev,Error **errp) +static void via_mc97_realize (PCIDevice *pci_dev,Error **errp) { -VIAMC97State *s =VIA_MC97 (dev); -uint8_t *pci_conf = s->dev.config; - -pci_set_word (pci_conf +PCI_COMMAND ,PCI_COMMAND_INVALIDATE | -PCI_COMMAND_VGA_PALETTE ); -pci_set_word (pci_conf +PCI_STATUS ,PCI_STATUS_DEVSEL_MEDIUM ); -pci_set_long (pci_conf +PCI_INTERRUPT_PIN ,0x03 ); +pci_set_word (pci_dev->config +PCI_COMMAND , +PCI_COMMAND_INVALIDATE |PCI_COMMAND_VGA_PALETTE ); +pci_set_word (pci_dev->config +PCI_STATUS ,PCI_STATUS_DEVSEL_MEDIUM ); +pci_set_long (pci_dev->config +PCI_INTERRUPT_PIN ,0x03 ); }static void via_mc97_class_init (ObjectClass *klass,void *data)
@@ -83,13 +68,15 @@ static void via_mc97_class_init(ObjectClass *klass, void *data) k->class_id =PCI_CLASS_COMMUNICATION_OTHER ; k->revision =0x30 ;set_bit (DEVICE_CATEGORY_NETWORK , dc->categories); - dc->desc ="MC97" ; + dc->desc ="VIA MC97" ; +/* Reason: Part of a south bridge chip */ + dc->user_creatable = false; }static const TypeInfo via_mc97_info = { .name =TYPE_VIA_MC97 , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (VIAMC97State), + .instance_size =sizeof (PCIDevice), .class_init = via_mc97_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE },
Signature · 1 line
2.21.3
PATCH 7/24 vt82c686: Remove legacy vt82c686b_isa_init() function
In reply to BALATON Zoltan via--- hw/isa/vt82c686.c | 9 --------- hw/mips/fuloong2e.c | 4 +++- include/hw/isa/vt82c686.h | 3 +-- 3 files changed, 4 insertions(+), 12 deletions(-)
hw/isa/vt82c686.c +0 -9
@@ -49,7 +49,6 @@ struct VT82C686BISAState {SuperIOConfig superio_conf; }; -#define TYPE_VT82C686B_ISA "vt82c686b-isa" OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data,
@@ -367,14 +366,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) &vt82c->superio); } -ISABus *vt82c686b_isa_init (PCIBus *bus,int devfn) -{ -PCIDevice *d; - - d =pci_create_simple_multifunction (bus, devfn, true,TYPE_VT82C686B_ISA ); -return ISA_BUS (qdev_get_child_bus (DEVICE (d),"isa.0" )); -} -static void via_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
hw/mips/fuloong2e.c +3 -1
@@ -240,7 +240,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,ISABus *isa_bus;PCIDevice *dev; - isa_bus =vt82c686b_isa_init (pci_bus,PCI_DEVFN (slot,0 )); + dev =pci_create_simple_multifunction (pci_bus,PCI_DEVFN (slot,0 ), true, +TYPE_VT82C686B_ISA ); + isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (dev),"isa.0" ));assert (isa_bus); *p_isa_bus = isa_bus;/* Interrupt controller */
include/hw/isa/vt82c686.h +1 -2
@@ -1,13 +1,12 @@#ifndef HW_VT82C686_H #define HW_VT82C686_H - +#define TYPE_VT82C686B_ISA "vt82c686b-isa"#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio"#define TYPE_VIA_AC97 "via-ac97"#define TYPE_VIA_MC97 "via-mc97"/* vt82c686.c */ -ISABus *vt82c686b_isa_init (PCIBus * bus,int devfn);I2CBus *vt82c686b_pm_init (PCIBus *bus,int devfn,uint32_t smb_io_base,qemu_irq sci_irq);
Signature · 1 line
2.21.3
PATCH 8/24 vt82c686: Remove legacy vt82c686b_pm_init() function
In reply to BALATON Zoltan viaRemove legacy vt82c686b_pm_init() function and also rename VT82C686B_PM type name to match other device names.
--- hw/isa/vt82c686.c | 18 ------------------ hw/mips/fuloong2e.c | 5 ++++- include/hw/isa/vt82c686.h | 5 +---- 3 files changed, 5 insertions(+), 23 deletions(-)
hw/isa/vt82c686.c +0 -18
@@ -12,7 +12,6 @@#include "qemu/osdep.h" #include "hw/isa/vt82c686.h" -#include "hw/i2c/i2c.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "hw/isa/isa.h"
@@ -167,7 +166,6 @@ struct VT686PMState {uint32_t smb_io_base; }; -#define TYPE_VT82C686B_PM "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM)static void pm_update_sci (VT686PMState *s)
@@ -271,22 +269,6 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)acpi_pm1_cnt_init (&s->ar, &s->io, false, false,2 ); } -I2CBus *vt82c686b_pm_init (PCIBus *bus,int devfn,uint32_t smb_io_base, -qemu_irq sci_irq) -{ -PCIDevice *dev; -VT686PMState *s; - - dev =pci_new (devfn,TYPE_VT82C686B_PM ); -qdev_prop_set_uint32 (&dev->qdev,"smb_io_base" , smb_io_base); - - s =VT82C686B_PM (dev); - -pci_realize_and_unref (dev, bus, &error_fatal); - -return s->smb.smbus; -} -static Property via_pm_properties[] = {DEFINE_PROP_UINT32 ("smb_io_base" , VT686PMState, smb_io_base,0 ),DEFINE_PROP_END_OF_LIST (),
hw/mips/fuloong2e.c +4 -1
@@ -263,7 +263,10 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,pci_create_simple (pci_bus,PCI_DEVFN (slot,2 ),"vt82c686b-usb-uhci" );pci_create_simple (pci_bus,PCI_DEVFN (slot,3 ),"vt82c686b-usb-uhci" ); - *i2c_bus =vt82c686b_pm_init (pci_bus,PCI_DEVFN (slot,4 ),0xeee1 ,NULL ); + dev =pci_new (PCI_DEVFN (slot,4 ),TYPE_VT82C686B_PM ); +qdev_prop_set_uint32 (DEVICE (dev),"smb_io_base" ,0xeee1 ); +pci_realize_and_unref (dev, pci_bus, &error_fatal); + *i2c_bus =I2C_BUS (qdev_get_child_bus (DEVICE (dev),"i2c" ));/* Audio support */ pci_create_simple (pci_bus,PCI_DEVFN (slot,5 ),TYPE_VIA_AC97 );
include/hw/isa/vt82c686.h +1 -4
@@ -3,11 +3,8 @@#define TYPE_VT82C686B_ISA "vt82c686b-isa"#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" +#define TYPE_VT82C686B_PM "vt82c686b-pm"#define TYPE_VIA_AC97 "via-ac97"#define TYPE_VIA_MC97 "via-mc97" -/* vt82c686.c */ -I2CBus *vt82c686b_pm_init (PCIBus *bus,int devfn,uint32_t smb_io_base, -qemu_irq sci_irq); -#endif
Signature · 1 line
2.21.3
PATCH 9/24 vt82c686: Convert debug printf to trace points
In reply to BALATON Zoltan viaDrop DPRINTF and use trace functions instead. Two debug messages about unimplemented registers could be converted to qemu_log_mask() but in reality all registers are currently unimplemented (we just store and return values of writable regs but do nothing with them). As we already trace register access there's no need for additional debug messages so these are just removed and a comment is added as a reminder.
--- hw/isa/trace-events | 6 ++++++ hw/isa/vt82c686.c | 51 +++++++++++++-------------------------------- 2 files changed, 21 insertions(+), 36 deletions(-)
hw/isa/trace-events +6 -0
@@ -13,3 +13,9 @@ pc87312_io_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x" # apm.c apm_io_read(uint8_t addr, uint8_t val) "read addr=0x%x val=0x%02x" apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x" + +# vt82c686.c +via_isa_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len 0x%x" +via_pm_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len 0x%x" +via_superio_read(uint8_t addr, uint8_t val) "addr 0x%x val 0x%x" +via_superio_write(uint8_t addr, uint32_t val) "addr 0x%x val 0x%x"
hw/isa/vt82c686.c +15 -36
96 lines not on this page · raw message
Signature · 1 line
2.21.3
Re: [PATCH 09/24] vt82c686: Convert debug printf to trace points
Quoted 7 lines · BALATON Zoltan via
Drop DPRINTF and use trace functions instead. Two debug messages about unimplemented registers could be converted to
qemu_log_mask()but in reality all registers are currently unimplemented (we just store and return values of writable regs but do nothing with them). As we already trace register access there's no need for additional debug messages so these are just removed and a comment is added as a reminder.
Quoted 5 lines
Signed-off-by BALATON Zoltan <[email protected]>--- hw/isa/trace-events | 6 ++++++ hw/isa/vt82c686.c | 51 +++++++++++++-------------------------------- 2 files changed, 21 insertions(+), 36 deletions(-)
PATCH 10/24 vt82c686: Remove unneeded includes and defines
In reply to BALATON Zoltan viaThese are not used or not needed.
--- hw/isa/vt82c686.c | 5 ----- 1 file changed, 5 deletions(-)
hw/isa/vt82c686.c +0 -5
@@ -16,9 +16,7 @@#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/isa/superio.h" -#include "hw/sysbus.h" #include "migration/vmstate.h" -#include "hw/mips/mips.h" #include "hw/isa/apm.h" #include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h"
@@ -26,7 +24,6 @@#include "qemu/module.h" #include "qemu/timer.h" #include "exec/address-spaces.h" -#include "qom/object.h" #include "trace.h" typedef struct SuperIOConfig {
@@ -136,8 +133,6 @@ static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, } } -#define ACPI_DBG_IO_ADDR 0xb044 -struct VT686PMState {PCIDevice dev;MemoryRegion io;
Signature · 1 line
2.21.3
PATCH 11/24 vt82c686: Use shorter name for local variable holding object state
In reply to BALATON Zoltan viaRename local variable holding object state for readability and consistency.
--- hw/isa/vt82c686.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
hw/isa/vt82c686.c +15 -15
@@ -95,8 +95,8 @@ static const MemoryRegionOps superio_ops = {static void vt82c686b_isa_reset (DeviceState *dev) { -VT82C686BISAState *vt82c =VT82C686B_ISA (dev); -uint8_t *pci_conf = vt82c->dev.config; +VT82C686BISAState *s =VT82C686B_ISA (dev); +uint8_t *pci_conf = s->dev.config;pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 ); pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
@@ -112,24 +112,24 @@ static void vt82c686b_isa_reset(DeviceState *dev) pci_conf[0x5f ] =0x04 ; pci_conf[0x77 ] =0x10 ;/* GPIO Control 1/2/3/4 */ - vt82c->superio_conf.config[0xe0 ] =0x3c ; - vt82c->superio_conf.config[0xe2 ] =0x03 ; - vt82c->superio_conf.config[0xe3 ] =0xfc ; - vt82c->superio_conf.config[0xe6 ] =0xde ; - vt82c->superio_conf.config[0xe7 ] =0xfe ; - vt82c->superio_conf.config[0xe8 ] =0xbe ; + s->superio_conf.config[0xe0 ] =0x3c ; + s->superio_conf.config[0xe2 ] =0x03 ; + s->superio_conf.config[0xe3 ] =0xfc ; + s->superio_conf.config[0xe6 ] =0xde ; + s->superio_conf.config[0xe7 ] =0xfe ; + s->superio_conf.config[0xe8 ] =0xbe ; }/* write config pci function0 registers. PCI-ISA bridge */ static void vt82c686b_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int len) { -VT82C686BISAState *vt686 =VT82C686B_ISA (d); +VT82C686BISAState *s =VT82C686B_ISA (d);trace_via_isa_write (addr, val, len);pci_default_write_config (d, addr, val, len);if (addr ==0x85 ) {/* enable or disable super IO configure */ -memory_region_set_enabled (&vt686->superio, val &0x2 ); +memory_region_set_enabled (&s->superio, val &0x2 ); } }
@@ -289,7 +289,7 @@ static const VMStateDescription vmstate_via = {/* init the PCI-to-ISA bridge */ static void vt82c686b_realize (PCIDevice *d,Error **errp) { -VT82C686BISAState *vt82c =VT82C686B_ISA (d); +VT82C686BISAState *s =VT82C686B_ISA (d);uint8_t *pci_conf;ISABus *isa_bus;uint8_t *wmask;
@@ -311,15 +311,15 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) } } -memory_region_init_io (&vt82c->superio,OBJECT (d), &superio_ops, - &vt82c->superio_conf,"superio" ,2 ); -memory_region_set_enabled (&vt82c->superio, false); +memory_region_init_io (&s->superio,OBJECT (d), &superio_ops, + &s->superio_conf,"superio" ,2 ); +memory_region_set_enabled (&s->superio, false);/* * The floppy also uses 0x3f0 and 0x3f1. * But we do not emulate a floppy, so just set it here. */ memory_region_add_subregion (isa_bus->address_space_io,0x3f0 , - &vt82c->superio); + &s->superio); }static void via_class_init (ObjectClass *klass,void *data)
Signature · 1 line
2.21.3
Re: [PATCH 11/24] vt82c686: Use shorter name for local variable holding object state
Quoted 7 lines · BALATON Zoltan via
Rename local variable holding object state for readability and consistency.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/isa/vt82c686.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
PATCH 12/24 vt82c686: Rename superio config related parts
In reply to BALATON Zoltan viaUse less confusing naming for superio config register handling related parts that makes it clearer what belongs to this part.
--- hw/isa/vt82c686.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
hw/isa/vt82c686.c +24 -24
@@ -27,7 +27,7 @@#include "trace.h" typedef struct SuperIOConfig { -uint8_t config[0x100 ]; +uint8_t regs[0x100 ];uint8_t index;uint8_t data; }SuperIOConfig ;
@@ -35,23 +35,23 @@ typedef struct SuperIOConfig {struct VT82C686BISAState {PCIDevice dev;MemoryRegion superio; -SuperIOConfig superio_conf; +SuperIOConfig superio_cfg; }; OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) -static void superio_ioport_writeb (void *opaque,hwaddr addr,uint64_t data, -unsigned size) +static void superio_cfg_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) { -SuperIOConfig *superio_conf = opaque; +SuperIOConfig *sc = opaque;if (addr ==0x3f0 ) {/* config index register */ - superio_conf->index = data &0xff ; + sc->index = data &0xff ; }else {bool can_write = true;/* 0x3f1, config data register */ -trace_via_superio_write (superio_conf->index, data &0xff ); -switch (superio_conf->index) { +trace_via_superio_write (sc->index, data &0xff ); +switch (sc->index) { case 0x00 ... 0xdf:case 0xe4 :case 0xe5 :
@@ -69,23 +69,23 @@ static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, }if (can_write) { - superio_conf->config[superio_conf->index] = data &0xff ; + sc->regs[sc->index] = data &0xff ; } } } -static uint64_t superio_ioport_readb (void *opaque,hwaddr addr,unsigned size) +static uint64_t superio_cfg_read (void *opaque,hwaddr addr,unsigned size) { -SuperIOConfig *superio_conf = opaque; -uint8_t val = superio_conf->config[superio_conf->index]; +SuperIOConfig *sc = opaque; +uint8_t val = sc->regs[sc->index]; -trace_via_superio_read (superio_conf->index, val); +trace_via_superio_read (sc->index, val);return val; } -static const MemoryRegionOps superio_ops = { - .read = superio_ioport_readb, - .write = superio_ioport_writeb, +static const MemoryRegionOps superio_cfg_ops = { + .read = superio_cfg_read, + .write = superio_cfg_write, .endianness =DEVICE_NATIVE_ENDIAN , .impl = { .min_access_size =1 ,
@@ -112,12 +112,12 @@ static void vt82c686b_isa_reset(DeviceState *dev) pci_conf[0x5f ] =0x04 ; pci_conf[0x77 ] =0x10 ;/* GPIO Control 1/2/3/4 */ - s->superio_conf.config[0xe0 ] =0x3c ; - s->superio_conf.config[0xe2 ] =0x03 ; - s->superio_conf.config[0xe3 ] =0xfc ; - s->superio_conf.config[0xe6 ] =0xde ; - s->superio_conf.config[0xe7 ] =0xfe ; - s->superio_conf.config[0xe8 ] =0xbe ; + s->superio_cfg.regs[0xe0 ] =0x3c ;/* Device ID */ + s->superio_cfg.regs[0xe2 ] =0x03 ;/* Function select */ + s->superio_cfg.regs[0xe3 ] =0xfc ;/* Floppy ctrl base addr */ + s->superio_cfg.regs[0xe6 ] =0xde ;/* Parallel port base addr */ + s->superio_cfg.regs[0xe7 ] =0xfe ;/* Serial port 1 base addr */ + s->superio_cfg.regs[0xe8 ] =0xbe ;/* Serial port 2 base addr */ }/* write config pci function0 registers. PCI-ISA bridge */
@@ -311,8 +311,8 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) } } -memory_region_init_io (&s->superio,OBJECT (d), &superio_ops, - &s->superio_conf,"superio" ,2 ); +memory_region_init_io (&s->superio,OBJECT (d), &superio_cfg_ops, + &s->superio_cfg,"superio" ,2 );memory_region_set_enabled (&s->superio, false);/* * The floppy also uses 0x3f0 and 0x3f1.
Signature · 1 line
2.21.3
Re: [PATCH 12/24] vt82c686: Rename superio config related parts
Quoted 7 lines · BALATON Zoltan via
Use less confusing naming for superio config register handling related parts that makes it clearer what belongs to this part.
Signed-off-by BALATON Zoltan <[email protected]>--- hw/isa/vt82c686.c | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
PATCH 13/24 vt82c686: Move superio memory region to SuperIOConfig struct
In reply to BALATON Zoltan viaThe superio memory region holds the io space index/data registers used to access the superio config registers that are implemented in struct SuperIOConfig. To keep these related things together move the memory region to SuperIOConfig and rename it accordingly.
Also remove the unused "data" member of SuperIOConfig which is not needed as we store actual data values in the regs array.
--- hw/isa/vt82c686.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
hw/isa/vt82c686.c +8 -8
@@ -29,12 +29,11 @@typedef struct SuperIOConfig {uint8_t regs[0x100 ];uint8_t index; -uint8_t data; +MemoryRegion io; }SuperIOConfig ;struct VT82C686BISAState {PCIDevice dev; -MemoryRegion superio;SuperIOConfig superio_cfg; };
@@ -128,8 +127,9 @@ static void vt82c686b_write_config(PCIDevice *d, uint32_t addr,trace_via_isa_write (addr, val, len);pci_default_write_config (d, addr, val, len); -if (addr ==0x85 ) {/* enable or disable super IO configure */ -memory_region_set_enabled (&s->superio, val &0x2 ); +if (addr ==0x85 ) { +/* BIT(1): enable or disable superio config io ports */ +memory_region_set_enabled (&s->superio_cfg.io, val &BIT (1 )); } }
@@ -311,15 +311,15 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) } } -memory_region_init_io (&s->superio,OBJECT (d), &superio_cfg_ops, - &s->superio_cfg,"superio" ,2 ); -memory_region_set_enabled (&s->superio, false); +memory_region_init_io (&s->superio_cfg.io,OBJECT (d), &superio_cfg_ops, + &s->superio_cfg,"superio_cfg" ,2 ); +memory_region_set_enabled (&s->superio_cfg.io, false);/* * The floppy also uses 0x3f0 and 0x3f1. * But we do not emulate a floppy, so just set it here. */ memory_region_add_subregion (isa_bus->address_space_io,0x3f0 , - &s->superio); + &s->superio_cfg.io); }static void via_class_init (ObjectClass *klass,void *data)
Signature · 1 line
2.21.3
PATCH 14/24 vt82c686: Reorganise code
In reply to BALATON Zoltan viaMove lines around so that object definitions become consecutive and not scattered around. This brings functions belonging to an object together so it's clearer what is defined and what parts belong to which object.
--- hw/isa/vt82c686.c | 279 +++++++++++++++++++++++----------------------- 1 file changed, 140 insertions(+), 139 deletions(-)
hw/isa/vt82c686.c +140 -139
@@ -26,112 +26,7 @@#include "exec/address-spaces.h" #include "trace.h" -typedef struct SuperIOConfig { -uint8_t regs[0x100 ]; -uint8_t index; -MemoryRegion io; -}SuperIOConfig ; - -struct VT82C686BISAState { -PCIDevice dev; -SuperIOConfig superio_cfg; -}; - -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) - -static void superio_cfg_write (void *opaque,hwaddr addr,uint64_t data, -unsigned size) -{ -SuperIOConfig *sc = opaque; - -if (addr ==0x3f0 ) {/* config index register */ - sc->index = data &0xff ; - }else { -bool can_write = true; -/* 0x3f1, config data register */ -trace_via_superio_write (sc->index, data &0xff ); -switch (sc->index) { - case 0x00 ... 0xdf: -case 0xe4 : -case 0xe5 : - case 0xe9 ... 0xed: -case 0xf3 : -case 0xf5 : -case 0xf7 : - case 0xf9 ... 0xfb: - case 0xfd ... 0xff: - can_write = false; -break ; -/* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ -default : -break ; - - } -if (can_write) { - sc->regs[sc->index] = data &0xff ; - } - } -} - -static uint64_t superio_cfg_read (void *opaque,hwaddr addr,unsigned size) -{ -SuperIOConfig *sc = opaque; -uint8_t val = sc->regs[sc->index]; - -trace_via_superio_read (sc->index, val); -return val; -} - -static const MemoryRegionOps superio_cfg_ops = { - .read = superio_cfg_read, - .write = superio_cfg_write, - .endianness =DEVICE_NATIVE_ENDIAN , - .impl = { - .min_access_size =1 , - .max_access_size =1 , - }, -}; - -static void vt82c686b_isa_reset (DeviceState *dev) -{ -VT82C686BISAState *s =VT82C686B_ISA (dev); -uint8_t *pci_conf = s->dev.config; - -pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 ); -pci_set_word (pci_conf +PCI_COMMAND ,PCI_COMMAND_IO |PCI_COMMAND_MEMORY | -PCI_COMMAND_MASTER |PCI_COMMAND_SPECIAL ); -pci_set_word (pci_conf +PCI_STATUS ,PCI_STATUS_DEVSEL_MEDIUM ); - - pci_conf[0x48 ] =0x01 ;/* Miscellaneous Control 3 */ - pci_conf[0x4a ] =0x04 ;/* IDE interrupt Routing */ - pci_conf[0x4f ] =0x03 ;/* DMA/Master Mem Access Control 3 */ - pci_conf[0x50 ] =0x2d ;/* PnP DMA Request Control */ - pci_conf[0x59 ] =0x04 ; - pci_conf[0x5a ] =0x04 ;/* KBC/RTC Control*/ - pci_conf[0x5f ] =0x04 ; - pci_conf[0x77 ] =0x10 ;/* GPIO Control 1/2/3/4 */ - - s->superio_cfg.regs[0xe0 ] =0x3c ;/* Device ID */ - s->superio_cfg.regs[0xe2 ] =0x03 ;/* Function select */ - s->superio_cfg.regs[0xe3 ] =0xfc ;/* Floppy ctrl base addr */ - s->superio_cfg.regs[0xe6 ] =0xde ;/* Parallel port base addr */ - s->superio_cfg.regs[0xe7 ] =0xfe ;/* Serial port 1 base addr */ - s->superio_cfg.regs[0xe8 ] =0xbe ;/* Serial port 2 base addr */ -} - -/* write config pci function0 registers. PCI-ISA bridge */ -static void vt82c686b_write_config (PCIDevice *d,uint32_t addr, -uint32_t val,int len) -{ -VT82C686BISAState *s =VT82C686B_ISA (d); - -trace_via_isa_write (addr, val, len); -pci_default_write_config (d, addr, val, len); -if (addr ==0x85 ) { -/* BIT(1): enable or disable superio config io ports */ -memory_region_set_enabled (&s->superio_cfg.io, val &BIT (1 )); - } -} +OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM)struct VT686PMState {PCIDevice dev;
@@ -142,30 +37,6 @@ struct VT686PMState {uint32_t smb_io_base; }; -OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM) - -static void pm_update_sci (VT686PMState *s) -{ -int sci_level, pmsts; - - pmsts =acpi_pm1_evt_get_sts (&s->ar); - sci_level = (((pmsts & s->ar.pm1.evt.en) & - (ACPI_BITMASK_RT_CLOCK_ENABLE | -ACPI_BITMASK_POWER_BUTTON_ENABLE | -ACPI_BITMASK_GLOBAL_LOCK_ENABLE | -ACPI_BITMASK_TIMER_ENABLE )) !=0 ); -pci_set_irq (&s->dev, sci_level); -/* schedule a timer interruption if needed */ -acpi_pm_tmr_update (&s->ar, (s->ar.pm1.evt.en &ACPI_BITMASK_TIMER_ENABLE ) && - !(pmsts &ACPI_BITMASK_TIMER_STATUS )); -} - -static void pm_tmr_timer (ACPIREGS *ar) -{ -VT686PMState *s =container_of (ar, VT686PMState, ar); -pm_update_sci (s); -} -static void pm_io_space_update (VT686PMState *s) {uint32_t pm_io_base;
@@ -179,12 +50,6 @@ static void pm_io_space_update(VT686PMState *s)memory_region_transaction_commit (); } -static void pm_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int len) -{ -trace_via_pm_write (addr, val, len); -pci_default_write_config (d, addr, val, len); -} -static int vmstate_acpi_post_load (void *opaque,int version_id) {VT686PMState *s = opaque;
@@ -210,7 +75,34 @@ static const VMStateDescription vmstate_acpi = { } }; -/* vt82c686 pm init */ +static void pm_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int len) +{ +trace_via_pm_write (addr, val, len); +pci_default_write_config (d, addr, val, len); +} + +static void pm_update_sci (VT686PMState *s) +{ +int sci_level, pmsts; + + pmsts =acpi_pm1_evt_get_sts (&s->ar); + sci_level = (((pmsts & s->ar.pm1.evt.en) & + (ACPI_BITMASK_RT_CLOCK_ENABLE | +ACPI_BITMASK_POWER_BUTTON_ENABLE | +ACPI_BITMASK_GLOBAL_LOCK_ENABLE | +ACPI_BITMASK_TIMER_ENABLE )) !=0 ); +pci_set_irq (&s->dev, sci_level); +/* schedule a timer interruption if needed */ +acpi_pm_tmr_update (&s->ar, (s->ar.pm1.evt.en &ACPI_BITMASK_TIMER_ENABLE ) && + !(pmsts &ACPI_BITMASK_TIMER_STATUS )); +} + +static void pm_tmr_timer (ACPIREGS *ar) +{ +VT686PMState *s =container_of (ar, VT686PMState, ar); +pm_update_sci (s); +} +static void vt82c686b_pm_realize (PCIDevice *dev,Error **errp) {VT686PMState *s =VT82C686B_PM (dev);
@@ -276,6 +168,87 @@ static const TypeInfo via_pm_info = { }, }; + +typedef struct SuperIOConfig { +uint8_t regs[0x100 ]; +uint8_t index; +MemoryRegion io; +}SuperIOConfig ; + +static void superio_cfg_write (void *opaque,hwaddr addr,uint64_t data, +unsigned size) +{ +SuperIOConfig *sc = opaque; + +if (addr ==0x3f0 ) {/* config index register */ + sc->index = data &0xff ; + }else { +bool can_write = true; +/* 0x3f1, config data register */ +trace_via_superio_write (sc->index, data &0xff ); +switch (sc->index) { + case 0x00 ... 0xdf: +case 0xe4 : +case 0xe5 : + case 0xe9 ... 0xed: +case 0xf3 : +case 0xf5 : +case 0xf7 : + case 0xf9 ... 0xfb: + case 0xfd ... 0xff: + can_write = false; +break ; +/* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ +default : +break ; + + } +if (can_write) { + sc->regs[sc->index] = data &0xff ; + } + } +} + +static uint64_t superio_cfg_read (void *opaque,hwaddr addr,unsigned size) +{ +SuperIOConfig *sc = opaque; +uint8_t val = sc->regs[sc->index]; + +trace_via_superio_read (sc->index, val); +return val; +} + +static const MemoryRegionOps superio_cfg_ops = { + .read = superio_cfg_read, + .write = superio_cfg_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .impl = { + .min_access_size =1 , + .max_access_size =1 , + }, +}; + + +OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) + +struct VT82C686BISAState { +PCIDevice dev; +SuperIOConfig superio_cfg; +}; + +static void vt82c686b_write_config (PCIDevice *d,uint32_t addr, +uint32_t val,int len) +{ +VT82C686BISAState *s =VT82C686B_ISA (d); + +trace_via_isa_write (addr, val, len); +pci_default_write_config (d, addr, val, len); +if (addr ==0x85 ) { +/* BIT(1): enable or disable superio config io ports */ +memory_region_set_enabled (&s->superio_cfg.io, val &BIT (1 )); + } +} +static const VMStateDescription vmstate_via = { .name ="vt82c686b" , .version_id =1 ,
@@ -286,7 +259,33 @@ static const VMStateDescription vmstate_via = { } }; -/* init the PCI-to-ISA bridge */ +static void vt82c686b_isa_reset (DeviceState *dev) +{ +VT82C686BISAState *s =VT82C686B_ISA (dev); +uint8_t *pci_conf = s->dev.config; + +pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 ); +pci_set_word (pci_conf +PCI_COMMAND ,PCI_COMMAND_IO |PCI_COMMAND_MEMORY | +PCI_COMMAND_MASTER |PCI_COMMAND_SPECIAL ); +pci_set_word (pci_conf +PCI_STATUS ,PCI_STATUS_DEVSEL_MEDIUM ); + + pci_conf[0x48 ] =0x01 ;/* Miscellaneous Control 3 */ + pci_conf[0x4a ] =0x04 ;/* IDE interrupt Routing */ + pci_conf[0x4f ] =0x03 ;/* DMA/Master Mem Access Control 3 */ + pci_conf[0x50 ] =0x2d ;/* PnP DMA Request Control */ + pci_conf[0x59 ] =0x04 ; + pci_conf[0x5a ] =0x04 ;/* KBC/RTC Control*/ + pci_conf[0x5f ] =0x04 ; + pci_conf[0x77 ] =0x10 ;/* GPIO Control 1/2/3/4 */ + + s->superio_cfg.regs[0xe0 ] =0x3c ;/* Device ID */ + s->superio_cfg.regs[0xe2 ] =0x03 ;/* Function select */ + s->superio_cfg.regs[0xe3 ] =0xfc ;/* Floppy ctrl base addr */ + s->superio_cfg.regs[0xe6 ] =0xde ;/* Parallel port base addr */ + s->superio_cfg.regs[0xe7 ] =0xfe ;/* Serial port 1 base addr */ + s->superio_cfg.regs[0xe8 ] =0xbe ;/* Serial port 2 base addr */ +} +static void vt82c686b_realize (PCIDevice *d,Error **errp) {VT82C686BISAState *s =VT82C686B_ISA (d);
@@ -354,6 +353,7 @@ static const TypeInfo via_info = { }, }; +static void vt82c686b_superio_class_init (ObjectClass *klass,void *data) {ISASuperIOClass *sc =ISA_SUPERIO_CLASS (klass);
@@ -372,11 +372,12 @@ static const TypeInfo via_superio_info = { .class_init = vt82c686b_superio_class_init, }; +static void vt82c686b_register_types (void ) {type_register_static (&via_pm_info); -type_register_static (&via_superio_info);type_register_static (&via_info); +type_register_static (&via_superio_info); }type_init (vt82c686b_register_types)
Signature · 1 line
2.21.3
PATCH 15/24 vt82c686: Fix SMBus IO base and configuration registers
In reply to BALATON Zoltan viaThe base address of the SMBus io ports and its enabled status is set by registers in the PCI config space but this was not correctly emulated. Instead the SMBus registers were mapped on realize to the base address set by a property to the address expected by fuloong2e firmware.
Fix the base and config register handling to more closely model hardware which allows to remove the property and allows the guest to control this mapping. Do all this in reset instead of realize so it's correctly updated on reset.
--- hw/isa/vt82c686.c | 49 +++++++++++++++++++++++++++++++++------------ hw/mips/fuloong2e.c | 4 +--- 2 files changed, 37 insertions(+), 16 deletions(-)
hw/isa/vt82c686.c +36 -13
@@ -22,6 +22,7 @@#include "hw/i2c/pm_smbus.h" #include "qapi/error.h" #include "qemu/module.h" +#include "qemu/range.h" #include "qemu/timer.h" #include "exec/address-spaces.h" #include "trace.h"
@@ -34,7 +35,6 @@ struct VT686PMState {ACPIREGS ar;APMState apm;PMSMBus smb; -uint32_t smb_io_base; };static void pm_io_space_update (VT686PMState *s)
@@ -50,11 +50,22 @@ static void pm_io_space_update(VT686PMState *s)memory_region_transaction_commit (); } +static void smb_io_space_update (VT686PMState *s) +{ +uint32_t smbase =pci_get_long (s->dev.config +0x90 ) &0xfff0UL ; + +memory_region_transaction_begin (); +memory_region_set_address (&s->smb.io, smbase); +memory_region_set_enabled (&s->smb.io, s->dev.config[0xd2 ] &BIT (0 )); +memory_region_transaction_commit (); +} +static int vmstate_acpi_post_load (void *opaque,int version_id) {VT686PMState *s = opaque;pm_io_space_update (s); +smb_io_space_update (s);return 0 ; }
@@ -77,8 +88,18 @@ static const VMStateDescription vmstate_acpi = {static void pm_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int len) { +VT686PMState *s =VT82C686B_PM (d); +trace_via_pm_write (addr, val, len);pci_default_write_config (d, addr, val, len); +if (ranges_overlap (addr, len,0x90 ,4 )) { +uint32_t v =pci_get_long (s->dev.config +0x90 ); +pci_set_long (s->dev.config +0x90 , (v &0xfff0UL ) |1 ); + } +if (range_covers_byte (addr, len,0xd2 )) { + s->dev.config[0xd2 ] &=0xf ; +smb_io_space_update (s); + } }static void pm_update_sci (VT686PMState *s)
@@ -103,6 +124,17 @@ static void pm_tmr_timer(ACPIREGS *ar)pm_update_sci (s); } +static void vt82c686b_pm_reset (DeviceState *d) +{ +VT686PMState *s =VT82C686B_PM (d); + +/* SMBus IO base */ +pci_set_long (s->dev.config +0x90 ,1 ); + s->dev.config[0xd2 ] =0 ; + +smb_io_space_update (s); +} +static void vt82c686b_pm_realize (PCIDevice *dev,Error **errp) {VT686PMState *s =VT82C686B_PM (dev);
@@ -116,13 +148,9 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)/* 0x48-0x4B is Power Management I/O Base */ pci_set_long (pci_conf +0x48 ,0x00000001 ); -/* SMB ports:0xeee0~0xeeef */ - s->smb_io_base = ((s->smb_io_base &0xfff0 ) +0x0 ); - pci_conf[0x90 ] = s->smb_io_base |1 ; - pci_conf[0x91 ] = s->smb_io_base >>8 ; - pci_conf[0xd2 ] =0x90 ;pm_smbus_init (DEVICE (s), &s->smb, false); -memory_region_add_subregion (get_system_io (), s->smb_io_base, &s->smb.io); +memory_region_add_subregion (pci_address_space_io (dev),0 , &s->smb.io); +memory_region_set_enabled (&s->smb.io, false);apm_init (dev, &s->apm,NULL , s);
@@ -135,11 +163,6 @@ static void vt82c686b_pm_realize(PCIDevice *dev, Error **errp)acpi_pm1_cnt_init (&s->ar, &s->io, false, false,2 ); } -static Property via_pm_properties[] = { -DEFINE_PROP_UINT32 ("smb_io_base" , VT686PMState, smb_io_base,0 ), -DEFINE_PROP_END_OF_LIST (), -}; -static void via_pm_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -151,10 +174,10 @@ static void via_pm_class_init(ObjectClass *klass, void *data) k->device_id =PCI_DEVICE_ID_VIA_ACPI ; k->class_id =PCI_CLASS_BRIDGE_OTHER ; k->revision =0x40 ; + dc->reset = vt82c686b_pm_reset; dc->desc ="PM" ; dc->vmsd = &vmstate_acpi;set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); -device_class_set_props (dc, via_pm_properties); }static const TypeInfo via_pm_info = {
hw/mips/fuloong2e.c +1 -3
@@ -263,9 +263,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,pci_create_simple (pci_bus,PCI_DEVFN (slot,2 ),"vt82c686b-usb-uhci" );pci_create_simple (pci_bus,PCI_DEVFN (slot,3 ),"vt82c686b-usb-uhci" ); - dev =pci_new (PCI_DEVFN (slot,4 ),TYPE_VT82C686B_PM ); -qdev_prop_set_uint32 (DEVICE (dev),"smb_io_base" ,0xeee1 ); -pci_realize_and_unref (dev, pci_bus, &error_fatal); + dev =pci_create_simple (pci_bus,PCI_DEVFN (slot,4 ),TYPE_VT82C686B_PM ); *i2c_bus =I2C_BUS (qdev_get_child_bus (DEVICE (dev),"i2c" ));/* Audio support */
Signature · 1 line
2.21.3
PATCH 16/24 vt82c686: Fix up power management io base and config
In reply to BALATON Zoltan viaSimilar to the SMBus io registers there is a power management io range that is set via similar base address reg and enable bit. Some handling of this was already there but with several problems: using the wrong registers and bits, wrong size range, not acually updating mapping and handling reset correctly, nor emulating any of the actual io registers. Some of these errors are fixed up here.
After this patch we use the correct base address register, enable bit and region size and allow guests to map/unmap this region and correctly reset all registers to default values on reset but we still don't emulate any of the registers in this range.
Previously just an empty RAM region was mapped on realize, now we add an empty io range logging access instead. I think the pm timer should be hooked up here but not sure guests need it. PMON on fuloong2e sets a base address but does not seem to enable region; the pegasos2 firmware pokes some regs but continues anyway so don't know if anything would make use of these facilities. Therefore this is just a clean up of previous state for now and not intending to fully implement missing functionality which could be done later if some guests need it.
--- hw/isa/trace-events | 2 ++ hw/isa/vt82c686.c | 56 ++++++++++++++++++++++++++++++++------------- 2 files changed, 42 insertions(+), 16 deletions(-)
hw/isa/trace-events +2 -0
@@ -17,5 +17,7 @@ apm_io_write(uint8_t addr, uint8_t val) "write addr=0x%x val=0x%02x" # vt82c686.c via_isa_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len 0x%x" via_pm_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len 0x%x" +via_pm_io_read(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len 0x%x" +via_pm_io_write(uint32_t addr, uint32_t val, int len) "addr 0x%x val 0x%x len 0x%x" via_superio_read(uint8_t addr, uint8_t val) "addr 0x%x val 0x%x" via_superio_write(uint8_t addr, uint32_t val) "addr 0x%x val 0x%x"
hw/isa/vt82c686.c +40 -16
101 lines not on this page · raw message
Signature · 1 line
2.21.3
PATCH 17/24 vt82c686: Make vt82c686b-pm an abstract base class and add vt8231-pm based on it
In reply to BALATON Zoltan viaThe 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.
--- hw/isa/vt82c686.c | 87 ++++++++++++++++++++++++++------------- include/hw/isa/vt82c686.h | 1 + 2 files changed, 59 insertions(+), 29 deletions(-)
hw/isa/vt82c686.c +58 -29
@@ -27,9 +27,10 @@#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;
@@ -37,7 +38,7 @@ struct VT686PMState {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 ;
@@ -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 ;
@@ -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);
@@ -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);
@@ -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;
@@ -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 );
@@ -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 );
@@ -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" ,0x100 ); +memory_region_init_io (&s->io,OBJECT (dev), &pm_io_ops, s,"via-pm" ,0x100 );memory_region_add_subregion (pci_address_space_io (dev),0 , &s->io);memory_region_set_enabled (&s->io, false);
@@ -187,34 +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; -set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); }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_ACPI , +}; + +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 =0x8235 , +}; + +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];
@@ -423,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); }
include/hw/isa/vt82c686.h +1 -0
@@ -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"
Signature · 1 line
2.21.3
PATCH 18/24 vt82c686: Simplify vt82c686b_realize()
In reply to BALATON Zoltan viaRemove unneeded variables and setting value to 0 on zero initialised data and replace check for error with error_fatal. Rationalise loop that sets PCI config header fields read only.
--- hw/isa/vt82c686.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
hw/isa/vt82c686.c +6 -14
@@ -363,24 +363,16 @@ static void vt82c686b_isa_reset(DeviceState *dev)static void vt82c686b_realize (PCIDevice *d,Error **errp) {VT82C686BISAState *s =VT82C686B_ISA (d); -uint8_t *pci_conf; +DeviceState *dev =DEVICE (d);ISABus *isa_bus; -uint8_t *wmask;int i; - isa_bus =isa_bus_new (DEVICE (d),get_system_memory (), -pci_address_space_io (d), errp); -if (!isa_bus) { -return ; - } - - pci_conf = d->config; -pci_config_set_prog_interface (pci_conf,0x0 ); + isa_bus =isa_bus_new (dev,get_system_memory (),pci_address_space_io (d), + &error_fatal); - wmask = d->wmask; -for (i =0x00 ; i <0xff ; i++) { -if (i <=0x03 || (i >=0x08 && i <=0x3f )) { - wmask[i] =0x00 ; +for (i =0 ; i <PCI_CONFIG_HEADER_SIZE ; i++) { +if (i <PCI_COMMAND || i >=PCI_REVISION_ID ) { + d->wmask[i] =0 ; } }
Signature · 1 line
2.21.3
PATCH 19/24 vt82c686: Move creation of ISA devices to the ISA bridge
In reply to BALATON Zoltan viaCurrently the ISA devices that are part of the VIA south bridge, superio chip are wired up by board code. Move creation of these ISA devices to the VIA ISA bridge model so that board code does not need to access ISA bus. This also allows vt82c686b-superio to be made internal to vt82c686 which allows implementing its configuration via registers in subseqent commits.
--- hw/isa/vt82c686.c | 20 ++++++++++++++++++++ hw/mips/fuloong2e.c | 29 +++++------------------------ 2 files changed, 25 insertions(+), 24 deletions(-)
hw/isa/vt82c686.c +20 -0
@@ -16,6 +16,11 @@#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/isa/superio.h" +#include "hw/intc/i8259.h" +#include "hw/irq.h" +#include "hw/dma/i8257.h" +#include "hw/timer/i8254.h" +#include "hw/rtc/mc146818rtc.h" #include "migration/vmstate.h" #include "hw/isa/apm.h" #include "hw/acpi/acpi.h"
@@ -307,9 +312,16 @@ OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)struct VT82C686BISAState {PCIDevice dev; +qemu_irq cpu_intr;SuperIOConfig superio_cfg; }; +static void via_isa_request_i8259_irq (void *opaque,int irq,int level) +{ +VT82C686BISAState *s = opaque; +qemu_set_irq (s->cpu_intr, level); +} +static void vt82c686b_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int len) {
@@ -365,10 +377,18 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)VT82C686BISAState *s =VT82C686B_ISA (d);DeviceState *dev =DEVICE (d);ISABus *isa_bus; +qemu_irq *isa_irq;int i; +qdev_init_gpio_out (dev, &s->cpu_intr,1 ); + isa_irq =qemu_allocate_irqs (via_isa_request_i8259_irq, s,1 ); isa_bus =isa_bus_new (dev,get_system_memory (),pci_address_space_io (d), &error_fatal); +isa_bus_irqs (isa_bus,i8259_init (isa_bus, *isa_irq)); +i8254_pit_init (isa_bus,0x40 ,0 ,NULL ); +i8257_dma_init (isa_bus,0 ); +isa_create_simple (isa_bus,TYPE_VT82C686B_SUPERIO ); +mc146818_rtc_init (isa_bus,2000 ,NULL );for (i =0 ; i <PCI_CONFIG_HEADER_SIZE ; i++) {if (i <PCI_COMMAND || i >=PCI_REVISION_ID ) {
hw/mips/fuloong2e.c +5 -24
@@ -25,9 +25,6 @@#include "qapi/error.h" #include "cpu.h" #include "hw/clock.h" -#include "hw/intc/i8259.h" -#include "hw/dma/i8257.h" -#include "hw/isa/superio.h" #include "net/net.h" #include "hw/boards.h" #include "hw/i2c/smbus_eeprom.h"
@@ -38,13 +35,13 @@#include "qemu/log.h" #include "hw/loader.h" #include "hw/ide/pci.h" +#include "hw/qdev-properties.h" #include "elf.h" #include "hw/isa/vt82c686.h" -#include "hw/rtc/mc146818rtc.h" -#include "hw/timer/i8254.h" #include "exec/address-spaces.h" #include "sysemu/qtest.h" #include "sysemu/reset.h" +#include "sysemu/sysemu.h" #include "qemu/error-report.h" #define DEBUG_FULOONG2E_INIT
@@ -234,26 +231,13 @@ static void main_cpu_reset(void *opaque) }static void vt82c686b_southbridge_init (PCIBus *pci_bus,int slot,qemu_irq intc, -I2CBus **i2c_bus,ISABus **p_isa_bus) +I2CBus **i2c_bus) { -qemu_irq *i8259; -ISABus *isa_bus;PCIDevice *dev; dev =pci_create_simple_multifunction (pci_bus,PCI_DEVFN (slot,0 ), true,TYPE_VT82C686B_ISA ); - isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (dev),"isa.0" )); -assert (isa_bus); - *p_isa_bus = isa_bus; -/* Interrupt controller */ -/* The 8259 -> IP5 */ - i8259 =i8259_init (isa_bus, intc); -isa_bus_irqs (isa_bus, i8259); -/* init other devices */ -i8254_pit_init (isa_bus,0x40 ,0 ,NULL ); -i8257_dma_init (isa_bus,0 ); -/* Super I/O */ -isa_create_simple (isa_bus,TYPE_VT82C686B_SUPERIO ); +qdev_connect_gpio_out (DEVICE (dev),0 , intc); dev =pci_new (PCI_DEVFN (slot,1 ),"via-ide" );qdev_prop_set_bit (&dev->qdev,"legacy-mode" , true);
@@ -302,7 +286,6 @@ static void mips_fuloong2e_init(MachineState *machine)int64_t kernel_entry;PCIDevice *pci_dev;PCIBus *pci_bus; -ISABus *isa_bus;I2CBus *smbus;Clock *cpuclk;MIPSCPU *cpu;
@@ -369,7 +352,7 @@ static void mips_fuloong2e_init(MachineState *machine)/* South bridge -> IP5 */ vt82c686b_southbridge_init (pci_bus,FULOONG2E_VIA_SLOT , env->irq[5 ], - &smbus, &isa_bus); + &smbus);/* GPU */ if (vga_interface_type !=VGA_NONE ) {
@@ -384,8 +367,6 @@ static void mips_fuloong2e_init(MachineState *machine) spd_data =spd_data_generate (DDR , machine->ram_size);smbus_eeprom_init_one (smbus,0x50 , spd_data); -mc146818_rtc_init (isa_bus,2000 ,NULL ); -/* Network card: RTL8139D */ network_init (pci_bus); }
Signature · 1 line
2.21.3
PATCH 20/24 vt82c686: Fix superio_cfg_{read,write}() functions
In reply to BALATON Zoltan viaThese functions are memory region callbacks so we have to check against relative address not the mapped address. Also reduce indentation by returning early and log unimplemented accesses. Additionally we remove separate index value from SuperIOConfig and store the index at reg 0 which is reserved and returns 0 on read. This simpilifies object state.
--- hw/isa/vt82c686.c | 63 ++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 28 deletions(-)
hw/isa/vt82c686.c +35 -28
@@ -26,6 +26,7 @@#include "hw/acpi/acpi.h" #include "hw/i2c/pm_smbus.h" #include "qapi/error.h" +#include "qemu/log.h" #include "qemu/module.h" #include "qemu/range.h" #include "qemu/timer.h"
@@ -250,7 +251,6 @@ static const TypeInfo vt8231_pm_info = {typedef struct SuperIOConfig {uint8_t regs[0x100 ]; -uint8_t index;MemoryRegion io; }SuperIOConfig ;
@@ -258,42 +258,49 @@ static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, unsigned size) {SuperIOConfig *sc = opaque; +uint8_t idx = sc->regs[0 ]; -if (addr ==0x3f0 ) {/* config index register */ - sc->index = data &0xff ; - }else { -bool can_write = true; -/* 0x3f1, config data register */ -trace_via_superio_write (sc->index, data &0xff ); -switch (sc->index) { - case 0x00 ... 0xdf: -case 0xe4 : -case 0xe5 : - case 0xe9 ... 0xed: -case 0xf3 : -case 0xf5 : -case 0xf7 : - case 0xf9 ... 0xfb: - case 0xfd ... 0xff: - can_write = false; -break ; -/* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ -default : -break ; +if (addr ==0 ) {/* config index register */ + sc->regs[0 ] = data; +return ; + } - } -if (can_write) { - sc->regs[sc->index] = data &0xff ; - } +/* config data register */ +trace_via_superio_write (idx, data); +switch (idx) { + case 0x00 ... 0xdf: +case 0xe4 : +case 0xe5 : + case 0xe9 ... 0xed: +case 0xf3 : +case 0xf5 : +case 0xf7 : + case 0xf9 ... 0xfb: + case 0xfd ... 0xff: +/* ignore write to read only registers */ +return ; +/* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ +default : +qemu_log_mask (LOG_UNIMP , +"via_superio_cfg: unimplemented register 0x%x\n" , idx); +break ; } + sc->regs[idx] = data; }static uint64_t superio_cfg_read (void *opaque,hwaddr addr,unsigned size) {SuperIOConfig *sc = opaque; -uint8_t val = sc->regs[sc->index]; +uint8_t idx = sc->regs[0 ]; +uint8_t val = sc->regs[idx]; -trace_via_superio_read (sc->index, val); +if (addr ==0 ) { +return idx; + } +if (addr ==1 && idx ==0 ) { + val =0 ;/* reading reg 0 where we store index value */ + } +trace_via_superio_read (idx, val);return val; }
Signature · 1 line
2.21.3
PATCH 21/24 vt82c686: Implement control of serial port io ranges via config regs
In reply to BALATON Zoltan viaIn VIA super south bridge the io ranges of superio components (parallel and serial ports and FDC) can be controlled by superio config registers to set their base address and enable/disable them. This is not easy to implement in QEMU because ISA emulation is only designed to set io base address once on creating the device and io ranges are registered at creation and cannot easily be disabled or moved later.
In this patch we hack around that but only for serial ports because those have a single io range at port base that's relatively easy to handle and it's what guests actually use and set address different than the default.
We do not attempt to handle controlling the parallel and FDC regions because those have multiple io ranges so handling them would be messy and guests either don't change their deafult or don't care. We could even get away with disabling and not emulating them, but since they are already there, this patch leaves them mapped at their default address just in case this could be useful for a guest in the future.
--- hw/isa/vt82c686.c | 84 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 82 insertions(+), 2 deletions(-)
hw/isa/vt82c686.c +82 -2
@@ -252,8 +252,24 @@ static const TypeInfo vt8231_pm_info = {typedef struct SuperIOConfig {uint8_t regs[0x100 ];MemoryRegion io; +ISASuperIODevice *superio; +MemoryRegion *serial_io[SUPERIO_MAX_SERIAL_PORTS ]; }SuperIOConfig ; +static MemoryRegion *find_subregion (ISADevice *d,MemoryRegion *parent, +int offs) +{ +MemoryRegion *subregion, *mr =NULL ; + + QTAILQ_FOREACH(subregion, &parent->subregions, subregions_link) { +if (subregion->addr == offs) { + mr = subregion; +break ; + } + } +return mr; +} +static void superio_cfg_write (void *opaque,hwaddr addr,uint64_t data,unsigned size) {
@@ -279,7 +295,53 @@ static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, case 0xfd ... 0xff:/* ignore write to read only registers */ return ; -/* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ +case 0xe2 : + { + data &=0x1f ; +if (data &BIT (2 )) {/* Serial port 1 enable */ +ISADevice *dev = sc->superio->serial[0 ]; +if (!memory_region_is_mapped (sc->serial_io[0 ])) { +memory_region_add_subregion (isa_address_space_io (dev), + dev->ioport_id, sc->serial_io[0 ]); + } + }else { +MemoryRegion *io =isa_address_space_io (sc->superio->serial[0 ]); +if (memory_region_is_mapped (sc->serial_io[0 ])) { +memory_region_del_subregion (io, sc->serial_io[0 ]); + } + } +if (data &BIT (3 )) {/* Serial port 2 enable */ +ISADevice *dev = sc->superio->serial[1 ]; +if (!memory_region_is_mapped (sc->serial_io[1 ])) { +memory_region_add_subregion (isa_address_space_io (dev), + dev->ioport_id, sc->serial_io[1 ]); + } + }else { +MemoryRegion *io =isa_address_space_io (sc->superio->serial[1 ]); +if (memory_region_is_mapped (sc->serial_io[1 ])) { +memory_region_del_subregion (io, sc->serial_io[1 ]); + } + } +break ; + } +case 0xe7 :/* Serial port 1 io base address */ + { + data &=0xfe ; + sc->superio->serial[0 ]->ioport_id = data <<2 ; +if (memory_region_is_mapped (sc->serial_io[0 ])) { +memory_region_set_address (sc->serial_io[0 ], data <<2 ); + } +break ; + } +case 0xe8 :/* Serial port 2 io base address */ + { + data &=0xfe ; + sc->superio->serial[1 ]->ioport_id = data <<2 ; +if (memory_region_is_mapped (sc->serial_io[1 ])) { +memory_region_set_address (sc->serial_io[1 ], data <<2 ); + } +break ; + }default :qemu_log_mask (LOG_UNIMP ,"via_superio_cfg: unimplemented register 0x%x\n" , idx);
@@ -385,6 +447,7 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)DeviceState *dev =DEVICE (d);ISABus *isa_bus;qemu_irq *isa_irq; +ISASuperIOClass *ic;int i;qdev_init_gpio_out (dev, &s->cpu_intr,1 );
@@ -394,7 +457,9 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)isa_bus_irqs (isa_bus,i8259_init (isa_bus, *isa_irq));i8254_pit_init (isa_bus,0x40 ,0 ,NULL );i8257_dma_init (isa_bus,0 ); -isa_create_simple (isa_bus,TYPE_VT82C686B_SUPERIO ); + s->superio_cfg.superio =ISA_SUPERIO (isa_create_simple (isa_bus, +TYPE_VT82C686B_SUPERIO )); + ic =ISA_SUPERIO_GET_CLASS (s->superio_cfg.superio);mc146818_rtc_init (isa_bus,2000 ,NULL );for (i =0 ; i <PCI_CONFIG_HEADER_SIZE ; i++) {
@@ -412,6 +477,21 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)*/ memory_region_add_subregion (isa_bus->address_space_io,0x3f0 , &s->superio_cfg.io); + +/* Grab io regions of serial devices so we can control them */ +for (i =0 ; i < ic->serial.count; i++) { +ISADevice *sd = s->superio_cfg.superio->serial[i]; +MemoryRegion *io =isa_address_space_io (sd); +MemoryRegion *mr =find_subregion (sd, io, sd->ioport_id); +if (!mr) { +error_setg (errp,"Could not get io region for serial %d" , i); +return ; + } + s->superio_cfg.serial_io[i] = mr; +if (memory_region_is_mapped (mr)) { +memory_region_del_subregion (io, mr); + } + } }static void via_class_init (ObjectClass *klass,void *data)
Signature · 1 line
2.21.3
PATCH 22/24 vt82c686: QOM-ify superio related functionality
In reply to BALATON Zoltan viaCollect superio functionality and its controlling config registers handling in an abstract VIA_SUPERIO class that is a subclass of ISA_SUPERIO and put vt82c686b specific parts in a subclass of this abstract class.
--- hw/isa/vt82c686.c | 240 ++++++++++++++++++++++++-------------- include/hw/isa/vt82c686.h | 1 - 2 files changed, 150 insertions(+), 91 deletions(-)
hw/isa/vt82c686.c +150 -90
@@ -249,12 +249,21 @@ static const TypeInfo vt8231_pm_info = { }; -typedef struct SuperIOConfig { +#define TYPE_VIA_SUPERIO "via-superio" +OBJECT_DECLARE_SIMPLE_TYPE(ViaSuperIOState, VIA_SUPERIO) + +struct ViaSuperIOState { +ISASuperIODevice superio;uint8_t regs[0x100 ]; +const MemoryRegionOps *io_ops;MemoryRegion io; -ISASuperIODevice *superio;MemoryRegion *serial_io[SUPERIO_MAX_SERIAL_PORTS ]; -}SuperIOConfig ; +}; + +static inline void via_superio_io_enable (ViaSuperIOState *s,bool enable) +{ +memory_region_set_enabled (&s->io, enable); +}static MemoryRegion *find_subregion (ISADevice *d,MemoryRegion *parent,int offs)
@@ -270,10 +279,76 @@ static MemoryRegion *find_subregion(ISADevice *d, MemoryRegion *parent,return mr; } -static void superio_cfg_write (void *opaque,hwaddr addr,uint64_t data, -unsigned size) +static void via_superio_realize (DeviceState *d,Error **errp) +{ +ViaSuperIOState *s =VIA_SUPERIO (d); +ISASuperIOClass *ic =ISA_SUPERIO_GET_CLASS (s); +int i; + +assert (s->io_ops); + ic->parent_realize (d, errp); +if (*errp) { +return ; + } +/* Grab io regions of serial devices so we can control them */ +for (i =0 ; i < ic->serial.count; i++) { +ISADevice *sd = s->superio.serial[i]; +MemoryRegion *io =isa_address_space_io (sd); +MemoryRegion *mr =find_subregion (sd, io, sd->ioport_id); +if (!mr) { +error_setg (errp,"Could not get io region for serial %d" , i); +return ; + } + s->serial_io[i] = mr; + } + +memory_region_init_io (&s->io,OBJECT (d), s->io_ops, s,"via-superio" ,2 ); +memory_region_set_enabled (&s->io, false); +/* The floppy also uses 0x3f0 and 0x3f1 but this seems to work anyway */ +memory_region_add_subregion (isa_address_space_io (ISA_DEVICE (s)),0x3f0 , + &s->io); +} + +static uint64_t via_superio_cfg_read (void *opaque,hwaddr addr,unsigned size) +{ +ViaSuperIOState *sc = opaque; +uint8_t idx = sc->regs[0 ]; +uint8_t val = sc->regs[idx]; + +if (addr ==0 ) { +return idx; + } +if (addr ==1 && idx ==0 ) { + val =0 ;/* reading reg 0 where we store index value */ + } +trace_via_superio_read (idx, val); +return val; +} + +static void via_superio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ISASuperIOClass *sc =ISA_SUPERIO_CLASS (klass); + + sc->parent_realize = dc->realize; + dc->realize = via_superio_realize; +} + +static const TypeInfo via_superio_info = { + .name =TYPE_VIA_SUPERIO , + .parent =TYPE_ISA_SUPERIO , + .instance_size =sizeof (ViaSuperIOState), + .class_size =sizeof (ISASuperIOClass), + .class_init = via_superio_class_init, + .abstract = true, +}; + +#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" + +static void vt82c686b_superio_cfg_write (void *opaque,hwaddr addr, +uint64_t data,unsigned size) { -SuperIOConfig *sc = opaque; +ViaSuperIOState *sc = opaque;uint8_t idx = sc->regs[0 ];if (addr ==0 ) {/* config index register */
@@ -295,29 +370,29 @@ static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, case 0xfd ... 0xff:/* ignore write to read only registers */ return ; -case 0xe2 : +case 0xe2 :/* Function select */ { data &=0x1f ;if (data &BIT (2 )) {/* Serial port 1 enable */ -ISADevice *dev = sc->superio->serial[0 ]; +ISADevice *dev = sc->superio.serial[0 ];if (!memory_region_is_mapped (sc->serial_io[0 ])) {memory_region_add_subregion (isa_address_space_io (dev), dev->ioport_id, sc->serial_io[0 ]); } }else { -MemoryRegion *io =isa_address_space_io (sc->superio->serial[0 ]); +MemoryRegion *io =isa_address_space_io (sc->superio.serial[0 ]);if (memory_region_is_mapped (sc->serial_io[0 ])) {memory_region_del_subregion (io, sc->serial_io[0 ]); } }if (data &BIT (3 )) {/* Serial port 2 enable */ -ISADevice *dev = sc->superio->serial[1 ]; +ISADevice *dev = sc->superio.serial[1 ];if (!memory_region_is_mapped (sc->serial_io[1 ])) {memory_region_add_subregion (isa_address_space_io (dev), dev->ioport_id, sc->serial_io[1 ]); } }else { -MemoryRegion *io =isa_address_space_io (sc->superio->serial[1 ]); +MemoryRegion *io =isa_address_space_io (sc->superio.serial[1 ]);if (memory_region_is_mapped (sc->serial_io[1 ])) {memory_region_del_subregion (io, sc->serial_io[1 ]); }
@@ -327,7 +402,7 @@ static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data,case 0xe7 :/* Serial port 1 io base address */ { data &=0xfe ; - sc->superio->serial[0 ]->ioport_id = data <<2 ; + sc->superio.serial[0 ]->ioport_id = data <<2 ;if (memory_region_is_mapped (sc->serial_io[0 ])) {memory_region_set_address (sc->serial_io[0 ], data <<2 ); }
@@ -336,7 +411,7 @@ static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data,case 0xe8 :/* Serial port 2 io base address */ { data &=0xfe ; - sc->superio->serial[1 ]->ioport_id = data <<2 ; + sc->superio.serial[1 ]->ioport_id = data <<2 ;if (memory_region_is_mapped (sc->serial_io[1 ])) {memory_region_set_address (sc->serial_io[1 ], data <<2 ); }
@@ -350,25 +425,9 @@ static void superio_cfg_write(void *opaque, hwaddr addr, uint64_t data, sc->regs[idx] = data; } -static uint64_t superio_cfg_read (void *opaque,hwaddr addr,unsigned size) -{ -SuperIOConfig *sc = opaque; -uint8_t idx = sc->regs[0 ]; -uint8_t val = sc->regs[idx]; - -if (addr ==0 ) { -return idx; - } -if (addr ==1 && idx ==0 ) { - val =0 ;/* reading reg 0 where we store index value */ - } -trace_via_superio_read (idx, val); -return val; -} - -static const MemoryRegionOps superio_cfg_ops = { - .read = superio_cfg_read, - .write = superio_cfg_write, +static const MemoryRegionOps vt82c686b_superio_cfg_ops = { + .read = via_superio_cfg_read, + .write = vt82c686b_superio_cfg_write, .endianness =DEVICE_NATIVE_ENDIAN , .impl = { .min_access_size =1 ,
@@ -376,13 +435,66 @@ static const MemoryRegionOps superio_cfg_ops = { }, }; +static void vt82c686b_superio_reset (DeviceState *dev) +{ +ViaSuperIOState *s =VIA_SUPERIO (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +/* Device ID */ +vt82c686b_superio_cfg_write (s,0 ,0xe0 ,1 ); +vt82c686b_superio_cfg_write (s,1 ,0x3c ,1 ); +/* Function select - all disabled */ +vt82c686b_superio_cfg_write (s,0 ,0xe2 ,1 ); +vt82c686b_superio_cfg_write (s,1 ,0x03 ,1 ); +/* Floppy ctrl base addr */ +vt82c686b_superio_cfg_write (s,0 ,0xe3 ,1 ); +vt82c686b_superio_cfg_write (s,1 ,0xfc ,1 ); +/* Parallel port base addr */ +vt82c686b_superio_cfg_write (s,0 ,0xe6 ,1 ); +vt82c686b_superio_cfg_write (s,1 ,0xde ,1 ); +/* Serial port 1 base addr */ +vt82c686b_superio_cfg_write (s,0 ,0xe7 ,1 ); +vt82c686b_superio_cfg_write (s,1 ,0xfe ,1 ); +/* Serial port 2 base addr */ +vt82c686b_superio_cfg_write (s,0 ,0xe8 ,1 ); +vt82c686b_superio_cfg_write (s,1 ,0xbe ,1 ); + +vt82c686b_superio_cfg_write (s,0 ,0 ,1 ); +} + +static void vt82c686b_superio_init (Object *obj) +{ +VIA_SUPERIO (obj)->io_ops = &vt82c686b_superio_cfg_ops; +} + +static void vt82c686b_superio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ISASuperIOClass *sc =ISA_SUPERIO_CLASS (klass); + + dc->reset = vt82c686b_superio_reset; + sc->serial.count =2 ; + sc->parallel.count =1 ; + sc->ide.count =0 ;/* emulated by via-ide */ + sc->floppy.count =1 ; +} + +static const TypeInfo vt82c686b_superio_info = { + .name =TYPE_VT82C686B_SUPERIO , + .parent =TYPE_VIA_SUPERIO , + .instance_size =sizeof (ViaSuperIOState), + .instance_init = vt82c686b_superio_init, + .class_size =sizeof (ISASuperIOClass), + .class_init = vt82c686b_superio_class_init, +}; + OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)struct VT82C686BISAState {PCIDevice dev;qemu_irq cpu_intr; -SuperIOConfig superio_cfg; +ViaSuperIOState *via_sio; };static void via_isa_request_i8259_irq (void *opaque,int irq,int level)
@@ -400,7 +512,7 @@ static void vt82c686b_write_config(PCIDevice *d, uint32_t addr,pci_default_write_config (d, addr, val, len);if (addr ==0x85 ) {/* BIT(1): enable or disable superio config io ports */ -memory_region_set_enabled (&s->superio_cfg.io, val &BIT (1 )); +via_superio_io_enable (s->via_sio, val &BIT (1 )); } }
@@ -432,13 +544,6 @@ static void vt82c686b_isa_reset(DeviceState *dev) pci_conf[0x5a ] =0x04 ;/* KBC/RTC Control*/ pci_conf[0x5f ] =0x04 ; pci_conf[0x77 ] =0x10 ;/* GPIO Control 1/2/3/4 */ - - s->superio_cfg.regs[0xe0 ] =0x3c ;/* Device ID */ - s->superio_cfg.regs[0xe2 ] =0x03 ;/* Function select */ - s->superio_cfg.regs[0xe3 ] =0xfc ;/* Floppy ctrl base addr */ - s->superio_cfg.regs[0xe6 ] =0xde ;/* Parallel port base addr */ - s->superio_cfg.regs[0xe7 ] =0xfe ;/* Serial port 1 base addr */ - s->superio_cfg.regs[0xe8 ] =0xbe ;/* Serial port 2 base addr */ }static void vt82c686b_realize (PCIDevice *d,Error **errp)
@@ -447,7 +552,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)DeviceState *dev =DEVICE (d);ISABus *isa_bus;qemu_irq *isa_irq; -ISASuperIOClass *ic;int i;qdev_init_gpio_out (dev, &s->cpu_intr,1 );
@@ -457,9 +561,8 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp)isa_bus_irqs (isa_bus,i8259_init (isa_bus, *isa_irq));i8254_pit_init (isa_bus,0x40 ,0 ,NULL );i8257_dma_init (isa_bus,0 ); - s->superio_cfg.superio =ISA_SUPERIO (isa_create_simple (isa_bus, -TYPE_VT82C686B_SUPERIO )); - ic =ISA_SUPERIO_GET_CLASS (s->superio_cfg.superio); + s->via_sio =VIA_SUPERIO (isa_create_simple (isa_bus, +TYPE_VT82C686B_SUPERIO ));mc146818_rtc_init (isa_bus,2000 ,NULL );for (i =0 ; i <PCI_CONFIG_HEADER_SIZE ; i++) {
@@ -467,31 +570,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) d->wmask[i] =0 ; } } - -memory_region_init_io (&s->superio_cfg.io,OBJECT (d), &superio_cfg_ops, - &s->superio_cfg,"superio_cfg" ,2 ); -memory_region_set_enabled (&s->superio_cfg.io, false); -/* -* The floppy also uses 0x3f0 and 0x3f1. -* But we do not emulate a floppy, so just set it here. -*/ -memory_region_add_subregion (isa_bus->address_space_io,0x3f0 , - &s->superio_cfg.io); - -/* Grab io regions of serial devices so we can control them */ -for (i =0 ; i < ic->serial.count; i++) { -ISADevice *sd = s->superio_cfg.superio->serial[i]; -MemoryRegion *io =isa_address_space_io (sd); -MemoryRegion *mr =find_subregion (sd, io, sd->ioport_id); -if (!mr) { -error_setg (errp,"Could not get io region for serial %d" , i); -return ; - } - s->superio_cfg.serial_io[i] = mr; -if (memory_region_is_mapped (mr)) { -memory_region_del_subregion (io, mr); - } - } }static void via_class_init (ObjectClass *klass,void *data)
@@ -527,32 +605,14 @@ static const TypeInfo via_info = { }; -static void vt82c686b_superio_class_init (ObjectClass *klass,void *data) -{ -ISASuperIOClass *sc =ISA_SUPERIO_CLASS (klass); - - sc->serial.count =2 ; - sc->parallel.count =1 ; - sc->ide.count =0 ; - sc->floppy.count =1 ; -} - -static const TypeInfo via_superio_info = { - .name =TYPE_VT82C686B_SUPERIO , - .parent =TYPE_ISA_SUPERIO , - .instance_size =sizeof (ISASuperIODevice), - .class_size =sizeof (ISASuperIOClass), - .class_init = vt82c686b_superio_class_init, -}; - -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); +type_register_static (&vt82c686b_superio_info); +type_register_static (&via_info); }type_init (vt82c686b_register_types)
include/hw/isa/vt82c686.h +0 -1
@@ -2,7 +2,6 @@#define HW_VT82C686_H #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"
Signature · 1 line
2.21.3
PATCH 23/24 vt82c686: Add VT8231_SUPERIO based on VIA_SUPERIO
In reply to BALATON Zoltan viaThe VT8231 south bridge is very similar to VT82C686B but there are some differences in register addresses and functionality, e.g. the VT8231 only has one serial port. This commit adds VT8231_SUPERIO subclass based on the abstract VIA_SUPERIO class to emulate the superio part of VT8231.
--- hw/isa/vt82c686.c | 121 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+)
hw/isa/vt82c686.c +121 -0
@@ -489,6 +489,126 @@ static const TypeInfo vt82c686b_superio_info = { }; +#define TYPE_VT8231_SUPERIO "vt8231-superio" + +static void vt8231_superio_cfg_write (void *opaque,hwaddr addr, +uint64_t data,unsigned size) +{ +ViaSuperIOState *sc = opaque; +uint8_t idx = sc->regs[0 ]; + +if (addr ==0 ) {/* config index register */ + sc->regs[0 ] = data; +return ; + } + +/* config data register */ +trace_via_superio_write (idx, data); +switch (idx) { + case 0x00 ... 0xdf: + case 0xe7 ... 0xef: + case 0xf0 ... 0xf1: +case 0xf5 : +case 0xf8 : +case 0xfd : +/* ignore write to read only registers */ +return ; +case 0xf2 :/* Function select */ + { + data &=0x17 ; +if (data &BIT (2 )) {/* Serial port enable */ +ISADevice *dev = sc->superio.serial[0 ]; +if (!memory_region_is_mapped (sc->serial_io[0 ])) { +memory_region_add_subregion (isa_address_space_io (dev), + dev->ioport_id, sc->serial_io[0 ]); + } + }else { +MemoryRegion *io =isa_address_space_io (sc->superio.serial[0 ]); +if (memory_region_is_mapped (sc->serial_io[0 ])) { +memory_region_del_subregion (io, sc->serial_io[0 ]); + } + } +break ; + } +case 0xf4 :/* Serial port io base address */ + { + data &=0xfe ; + sc->superio.serial[0 ]->ioport_id = data <<2 ; +if (memory_region_is_mapped (sc->serial_io[0 ])) { +memory_region_set_address (sc->serial_io[0 ], data <<2 ); + } +break ; + } +default : +qemu_log_mask (LOG_UNIMP , +"via_superio_cfg: unimplemented register 0x%x\n" , idx); +break ; + } + sc->regs[idx] = data; +} + +static const MemoryRegionOps vt8231_superio_cfg_ops = { + .read = via_superio_cfg_read, + .write = vt8231_superio_cfg_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .impl = { + .min_access_size =1 , + .max_access_size =1 , + }, +}; + +static void vt8231_superio_reset (DeviceState *dev) +{ +ViaSuperIOState *s =VIA_SUPERIO (dev); + +memset (s->regs,0 ,sizeof (s->regs)); +/* Device ID */ + s->regs[0xf0 ] =0x3c ; +/* Device revision */ + s->regs[0xf1 ] =0x01 ; +/* Function select - all disabled */ +vt8231_superio_cfg_write (s,0 ,0xf2 ,1 ); +vt8231_superio_cfg_write (s,1 ,0x03 ,1 ); +/* Serial port base addr */ +vt8231_superio_cfg_write (s,0 ,0xf4 ,1 ); +vt8231_superio_cfg_write (s,1 ,0xfe ,1 ); +/* Parallel port base addr */ +vt8231_superio_cfg_write (s,0 ,0xf6 ,1 ); +vt8231_superio_cfg_write (s,1 ,0xde ,1 ); +/* Floppy ctrl base addr */ +vt8231_superio_cfg_write (s,0 ,0xf7 ,1 ); +vt8231_superio_cfg_write (s,1 ,0xfc ,1 ); + +vt8231_superio_cfg_write (s,0 ,0 ,1 ); +} + +static void vt8231_superio_init (Object *obj) +{ +VIA_SUPERIO (obj)->io_ops = &vt8231_superio_cfg_ops; +} + +static void vt8231_superio_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ISASuperIOClass *sc =ISA_SUPERIO_CLASS (klass); + + dc->reset = vt8231_superio_reset; + sc->serial.count =1 ; + sc->parallel.count =1 ; + sc->ide.count =0 ;/* emulated by via-ide */ + sc->floppy.count =1 ; +} + +static const TypeInfo vt8231_superio_info = { + .name =TYPE_VT8231_SUPERIO , + .parent =TYPE_VIA_SUPERIO , + .instance_size =sizeof (ViaSuperIOState), + .instance_init = vt8231_superio_init, + .class_size =sizeof (ISASuperIOClass), + .class_init = vt8231_superio_class_init, +}; + + OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA)struct VT82C686BISAState {
@@ -612,6 +732,7 @@ static void vt82c686b_register_types(void)type_register_static (&vt8231_pm_info);type_register_static (&via_superio_info);type_register_static (&vt82c686b_superio_info); +type_register_static (&vt8231_superio_info);type_register_static (&via_info); }
Signature · 1 line
2.21.3
PATCH 24/24 vt82c686: Add emulation of VT8231 south bridge
In reply to BALATON Zoltan viaAdd emulation of VT8231 south bridge ISA part based on the similar VT82C686B but implemented in a separate subclass that holds the differences while reusing parts that can be shared.
--- hw/isa/vt82c686.c | 152 ++++++++++++++++++++++++++++++-------- include/hw/isa/vt82c686.h | 1 + 2 files changed, 123 insertions(+), 30 deletions(-)
hw/isa/vt82c686.c +122 -30
@@ -8,6 +8,9 @@* * Contributions after 2012-01-13 are licensed under the terms of the * GNU GPL, version 2 or (at your option) any later version. +* +* VT8231 south bridge support and general clean up to allow it +* Copyright (c) 2018-2020 BALATON Zoltan */ #include "qemu/osdep.h"
@@ -609,24 +612,48 @@ static const TypeInfo vt8231_superio_info = { }; -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) +#define TYPE_VIA_ISA "via-isa" +OBJECT_DECLARE_SIMPLE_TYPE(ViaISAState, VIA_ISA) -struct VT82C686BISAState { +struct ViaISAState {PCIDevice dev;qemu_irq cpu_intr;ViaSuperIOState *via_sio; }; +static const VMStateDescription vmstate_via = { + .name ="via-isa" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (VMStateField []) { +VMSTATE_PCI_DEVICE (dev, ViaISAState), +VMSTATE_END_OF_LIST () + } +}; + +static const TypeInfo via_isa_info = { + .name =TYPE_VIA_ISA , + .parent =TYPE_PCI_DEVICE , + .instance_size =sizeof (ViaISAState), + .abstract = true, + .interfaces = (InterfaceInfo []) { + {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; +static void via_isa_request_i8259_irq (void *opaque,int irq,int level) { -VT82C686BISAState *s = opaque; +ViaISAState *s = opaque;qemu_set_irq (s->cpu_intr, level); } +/* TYPE_VT82C686B_ISA */ +static void vt82c686b_write_config (PCIDevice *d,uint32_t addr,uint32_t val,int len) { -VT82C686BISAState *s =VT82C686B_ISA (d); +ViaISAState *s =VIA_ISA (d);trace_via_isa_write (addr, val, len);pci_default_write_config (d, addr, val, len);
@@ -636,19 +663,9 @@ static void vt82c686b_write_config(PCIDevice *d, uint32_t addr, } } -static const VMStateDescription vmstate_via = { - .name ="vt82c686b" , - .version_id =1 , - .minimum_version_id =1 , - .fields = (VMStateField []) { -VMSTATE_PCI_DEVICE (dev, VT82C686BISAState), -VMSTATE_END_OF_LIST () - } -}; -static void vt82c686b_isa_reset (DeviceState *dev) { -VT82C686BISAState *s =VT82C686B_ISA (dev); +ViaISAState *s =VIA_ISA (dev);uint8_t *pci_conf = s->dev.config;pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 );
@@ -668,7 +685,7 @@ static void vt82c686b_isa_reset(DeviceState *dev)static void vt82c686b_realize (PCIDevice *d,Error **errp) { -VT82C686BISAState *s =VT82C686B_ISA (d); +ViaISAState *s =VIA_ISA (d);DeviceState *dev =DEVICE (d);ISABus *isa_bus;qemu_irq *isa_irq;
@@ -692,7 +709,7 @@ static void vt82c686b_realize(PCIDevice *d, Error **errp) } } -static void via_class_init (ObjectClass *klass,void *data) +static void vt82c686b_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass);
@@ -706,22 +723,95 @@ static void via_class_init(ObjectClass *klass, void *data) dc->reset = vt82c686b_isa_reset; dc->desc ="ISA bridge" ; dc->vmsd = &vmstate_via; -/* -* Reason: part of VIA VT82C686 southbridge, needs to be wired up, -* e.g. by mips_fuloong2e_init() -*/ +/* Reason: part of VIA VT82C686 southbridge, needs to be wired up */ dc->user_creatable = false; } -static const TypeInfo via_info = { +static const TypeInfo vt82c686b_isa_info = { .name =TYPE_VT82C686B_ISA , - .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (VT82C686BISAState), - .class_init = via_class_init, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, + .parent =TYPE_VIA_ISA , + .instance_size =sizeof (ViaISAState), + .class_init = vt82c686b_class_init, +}; + +/* TYPE_VT8231_ISA */ + +static void vt8231_write_config (PCIDevice *d,uint32_t addr, +uint32_t val,int len) +{ +ViaISAState *s =VIA_ISA (d); + +trace_via_isa_write (addr, val, len); +pci_default_write_config (d, addr, val, len); +if (addr ==0x50 ) { +/* BIT(2): enable or disable superio config io ports */ +via_superio_io_enable (s->via_sio, val &BIT (2 )); + } +} + +static void vt8231_isa_reset (DeviceState *dev) +{ +ViaISAState *s =VIA_ISA (dev); +uint8_t *pci_conf = s->dev.config; + +pci_set_long (pci_conf +PCI_CAPABILITY_LIST ,0x000000c0 ); +pci_set_word (pci_conf +PCI_COMMAND ,PCI_COMMAND_IO |PCI_COMMAND_MEMORY | +PCI_COMMAND_MASTER |PCI_COMMAND_SPECIAL ); +pci_set_word (pci_conf +PCI_STATUS ,PCI_STATUS_DEVSEL_MEDIUM ); + + pci_conf[0x58 ] =0x40 ;/* Miscellaneous Control 0 */ + pci_conf[0x67 ] =0x08 ;/* Fast IR Config */ + pci_conf[0x6b ] =0x01 ;/* Fast IR I/O Base */ +} + +static void vt8231_realize (PCIDevice *d,Error **errp) +{ +ViaISAState *s =VIA_ISA (d); +DeviceState *dev =DEVICE (d); +ISABus *isa_bus; +qemu_irq *isa_irq; +int i; + +qdev_init_gpio_out (dev, &s->cpu_intr,1 ); + isa_irq =qemu_allocate_irqs (via_isa_request_i8259_irq, s,1 ); + isa_bus =isa_bus_new (dev,get_system_memory (),pci_address_space_io (d), + &error_fatal); +isa_bus_irqs (isa_bus,i8259_init (isa_bus, *isa_irq)); +i8254_pit_init (isa_bus,0x40 ,0 ,NULL ); +i8257_dma_init (isa_bus,0 ); + s->via_sio =VIA_SUPERIO (isa_create_simple (isa_bus,TYPE_VT8231_SUPERIO )); +mc146818_rtc_init (isa_bus,2000 ,NULL ); + +for (i =0 ; i <PCI_CONFIG_HEADER_SIZE ; i++) { +if (i <PCI_COMMAND || i >=PCI_REVISION_ID ) { + d->wmask[i] =0 ; + } + } +} + +static void vt8231_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + + k->realize = vt8231_realize; + k->config_write = vt8231_write_config; + k->vendor_id =PCI_VENDOR_ID_VIA ; + k->device_id =0x8231 ; + k->class_id =PCI_CLASS_BRIDGE_ISA ; + k->revision =0x10 ; + dc->reset = vt8231_isa_reset; + dc->desc ="ISA bridge" ; + dc->vmsd = &vmstate_via; +/* Reason: part of VIA VT8231 southbridge, needs to be wired up */ + dc->user_creatable = false; +} + +static const TypeInfo vt8231_isa_info = { + .name =TYPE_VT8231_ISA , + .parent =TYPE_VIA_ISA , + .instance_size =sizeof (ViaISAState), + .class_init = vt8231_class_init, };
@@ -733,7 +823,9 @@ static void vt82c686b_register_types(void)type_register_static (&via_superio_info);type_register_static (&vt82c686b_superio_info);type_register_static (&vt8231_superio_info); -type_register_static (&via_info); +type_register_static (&via_isa_info); +type_register_static (&vt82c686b_isa_info); +type_register_static (&vt8231_isa_info); }type_init (vt82c686b_register_types)
include/hw/isa/vt82c686.h +1 -0
@@ -3,6 +3,7 @@#define TYPE_VT82C686B_ISA "vt82c686b-isa"#define TYPE_VT82C686B_PM "vt82c686b-pm" +#define TYPE_VT8231_ISA "vt8231-isa"#define TYPE_VT8231_PM "vt8231-pm"#define TYPE_VIA_AC97 "via-ac97"#define TYPE_VIA_MC97 "via-mc97"
Signature · 1 line
2.21.3
Quoted 31 lines · BALATON Zoltan via
Hello,
This is an all in one series containing all the patches from my previous part I and part II vt82c686b clean up series plus the end of it to finally add vt8231 emulation that will be used by subsequent ppc/pegasos2 emulation. I consider this finished for now and good enough to get in also cleaning up and improving fuloong2e emulation a bit but previous disclaimer is still valid: It does not aim to fix all existing bugs or make the model perfectly emulate the real chip just reach the level where we can have working emulation to boot guests which can then be improved later. (E.g. I think state saving was broken before and it remains broken after because I don't know all the details how to add vmstate for all kinds of data structures and this could be addressed separately when fixing the already broken state saving if someone wants to test and fix it.) With this it boots at least MorphOS on pegasos2 and works with the pmon_2e.bin for fuloong2e which needs more fixes for Linux that are currently under review. More testing is welcome.
It still needs the Bonito
BONITO_PCICONF_REG_MASKfix for fuloong2e because it no longer maps SMBus but due to the Bonito bug guest cannot write register0xd2to map it. With that fix pmon_2e.bin from here:
http://www.anheng.com.cn/loongson/pmon/ works for me with this
command: qemu-system-mips64el -M fuloong2e -net none -bios pmon_2e.binAfter rolling this for two years now I hope it can finally be merged and eventually also get pegasos2 emulation that will need this.
Regards,
BALATON Zoltan
Quoted 13 lines
BALATON Zoltan (24):
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
vt82c686: Remove unnecessary_DEVICEsuffix from type macros
vt82c686b: Rename VT82C686B toVT82C686B_ISA
vt82c686: Remove vt82c686b_[am]c97_init() functions
vt82c686: Split off via-[am]c97 into separate file in hw/audio audio/via-ac97: Simplify code and setuser_creatableto false
vt82c686: Remove legacyvt82c686b_isa_init()function
vt82c686: Remove legacyvt82c686b_pm_init()function
vt82c686: Convert debug printf to trace points
vt82c686: Remove unneeded includes and defines
vt82c686: Use shorter name for local variable holding object state
vt82c686: Rename superio config related parts
As the first half of this series is reviewed, I'm queuing it (patches 1-12) via mips-next.
Regards,
Phil.
Quoted 46 lines · Philippe Mathieu-Daudé
Quoted 31 lines · BALATON Zoltan via
Hello,
This is an all in one series containing all the patches from my previous part I and part II vt82c686b clean up series plus the end of it to finally add vt8231 emulation that will be used by subsequent ppc/pegasos2 emulation. I consider this finished for now and good enough to get in also cleaning up and improving fuloong2e emulation a bit but previous disclaimer is still valid: It does not aim to fix all existing bugs or make the model perfectly emulate the real chip just reach the level where we can have working emulation to boot guests which can then be improved later. (E.g. I think state saving was broken before and it remains broken after because I don't know all the details how to add vmstate for all kinds of data structures and this could be addressed separately when fixing the already broken state saving if someone wants to test and fix it.) With this it boots at least MorphOS on pegasos2 and works with the pmon_2e.bin for fuloong2e which needs more fixes for Linux that are currently under review. More testing is welcome.
It still needs the Bonito
BONITO_PCICONF_REG_MASKfix for fuloong2e because it no longer maps SMBus but due to the Bonito bug guest cannot write register0xd2to map it. With that fix pmon_2e.bin from here:
http://www.anheng.com.cn/loongson/pmon/ works for me with this
command: qemu-system-mips64el -M fuloong2e -net none -bios pmon_2e.binAfter rolling this for two years now I hope it can finally be merged and eventually also get pegasos2 emulation that will need this.
Regards,
BALATON ZoltanQuoted 13 lines
BALATON Zoltan (24):
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
vt82c686: Remove unnecessary_DEVICEsuffix from type macros
vt82c686b: Rename VT82C686B toVT82C686B_ISA
vt82c686: Remove vt82c686b_[am]c97_init() functions
vt82c686: Split off via-[am]c97 into separate file in hw/audio audio/via-ac97: Simplify code and setuser_creatableto false
vt82c686: Remove legacyvt82c686b_isa_init()function
vt82c686: Remove legacyvt82c686b_pm_init()function
vt82c686: Convert debug printf to trace points
vt82c686: Remove unneeded includes and defines
vt82c686: Use shorter name for local variable holding object state
vt82c686: Rename superio config related parts
Quoted 2 lines
As the first half of this series is reviewed, I'm queuing it (patches 1-12) via mips-next.
Thanks, You may want to fix the single vt82c686b: in the above commit title that was a typo, just for consistency. Will this pull include the Bonito BONITO_PCICONF_REG_MASK fix or some replacement for that? That would be needed to get the rest of this series starting with 15/24 working. Up to that it's just clean up which should be OK. I can repost the remaining patches rebased once it's merged in master or if you tell me which branch should I use.
Regards,
BALATON Zoltan
Quoted 47 lines · BALATON Zoltan via
Quoted 46 lines · Philippe Mathieu-Daudé
Quoted 44 lines · BALATON Zoltan via
Hello,
This is an all in one series containing all the patches from my previous part I and part II vt82c686b clean up series plus the end of it to finally add vt8231 emulation that will be used by subsequent ppc/pegasos2 emulation. I consider this finished for now and good enough to get in also cleaning up and improving fuloong2e emulation a bit but previous disclaimer is still valid: It does not aim to fix all existing bugs or make the model perfectly emulate the real chip just reach the level where we can have working emulation to boot guests which can then be improved later. (E.g. I think state saving was broken before and it remains broken after because I don't know all the details how to add vmstate for all kinds of data structures and this could be addressed separately when fixing the already broken state saving if someone wants to test and fix it.) With this it boots at least MorphOS on pegasos2 and works with the pmon_2e.bin for fuloong2e which needs more fixes for Linux that are currently under review. More testing is welcome.
It still needs the Bonito
BONITO_PCICONF_REG_MASKfix for fuloong2e because it no longer maps SMBus but due to the Bonito bug guest cannot write register0xd2to map it. With that fix pmon_2e.bin from here:
http://www.anheng.com.cn/loongson/pmon/ works for me with this
command: qemu-system-mips64el -M fuloong2e -net none -bios pmon_2e.binAfter rolling this for two years now I hope it can finally be merged and eventually also get pegasos2 emulation that will need this.
Regards,
BALATON ZoltanBALATON Zoltan (24):
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
vt82c686: Remove unnecessary_DEVICEsuffix from type macros
vt82c686b: Rename VT82C686B toVT82C686B_ISA
vt82c686: Remove vt82c686b_[am]c97_init() functions
vt82c686: Split off via-[am]c97 into separate file in hw/audio audio/via-ac97: Simplify code and setuser_creatableto false
vt82c686: Remove legacyvt82c686b_isa_init()function
vt82c686: Remove legacyvt82c686b_pm_init()function
vt82c686: Convert debug printf to trace points
vt82c686: Remove unneeded includes and defines
vt82c686: Use shorter name for local variable holding object state
vt82c686: Rename superio config related parts
Quoted 5 lines
Quoted 2 lines
As the first half of this series is reviewed, I'm queuing it (patches 1-12) via mips-next.
Thanks, You may want to fix the single vt82c686b: in the above commit title that was a typo, just for consistency.
Fixed (along with your git author email, instead of the list).
Quoted 4 lines
Will this pull include the
BonitoBONITO_PCICONF_REG_MASKfix or some replacement for that? That would be needed to get the rest of this series starting with 15/24 working. Up to that it's just clean up which should be OK.
I checked the Bonito(32) ASIC and Bonito64 (FPGA) manuals, and for (vendor_id = 0xdf53, device_id = 0x00d5) our implementation is correct. I am waiting for further news from Jiaxun who asked someone at Loongson for a manual of their Bonito variant.
I expect a different PCI device_id, so we can add it with your change.
Quoted 3 lines
I can repost
the remaining patches rebased once it's merged in master or if you tell me which branch should I use.
IMHO no need (at least not worthwhile until mips/next is merged).
Regards,
Phil.
Quoted 48 lines · Philippe Mathieu-Daudé
Quoted 47 lines · BALATON Zoltan via
Quoted 46 lines · Philippe Mathieu-Daudé
Quoted 44 lines · BALATON Zoltan via
Hello,
This is an all in one series containing all the patches from my previous part I and part II vt82c686b clean up series plus the end of it to finally add vt8231 emulation that will be used by subsequent ppc/pegasos2 emulation. I consider this finished for now and good enough to get in also cleaning up and improving fuloong2e emulation a bit but previous disclaimer is still valid: It does not aim to fix all existing bugs or make the model perfectly emulate the real chip just reach the level where we can have working emulation to boot guests which can then be improved later. (E.g. I think state saving was broken before and it remains broken after because I don't know all the details how to add vmstate for all kinds of data structures and this could be addressed separately when fixing the already broken state saving if someone wants to test and fix it.) With this it boots at least MorphOS on pegasos2 and works with the pmon_2e.bin for fuloong2e which needs more fixes for Linux that are currently under review. More testing is welcome.
It still needs the Bonito
BONITO_PCICONF_REG_MASKfix for fuloong2e because it no longer maps SMBus but due to the Bonito bug guest cannot write register0xd2to map it. With that fix pmon_2e.bin from here:
http://www.anheng.com.cn/loongson/pmon/ works for me with this
command: qemu-system-mips64el -M fuloong2e -net none -bios pmon_2e.binAfter rolling this for two years now I hope it can finally be merged and eventually also get pegasos2 emulation that will need this.
Regards,
BALATON ZoltanBALATON Zoltan (24):
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
vt82c686: Remove unnecessary_DEVICEsuffix from type macros
vt82c686b: Rename VT82C686B toVT82C686B_ISA
vt82c686: Remove vt82c686b_[am]c97_init() functions
vt82c686: Split off via-[am]c97 into separate file in hw/audio audio/via-ac97: Simplify code and setuser_creatableto false
vt82c686: Remove legacyvt82c686b_isa_init()function
vt82c686: Remove legacyvt82c686b_pm_init()function
vt82c686: Convert debug printf to trace points
vt82c686: Remove unneeded includes and defines
vt82c686: Use shorter name for local variable holding object state
vt82c686: Rename superio config related parts
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
As the first half of this series is reviewed, I'm queuing it (patches 1-12) via mips-next.
Thanks, You may want to fix the single vt82c686b: in the above commit title that was a typo, just for consistency.
Fixed (along with your git author email, instead of the list).
Thanks, sorry for the email address, that's something that seems to have changed last August without me doing anthing differently and I still don't know if it's something with the list or my mail provider. I've asked them both but I guess it's still holidays so haven't got an answer yet.
Quoted 5 lines
Quoted 4 lines
Will this pull include the
BonitoBONITO_PCICONF_REG_MASKfix or some replacement for that? That would be needed to get the rest of this series starting with 15/24 working. Up to that it's just clean up which should be OK.
Quoted 7 lines
I checked the Bonito(32) ASIC and Bonito64 (FPGA) manuals, and for (
vendor_id=0xdf53,device_id=0x00d5) our implementation is correct. I am waiting for further news from Jiaxun who asked someone at Loongson for a manual of their Bonito variant.I expect a different PCI
device_id, so we can add it with your change.
It's not my change, Jiaxun suggested it but fixes the problem with accessing register at 0xd2 that's needed on fuloong2e to get SMBus mapped after my series (patch 15 to be exact).
Quoted 5 lines
Quoted 3 lines
I can repost
the remaining patches rebased once it's merged in master or if you tell me which branch should I use.IMHO no need (at least not worthwhile until mips/next is merged).
OK, I'll wait for that then before posting the remaining patches again. If you can have a look at them anyway I can make any necessary changes by then.
Regards,
BALATON Zoltan
Quoted 52 lines · BALATON Zoltan
Quoted 51 lines · Philippe Mathieu-Daudé
Quoted 50 lines · BALATON Zoltan via
Quoted 48 lines · Philippe Mathieu-Daudé
Quoted 31 lines · BALATON Zoltan via
Hello,
This is an all in one series containing all the patches from my previous part I and part II vt82c686b clean up series plus the end of it to finally add vt8231 emulation that will be used by subsequent ppc/pegasos2 emulation. I consider this finished for now and good enough to get in also cleaning up and improving fuloong2e emulation a bit but previous disclaimer is still valid: It does not aim to fix all existing bugs or make the model perfectly emulate the real chip just reach the level where we can have working emulation to boot guests which can then be improved later. (E.g. I think state saving was broken before and it remains broken after because I don't know all the details how to add vmstate for all kinds of data structures and this could be addressed separately when fixing the already broken state saving if someone wants to test and fix it.) With this it boots at least MorphOS on pegasos2 and works with the pmon_2e.bin for fuloong2e which needs more fixes for Linux that are currently under review. More testing is welcome.
It still needs the Bonito
BONITO_PCICONF_REG_MASKfix for fuloong2e because it no longer maps SMBus but due to the Bonito bug guest cannot write register0xd2to map it. With that fix pmon_2e.bin from here:
http://www.anheng.com.cn/loongson/pmon/ works for me with this
command: qemu-system-mips64el -M fuloong2e -net none -bios pmon_2e.binAfter rolling this for two years now I hope it can finally be merged and eventually also get pegasos2 emulation that will need this.
Regards,
BALATON ZoltanQuoted 13 lines
BALATON Zoltan (24):
vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA
vt82c686: Remove unnecessary_DEVICEsuffix from type macros
vt82c686b: Rename VT82C686B toVT82C686B_ISA
vt82c686: Remove vt82c686b_[am]c97_init() functions
vt82c686: Split off via-[am]c97 into separate file in hw/audio audio/via-ac97: Simplify code and setuser_creatableto false
vt82c686: Remove legacyvt82c686b_isa_init()function
vt82c686: Remove legacyvt82c686b_pm_init()function
vt82c686: Convert debug printf to trace points
vt82c686: Remove unneeded includes and defines
vt82c686: Use shorter name for local variable holding object state
vt82c686: Rename superio config related partsAs the first half of this series is reviewed, I'm queuing it (patches 1-12) via mips-next.
Quoted 19 lines
Quoted 4 lines
Quoted 2 lines
Thanks, You may want to fix the single vt82c686b: in the above commit title that was a typo, just for consistency.
Fixed (along with your git author email, instead of the list).
Thanks, sorry for the email address, that's something that seems to have changed last August without me doing anthing differently and I still don't know if it's something with the list or my mail provider. I've asked them both but I guess it's still holidays so haven't got an answer yet.
Quoted 12 lines
Quoted 4 lines
Will this pull include the
BonitoBONITO_PCICONF_REG_MASKfix or some replacement for that? That would be needed to get the rest of this series starting with 15/24 working. Up to that it's just clean up which should be OK.I checked the Bonito(32) ASIC and Bonito64 (FPGA) manuals, and for (
vendor_id=0xdf53,device_id=0x00d5) our implementation is correct. I am waiting for further news from Jiaxun who asked someone at Loongson for a manual of their Bonito variant.I expect a different PCI
device_id, so we can add it with your change.
Hi all,
Bonito 2E manual (Chinese) is available here:
https://github.com/loongson-community/docs/blob/master/2E/Godson_2E_NB_UM.pdf
It said when accessing PCICFG map, the address is continues, so there is no need to mask out lowest 2 bit.
The actual command on PCI bus will be shifted by hardware as per PCI spec requirement, but that is out of our scope, it is SysAD internal implementation.
As you may see, bonito64(malta version) driver in kernel does not shift regno as well.
https://elixir.bootlin.com/linux/latest/source/arch/mips/pci/ops-bonito64.c
So In my opinion the fix is fine.
Thanks.
- Jiaxun
Quoted 13 lines
It's not my change, Jiaxun suggested it but fixes the problem with accessing register at
0xd2that's needed on fuloong2e to get SMBus mapped after my series (patch 15 to be exact).Quoted 5 lines
Quoted 3 lines
I can repost
the remaining patches rebased once it's merged in master or if you tell me which branch should I use.IMHO no need (at least not worthwhile until mips/next is merged).
OK, I'll wait for that then before posting the remaining patches again. If you can have a look at them anyway I can make any necessary changes by then.
Regards,
BALATON Zoltan