[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 08/12] hw/acpi/piix4: use qdev gpio to wire up sci_irq
From: |
Mark Cave-Ayland |
Subject: |
[PATCH 08/12] hw/acpi/piix4: use qdev gpio to wire up sci_irq |
Date: |
Sat, 28 May 2022 10:19:30 +0100 |
The sci_irq can now be wired up directly using a qdev gpio instead of having to
set the IRQ externally in piix4_pm_initfn().
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
hw/acpi/piix4.c | 4 +---
hw/i386/pc_piix.c | 4 ++--
hw/isa/piix4.c | 6 +++---
include/hw/southbridge/piix.h | 3 +--
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 454fa34df1..141852b7d4 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -506,8 +506,7 @@ static void piix4_pm_init(Object *obj)
}
PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base,
- qemu_irq sci_irq, qemu_irq smi_irq,
- int smm_enabled)
+ qemu_irq smi_irq, int smm_enabled)
{
PCIDevice *pci_dev;
DeviceState *dev;
@@ -519,7 +518,6 @@ PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn,
uint32_t smb_io_base,
qdev_prop_set_bit(dev, "smm-enabled", smm_enabled);
s = PIIX4_PM(dev);
- s->irq = sci_irq;
s->smi_irq = smi_irq;
pci_realize_and_unref(pci_dev, bus, &error_fatal);
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index ae21946981..21e6159166 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -285,9 +285,9 @@ static void pc_init1(MachineState *machine,
smi_irq = qemu_allocate_irq(pc_acpi_smi_interrupt, first_cpu, 0);
/* TODO: Populate SPD eeprom data. */
- piix4_pm = piix4_pm_initfn(pci_bus, piix3_devfn + 3, 0xb100,
- x86ms->gsi[9], smi_irq,
+ piix4_pm = piix4_pm_initfn(pci_bus, piix3_devfn + 3, 0xb100, smi_irq,
x86_machine_is_smm_enabled(x86ms));
+ qdev_connect_gpio_out(DEVICE(piix4_pm), 0, x86ms->gsi[9]);
pcms->smbus = I2C_BUS(qdev_get_child_bus(DEVICE(piix4_pm), "i2c"));
smbus_eeprom_init(pcms->smbus, 8, NULL, 0);
diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 33a7015ea3..0b6ea22143 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -311,9 +311,9 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus
**isa_bus, I2CBus **smbus)
pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci");
if (smbus) {
- pms = piix4_pm_initfn(pci_bus, devfn + 3, 0x1100,
- qdev_get_gpio_in_named(dev, "isa", 9),
- NULL, 0);
+ pms = piix4_pm_initfn(pci_bus, devfn + 3, 0x1100, NULL, 0);
+ qdev_connect_gpio_out(DEVICE(pms), 0,
+ qdev_get_gpio_in_named(dev, "isa", 9));
*smbus = I2C_BUS(qdev_get_child_bus(DEVICE(pms), "i2c"));
}
diff --git a/include/hw/southbridge/piix.h b/include/hw/southbridge/piix.h
index 479d88e242..aefdaebc3f 100644
--- a/include/hw/southbridge/piix.h
+++ b/include/hw/southbridge/piix.h
@@ -17,8 +17,7 @@
#include "hw/acpi/piix4.h"
PIIX4PMState *piix4_pm_initfn(PCIBus *bus, int devfn, uint32_t smb_io_base,
- qemu_irq sci_irq, qemu_irq smi_irq,
- int smm_enabled);
+ qemu_irq smi_irq, int smm_enabled);
/* PIRQRC[A:D]: PIRQx Route Control Registers */
#define PIIX_PIRQCA 0x60
--
2.20.1
- [PATCH 10/12] hw/i386/pc_piix: create PIIX4_PM device directly instead of using piix4_pm_initfn(), (continued)
- [PATCH 10/12] hw/i386/pc_piix: create PIIX4_PM device directly instead of using piix4_pm_initfn(), Mark Cave-Ayland, 2022/05/28
- [PATCH 12/12] hw/acpi/piix4: remove unused piix4_pm_initfn() function, Mark Cave-Ayland, 2022/05/28
- [PATCH 01/12] hw/acpi/piix4: move xen_enabled() logic from piix4_pm_init() to piix4_pm_realize(), Mark Cave-Ayland, 2022/05/28
- [PATCH 02/12] hw/acpi/piix4: change smm_enabled from int to bool, Mark Cave-Ayland, 2022/05/28
- [PATCH 03/12] hw/acpi/piix4: convert smm_enabled bool to qdev property, Mark Cave-Ayland, 2022/05/28
- [PATCH 11/12] hw/isa/piix4.c: create PIIX4_PM device directly instead of using piix4_pm_initfn(), Mark Cave-Ayland, 2022/05/28
- [PATCH 08/12] hw/acpi/piix4: use qdev gpio to wire up sci_irq,
Mark Cave-Ayland <=
- [PATCH 09/12] hw/acpi/piix4: use qdev gpio to wire up smi_irq, Mark Cave-Ayland, 2022/05/28
- [PATCH 07/12] hw/acpi/piix4: introduce piix4_pm_init() instance init function, Mark Cave-Ayland, 2022/05/28
- [PATCH 05/12] hw/acpi/piix4: alter piix4_pm_init() to return PIIX4PMState, Mark Cave-Ayland, 2022/05/28
- [PATCH 04/12] hw/acpi/piix4: move PIIX4PMState into separate piix4.h header, Mark Cave-Ayland, 2022/05/28