Consolidate PIIX south bridges
v2 cover Consolidate PIIX south bridges
This series consolidates the implementations of the PIIX3 and PIIX4 south bridges and is an extended version of [1]. The motivation is to share as much code as possible and to bring both device models to feature parity such that perhaps PIIX4 can become a drop-in-replacement for PIIX3 in the pc machine. This could resolve the "Frankenstein" PIIX4-PM problem in PIIX3 discussed on this list before.
The series is structured as follows: First, PIIX3 is changed to instantiate internal devices itself, like PIIX4 does already. Second, PIIX3 gets prepared for the merge with PIIX4 which includes some fixes, cleanups, and renamings. Third, the same is done for PIIX4. In step four the implementations are merged. Since some consolidations could be done easier with merged implementations, the consolidation continues in step five which concludes the series.
One particular challenge in this series was that the PIC of PIIX3 used to be instantiated outside of the south bridge while some sub functions require a PIC with populated qemu_irqs. This has been solved by introducing a proxy PIC which furthermore allows PIIX3 to be agnostic towards the virtualization technology used (KVM, TCG, Xen). Due to consolidation PIIX4 gained the PIC as well, possibly allowing the Malta board to gain KVM capabilities in the future.
Another challenge was dealing with optional devices where Peter already gave advice in [1] which this series implements.
A challenge still remains with consolidating PCI interrupt handling. There are still board-specific piix3_pci_slot_get_pirq() and piix4_pci_slot_get_pirq() which are implemented in isa/piix.c. Any advice how to resolve these would be highly appreaciated.
Last but not least there might be some opportunity to consolidate VM state handling, probably by reusing the one from PIIX3. Since I'm not very familiar with the requirements I didn't touch it so far.
Testing done:
* make check
* make check-avocado
* Boot live CD:
* qemu-system-x86_64 -M pc -m 2G -accel kvm -cpu host -cdrom manjaro-kde-21.3.2-220704-linux515.iso
* qemu-system-x86_64 -M q35 -m 2G -accel kvm -cpu host -cdrom manjaro-kde-21.3.2-220704-linux515.iso
* 'qemu-system-mips64el -M malta -kernel vmlinux-3.2.0-4-5kc-malta -hda debian_wheezy_mipsel_standard.qcow2 -append "root=/dev/sda1 console=tty0"`
[1] https://lists.nongnu.org/archive/html/qemu-devel/2022-07/msg02348.html
v2:
- Introduce TYPE_ defines for IDE and USB device models (Mark)
- Omit unexporting of PIIXState (Mark)
- Improve commit message of patch 5 to mention reset triggering through PCI configuration space (Mark)
- Move reviewed patches w/o dependencies to the bottom of the series for early upstreaming -> @Michael?
Bernhard Beschow (43):
hw/i386/pc: Create DMA controllers in south bridges hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/isa/piix3: Remove extra ';' outside of functions hw/isa/piix3: Add size constraints to rcr_ops hw/isa/piix3: Modernize reset handling
hw/isa/piix3: Prefer pci_address_space() over get_system_memory() hw/isa/piix4: Rename wrongly named method
hw/ide/piix: Introduce TYPE_ macros for PIIX IDE controllers hw/usb/hcd-uhci: Introduce TYPE_ defines for device models hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need for rtc_state to be an out-parameter hw/isa/piix3: Create USB controller in host device hw/isa/piix3: Create power management controller in host device hw/intc/i8259: Introduce i8259 proxy "isa-pic" hw/isa/piix3: Create ISA PIC in host device
hw/isa/piix3: Create IDE controller in host device hw/isa/piix3: Wire up ACPI interrupt internally hw/isa/piix3: Remove unused include
hw/isa/piix3: Allow board to provide PCI interrupt routes hw/isa/piix3: Resolve redundant PIIX_NUM_PIC_IRQS hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4 hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4 hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_" hw/isa/piix3: Rename typedef PIIX3State to PIIXState hw/mips/malta: Reuse dev variable
meson: Fix dependencies of piix4 southbridge hw/isa/piix4: Add missing initialization
hw/isa/piix4: Move pci_ide_create_devs() call to board code hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Allow board to provide PCI interrupt routes hw/isa/piix4: Remove unused code
hw/isa/piix4: Use ISA PIC device
hw/isa/piix4: Reuse struct PIIXState from PIIX3 hw/isa/piix4: Rename reset control operations to match PIIX3 hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_" hw/isa/piix3: Merge hw/isa/piix4.c
hw/isa/piix: Harmonize names of reset control memory regions hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4 hw/isa/piix: Rename functions to be shared for interrupt triggering hw/isa/piix: Consolidate IRQ triggering
hw/isa/piix: Share PIIX3 base class with PIIX4 hw/isa/piix: Drop the "3" from the PIIX base class hw/i386/acpi-build: Resolve PIIX ISA bridge rather than ACPI
controller
MAINTAINERS | 6 +-
configs/devices/mips-softmmu/common.mak | 3 +-
hw/i386/Kconfig | 3 +-
hw/i386/acpi-build.c | 4 +-
hw/i386/pc.c | 19 +-
hw/i386/pc_piix.c | 72 ++---
hw/i386/pc_q35.c | 16 +-
hw/ide/piix.c | 5 +-
hw/intc/i8259.c | 27 ++
hw/isa/Kconfig | 14 +-
hw/isa/lpc_ich9.c | 11 +
hw/isa/meson.build | 3 +-
hw/isa/{piix3.c => piix.c} | 337 ++++++++++++++++++------
hw/isa/piix4.c | 325 -----------------------
hw/mips/malta.c | 34 ++-
hw/usb/hcd-uhci.c | 16 +-
hw/usb/hcd-uhci.h | 9 +
include/hw/i386/ich9.h | 2 +
include/hw/i386/pc.h | 2 +-
include/hw/ide/piix.h | 7 +
include/hw/intc/i8259.h | 14 +
include/hw/southbridge/piix.h | 33 ++-
22 files changed, 473 insertions(+), 489 deletions(-)
rename hw/isa/{piix3.c => piix.c} (51%)
delete mode 100644 hw/isa/piix4.c
create mode 100644 include/hw/ide/piix.hSignature · 1 line
2.38.1
PATCH v2 1/43 hw/i386/pc: Create DMA controllers in south bridges
Just like in the real hardware (and in PIIX4), create the DMA controllers in the south bridges.
--- hw/i386/pc.c | 3 --- hw/i386/pc_piix.c | 2 ++ hw/isa/Kconfig | 2 ++ hw/isa/lpc_ich9.c | 3 +++ hw/isa/piix3.c | 9 +++++++-- 5 files changed, 14 insertions(+), 5 deletions(-)
hw/i386/pc.c +0 -3
@@ -47,7 +47,6 @@#include "multiboot.h" #include "hw/rtc/mc146818rtc.h" #include "hw/intc/i8259.h" -#include "hw/dma/i8257.h" #include "hw/timer/i8254.h" #include "hw/input/i8042.h" #include "hw/irq.h"
@@ -1320,8 +1319,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,pcspk_init (pcms->pcspk, isa_bus, pit); } -i8257_dma_init (isa_bus,0 ); -/* Super I/O */ pc_superio_init (isa_bus, create_fdctrl, pcms->i8042_enabled, pcms->vmport !=ON_OFF_AUTO_ON );
hw/i386/pc_piix.c +2 -0
@@ -26,6 +26,7 @@#include CONFIG_DEVICES #include "qemu/units.h" +#include "hw/dma/i8257.h" #include "hw/loader.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h"
@@ -225,6 +226,7 @@ static void pc_init1(MachineState *machine, pci_bus =NULL ; isa_bus =isa_bus_new (NULL ,get_system_memory (), system_io, &error_abort); +i8257_dma_init (isa_bus,0 ); pcms->hpet_enabled = false; }isa_bus_irqs (isa_bus, x86ms->gsi);
hw/isa/Kconfig +2 -0
@@ -33,6 +33,7 @@ config PC87312 config PIIX3 bool + select I8257 select ISA_BUS config PIIX4
@@ -67,6 +68,7 @@ config LPC_ICH9 bool # For historical reasons, SuperIO devices are created in the board # for ICH9. + select I8257 select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH
hw/isa/lpc_ich9.c +3 -0
@@ -34,6 +34,7 @@#include "qapi/error.h" #include "qapi/visitor.h" #include "qemu/range.h" +#include "hw/dma/i8257.h" #include "hw/isa/isa.h" #include "migration/vmstate.h" #include "hw/irq.h"
@@ -722,6 +723,8 @@ static void ich9_lpc_realize(PCIDevice *d, Error **errp)qdev_init_gpio_out_named (dev, lpc->gsi,ICH9_GPIO_GSI ,GSI_NUM_PINS );isa_bus_irqs (isa_bus, lpc->gsi); + +i8257_dma_init (isa_bus,0 ); }static bool ich9_rst_cnt_needed (void *opaque)
hw/isa/piix3.c +7 -2
@@ -25,6 +25,7 @@#include "qemu/osdep.h" #include "qemu/range.h" #include "qapi/error.h" +#include "hw/dma/i8257.h" #include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/isa/isa.h"
@@ -295,9 +296,11 @@ static const MemoryRegionOps rcr_ops = {static void pci_piix3_realize (PCIDevice *dev,Error **errp) {PIIX3State *d =PIIX3_PCI_DEVICE (dev); +ISABus *isa_bus; -if (!isa_bus_new (DEVICE (d),get_system_memory (), -pci_address_space_io (dev), errp)) { + isa_bus =isa_bus_new (DEVICE (d),get_system_memory (), +pci_address_space_io (dev), errp); +if (!isa_bus) {return ; }
@@ -307,6 +310,8 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp) PIIX_RCR_IOPORT, &d->rcr_mem, 1);qemu_register_reset (piix3_reset, d); + +i8257_dma_init (isa_bus,0 ); }static void build_pci_isa_aml (AcpiDevAmlIf *adev,Aml *scope)
Signature · 1 line
2.38.1
PATCH v2 2/43 hw/i386/pc_piix: Allow for setting properties before realizing PIIX3 south bridge
In reply to Bernhard BeschowThe next patches will need to take advantage of it.
--- hw/i386/pc_piix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/i386/pc_piix.c +2 -1
@@ -217,7 +217,8 @@ static void pc_init1(MachineState *machine, pci_memory, ram_memory); pcms->bus = pci_bus; - pci_dev =pci_create_simple_multifunction (pci_bus,-1 , true, type); + pci_dev =pci_new_multifunction (-1 , true, type); +pci_realize_and_unref (pci_dev, pci_bus, &error_fatal); piix3 =PIIX3_PCI_DEVICE (pci_dev); piix3->pic = x86ms->gsi; piix3_devfn = piix3->dev.devfn;
Signature · 1 line
2.38.1
PATCH v2 3/43 hw/isa/piix3: Remove extra ';' outside of functions
In reply to Bernhard BeschowFixes the "extra-semi" clang-tidy check.
--- hw/isa/piix3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
hw/isa/piix3.c +3 -3
@@ -375,7 +375,7 @@ static void piix3_realize(PCIDevice *dev, Error **errp)pci_bus_irqs (pci_bus, piix3_set_irq, pci_slot_get_pirq, piix3,PIIX_NUM_PIRQS );pci_bus_set_route_irq_fn (pci_bus, piix3_route_intx_pin_to_irq); -}; +}static void piix3_class_init (ObjectClass *klass,void *data) {
@@ -410,7 +410,7 @@ static void piix3_xen_realize(PCIDevice *dev, Error **errp)*/ pci_bus_irqs (pci_bus, xen_piix3_set_irq, xen_pci_slot_get_pirq, piix3,XEN_PIIX_NUM_PIRQS ); -}; +}static void piix3_xen_class_init (ObjectClass *klass,void *data) {
@@ -418,7 +418,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data) k->config_write = piix3_write_config_xen; k->realize = piix3_xen_realize; -}; +}static const TypeInfo piix3_xen_info = { .name =TYPE_PIIX3_XEN_DEVICE ,
Signature · 1 line
2.38.1
PATCH v2 4/43 hw/isa/piix3: Add size constraints to rcr_ops
In reply to Bernhard BeschowAccording to the PIIX3 datasheet, the reset control register is one byte in size. Moreover, PIIX4 has it, so add it to PIIX3 as well.
--- hw/isa/piix3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
hw/isa/piix3.c +5 -1
@@ -290,7 +290,11 @@ static uint64_t rcr_read(void *opaque, hwaddr addr, unsigned len)static const MemoryRegionOps rcr_ops = { .read = rcr_read, .write = rcr_write, - .endianness =DEVICE_LITTLE_ENDIAN + .endianness =DEVICE_LITTLE_ENDIAN , + .impl = { + .min_access_size =1 , + .max_access_size =1 , + }, };static void pci_piix3_realize (PCIDevice *dev,Error **errp)
Signature · 1 line
2.38.1
PATCH v2 5/43 hw/isa/piix3: Modernize reset handling
In reply to Bernhard BeschowRather than registering the reset handler via a function which appends the handler to a global list, prefer to implement it as a virtual method - PIIX4 does the same already.
Note that this means that piix3_reset can now also be called writing to the relevant configuration space register on a PCI bridge.
--- hw/isa/piix3.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
hw/isa/piix3.c +3 -5
@@ -31,7 +31,6 @@#include "hw/isa/isa.h" #include "hw/xen/xen.h" #include "sysemu/xen.h" -#include "sysemu/reset.h" #include "sysemu/runstate.h" #include "migration/vmstate.h" #include "hw/acpi/acpi_aml_interface.h"
@@ -156,9 +155,9 @@ static void piix3_write_config_xen(PCIDevice *dev,piix3_write_config (dev, address, val, len); } -static void piix3_reset (void *opaque) +static void piix3_reset (DeviceState *dev) { -PIIX3State *d = opaque; +PIIX3State *d =PIIX3_PCI_DEVICE (dev);uint8_t *pci_conf = d->dev.config; pci_conf[0x04 ] =0x07 ;/* master, memory and I/O */
@@ -313,8 +312,6 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)memory_region_add_subregion_overlap (pci_address_space_io (dev),PIIX_RCR_IOPORT , &d->rcr_mem,1 ); -qemu_register_reset (piix3_reset, d); -i8257_dma_init (isa_bus,0 ); }
@@ -337,6 +334,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)PCIDeviceClass *k =PCI_DEVICE_CLASS (klass);AcpiDevAmlIfClass *adevc =ACPI_DEV_AML_IF_CLASS (klass); + dc->reset = piix3_reset; dc->desc ="ISA bridge" ; dc->vmsd = &vmstate_piix3; dc->hotpluggable = false;
Signature · 1 line
2.38.1
PATCH v2 6/43 hw/isa/piix3: Prefer pci_address_space() over get_system_memory()
In reply to Bernhard Beschowget_system_memory() accesses global state while pci_address_space() uses whatever has been passed to the device instance, so avoid the global. Moreover, PIIX4 uses pci_address_space() here as well.
--- hw/isa/piix3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/isa/piix3.c +1 -1
@@ -301,7 +301,7 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)PIIX3State *d =PIIX3_PCI_DEVICE (dev);ISABus *isa_bus; - isa_bus =isa_bus_new (DEVICE (d),get_system_memory (), + isa_bus =isa_bus_new (DEVICE (d),pci_address_space (dev),pci_address_space_io (dev), errp);if (!isa_bus) {return ;
Signature · 1 line
2.38.1
PATCH v2 7/43 hw/isa/piix4: Rename wrongly named method
In reply to Bernhard BeschowThis method post-loads the southbridge, not the IDE device.
--- hw/isa/piix4.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix4.c +2 -2
@@ -141,7 +141,7 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xae ] =0x00 ; } -static int piix4_ide_post_load (void *opaque,int version_id) +static int piix4_post_load (void *opaque,int version_id) {PIIX4State *s = opaque;
@@ -156,7 +156,7 @@ static const VMStateDescription vmstate_piix4 = { .name = "PIIX4", .version_id = 3, .minimum_version_id = 2, - .post_load = piix4_ide_post_load, + .post_load = piix4_post_load, .fields = (VMStateField []) {VMSTATE_PCI_DEVICE (dev, PIIX4State),VMSTATE_UINT8_V (rcr, PIIX4State,3 ),
Signature · 1 line
2.38.1
PATCH v2 8/43 hw/ide/piix: Introduce TYPE_ macros for PIIX IDE controllers
In reply to Bernhard Beschow--- hw/i386/pc_piix.c | 3 ++- hw/ide/piix.c | 5 +++-- hw/isa/piix4.c | 3 ++- include/hw/ide/piix.h | 7 +++++++ 4 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 include/hw/ide/piix.h
hw/i386/pc_piix.c +2 -1
@@ -40,6 +40,7 @@#include "hw/usb.h" #include "net/net.h" #include "hw/ide/pci.h" +#include "hw/ide/piix.h" #include "hw/irq.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h"
@@ -260,7 +261,7 @@ static void pc_init1(MachineState *machine,if (pcmc->pci_enabled) {PCIDevice *dev; - dev =pci_create_simple (pci_bus, piix3_devfn +1 ,"piix3-ide" ); + dev =pci_create_simple (pci_bus, piix3_devfn +1 ,TYPE_PIIX3_IDE );pci_ide_create_devs (dev); idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );
hw/ide/piix.c +3 -2
@@ -36,6 +36,7 @@#include "sysemu/blockdev.h" #include "sysemu/dma.h" +#include "hw/ide/piix.h" #include "hw/ide/pci.h" #include "trace.h"
@@ -202,7 +203,7 @@ static void piix3_ide_class_init(ObjectClass *klass, void *data) }static const TypeInfo piix3_ide_info = { - .name ="piix3-ide" , + .name =TYPE_PIIX3_IDE , .parent =TYPE_PCI_IDE , .class_init = piix3_ide_class_init, };
@@ -224,7 +225,7 @@ static void piix4_ide_class_init(ObjectClass *klass, void *data) }static const TypeInfo piix4_ide_info = { - .name ="piix4-ide" , + .name =TYPE_PIIX4_IDE , .parent =TYPE_PCI_IDE , .class_init = piix4_ide_class_init, };
hw/isa/piix4.c +2 -1
@@ -28,6 +28,7 @@#include "hw/irq.h" #include "hw/southbridge/piix.h" #include "hw/pci/pci.h" +#include "hw/ide/piix.h" #include "hw/isa/isa.h" #include "hw/intc/i8259.h" #include "hw/dma/i8257.h"
@@ -277,7 +278,7 @@ static void piix4_init(Object *obj)PIIX4State *s =PIIX4_PCI_DEVICE (obj);object_initialize_child (obj,"rtc" , &s->rtc,TYPE_MC146818_RTC ); -object_initialize_child (obj,"ide" , &s->ide,"piix4-ide" ); +object_initialize_child (obj,"ide" , &s->ide,TYPE_PIIX4_IDE );object_initialize_child (obj,"uhci" , &s->uhci,"piix4-usb-uhci" );object_initialize_child (obj,"pm" , &s->pm,TYPE_PIIX4_PM );
include/hw/ide/piix.h new file +7 -0
@@ -0,0 +1,7 @@ +#ifndef HW_IDE_PIIX_H +#define HW_IDE_PIIX_H + +#define TYPE_PIIX3_IDE "piix3-ide" +#define TYPE_PIIX4_IDE "piix4-ide" + +#endif /* HW_IDE_PIIX_H */
Signature · 1 line
2.38.1
Re: [PATCH v2 08/43] hw/ide/piix: Introduce TYPE_ macros for PIIX IDE controllers
Quoted 16 lines · Bernhard Beschow
Suggested-by Mark Cave-Ayland <[email protected]>Signed-off-by Bernhard Beschow <[email protected]>--- hw/i386/pc_piix.c | 3 ++- hw/ide/piix.c | 5 +++-- hw/isa/piix4.c | 3 ++- include/hw/ide/piix.h | 7 +++++++ 4 files changed, 14 insertions(+), 4 deletions(-)create mode 100644
include/hw/ide/piix.hinclude/hw/ide/piix.h new file +0
-0
include/hw/ide/piix.h line 5
Quoted 5 lines
include/hw/ide/piix.h new file +5
-0@@ -0,0 +1,7 @@ +#ifndef HW_IDE_PIIX_H +#define HW_IDE_PIIX_H + +#define TYPE_PIIX3_IDE "piix3-ide" +#define TYPE_PIIX4_IDE "piix4-ide"
I'd have added that to include/hw/southbridge/piix.h, but I understand some machines want to include parts of PIIX, so:
PATCH v2 9/43 hw/usb/hcd-uhci: Introduce TYPE_ defines for device models
In reply to Bernhard Beschow--- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 13 +++++++------ hw/isa/piix4.c | 2 +- hw/usb/hcd-uhci.c | 16 ++++++++-------- hw/usb/hcd-uhci.h | 9 +++++++++ 5 files changed, 27 insertions(+), 16 deletions(-)
hw/i386/pc_piix.c +2 -1
@@ -50,6 +50,7 @@#include "exec/memory.h" #include "hw/acpi/acpi.h" #include "hw/acpi/piix4.h" +#include "hw/usb/hcd-uhci.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/xen.h"
@@ -291,7 +292,7 @@ static void pc_init1(MachineState *machine,#endif if (pcmc->pci_enabled &&machine_usb (machine)) { -pci_create_simple (pci_bus, piix3_devfn +2 ,"piix3-usb-uhci" ); +pci_create_simple (pci_bus, piix3_devfn +2 ,TYPE_PIIX3_USB_UHCI ); }if (pcmc->pci_enabled &&x86_machine_is_acpi_enabled (X86_MACHINE (pcms))) {
hw/i386/pc_q35.c +7 -6
@@ -48,6 +48,7 @@#include "hw/ide/pci.h" #include "hw/ide/ahci.h" #include "hw/usb.h" +#include "hw/usb/hcd-uhci.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/numa.h"
@@ -65,15 +66,15 @@ struct ehci_companions { };static const struct ehci_companions ich9_1d[] = { - { .name ="ich9-usb-uhci1" , .func =0 , .port =0 }, - { .name ="ich9-usb-uhci2" , .func =1 , .port =2 }, - { .name ="ich9-usb-uhci3" , .func =2 , .port =4 }, + { .name =TYPE_ICH9_USB_UHCI1 , .func =0 , .port =0 }, + { .name =TYPE_ICH9_USB_UHCI2 , .func =1 , .port =2 }, + { .name =TYPE_ICH9_USB_UHCI3 , .func =2 , .port =4 }, };static const struct ehci_companions ich9_1a[] = { - { .name ="ich9-usb-uhci4" , .func =0 , .port =0 }, - { .name ="ich9-usb-uhci5" , .func =1 , .port =2 }, - { .name ="ich9-usb-uhci6" , .func =2 , .port =4 }, + { .name =TYPE_ICH9_USB_UHCI4 , .func =0 , .port =0 }, + { .name =TYPE_ICH9_USB_UHCI5 , .func =1 , .port =2 }, + { .name =TYPE_ICH9_USB_UHCI6 , .func =2 , .port =4 }, };static int ehci_create_ich9_with_companions (PCIBus *bus,int slot)
hw/isa/piix4.c +1 -1
@@ -279,7 +279,7 @@ static void piix4_init(Object *obj)object_initialize_child (obj,"rtc" , &s->rtc,TYPE_MC146818_RTC );object_initialize_child (obj,"ide" , &s->ide,TYPE_PIIX4_IDE ); -object_initialize_child (obj,"uhci" , &s->uhci,"piix4-usb-uhci" ); +object_initialize_child (obj,"uhci" , &s->uhci,TYPE_PIIX4_USB_UHCI );object_initialize_child (obj,"pm" , &s->pm,TYPE_PIIX4_PM );qdev_prop_set_uint32 (DEVICE (&s->pm),"smb_io_base" ,0x1100 );
hw/usb/hcd-uhci.c +8 -8
@@ -1292,56 +1292,56 @@ void uhci_data_class_init(ObjectClass *klass, void *data)static UHCIInfo uhci_info[] = { { - .name ="piix3-usb-uhci" , + .name =TYPE_PIIX3_USB_UHCI , .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82371SB_2 , .revision =0x01 , .irq_pin =3 , .unplug = true, },{ - .name ="piix4-usb-uhci" , + .name =TYPE_PIIX4_USB_UHCI , .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82371AB_2 , .revision =0x01 , .irq_pin =3 , .unplug = true, },{ - .name ="ich9-usb-uhci1" ,/* 00:1d.0 */ + .name =TYPE_ICH9_USB_UHCI1 ,/* 00:1d.0 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI1 , .revision =0x03 , .irq_pin =0 , .unplug = false, },{ - .name ="ich9-usb-uhci2" ,/* 00:1d.1 */ + .name =TYPE_ICH9_USB_UHCI2 ,/* 00:1d.1 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI2 , .revision =0x03 , .irq_pin =1 , .unplug = false, },{ - .name ="ich9-usb-uhci3" ,/* 00:1d.2 */ + .name =TYPE_ICH9_USB_UHCI3 ,/* 00:1d.2 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI3 , .revision =0x03 , .irq_pin =2 , .unplug = false, },{ - .name ="ich9-usb-uhci4" ,/* 00:1a.0 */ + .name =TYPE_ICH9_USB_UHCI4 ,/* 00:1a.0 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI4 , .revision =0x03 , .irq_pin =0 , .unplug = false, },{ - .name ="ich9-usb-uhci5" ,/* 00:1a.1 */ + .name =TYPE_ICH9_USB_UHCI5 ,/* 00:1a.1 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI5 , .revision =0x03 , .irq_pin =1 , .unplug = false, },{ - .name ="ich9-usb-uhci6" ,/* 00:1a.2 */ + .name =TYPE_ICH9_USB_UHCI6 ,/* 00:1a.2 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI6 , .revision =0x03 ,
hw/usb/hcd-uhci.h +9 -0
@@ -91,4 +91,13 @@ typedef struct UHCIInfo {void uhci_data_class_init (ObjectClass *klass,void *data);void usb_uhci_common_realize (PCIDevice *dev,Error **errp); +#define TYPE_PIIX3_USB_UHCI "piix3-usb-uhci" +#define TYPE_PIIX4_USB_UHCI "piix4-usb-uhci" +#define TYPE_ICH9_USB_UHCI1 "ich9-usb-uhci1" +#define TYPE_ICH9_USB_UHCI2 "ich9-usb-uhci2" +#define TYPE_ICH9_USB_UHCI3 "ich9-usb-uhci3" +#define TYPE_ICH9_USB_UHCI4 "ich9-usb-uhci4" +#define TYPE_ICH9_USB_UHCI5 "ich9-usb-uhci5" +#define TYPE_ICH9_USB_UHCI6 "ich9-usb-uhci6" +#endif
Signature · 1 line
2.38.1
Re: [PATCH v2 09/43] hw/usb/hcd-uhci: Introduce TYPE_ defines for device models
Quoted 16 lines · Bernhard Beschow
Suggested-by Mark Cave-Ayland <[email protected]>Signed-off-by Bernhard Beschow <[email protected]>--- hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 13 +++++++------ hw/isa/piix4.c | 2 +- hw/usb/hcd-uhci.c | 16 ++++++++-------- hw/usb/hcd-uhci.h | 9 +++++++++ 5 files changed, 27 insertions(+), 16 deletions(-)hw/usb/hcd-uhci.h +0
-0@@ -91,4 +91,13 @@ typedef struct UHCIInfo {void uhci_data_class_init (ObjectClass *klass,void *data);
hw/usb/hcd-uhci.h typedef struct UHCIInfo { · line 101
Quoted 10 lines
hw/usb/hcd-uhci.h +8
-0void usb_uhci_common_realize (PCIDevice *dev,Error **errp); +#define TYPE_PIIX3_USB_UHCI "piix3-usb-uhci" +#define TYPE_PIIX4_USB_UHCI "piix4-usb-uhci" +#define TYPE_ICH9_USB_UHCI1 "ich9-usb-uhci1" +#define TYPE_ICH9_USB_UHCI2 "ich9-usb-uhci2" +#define TYPE_ICH9_USB_UHCI3 "ich9-usb-uhci3" +#define TYPE_ICH9_USB_UHCI4 "ich9-usb-uhci4" +#define TYPE_ICH9_USB_UHCI5 "ich9-usb-uhci5" +#define TYPE_ICH9_USB_UHCI6 "ich9-usb-uhci6"
What about defining once:
#define TYPE_ICH9_USB_UHCI(fn) "ich9-usb-uhci" #fn
?
PATCH v2 10/43 hw/i386/pc: Create RTC controllers in south bridges
In reply to Bernhard BeschowJust like in the real hardware (and in PIIX4), create the RTC controllers in the south bridges.
--- hw/i386/pc.c | 12 +++++++++++- hw/i386/pc_piix.c | 8 ++++++++ hw/i386/pc_q35.c | 1 + hw/isa/Kconfig | 2 ++ hw/isa/lpc_ich9.c | 8 ++++++++ hw/isa/piix3.c | 15 +++++++++++++++ include/hw/i386/ich9.h | 2 ++ include/hw/southbridge/piix.h | 3 +++ 8 files changed, 50 insertions(+), 1 deletion(-)
hw/i386/pc.c +11 -1
@@ -1301,7 +1301,17 @@ void pc_basic_device_init(struct PCMachineState *pcms, pit_alt_irq =qdev_get_gpio_in (hpet,HPET_LEGACY_PIT_INT ); rtc_irq =qdev_get_gpio_in (hpet,HPET_LEGACY_RTC_INT ); } - *rtc_state =mc146818_rtc_init (isa_bus,2000 , rtc_irq); + +if (rtc_irq) { +qdev_connect_gpio_out (DEVICE (*rtc_state),0 , rtc_irq); + }else { +uint32_t irq =object_property_get_uint (OBJECT (*rtc_state), +"irq" , + &error_fatal); +isa_connect_gpio_out (*rtc_state,0 , irq); + } +object_property_add_alias (OBJECT (pcms),"rtc-time" ,OBJECT (*rtc_state), +"date" );qemu_register_boot_set (pc_boot_set, *rtc_state);
hw/i386/pc_piix.c +8 -0
@@ -32,6 +32,7 @@#include "hw/i386/pc.h" #include "hw/i386/apic.h" #include "hw/pci-host/i440fx.h" +#include "hw/rtc/mc146818rtc.h" #include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" #include "hw/firmware/smbios.h"
@@ -225,10 +226,17 @@ static void pc_init1(MachineState *machine, piix3->pic = x86ms->gsi; piix3_devfn = piix3->dev.devfn; isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix3),"isa.0" )); + rtc_state =ISA_DEVICE (object_resolve_path_component (OBJECT (pci_dev), +"rtc" )); }else { pci_bus =NULL ; isa_bus =isa_bus_new (NULL ,get_system_memory (), system_io, &error_abort); + + rtc_state =isa_new (TYPE_MC146818_RTC ); +qdev_prop_set_int32 (DEVICE (rtc_state),"base_year" ,2000 ); +isa_realize_and_unref (rtc_state, isa_bus, &error_fatal); +i8257_dma_init (isa_bus,0 ); pcms->hpet_enabled = false; }
hw/i386/pc_q35.c +1 -0
@@ -239,6 +239,7 @@ static void pc_q35_init(MachineState *machine) lpc =pci_create_simple_multifunction (host_bus,PCI_DEVFN (ICH9_LPC_DEV ,ICH9_LPC_FUNC ), true,TYPE_ICH9_LPC_DEVICE ); + rtc_state =ISA_DEVICE (object_resolve_path_component (OBJECT (lpc),"rtc" )); object_property_add_link(OBJECT(machine), PC_MACHINE_ACPI_DEVICE_PROP, TYPE_HOTPLUG_HANDLER,
hw/isa/Kconfig +2 -0
@@ -35,6 +35,7 @@ config PIIX3 bool select I8257 select ISA_BUS + select MC146818RTC config PIIX4 bool
@@ -72,3 +73,4 @@ config LPC_ICH9 select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH + select MC146818RTC
hw/isa/lpc_ich9.c +8 -0
@@ -660,6 +660,8 @@ static void ich9_lpc_initfn(Object *obj)static const uint8_t acpi_enable_cmd =ICH9_APM_ACPI_ENABLE ;static const uint8_t acpi_disable_cmd =ICH9_APM_ACPI_DISABLE ; +object_initialize_child (obj,"rtc" , &lpc->rtc,TYPE_MC146818_RTC ); +object_property_add_uint8_ptr (obj,ACPI_PM_PROP_SCI_INT , &lpc->sci_gsi,OBJ_PROP_FLAG_READ ); object_property_add_uint8_ptr(OBJECT(lpc), ACPI_PM_PROP_ACPI_ENABLE_CMD,
@@ -725,6 +727,12 @@ static void ich9_lpc_realize(PCIDevice *d, Error **errp)isa_bus_irqs (isa_bus, lpc->gsi);i8257_dma_init (isa_bus,0 ); + +/* RTC */ +qdev_prop_set_int32 (DEVICE (&lpc->rtc),"base_year" ,2000 ); +if (!qdev_realize (DEVICE (&lpc->rtc),BUS (isa_bus), errp)) { +return ; + } }static bool ich9_rst_cnt_needed (void *opaque)
hw/isa/piix3.c +15 -0
@@ -28,6 +28,7 @@#include "hw/dma/i8257.h" #include "hw/southbridge/piix.h" #include "hw/irq.h" +#include "hw/qdev-properties.h" #include "hw/isa/isa.h" #include "hw/xen/xen.h" #include "sysemu/xen.h"
@@ -313,6 +314,12 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp) PIIX_RCR_IOPORT, &d->rcr_mem, 1);i8257_dma_init (isa_bus,0 ); + +/* RTC */ +qdev_prop_set_int32 (DEVICE (&d->rtc),"base_year" ,2000 ); +if (!qdev_realize (DEVICE (&d->rtc),BUS (isa_bus), errp)) { +return ; + } }static void build_pci_isa_aml (AcpiDevAmlIf *adev,Aml *scope)
@@ -328,6 +335,13 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope) } } +static void pci_piix3_init (Object *obj) +{ +PIIX3State *d =PIIX3_PCI_DEVICE (obj); + +object_initialize_child (obj,"rtc" , &d->rtc,TYPE_MC146818_RTC ); +} +static void pci_piix3_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -354,6 +368,7 @@ static const TypeInfo piix3_pci_type_info = { .name = TYPE_PIIX3_PCI_DEVICE, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(PIIX3State), + .instance_init = pci_piix3_init, .abstract = true, .class_init = pci_piix3_class_init, .interfaces = (InterfaceInfo []) {
include/hw/i386/ich9.h +2 -0
@@ -11,6 +11,7 @@#include "hw/acpi/acpi.h" #include "hw/acpi/ich9.h" #include "hw/pci/pci_bus.h" +#include "hw/rtc/mc146818rtc.h" #include "qom/object.h" void ich9_lpc_set_irq (void *opaque,int irq_num,int level);
@@ -39,6 +40,7 @@ struct ICH9LPCState {*/ uint8_t irr[PCI_SLOT_MAX ][PCI_NUM_PINS ]; +RTCState rtc;APMState apm;ICH9LPCPMRegs pm;uint32_t sci_level;/* track sci level */
include/hw/southbridge/piix.h +3 -0
@@ -14,6 +14,7 @@#include "hw/pci/pci.h" #include "qom/object.h" +#include "hw/rtc/mc146818rtc.h" /* PIRQRC[A:D]: PIRQx Route Control Registers */ #define PIIX_PIRQCA 0x60
@@ -52,6 +53,8 @@ struct PIIXState {/* This member isn't used. Just for save/load compatibility */ int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ]; +RTCState rtc; +/* Reset Control Register contents */ uint8_t rcr;
Signature · 1 line
2.38.1
PATCH v2 11/43 hw/i386/pc: No need for rtc_state to be an out-parameter
In reply to Bernhard BeschowNow that the RTC is created as part of the southbridges it doesn't need to be an out-parameter any longer.
--- hw/i386/pc.c | 12 ++++++------ hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- include/hw/i386/pc.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
hw/i386/pc.c +6 -6
@@ -1248,7 +1248,7 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl,void pc_basic_device_init (struct PCMachineState *pcms,ISABus *isa_bus,qemu_irq *gsi, -ISADevice **rtc_state, +ISADevice *rtc_state,bool create_fdctrl,uint32_t hpet_irqs) {
@@ -1303,17 +1303,17 @@ void pc_basic_device_init(struct PCMachineState *pcms, }if (rtc_irq) { -qdev_connect_gpio_out (DEVICE (*rtc_state),0 , rtc_irq); +qdev_connect_gpio_out (DEVICE (rtc_state),0 , rtc_irq); }else { -uint32_t irq =object_property_get_uint (OBJECT (*rtc_state), +uint32_t irq =object_property_get_uint (OBJECT (rtc_state),"irq" , &error_fatal); -isa_connect_gpio_out (*rtc_state,0 , irq); +isa_connect_gpio_out (rtc_state,0 , irq); } -object_property_add_alias (OBJECT (pcms),"rtc-time" ,OBJECT (*rtc_state), +object_property_add_alias (OBJECT (pcms),"rtc-time" ,OBJECT (rtc_state),"date" ); -qemu_register_boot_set (pc_boot_set, *rtc_state); +qemu_register_boot_set (pc_boot_set, rtc_state);if (!xen_enabled () && (x86ms->pit ==ON_OFF_AUTO_AUTO || x86ms->pit ==ON_OFF_AUTO_ON )) {
hw/i386/pc_piix.c +1 -1
@@ -262,7 +262,7 @@ static void pc_init1(MachineState *machine, }/* init basic PC hardware */ -pc_basic_device_init (pcms, isa_bus, x86ms->gsi, &rtc_state, true, +pc_basic_device_init (pcms, isa_bus, x86ms->gsi, rtc_state, true,0x4 );pc_nic_init (pcmc, isa_bus, pci_bus);
hw/i386/pc_q35.c +1 -1
@@ -293,7 +293,7 @@ static void pc_q35_init(MachineState *machine) }/* init basic PC hardware */ -pc_basic_device_init (pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy, +pc_basic_device_init (pcms, isa_bus, x86ms->gsi, rtc_state, !mc->no_floppy,0xff0104 );/* connect pm stuff to lpc */
include/hw/i386/pc.h +1 -1
@@ -169,7 +169,7 @@ uint64_t pc_pci_hole64_start(void);DeviceState *pc_vga_init (ISABus *isa_bus,PCIBus *pci_bus);void pc_basic_device_init (struct PCMachineState *pcms,ISABus *isa_bus,qemu_irq *gsi, -ISADevice **rtc_state, +ISADevice *rtc_state,bool create_fdctrl,uint32_t hpet_irqs); void pc_cmos_init(PCMachineState *pcms,
Signature · 1 line
2.38.1
PATCH v2 12/43 hw/isa/piix3: Create USB controller in host device
In reply to Bernhard BeschowThe USB controller is an integral part of PIIX3 (function 2). So create it as part of the south bridge.
Note that the USB function is optional in QEMU. This is why it gets object_initialize_child()'ed in realize rather than in instance_init.
--- hw/i386/pc_piix.c | 7 ++----- hw/isa/Kconfig | 1 + hw/isa/piix3.c | 17 +++++++++++++++++ include/hw/southbridge/piix.h | 4 ++++ 4 files changed, 24 insertions(+), 5 deletions(-)
hw/i386/pc_piix.c +2 -5
@@ -51,7 +51,6 @@#include "exec/memory.h" #include "hw/acpi/acpi.h" #include "hw/acpi/piix4.h" -#include "hw/usb/hcd-uhci.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/xen.h"
@@ -221,6 +220,8 @@ static void pc_init1(MachineState *machine, pcms->bus = pci_bus; pci_dev =pci_new_multifunction (-1 , true, type); +object_property_set_bool (OBJECT (pci_dev),"has-usb" , +machine_usb (machine), &error_abort);pci_realize_and_unref (pci_dev, pci_bus, &error_fatal); piix3 =PIIX3_PCI_DEVICE (pci_dev); piix3->pic = x86ms->gsi;
@@ -299,10 +300,6 @@ static void pc_init1(MachineState *machine, }#endif -if (pcmc->pci_enabled &&machine_usb (machine)) { -pci_create_simple (pci_bus, piix3_devfn +2 ,TYPE_PIIX3_USB_UHCI ); - } -if (pcmc->pci_enabled &&x86_machine_is_acpi_enabled (X86_MACHINE (pcms))) {PCIDevice *piix4_pm;
hw/isa/Kconfig +1 -0
@@ -36,6 +36,7 @@ config PIIX3 select I8257 select ISA_BUS select MC146818RTC + select USB_UHCI config PIIX4 bool
hw/isa/piix3.c +17 -0
@@ -300,6 +300,7 @@ static const MemoryRegionOps rcr_ops = {static void pci_piix3_realize (PCIDevice *dev,Error **errp) {PIIX3State *d =PIIX3_PCI_DEVICE (dev); +PCIBus *pci_bus =pci_get_bus (dev);ISABus *isa_bus; isa_bus = isa_bus_new(DEVICE(d), pci_address_space(dev),
@@ -320,6 +321,16 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)if (!qdev_realize (DEVICE (&d->rtc),BUS (isa_bus), errp)) {return ; } + +/* USB */ +if (d->has_usb) { +object_initialize_child (OBJECT (dev),"uhci" , &d->uhci, +TYPE_PIIX3_USB_UHCI ); +qdev_prop_set_int32 (DEVICE (&d->uhci),"addr" , dev->devfn +2 ); +if (!qdev_realize (DEVICE (&d->uhci),BUS (pci_bus), errp)) { +return ; + } + } }static void build_pci_isa_aml (AcpiDevAmlIf *adev,Aml *scope)
@@ -342,6 +353,11 @@ static void pci_piix3_init(Object *obj)object_initialize_child (obj,"rtc" , &d->rtc,TYPE_MC146818_RTC ); } +static Property pci_piix3_props[] = { +DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true), +DEFINE_PROP_END_OF_LIST (), +}; +static void pci_piix3_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -361,6 +377,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)* pc_piix.c's pc_init1() */ dc->user_creatable = false; +device_class_set_props (dc, pci_piix3_props); adevc->build_dev_aml = build_pci_isa_aml; }
include/hw/southbridge/piix.h +4 -0
@@ -15,6 +15,7 @@#include "hw/pci/pci.h" #include "qom/object.h" #include "hw/rtc/mc146818rtc.h" +#include "hw/usb/hcd-uhci.h" /* PIRQRC[A:D]: PIRQx Route Control Registers */ #define PIIX_PIRQCA 0x60
@@ -54,12 +55,15 @@ struct PIIXState {int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ];RTCState rtc; +UHCIState uhci;/* Reset Control Register contents */ uint8_t rcr;/* IO memory region for Reset Control Register (PIIX_RCR_IOPORT) */ MemoryRegion rcr_mem; + +bool has_usb; };typedef struct PIIXState PIIX3State ;
Signature · 1 line
2.38.1
PATCH v2 13/43 hw/isa/piix3: Create power management controller in host device
In reply to Bernhard BeschowThe power management controller is an integral part of PIIX3 (function 3). So create it as part of the south bridge.
Note that the ACPI function is optional in QEMU. This is why it gets object_initialize_child()'ed in realize rather than in instance_init.
--- hw/i386/pc_piix.c | 23 +++++++++++++---------- hw/isa/Kconfig | 1 + hw/isa/piix3.c | 14 ++++++++++++++ include/hw/southbridge/piix.h | 6 ++++++ 4 files changed, 34 insertions(+), 10 deletions(-)
hw/i386/pc_piix.c +13 -10
@@ -46,11 +46,11 @@#include "sysemu/kvm.h" #include "hw/kvm/clock.h" #include "hw/sysbus.h" +#include "hw/i2c/i2c.h" #include "hw/i2c/smbus_eeprom.h" #include "hw/xen/xen-x86.h" #include "exec/memory.h" #include "hw/acpi/acpi.h" -#include "hw/acpi/piix4.h" #include "qapi/error.h" #include "qemu/error-report.h" #include "sysemu/xen.h"
@@ -85,6 +85,7 @@ static void pc_init1(MachineState *machine,MemoryRegion *system_io =get_system_io ();PCIBus *pci_bus;ISABus *isa_bus; +Object *piix4_pm;int piix3_devfn =-1 ;qemu_irq smi_irq;GSIState *gsi_state;
@@ -222,6 +223,13 @@ static void pc_init1(MachineState *machine, pci_dev =pci_new_multifunction (-1 , true, type);object_property_set_bool (OBJECT (pci_dev),"has-usb" ,machine_usb (machine), &error_abort); +object_property_set_bool (OBJECT (pci_dev),"has-acpi" , +x86_machine_is_acpi_enabled (x86ms), + &error_abort); +qdev_prop_set_uint32 (DEVICE (pci_dev),"smb_io_base" ,0xb100 ); +object_property_set_bool (OBJECT (pci_dev),"smm-enabled" , +x86_machine_is_smm_enabled (x86ms), + &error_abort);pci_realize_and_unref (pci_dev, pci_bus, &error_fatal); piix3 =PIIX3_PCI_DEVICE (pci_dev); piix3->pic = x86ms->gsi;
@@ -229,8 +237,10 @@ static void pc_init1(MachineState *machine, isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix3),"isa.0" )); rtc_state =ISA_DEVICE (object_resolve_path_component (OBJECT (pci_dev),"rtc" )); + piix4_pm =object_resolve_path_component (OBJECT (pci_dev),"pm" ); }else { pci_bus =NULL ; + piix4_pm =NULL ; isa_bus =isa_bus_new (NULL ,get_system_memory (), system_io, &error_abort);
@@ -300,15 +310,8 @@ static void pc_init1(MachineState *machine, }#endif -if (pcmc->pci_enabled &&x86_machine_is_acpi_enabled (X86_MACHINE (pcms))) { -PCIDevice *piix4_pm; - +if (piix4_pm) { smi_irq =qemu_allocate_irq (pc_acpi_smi_interrupt, first_cpu,0 ); - piix4_pm =pci_new (piix3_devfn +3 ,TYPE_PIIX4_PM ); -qdev_prop_set_uint32 (DEVICE (piix4_pm),"smb_io_base" ,0xb100 ); -qdev_prop_set_bit (DEVICE (piix4_pm),"smm-enabled" , -x86_machine_is_smm_enabled (x86ms)); -pci_realize_and_unref (piix4_pm, pci_bus, &error_fatal);qdev_connect_gpio_out (DEVICE (piix4_pm),0 , x86ms->gsi[9 ]);qdev_connect_gpio_out_named (DEVICE (piix4_pm),"smi-irq" ,0 , smi_irq);
@@ -322,7 +325,7 @@ static void pc_init1(MachineState *machine, object_property_allow_set_link, OBJ_PROP_LINK_STRONG);object_property_set_link (OBJECT (machine),PC_MACHINE_ACPI_DEVICE_PROP , -OBJECT (piix4_pm), &error_abort); + piix4_pm, &error_abort); }if (machine->nvdimms_state->is_enabled) {
hw/isa/Kconfig +1 -0
@@ -33,6 +33,7 @@ config PC87312 config PIIX3 bool + select ACPI_PIIX4 select I8257 select ISA_BUS select MC146818RTC
hw/isa/piix3.c +14 -0
@@ -331,6 +331,17 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)return ; } } + +/* Power Management */ +if (d->has_acpi) { +object_initialize_child (OBJECT (d),"pm" , &d->pm,TYPE_PIIX4_PM ); +qdev_prop_set_int32 (DEVICE (&d->pm),"addr" , dev->devfn +3 ); +qdev_prop_set_uint32 (DEVICE (&d->pm),"smb_io_base" , d->smb_io_base); +qdev_prop_set_bit (DEVICE (&d->pm),"smm-enabled" , d->smm_enabled); +if (!qdev_realize (DEVICE (&d->pm),BUS (pci_bus), errp)) { +return ; + } + } }static void build_pci_isa_aml (AcpiDevAmlIf *adev,Aml *scope)
@@ -354,7 +365,10 @@ static void pci_piix3_init(Object *obj) }static Property pci_piix3_props[] = { +DEFINE_PROP_UINT32 ("smb_io_base" , PIIX3State, smb_io_base,0 ), +DEFINE_PROP_BOOL ("has-acpi" , PIIX3State, has_acpi, true),DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true), +DEFINE_PROP_BOOL ("smm-enabled" , PIIX3State, smm_enabled, false),DEFINE_PROP_END_OF_LIST (), };
include/hw/southbridge/piix.h +6 -0
@@ -14,6 +14,7 @@#include "hw/pci/pci.h" #include "qom/object.h" +#include "hw/acpi/piix4.h" #include "hw/rtc/mc146818rtc.h" #include "hw/usb/hcd-uhci.h"
@@ -56,6 +57,9 @@ struct PIIXState {RTCState rtc;UHCIState uhci; +PIIX4PMState pm; + +uint32_t smb_io_base;/* Reset Control Register contents */ uint8_t rcr;
@@ -63,7 +67,9 @@ struct PIIXState {/* IO memory region for Reset Control Register (PIIX_RCR_IOPORT) */ MemoryRegion rcr_mem; +bool has_acpi;bool has_usb; +bool smm_enabled; };typedef struct PIIXState PIIX3State ;
Signature · 1 line
2.38.1
PATCH v2 14/43 hw/intc/i8259: Introduce i8259 proxy "isa-pic"
In reply to Bernhard BeschowHaving an i8259 proxy allows for ISA PICs to be created and wired up in southbridges. This is especially interesting for PIIX3 for two reasons:
First, the southbridge doesn't need to care about the virtualization technology used (KVM, TCG, Xen) due to in-IRQs (where devices get attached) and out-IRQs (which will trigger the IRQs of the respective virtzalization technology) are separated. Second, since the in-IRQs are populated with fully initialized qemu_irq's, they can already be wired up inside PIIX3.
--- hw/intc/i8259.c | 27 +++++++++++++++++++++++++++ include/hw/intc/i8259.h | 14 ++++++++++++++ 2 files changed, 41 insertions(+)
hw/intc/i8259.c +27 -0
@@ -458,9 +458,36 @@ static const TypeInfo i8259_info = { .class_size = sizeof(PICClass), }; +static void isapic_set_irq (void *opaque,int irq,int level) +{ +ISAPICState *s = opaque; + +qemu_set_irq (s->out_irqs[irq], level); +} + +static void isapic_init (Object *obj) +{ +ISAPICState *s =ISA_PIC (obj); + +qdev_init_gpio_in (DEVICE (s), isapic_set_irq,ISA_NUM_IRQS ); +qdev_init_gpio_out (DEVICE (s), s->out_irqs,ISA_NUM_IRQS ); + +for (int i =0 ; i <ISA_NUM_IRQS ; ++i) { + s->in_irqs[i] =qdev_get_gpio_in (DEVICE (s), i); + } +} + +static const TypeInfo isapic_info = { + .name =TYPE_ISA_PIC , + .parent =TYPE_ISA_DEVICE , + .instance_size =sizeof (ISAPICState), + .instance_init = isapic_init, +}; +static void pic_register_types (void ) {type_register_static (&i8259_info); +type_register_static (&isapic_info); }type_init (pic_register_types)
include/hw/intc/i8259.h +14 -0
@@ -1,6 +1,20 @@#ifndef HW_I8259_H #define HW_I8259_H +#include "qom/object.h" +#include "hw/isa/isa.h" +#include "qemu/typedefs.h" + +#define TYPE_ISA_PIC "isa-pic" +OBJECT_DECLARE_SIMPLE_TYPE(ISAPICState, ISA_PIC) + +struct ISAPICState { +ISADevice parent_obj; + +qemu_irq in_irqs[ISA_NUM_IRQS ]; +qemu_irq out_irqs[ISA_NUM_IRQS ]; +}; +/* i8259.c */ extern DeviceState *isa_pic;
Signature · 1 line
2.38.1
Re: [PATCH v2 14/43] hw/intc/i8259: Introduce i8259 proxy "isa-pic"
Hi Bernhard,
Quoted 50 lines · Bernhard Beschow
Having an i8259 proxy allows for ISA PICs to be created and wired up in southbridges. This is especially interesting for PIIX3 for two reasons:
First, the southbridge doesn't need to care about the virtualization technology used (KVM, TCG, Xen) due to in-IRQs (where devices get attached) and out-IRQs (which will trigger the IRQs of the respective virtzalization technology) are separated. Second, since the in-IRQs are populated with fully initialized qemu_irq's, they can already be wired up inside PIIX3.Signed-off-by Bernhard Beschow <[email protected]>--- hw/intc/i8259.c | 27 +++++++++++++++++++++++++++ include/hw/intc/i8259.h | 14 ++++++++++++++ 2 files changed, 41 insertions(+)hw/intc/i8259.c +25
-0+static void isapic_set_irq (void *opaque,int irq,int level) +{ +ISAPICState *s = opaque; + +qemu_set_irq (s->out_irqs[irq], level); +} + +static void isapic_init (Object *obj) +{ +ISAPICState *s =ISA_PIC (obj); + +qdev_init_gpio_in (DEVICE (s), isapic_set_irq,ISA_NUM_IRQS ); +qdev_init_gpio_out (DEVICE (s), s->out_irqs,ISA_NUM_IRQS ); + +for (int i =0 ; i <ISA_NUM_IRQS ; ++i) { + s->in_irqs[i] =qdev_get_gpio_in (DEVICE (s), i); + } +} + +static const TypeInfo isapic_info = { + .name =TYPE_ISA_PIC , + .parent =TYPE_ISA_DEVICE , + .instance_size =sizeof (ISAPICState), + .instance_init = isapic_init, +};include/hw/intc/i8259.h +3
-0@@ -1,6 +1,20 @@#ifndef HW_I8259_H #define HW_I8259_H +#include "qom/object.h" +#include "hw/isa/isa.h" +#include "qemu/typedefs.h"
include/hw/intc/i8259.h line 16
Quoted 10 lines
include/hw/intc/i8259.h +10
-0+ +#define TYPE_ISA_PIC "isa-pic" +OBJECT_DECLARE_SIMPLE_TYPE(ISAPICState, ISA_PIC) + +struct ISAPICState { +ISADevice parent_obj; + +qemu_irq in_irqs[ISA_NUM_IRQS ]; +qemu_irq out_irqs[ISA_NUM_IRQS ]; +};
There is nothing I8259 / ISA specific in your model.
What about adding a generic qdev proxy-irq (having a configurable number of IRQs to proxy)? See for example hw/core/split-irq.c.
Regards,
Phil.
Re: [PATCH v2 14/43] hw/intc/i8259: Introduce i8259 proxy "isa-pic"
Am 24. Oktober 2022 07:35:48 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 65 lines
Hi Bernhard,
Quoted 49 lines · Bernhard Beschow
Having an i8259 proxy allows for ISA PICs to be created and wired up in southbridges. This is especially interesting for PIIX3 for two reasons:
First, the southbridge doesn't need to care about the virtualization technology used (KVM, TCG, Xen) due to in-IRQs (where devices get attached) and out-IRQs (which will trigger the IRQs of the respective virtzalization technology) are separated. Second, since the in-IRQs are populated with fully initialized qemu_irq's, they can already be wired up inside PIIX3.Signed-off-by Bernhard Beschow <[email protected]>--- hw/intc/i8259.c | 27 +++++++++++++++++++++++++++ include/hw/intc/i8259.h | 14 ++++++++++++++ 2 files changed, 41 insertions(+)hw/intc/i8259.c +25
-0+static void isapic_set_irq (void *opaque,int irq,int level) +{ +ISAPICState *s = opaque; + +qemu_set_irq (s->out_irqs[irq], level); +} + +static void isapic_init (Object *obj) +{ +ISAPICState *s =ISA_PIC (obj); + +qdev_init_gpio_in (DEVICE (s), isapic_set_irq,ISA_NUM_IRQS ); +qdev_init_gpio_out (DEVICE (s), s->out_irqs,ISA_NUM_IRQS ); + +for (int i =0 ; i <ISA_NUM_IRQS ; ++i) { + s->in_irqs[i] =qdev_get_gpio_in (DEVICE (s), i); + } +} + +static const TypeInfo isapic_info = { + .name =TYPE_ISA_PIC , + .parent =TYPE_ISA_DEVICE , + .instance_size =sizeof (ISAPICState), + .instance_init = isapic_init, +};include/hw/intc/i8259.h +2
-0@@ -1,6 +1,20 @@#ifndef HW_I8259_H #define HW_I8259_H +#include "qom/object.h" +#include "hw/isa/isa.h" +#include "qemu/typedefs.h" include/hw/intc/i8259.h line 15
Quoted 10 lines
include/hw/intc/i8259.h +10
-0+ +#define TYPE_ISA_PIC "isa-pic" +OBJECT_DECLARE_SIMPLE_TYPE(ISAPICState, ISA_PIC) + +struct ISAPICState { +ISADevice parent_obj; + +qemu_irq in_irqs[ISA_NUM_IRQS ]; +qemu_irq out_irqs[ISA_NUM_IRQS ]; +};There is nothing I8259 / ISA specific in your model.
Quoted 2 lines
What about adding a generic qdev proxy-irq (having a configurable number of IRQs to proxy)? See for example
hw/core/split-irq.c.
Will do!
Best regards,
Bernhard
Quoted 4 lines
Regards,
Phil.
PATCH v2 15/43 hw/isa/piix3: Create ISA PIC in host device
In reply to Bernhard BeschowUse the newly introduced i8259 proxy "isa-pic" which allows for wiring up devices in the southbridge where the virtualization technology used (KVM, TCG, Xen) is not yet known.
--- hw/i386/pc_piix.c | 15 +++++++++------ hw/isa/Kconfig | 1 + hw/isa/piix3.c | 10 +++++++++- include/hw/southbridge/piix.h | 4 ++-- 4 files changed, 21 insertions(+), 9 deletions(-)
hw/i386/pc_piix.c +9 -6
@@ -207,10 +207,11 @@ static void pc_init1(MachineState *machine, gsi_state =pc_gsi_create (&x86ms->gsi, pcmc->pci_enabled);if (pcmc->pci_enabled) { -PIIX3State *piix3; +DeviceState *dev;PCIDevice *pci_dev;const char *type =xen_enabled () ?TYPE_PIIX3_XEN_DEVICE :TYPE_PIIX3_DEVICE ; +int i; pci_bus = i440fx_init(pci_type, i440fx_host,
@@ -231,10 +232,12 @@ static void pc_init1(MachineState *machine,x86_machine_is_smm_enabled (x86ms), &error_abort);pci_realize_and_unref (pci_dev, pci_bus, &error_fatal); - piix3 =PIIX3_PCI_DEVICE (pci_dev); - piix3->pic = x86ms->gsi; - piix3_devfn = piix3->dev.devfn; - isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix3),"isa.0" )); + dev =DEVICE (object_resolve_path_component (OBJECT (pci_dev),"pic" )); +for (i =0 ; i <ISA_NUM_IRQS ; i++) { +qdev_connect_gpio_out (dev, i, x86ms->gsi[i]); + } + piix3_devfn = pci_dev->devfn; + isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (pci_dev),"isa.0" )); rtc_state =ISA_DEVICE (object_resolve_path_component (OBJECT (pci_dev),"rtc" )); piix4_pm =object_resolve_path_component (OBJECT (pci_dev),"pm" );
@@ -243,6 +246,7 @@ static void pc_init1(MachineState *machine, piix4_pm =NULL ; isa_bus =isa_bus_new (NULL ,get_system_memory (), system_io, &error_abort); +isa_bus_irqs (isa_bus, x86ms->gsi); rtc_state =isa_new (TYPE_MC146818_RTC );qdev_prop_set_int32 (DEVICE (rtc_state),"base_year" ,2000 );
@@ -251,7 +255,6 @@ static void pc_init1(MachineState *machine,i8257_dma_init (isa_bus,0 ); pcms->hpet_enabled = false; } -isa_bus_irqs (isa_bus, x86ms->gsi);if (x86ms->pic ==ON_OFF_AUTO_ON || x86ms->pic ==ON_OFF_AUTO_AUTO ) {pc_i8259_create (isa_bus, gsi_state->i8259_irq);
hw/isa/Kconfig +1 -0
@@ -35,6 +35,7 @@ config PIIX3 bool select ACPI_PIIX4 select I8257 + select I8259 select ISA_BUS select MC146818RTC select USB_UHCI
hw/isa/piix3.c +9 -1
@@ -40,7 +40,7 @@static void piix3_set_irq_pic (PIIX3State *piix3,int pic_irq) { -qemu_set_irq (piix3->pic[pic_irq], +qemu_set_irq (piix3->pic.in_irqs[pic_irq], !!(piix3->pic_levels & (((1ULL <<PIIX_NUM_PIRQS ) -1 ) << (pic_irq *PIIX_NUM_PIRQS ))));
@@ -309,6 +309,13 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)return ; } +/* PIC */ +if (!qdev_realize (DEVICE (&d->pic),BUS (isa_bus), errp)) { +return ; + } + +isa_bus_irqs (isa_bus, d->pic.in_irqs); +memory_region_init_io (&d->rcr_mem,OBJECT (dev), &rcr_ops, d,"piix3-reset-control" ,1 ); memory_region_add_subregion_overlap(pci_address_space_io(dev),
@@ -361,6 +368,7 @@ static void pci_piix3_init(Object *obj) {PIIX3State *d =PIIX3_PCI_DEVICE (obj); +object_initialize_child (obj,"pic" , &d->pic,TYPE_ISA_PIC );object_initialize_child (obj,"rtc" , &d->rtc,TYPE_MC146818_RTC ); }
include/hw/southbridge/piix.h +2 -2
@@ -15,6 +15,7 @@#include "hw/pci/pci.h" #include "qom/object.h" #include "hw/acpi/piix4.h" +#include "hw/intc/i8259.h" #include "hw/rtc/mc146818rtc.h" #include "hw/usb/hcd-uhci.h"
@@ -50,11 +51,10 @@ struct PIIXState {#endif uint64_t pic_levels; -qemu_irq *pic; -/* This member isn't used. Just for save/load compatibility */ int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ]; +ISAPICState pic;RTCState rtc;UHCIState uhci;PIIX4PMState pm;
Signature · 1 line
2.38.1
PATCH v2 16/43 hw/isa/piix3: Create IDE controller in host device
In reply to Bernhard BeschowNow that PIIX3 contains the new isa-pic, it is possible to instantiate PIIX3 IDE in the PIIX3 southbridge. PIIX3 IDE wires up its interrupts to the ISA bus in its realize method which requires the interrupt controller to provide fully populated qemu_irqs. This is the case for isa-pic even though the virtualization technology not known yet.
--- hw/i386/Kconfig | 1 - hw/i386/pc_piix.c | 15 ++++++--------- hw/isa/Kconfig | 1 + hw/isa/piix3.c | 8 ++++++++ include/hw/southbridge/piix.h | 2 ++ 5 files changed, 17 insertions(+), 10 deletions(-)
hw/i386/Kconfig +0 -1
@@ -74,7 +74,6 @@ config I440FX select ACPI_SMBUS select PCI_I440FX select PIIX3 - select IDE_PIIX select DIMM select SMBIOS select FW_CFG_DMA
hw/i386/pc_piix.c +6 -9
@@ -41,7 +41,6 @@#include "hw/usb.h" #include "net/net.h" #include "hw/ide/pci.h" -#include "hw/ide/piix.h" #include "hw/irq.h" #include "sysemu/kvm.h" #include "hw/kvm/clock.h"
@@ -86,7 +85,6 @@ static void pc_init1(MachineState *machine,PCIBus *pci_bus;ISABus *isa_bus;Object *piix4_pm; -int piix3_devfn =-1 ;qemu_irq smi_irq;GSIState *gsi_state;BusState *idebus[MAX_IDE_BUS ];
@@ -236,11 +234,14 @@ static void pc_init1(MachineState *machine,for (i =0 ; i <ISA_NUM_IRQS ; i++) {qdev_connect_gpio_out (dev, i, x86ms->gsi[i]); } - piix3_devfn = pci_dev->devfn; isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (pci_dev),"isa.0" )); rtc_state =ISA_DEVICE (object_resolve_path_component (OBJECT (pci_dev),"rtc" )); piix4_pm =object_resolve_path_component (OBJECT (pci_dev),"pm" ); + dev =DEVICE (object_resolve_path_component (OBJECT (pci_dev),"ide" )); +pci_ide_create_devs (PCI_DEVICE (dev)); + idebus[0 ] =qdev_get_child_bus (dev,"ide.0" ); + idebus[1 ] =qdev_get_child_bus (dev,"ide.1" ); }else { pci_bus =NULL ; piix4_pm =NULL ;
@@ -254,6 +255,8 @@ static void pc_init1(MachineState *machine,i8257_dma_init (isa_bus,0 ); pcms->hpet_enabled = false; + idebus[0 ] =NULL ; + idebus[1 ] =NULL ; }if (x86ms->pic ==ON_OFF_AUTO_ON || x86ms->pic ==ON_OFF_AUTO_AUTO ) {
@@ -282,12 +285,6 @@ static void pc_init1(MachineState *machine,pc_nic_init (pcmc, isa_bus, pci_bus);if (pcmc->pci_enabled) { -PCIDevice *dev; - - dev =pci_create_simple (pci_bus, piix3_devfn +1 ,TYPE_PIIX3_IDE ); -pci_ide_create_devs (dev); - idebus[0 ] =qdev_get_child_bus (&dev->qdev,"ide.0" ); - idebus[1 ] =qdev_get_child_bus (&dev->qdev,"ide.1" );pc_cmos_init (pcms, idebus[0 ], idebus[1 ], rtc_state); }#ifdef CONFIG_IDE_ISA
hw/isa/Kconfig +1 -0
@@ -36,6 +36,7 @@ config PIIX3 select ACPI_PIIX4 select I8257 select I8259 + select IDE_PIIX select ISA_BUS select MC146818RTC select USB_UHCI
hw/isa/piix3.c +8 -0
@@ -29,6 +29,7 @@#include "hw/southbridge/piix.h" #include "hw/irq.h" #include "hw/qdev-properties.h" +#include "hw/ide/piix.h" #include "hw/isa/isa.h" #include "hw/xen/xen.h" #include "sysemu/xen.h"
@@ -329,6 +330,12 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)return ; } +/* IDE */ +qdev_prop_set_int32 (DEVICE (&d->ide),"addr" , dev->devfn +1 ); +if (!qdev_realize (DEVICE (&d->ide),BUS (pci_bus), errp)) { +return ; + } +/* USB */ if (d->has_usb) { object_initialize_child(OBJECT(dev), "uhci", &d->uhci,
@@ -370,6 +377,7 @@ static void pci_piix3_init(Object *obj)object_initialize_child (obj,"pic" , &d->pic,TYPE_ISA_PIC );object_initialize_child (obj,"rtc" , &d->rtc,TYPE_MC146818_RTC ); +object_initialize_child (obj,"ide" , &d->ide,TYPE_PIIX3_IDE ); }static Property pci_piix3_props[] = {
include/hw/southbridge/piix.h +2 -0
@@ -15,6 +15,7 @@#include "hw/pci/pci.h" #include "qom/object.h" #include "hw/acpi/piix4.h" +#include "hw/ide/pci.h" #include "hw/intc/i8259.h" #include "hw/rtc/mc146818rtc.h" #include "hw/usb/hcd-uhci.h"
@@ -56,6 +57,7 @@ struct PIIXState {ISAPICState pic;RTCState rtc; +PCIIDEState ide;UHCIState uhci;PIIX4PMState pm;
Signature · 1 line
2.38.1
PATCH v2 17/43 hw/isa/piix3: Wire up ACPI interrupt internally
In reply to Bernhard BeschowNow that PIIX3 has the PIC integrated, the ACPI controller can be wired up internally.
--- hw/i386/pc_piix.c | 1 - hw/isa/piix3.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
hw/i386/pc_piix.c +0 -1
@@ -313,7 +313,6 @@ static void pc_init1(MachineState *machine,if (piix4_pm) { smi_irq =qemu_allocate_irq (pc_acpi_smi_interrupt, first_cpu,0 ); -qdev_connect_gpio_out (DEVICE (piix4_pm),0 , x86ms->gsi[9 ]);qdev_connect_gpio_out_named (DEVICE (piix4_pm),"smi-irq" ,0 , smi_irq); pcms->smbus =I2C_BUS (qdev_get_child_bus (DEVICE (piix4_pm),"i2c" ));/* TODO: Populate SPD eeprom data. */
hw/isa/piix3.c +2 -0
@@ -355,6 +355,8 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)if (!qdev_realize (DEVICE (&d->pm),BUS (pci_bus), errp)) {return ; } +qdev_connect_gpio_out (DEVICE (&d->pm),0 , +qdev_get_gpio_in (DEVICE (&d->pic),9 )); } }
Signature · 1 line
2.38.1
PATCH v2 18/43 hw/isa/piix3: Remove unused include
In reply to Bernhard BeschowAmmends commit 988fb613215993dd0ce642b89ca8182c479d39dd.
--- hw/isa/piix3.c | 1 - 1 file changed, 1 deletion(-)
hw/isa/piix3.c +0 -1
@@ -32,7 +32,6 @@#include "hw/ide/piix.h" #include "hw/isa/isa.h" #include "hw/xen/xen.h" -#include "sysemu/xen.h" #include "sysemu/runstate.h" #include "migration/vmstate.h" #include "hw/acpi/acpi_aml_interface.h"
Signature · 1 line
2.38.1
Re: [PATCH v2 18/43] hw/isa/piix3: Remove unused include
Quoted 6 lines · Bernhard Beschow
Ammends commit
988fb613215993dd0ce642b89ca8182c479d39dd.Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 1 - 1 file changed, 1 deletion(-)
PATCH v2 19/43 hw/isa/piix3: Allow board to provide PCI interrupt routes
In reply to Bernhard BeschowPIIX3 initializes the PIRQx route control registers to the default values as described in the 82371AB PCI-TO-ISA/IDE XCELERATOR (PIIX4) April 1997 manual. PIIX4, however, initializes the routes according to the Malta™ User’s Manual, ch 6.6, which are IRQs 10 and 11. In order to allow the reset methods to be consolidated, allow board code to specify the routes.
--- hw/isa/piix3.c | 12 ++++++++---- include/hw/southbridge/piix.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)
hw/isa/piix3.c +8 -4
@@ -168,10 +168,10 @@ static void piix3_reset(DeviceState *dev) pci_conf[0x4c ] =0x4d ; pci_conf[0x4e ] =0x03 ; pci_conf[0x4f ] =0x00 ; - pci_conf[0x60 ] =0x80 ; - pci_conf[0x61 ] =0x80 ; - pci_conf[0x62 ] =0x80 ; - pci_conf[0x63 ] =0x80 ; + pci_conf[PIIX_PIRQCA ] = d->pci_irq_reset_mappings[0 ]; + pci_conf[PIIX_PIRQCB ] = d->pci_irq_reset_mappings[1 ]; + pci_conf[PIIX_PIRQCC ] = d->pci_irq_reset_mappings[2 ]; + pci_conf[PIIX_PIRQCD ] = d->pci_irq_reset_mappings[3 ]; pci_conf[0x69 ] =0x02 ; pci_conf[0x70 ] =0x80 ; pci_conf[0x76 ] =0x0c ;
@@ -383,6 +383,10 @@ static void pci_piix3_init(Object *obj)static Property pci_piix3_props[] = {DEFINE_PROP_UINT32 ("smb_io_base" , PIIX3State, smb_io_base,0 ), +DEFINE_PROP_UINT8 ("pirqa" , PIIX3State, pci_irq_reset_mappings[0 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqb" , PIIX3State, pci_irq_reset_mappings[1 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqc" , PIIX3State, pci_irq_reset_mappings[2 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqd" , PIIX3State, pci_irq_reset_mappings[3 ],0x80 ),DEFINE_PROP_BOOL ("has-acpi" , PIIX3State, has_acpi, true),DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true),DEFINE_PROP_BOOL ("smm-enabled" , PIIX3State, smm_enabled, false),
include/hw/southbridge/piix.h +1 -0
@@ -54,6 +54,7 @@ struct PIIXState {/* This member isn't used. Just for save/load compatibility */ int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ]; +uint8_t pci_irq_reset_mappings[PIIX_NUM_PIRQS ];ISAPICState pic;RTCState rtc;
Signature · 1 line
2.38.1
Re: [PATCH v2 19/43] hw/isa/piix3: Allow board to provide PCI interrupt routes
Quoted 18 lines · Bernhard Beschow
PIIX3 initializes the PIRQx route control registers to the default values as described in the 82371AB PCI-TO-ISA/IDE XCELERATOR (PIIX4) April 1997 manual. PIIX4, however, initializes the routes according to the Malta™ User’s Manual, ch 6.6, which are IRQs 10 and 11. In order to allow the reset methods to be consolidated, allow board code to specify the routes.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 12 ++++++++---- include/hw/southbridge/piix.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)include/hw/southbridge/piix.h +0
-0
include/hw/southbridge/piix.h struct PIIXState { · line 57
Quoted 4 lines
include/hw/southbridge/piix.h +1
-0@@ -54,6 +54,7 @@ struct PIIXState {/* This member isn't used. Just for save/load compatibility */ int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ]; +uint8_t pci_irq_reset_mappings[PIIX_NUM_PIRQS ];
pci_irq_reset_mappings[PCI_NUM_PINS]?
Quoted 3 lines
include/hw/southbridge/piix.h +0
-0ISAPICState pic;RTCState rtc;
Re: [PATCH v2 19/43] hw/isa/piix3: Allow board to provide PCI interrupt routes
In reply to Bernhard BeschowQuoted 18 lines · Bernhard Beschow
PIIX3 initializes the PIRQx route control registers to the default values as described in the 82371AB PCI-TO-ISA/IDE XCELERATOR (PIIX4) April 1997 manual. PIIX4, however, initializes the routes according to the Malta™ User’s Manual, ch 6.6, which are IRQs 10 and 11. In order to allow the reset methods to be consolidated, allow board code to specify the routes.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 12 ++++++++---- include/hw/southbridge/piix.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)hw/isa/piix3.c +0
-0
hw/isa/piix3.c static void piix3_reset(DeviceState *dev) · line 174
Quoted 7 lines
hw/isa/piix3.c +0
-4@@ -168,10 +168,10 @@ static void piix3_reset(DeviceState *dev) pci_conf[0x4c ] =0x4d ; pci_conf[0x4e ] =0x03 ; pci_conf[0x4f ] =0x00 ; - pci_conf[0x60 ] =0x80 ; - pci_conf[0x61 ] =0x80 ; - pci_conf[0x62 ] =0x80 ; - pci_conf[0x63 ] =0x80 ;
These values are the correct reset ones however (also for PIIX4).
The problem is the Malta machine abuse of the PIIX4 model. IOW this doesn't seem the correct approach, we should fix how Malta use the PIIX4 (in the emulated tiny boot loader). I'll try to write smth before reviewing the rest of this series, because it might simplify your refactor.
Quoted 30 lines
hw/isa/piix3.c +8
-0+ pci_conf[PIIX_PIRQCA ] = d->pci_irq_reset_mappings[0 ]; + pci_conf[PIIX_PIRQCB ] = d->pci_irq_reset_mappings[1 ]; + pci_conf[PIIX_PIRQCC ] = d->pci_irq_reset_mappings[2 ]; + pci_conf[PIIX_PIRQCD ] = d->pci_irq_reset_mappings[3 ]; pci_conf[0x69 ] =0x02 ; pci_conf[0x70 ] =0x80 ; pci_conf[0x76 ] =0x0c ;@@ -383,6 +383,10 @@ static void pci_piix3_init(Object *obj)static Property pci_piix3_props[] = {DEFINE_PROP_UINT32 ("smb_io_base" , PIIX3State, smb_io_base,0 ), +DEFINE_PROP_UINT8 ("pirqa" , PIIX3State, pci_irq_reset_mappings[0 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqb" , PIIX3State, pci_irq_reset_mappings[1 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqc" , PIIX3State, pci_irq_reset_mappings[2 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqd" , PIIX3State, pci_irq_reset_mappings[3 ],0x80 ),DEFINE_PROP_BOOL ("has-acpi" , PIIX3State, has_acpi, true),DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true),DEFINE_PROP_BOOL ("smm-enabled" , PIIX3State, smm_enabled, false),include/hw/southbridge/piix.h +1
-0@@ -54,6 +54,7 @@ struct PIIXState {/* This member isn't used. Just for save/load compatibility */ int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ]; +uint8_t pci_irq_reset_mappings[PIIX_NUM_PIRQS ];ISAPICState pic;RTCState rtc;
Re: [PATCH v2 19/43] hw/isa/piix3: Allow board to provide PCI interrupt routes
Hi Phil,
Am 25. Oktober 2022 23:34:15 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 29 lines · Bernhard Beschow
Quoted 18 lines
PIIX3 initializes the PIRQx route control registers to the default values as described in the 82371AB PCI-TO-ISA/IDE XCELERATOR (PIIX4) April 1997 manual. PIIX4, however, initializes the routes according to the Malta™ User’s Manual, ch 6.6, which are IRQs 10 and 11. In order to allow the reset methods to be consolidated, allow board code to specify the routes.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 12 ++++++++---- include/hw/southbridge/piix.h | 1 + 2 files changed, 9 insertions(+), 4 deletions(-)hw/isa/piix3.c +0
-0hw/isa/piix3.c static void piix3_reset(DeviceState *dev) · line 174
Quoted 7 lines
hw/isa/piix3.c +0
-4@@ -168,10 +168,10 @@ static void piix3_reset(DeviceState *dev) pci_conf[0x4c ] =0x4d ; pci_conf[0x4e ] =0x03 ; pci_conf[0x4f ] =0x00 ; - pci_conf[0x60 ] =0x80 ; - pci_conf[0x61 ] =0x80 ; - pci_conf[0x62 ] =0x80 ; - pci_conf[0x63 ] =0x80 ;These values are the correct reset ones however (also for PIIX4).
Quoted 5 lines
The problem is the Malta machine abuse of the PIIX4 model. IOW this doesn't seem the correct approach, we should fix how Malta use the PIIX4 (in the emulated tiny boot loader). I'll try to write smth before reviewing the rest of this series, because it might simplify your refactor.
Indeed my first approach for the refactor was to implement MachineClass::reset for Malta where the Malta-specific values would be set. I could redo that if you want. Just let me know.
Best regards,
Bernhard
Quoted 29 lines
Quoted 28 lines
hw/isa/piix3.c +8
-0+ pci_conf[PIIX_PIRQCA ] = d->pci_irq_reset_mappings[0 ]; + pci_conf[PIIX_PIRQCB ] = d->pci_irq_reset_mappings[1 ]; + pci_conf[PIIX_PIRQCC ] = d->pci_irq_reset_mappings[2 ]; + pci_conf[PIIX_PIRQCD ] = d->pci_irq_reset_mappings[3 ]; pci_conf[0x69 ] =0x02 ; pci_conf[0x70 ] =0x80 ; pci_conf[0x76 ] =0x0c ;@@ -383,6 +383,10 @@ static void pci_piix3_init(Object *obj)static Property pci_piix3_props[] = {DEFINE_PROP_UINT32 ("smb_io_base" , PIIX3State, smb_io_base,0 ), +DEFINE_PROP_UINT8 ("pirqa" , PIIX3State, pci_irq_reset_mappings[0 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqb" , PIIX3State, pci_irq_reset_mappings[1 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqc" , PIIX3State, pci_irq_reset_mappings[2 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqd" , PIIX3State, pci_irq_reset_mappings[3 ],0x80 ),DEFINE_PROP_BOOL ("has-acpi" , PIIX3State, has_acpi, true),DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true),DEFINE_PROP_BOOL ("smm-enabled" , PIIX3State, smm_enabled, false),include/hw/southbridge/piix.h +1
-0@@ -54,6 +54,7 @@ struct PIIXState {/* This member isn't used. Just for save/load compatibility */ int32_t pci_irq_levels_vmstate[PIIX_NUM_PIRQS ]; +uint8_t pci_irq_reset_mappings[PIIX_NUM_PIRQS ];ISAPICState pic;RTCState rtc;
PATCH v2 20/43 hw/isa/piix3: Resolve redundant PIIX_NUM_PIC_IRQS
In reply to Bernhard BeschowPIIX_NUM_PIC_IRQS is assumed to be the same as ISA_NUM_IRQS, otherwise inconsistencies can occur.
--- hw/isa/piix3.c | 8 ++++---- include/hw/southbridge/piix.h | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-)
hw/isa/piix3.c +4 -4
@@ -52,7 +52,7 @@ static void piix3_set_irq_level_internal(PIIX3State *piix3, int pirq, int level)uint64_t mask; pic_irq = piix3->dev.config[PIIX_PIRQCA + pirq]; -if (pic_irq >=PIIX_NUM_PIC_IRQS ) { +if (pic_irq >=ISA_NUM_IRQS ) {return ; }
@@ -66,7 +66,7 @@ static void piix3_set_irq_level(PIIX3State *piix3, int pirq, int level)int pic_irq; pic_irq = piix3->dev.config[PIIX_PIRQCA + pirq]; -if (pic_irq >=PIIX_NUM_PIC_IRQS ) { +if (pic_irq >=ISA_NUM_IRQS ) {return ; }
@@ -98,7 +98,7 @@ static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pin)int irq = piix3->dev.config[PIIX_PIRQCA + pin];PCIINTxRoute route; -if (irq <PIIX_NUM_PIC_IRQS ) { +if (irq <ISA_NUM_IRQS ) { route.mode =PCI_INTX_ENABLED ; route.irq = irq; }else {
@@ -130,7 +130,7 @@ static void piix3_write_config(PCIDevice *dev,pci_bus_fire_intx_routing_notifier (pci_get_bus (&piix3->dev));piix3_update_irq_levels (piix3); -for (pic_irq =0 ; pic_irq <PIIX_NUM_PIC_IRQS ; pic_irq++) { +for (pic_irq =0 ; pic_irq <ISA_NUM_IRQS ; pic_irq++) {piix3_set_irq_pic (piix3, pic_irq); } }
include/hw/southbridge/piix.h +2 -3
@@ -32,7 +32,6 @@*/ #define PIIX_RCR_IOPORT 0xcf9 -#define PIIX_NUM_PIC_IRQS 16/* i8259 * 2 */ #define PIIX_NUM_PIRQS 4ULL/* PIRQ[A-D] */ struct PIIXState {
@@ -44,10 +43,10 @@ struct PIIXState {* So one PIC level is tracked by PIIX_NUM_PIRQS bits. * * PIRQ is mapped to PIC pins, we track it by -* PIIX_NUM_PIRQS * PIIX_NUM_PIC_IRQS = 64 bits with +* PIIX_NUM_PIRQS * ISA_NUM_IRQS = 64 bits with * pic_irq * PIIX_NUM_PIRQS + pirq */ -#if PIIX_NUM_PIC_IRQS *PIIX_NUM_PIRQS >64 +#if ISA_NUM_IRQS *PIIX_NUM_PIRQS >64 #error "unable to encode pic state in 64bit in pic_levels."#endif uint64_t pic_levels;
Signature · 1 line
2.38.1
PATCH v2 21/43 hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4
In reply to Bernhard Beschow--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix3.c +2 -2
@@ -381,7 +381,7 @@ static void pci_piix3_init(Object *obj)object_initialize_child (obj,"ide" , &d->ide,TYPE_PIIX3_IDE ); } -static Property pci_piix3_props[] = { +static Property pci_piix_props[] = {DEFINE_PROP_UINT32 ("smb_io_base" , PIIX3State, smb_io_base,0 ),DEFINE_PROP_UINT8 ("pirqa" , PIIX3State, pci_irq_reset_mappings[0 ],0x80 ),DEFINE_PROP_UINT8 ("pirqb" , PIIX3State, pci_irq_reset_mappings[1 ],0x80 ),
@@ -412,7 +412,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)* pc_piix.c's pc_init1() */ dc->user_creatable = false; -device_class_set_props (dc, pci_piix3_props); +device_class_set_props (dc, pci_piix_props); adevc->build_dev_aml = build_pci_isa_aml; }
Signature · 1 line
2.38.1
Re: [PATCH v2 21/43] hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4
Quoted 4 lines · Bernhard Beschow
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 22/43 hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4
In reply to Bernhard Beschow--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix3.c +2 -2
@@ -156,7 +156,7 @@ static void piix3_write_config_xen(PCIDevice *dev,piix3_write_config (dev, address, val, len); } -static void piix3_reset (DeviceState *dev) +static void piix_reset (DeviceState *dev) {PIIX3State *d =PIIX3_PCI_DEVICE (dev);uint8_t *pci_conf = d->dev.config;
@@ -399,7 +399,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)PCIDeviceClass *k =PCI_DEVICE_CLASS (klass);AcpiDevAmlIfClass *adevc =ACPI_DEV_AML_IF_CLASS (klass); - dc->reset = piix3_reset; + dc->reset = piix_reset; dc->desc ="ISA bridge" ; dc->vmsd = &vmstate_piix3; dc->hotpluggable = false;
Signature · 1 line
2.38.1
Re: [PATCH v2 22/43] hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4
Quoted 4 lines · Bernhard Beschow
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 23/43 hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_"
In reply to Bernhard BeschowThe additional prefix aligns the function name with both other piix3-internal functions as well as QEMU conventions. Furthermore, it will help to distinguish the function from its PIIX4 counterpart once merged.
--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix3.c +2 -2
@@ -85,7 +85,7 @@ static void piix3_set_irq(void *opaque, int pirq, int level)* Return the global irq number corresponding to a given device irq * pin. We could also use the bus number to have a more precise mapping. */ -static int pci_slot_get_pirq (PCIDevice *pci_dev,int pci_intx) +static int piix3_pci_slot_get_pirq (PCIDevice *pci_dev,int pci_intx) {int slot_addend; slot_addend =PCI_SLOT (pci_dev->devfn) -1 ;
@@ -441,7 +441,7 @@ static void piix3_realize(PCIDevice *dev, Error **errp)return ; } -pci_bus_irqs (pci_bus, piix3_set_irq, pci_slot_get_pirq, +pci_bus_irqs (pci_bus, piix3_set_irq, piix3_pci_slot_get_pirq, piix3,PIIX_NUM_PIRQS );pci_bus_set_route_irq_fn (pci_bus, piix3_route_intx_pin_to_irq); }
Signature · 1 line
2.38.1
Re: [PATCH v2 23/43] hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_"
Quoted 9 lines · Bernhard Beschow
The additional prefix aligns the function name with both other piix3-internal functions as well as QEMU conventions. Furthermore, it will help to distinguish the function from its PIIX4 counterpart once merged.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 24/43 hw/isa/piix3: Rename typedef PIIX3State to PIIXState
In reply to Bernhard BeschowThis commit marks the finalization of the PIIX3 preparations to be merged with PIIX4. In particular, PIIXState is prepared to be reused in piix4.c.
--- hw/isa/piix3.c | 58 +++++++++++++++++------------------ include/hw/southbridge/piix.h | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-)
hw/isa/piix3.c +29 -29
@@ -38,7 +38,7 @@#define XEN_PIIX_NUM_PIRQS 128ULL -static void piix3_set_irq_pic (PIIX3State *piix3,int pic_irq) +static void piix3_set_irq_pic (PIIXState *piix3,int pic_irq) { qemu_set_irq(piix3->pic.in_irqs[pic_irq], !!(piix3->pic_levels &
@@ -46,7 +46,7 @@ static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq) (pic_irq * PIIX_NUM_PIRQS)))); } -static void piix3_set_irq_level_internal (PIIX3State *piix3,int pirq,int level) +static void piix3_set_irq_level_internal (PIIXState *piix3,int pirq,int level) {int pic_irq;uint64_t mask;
@@ -61,7 +61,7 @@ static void piix3_set_irq_level_internal(PIIX3State *piix3, int pirq, int level) piix3->pic_levels |= mask * !!level; } -static void piix3_set_irq_level (PIIX3State *piix3,int pirq,int level) +static void piix3_set_irq_level (PIIXState *piix3,int pirq,int level) {int pic_irq;
@@ -77,7 +77,7 @@ static void piix3_set_irq_level(PIIX3State *piix3, int pirq, int level)static void piix3_set_irq (void *opaque,int pirq,int level) { -PIIX3State *piix3 = opaque; +PIIXState *piix3 = opaque;piix3_set_irq_level (piix3, pirq, level); }
@@ -94,7 +94,7 @@ static int piix3_pci_slot_get_pirq(PCIDevice *pci_dev, int pci_intx)static PCIINTxRoute piix3_route_intx_pin_to_irq (void *opaque,int pin) { -PIIX3State *piix3 = opaque; +PIIXState *piix3 = opaque;int irq = piix3->dev.config[PIIX_PIRQCA + pin];PCIINTxRoute route;
@@ -109,7 +109,7 @@ static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pin) }/* irq routing is changed. so rebuild bitmap */ -static void piix3_update_irq_levels (PIIX3State *piix3) +static void piix3_update_irq_levels (PIIXState *piix3) {PCIBus *bus =pci_get_bus (&piix3->dev);int pirq;
@@ -125,7 +125,7 @@ static void piix3_write_config(PCIDevice *dev, {pci_default_write_config (dev, address, val, len);if (ranges_overlap (address, len,PIIX_PIRQCA ,4 )) { -PIIX3State *piix3 =PIIX3_PCI_DEVICE (dev); +PIIXState *piix3 =PIIX_PCI_DEVICE (dev);int pic_irq;pci_bus_fire_intx_routing_notifier (pci_get_bus (&piix3->dev));
@@ -158,7 +158,7 @@ static void piix3_write_config_xen(PCIDevice *dev,static void piix_reset (DeviceState *dev) { -PIIX3State *d =PIIX3_PCI_DEVICE (dev); +PIIXState *d =PIIX_PCI_DEVICE (dev);uint8_t *pci_conf = d->dev.config; pci_conf[0x04 ] =0x07 ;/* master, memory and I/O */
@@ -199,7 +199,7 @@ static void piix_reset(DeviceState *dev)static int piix3_post_load (void *opaque,int version_id) { -PIIX3State *piix3 = opaque; +PIIXState *piix3 = opaque;int pirq;/*
@@ -222,7 +222,7 @@ static int piix3_post_load(void *opaque, int version_id)static int piix3_pre_save (void *opaque) {int i; -PIIX3State *piix3 = opaque; +PIIXState *piix3 = opaque;for (i =0 ; i <ARRAY_SIZE (piix3->pci_irq_levels_vmstate); i++) { piix3->pci_irq_levels_vmstate[i] =
@@ -234,7 +234,7 @@ static int piix3_pre_save(void *opaque)static bool piix3_rcr_needed (void *opaque) { -PIIX3State *piix3 = opaque; +PIIXState *piix3 = opaque;return (piix3->rcr !=0 ); }
@@ -245,7 +245,7 @@ static const VMStateDescription vmstate_piix3_rcr = { .minimum_version_id = 1, .needed = piix3_rcr_needed, .fields = (VMStateField []) { -VMSTATE_UINT8 (rcr, PIIX3State), +VMSTATE_UINT8 (rcr, PIIXState),VMSTATE_END_OF_LIST () } };
@@ -257,8 +257,8 @@ static const VMStateDescription vmstate_piix3 = { .post_load = piix3_post_load, .pre_save = piix3_pre_save, .fields = (VMStateField []) { -VMSTATE_PCI_DEVICE (dev, PIIX3State), -VMSTATE_INT32_ARRAY_V (pci_irq_levels_vmstate, PIIX3State, +VMSTATE_PCI_DEVICE (dev, PIIXState), +VMSTATE_INT32_ARRAY_V (pci_irq_levels_vmstate, PIIXState,PIIX_NUM_PIRQS ,3 ),VMSTATE_END_OF_LIST () },
@@ -271,7 +271,7 @@ static const VMStateDescription vmstate_piix3 = {static void rcr_write (void *opaque,hwaddr addr,uint64_t val,unsigned len) { -PIIX3State *d = opaque; +PIIXState *d = opaque;if (val &4 ) {qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET );
@@ -282,7 +282,7 @@ static void rcr_write(void *opaque, hwaddr addr, uint64_t val, unsigned len)static uint64_t rcr_read (void *opaque,hwaddr addr,unsigned len) { -PIIX3State *d = opaque; +PIIXState *d = opaque;return d->rcr; }
@@ -299,7 +299,7 @@ static const MemoryRegionOps rcr_ops = {static void pci_piix3_realize (PCIDevice *dev,Error **errp) { -PIIX3State *d =PIIX3_PCI_DEVICE (dev); +PIIXState *d =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);ISABus *isa_bus;
@@ -374,7 +374,7 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope)static void pci_piix3_init (Object *obj) { -PIIX3State *d =PIIX3_PCI_DEVICE (obj); +PIIXState *d =PIIX_PCI_DEVICE (obj);object_initialize_child (obj,"pic" , &d->pic,TYPE_ISA_PIC );object_initialize_child (obj,"rtc" , &d->rtc,TYPE_MC146818_RTC );
@@ -382,14 +382,14 @@ static void pci_piix3_init(Object *obj) }static Property pci_piix_props[] = { -DEFINE_PROP_UINT32 ("smb_io_base" , PIIX3State, smb_io_base,0 ), -DEFINE_PROP_UINT8 ("pirqa" , PIIX3State, pci_irq_reset_mappings[0 ],0x80 ), -DEFINE_PROP_UINT8 ("pirqb" , PIIX3State, pci_irq_reset_mappings[1 ],0x80 ), -DEFINE_PROP_UINT8 ("pirqc" , PIIX3State, pci_irq_reset_mappings[2 ],0x80 ), -DEFINE_PROP_UINT8 ("pirqd" , PIIX3State, pci_irq_reset_mappings[3 ],0x80 ), -DEFINE_PROP_BOOL ("has-acpi" , PIIX3State, has_acpi, true), -DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true), -DEFINE_PROP_BOOL ("smm-enabled" , PIIX3State, smm_enabled, false), +DEFINE_PROP_UINT32 ("smb_io_base" , PIIXState, smb_io_base,0 ), +DEFINE_PROP_UINT8 ("pirqa" , PIIXState, pci_irq_reset_mappings[0 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqb" , PIIXState, pci_irq_reset_mappings[1 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqc" , PIIXState, pci_irq_reset_mappings[2 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqd" , PIIXState, pci_irq_reset_mappings[3 ],0x80 ), +DEFINE_PROP_BOOL ("has-acpi" , PIIXState, has_acpi, true), +DEFINE_PROP_BOOL ("has-usb" , PIIXState, has_usb, true), +DEFINE_PROP_BOOL ("smm-enabled" , PIIXState, smm_enabled, false),DEFINE_PROP_END_OF_LIST (), };
@@ -419,7 +419,7 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data)static const TypeInfo piix3_pci_type_info = { .name =TYPE_PIIX3_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PIIX3State), + .instance_size =sizeof (PIIXState), .instance_init = pci_piix3_init, .abstract = true, .class_init = pci_piix3_class_init,
@@ -433,7 +433,7 @@ static const TypeInfo piix3_pci_type_info = {static void piix3_realize (PCIDevice *dev,Error **errp) {ERRP_GUARD (); -PIIX3State *piix3 =PIIX3_PCI_DEVICE (dev); +PIIXState *piix3 =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);pci_piix3_realize (dev, errp);
@@ -463,7 +463,7 @@ static const TypeInfo piix3_info = {static void piix3_xen_realize (PCIDevice *dev,Error **errp) {ERRP_GUARD (); -PIIX3State *piix3 =PIIX3_PCI_DEVICE (dev); +PIIXState *piix3 =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);pci_piix3_realize (dev, errp);
include/hw/southbridge/piix.h +2 -2
@@ -73,10 +73,10 @@ struct PIIXState {bool has_usb;bool smm_enabled; }; -typedef struct PIIXState PIIX3State ; +typedef struct PIIXState PIIXState ;#define TYPE_PIIX3_PCI_DEVICE "pci-piix3" -DECLARE_INSTANCE_CHECKER (PIIX3State,PIIX3_PCI_DEVICE , +DECLARE_INSTANCE_CHECKER (PIIXState,PIIX_PCI_DEVICE , TYPE_PIIX3_PCI_DEVICE)#define TYPE_PIIX3_DEVICE "PIIX3"
Signature · 1 line
2.38.1
Re: [PATCH v2 24/43] hw/isa/piix3: Rename typedef PIIX3State to PIIXState
Quoted 9 lines · Bernhard Beschow
This commit marks the finalization of the PIIX3 preparations to be merged with PIIX4. In particular, PIIXState is prepared to be reused in
piix4.c.Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix3.c | 58 +++++++++++++++++------------------ include/hw/southbridge/piix.h | 4 +-- 2 files changed, 31 insertions(+), 31 deletions(-)
PATCH v2 25/43 hw/mips/malta: Reuse dev variable
In reply to Bernhard BeschowWhile at it, move the assignments closer to where they are used.
--- hw/mips/malta.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
hw/mips/malta.c +2 -3
@@ -1239,7 +1239,6 @@ void mips_malta_init(MachineState *machine)MaltaState *s;PCIDevice *piix4;DeviceState *dev; -DeviceState *pm_dev; s =MIPS_MALTA (qdev_new (TYPE_MIPS_MALTA ));sysbus_realize_and_unref (SYS_BUS_DEVICE (s), &error_fatal);
@@ -1405,13 +1404,13 @@ void mips_malta_init(MachineState *machine) TYPE_PIIX4_PCI_DEVICE); dev =DEVICE (piix4); isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); - pm_dev =DEVICE (object_resolve_path_component (OBJECT (dev),"pm" )); - smbus =I2C_BUS (qdev_get_child_bus (pm_dev,"i2c" ));/* Interrupt controller */ qdev_connect_gpio_out_named (dev,"intr" ,0 , i8259_irq);/* generate SPD EEPROM data */ + dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"pm" )); + smbus =I2C_BUS (qdev_get_child_bus (dev,"i2c" ));generate_eeprom_spd (&smbus_eeprom_buf[0 *256 ], ram_size);generate_eeprom_serial (&smbus_eeprom_buf[6 *256 ]);smbus_eeprom_init (smbus,8 , smbus_eeprom_buf, smbus_eeprom_size);
Signature · 1 line
2.38.1
Re: [PATCH v2 25/43] hw/mips/malta: Reuse dev variable
Quoted 6 lines · Bernhard Beschow
While at it, move the assignments closer to where they are used.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/mips/malta.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
PATCH v2 26/43 meson: Fix dependencies of piix4 southbridge
In reply to Bernhard Beschow--- configs/devices/mips-softmmu/common.mak | 1 - hw/isa/Kconfig | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-)
configs/devices/mips-softmmu/common.mak +0 -1
@@ -23,7 +23,6 @@ CONFIG_APM=y CONFIG_I8257=y CONFIG_PIIX4=y CONFIG_IDE_ISA=y -CONFIG_IDE_PIIX=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y
hw/isa/Kconfig +6 -0
@@ -45,7 +45,13 @@ config PIIX4 bool # For historical reasons, SuperIO devices are created in the board # for PIIX4. + select ACPI_PIIX4 + select I8254 + select I8257 + select I8259 + select IDE_PIIX select ISA_BUS + select MC146818RTC select USB_UHCI config VT82C686
Signature · 1 line
2.38.1
PATCH v2 27/43 hw/isa/piix4: Add missing initialization
In reply to Bernhard BeschowPIIX3 clears its reset control register, so do the same in PIIX4.
--- hw/isa/piix4.c | 2 ++ 1 file changed, 2 insertions(+)
hw/isa/piix4.c +2 -0
@@ -140,6 +140,8 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xab ] =0x00 ; pci_conf[0xac ] =0x00 ; pci_conf[0xae ] =0x00 ; + + d->rcr =0 ; }static int piix4_post_load (void *opaque,int version_id)
Signature · 1 line
2.38.1
PATCH v2 28/43 hw/isa/piix4: Move pci_ide_create_devs() call to board code
In reply to Bernhard BeschowFor the VIA south bridges there was a comment to have the call in board code. Move it there for PIIX4 as well for consistency.
--- hw/isa/piix4.c | 1 - hw/mips/malta.c | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-)
hw/isa/piix4.c +0 -1
@@ -257,7 +257,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)if (!qdev_realize (DEVICE (&s->ide),BUS (pci_bus), errp)) {return ; } -pci_ide_create_devs (PCI_DEVICE (&s->ide));/* USB */ qdev_prop_set_int32 (DEVICE (&s->uhci),"addr" , dev->devfn +2 );
hw/mips/malta.c +6 -4
@@ -39,7 +39,7 @@#include "hw/pci/pci.h" #include "qemu/log.h" #include "hw/mips/bios.h" -#include "hw/ide.h" +#include "hw/ide/pci.h" #include "hw/irq.h" #include "hw/loader.h" #include "elf.h"
@@ -1402,11 +1402,13 @@ void mips_malta_init(MachineState *machine)/* Southbridge */ piix4 =pci_create_simple_multifunction (pci_bus,PCI_DEVFN (10 ,0 ), true,TYPE_PIIX4_PCI_DEVICE ); - dev =DEVICE (piix4); - isa_bus =ISA_BUS (qdev_get_child_bus (dev,"isa.0" )); + isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix4),"isa.0" )); + + dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"ide" )); +pci_ide_create_devs (PCI_DEVICE (dev));/* Interrupt controller */ -qdev_connect_gpio_out_named (dev,"intr" ,0 , i8259_irq); +qdev_connect_gpio_out_named (DEVICE (piix4),"intr" ,0 , i8259_irq);/* generate SPD EEPROM data */ dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"pm" ));
Signature · 1 line
2.38.1
PATCH v2 29/43 hw/isa/piix4: Make PIIX4's ACPI and USB functions optional
In reply to Bernhard BeschowThis aligns PIIX4 with PIIX3.
--- hw/isa/piix4.c | 44 ++++++++++++++++++++++++++++++++------------ hw/mips/malta.c | 6 ++++-- 2 files changed, 36 insertions(+), 14 deletions(-)
hw/isa/piix4.c +32 -12
@@ -51,9 +51,16 @@ struct PIIX4State {PCIIDEState ide;UHCIState uhci;PIIX4PMState pm; + +uint32_t smb_io_base; +/* Reset Control Register */ MemoryRegion rcr_mem;uint8_t rcr; + +bool has_acpi; +bool has_usb; +bool smm_enabled; };OBJECT_DECLARE_SIMPLE_TYPE (PIIX4State,PIIX4_PCI_DEVICE )
@@ -259,17 +266,26 @@ static void piix4_realize(PCIDevice *dev, Error **errp) }/* USB */ -qdev_prop_set_int32 (DEVICE (&s->uhci),"addr" , dev->devfn +2 ); -if (!qdev_realize (DEVICE (&s->uhci),BUS (pci_bus), errp)) { -return ; +if (s->has_usb) { +object_initialize_child (OBJECT (dev),"uhci" , &s->uhci, +TYPE_PIIX4_USB_UHCI ); +qdev_prop_set_int32 (DEVICE (&s->uhci),"addr" , dev->devfn +2 ); +if (!qdev_realize (DEVICE (&s->uhci),BUS (pci_bus), errp)) { +return ; + } }/* ACPI controller */ -qdev_prop_set_int32 (DEVICE (&s->pm),"addr" , dev->devfn +3 ); -if (!qdev_realize (DEVICE (&s->pm),BUS (pci_bus), errp)) { -return ; +if (s->has_acpi) { +object_initialize_child (OBJECT (s),"pm" , &s->pm,TYPE_PIIX4_PM ); +qdev_prop_set_int32 (DEVICE (&s->pm),"addr" , dev->devfn +3 ); +qdev_prop_set_uint32 (DEVICE (&s->pm),"smb_io_base" , s->smb_io_base); +qdev_prop_set_bit (DEVICE (&s->pm),"smm-enabled" , s->smm_enabled); +if (!qdev_realize (DEVICE (&s->pm),BUS (pci_bus), errp)) { +return ; + } +qdev_connect_gpio_out (DEVICE (&s->pm),0 , s->isa[9 ]); } -qdev_connect_gpio_out (DEVICE (&s->pm),0 , s->isa[9 ]);pci_bus_irqs (pci_bus, piix4_set_irq, pci_slot_get_pirq, s,PIIX_NUM_PIRQS ); }
@@ -280,13 +296,16 @@ static void piix4_init(Object *obj)object_initialize_child (obj,"rtc" , &s->rtc,TYPE_MC146818_RTC );object_initialize_child (obj,"ide" , &s->ide,TYPE_PIIX4_IDE ); -object_initialize_child (obj,"uhci" , &s->uhci,TYPE_PIIX4_USB_UHCI ); - -object_initialize_child (obj,"pm" , &s->pm,TYPE_PIIX4_PM ); -qdev_prop_set_uint32 (DEVICE (&s->pm),"smb_io_base" ,0x1100 ); -qdev_prop_set_bit (DEVICE (&s->pm),"smm-enabled" ,0 ); } +static Property piix4_props[] = { +DEFINE_PROP_UINT32 ("smb_io_base" , PIIX4State, smb_io_base,0 ), +DEFINE_PROP_BOOL ("has-acpi" , PIIX4State, has_acpi, true), +DEFINE_PROP_BOOL ("has-usb" , PIIX4State, has_usb, true), +DEFINE_PROP_BOOL ("smm-enabled" , PIIX4State, smm_enabled, false), +DEFINE_PROP_END_OF_LIST (), +}; +static void piix4_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);
@@ -305,6 +324,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)*/ dc->user_creatable = false; dc->hotpluggable = false; +device_class_set_props (dc, piix4_props); }static const TypeInfo piix4_info = {
hw/mips/malta.c +4 -2
@@ -1400,8 +1400,10 @@ void mips_malta_init(MachineState *machine)empty_slot_init ("GT64120" ,0 ,0x20000000 );/* Southbridge */ - piix4 =pci_create_simple_multifunction (pci_bus,PCI_DEVFN (10 ,0 ), true, -TYPE_PIIX4_PCI_DEVICE ); + piix4 =pci_new_multifunction (PCI_DEVFN (10 ,0 ), true, +TYPE_PIIX4_PCI_DEVICE ); +qdev_prop_set_uint32 (DEVICE (piix4),"smb_io_base" ,0x1100 ); +pci_realize_and_unref (piix4, pci_bus, &error_fatal); isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix4),"isa.0" )); dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"ide" ));
Signature · 1 line
2.38.1
PATCH v2 30/43 hw/isa/piix4: Allow board to provide PCI interrupt routes
In reply to Bernhard BeschowPIIX3 initializes the PIRQx route control registers to the default values as described in the 82371AB PCI-TO-ISA/IDE XCELERATOR (PIIX4) April 1997 manual. PIIX4, however, initializes the routes according to the Malta™ User’s Manual, ch 6.6, which are IRQs 10 and 11. In order to allow the reset methods to be consolidated, allow board code to specify the routes.
--- hw/isa/piix4.c | 14 ++++++++++---- hw/mips/malta.c | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-)
hw/isa/piix4.c +10 -4
@@ -58,6 +58,8 @@ struct PIIX4State {MemoryRegion rcr_mem;uint8_t rcr; +uint8_t pci_irq_reset_mappings[PIIX_NUM_PIRQS ]; +bool has_acpi;bool has_usb;bool smm_enabled;
@@ -123,10 +125,10 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0x4c ] =0x4d ; pci_conf[0x4e ] =0x03 ; pci_conf[0x4f ] =0x00 ; - pci_conf[0x60 ] =0x0a ;// PCI A -> IRQ 10 - pci_conf[0x61 ] =0x0a ;// PCI B -> IRQ 10 - pci_conf[0x62 ] =0x0b ;// PCI C -> IRQ 11 - pci_conf[0x63 ] =0x0b ;// PCI D -> IRQ 11 + pci_conf[PIIX_PIRQCA ] = d->pci_irq_reset_mappings[0 ]; + pci_conf[PIIX_PIRQCB ] = d->pci_irq_reset_mappings[1 ]; + pci_conf[PIIX_PIRQCC ] = d->pci_irq_reset_mappings[2 ]; + pci_conf[PIIX_PIRQCD ] = d->pci_irq_reset_mappings[3 ]; pci_conf[0x69 ] =0x02 ; pci_conf[0x70 ] =0x80 ; pci_conf[0x76 ] =0x0c ;
@@ -300,6 +302,10 @@ static void piix4_init(Object *obj)static Property piix4_props[] = {DEFINE_PROP_UINT32 ("smb_io_base" , PIIX4State, smb_io_base,0 ), +DEFINE_PROP_UINT8 ("pirqa" , PIIX4State, pci_irq_reset_mappings[0 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqb" , PIIX4State, pci_irq_reset_mappings[1 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqc" , PIIX4State, pci_irq_reset_mappings[2 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqd" , PIIX4State, pci_irq_reset_mappings[3 ],0x80 ),DEFINE_PROP_BOOL ("has-acpi" , PIIX4State, has_acpi, true),DEFINE_PROP_BOOL ("has-usb" , PIIX4State, has_usb, true),DEFINE_PROP_BOOL ("smm-enabled" , PIIX4State, smm_enabled, false),
hw/mips/malta.c +4 -0
@@ -1403,6 +1403,10 @@ void mips_malta_init(MachineState *machine) piix4 =pci_new_multifunction (PCI_DEVFN (10 ,0 ), true,TYPE_PIIX4_PCI_DEVICE );qdev_prop_set_uint32 (DEVICE (piix4),"smb_io_base" ,0x1100 ); +qdev_prop_set_uint8 (DEVICE (piix4),"pirqa" ,10 ); +qdev_prop_set_uint8 (DEVICE (piix4),"pirqb" ,10 ); +qdev_prop_set_uint8 (DEVICE (piix4),"pirqc" ,11 ); +qdev_prop_set_uint8 (DEVICE (piix4),"pirqd" ,11 );pci_realize_and_unref (piix4, pci_bus, &error_fatal); isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix4),"isa.0" ));
Signature · 1 line
2.38.1
PATCH v2 31/43 hw/isa/piix4: Remove unused code
In reply to Bernhard BeschowThe Malta board, which is the only user of PIIX4, doesn't connect to the exported interrupt lines.
--- hw/isa/piix4.c | 8 -------- 1 file changed, 8 deletions(-)
hw/isa/piix4.c +0 -8
@@ -182,12 +182,6 @@ static void piix4_request_i8259_irq(void *opaque, int irq, int level)qemu_set_irq (s->cpu_intr, level); } -static void piix4_set_i8259_irq (void *opaque,int irq,int level) -{ -PIIX4State *s = opaque; -qemu_set_irq (s->isa[irq], level); -} -static void piix4_rcr_write (void *opaque,hwaddr addr,uint64_t val,unsigned int len) {
@@ -231,8 +225,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)return ; } -qdev_init_gpio_in_named (DEVICE (dev), piix4_set_i8259_irq, -"isa" ,ISA_NUM_IRQS );qdev_init_gpio_out_named (DEVICE (dev), &s->cpu_intr,"intr" ,1 );
Signature · 1 line
2.38.1
PATCH v2 32/43 hw/isa/piix4: Use ISA PIC device
In reply to Bernhard BeschowAligns the code with PIIX3 such that PIIXState can be used in PIIX4, too.
--- hw/isa/piix4.c | 28 ++++++++++------------------ hw/mips/malta.c | 11 +++++++++-- 2 files changed, 19 insertions(+), 20 deletions(-)
hw/isa/piix4.c +10 -18
@@ -44,9 +44,8 @@struct PIIX4State {PCIDevice dev; -qemu_irq cpu_intr; -qemu_irq *isa; +ISAPICState pic;RTCState rtc;PCIIDEState ide;UHCIState uhci;
@@ -84,7 +83,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level) pic_level |=pci_bus_get_irq_level (bus, i); } } -qemu_set_irq (s->isa[pic_irq], pic_level); +qemu_set_irq (s->pic.in_irqs[pic_irq], pic_level); } }
@@ -176,12 +175,6 @@ static const VMStateDescription vmstate_piix4 = { } }; -static void piix4_request_i8259_irq (void *opaque,int irq,int level) -{ -PIIX4State *s = opaque; -qemu_set_irq (s->cpu_intr, level); -} -static void piix4_rcr_write (void *opaque,hwaddr addr,uint64_t val,unsigned int len) {
@@ -217,7 +210,6 @@ static void piix4_realize(PCIDevice *dev, Error **errp)PIIX4State *s =PIIX4_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);ISABus *isa_bus; -qemu_irq *i8259_out_irq; isa_bus =isa_bus_new (DEVICE (dev),pci_address_space (dev),pci_address_space_io (dev), errp);
@@ -225,20 +217,18 @@ static void piix4_realize(PCIDevice *dev, Error **errp)return ; } -qdev_init_gpio_out_named (DEVICE (dev), &s->cpu_intr, -"intr" ,1 ); -memory_region_init_io (&s->rcr_mem,OBJECT (dev), &piix4_rcr_ops, s,"reset-control" ,1 );memory_region_add_subregion_overlap (pci_address_space_io (dev),PIIX_RCR_IOPORT , &s->rcr_mem,1 );/* initialize i8259 pic */ - i8259_out_irq =qemu_allocate_irqs (piix4_request_i8259_irq, s,1 ); - s->isa =i8259_init (isa_bus, *i8259_out_irq); +if (!qdev_realize (DEVICE (&s->pic),BUS (isa_bus), errp)) { +return ; + }/* initialize ISA irqs */ -isa_bus_irqs (isa_bus, s->isa); +isa_bus_irqs (isa_bus, s->pic.in_irqs);/* initialize pit */ i8254_pit_init (isa_bus,0x40 ,0 ,NULL );
@@ -251,7 +241,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)if (!qdev_realize (DEVICE (&s->rtc),BUS (isa_bus), errp)) {return ; } - s->rtc.irq =isa_get_irq (ISA_DEVICE (&s->rtc), s->rtc.isairq); + s->rtc.irq =qdev_get_gpio_in (DEVICE (&s->pic), s->rtc.isairq);/* IDE */ qdev_prop_set_int32 (DEVICE (&s->ide),"addr" , dev->devfn +1 );
@@ -278,7 +268,8 @@ static void piix4_realize(PCIDevice *dev, Error **errp)if (!qdev_realize (DEVICE (&s->pm),BUS (pci_bus), errp)) {return ; } -qdev_connect_gpio_out (DEVICE (&s->pm),0 , s->isa[9 ]); +qdev_connect_gpio_out (DEVICE (&s->pm),0 , +qdev_get_gpio_in (DEVICE (&s->pic),9 )); }pci_bus_irqs (pci_bus, piix4_set_irq, pci_slot_get_pirq, s,PIIX_NUM_PIRQS );
@@ -288,6 +279,7 @@ static void piix4_init(Object *obj) {PIIX4State *s =PIIX4_PCI_DEVICE (obj); +object_initialize_child (obj,"pic" , &s->pic,TYPE_ISA_PIC );object_initialize_child (obj,"rtc" , &s->rtc,TYPE_MC146818_RTC );object_initialize_child (obj,"ide" , &s->ide,TYPE_PIIX4_IDE ); }
hw/mips/malta.c +9 -2
@@ -28,6 +28,7 @@#include "qemu/datadir.h" #include "hw/clock.h" #include "hw/southbridge/piix.h" +#include "hw/intc/i8259.h" #include "hw/isa/superio.h" #include "hw/char/serial.h" #include "net/net.h"
@@ -1232,10 +1233,11 @@ void mips_malta_init(MachineState *machine)PCIBus *pci_bus;ISABus *isa_bus;qemu_irq cbus_irq, i8259_irq; +qemu_irq *i8259;I2CBus *smbus;DriveInfo *dinfo;int fl_idx =0 ; -int be; +int be, i;MaltaState *s;PCIDevice *piix4;DeviceState *dev;
@@ -1414,7 +1416,12 @@ void mips_malta_init(MachineState *machine)pci_ide_create_devs (PCI_DEVICE (dev));/* Interrupt controller */ -qdev_connect_gpio_out_named (DEVICE (piix4),"intr" ,0 , i8259_irq); + dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"pic" )); + i8259 =i8259_init (isa_bus, i8259_irq); +for (i =0 ; i <ISA_NUM_IRQS ; i++) { +qdev_connect_gpio_out (dev, i, i8259[i]); + } +g_free (i8259);/* generate SPD EEPROM data */ dev =DEVICE (object_resolve_path_component (OBJECT (piix4),"pm" ));
Signature · 1 line
2.38.1
PATCH v2 33/43 hw/isa/piix4: Reuse struct PIIXState from PIIX3
In reply to Bernhard BeschowNow that PIIX4 also uses the "isa-pic" proxy, both implementations can share the same struct.
--- hw/isa/piix4.c | 61 ++++++++++++++++---------------------------------- 1 file changed, 19 insertions(+), 42 deletions(-)
hw/isa/piix4.c +19 -42
@@ -42,34 +42,10 @@#include "sysemu/runstate.h" #include "qom/object.h" -struct PIIX4State { -PCIDevice dev; - -ISAPICState pic; -RTCState rtc; -PCIIDEState ide; -UHCIState uhci; -PIIX4PMState pm; - -uint32_t smb_io_base; - -/* Reset Control Register */ -MemoryRegion rcr_mem; -uint8_t rcr; - -uint8_t pci_irq_reset_mappings[PIIX_NUM_PIRQS ]; - -bool has_acpi; -bool has_usb; -bool smm_enabled; -}; - -OBJECT_DECLARE_SIMPLE_TYPE(PIIX4State, PIIX4_PCI_DEVICE) -static void piix4_set_irq (void *opaque,int irq_num,int level) {int i, pic_irq, pic_level; -PIIX4State *s = opaque; +PIIXState *s = opaque;PCIBus *bus =pci_get_bus (&s->dev);/* now we change the pic irq level according to the piix irq mappings */
@@ -114,7 +90,7 @@ static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)static void piix4_isa_reset (DeviceState *dev) { -PIIX4State *d =PIIX4_PCI_DEVICE (dev); +PIIXState *d =PIIX_PCI_DEVICE (dev);uint8_t *pci_conf = d->dev.config; pci_conf[0x04 ] =0x07 ;// master, memory and I/O
@@ -149,12 +125,13 @@ static void piix4_isa_reset(DeviceState *dev) pci_conf[0xac ] =0x00 ; pci_conf[0xae ] =0x00 ; + d->pic_levels =0 ;/* not used in PIIX4 */ d->rcr =0 ; }static int piix4_post_load (void *opaque,int version_id) { -PIIX4State *s = opaque; +PIIXState *s = opaque;if (version_id ==2 ) { s->rcr =0 ;
@@ -169,8 +146,8 @@ static const VMStateDescription vmstate_piix4 = { .minimum_version_id = 2, .post_load = piix4_post_load, .fields = (VMStateField []) { -VMSTATE_PCI_DEVICE (dev, PIIX4State), -VMSTATE_UINT8_V (rcr, PIIX4State,3 ), +VMSTATE_PCI_DEVICE (dev, PIIXState), +VMSTATE_UINT8_V (rcr, PIIXState,3 ),VMSTATE_END_OF_LIST () } };
@@ -178,7 +155,7 @@ static const VMStateDescription vmstate_piix4 = {static void piix4_rcr_write (void *opaque,hwaddr addr,uint64_t val,unsigned int len) { -PIIX4State *s = opaque; +PIIXState *s = opaque;if (val &4 ) {qemu_system_reset_request (SHUTDOWN_CAUSE_GUEST_RESET );
@@ -190,7 +167,7 @@ static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val,static uint64_t piix4_rcr_read (void *opaque,hwaddr addr,unsigned int len) { -PIIX4State *s = opaque; +PIIXState *s = opaque;return s->rcr; }
@@ -207,7 +184,7 @@ static const MemoryRegionOps piix4_rcr_ops = {static void piix4_realize (PCIDevice *dev,Error **errp) { -PIIX4State *s =PIIX4_PCI_DEVICE (dev); +PIIXState *s =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);ISABus *isa_bus;
@@ -277,7 +254,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)static void piix4_init (Object *obj) { -PIIX4State *s =PIIX4_PCI_DEVICE (obj); +PIIXState *s =PIIX_PCI_DEVICE (obj);object_initialize_child (obj,"pic" , &s->pic,TYPE_ISA_PIC );object_initialize_child (obj,"rtc" , &s->rtc,TYPE_MC146818_RTC );
@@ -285,14 +262,14 @@ static void piix4_init(Object *obj) }static Property piix4_props[] = { -DEFINE_PROP_UINT32 ("smb_io_base" , PIIX4State, smb_io_base,0 ), -DEFINE_PROP_UINT8 ("pirqa" , PIIX4State, pci_irq_reset_mappings[0 ],0x80 ), -DEFINE_PROP_UINT8 ("pirqb" , PIIX4State, pci_irq_reset_mappings[1 ],0x80 ), -DEFINE_PROP_UINT8 ("pirqc" , PIIX4State, pci_irq_reset_mappings[2 ],0x80 ), -DEFINE_PROP_UINT8 ("pirqd" , PIIX4State, pci_irq_reset_mappings[3 ],0x80 ), -DEFINE_PROP_BOOL ("has-acpi" , PIIX4State, has_acpi, true), -DEFINE_PROP_BOOL ("has-usb" , PIIX4State, has_usb, true), -DEFINE_PROP_BOOL ("smm-enabled" , PIIX4State, smm_enabled, false), +DEFINE_PROP_UINT32 ("smb_io_base" , PIIXState, smb_io_base,0 ), +DEFINE_PROP_UINT8 ("pirqa" , PIIXState, pci_irq_reset_mappings[0 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqb" , PIIXState, pci_irq_reset_mappings[1 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqc" , PIIXState, pci_irq_reset_mappings[2 ],0x80 ), +DEFINE_PROP_UINT8 ("pirqd" , PIIXState, pci_irq_reset_mappings[3 ],0x80 ), +DEFINE_PROP_BOOL ("has-acpi" , PIIXState, has_acpi, true), +DEFINE_PROP_BOOL ("has-usb" , PIIXState, has_usb, true), +DEFINE_PROP_BOOL ("smm-enabled" , PIIXState, smm_enabled, false),DEFINE_PROP_END_OF_LIST (), };
@@ -320,7 +297,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)static const TypeInfo piix4_info = { .name =TYPE_PIIX4_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PIIX4State), + .instance_size =sizeof (PIIXState), .instance_init = piix4_init, .class_init = piix4_class_init, .interfaces = (InterfaceInfo []) {
Signature · 1 line
2.38.1
PATCH v2 34/43 hw/isa/piix4: Rename reset control operations to match PIIX3
In reply to Bernhard BeschowBoth implementations are the same and will be shared upon merging.
--- hw/isa/piix4.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/isa/piix4.c +6 -6
@@ -152,7 +152,7 @@ static const VMStateDescription vmstate_piix4 = { } }; -static void piix4_rcr_write (void *opaque,hwaddr addr,uint64_t val, +static void rcr_write (void *opaque,hwaddr addr,uint64_t val,unsigned int len) {PIIXState *s = opaque;
@@ -165,16 +165,16 @@ static void piix4_rcr_write(void *opaque, hwaddr addr, uint64_t val, s->rcr = val &2 ;/* keep System Reset type only */ } -static uint64_t piix4_rcr_read (void *opaque,hwaddr addr,unsigned int len) +static uint64_t rcr_read (void *opaque,hwaddr addr,unsigned int len) {PIIXState *s = opaque;return s->rcr; } -static const MemoryRegionOps piix4_rcr_ops = { - .read = piix4_rcr_read, - .write = piix4_rcr_write, +static const MemoryRegionOps rcr_ops = { + .read = rcr_read, + .write = rcr_write, .endianness =DEVICE_LITTLE_ENDIAN , .impl = { .min_access_size =1 ,
@@ -194,7 +194,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)return ; } -memory_region_init_io (&s->rcr_mem,OBJECT (dev), &piix4_rcr_ops, s, +memory_region_init_io (&s->rcr_mem,OBJECT (dev), &rcr_ops, s,"reset-control" ,1 );memory_region_add_subregion_overlap (pci_address_space_io (dev),PIIX_RCR_IOPORT , &s->rcr_mem,1 );
Signature · 1 line
2.38.1
Re: [PATCH v2 34/43] hw/isa/piix4: Rename reset control operations to match PIIX3
Quoted 6 lines · Bernhard Beschow
Both implementations are the same and will be shared upon merging.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix4.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
PATCH v2 35/43 hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_"
In reply to Bernhard BeschowPrefixing with "piix4_" makes the method distinguishable from its PIIX3 counterpart upon merging and also complies more with QEMU conventions.
--- hw/isa/piix4.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
hw/isa/piix4.c +3 -2
@@ -63,7 +63,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level) } } -static int pci_slot_get_pirq (PCIDevice *pci_dev,int irq_num) +static int piix4_pci_slot_get_pirq (PCIDevice *pci_dev,int irq_num) {int slot;
@@ -249,7 +249,8 @@ static void piix4_realize(PCIDevice *dev, Error **errp) qdev_get_gpio_in(DEVICE(&s->pic), 9)); } -pci_bus_irqs (pci_bus, piix4_set_irq, pci_slot_get_pirq, s,PIIX_NUM_PIRQS ); +pci_bus_irqs (pci_bus, piix4_set_irq, piix4_pci_slot_get_pirq, s, +PIIX_NUM_PIRQS ); }static void piix4_init (Object *obj)
Signature · 1 line
2.38.1
PATCH v2 36/43 hw/isa/piix3: Merge hw/isa/piix4.c
In reply to Bernhard BeschowNow that the PIIX3 and PIIX4 device models are sufficiently consolidated
---
MAINTAINERS | 6 +-
configs/devices/mips-softmmu/common.mak | 2 +-
hw/i386/Kconfig | 2 +-
hw/isa/Kconfig | 12 +-
hw/isa/meson.build | 3 +-
hw/isa/{piix3.c => piix.c} | 185 ++++++++++++++
hw/isa/piix4.c | 315 ------------------------
7 files changed, 192 insertions(+), 333 deletions(-)
rename hw/isa/{piix3.c => piix.c} (73%)
delete mode 100644 hw/isa/piix4.cMAINTAINERS +3 -3
@@ -1228,7 +1228,7 @@ Malta M: Philippe Mathieu-Daudé <[email protected]> R: Aurelien Jarno <[email protected]> S: Odd Fixes -F: hw/isa/piix4.c +F: hw/isa/piix.c F: hw/acpi/piix4.c F: hw/mips/malta.c F: hw/mips/gt64xxx_pci.c
@@ -1643,7 +1643,7 @@ F: hw/pci-host/pam.c F: include/hw/pci-host/i440fx.h F: include/hw/pci-host/q35.h F: include/hw/pci-host/pam.h -F: hw/isa/piix3.c +F: hw/isa/piix.c F: hw/isa/lpc_ich9.c F: hw/i2c/smbus_ich9.c F: hw/acpi/piix4.c
@@ -2314,7 +2314,7 @@ PIIX4 South Bridge (i82371AB) M: Hervé Poussineau <[email protected]> M: Philippe Mathieu-Daudé <[email protected]> S: Maintained -F: hw/isa/piix4.c +F: hw/isa/piix.c F: include/hw/southbridge/piix.h Firmware configuration (fw_cfg)
configs/devices/mips-softmmu/common.mak +1 -1
@@ -21,7 +21,7 @@ CONFIG_ACPI=y CONFIG_ACPI_PIIX4=y CONFIG_APM=y CONFIG_I8257=y -CONFIG_PIIX4=y +CONFIG_PIIX=y CONFIG_IDE_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y
hw/i386/Kconfig +1 -1
@@ -73,7 +73,7 @@ config I440FX select PC_ACPI select ACPI_SMBUS select PCI_I440FX - select PIIX3 + select PIIX select DIMM select SMBIOS select FW_CFG_DMA
hw/isa/Kconfig +1 -11
@@ -31,17 +31,7 @@ config PC87312 select FDC_ISA select IDE_ISA -config PIIX3 - bool - select ACPI_PIIX4 - select I8257 - select I8259 - select IDE_PIIX - select ISA_BUS - select MC146818RTC - select USB_UHCI - -config PIIX4 +config PIIX bool # For historical reasons, SuperIO devices are created in the board # for PIIX4.
hw/isa/meson.build +1 -2
@@ -3,8 +3,7 @@ softmmu_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c')) softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c')) softmmu_ss.add(when: 'CONFIG_ISA_SUPERIO', if_true: files('isa-superio.c')) softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c')) -softmmu_ss.add(when: 'CONFIG_PIIX3', if_true: files('piix3.c')) -softmmu_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c')) +softmmu_ss.add(when: 'CONFIG_PIIX', if_true: files('piix.c')) softmmu_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c')) softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
hw/isa/piix.c renamed from hw/isa/piix3.c +185 -0
233 lines not on this page · raw message
hw/isa/piix4.c deleted +0 -315
315 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH v2 37/43 hw/isa/piix: Harmonize names of reset control memory regions
In reply to Bernhard BeschowThere is no need for having different names here. Having the same name further allows code to be shared between PIIX3 and PIIX4.
--- hw/isa/piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix.c +2 -2
@@ -388,7 +388,7 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)isa_bus_irqs (isa_bus, d->pic.in_irqs);memory_region_init_io (&d->rcr_mem,OBJECT (dev), &rcr_ops, d, -"piix3-reset-control" ,1 ); +"piix-reset-control" ,1 );memory_region_add_subregion_overlap (pci_address_space_io (dev),PIIX_RCR_IOPORT , &d->rcr_mem,1 );
@@ -579,7 +579,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) }memory_region_init_io (&s->rcr_mem,OBJECT (dev), &rcr_ops, s, -"reset-control" ,1 ); +"piix-reset-control" ,1 );memory_region_add_subregion_overlap (pci_address_space_io (dev),PIIX_RCR_IOPORT , &s->rcr_mem,1 );
Signature · 1 line
2.38.1
Re: [PATCH v2 37/43] hw/isa/piix: Harmonize names of reset control memory regions
Quoted 7 lines · Bernhard Beschow
There is no need for having different names here. Having the same name further allows code to be shared between PIIX3 and PIIX4.
Signed-off-by Bernhard Beschow <[email protected]>--- hw/isa/piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
PATCH v2 38/43 hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4
In reply to Bernhard BeschowResolves duplicate code.
--- hw/isa/piix.c | 65 +++++++-------------------------------------------- 1 file changed, 9 insertions(+), 56 deletions(-)
hw/isa/piix.c +9 -56
@@ -368,7 +368,8 @@ static const MemoryRegionOps rcr_ops = { }, }; -static void pci_piix3_realize (PCIDevice *dev,Error **errp) +static void pci_piix_realize (PCIDevice *dev,const char *uhci_type, +Error **errp) {PIIXState *d =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);
@@ -408,8 +409,7 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)/* USB */ if (d->has_usb) { -object_initialize_child (OBJECT (dev),"uhci" , &d->uhci, -TYPE_PIIX3_USB_UHCI ); +object_initialize_child (OBJECT (dev),"uhci" , &d->uhci, uhci_type);qdev_prop_set_int32 (DEVICE (&d->uhci),"addr" , dev->devfn +2 );if (!qdev_realize (DEVICE (&d->uhci),BUS (pci_bus), errp)) {return ;
@@ -507,7 +507,7 @@ static void piix3_realize(PCIDevice *dev, Error **errp)PIIXState *piix3 =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev); -pci_piix3_realize (dev, errp); +pci_piix_realize (dev,TYPE_PIIX3_USB_UHCI , errp);if (*errp) {return ; }
@@ -537,7 +537,7 @@ static void piix3_xen_realize(PCIDevice *dev, Error **errp)PIIXState *piix3 =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev); -pci_piix3_realize (dev, errp); +pci_piix_realize (dev,TYPE_PIIX3_USB_UHCI , errp);if (*errp) {return ; }
@@ -568,71 +568,24 @@ static const TypeInfo piix3_xen_info = {static void piix4_realize (PCIDevice *dev,Error **errp) { +ERRP_GUARD ();PIIXState *s =PIIX_PCI_DEVICE (dev);PCIBus *pci_bus =pci_get_bus (dev);ISABus *isa_bus; - isa_bus =isa_bus_new (DEVICE (dev),pci_address_space (dev), -pci_address_space_io (dev), errp); -if (!isa_bus) { -return ; - } - -memory_region_init_io (&s->rcr_mem,OBJECT (dev), &rcr_ops, s, -"piix-reset-control" ,1 ); -memory_region_add_subregion_overlap (pci_address_space_io (dev), -PIIX_RCR_IOPORT , &s->rcr_mem,1 ); - -/* initialize i8259 pic */ -if (!qdev_realize (DEVICE (&s->pic),BUS (isa_bus), errp)) { +pci_piix_realize (dev,TYPE_PIIX4_USB_UHCI , errp); +if (*errp) {return ; } -/* initialize ISA irqs */ -isa_bus_irqs (isa_bus, s->pic.in_irqs); + isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (dev),"isa.0" ));/* initialize pit */ i8254_pit_init (isa_bus,0x40 ,0 ,NULL ); -/* DMA */ -i8257_dma_init (isa_bus,0 ); -/* RTC */ -qdev_prop_set_int32 (DEVICE (&s->rtc),"base_year" ,2000 ); -if (!qdev_realize (DEVICE (&s->rtc),BUS (isa_bus), errp)) { -return ; - } s->rtc.irq =qdev_get_gpio_in (DEVICE (&s->pic), s->rtc.isairq); -/* IDE */ -qdev_prop_set_int32 (DEVICE (&s->ide),"addr" , dev->devfn +1 ); -if (!qdev_realize (DEVICE (&s->ide),BUS (pci_bus), errp)) { -return ; - } - -/* USB */ -if (s->has_usb) { -object_initialize_child (OBJECT (dev),"uhci" , &s->uhci, -TYPE_PIIX4_USB_UHCI ); -qdev_prop_set_int32 (DEVICE (&s->uhci),"addr" , dev->devfn +2 ); -if (!qdev_realize (DEVICE (&s->uhci),BUS (pci_bus), errp)) { -return ; - } - } - -/* ACPI controller */ -if (s->has_acpi) { -object_initialize_child (OBJECT (s),"pm" , &s->pm,TYPE_PIIX4_PM ); -qdev_prop_set_int32 (DEVICE (&s->pm),"addr" , dev->devfn +3 ); -qdev_prop_set_uint32 (DEVICE (&s->pm),"smb_io_base" , s->smb_io_base); -qdev_prop_set_bit (DEVICE (&s->pm),"smm-enabled" , s->smm_enabled); -if (!qdev_realize (DEVICE (&s->pm),BUS (pci_bus), errp)) { -return ; - } -qdev_connect_gpio_out (DEVICE (&s->pm),0 , -qdev_get_gpio_in (DEVICE (&s->pic),9 )); - } -pci_bus_irqs (pci_bus, piix4_set_irq, piix4_pci_slot_get_pirq, s,PIIX_NUM_PIRQS ); }
Signature · 1 line
2.38.1
PATCH v2 39/43 hw/isa/piix: Rename functions to be shared for interrupt triggering
In reply to Bernhard BeschowPIIX4 will get the same optimizations which are already implemented for PIIX3.
--- hw/isa/piix.c | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
hw/isa/piix.c +28 -28
@@ -41,47 +41,47 @@#define XEN_PIIX_NUM_PIRQS 128ULL -static void piix3_set_irq_pic (PIIXState *piix3,int pic_irq) +static void piix_set_irq_pic (PIIXState *piix,int pic_irq) { -qemu_set_irq (piix3->pic.in_irqs[pic_irq], - !!(piix3->pic_levels & +qemu_set_irq (piix->pic.in_irqs[pic_irq], + !!(piix->pic_levels & (((1ULL <<PIIX_NUM_PIRQS ) -1 ) << (pic_irq *PIIX_NUM_PIRQS )))); } -static void piix3_set_irq_level_internal (PIIXState *piix3,int pirq,int level) +static void piix_set_irq_level_internal (PIIXState *piix,int pirq,int level) {int pic_irq;uint64_t mask; - pic_irq = piix3->dev.config[PIIX_PIRQCA + pirq]; + pic_irq = piix->dev.config[PIIX_PIRQCA + pirq];if (pic_irq >=ISA_NUM_IRQS ) {return ; } mask =1ULL << ((pic_irq *PIIX_NUM_PIRQS ) + pirq); - piix3->pic_levels &= ~mask; - piix3->pic_levels |= mask * !!level; + piix->pic_levels &= ~mask; + piix->pic_levels |= mask * !!level; } -static void piix3_set_irq_level (PIIXState *piix3,int pirq,int level) +static void piix_set_irq_level (PIIXState *piix,int pirq,int level) {int pic_irq; - pic_irq = piix3->dev.config[PIIX_PIRQCA + pirq]; + pic_irq = piix->dev.config[PIIX_PIRQCA + pirq];if (pic_irq >=ISA_NUM_IRQS ) {return ; } -piix3_set_irq_level_internal (piix3, pirq, level); +piix_set_irq_level_internal (piix, pirq, level); -piix3_set_irq_pic (piix3, pic_irq); +piix_set_irq_pic (piix, pic_irq); } -static void piix3_set_irq (void *opaque,int pirq,int level) +static void piix_set_irq (void *opaque,int pirq,int level) { -PIIXState *piix3 = opaque; -piix3_set_irq_level (piix3, pirq, level); +PIIXState *piix = opaque; +piix_set_irq_level (piix, pirq, level); }static void piix4_set_irq (void *opaque,int irq_num,int level)
@@ -158,29 +158,29 @@ static PCIINTxRoute piix3_route_intx_pin_to_irq(void *opaque, int pin) }/* irq routing is changed. so rebuild bitmap */ -static void piix3_update_irq_levels (PIIXState *piix3) +static void piix_update_irq_levels (PIIXState *piix) { -PCIBus *bus =pci_get_bus (&piix3->dev); +PCIBus *bus =pci_get_bus (&piix->dev);int pirq; - piix3->pic_levels =0 ; + piix->pic_levels =0 ;for (pirq =0 ; pirq <PIIX_NUM_PIRQS ; pirq++) { -piix3_set_irq_level (piix3, pirq,pci_bus_get_irq_level (bus, pirq)); +piix_set_irq_level (piix, pirq,pci_bus_get_irq_level (bus, pirq)); } } -static void piix3_write_config (PCIDevice *dev, -uint32_t address,uint32_t val,int len) +static void piix_write_config (PCIDevice *dev,uint32_t address,uint32_t val, +int len) {pci_default_write_config (dev, address, val, len);if (ranges_overlap (address, len,PIIX_PIRQCA ,4 )) { -PIIXState *piix3 =PIIX_PCI_DEVICE (dev); +PIIXState *piix =PIIX_PCI_DEVICE (dev);int pic_irq; -pci_bus_fire_intx_routing_notifier (pci_get_bus (&piix3->dev)); -piix3_update_irq_levels (piix3); +pci_bus_fire_intx_routing_notifier (pci_get_bus (&piix->dev)); +piix_update_irq_levels (piix);for (pic_irq =0 ; pic_irq <ISA_NUM_IRQS ; pic_irq++) { -piix3_set_irq_pic (piix3, pic_irq); +piix_set_irq_pic (piix, pic_irq); } } }
@@ -202,7 +202,7 @@ static void piix3_write_config_xen(PCIDevice *dev, } } -piix3_write_config (dev, address, val, len); +piix_write_config (dev, address, val, len); }static void piix_reset (DeviceState *dev)
@@ -262,7 +262,7 @@ static int piix3_post_load(void *opaque, int version_id)*/ piix3->pic_levels =0 ;for (pirq =0 ; pirq <PIIX_NUM_PIRQS ; pirq++) { -piix3_set_irq_level_internal (piix3, pirq, +piix_set_irq_level_internal (piix3, pirq,pci_bus_get_irq_level (pci_get_bus (&piix3->dev), pirq)); }return 0 ;
@@ -512,7 +512,7 @@ static void piix3_realize(PCIDevice *dev, Error **errp)return ; } -pci_bus_irqs (pci_bus, piix3_set_irq, piix3_pci_slot_get_pirq, +pci_bus_irqs (pci_bus, piix_set_irq, piix3_pci_slot_get_pirq, piix3,PIIX_NUM_PIRQS );pci_bus_set_route_irq_fn (pci_bus, piix3_route_intx_pin_to_irq); }
@@ -521,7 +521,7 @@ static void piix3_class_init(ObjectClass *klass, void *data) {PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); - k->config_write = piix3_write_config; + k->config_write = piix_write_config; k->realize = piix3_realize; }
Signature · 1 line
2.38.1
PATCH v2 40/43 hw/isa/piix: Consolidate IRQ triggering
In reply to Bernhard BeschowSpeeds up PIIX4 which resolves an old TODO.
--- hw/isa/piix.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)
hw/isa/piix.c +3 -23
@@ -84,27 +84,6 @@ static void piix_set_irq(void *opaque, int pirq, int level)piix_set_irq_level (piix, pirq, level); } -static void piix4_set_irq (void *opaque,int irq_num,int level) -{ -int i, pic_irq, pic_level; -PIIXState *s = opaque; -PCIBus *bus =pci_get_bus (&s->dev); - -/* now we change the pic irq level according to the piix irq mappings */ -/* XXX: optimize */ - pic_irq = s->dev.config[PIIX_PIRQCA + irq_num]; -if (pic_irq <ISA_NUM_IRQS ) { -/* The pic level is the logical OR of all the PCI irqs mapped to it. */ - pic_level =0 ; -for (i =0 ; i <PIIX_NUM_PIRQS ; i++) { -if (pic_irq == s->dev.config[PIIX_PIRQCA + i]) { - pic_level |=pci_bus_get_irq_level (bus, i); - } - } -qemu_set_irq (s->pic.in_irqs[pic_irq], pic_level); - } -} -/* * Return the global irq number corresponding to a given device irq * pin. We could also use the bus number to have a more precise mapping.
@@ -276,7 +255,7 @@ static int piix4_post_load(void *opaque, int version_id) s->rcr =0 ; } -return 0 ; +return piix3_post_load (opaque, version_id); }static int piix3_pre_save (void *opaque)
@@ -586,7 +565,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp)/* RTC */ s->rtc.irq =qdev_get_gpio_in (DEVICE (&s->pic), s->rtc.isairq); -pci_bus_irqs (pci_bus, piix4_set_irq, piix4_pci_slot_get_pirq, s, +pci_bus_irqs (pci_bus, piix_set_irq, piix4_pci_slot_get_pirq, s,PIIX_NUM_PIRQS ); }
@@ -604,6 +583,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + k->config_write = piix_write_config; k->realize = piix4_realize; k->vendor_id =PCI_VENDOR_ID_INTEL ; k->device_id =PCI_DEVICE_ID_INTEL_82371AB_0 ;
Signature · 1 line
2.38.1
PATCH v2 41/43 hw/isa/piix: Share PIIX3 base class with PIIX4
In reply to Bernhard BeschowHaving a common base class allows for substituting PIIX3 with PIIX4 and vice versa. Moreover, it makes PIIX4 implement the acpi-dev-aml-interface.
--- hw/isa/piix.c | 53 +++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 29 deletions(-)
hw/isa/piix.c +24 -29
@@ -422,13 +422,12 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope) } } -static void pci_piix3_init (Object *obj) +static void pci_piix_init (Object *obj) {PIIXState *d =PIIX_PCI_DEVICE (obj);object_initialize_child (obj,"pic" , &d->pic,TYPE_ISA_PIC );object_initialize_child (obj,"rtc" , &d->rtc,TYPE_MC146818_RTC ); -object_initialize_child (obj,"ide" , &d->ide,TYPE_PIIX3_IDE ); }static Property pci_piix_props[] = {
@@ -443,7 +442,7 @@ static Property pci_piix_props[] = { DEFINE_PROP_END_OF_LIST(), }; -static void pci_piix3_class_init (ObjectClass *klass,void *data) +static void pci_piix_class_init (ObjectClass *klass,void *data) {DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass);
@@ -451,11 +450,8 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data) dc->reset = piix_reset; dc->desc ="ISA bridge" ; - dc->vmsd = &vmstate_piix3; dc->hotpluggable = false; k->vendor_id =PCI_VENDOR_ID_INTEL ; -/* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */ - k->device_id =PCI_DEVICE_ID_INTEL_82371SB_0 ; k->class_id =PCI_CLASS_BRIDGE_ISA ;/* * Reason: part of PIIX3 southbridge, needs to be wired up by
@@ -466,13 +462,13 @@ static void pci_piix3_class_init(ObjectClass *klass, void *data) adevc->build_dev_aml = build_pci_isa_aml; } -static const TypeInfo piix3_pci_type_info = { +static const TypeInfo piix_pci_type_info = { .name =TYPE_PIIX3_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PIIXState), - .instance_init = pci_piix3_init, + .instance_init = pci_piix_init, .abstract = true, - .class_init = pci_piix3_class_init, + .class_init = pci_piix_class_init, .interfaces = (InterfaceInfo []) { {INTERFACE_CONVENTIONAL_PCI_DEVICE }, {TYPE_ACPI_DEV_AML_IF },
@@ -496,17 +492,29 @@ static void piix3_realize(PCIDevice *dev, Error **errp)pci_bus_set_route_irq_fn (pci_bus, piix3_route_intx_pin_to_irq); } +static void piix3_init (Object *obj) +{ +PIIXState *d =PIIX_PCI_DEVICE (obj); + +object_initialize_child (obj,"ide" , &d->ide,TYPE_PIIX3_IDE ); +} +static void piix3_class_init (ObjectClass *klass,void *data) { +DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); k->config_write = piix_write_config; k->realize = piix3_realize; +/* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */ + k->device_id =PCI_DEVICE_ID_INTEL_82371SB_0 ; + dc->vmsd = &vmstate_piix3; }static const TypeInfo piix3_info = { .name =TYPE_PIIX3_DEVICE , .parent =TYPE_PIIX3_PCI_DEVICE , + .instance_init = piix3_init, .class_init = piix3_class_init, };
@@ -533,15 +541,20 @@ static void piix3_xen_realize(PCIDevice *dev, Error **errp)static void piix3_xen_class_init (ObjectClass *klass,void *data) { +DeviceClass *dc =DEVICE_CLASS (klass);PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); k->config_write = piix3_write_config_xen; k->realize = piix3_xen_realize; +/* 82371SB PIIX3 PCI-to-ISA bridge (Step A1) */ + k->device_id =PCI_DEVICE_ID_INTEL_82371SB_0 ; + dc->vmsd = &vmstate_piix3; }static const TypeInfo piix3_xen_info = { .name =TYPE_PIIX3_XEN_DEVICE , .parent =TYPE_PIIX3_PCI_DEVICE , + .instance_init = piix3_init, .class_init = piix3_xen_class_init, };
@@ -573,8 +586,6 @@ static void piix4_init(Object *obj) {PIIXState *s =PIIX_PCI_DEVICE (obj); -object_initialize_child (obj,"pic" , &s->pic,TYPE_ISA_PIC ); -object_initialize_child (obj,"rtc" , &s->rtc,TYPE_MC146818_RTC );object_initialize_child (obj,"ide" , &s->ide,TYPE_PIIX4_IDE ); }
@@ -585,36 +596,20 @@ static void piix4_class_init(ObjectClass *klass, void *data) k->config_write = piix_write_config; k->realize = piix4_realize; - k->vendor_id =PCI_VENDOR_ID_INTEL ; k->device_id =PCI_DEVICE_ID_INTEL_82371AB_0 ; - k->class_id =PCI_CLASS_BRIDGE_ISA ; - dc->reset = piix_reset; - dc->desc ="ISA bridge" ; dc->vmsd = &vmstate_piix4; -/* -* Reason: part of PIIX4 southbridge, needs to be wired up, -* e.g. by mips_malta_init() -*/ - dc->user_creatable = false; - dc->hotpluggable = false; -device_class_set_props (dc, pci_piix_props); }static const TypeInfo piix4_info = { .name =TYPE_PIIX4_PCI_DEVICE , - .parent =TYPE_PCI_DEVICE , - .instance_size =sizeof (PIIXState), + .parent =TYPE_PIIX3_PCI_DEVICE , .instance_init = piix4_init, .class_init = piix4_class_init, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, };static void piix3_register_types (void ) { -type_register_static (&piix3_pci_type_info); +type_register_static (&piix_pci_type_info);type_register_static (&piix3_info);type_register_static (&piix3_xen_info);type_register_static (&piix4_info);
Signature · 1 line
2.38.1
PATCH v2 42/43 hw/isa/piix: Drop the "3" from the PIIX base class
In reply to Bernhard BeschowNow that the base class is used for both PIIX3 and PIIX4, the "3" became misleading.
--- hw/i386/acpi-build.c | 2 +- hw/isa/piix.c | 8 ++++---- include/hw/southbridge/piix.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
hw/i386/acpi-build.c +1 -1
@@ -1298,7 +1298,7 @@ static void build_piix4_isa_bridge(Aml *table)* once PCI is converted to AcpiDevAmlIf and would be ble to generate * AML for bridge itself */ - obj =object_resolve_path_type ("" ,TYPE_PIIX3_PCI_DEVICE , &ambiguous); + obj =object_resolve_path_type ("" ,TYPE_PIIX_PCI_DEVICE , &ambiguous);assert (obj && !ambiguous); scope =aml_scope ("_SB.PCI0" );
hw/isa/piix.c +4 -4
@@ -463,7 +463,7 @@ static void pci_piix_class_init(ObjectClass *klass, void *data) }static const TypeInfo piix_pci_type_info = { - .name =TYPE_PIIX3_PCI_DEVICE , + .name =TYPE_PIIX_PCI_DEVICE , .parent =TYPE_PCI_DEVICE , .instance_size =sizeof (PIIXState), .instance_init = pci_piix_init,
@@ -513,7 +513,7 @@ static void piix3_class_init(ObjectClass *klass, void *data)static const TypeInfo piix3_info = { .name =TYPE_PIIX3_DEVICE , - .parent =TYPE_PIIX3_PCI_DEVICE , + .parent =TYPE_PIIX_PCI_DEVICE , .instance_init = piix3_init, .class_init = piix3_class_init, };
@@ -553,7 +553,7 @@ static void piix3_xen_class_init(ObjectClass *klass, void *data)static const TypeInfo piix3_xen_info = { .name =TYPE_PIIX3_XEN_DEVICE , - .parent =TYPE_PIIX3_PCI_DEVICE , + .parent =TYPE_PIIX_PCI_DEVICE , .instance_init = piix3_init, .class_init = piix3_xen_class_init, };
@@ -602,7 +602,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)static const TypeInfo piix4_info = { .name =TYPE_PIIX4_PCI_DEVICE , - .parent =TYPE_PIIX3_PCI_DEVICE , + .parent =TYPE_PIIX_PCI_DEVICE , .instance_init = piix4_init, .class_init = piix4_class_init, };
include/hw/southbridge/piix.h +2 -2
@@ -75,9 +75,9 @@ struct PIIXState { };typedef struct PIIXState PIIXState ; -#define TYPE_PIIX3_PCI_DEVICE "pci-piix3" +#define TYPE_PIIX_PCI_DEVICE "pci-piix"DECLARE_INSTANCE_CHECKER (PIIXState,PIIX_PCI_DEVICE , - TYPE_PIIX3_PCI_DEVICE) + TYPE_PIIX_PCI_DEVICE)#define TYPE_PIIX3_DEVICE "PIIX3"#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
Signature · 1 line
2.38.1
PATCH v2 43/43 hw/i386/acpi-build: Resolve PIIX ISA bridge rather than ACPI controller
In reply to Bernhard BeschowResolving the PIIX ISA bridge rather than the PIIX ACPI controller mirrors the ICH9 code one line below.
--- hw/i386/acpi-build.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/i386/acpi-build.c +1 -1
@@ -288,7 +288,7 @@ static void acpi_get_pm_info(MachineState *machine, AcpiPmInfo *pm)static void acpi_get_misc_info (AcpiMiscInfo *info) { -Object *piix =object_resolve_type_unambiguous (TYPE_PIIX4_PM ); +Object *piix =object_resolve_type_unambiguous (TYPE_PIIX_PCI_DEVICE );Object *lpc =object_resolve_type_unambiguous (TYPE_ICH9_LPC_DEVICE );assert (!!piix != !!lpc);
Signature · 1 line
2.38.1