@@ -29,6 +29,7 @@
#include "exec/ioport.h"
#include "hw/nvram/fw_cfg.h"
#include "exec/address-spaces.h"
+#include "hw/acpi/piix4.h"
//#define DEBUG
@@ -63,7 +64,7 @@ typedef struct CPUStatus {
uint8_t sts[PIIX4_PROC_LEN];
} CPUStatus;
-typedef struct PIIX4PMState {
+struct PIIX4PMState {
/*< private >*/
PCIDevice parent_obj;
/*< public >*/
@@ -96,7 +97,7 @@ typedef struct PIIX4PMState {
CPUStatus gpe_cpu;
Notifier cpu_added_notifier;
-} PIIX4PMState;
+};
#define TYPE_PIIX4_PM "PIIX4_PM"
@@ -458,6 +459,30 @@ static int piix4_pm_initfn(PCIDevice *dev)
return 0;
}
+PIIX4PMState *piix4_pm_find(void)
+{
+ bool ambig;
+ Object *o = object_resolve_path_type("", "PIIX4_PM", &ambig);
+
+ if (ambig || !o) {
+ return NULL;
+ }
+ return OBJECT_CHECK(PIIX4PMState, o, "PIIX4_PM");
+}
+
+void piix4_pm_get_acpi_pm_info(PIIX4PMState *s, AcpiPmInfo *info)
+{
+ info->s3_disabled = s->disable_s3;
+ info->s4_disabled = s->disable_s4;
+ info->s4_val = s->s4_val;
+
+ info->acpi_enable_cmd = ACPI_ENABLE;
+ info->acpi_disable_cmd = ACPI_DISABLE;
+ info->gpe0_blk = GPE_BASE;
+ info->gpe0_blk_len = GPE_LEN;
+ info->sci_int = 9;
+}
+
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
qemu_irq sci_irq, qemu_irq smi_irq,
int kvm_enabled, FWCfgState *fw_cfg)
@@ -965,7 +965,7 @@ void mips_malta_init(QEMUMachineInitArgs *args)
pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1);
pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci");
smbus = piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100,
- isa_get_irq(NULL, 9), NULL, 0, NULL);
+ isa_get_irq(NULL, 9), NULL, 0, NULL, NULL);
/* TODO: Populate SPD eeprom data. */
smbus_eeprom_init(smbus, 8, NULL, 0);
pit = pit_init(isa_bus, 0x40, 0, NULL);
@@ -349,6 +349,14 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix3_devfn,
return b;
}
+PCIBus *find_i440fx(void)
+{
+ PCIHostState *s = OBJECT_CHECK(PCIHostState,
+ object_resolve_path("/machine/i440fx", NULL),
+ TYPE_PCI_HOST_BRIDGE);
+ return s ? s->bus : NULL;
+}
+
/* PIIX3 PCI to ISA bridge */
static void piix3_set_irq_pic(PIIX3State *piix3, int pic_irq)
{
@@ -186,6 +186,7 @@ PCIBus *i440fx_init(PCII440FXState **pi440fx_state, int *piix_devfn,
MemoryRegion *pci_memory,
MemoryRegion *ram_memory);
+PCIBus *find_i440fx(void);
/* piix4.c */
extern PCIDevice *piix4_dev;
int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn);
@@ -65,6 +65,7 @@ typedef struct QEMUSGList QEMUSGList;
typedef struct SHPCDevice SHPCDevice;
typedef struct FWCfgState FWCfgState;
typedef struct PcGuestInfo PcGuestInfo;
+typedef struct PIIX4PMState PIIX4PMState;
typedef struct AcpiPmInfo AcpiPmInfo;
#endif /* QEMU_TYPEDEFS_H */
This adds APIs that will be used to fill in guest info table, implemented using QOM, to various piix components. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> --- hw/acpi/piix4.c | 29 +++++++++++++++++++++++++++-- hw/mips/mips_malta.c | 2 +- hw/pci-host/piix.c | 8 ++++++++ include/hw/i386/pc.h | 1 + include/qemu/typedefs.h | 1 + 5 files changed, 38 insertions(+), 3 deletions(-)