Consolidate PIIX south bridges
v5 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. Note that the first three patches are only included to avoid merge conflicts with mips-next -- please ignore.
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 proxy PIC as well.
Another challenge was dealing with optional devices where Peter already gave advice in [1] which this series implements.
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.
v5:
- Pick up Reviewed-by tags from https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg00116.html
- Add patch to make usage of the isa_pic global more type-safe
- Re-introduce isa-pic as PIC specific proxy (Mark)
Note that both patches are unreviewed -> Mark?
Furthermore, patch 'hw/i386/pc_piix: Associate pci_map_irq_fn as soon as PCI bus is created' needs review and could be merged into
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03312.html .
Testing done:
* make check
* 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=ttyS0"`
Based-on: <[email protected]>
"[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges"
v4:
- Rebase onto "[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges" since it is already queued via mips-next. This eliminates patches 'hw/isa/piix3: Prefix pci_slot_get_pirq() with "piix3_"' and 'hw/isa/piix4:
Prefix pci_slot_get_pirq() with "piix4_"'.
- Squash 'hw/isa/piix: Drop the "3" from the PIIX base class' into 'hw/isa/piix3: Rename typedef PIIX3State to PIIXState'. I originally only split these patches since I wasn't sure whether renaming a type was allowed.
- Add new patch 'hw/i386/pc_piix: Associate pci_map_irq_fn as soon as PCI bus is created' for forther cleanup of INTx-to-LNKx route decoupling.
v3:
- Introduce one TYPE_ICH9_USB_UHCI(fn) rather than several TYPE_ICH9_USB_UHCIx (Philippe)
- Make proxy PIC generic (Philippe)
- Track Malta's PIIX dependencies through KConfig
- Rebase onto Philippe's 'hw/isa/piix4: Remove MIPS Malta specific bits' series [3]
- Also rebase onto latest master to resolve merge conflicts. This required copying Philippe's series as first three patches - please ignore.
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
[1] https://lists.nongnu.org/archive/html/qemu-devel/2022-07/msg02348.html
[2] https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03310.html
[3] https://lists.nongnu.org/archive/html/qemu-devel/2022-10/msg05367.html
Bernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies via Kconfig hw/usb/hcd-uhci: Introduce TYPE_ defines for device models hw/i386/pc_piix: Associate pci_map_irq_fn as soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
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: Make using the isa_pic singleton more type-safe 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: 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: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/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's base class with PIIX4
Philippe Mathieu-Daudé (3):
hw/mips/malta: Introduce PIIX4_PCI_DEVFN definition hw/mips/malta: Set PIIX4 IRQ routes in embedded bootloader hw/isa/piix4: Correct IRQRC[A:D] reset values
configs/devices/mips-softmmu/common.mak | 2 -
hw/usb/hcd-uhci.h | 4 +
include/hw/i386/ich9.h | 2 +
include/hw/i386/pc.h | 2 +-
include/hw/intc/i8259.h | 25 +-
include/hw/southbridge/piix.h | 30 ++-
include/qemu/typedefs.h | 1 +
hw/i386/pc.c | 16 +-
hw/i386/pc_piix.c | 77 +++---
hw/i386/pc_q35.c | 16 +-
hw/intc/i8259.c | 38 ++-
hw/isa/lpc_ich9.c | 8 +
hw/isa/{piix3.c => piix.c} | 274 ++++++++++++++++-----
hw/isa/piix4.c | 302 ------------------------
hw/mips/malta.c | 38 ++-
hw/usb/hcd-uhci.c | 16 +-
MAINTAINERS | 6 +-
hw/i386/Kconfig | 4 +-
hw/isa/Kconfig | 8 +-
hw/isa/meson.build | 3 +-
hw/mips/Kconfig | 2 +
21 files changed, 419 insertions(+), 455 deletions(-)
rename hw/isa/{piix3.c => piix.c} (57%)
delete mode 100644 hw/isa/piix4.cSignature · 1 line
2.39.0
PATCH v5 1/31 hw/mips/malta: Introduce PIIX4_PCI_DEVFN definition
From: Philippe Mathieu-Daudé <[email protected]>
The PIIX4 PCI-ISA bridge function is always located at 10:0. Since we want to re-use its address, add the PIIX4_PCI_DEVFN definition.
Message-Id: <[email protected]>
--- hw/mips/malta.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
hw/mips/malta.c +3 -1
@@ -72,6 +72,8 @@#define FLASH_SIZE 0x400000 +#define PIIX4_PCI_DEVFN PCI_DEVFN(10, 0) + typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */
@@ -1427,7 +1429,7 @@ 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, + piix4 =pci_create_simple_multifunction (pci_bus,PIIX4_PCI_DEVFN , true,TYPE_PIIX4_PCI_DEVICE ); isa_bus =ISA_BUS (qdev_get_child_bus (DEVICE (piix4),"isa.0" ));
Signature · 1 line
2.39.0
PATCH v5 2/31 hw/mips/malta: Set PIIX4 IRQ routes in embedded bootloader
In reply to Bernhard BeschowFrom: Philippe Mathieu-Daudé <[email protected]>
Linux kernel expects the northbridge & southbridge chipsets configured by the BIOS firmware. We emulate that by writing a tiny bootloader code in write_bootloader().
Upon introduction in commit 5c2b87e34d ("PIIX4 support"), the PIIX4 configuration space included values specific to the Malta board.
Set the Malta-specific IRQ routing values in the embedded bootloader, so the next commit can remove the Malta specific bits from the PIIX4 PCI-ISA bridge and make it generic (matching the real hardware).
Message-Id: <[email protected]>
--- hw/mips/malta.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
hw/mips/malta.c +19 -0
@@ -804,6 +804,8 @@ static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr,stw_p (p++,0x8422 );stw_p (p++,0x9088 );/* sw t0, 0x88(t1) */ +/* TODO set PIIX IRQC[A:D] routing values! */ +stw_p (p++,0xe320 |NM_HI1 (kernel_entry));stw_p (p++,NM_HI2 (kernel_entry));
@@ -841,6 +843,9 @@ static void write_bootloader_nanomips(uint8_t *base, uint64_t run_addr,static void write_bootloader (uint8_t *base,uint64_t run_addr,uint64_t kernel_entry) { +const char pci_pins_cfg[PCI_NUM_PINS ] = { +10 ,10 ,11 ,11 /* PIIX IRQRC[A:D] */ + };uint32_t *p;/* Small bootloader */
@@ -915,6 +920,20 @@ static void write_bootloader(uint8_t *base, uint64_t run_addr,#undef cpu_to_gt32 +/* +* The PIIX ISA bridge is on PCI bus 0 dev 10 func 0. +* Load the PIIX IRQC[A:D] routing config address, then +* write routing configuration to the config data register. +*/ +bl_gen_write_u32 (&p,/* GT_PCI0_CFGADDR */ +cpu_mips_phys_to_kseg1 (NULL ,0x1be00000 +0xcf8 ), +tswap32 ((1 <<31 )/* ConfigEn */ + |PCI_BUILD_BDF (0 ,PIIX4_PCI_DEVFN ) <<8 + |PIIX_PIRQCA )); +bl_gen_write_u32 (&p,/* GT_PCI0_CFGDATA */ +cpu_mips_phys_to_kseg1 (NULL ,0x1be00000 +0xcfc ), +tswap32 (ldl_be_p (pci_pins_cfg))); + bl_gen_jump_kernel(&p, true, ENVP_VADDR - 64,/*
Signature · 1 line
2.39.0
PATCH v5 3/31 hw/isa/piix4: Correct IRQRC[A:D] reset values
In reply to Bernhard BeschowFrom: Philippe Mathieu-Daudé <[email protected]>
IRQRC[A:D] registers reset value is 0x80. We were forcing the MIPS Malta machine routing to be able to boot a Linux kernel without any bootloader.
We now have these registers initialized in the Malta machine write_bootloader(), so we can use the correct reset values.
Message-Id: <[email protected]>
--- hw/isa/piix4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
hw/isa/piix4.c +4 -4
@@ -91,10 +91,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[0x60 ] =0x80 ; + pci_conf[0x61 ] =0x80 ; + pci_conf[0x62 ] =0x80 ; + pci_conf[0x63 ] =0x80 ; pci_conf[0x69 ] =0x02 ; pci_conf[0x70 ] =0x80 ; pci_conf[0x76 ] =0x0c ;
Signature · 1 line
2.39.0
PATCH v5 4/31 hw/mips/Kconfig: Track Malta's PIIX dependencies via Kconfig
In reply to Bernhard BeschowTracking dependencies via Kconfig seems much cleaner.
Note that PIIX4 already depends on ACPI_PIIX4.
--- configs/devices/mips-softmmu/common.mak | 2 -- hw/mips/Kconfig | 1 + 2 files changed, 1 insertion(+), 2 deletions(-)
configs/devices/mips-softmmu/common.mak +0 -2
@@ -18,10 +18,8 @@ CONFIG_PCSPK=y CONFIG_PCKBD=y CONFIG_FDC=y CONFIG_ACPI=y -CONFIG_ACPI_PIIX4=y CONFIG_APM=y CONFIG_I8257=y -CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y
hw/mips/Kconfig +1 -0
@@ -1,6 +1,7 @@ config MALTA bool select ISA_SUPERIO + select PIIX4 config MIPSSIM bool
Signature · 1 line
2.39.0
PATCH v5 5/31 hw/usb/hcd-uhci: Introduce TYPE_ defines for device models
In reply to Bernhard BeschowMessage-Id: <[email protected]>
--- hw/usb/hcd-uhci.h | 4 ++++ hw/i386/pc_piix.c | 3 ++- hw/i386/pc_q35.c | 13 +++++++------ hw/isa/piix4.c | 2 +- hw/usb/hcd-uhci.c | 16 ++++++++-------- 5 files changed, 22 insertions(+), 16 deletions(-)
hw/usb/hcd-uhci.h +4 -0
@@ -91,4 +91,8 @@ 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_UHCI (fn) "ich9-usb-uhci" #fn +#endif
hw/i386/pc_piix.c +2 -1
@@ -51,6 +51,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"
@@ -306,7 +307,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_UHCI (1 ), .func =0 , .port =0 }, + { .name =TYPE_ICH9_USB_UHCI (2 ), .func =1 , .port =2 }, + { .name =TYPE_ICH9_USB_UHCI (3 ), .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_UHCI (4 ), .func =0 , .port =0 }, + { .name =TYPE_ICH9_USB_UHCI (5 ), .func =1 , .port =2 }, + { .name =TYPE_ICH9_USB_UHCI (6 ), .func =2 , .port =4 }, };static int ehci_create_ich9_with_companions (PCIBus *bus,int slot)
hw/isa/piix4.c +1 -1
@@ -255,7 +255,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_UHCI (1 ),/* 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_UHCI (2 ),/* 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_UHCI (3 ),/* 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_UHCI (4 ),/* 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_UHCI (5 ),/* 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_UHCI (6 ),/* 00:1a.2 */ .vendor_id =PCI_VENDOR_ID_INTEL , .device_id =PCI_DEVICE_ID_INTEL_82801I_UHCI6 , .revision =0x03 ,
Signature · 1 line
2.39.0
PATCH v5 6/31 hw/i386/pc_piix: Associate pci_map_irq_fn as soon as PCI bus is created
In reply to Bernhard BeschowObserve that the pci_map_irq_fn's don't depend on the south bridge instance. So associate them immediately when the PCI bus is created to keep things logically together.
--- hw/i386/pc_piix.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
hw/i386/pc_piix.c +3 -4
@@ -229,6 +229,9 @@ static void pc_init1(MachineState *machine, x86ms->below_4g_mem_size, x86ms->above_4g_mem_size, pci_memory, ram_memory); +pci_bus_map_irqs (pci_bus, +xen_enabled () ? xen_pci_slot_get_pirq + : pci_slot_get_pirq); pcms->bus = pci_bus; pci_dev =pci_create_simple_multifunction (pci_bus,-1 , true, type);
@@ -236,10 +239,6 @@ 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" )); - -pci_bus_map_irqs (pci_bus, -xen_enabled () ? xen_pci_slot_get_pirq - : pci_slot_get_pirq); }else { pci_bus =NULL ; isa_bus = isa_bus_new(NULL, get_system_memory(), system_io,
Signature · 1 line
2.39.0
PATCH v5 7/31 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.
Message-Id: <[email protected]>
--- hw/i386/pc_piix.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
hw/i386/pc_piix.c +2 -1
@@ -234,7 +234,8 @@ static void pc_init1(MachineState *machine, : pci_slot_get_pirq); 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.39.0
PATCH v5 8/31 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.
Message-Id: <[email protected]>
--- include/hw/i386/ich9.h | 2 ++ include/hw/southbridge/piix.h | 3 +++ hw/i386/pc.c | 12 +++++++++++- hw/i386/pc_piix.c | 8 ++++++++ hw/i386/pc_q35.c | 1 + hw/isa/lpc_ich9.c | 8 ++++++++ hw/isa/piix3.c | 15 +++++++++++++++ hw/isa/Kconfig | 2 ++ 8 files changed, 50 insertions(+), 1 deletion(-)
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;
hw/i386/pc.c +11 -1
@@ -1304,7 +1304,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"
@@ -240,10 +241,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/lpc_ich9.c +8 -0
@@ -663,6 +663,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,
@@ -728,6 +730,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/runstate.h"
@@ -301,6 +302,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)
@@ -327,6 +334,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);
@@ -353,6 +367,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 []) {
hw/isa/Kconfig +2 -0
@@ -35,6 +35,7 @@ config PIIX3 bool select I8257 select ISA_BUS + select MC146818RTC config PIIX4 bool
@@ -79,3 +80,4 @@ config LPC_ICH9 select ISA_BUS select ACPI_SMBUS select ACPI_X86_ICH + select MC146818RTC
Signature · 1 line
2.39.0
PATCH v5 9/31 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.
Message-Id: <[email protected]>
--- include/hw/i386/pc.h | 2 +- hw/i386/pc.c | 12 ++++++------ hw/i386/pc_piix.c | 2 +- hw/i386/pc_q35.c | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
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,
hw/i386/pc.c +6 -6
@@ -1251,7 +1251,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) {
@@ -1306,17 +1306,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
@@ -277,7 +277,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 */
Signature · 1 line
2.39.0
PATCH v5 10/31 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.
Message-Id: <[email protected]>
--- include/hw/southbridge/piix.h | 4 ++++ hw/i386/pc_piix.c | 7 ++----- hw/isa/piix3.c | 17 +++++++++++++++++ hw/isa/Kconfig | 1 + 4 files changed, 24 insertions(+), 5 deletions(-)
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 ;
hw/i386/pc_piix.c +2 -5
@@ -52,7 +52,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"
@@ -236,6 +235,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;
@@ -314,10 +315,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/piix3.c +17 -0
@@ -288,6 +288,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),
@@ -308,6 +309,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)
@@ -341,6 +352,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);
@@ -360,6 +376,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; }
hw/isa/Kconfig +1 -0
@@ -36,6 +36,7 @@ config PIIX3 select I8257 select ISA_BUS select MC146818RTC + select USB_UHCI config PIIX4 bool
Signature · 1 line
2.39.0
PATCH v5 11/31 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.
Message-Id: <[email protected]>
--- include/hw/southbridge/piix.h | 6 ++++++ hw/i386/pc_piix.c | 24 ++++++++++++++---------- hw/isa/piix3.c | 14 ++++++++++++++ hw/isa/Kconfig | 1 + 4 files changed, 35 insertions(+), 10 deletions(-)
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 ;
hw/i386/pc_piix.c +14 -10
@@ -46,12 +46,12 @@#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 "hw/xen/xen.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"
@@ -97,6 +97,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;
@@ -237,15 +238,25 @@ 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; 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" )); + 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);
@@ -315,15 +326,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);
@@ -337,7 +341,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/piix3.c +14 -0
@@ -319,6 +319,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)
@@ -353,7 +364,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 (), };
hw/isa/Kconfig +1 -0
@@ -33,6 +33,7 @@ config PC87312 config PIIX3 bool + select ACPI_PIIX4 select I8257 select ISA_BUS select MC146818RTC
Signature · 1 line
2.39.0
PATCH v5 12/31 hw/intc/i8259: Make using the isa_pic singleton more type-safe
In reply to Bernhard BeschowThis even spares some casts in hot code paths along the way.
---
Note: The next patch will introduce a class "isa-pic", which is shall not be confused with the isa_pic singleton.
--- include/hw/intc/i8259.h | 6 +++--- include/qemu/typedefs.h | 1 + hw/intc/i8259.c | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-)
include/hw/intc/i8259.h +3 -3
@@ -3,10 +3,10 @@/* i8259.c */ -extern DeviceState *isa_pic; +extern PICCommonState *isa_pic;qemu_irq *i8259_init (ISABus *bus,qemu_irq parent_irq);qemu_irq *kvm_i8259_init (ISABus *bus); -int pic_get_output (DeviceState *d); -int pic_read_irq (DeviceState *d); +int pic_get_output (PICCommonState *s); +int pic_read_irq (PICCommonState *s);#endif
include/qemu/typedefs.h +1 -0
@@ -98,6 +98,7 @@ typedef struct PCIExpressDevice PCIExpressDevice;typedef struct PCIExpressHost PCIExpressHost ;typedef struct PCIHostDeviceAddress PCIHostDeviceAddress ;typedef struct PCIHostState PCIHostState ; +typedef struct PICCommonState PICCommonState ;typedef struct PostcopyDiscardState PostcopyDiscardState ;typedef struct Property Property ;typedef struct PropertyInfo PropertyInfo ;
hw/intc/i8259.c +4 -7
@@ -55,7 +55,7 @@ struct PICClass {#ifdef DEBUG_IRQ_LATENCY static int64_t irq_time[16 ];#endif -DeviceState *isa_pic; +PICCommonState *isa_pic;static PICCommonState *slave_pic;/* return the highest priority found in mask (highest = smallest
@@ -173,9 +173,8 @@ static void pic_intack(PICCommonState *s, int irq)pic_update_irq (s); } -int pic_read_irq (DeviceState *d) +int pic_read_irq (PICCommonState *s) { -PICCommonState *s =PIC_COMMON (d);int irq, intno; irq =pic_get_irq (s);
@@ -354,10 +353,8 @@ static uint64_t pic_ioport_read(void *opaque, hwaddr addr,return ret; } -int pic_get_output (DeviceState *d) +int pic_get_output (PICCommonState *s) { -PICCommonState *s =PIC_COMMON (d); -return (pic_get_irq (s) >=0 ); }
@@ -426,7 +423,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) irq_set[i] =qdev_get_gpio_in (dev, i); } - isa_pic = dev; + isa_pic =PIC_COMMON (dev); isadev =i8259_init_chip (TYPE_I8259 , bus, false); dev =DEVICE (isadev);
Signature · 1 line
2.39.0
Re: [PATCH v5 12/31] hw/intc/i8259: Make using the isa_pic singleton more type-safe
Quoted 80 lines · Bernhard Beschow
This even spares some casts in hot code paths along the way.
Signed-off-by Bernhard Beschow <[email protected]>---
Note: The next patch will introduce a class "isa-pic", which is shall not be confused with theisa_picsingleton.--- include/hw/intc/i8259.h | 6 +++--- include/qemu/typedefs.h | 1 + hw/intc/i8259.c | 11 ++++------- 3 files changed, 8 insertions(+), 10 deletions(-)include/hw/intc/i8259.h +3
-3@@ -3,10 +3,10 @@/* i8259.c */ -extern DeviceState *isa_pic; +extern PICCommonState *isa_pic;qemu_irq *i8259_init (ISABus *bus,qemu_irq parent_irq);qemu_irq *kvm_i8259_init (ISABus *bus); -int pic_get_output (DeviceState *d); -int pic_read_irq (DeviceState *d); +int pic_get_output (PICCommonState *s); +int pic_read_irq (PICCommonState *s);#endif include/qemu/typedefs.h +1
-0@@ -98,6 +98,7 @@ typedef struct PCIExpressDevice PCIExpressDevice;typedef struct PCIExpressHost PCIExpressHost ;typedef struct PCIHostDeviceAddress PCIHostDeviceAddress ;typedef struct PCIHostState PCIHostState ; +typedef struct PICCommonState PICCommonState ;typedef struct PostcopyDiscardState PostcopyDiscardState ;typedef struct Property Property ;typedef struct PropertyInfo PropertyInfo ;hw/intc/i8259.c +3
-6@@ -55,7 +55,7 @@ struct PICClass {#ifdef DEBUG_IRQ_LATENCY static int64_t irq_time[16 ];#endif -DeviceState *isa_pic; +PICCommonState *isa_pic;static PICCommonState *slave_pic;/* return the highest priority found in mask (highest = smallest @@ -173,9 +173,8 @@ static void pic_intack(PICCommonState *s, int irq)pic_update_irq (s); } -int pic_read_irq (DeviceState *d) +int pic_read_irq (PICCommonState *s) { -PICCommonState *s =PIC_COMMON (d);int irq, intno; irq =pic_get_irq (s);@@ -354,10 +353,8 @@ static uint64_t pic_ioport_read(void *opaque, hwaddr addr,return ret; } -int pic_get_output (DeviceState *d) +int pic_get_output (PICCommonState *s) { -PICCommonState *s =PIC_COMMON (d); -return (pic_get_irq (s) >=0 ); }
hw/intc/i8259.c qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) · line 429
Quoted 8 lines
hw/intc/i8259.c +1
-1@@ -426,7 +423,7 @@ qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) irq_set[i] =qdev_get_gpio_in (dev, i); } - isa_pic = dev; + isa_pic =PIC_COMMON (dev); isadev =i8259_init_chip (TYPE_I8259 , bus, false); dev =DEVICE (isadev);
I actually had a similar thought when I was looking at the i8259 code and it seems sensible to me, so:
ATB,
Mark.
PATCH v5 13/31 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 virtualization technology) are separated. Second, since the in-IRQs are populated with fully initialized qemu_irq's, they can already be wired up inside PIIX3.
--- include/hw/intc/i8259.h | 19 +++++++++++++++++++ hw/intc/i8259.c | 27 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)
include/hw/intc/i8259.h +19 -0
@@ -1,6 +1,25 @@#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 ) + +/* +* TYPE_ISA_PIC is currently a PIC proxy which allows for interrupt wiring in +* a virtualization technology agnostic way. It could be turned into a proper +* GPIO-based ISA PIC in the future. + */ +struct ISAPICState { +DeviceState parent_obj; + +qemu_irq in_irqs[ISA_NUM_IRQS ]; +qemu_irq out_irqs[ISA_NUM_IRQS ]; +}; +/* i8259.c */ extern PICCommonState *isa_pic;
hw/intc/i8259.c +27 -0
@@ -455,9 +455,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_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)
Signature · 1 line
2.39.0
Re: [PATCH v5 13/31] hw/intc/i8259: Introduce i8259 proxy "isa-pic"
Quoted 26 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 virtualization technology) are separated. Second, since the in-IRQs are populated with fully initialized qemu_irq's, they can already be wired up inside PIIX3.Cc Mark Cave-Ayland <[email protected]>Signed-off-by Bernhard Beschow <[email protected]>--- include/hw/intc/i8259.h | 19 +++++++++++++++++++ hw/intc/i8259.c | 27 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)include/hw/intc/i8259.h +2
-0@@ -1,6 +1,25 @@#ifndef HW_I8259_H #define HW_I8259_H +#include "qom/object.h" +#include "hw/isa/isa.h"
include/hw/intc/i8259.h line 15
Quoted 10 lines
include/hw/intc/i8259.h +10
-0+#include "qemu/typedefs.h" + +#define TYPE_ISA_PIC "isa-pic" +OBJECT_DECLARE_SIMPLE_TYPE (ISAPICState,ISA_PIC ) + +/* +* TYPE_ISA_PIC is currently a PIC proxy which allows for interrupt wiring in +* a virtualization technology agnostic way. It could be turned into a proper +* GPIO-based ISA PIC in the future. +*/
I would say that the last sentence isn't true, since when all PIC implementations have been converted to qdev the mechanism for choosing the PIC implementation is currently unspecified. As an example once this has been done "isa-pic" could be removed completely and the code in the following patch changed to something like:
object_initialize_child(obj, "pic", &d->pic, kvm_enabled() ? TYPE_KVM_I8259 :
TYPE_I8259);Perhaps change the last sentence to something like: "It provides a temporary bridge between older x86 code where qemu_irqs are passed around directly and devices that use qdev gpios."?
Other than that the implementation looks sensible to me, so:
Quoted 41 lines
include/hw/intc/i8259.h +7
-0+struct ISAPICState { +DeviceState parent_obj; + +qemu_irq in_irqs[ISA_NUM_IRQS ]; +qemu_irq out_irqs[ISA_NUM_IRQS ]; +}; +/* i8259.c */ extern PICCommonState *isa_pic;hw/intc/i8259.c +23
-0@@ -455,9 +455,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_DEVICE , + .instance_size =sizeof (ISAPICState),
hw/intc/i8259.c static const TypeInfo i8259_info = { · line 490
Quoted 10 lines
hw/intc/i8259.c +4
-0+ .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)
ATB,
Mark.
Re: [PATCH v5 13/31] hw/intc/i8259: Introduce i8259 proxy "isa-pic"
Hi Mark,
Am 7. Januar 2023 23:45:39 UTC schrieb Mark Cave-Ayland <[email protected]>:
Quoted 40 lines · Bernhard Beschow
Quoted 26 lines
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 virtualization technology) are separated. Second, since the in-IRQs are populated with fully initialized qemu_irq's, they can already be wired up inside PIIX3.Cc Mark Cave-Ayland <[email protected]>Signed-off-by Bernhard Beschow <[email protected]>--- include/hw/intc/i8259.h | 19 +++++++++++++++++++ hw/intc/i8259.c | 27 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+)include/hw/intc/i8259.h +1
-0@@ -1,6 +1,25 @@#ifndef HW_I8259_H #define HW_I8259_H +#include "qom/object.h" +#include "hw/isa/isa.h" include/hw/intc/i8259.h line 14
Quoted 10 lines
include/hw/intc/i8259.h +10
-0+#include "qemu/typedefs.h" + +#define TYPE_ISA_PIC "isa-pic" +OBJECT_DECLARE_SIMPLE_TYPE (ISAPICState,ISA_PIC ) + +/* +* TYPE_ISA_PIC is currently a PIC proxy which allows for interrupt wiring in +* a virtualization technology agnostic way. It could be turned into a proper +* GPIO-based ISA PIC in the future. +*/ I would say that the last sentence isn't true, since when all PIC implementations have been converted to qdev the mechanism for choosing the PIC implementation is currently unspecified. As an example once this has been done "isa-pic" could be removed completely and the code in the following patch changed to something like:
Quoted 2 lines
object_initialize_child(obj, "pic", &d->pic, kvm_enabled() ? TYPE_KVM_I8259 :
TYPE_I8259);This wouldn't work for the Malta machine where TYPE_I8259 is used even in the case of kvm_enabled(). Furthermore, the PC machine may instantiate yet another interrupt controller here in Xen mode. Hence my sentence in the cover letter of making PIIX agnostic about the virtualization technology used. Let's discuss future directions elsewhere for the sake of separation of concerns ;)
Quoted 1 line
Perhaps change the last sentence to something like: "It provides a temporary bridge between older x86 code where
qemu_irqsare passed around directly and devices that use qdev gpios."?
I'd omit the last sentence for now.
Quoted 3 lines
Other than that the implementation looks sensible to me, so:
Reviewed-by Mark Cave-Ayland <[email protected]>
Thanks!
Best regards,
Bernhard
Quoted 53 lines
Quoted 38 lines
include/hw/intc/i8259.h +7
-0+struct ISAPICState { +DeviceState parent_obj; + +qemu_irq in_irqs[ISA_NUM_IRQS ]; +qemu_irq out_irqs[ISA_NUM_IRQS ]; +}; +/* i8259.c */ extern PICCommonState *isa_pic;hw/intc/i8259.c +21
-0@@ -455,9 +455,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_DEVICE ,hw/intc/i8259.c static const TypeInfo i8259_info = { · line 488
Quoted 10 lines
hw/intc/i8259.c +5
-0+ .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)ATB,
Mark.
PATCH v5 14/31 hw/isa/piix3: Create ISA PIC in host device
In reply to Bernhard BeschowUse the newly introduced TYPE_ISA_PIC which allows for wiring up devices in the southbridge where the virtualization technology used (KVM, TCG, Xen) is not yet known.
Message-Id: <[email protected]>
--- include/hw/southbridge/piix.h | 4 ++-- hw/i386/pc_piix.c | 15 +++++++++------ hw/isa/piix3.c | 10 +++++++++- hw/i386/Kconfig | 1 + hw/isa/Kconfig | 1 + 5 files changed, 22 insertions(+), 9 deletions(-)
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;
hw/i386/pc_piix.c +9 -6
@@ -219,10 +219,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,
@@ -247,10 +248,12 @@ static void pc_init1(MachineState *machine, &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" );
@@ -259,6 +262,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 );
@@ -267,7 +271,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/piix3.c +9 -1
@@ -39,7 +39,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 ))));
@@ -297,6 +297,13 @@ static void pci_piix3_realize(PCIDevice *dev, Error **errp)return ; } +/* PIC */ +if (!qdev_realize (DEVICE (&d->pic),NULL , 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),
@@ -360,6 +367,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 ); }
hw/i386/Kconfig +1 -0
@@ -72,6 +72,7 @@ config I440FX select PC_PCI select PC_ACPI select ACPI_SMBUS + select I8259 select PCI_I440FX select PIIX3 select IDE_PIIX
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
Signature · 1 line
2.39.0
PATCH v5 15/31 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.
Message-Id: <[email protected]>
--- include/hw/southbridge/piix.h | 2 ++ hw/i386/pc_piix.c | 15 ++++++--------- hw/isa/piix3.c | 8 ++++++++ hw/i386/Kconfig | 1 - hw/isa/Kconfig | 1 + 5 files changed, 17 insertions(+), 10 deletions(-)
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;
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"
@@ -98,7 +97,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 ];
@@ -252,11 +250,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 ;
@@ -270,6 +271,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 ) {
@@ -298,12 +301,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/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/runstate.h"
@@ -317,6 +318,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,
@@ -369,6 +376,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[] = {
hw/i386/Kconfig +0 -1
@@ -75,7 +75,6 @@ config I440FX select I8259 select PCI_I440FX select PIIX3 - select IDE_PIIX select DIMM select SMBIOS select FW_CFG_DMA
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
Signature · 1 line
2.39.0
PATCH v5 16/31 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.
Message-Id: <[email protected]>
--- 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
@@ -329,7 +329,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
@@ -343,6 +343,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.39.0
PATCH v5 17/31 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.
Message-Id: <[email protected]>
--- include/hw/southbridge/piix.h | 5 ++--- hw/isa/piix3.c | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-)
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;
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 ; }
@@ -87,7 +87,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 {
@@ -119,7 +119,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); } }
Signature · 1 line
2.39.0
PATCH v5 18/31 hw/isa/piix3: Rename pci_piix3_props for sharing with PIIX4
In reply to Bernhard BeschowMessage-Id: <[email protected]>
--- 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_BOOL ("has-acpi" , PIIX3State, has_acpi, true),DEFINE_PROP_BOOL ("has-usb" , PIIX3State, has_usb, true),
@@ -408,7 +408,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.39.0
PATCH v5 19/31 hw/isa/piix3: Rename piix3_reset() for sharing with PIIX4
In reply to Bernhard BeschowMessage-Id: <[email protected]>
--- hw/isa/piix3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix3.c +2 -2
@@ -145,7 +145,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;
@@ -395,7 +395,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.39.0
PATCH v5 20/31 hw/isa/piix3: Drop the "3" from PIIX base class
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.
Message-Id: <[email protected]>
--- include/hw/southbridge/piix.h | 6 ++-- hw/isa/piix3.c | 60 +++++++++++++++++------------------ 2 files changed, 32 insertions(+), 34 deletions(-)
include/hw/southbridge/piix.h +2 -4
@@ -72,11 +72,9 @@ struct PIIXState {bool has_usb;bool smm_enabled; }; -typedef struct PIIXState PIIX3State ; -#define TYPE_PIIX3_PCI_DEVICE "pci-piix3" -DECLARE_INSTANCE_CHECKER (PIIX3State,PIIX3_PCI_DEVICE , - TYPE_PIIX3_PCI_DEVICE) +#define TYPE_PIIX_PCI_DEVICE "pci-piix" +OBJECT_DECLARE_SIMPLE_TYPE(PIIXState, PIIX_PCI_DEVICE)#define TYPE_PIIX3_DEVICE "PIIX3"#define TYPE_PIIX3_XEN_DEVICE "PIIX3-xen"
hw/isa/piix3.c +30 -30
203 lines not on this page · raw message
Signature · 1 line
2.39.0
PATCH v5 21/31 hw/isa/piix4: Make PIIX4's ACPI and USB functions optional
In reply to Bernhard BeschowThis aligns PIIX4 with PIIX3.
Message-Id: <[email protected]>
--- 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 )
@@ -234,17 +241,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, s,PIIX_NUM_PIRQS ); }
@@ -255,13 +271,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);
@@ -280,6 +299,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
@@ -1448,8 +1448,10 @@ void mips_malta_init(MachineState *machine)empty_slot_init ("GT64120" ,0 ,0x20000000 );/* Southbridge */ - piix4 =pci_create_simple_multifunction (pci_bus,PIIX4_PCI_DEVFN , true, -TYPE_PIIX4_PCI_DEVICE ); + piix4 =pci_new_multifunction (PIIX4_PCI_DEVFN , 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.39.0
PATCH v5 22/31 hw/isa/piix4: Remove unused inbound ISA interrupt lines
In reply to Bernhard BeschowThe Malta board, which is the only user of PIIX4, doesn't connect to the exported interrupt lines. PIIX3 doesn't expose such intterupt lines either, so remove them for PIIX4 for simplicity and consistency.
Message-Id: <[email protected]>
--- hw/isa/piix4.c | 8 -------- 1 file changed, 8 deletions(-)
hw/isa/piix4.c +0 -8
@@ -155,12 +155,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) {
@@ -204,8 +198,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.39.0
Re: [PATCH v5 22/31] hw/isa/piix4: Remove unused inbound ISA interrupt lines
Quoted 2 lines · Bernhard Beschow
The Malta board, which is the only user of PIIX4, doesn't connect to the exported interrupt lines. PIIX3 doesn't expose such intterupt lines
typo here: s/intterupt/interrupt/
Quoted 27 lines
either, so remove them for PIIX4 for simplicity and consistency.
Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Message-Id: <[email protected]>
--- hw/isa/piix4.c | 8 -------- 1 file changed, 8 deletions(-)hw/isa/piix4.c +0
-6@@ -155,12 +155,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) {
hw/isa/piix4.c static void piix4_realize(PCIDevice *dev, Error **errp) · line 203
Quoted 8 lines
hw/isa/piix4.c +0
-2@@ -204,8 +198,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 );
ATB,
Mark.
PATCH v5 23/31 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.
Message-Id: <[email protected]>
--- hw/isa/piix4.c | 28 ++++++++++------------------ hw/mips/malta.c | 11 +++++++++-- hw/mips/Kconfig | 1 + 3 files changed, 20 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;
@@ -82,7 +81,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); } }
@@ -149,12 +148,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) {
@@ -190,7 +183,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);
@@ -198,20 +190,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),NULL , 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 );
@@ -224,7 +214,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 );
@@ -251,7 +241,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, s,PIIX_NUM_PIRQS );
@@ -261,6 +252,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
@@ -29,6 +29,7 @@#include "qemu/guest-random.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"
@@ -1280,10 +1281,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;
@@ -1458,7 +1460,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);pci_bus_map_irqs (pci_bus, pci_slot_get_pirq);
hw/mips/Kconfig +1 -0
@@ -1,5 +1,6 @@ config MALTA bool + select I8259 select ISA_SUPERIO select PIIX4
Signature · 1 line
2.39.0
PATCH v5 24/31 hw/isa/piix4: Reuse struct PIIXState from PIIX3
In reply to Bernhard BeschowNow that PIIX4 also uses the "proxy-pic", both implementations can share the same struct.
Message-Id: <[email protected]>
--- hw/isa/piix4.c | 51 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-)
hw/isa/piix4.c +15 -36
@@ -42,32 +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; - -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 */
@@ -87,7 +65,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level)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
@@ -122,12 +100,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 ;
@@ -142,8 +121,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 () } };
@@ -151,7 +130,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 );
@@ -163,7 +142,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; }
@@ -180,7 +159,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;
@@ -250,7 +229,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 );
@@ -258,10 +237,10 @@ static void piix4_init(Object *obj) }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_UINT32 ("smb_io_base" , PIIXState, smb_io_base,0 ), +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 (), };
@@ -289,7 +268,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.39.0
Re: [PATCH v5 24/31] hw/isa/piix4: Reuse struct PIIXState from PIIX3
Quoted 1 line · Bernhard Beschow
Now that PIIX4 also uses the "proxy-pic", both implementations
Should "proxy-pic" be replaced with "isa-pic" (or even TYPE_ISA_PIC) here?
Quoted 134 lines
can share the same struct.
Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Message-Id: <[email protected]>
--- hw/isa/piix4.c | 51 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-)hw/isa/piix4.c +14
-35@@ -42,32 +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; - -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 */ @@ -87,7 +65,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level)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 @@ -122,12 +100,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 ;@@ -142,8 +121,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 () } };@@ -151,7 +130,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 );@@ -163,7 +142,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; }@@ -180,7 +159,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;@@ -250,7 +229,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 );@@ -258,10 +237,10 @@ static void piix4_init(Object *obj) }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_UINT32 ("smb_io_base" , PIIXState, smb_io_base,0 ), +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 (), };
hw/isa/piix4.c static void piix4_class_init(ObjectClass *klass, void *data) · line 274
Quoted 8 lines
hw/isa/piix4.c +1
-1@@ -289,7 +268,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 []) {
ATB,
Mark.
Re: [PATCH v5 24/31] hw/isa/piix4: Reuse struct PIIXState from PIIX3
Am 7. Januar 2023 23:48:52 UTC schrieb Mark Cave-Ayland <[email protected]>:
Quoted 5 lines · Bernhard Beschow
Quoted 2 lines
Now that PIIX4 also uses the "proxy-pic", both implementations
Should "proxy-pic" be replaced with "isa-pic" (or even
TYPE_ISA_PIC) here?
Yes, indeed.
Best regards,
Bernhard
Quoted 131 lines
Quoted 121 lines
can share the same struct.
Signed-off-by Bernhard Beschow <[email protected]>Reviewed-by Michael S. Tsirkin <[email protected]>Message-Id: <[email protected]>
--- hw/isa/piix4.c | 51 +++++++++++++++----------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-)hw/isa/piix4.c +8
-29@@ -42,32 +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; - -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 */ @@ -87,7 +65,7 @@ static void piix4_set_irq(void *opaque, int irq_num, int level)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 @@ -122,12 +100,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 ;@@ -142,8 +121,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 () } };@@ -151,7 +130,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 );@@ -163,7 +142,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; }@@ -180,7 +159,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; @@ -250,7 +229,7 @@ static void piix4_realize(PCIDevice *dev, Error **errp) static void piix4_init(Object *obj){hw/isa/piix4.c +5
-5-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 );@@ -258,10 +237,10 @@ static void piix4_init(Object *obj) }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_UINT32 ("smb_io_base" , PIIXState, smb_io_base,0 ), +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 (), }; @@ -289,7 +268,7 @@ static void piix4_class_init(ObjectClass *klass, void *data) static const TypeInfo piix4_info = {.name =
TYPE_PIIX4_PCI_DEVICE,
.parent =TYPE_PCI_DEVICE,hw/isa/piix4.c static void piix4_class_init(ObjectClass *klass, void *data) · line 274
Quoted 5 lines
hw/isa/piix4.c +1
-1- .instance_size = sizeof(PIIX4State), + .instance_size = sizeof(PIIXState), .instance_init = piix4_init, .class_init = piix4_class_init, .interfaces = (InterfaceInfo []) {ATB,
Mark.
PATCH v5 25/31 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.
Message-Id: <[email protected]>
--- hw/isa/piix4.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
hw/isa/piix4.c +6 -6
@@ -127,7 +127,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;
@@ -140,16 +140,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 ,
@@ -169,7 +169,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.39.0
PATCH v5 26/31 hw/isa/piix3: Merge hw/isa/piix4.c
In reply to Bernhard BeschowNow that the PIIX3 and PIIX4 device models are sufficiently consolidated, their implementations can be merged into one file for further consolidation.
Message-Id: <[email protected]>
---
hw/isa/{piix3.c => piix.c} | 158 ++++++++++++++++++++
hw/isa/piix4.c | 285 -------------------------------------
MAINTAINERS | 6 +-
hw/i386/Kconfig | 2 +-
hw/isa/Kconfig | 12 +-
hw/isa/meson.build | 3 +-
hw/mips/Kconfig | 2 +-
7 files changed, 165 insertions(+), 303 deletions(-)
rename hw/isa/{piix3.c => piix.c} (75%)
delete mode 100644 hw/isa/piix4.chw/isa/piix.c renamed from hw/isa/piix3.c +158 -0
@@ -2,6 +2,7 @@* QEMU PIIX PCI ISA Bridge Emulation * * Copyright (c) 2006 Fabrice Bellard +* Copyright (c) 2018 Hervé Poussineau * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal
@@ -27,6 +28,7 @@#include "qapi/error.h" #include "hw/dma/i8257.h" #include "hw/southbridge/piix.h" +#include "hw/timer/i8254.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/ide/piix.h"
@@ -81,6 +83,27 @@ static void piix3_set_irq(void *opaque, int pirq, int level)piix3_set_irq_level (piix3, 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); + } +} +static PCIINTxRoute piix3_route_intx_pin_to_irq (void *opaque,int pin) {PIIXState *piix3 = opaque;
@@ -208,6 +231,17 @@ static int piix3_post_load(void *opaque, int version_id)return 0 ; } +static int piix4_post_load (void *opaque,int version_id) +{ +PIIXState *s = opaque; + +if (version_id ==2 ) { + s->rcr =0 ; + } + +return 0 ; +} +static int piix3_pre_save (void *opaque) {int i;
@@ -257,6 +291,17 @@ static const VMStateDescription vmstate_piix3 = { } }; +static const VMStateDescription vmstate_piix4 = { + .name ="PIIX4" , + .version_id =3 , + .minimum_version_id =2 , + .post_load = piix4_post_load, + .fields = (VMStateField []) { +VMSTATE_PCI_DEVICE (dev, PIIXState), +VMSTATE_UINT8_V (rcr, PIIXState,3 ), +VMSTATE_END_OF_LIST () + } +};static void rcr_write (void *opaque,hwaddr addr,uint64_t val,unsigned len) {
@@ -489,11 +534,124 @@ static const TypeInfo piix3_xen_info = { .class_init = piix3_xen_class_init, }; +static void piix4_realize (PCIDevice *dev,Error **errp) +{ +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, +"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),NULL , errp)) { +return ; + } + +/* initialize ISA irqs */ +isa_bus_irqs (isa_bus, s->pic.in_irqs); + +/* 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, s,PIIX_NUM_PIRQS ); +} + +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 ); +} + +static void piix4_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +PCIDeviceClass *k =PCI_DEVICE_CLASS (klass); + + 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), + .instance_init = piix4_init, + .class_init = piix4_class_init, + .interfaces = (InterfaceInfo []) { + {INTERFACE_CONVENTIONAL_PCI_DEVICE }, + { }, + }, +}; +static void piix3_register_types (void ) {type_register_static (&piix_pci_type_info);type_register_static (&piix3_info);type_register_static (&piix3_xen_info); +type_register_static (&piix4_info); }type_init (piix3_register_types)
hw/isa/piix4.c deleted +0 -285
285 lines not on this page · raw message
MAINTAINERS +3 -3
@@ -1236,7 +1236,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
@@ -1654,7 +1654,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
@@ -2344,7 +2344,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)
hw/i386/Kconfig +1 -1
@@ -74,7 +74,7 @@ config I440FX select ACPI_SMBUS select I8259 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/mips/Kconfig +1 -1
@@ -2,7 +2,7 @@ config MALTA bool select I8259 select ISA_SUPERIO - select PIIX4 + select PIIX config MIPSSIM bool
Signature · 1 line
2.39.0
PATCH v5 27/31 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.
Message-Id: <[email protected]>
--- hw/isa/piix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
hw/isa/piix.c +2 -2
@@ -351,7 +351,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 );
@@ -547,7 +547,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.39.0
PATCH v5 28/31 hw/isa/piix: Reuse PIIX3 base class' realize method in PIIX4
In reply to Bernhard BeschowResolves duplicate code.
Message-Id: <[email protected]>
--- hw/isa/piix.c | 65 +++++++-------------------------------------------- 1 file changed, 9 insertions(+), 56 deletions(-)
hw/isa/piix.c +9 -56
@@ -331,7 +331,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);
@@ -371,8 +372,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 ;
@@ -477,7 +477,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 ; }
@@ -506,7 +506,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 ; }
@@ -536,71 +536,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),NULL , 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, s,PIIX_NUM_PIRQS ); }
Signature · 1 line
2.39.0
PATCH v5 29/31 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.
Message-Id: <[email protected]>
--- hw/isa/piix.c | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-)
hw/isa/piix.c +28 -28
@@ -40,47 +40,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)
@@ -121,29 +121,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); } } }
@@ -165,7 +165,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)
@@ -225,7 +225,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 ;
@@ -482,7 +482,7 @@ static void piix3_realize(PCIDevice *dev, Error **errp)return ; } -pci_bus_irqs (pci_bus, piix3_set_irq, piix3,PIIX_NUM_PIRQS ); +pci_bus_irqs (pci_bus, piix_set_irq, piix3,PIIX_NUM_PIRQS );pci_bus_set_route_irq_fn (pci_bus, piix3_route_intx_pin_to_irq); }
@@ -490,7 +490,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.39.0
PATCH v5 30/31 hw/isa/piix: Consolidate IRQ triggering
In reply to Bernhard BeschowSpeeds up PIIX4 which resolves an old TODO.
Message-Id: <[email protected]>
--- hw/isa/piix.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)
hw/isa/piix.c +3 -23
@@ -83,27 +83,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); - } -} -static PCIINTxRoute piix3_route_intx_pin_to_irq (void *opaque,int pin) {PIIXState *piix3 = opaque;
@@ -239,7 +218,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)
@@ -554,7 +533,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, s,PIIX_NUM_PIRQS ); +pci_bus_irqs (pci_bus, piix_set_irq, s,PIIX_NUM_PIRQS ); }static void piix4_init (Object *obj)
@@ -571,6 +550,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.39.0
PATCH v5 31/31 hw/isa/piix: Share PIIX3's base class with PIIX4
In reply to Bernhard BeschowHaving a common base class will allow for substituting PIIX3 with PIIX4 and vice versa. Moreover, it makes PIIX4 implement the acpi-dev-aml-interface.
Message-Id: <[email protected]>
--- hw/isa/piix.c | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-)
hw/isa/piix.c +22 -27
@@ -396,13 +396,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[] = {
@@ -413,7 +412,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);
@@ -421,11 +420,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
@@ -440,9 +436,9 @@ static const TypeInfo piix_pci_type_info = { .name = TYPE_PIIX_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 },
@@ -465,17 +461,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_PIIX_PCI_DEVICE , + .instance_init = piix3_init, .class_init = piix3_class_init, };
@@ -501,15 +509,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_PIIX_PCI_DEVICE , + .instance_init = piix3_init, .class_init = piix3_xen_class_init, };
@@ -540,8 +553,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 ); }
@@ -552,31 +563,15 @@ 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_PIIX_PCI_DEVICE , .instance_init = piix4_init, .class_init = piix4_class_init, - .interfaces = (InterfaceInfo []) { - {INTERFACE_CONVENTIONAL_PCI_DEVICE }, - { }, - }, };static void piix3_register_types (void )
Signature · 1 line
2.39.0
Quoted 22 lines · Bernhard Beschow
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. Note that the first three patches are only included to avoid merge conflicts with mips-next -- please ignore.
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 proxy PIC as well.
Quoted 6 lines
Another challenge was dealing with optional devices where Peter already gave advice in [1] which this series implements.
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.
This is going to be merged through mips tree yes?
series:
Quoted 117 lines
v5:
- Pick up Reviewed-by tags from https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg00116.html
- Add patch to make usage of theisa_picglobal more type-safe
- Re-introduce isa-pic as PIC specific proxy (Mark)
Note that both patches are unreviewed -> Mark?Furthermore, patch 'hw/i386/pc_piix: Associate
pci_map_irq_fnas soon as PCI bus is created' needs review and could be merged into
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03312.html .Testing done:
* make check
* 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=ttyS0"`Based-on: <[email protected]>
"[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges"v4:
- Rebase onto "[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges" since it is already queued via mips-next. This eliminates patches 'hw/isa/piix3: Prefixpci_slot_get_pirq()with "piix3_"' and 'hw/isa/piix4:
Prefixpci_slot_get_pirq()with "piix4_"'.
- Squash 'hw/isa/piix: Drop the "3" from the PIIX base class' into 'hw/isa/piix3: Rename typedef PIIX3State to PIIXState'. I originally only split these patches since I wasn't sure whether renaming a type was allowed.
- Add new patch 'hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is created' for forther cleanup of INTx-to-LNKx route decoupling.v3:
- Introduce oneTYPE_ICH9_USB_UHCI(fn)rather than severalTYPE_ICH9_USB_UHCIx(Philippe)
- Make proxy PIC generic (Philippe)
- Track Malta's PIIX dependencies through KConfig
- Rebase onto Philippe's 'hw/isa/piix4: Remove MIPS Malta specific bits' series [3]
- Also rebase onto latest master to resolve merge conflicts. This required copying Philippe's series as first three patches - please ignore.v2:
- IntroduceTYPE_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[1] https://lists.nongnu.org/archive/html/qemu-devel/2022-07/msg02348.html
[2] https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03310.html
[3] https://lists.nongnu.org/archive/html/qemu-devel/2022-10/msg05367.htmlBernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/piix3: Mergehw/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's base class with PIIX4Philippe Mathieu-Daudé (3):
hw/mips/malta: IntroducePIIX4_PCI_DEVFNdefinition hw/mips/malta: Set PIIX4 IRQ routes in embedded bootloader hw/isa/piix4: Correct IRQRC[A:D] reset valuesconfigs/devices/mips-softmmu/common.mak | 2 - hw/usb/hcd-uhci.h | 4 + include/hw/i386/ich9.h | 2 + include/hw/i386/pc.h | 2 +- include/hw/intc/i8259.h | 25 +- include/hw/southbridge/piix.h | 30 ++- include/qemu/typedefs.h | 1 + hw/i386/pc.c | 16 +- hw/i386/pc_piix.c | 77 +++--- hw/i386/pc_q35.c | 16 +- hw/intc/i8259.c | 38 ++- hw/isa/lpc_ich9.c | 8 + hw/isa/{piix3.c => piix.c} | 274 ++++++++++++++++----- hw/isa/piix4.c | 302 ------------------------ hw/mips/malta.c | 38 ++- hw/usb/hcd-uhci.c | 16 +- MAINTAINERS | 6 +- hw/i386/Kconfig | 4 +- hw/isa/Kconfig | 8 +- hw/isa/meson.build | 3 +- hw/mips/Kconfig | 2 + 21 files changed, 419 insertions(+), 455 deletions(-) rename hw/isa/{piix3.c => piix.c} (57%) delete mode 100644 hw/isa/piix4.cSignature · 1 line
2.39.0
Am 5. Januar 2023 16:39:01 UTC schrieb "Michael S. Tsirkin" <[email protected]>:
Quoted 23 lines · Bernhard Beschow
Quoted 22 lines
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. Note that the first three patches are only included to avoid merge conflicts with mips-next -- please ignore.
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 proxy PIC as well.
Quoted 8 lines
Quoted 6 lines
Another challenge was dealing with optional devices where Peter already gave advice in [1] which this series implements.
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.
This is going to be merged through mips tree yes?
Right. Because it depends on some MIPS changes.
Quoted 3 lines
series:
Reviewed-by Michael S. Tsirkin <[email protected]>
Thanks!
Best regards,
Bernhard
Quoted 119 lines
Quoted 118 lines
v5:
- Pick up Reviewed-by tags from https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg00116.html
- Add patch to make usage of theisa_picglobal more type-safe
- Re-introduce isa-pic as PIC specific proxy (Mark)
Note that both patches are unreviewed -> Mark?Furthermore, patch 'hw/i386/pc_piix: Associate
pci_map_irq_fnas soon as PCI bus is created' needs review and could be merged into
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03312.html .Testing done:
* make check
* 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=ttyS0"`Based-on: <[email protected]>
"[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges"v4:
- Rebase onto "[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges" since it is already queued via mips-next. This eliminates patches 'hw/isa/piix3: Prefixpci_slot_get_pirq()with "piix3_"' and 'hw/isa/piix4:
Prefixpci_slot_get_pirq()with "piix4_"'.
- Squash 'hw/isa/piix: Drop the "3" from the PIIX base class' into 'hw/isa/piix3: Rename typedef PIIX3State to PIIXState'. I originally only split these patches since I wasn't sure whether renaming a type was allowed.
- Add new patch 'hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is created' for forther cleanup of INTx-to-LNKx route decoupling.v3:
- Introduce oneTYPE_ICH9_USB_UHCI(fn)rather than severalTYPE_ICH9_USB_UHCIx(Philippe)
- Make proxy PIC generic (Philippe)
- Track Malta's PIIX dependencies through KConfig
- Rebase onto Philippe's 'hw/isa/piix4: Remove MIPS Malta specific bits' series [3]
- Also rebase onto latest master to resolve merge conflicts. This required copying Philippe's series as first three patches - please ignore.v2:
- IntroduceTYPE_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[1] https://lists.nongnu.org/archive/html/qemu-devel/2022-07/msg02348.html
[2] https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03310.html
[3] https://lists.nongnu.org/archive/html/qemu-devel/2022-10/msg05367.htmlBernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/piix3: Mergehw/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's base class with PIIX4Philippe Mathieu-Daudé (3):
hw/mips/malta: IntroducePIIX4_PCI_DEVFNdefinition hw/mips/malta: Set PIIX4 IRQ routes in embedded bootloader hw/isa/piix4: Correct IRQRC[A:D] reset valuesconfigs/devices/mips-softmmu/common.mak | 2 - hw/usb/hcd-uhci.h | 4 + include/hw/i386/ich9.h | 2 + include/hw/i386/pc.h | 2 +- include/hw/intc/i8259.h | 25 +- include/hw/southbridge/piix.h | 30 ++- include/qemu/typedefs.h | 1 + hw/i386/pc.c | 16 +- hw/i386/pc_piix.c | 77 +++--- hw/i386/pc_q35.c | 16 +- hw/intc/i8259.c | 38 ++- hw/isa/lpc_ich9.c | 8 + hw/isa/{piix3.c => piix.c} | 274 ++++++++++++++++----- hw/isa/piix4.c | 302 ------------------------ hw/mips/malta.c | 38 ++- hw/usb/hcd-uhci.c | 16 +- MAINTAINERS | 6 +- hw/i386/Kconfig | 4 +- hw/isa/Kconfig | 8 +- hw/isa/meson.build | 3 +- hw/mips/Kconfig | 2 + 21 files changed, 419 insertions(+), 455 deletions(-) rename hw/isa/{piix3.c => piix.c} (57%) delete mode 100644 hw/isa/piix4.cSignature · 1 line
2.39.0
Quoted 140 lines · Bernhard Beschow
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. Note that the first three patches are only included to avoid merge conflicts with mips-next -- please ignore.
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 proxy PIC as well.Another challenge was dealing with optional devices where Peter already gave advice in [1] which this series implements.
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.
v5:
- Pick up Reviewed-by tags from https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg00116.html
- Add patch to make usage of theisa_picglobal more type-safe
- Re-introduce isa-pic as PIC specific proxy (Mark)
Note that both patches are unreviewed -> Mark?Furthermore, patch 'hw/i386/pc_piix: Associate
pci_map_irq_fnas soon as PCI bus is created' needs review and could be merged into
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03312.html .Testing done:
* make check
* 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=ttyS0"`Based-on: <[email protected]>
"[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges"v4:
- Rebase onto "[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges" since it is already queued via mips-next. This eliminates patches 'hw/isa/piix3: Prefixpci_slot_get_pirq()with "piix3_"' and 'hw/isa/piix4:Prefix pci_slot_get_pirq() with "piix4_"'.- Squash 'hw/isa/piix: Drop the "3" from the PIIX base class' into 'hw/isa/piix3: Rename typedef PIIX3State to PIIXState'. I originally only split these patches since I wasn't sure whether renaming a type was allowed.
- Add new patch 'hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is created' for forther cleanup of INTx-to-LNKx route decoupling.v3:
- Introduce oneTYPE_ICH9_USB_UHCI(fn)rather than severalTYPE_ICH9_USB_UHCIx(Philippe)
- Make proxy PIC generic (Philippe)
- Track Malta's PIIX dependencies through KConfig
- Rebase onto Philippe's 'hw/isa/piix4: Remove MIPS Malta specific bits' series [3]
- Also rebase onto latest master to resolve merge conflicts. This required copying Philippe's series as first three patches - please ignore.v2:
- IntroduceTYPE_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[1] https://lists.nongnu.org/archive/html/qemu-devel/2022-07/msg02348.html
[2] https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03310.html
[3] https://lists.nongnu.org/archive/html/qemu-devel/2022-10/msg05367.htmlBernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/piix3: Mergehw/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's base class with PIIX4Philippe Mathieu-Daudé (3):
hw/mips/malta: IntroducePIIX4_PCI_DEVFNdefinition hw/mips/malta: Set PIIX4 IRQ routes in embedded bootloader hw/isa/piix4: Correct IRQRC[A:D] reset valuesconfigs/devices/mips-softmmu/common.mak | 2 - hw/usb/hcd-uhci.h | 4 + include/hw/i386/ich9.h | 2 + include/hw/i386/pc.h | 2 +- include/hw/intc/i8259.h | 25 +- include/hw/southbridge/piix.h | 30 ++- include/qemu/typedefs.h | 1 + hw/i386/pc.c | 16 +- hw/i386/pc_piix.c | 77 +++--- hw/i386/pc_q35.c | 16 +- hw/intc/i8259.c | 38 ++- hw/isa/lpc_ich9.c | 8 + hw/isa/{piix3.c => piix.c} | 274 ++++++++++++++++----- hw/isa/piix4.c | 302 ------------------------ hw/mips/malta.c | 38 ++- hw/usb/hcd-uhci.c | 16 +- MAINTAINERS | 6 +- hw/i386/Kconfig | 4 +- hw/isa/Kconfig | 8 +- hw/isa/meson.build | 3 +- hw/mips/Kconfig | 2 + 21 files changed, 419 insertions(+), 455 deletions(-)
Quoted 2 lines
rename
hw/isa/{piix3.c=>piix.c} (57%)
delete mode 100644hw/isa/piix4.c
I've made a few comments on minor things I spotted reading through the series, but in general I'm happy with this series as it does a lot of good tidy-up work (and even if any problems do occur later, it's early enough in the development cycle to catch them in plenty of time).
Phil - over to you!
ATB,
Mark.
Am 7. Januar 2023 23:57:32 UTC schrieb Mark Cave-Ayland <[email protected]>:
Quoted 145 lines · Bernhard Beschow
Quoted 141 lines
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. Note that the first three patches are only included to avoid merge conflicts with mips-next -- please ignore.
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 proxy PIC as well.Another challenge was dealing with optional devices where Peter already gave advice in [1] which this series implements.
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.
v5:
- Pick up Reviewed-by tags from https://lists.nongnu.org/archive/html/qemu-devel/2023-01/msg00116.html
- Add patch to make usage of theisa_picglobal more type-safe
- Re-introduce isa-pic as PIC specific proxy (Mark)
Note that both patches are unreviewed -> Mark?Furthermore, patch 'hw/i386/pc_piix: Associate
pci_map_irq_fnas soon as PCI bus is created' needs review and could be merged into
https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03312.html .Testing done:
* make check
* 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=ttyS0"`Based-on: <[email protected]>
"[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges"v4:
- Rebase onto "[PATCH v2 0/3] Decouple INTx-to-LNKx routing from south bridges" since it is already queued via mips-next. This eliminates patches 'hw/isa/piix3: Prefixpci_slot_get_pirq()with "piix3_"' and 'hw/isa/piix4:Prefix pci_slot_get_pirq() with "piix4_"'.- Squash 'hw/isa/piix: Drop the "3" from the PIIX base class' into 'hw/isa/piix3: Rename typedef PIIX3State to PIIXState'. I originally only split these patches since I wasn't sure whether renaming a type was allowed.
- Add new patch 'hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is created' for forther cleanup of INTx-to-LNKx route decoupling.v3:
- Introduce oneTYPE_ICH9_USB_UHCI(fn)rather than severalTYPE_ICH9_USB_UHCIx(Philippe)
- Make proxy PIC generic (Philippe)
- Track Malta's PIIX dependencies through KConfig
- Rebase onto Philippe's 'hw/isa/piix4: Remove MIPS Malta specific bits' series [3]
- Also rebase onto latest master to resolve merge conflicts. This required copying Philippe's series as first three patches - please ignore.v2:
- IntroduceTYPE_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[1] https://lists.nongnu.org/archive/html/qemu-devel/2022-07/msg02348.html
[2] https://lists.nongnu.org/archive/html/qemu-devel/2022-11/msg03310.html
[3] https://lists.nongnu.org/archive/html/qemu-devel/2022-10/msg05367.htmlBernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/piix3: Mergehw/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's base class with PIIX4Philippe Mathieu-Daudé (3):
hw/mips/malta: IntroducePIIX4_PCI_DEVFNdefinition hw/mips/malta: Set PIIX4 IRQ routes in embedded bootloader hw/isa/piix4: Correct IRQRC[A:D] reset valuesconfigs/devices/mips-softmmu/common.mak | 2 - hw/usb/hcd-uhci.h | 4 + include/hw/i386/ich9.h | 2 + include/hw/i386/pc.h | 2 +- include/hw/intc/i8259.h | 25 +- include/hw/southbridge/piix.h | 30 ++- include/qemu/typedefs.h | 1 + hw/i386/pc.c | 16 +- hw/i386/pc_piix.c | 77 +++--- hw/i386/pc_q35.c | 16 +- hw/intc/i8259.c | 38 ++- hw/isa/lpc_ich9.c | 8 + hw/isa/{piix3.c => piix.c} | 274 ++++++++++++++++----- hw/isa/piix4.c | 302 ------------------------ hw/mips/malta.c | 38 ++- hw/usb/hcd-uhci.c | 16 +- MAINTAINERS | 6 +- hw/i386/Kconfig | 4 +- hw/isa/Kconfig | 8 +- hw/isa/meson.build | 3 +- hw/mips/Kconfig | 2 + 21 files changed, 419 insertions(+), 455 deletions(-)Quoted 2 lines
rename
hw/isa/{piix3.c=>piix.c} (57%)
delete mode 100644hw/isa/piix4.c
Quoted 1 line
I've made a few comments on minor things I spotted reading through the series, but in general I'm happy with this series as it does a lot of good tidy-up work (and even if any problems do occur later, it's early enough in the development cycle to catch them in plenty of time).
Thanks!
Quoted 1 line
Phil - over to you!
Shall I respin? I could integrate my PCI series into this one in order to avoid the outdated MIPS patches while still delivering a working series. Yes/No?
Best regards,
Bernhard
Quoted 5 lines
ATB,
Mark.
Quoted 36 lines · Bernhard Beschow
Am 7. Januar 2023 23:57:32 UTC schrieb Mark Cave-Ayland <[email protected]>:
Quoted 35 lines · Bernhard Beschow
Quoted 24 lines
Bernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines hw/isa/piix4: Use ISA PIC deviceQuoted 8 lines
hw/isa/piix4: Reuse struct PIIXState from PIIX3 hw/isa/piix4: Rename reset control operations to match PIIX3 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's base class with PIIX4Phil - over to you!
Thanks for the review Mark!
Quoted 1 line
Shall I respin? I could integrate my PCI series into this one in order to avoid the outdated MIPS patches while still delivering a working series. Yes/No?
If you don't mind, that is certainly easier for me :)
Am 8. Januar 2023 18:28:28 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 36 lines · Bernhard Beschow
Quoted 34 lines
Am 7. Januar 2023 23:57:32 UTC schrieb Mark Cave-Ayland <[email protected]>:
Quoted 33 lines · Bernhard Beschow
Quoted 32 lines
Bernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/piix3: Mergehw/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's base class with PIIX4
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Phil - over to you!
Thanks for the review Mark!
Quoted 1 line
Shall I respin? I could integrate my PCI series into this one in order to avoid the outdated MIPS patches while still delivering a working series. Yes/No?
If you don't mind, that is certainly easier for me :)
Okay, will do!
Am 8. Januar 2023 18:28:28 UTC schrieb "Philippe Mathieu-Daudé" <[email protected]>:
Quoted 36 lines · Bernhard Beschow
Quoted 34 lines
Am 7. Januar 2023 23:57:32 UTC schrieb Mark Cave-Ayland <[email protected]>:
Quoted 33 lines · Bernhard Beschow
Quoted 32 lines
Bernhard Beschow (28):
hw/mips/Kconfig: Track Malta's PIIX dependencies viaKconfighw/usb/hcd-uhci: IntroduceTYPE_defines for device models hw/i386/pc_piix: Associatepci_map_irq_fnas soon as PCI bus is
created
hw/i386/pc_piix: Allow for setting properties before realizing PIIX3
south bridge
hw/i386/pc: Create RTC controllers in south bridges hw/i386/pc: No need forrtc_stateto 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: Make using theisa_picsingleton more type-safe 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: Resolve redundantPIIX_NUM_PIC_IRQShw/isa/piix3: Renamepci_piix3_propsfor sharing with PIIX4 hw/isa/piix3: Renamepiix3_reset()for sharing with PIIX4 hw/isa/piix3: Drop the "3" from PIIX base class hw/isa/piix4: Make PIIX4's ACPI and USB functions optional hw/isa/piix4: Remove unused inbound ISA interrupt lines 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/piix3: Mergehw/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's base class with PIIX4
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Phil - over to you!
Thanks for the review Mark!
Quoted 1 line
Shall I respin? I could integrate my PCI series into this one in order to avoid the outdated MIPS patches while still delivering a working series. Yes/No?
If you don't mind, that is certainly easier for me :)
v6 is out! I've also rebased onto latest master which resolves some merge conflicts (PCI, building) for you. I hope you don't mind some minor cleanups that I've made to the PCI INTx series which aligns board code with my latest fuloong2e cleanup series.
Best regards,
Bernhard