hw/isa/vt82c686: Implement relocation and toggling of SuperI/O functions
v3 cover hw/isa/vt82c686: Implement relocation and toggling of SuperI/O functions
This series implements relocation of the SuperI/O functions of the VIA south bridges which resolves some FIXME's. It is part of my via-apollo-pro-133t branch [1] which is an extension of bringing the VIA south bridges to the PC machine [2]. This branch is able to run some real-world X86 BIOSes in the hope that it allows us to form a better understanding of the real vt82c686b devices. Implementing relocation and toggling of the SuperI/O functions is one step to make these BIOSes run without error messages, so here we go.
The series is structured as follows: Patches 1-3 prepare the TYPE_ISA_FDC, TYPE_ISA_PARALLEL and TYPE_ISA_SERIAL to relocate and toggle (enable/disable) themselves without breaking encapsulation of their respective device states. This is achieved by moving the MemoryRegions and PortioLists from the device states into the encapsulating ISA devices since they will be relocated and toggled.
Inspired by the memory API patches 4-6 add two convenience functions to the portio_list API to toggle and relocate portio lists. Patch 5 is a preparation for that which removes some redundancies which otherwise had to be dealt with during relocation.
Patches 7-9 implement toggling and relocation for types TYPE_ISA_FDC, TYPE_ISA_PARALLEL and TYPE_ISA_SERIAL. Patch 10 prepares the pegasos2 machine which would end up with all SuperI/O functions disabled if no -bios argument is given. Patch 11 finally implements the main feature which now relies on firmware to configure the SuperI/O functions accordingly (except for pegasos2).
v3:
* Rework various commit messages (Zoltan)
* Drop patch "hw/char/serial: Free struct SerialState from MemoryRegion" (Zoltan)
* Generalize wording in migration.rst to include portio_list API (Zoltan)
v2:
* Improve commit message (Zoltan)
* Split pegasos2 from vt82c686 patch (Zoltan)
* Avoid poking into device internals (Zoltan)
Testing done:
* make check
* make check-avocado
* Run MorphOS on pegasos2 with and without pegasos2.rom
* Run Linux on amigaone
* Run real-world BIOSes on via-apollo-pro-133t branch
* Start rescue-yl on fuloong2e
[1] https://github.com/shentok/qemu/tree/via-apollo-pro-133t
[2] https://github.com/shentok/qemu/tree/pc-via
Bernhard Beschow (11):
hw/block/fdc-isa: Move portio_list from FDCtrl to FDCtrlISABus hw/block/fdc-sysbus: Move iomem from FDCtrl to FDCtrlSysBus hw/char/parallel: Move portio_list from ParallelState to
ISAParallelState
exec/ioport: Resolve redundant .base attribute in struct
MemoryRegionPortio
exec/ioport: Add portio_list_set_address()
exec/ioport: Add portio_list_set_enabled() hw/block/fdc-isa: Implement relocation and enabling/disabling for
TYPE_ISA_FDC
hw/char/serial-isa: Implement relocation and enabling/disabling for
TYPE_ISA_SERIAL
hw/char/parallel-isa: Implement relocation and enabling/disabling for
TYPE_ISA_PARALLEL
hw/ppc/pegasos2: Let pegasos2 machine configure SuperI/O functions hw/isa/vt82c686: Implement relocation and toggling of SuperI/O
functions
docs/devel/migration.rst | 6 +- hw/block/fdc-internal.h | 4 -- include/exec/ioport.h | 4 +- include/hw/block/fdc.h | 3 + include/hw/char/parallel-isa.h | 5 ++ include/hw/char/parallel.h | 2 - include/hw/char/serial.h | 2 + hw/block/fdc-isa.c | 18 +++++- hw/block/fdc-sysbus.c | 6 +- hw/char/parallel-isa.c | 14 ++++ hw/char/parallel.c | 2 +- hw/char/serial-isa.c | 14 ++++ hw/isa/vt82c686.c | 115 ++++++++++++++++++++++++--------- hw/ppc/pegasos2.c | 15 +++++ system/ioport.c | 41 ++++++++++-- 15 files changed, 200 insertions(+), 51 deletions(-)
Signature · 1 line
2.43.0
PATCH v3 1/11 hw/block/fdc-isa: Move portio_list from FDCtrl to FDCtrlISABus
FDCtrl::portio_list isn't used inside FDCtrl context but only inside FDCtrlISABus context, so move it there.
--- hw/block/fdc-internal.h | 2 -- hw/block/fdc-isa.c | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-)
hw/block/fdc-internal.h +0 -2
@@ -26,7 +26,6 @@#define HW_BLOCK_FDC_INTERNAL_H #include "exec/memory.h" -#include "exec/ioport.h" #include "hw/block/block.h" #include "hw/block/fdc.h" #include "qapi/qapi-types-block.h"
@@ -140,7 +139,6 @@ struct FDCtrl {/* Timers state */ uint8_t timer0;uint8_t timer1; -PortioList portio_list; };extern const FDFormat fd_formats[];
hw/block/fdc-isa.c +3 -1
@@ -42,6 +42,7 @@#include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" +#include "exec/ioport.h" #include "qemu/log.h" #include "qemu/main-loop.h" #include "qemu/module.h"
@@ -60,6 +61,7 @@ struct FDCtrlISABus {uint32_t irq;uint32_t dma;struct FDCtrl state; +PortioList portio_list;int32_t bootindexA;int32_t bootindexB; };
@@ -91,7 +93,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)FDCtrl *fdctrl = &isa->state;Error *err =NULL ; -isa_register_portio_list (isadev, &fdctrl->portio_list, +isa_register_portio_list (isadev, &isa->portio_list, isa->iobase, fdc_portio_list, fdctrl,"fdc" );
Signature · 1 line
2.43.0
PATCH v3 2/11 hw/block/fdc-sysbus: Move iomem from FDCtrl to FDCtrlSysBus
In reply to Bernhard BeschowFDCtrl::iomem isn't used inside FDCtrl context but only inside FDCtrlSysBus context, so move it there.
--- hw/block/fdc-internal.h | 2 -- hw/block/fdc-sysbus.c | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-)
hw/block/fdc-internal.h +0 -2
@@ -25,7 +25,6 @@#ifndef HW_BLOCK_FDC_INTERNAL_H #define HW_BLOCK_FDC_INTERNAL_H -#include "exec/memory.h" #include "hw/block/block.h" #include "hw/block/fdc.h" #include "qapi/qapi-types-block.h"
@@ -91,7 +90,6 @@ typedef struct FDrive { } FDrive;struct FDCtrl { -MemoryRegion iomem;qemu_irq irq;/* Controller state */ QEMUTimer *result_timer;
hw/block/fdc-sysbus.c +4 -2
@@ -26,6 +26,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qom/object.h" +#include "exec/memory.h" #include "hw/sysbus.h" #include "hw/block/fdc.h" #include "migration/vmstate.h"
@@ -52,6 +53,7 @@ struct FDCtrlSysBus {/*< public >*/ struct FDCtrl state; +MemoryRegion iomem; };static uint64_t fdctrl_read_mem (void *opaque,hwaddr reg,unsigned ize)
@@ -146,11 +148,11 @@ static void sysbus_fdc_common_instance_init(Object *obj)qdev_set_legacy_instance_id (dev,0 /* io */ ,2 );/* FIXME */ -memory_region_init_io (&fdctrl->iomem, obj, +memory_region_init_io (&sys->iomem, obj, sbdc->use_strict_io ? &fdctrl_mem_strict_ops : &fdctrl_mem_ops, fdctrl,"fdc" ,0x08 ); -sysbus_init_mmio (sbd, &fdctrl->iomem); +sysbus_init_mmio (sbd, &sys->iomem);sysbus_init_irq (sbd, &fdctrl->irq);qdev_init_gpio_in (dev, fdctrl_handle_tc,1 );
Signature · 1 line
2.43.0
PATCH v3 3/11 hw/char/parallel: Move portio_list from ParallelState to ISAParallelState
In reply to Bernhard BeschowParallelState::portio_list isn't used inside ParallelState context but only inside ISAParallelState context, so move it there.
--- include/hw/char/parallel-isa.h | 2 ++ include/hw/char/parallel.h | 2 -- hw/char/parallel.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/hw/char/parallel-isa.h +2 -0
@@ -12,6 +12,7 @@#include "parallel.h" +#include "exec/ioport.h" #include "hw/isa/isa.h" #include "qom/object.h"
@@ -25,6 +26,7 @@ struct ISAParallelState {uint32_t iobase;uint32_t isairq;ParallelState state; + PortioList portio_list; };#endif /* HW_PARALLEL_ISA_H */
include/hw/char/parallel.h +0 -2
@@ -1,7 +1,6 @@#ifndef HW_PARALLEL_H #define HW_PARALLEL_H -#include "exec/ioport.h" #include "exec/memory.h" #include "hw/isa/isa.h" #include "hw/irq.h"
@@ -22,7 +21,6 @@ typedef struct ParallelState {uint32_t last_read_offset;/* For debugging */ /* Memory-mapped interface */ int it_shift; -PortioList portio_list; } ParallelState;void parallel_hds_isa_init (ISABus *bus,int n);
hw/char/parallel.c +1 -1
@@ -532,7 +532,7 @@ static void parallel_isa_realizefn(DeviceState *dev, Error **errp) s->status = dummy; } - isa_register_portio_list(isadev, &s->portio_list, base, + isa_register_portio_list(isadev, &isa->portio_list, base, (s->hw_driver ? &isa_parallel_portio_hw_list[0] : &isa_parallel_portio_sw_list[0]),
Signature · 1 line
2.43.0
PATCH v3 4/11 exec/ioport: Resolve redundant .base attribute in struct MemoryRegionPortio
In reply to Bernhard Beschowportio_list_add_1() creates a MemoryRegionPortioList instance which holds a MemoryRegion mr and an array of MemoryRegionPortio elements named ports. Each element in the array gets assigned the same value for its .base attribute. The same value also ends up as the .addr attribute of mr due to the memory_region_add_subregion() call. This means that all .base attributes are the same as mr.addr.
The only usages of MemoryRegionPortio::base were in portio_read() and portio_write(). Both functions get above MemoryRegionPortioList as their opaque parameter. In both cases find_portio() can only return one of the MemoryRegionPortio elements of the ports array. Due to above observation any element will have the same .base value equal to mr.addr which is also accessible.
Hence, mrpio->mr.addr is equivalent to mrp->base and MemoryRegionPortio::base is redundant and can be removed.
--- include/exec/ioport.h | 1 - system/ioport.c | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-)
include/exec/ioport.h +0 -1
@@ -35,7 +35,6 @@ typedef struct MemoryRegionPortio {unsigned size;uint32_t (*read)(void *opaque,uint32_t address);void (*write)(void *opaque,uint32_t address,uint32_t data); -uint32_t base;/* private field */ } MemoryRegionPortio;#define PORTIO_END_OF_LIST () { }
system/ioport.c +6 -7
@@ -181,13 +181,13 @@ static uint64_t portio_read(void *opaque, hwaddr addr, unsigned size) data = ((uint64_t )1 << (size *8 )) -1 ;if (mrp) { - data = mrp->read (mrpio->portio_opaque, mrp->base + addr); + data = mrp->read (mrpio->portio_opaque, mrpio->mr.addr + addr); }else if (size ==2 ) { mrp =find_portio (mrpio, addr,1 , false);if (mrp) { - data = mrp->read (mrpio->portio_opaque, mrp->base + addr); + data = mrp->read (mrpio->portio_opaque, mrpio->mr.addr + addr);if (addr +1 < mrp->offset + mrp->len) { - data |= mrp->read (mrpio->portio_opaque, mrp->base + addr +1 ) <<8 ; + data |= mrp->read (mrpio->portio_opaque, mrpio->mr.addr + addr +1 ) <<8 ; }else { data |=0xff00 ; }
@@ -203,13 +203,13 @@ static void portio_write(void *opaque, hwaddr addr, uint64_t data,const MemoryRegionPortio *mrp =find_portio (mrpio, addr, size, true);if (mrp) { - mrp->write (mrpio->portio_opaque, mrp->base + addr, data); + mrp->write (mrpio->portio_opaque, mrpio->mr.addr + addr, data); }else if (size ==2 ) { mrp =find_portio (mrpio, addr,1 , true);if (mrp) { - mrp->write (mrpio->portio_opaque, mrp->base + addr, data &0xff ); + mrp->write (mrpio->portio_opaque, mrpio->mr.addr + addr, data &0xff );if (addr +1 < mrp->offset + mrp->len) { - mrp->write (mrpio->portio_opaque, mrp->base + addr +1 , data >>8 ); + mrp->write (mrpio->portio_opaque, mrpio->mr.addr + addr +1 , data >>8 ); } } }
@@ -244,7 +244,6 @@ static void portio_list_add_1(PortioList *piolist,/* Adjust the offsets to all be zero-based for the region. */ for (i =0 ; i < count; ++i) { mrpio->ports[i].offset -= off_low; - mrpio->ports[i].base = start + off_low; }/*
Signature · 1 line
2.43.0
PATCH v3 5/11 exec/ioport: Add portio_list_set_address()
In reply to Bernhard BeschowSome SuperI/O devices such as the VIA south bridges or the PC87312 controller are able to relocate their SuperI/O functions. Add a convenience function for implementing this in the VIA south bridges.
This convenience function relies on previous simplifications in exec/ioport which avoids some duplicate synchronization of I/O port base addresses. The naming of the function is inspired by its memory_region_set_address() pendant.
--- docs/devel/migration.rst | 5 +++-- include/exec/ioport.h | 2 ++ system/ioport.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-)
docs/devel/migration.rst +3 -2
@@ -452,10 +452,10 @@ data doesn't match the stored device data well; it allows an intermediate temporary structure to be populated with migration data and then transferred to the main structure. -If you use memory API functions that update memory layout outside +If you use memory or portio_list API functions that update memory layout outside initialization (i.e., in response to a guest action), this is a strong indication that you need to call these functions in a ``post_load`` callback. -Examples of such memory API functions are: +Examples of such API functions are: - memory_region_add_subregion() - memory_region_del_subregion()
@@ -464,6 +464,7 @@ Examples of such memory API functions are: - memory_region_set_enabled() - memory_region_set_address() - memory_region_set_alias_offset() + - portio_list_set_address() Iterative device migration --------------------------
include/exec/ioport.h +2 -0
@@ -54,6 +54,7 @@ typedef struct PortioList {const struct MemoryRegionPortio *ports;Object *owner;struct MemoryRegion *address_space; +uint32_t addr;unsigned nr;struct MemoryRegion **regions;void *opaque;
@@ -70,5 +71,6 @@ void portio_list_add(PortioList *piolist,struct MemoryRegion *address_space, uint32_t addr);void portio_list_del (PortioList *piolist); +void portio_list_set_address (PortioList *piolist,uint32_t addr);#endif /* IOPORT_H */
system/ioport.c +19 -0
@@ -133,6 +133,7 @@ void portio_list_init(PortioList *piolist, piolist->nr =0 ; piolist->regions = g_new0(MemoryRegion *, n); piolist->address_space =NULL ; + piolist->addr =0 ; piolist->opaque = opaque; piolist->owner = owner; piolist->name = name;
@@ -282,6 +283,7 @@ void portio_list_add(PortioList *piolist,unsigned int off_low, off_high, off_last, count; piolist->address_space = address_space; + piolist->addr = start;/* Handle the first entry specially. */ off_last = off_low = pio_start->offset;
@@ -322,6 +324,23 @@ void portio_list_del(PortioList *piolist) } } +void portio_list_set_address (PortioList *piolist,uint32_t addr) +{ +MemoryRegionPortioList *mrpio; +unsigned i, j; + +for (i =0 ; i < piolist->nr; ++i) { + mrpio =container_of (piolist->regions[i], MemoryRegionPortioList, mr); +memory_region_set_address (&mrpio->mr, + mrpio->mr.addr - piolist->addr + addr); +for (j =0 ; mrpio->ports[j].size; ++j) { + mrpio->ports[j].offset += addr - piolist->addr; + } + } + + piolist->addr = addr; +} +static void memory_region_portio_list_finalize (Object *obj) {MemoryRegionPortioList *mrpio =MEMORY_REGION_PORTIO_LIST (obj);
Signature · 1 line
2.43.0
PATCH v3 6/11 exec/ioport: Add portio_list_set_enabled()
In reply to Bernhard BeschowSome SuperI/O devices such as the VIA south bridges or the PC87312 controller allow to enable or disable their SuperI/O functions. Add a convenience function for implementing this in the VIA south bridges.
The naming of the functions is inspired by its memory_region_set_enabled() pendant.
--- docs/devel/migration.rst | 1 + include/exec/ioport.h | 1 + system/ioport.c | 9 +++++++++ 3 files changed, 11 insertions(+)
docs/devel/migration.rst +1 -0
@@ -465,6 +465,7 @@ Examples of such API functions are: - memory_region_set_address() - memory_region_set_alias_offset() - portio_list_set_address() + - portio_list_set_enabled() Iterative device migration --------------------------
include/exec/ioport.h +1 -0
@@ -71,6 +71,7 @@ void portio_list_add(PortioList *piolist,struct MemoryRegion *address_space, uint32_t addr);void portio_list_del (PortioList *piolist); +void portio_list_set_enabled (PortioList *piolist,bool enabled);void portio_list_set_address (PortioList *piolist,uint32_t addr);#endif /* IOPORT_H */
system/ioport.c +9 -0
@@ -324,6 +324,15 @@ void portio_list_del(PortioList *piolist) } } +void portio_list_set_enabled (PortioList *piolist,bool enabled) +{ +unsigned i; + +for (i =0 ; i < piolist->nr; ++i) { +memory_region_set_enabled (piolist->regions[i], enabled); + } +} +void portio_list_set_address (PortioList *piolist,uint32_t addr) {MemoryRegionPortioList *mrpio;
Signature · 1 line
2.43.0
PATCH v3 7/11 hw/block/fdc-isa: Implement relocation and enabling/disabling for TYPE_ISA_FDC
In reply to Bernhard BeschowThe real SuperI/O chips emulated by QEMU allow for relocating and enabling or disabling their SuperI/O functions via software. So far this is not implemented. Prepare for that by adding isa_fdc_set_{enabled,iobase}.
--- include/hw/block/fdc.h | 3 +++ hw/block/fdc-isa.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+)
include/hw/block/fdc.h +3 -0
@@ -14,6 +14,9 @@ void fdctrl_init_sysbus(qemu_irq irq, hwaddr mmio_base, DriveInfo **fds);void sun4m_fdctrl_init (qemu_irq irq,hwaddr io_base,DriveInfo **fds,qemu_irq *fdc_tc); +void isa_fdc_set_iobase (ISADevice *fdc,hwaddr iobase); +void isa_fdc_set_enabled (ISADevice *fdc,bool enabled); +FloppyDriveType isa_fdc_get_drive_type (ISADevice *fdc,int i);int cmos_get_fd_drive_type (FloppyDriveType fd0);
hw/block/fdc-isa.c +14 -0
@@ -192,6 +192,20 @@ static Aml *build_fdinfo_aml(int idx, FloppyDriveType type)return dev; } +void isa_fdc_set_iobase (ISADevice *fdc,hwaddr iobase) +{ +FDCtrlISABus *isa =ISA_FDC (fdc); + + fdc->ioport_id = iobase; + isa->iobase = iobase; +portio_list_set_address (&isa->portio_list, isa->iobase); +} + +void isa_fdc_set_enabled (ISADevice *fdc,bool enabled) +{ +portio_list_set_enabled (&ISA_FDC (fdc)->portio_list, enabled); +} +int cmos_get_fd_drive_type (FloppyDriveType fd0) {int val;
Signature · 1 line
2.43.0
PATCH v3 8/11 hw/char/serial-isa: Implement relocation and enabling/disabling for TYPE_ISA_SERIAL
In reply to Bernhard BeschowThe real SuperI/O chips emulated by QEMU allow for relocating and enabling or disabling their SuperI/O functions via software. So far this is not implemented. Prepare for that by adding isa_serial_set_{enabled,iobase}.
--- include/hw/char/serial.h | 2 ++ hw/char/serial-isa.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
include/hw/char/serial.h +2 -0
@@ -112,5 +112,7 @@ SerialMM *serial_mm_init(MemoryRegion *address_space,#define TYPE_ISA_SERIAL "isa-serial"void serial_hds_isa_init (ISABus *bus,int from,int to); +void isa_serial_set_iobase (ISADevice *serial,hwaddr iobase); +void isa_serial_set_enabled (ISADevice *serial,bool enabled);#endif
hw/char/serial-isa.c +14 -0
@@ -184,3 +184,17 @@ void serial_hds_isa_init(ISABus *bus, int from, int to) } } } + +void isa_serial_set_iobase (ISADevice *serial,hwaddr iobase) +{ +ISASerialState *s =ISA_SERIAL (serial); + + serial->ioport_id = iobase; + s->iobase = iobase; +memory_region_set_address (&s->state.io, s->iobase); +} + +void isa_serial_set_enabled (ISADevice *serial,bool enabled) +{ +memory_region_set_enabled (&ISA_SERIAL (serial)->state.io, enabled); +}
Signature · 1 line
2.43.0
PATCH v3 9/11 hw/char/parallel-isa: Implement relocation and enabling/disabling for TYPE_ISA_PARALLEL
In reply to Bernhard BeschowThe real SuperI/O chips emulated by QEMU allow for relocating and enabling or disabling their SuperI/O functions via software. So far this is not implemented. Prepare for that by adding isa_parallel_set_{enabled,iobase}.
--- include/hw/char/parallel-isa.h | 3 +++ hw/char/parallel-isa.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+)
include/hw/char/parallel-isa.h +3 -0
@@ -29,4 +29,7 @@ struct ISAParallelState { PortioList portio_list; }; +void isa_parallel_set_iobase (ISADevice *parallel,hwaddr iobase); +void isa_parallel_set_enabled (ISADevice *parallel,bool enabled); +#endif /* HW_PARALLEL_ISA_H */
hw/char/parallel-isa.c +14 -0
@@ -41,3 +41,17 @@ void parallel_hds_isa_init(ISABus *bus, int n) } } } + +void isa_parallel_set_iobase (ISADevice *parallel,hwaddr iobase) +{ +ISAParallelState *s =ISA_PARALLEL (parallel); + + parallel->ioport_id = iobase; + s->iobase = iobase; +portio_list_set_address (&s->portio_list, s->iobase); +} + +void isa_parallel_set_enabled (ISADevice *parallel,bool enabled) +{ +portio_list_set_enabled (&ISA_PARALLEL (parallel)->portio_list, enabled); +}
Signature · 1 line
2.43.0
PATCH v3 10/11 hw/ppc/pegasos2: Let pegasos2 machine configure SuperI/O functions
In reply to Bernhard BeschowThis is a preparation for implementing relocation and toggling of SuperI/O functions in the VT8231 device model. Upon reset, all SuperI/O functions will be deactivated, so in case if no -bios is given, let the machine configure those functions the same way Pegasos II firmware would do.
--- hw/ppc/pegasos2.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
hw/ppc/pegasos2.c +15 -0
@@ -285,6 +285,15 @@ static void pegasos2_pci_config_write(Pegasos2MachineState *pm, int bus,pegasos2_mv_reg_write (pm, pcicfg +4 , len, val); } +static void pegasos2_superio_write (Pegasos2MachineState *pm,uint32_t addr, +uint32_t val) +{ +AddressSpace *as =CPU (pm->cpu)->as; + +stb_phys (as,PCI1_IO_BASE +0x3f0 , addr); +stb_phys (as,PCI1_IO_BASE +0x3f1 , val); +} +static void pegasos2_machine_reset (MachineState *machine,ShutdownCause reason) {Pegasos2MachineState *pm =PEGASOS2_MACHINE (machine);
@@ -310,6 +319,12 @@ static void pegasos2_machine_reset(MachineState *machine, ShutdownCause reason)pegasos2_pci_config_write (pm,1 , (PCI_DEVFN (12 ,0 ) <<8 ) |PCI_INTERRUPT_LINE ,2 ,0x9 ); +pegasos2_pci_config_write (pm,1 , (PCI_DEVFN (12 ,0 ) <<8 ) | +0x50 ,1 ,0x6 ); +pegasos2_superio_write (pm,0xf4 ,0xbe ); +pegasos2_superio_write (pm,0xf6 ,0xef ); +pegasos2_superio_write (pm,0xf7 ,0xfc ); +pegasos2_superio_write (pm,0xf2 ,0x14 );pegasos2_pci_config_write (pm,1 , (PCI_DEVFN (12 ,0 ) <<8 ) |0x50 ,1 ,0x2 ); pegasos2_pci_config_write(pm, 1, (PCI_DEVFN(12, 0) << 8) |
Signature · 1 line
2.43.0
PATCH v3 11/11 hw/isa/vt82c686: Implement relocation and toggling of SuperI/O functions
In reply to Bernhard BeschowThe VIA south bridges are able to relocate and toggle (enable or disable) their SuperI/O functions. So far this is hardcoded such that all functions are always enabled and are located at fixed addresses.
Some PC BIOSes seem to probe for I/O occupancy before activating such a function and issue an error in case of a conflict. Since the functions are currently enabled on reset, conflicts are always detected. Prevent that by implementing relocation and toggling of the SuperI/O functions.
Note that all SuperI/O functions are now deactivated upon reset (except for VT82C686B's serial ports where Fuloong 2e's rescue-yl seems to expect them to be enabled by default). Rely on firmware to configure the functions accordingly.
--- hw/isa/vt82c686.c | 115 +++++++++++++++++++++++++++++++++------------- 1 file changed, 84 insertions(+), 31 deletions(-)
hw/isa/vt82c686.c +84 -31
@@ -15,6 +15,9 @@#include "qemu/osdep.h" #include "hw/isa/vt82c686.h" +#include "hw/block/fdc.h" +#include "hw/char/parallel-isa.h" +#include "hw/char/serial.h" #include "hw/pci/pci.h" #include "hw/qdev-properties.h" #include "hw/ide/pci.h"
@@ -343,6 +346,32 @@ static const TypeInfo via_superio_info = {#define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" +static void vt82c686b_superio_update (ViaSuperIOState *s) +{ +isa_parallel_set_enabled (s->superio.parallel[0 ], + (s->regs[0xe2 ] &0x3 ) !=3 ); +isa_serial_set_enabled (s->superio.serial[0 ], s->regs[0xe2 ] &BIT (2 )); +isa_serial_set_enabled (s->superio.serial[1 ], s->regs[0xe2 ] &BIT (3 )); +isa_fdc_set_enabled (s->superio.floppy, s->regs[0xe2 ] &BIT (4 )); + +isa_fdc_set_iobase (s->superio.floppy, (s->regs[0xe3 ] &0xfc ) <<2 ); +isa_parallel_set_iobase (s->superio.parallel[0 ], s->regs[0xe6 ] <<2 ); +isa_serial_set_iobase (s->superio.serial[0 ], (s->regs[0xe7 ] &0xfe ) <<2 ); +isa_serial_set_iobase (s->superio.serial[1 ], (s->regs[0xe8 ] &0xfe ) <<2 ); +} + +static int vmstate_vt82c686b_superio_post_load (void *opaque,int version_id) +{ +vt82c686b_superio_update (opaque); +return 0 ; +} + +static const VMStateDescription vmstate_vt82c686b_superio = { + .name ="vt82c686b_superio" , + .version_id =1 , + .post_load = vmstate_vt82c686b_superio_post_load, +}; +static void vt82c686b_superio_cfg_write (void *opaque,hwaddr addr,uint64_t data,unsigned size) {
@@ -368,7 +397,11 @@ static void vt82c686b_superio_cfg_write(void *opaque, hwaddr addr, case 0xfd ... 0xff:/* ignore write to read only registers */ return ; -/* case 0xe6 ... 0xe8: Should set base port of parallel and serial */ + case 0xe2 ... 0xe3: + case 0xe6 ... 0xe8: + sc->regs[idx] = data; +vt82c686b_superio_update (sc); +return ;default :qemu_log_mask (LOG_UNIMP ,"via_superio_cfg: unimplemented register 0x%x\n" , idx);
@@ -393,25 +426,24 @@ static void vt82c686b_superio_reset(DeviceState *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 ); + s->regs[0xe0 ] =0x3c ; +/* +* Function select - only serial enabled +* Fuloong 2e's rescue-yl prints to the serial console w/o enabling it. This +* suggests that the serial ports are enabled by default, so override the +* datasheet. +*/ + s->regs[0xe2 ] =0x0f ;/* Floppy ctrl base addr 0x3f0-7 */ -vt82c686b_superio_cfg_write (s,0 ,0xe3 ,1 ); -vt82c686b_superio_cfg_write (s,1 ,0xfc ,1 ); + s->regs[0xe3 ] =0xfc ;/* Parallel port base addr 0x378-f */ -vt82c686b_superio_cfg_write (s,0 ,0xe6 ,1 ); -vt82c686b_superio_cfg_write (s,1 ,0xde ,1 ); + s->regs[0xe6 ] =0xde ;/* Serial port 1 base addr 0x3f8-f */ -vt82c686b_superio_cfg_write (s,0 ,0xe7 ,1 ); -vt82c686b_superio_cfg_write (s,1 ,0xfe ,1 ); + s->regs[0xe7 ] =0xfe ;/* Serial port 2 base addr 0x2f8-f */ -vt82c686b_superio_cfg_write (s,0 ,0xe8 ,1 ); -vt82c686b_superio_cfg_write (s,1 ,0xbe ,1 ); + s->regs[0xe8 ] =0xbe ; -vt82c686b_superio_cfg_write (s,0 ,0 ,1 ); +vt82c686b_superio_update (s); }static void vt82c686b_superio_init (Object *obj)
@@ -429,6 +461,7 @@ static void vt82c686b_superio_class_init(ObjectClass *klass, void *data) sc->parallel.count =1 ; sc->ide.count =0 ;/* emulated by via-ide */ sc->floppy.count =1 ; + dc->vmsd = &vmstate_vt82c686b_superio; }static const TypeInfo vt82c686b_superio_info = {
@@ -443,6 +476,30 @@ static const TypeInfo vt82c686b_superio_info = {#define TYPE_VT8231_SUPERIO "vt8231-superio" +static void vt8231_superio_update (ViaSuperIOState *s) +{ +isa_parallel_set_enabled (s->superio.parallel[0 ], + (s->regs[0xf2 ] &0x3 ) !=3 ); +isa_serial_set_enabled (s->superio.serial[0 ], s->regs[0xf2 ] &BIT (2 )); +isa_fdc_set_enabled (s->superio.floppy, s->regs[0xf2 ] &BIT (4 )); + +isa_serial_set_iobase (s->superio.serial[0 ], (s->regs[0xf4 ] &0xfe ) <<2 ); +isa_parallel_set_iobase (s->superio.parallel[0 ], s->regs[0xf6 ] <<2 ); +isa_fdc_set_iobase (s->superio.floppy, (s->regs[0xf7 ] &0xfc ) <<2 ); +} + +static int vmstate_vt8231_superio_post_load (void *opaque,int version_id) +{ +vt8231_superio_update (opaque); +return 0 ; +} + +static const VMStateDescription vmstate_vt8231_superio = { + .name ="vt8231_superio" , + .version_id =1 , + .post_load = vmstate_vt8231_superio_post_load, +}; +static void vt8231_superio_cfg_write (void *opaque,hwaddr addr,uint64_t data,unsigned size) {
@@ -465,6 +522,12 @@ static void vt8231_superio_cfg_write(void *opaque, hwaddr addr,case 0xfd :/* ignore write to read only registers */ return ; +case 0xf2 : +case 0xf4 : + case 0xf6 ... 0xf7: + sc->regs[idx] = data; +vt8231_superio_update (sc); +return ;default :qemu_log_mask (LOG_UNIMP ,"via_superio_cfg: unimplemented register 0x%x\n" , idx);
@@ -493,19 +556,15 @@ static void vt8231_superio_reset(DeviceState *dev)/* 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 ); + s->regs[0xf2 ] =0x03 ;/* Serial port base addr */ -vt8231_superio_cfg_write (s,0 ,0xf4 ,1 ); -vt8231_superio_cfg_write (s,1 ,0xfe ,1 ); + s->regs[0xf4 ] =0xfe ;/* Parallel port base addr */ -vt8231_superio_cfg_write (s,0 ,0xf6 ,1 ); -vt8231_superio_cfg_write (s,1 ,0xde ,1 ); + s->regs[0xf6 ] =0xde ;/* Floppy ctrl base addr */ -vt8231_superio_cfg_write (s,0 ,0xf7 ,1 ); -vt8231_superio_cfg_write (s,1 ,0xfc ,1 ); + s->regs[0xf7 ] =0xfc ; -vt8231_superio_cfg_write (s,0 ,0 ,1 ); +vt8231_superio_update (s); }static void vt8231_superio_init (Object *obj)
@@ -513,12 +572,6 @@ static void vt8231_superio_init(Object *obj)VIA_SUPERIO (obj)->io_ops = &vt8231_superio_cfg_ops; } -static uint16_t vt8231_superio_serial_iobase (ISASuperIODevice *sio, -uint8_t index) -{ -return 0x2f8 ;/* FIXME: This should be settable via registers f2-f4 */ -} -static void vt8231_superio_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -526,10 +579,10 @@ static void vt8231_superio_class_init(ObjectClass *klass, void *data) dc->reset = vt8231_superio_reset; sc->serial.count =1 ; - sc->serial.get_iobase = vt8231_superio_serial_iobase; sc->parallel.count =1 ; sc->ide.count =0 ;/* emulated by via-ide */ sc->floppy.count =1 ; + dc->vmsd = &vmstate_vt8231_superio; }static const TypeInfo vt8231_superio_info = {
Signature · 1 line
2.43.0