Skip to content

Consolidate PIIX south bridges

Bernhard Beschow qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest43 patches 15 repliesIn review
  2. v142 patches 22 repliesSuperseded

Changes in v2 from the cover letter

- 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?

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/43hw/i386/pc: Create DMA controllers in south bridgeshw/i386/pc.c hw/i386/pc_piix.c hw/isa/Kconfig +2 more+14 -50 replies
2/43hw/i386/pc_piix: Allow for setting properties before realizing PIIX3 south bridgehw/i386/pc_piix.c+2 -10 replies
3/43hw/isa/piix3: Remove extra ';' outside of functionshw/isa/piix3.c+3 -30 replies
4/43hw/isa/piix3: Add size constraints to rcr_opshw/isa/piix3.c+5 -10 replies
5/43hw/isa/piix3: Modernize reset handlinghw/isa/piix3.c+3 -50 replies
6/43hw/isa/piix3: Prefer pci_address_space() over get_system_memory()hw/isa/piix3.c+1 -10 replies
7/43hw/isa/piix4: Rename wrongly named methodhw/isa/piix4.c+2 -20 replies
8/43hw/ide/piix: Introduce TYPE_ macros for PIIX IDE controllershw/i386/pc_piix.c hw/ide/piix.c hw/isa/piix4.c +1 more+14 -41 reply
9/43hw/usb/hcd-uhci: Introduce TYPE_ defines for device modelshw/i386/pc_piix.c hw/i386/pc_q35.c hw/isa/piix4.c +2 more+27 -161 reply
10/43hw/i386/pc: Create RTC controllers in south bridgeshw/i386/pc.c hw/i386/pc_piix.c hw/i386/pc_q35.c +5 more+50 -10 replies
11/43hw/i386/pc: No need for rtc_state to be an out-parameterhw/i386/pc.c hw/i386/pc_piix.c hw/i386/pc_q35.c +1 more+9 -90 replies
12/43hw/isa/piix3: Create USB controller in host devicehw/i386/pc_piix.c hw/isa/Kconfig hw/isa/piix3.c +1 more+24 -50 replies
13/43hw/isa/piix3: Create power management controller in host devicehw/i386/pc_piix.c hw/isa/Kconfig hw/isa/piix3.c +1 more+34 -100 replies
14/43hw/intc/i8259: Introduce i8259 proxy "isa-pic"hw/intc/i8259.c include/hw/intc/i8259.h+41 -02 replies
15/43hw/isa/piix3: Create ISA PIC in host devicehw/i386/pc_piix.c hw/isa/Kconfig hw/isa/piix3.c +1 more+21 -90 replies
16/43hw/isa/piix3: Create IDE controller in host devicehw/i386/Kconfig hw/i386/pc_piix.c hw/isa/Kconfig +2 more+17 -100 replies
17/43hw/isa/piix3: Wire up ACPI interrupt internallyhw/i386/pc_piix.c hw/isa/piix3.c+2 -10 replies
18/43hw/isa/piix3: Remove unused includehw/isa/piix3.c+0 -11 reply
19/43hw/isa/piix3: Allow board to provide PCI interrupt routeshw/isa/piix3.c include/hw/southbridge/piix.h+9 -43 replies
20/43hw/isa/piix3: Resolve redundant PIIX_NUM_PIC_IRQShw/isa/piix3.c include/hw/southbridge/piix.h+6 -70 replies
21/43hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4hw/isa/piix3.c+2 -21 reply
22/43hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4hw/isa/piix3.c+2 -21 reply
23/43hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_"hw/isa/piix3.c+2 -21 reply
24/43hw/isa/piix3: Rename typedef PIIX3State to PIIXStatehw/isa/piix3.c include/hw/southbridge/piix.h+31 -311 reply
25/43hw/mips/malta: Reuse dev variablehw/mips/malta.c+2 -31 reply
26/43meson: Fix dependencies of piix4 southbridgeconfigs/devices/mips-softmmu/common.mak hw/isa/Kconfig+6 -10 replies
27/43hw/isa/piix4: Add missing initializationhw/isa/piix4.c+2 -00 replies
28/43hw/isa/piix4: Move pci_ide_create_devs() call to board codehw/isa/piix4.c hw/mips/malta.c+6 -50 replies
29/43hw/isa/piix4: Make PIIX4's ACPI and USB functions optionalhw/isa/piix4.c hw/mips/malta.c+36 -140 replies
30/43hw/isa/piix4: Allow board to provide PCI interrupt routeshw/isa/piix4.c hw/mips/malta.c+14 -40 replies
31/43hw/isa/piix4: Remove unused codehw/isa/piix4.c+0 -80 replies
32/43hw/isa/piix4: Use ISA PIC devicehw/isa/piix4.c hw/mips/malta.c+19 -200 replies
33/43hw/isa/piix4: Reuse struct PIIXState from PIIX3hw/isa/piix4.c+19 -420 replies
34/43hw/isa/piix4: Rename reset control operations to match PIIX3hw/isa/piix4.c+6 -61 reply
35/43hw/isa/piix4: Prefix pci_slot_get_pirq() with "piix4_"hw/isa/piix4.c+3 -20 replies
36/43hw/isa/piix3: Merge hw/isa/piix4.cMAINTAINERS configs/devices/mips-softmmu/common.mak hw/i386/Kconfig +4 more+192 -3330 replies
37/43hw/isa/piix: Harmonize names of reset control memory regionshw/isa/piix.c+2 -21 reply
38/43hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4hw/isa/piix.c+9 -560 replies
39/43hw/isa/piix: Rename functions to be shared for interrupt triggeringhw/isa/piix.c+28 -280 replies
40/43hw/isa/piix: Consolidate IRQ triggeringhw/isa/piix.c+3 -230 replies
41/43hw/isa/piix: Share PIIX3 base class with PIIX4hw/isa/piix.c+24 -290 replies
42/43hw/isa/piix: Drop the "3" from the PIIX base classhw/i386/acpi-build.c hw/isa/piix.c include/hw/southbridge/piix.h+7 -70 replies
43/43hw/i386/acpi-build: Resolve PIIX ISA bridge rather than ACPI controllerhw/i386/acpi-build.c+1 -10 replies

Reviews trailers per patch

19 of 43 patches have a Reviewed-by or Acked-by.

PatchPhilippe Mathieu-DaudéPeter Maydell
1/43R-b
2/43R-b
3/43R-b R-b
4/43R-b
5/43R-b
6/43R-b
7/43R-b
8/43R-b
9/43
10/43
11/43R-b
12/43
13/43
14/43
15/43
16/43
17/43
18/43R-b
19/43
20/43
21/43R-b
22/43R-b
23/43R-b
24/43R-b
25/43R-b
26/43
27/43
28/43R-b
29/43
30/43R-b
31/43
32/43
33/43
34/43R-b
35/43
36/43
37/43R-b
38/43
39/43
40/43
41/43
42/43
43/43

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH v2 00/43] 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.h
Signature · 1 line
2.38.1