[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 14/18] apci: switch piix4 gpe to memory api
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v2 14/18] apci: switch piix4 gpe to memory api |
Date: |
Tue, 27 Nov 2012 09:59:24 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi_piix4.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index b1d5bf3..c1a58d3 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -57,6 +57,7 @@ struct pci_status {
typedef struct PIIX4PMState {
PCIDevice dev;
MemoryRegion io;
+ MemoryRegion io_gpe;
ACPIREGS ar;
APMState apm;
@@ -500,7 +501,7 @@ static void piix4_pm_register_types(void)
type_init(piix4_pm_register_types)
-static uint32_t gpe_readb(void *opaque, uint32_t addr)
+static uint64_t gpe_readb(void *opaque, hwaddr addr, unsigned width)
{
PIIX4PMState *s = opaque;
uint32_t val = acpi_gpe_ioport_readb(&s->ar, addr);
@@ -509,7 +510,8 @@ static uint32_t gpe_readb(void *opaque, uint32_t addr)
return val;
}
-static void gpe_writeb(void *opaque, uint32_t addr, uint32_t val)
+static void gpe_writeb(void *opaque, hwaddr addr, uint64_t val,
+ unsigned width)
{
PIIX4PMState *s = opaque;
@@ -519,6 +521,16 @@ static void gpe_writeb(void *opaque, uint32_t addr,
uint32_t val)
PIIX4_DPRINTF("gpe write %x <== %d\n", addr, val);
}
+static const MemoryRegionOps piix4_gpe_ops = {
+ .read = gpe_readb,
+ .write = gpe_writeb,
+ .valid.min_access_size = 1,
+ .valid.max_access_size = 4,
+ .impl.min_access_size = 1,
+ .impl.max_access_size = 1,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
static uint32_t pci_up_read(void *opaque, uint32_t addr)
{
PIIX4PMState *s = opaque;
@@ -567,10 +579,10 @@ static int piix4_device_hotplug(DeviceState *qdev,
PCIDevice *dev,
static void piix4_acpi_system_hot_add_init(PCIBus *bus, PIIX4PMState *s)
{
-
- register_ioport_write(GPE_BASE, GPE_LEN, 1, gpe_writeb, s);
- register_ioport_read(GPE_BASE, GPE_LEN, 1, gpe_readb, s);
- acpi_gpe_blk(&s->ar, GPE_BASE);
+ memory_region_init_io(&s->io_gpe, &piix4_gpe_ops, s, "apci-gpe0",
+ GPE_LEN);
+ memory_region_add_subregion(get_system_io(), GPE_BASE, &s->io_gpe);
+ acpi_gpe_blk(&s->ar, 0);
register_ioport_read(PCI_UP_BASE, 4, 4, pci_up_read, s);
register_ioport_read(PCI_DOWN_BASE, 4, 4, pci_down_read, s);
--
1.7.1
- [Qemu-devel] [PATCH v2 00/18] acpi: switch to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 07/18] acpi: cleanup piix4 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 03/18] apci: switch vt82c686 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 02/18] apci: switch ich9 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 18/18] acpi: drop debug port, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 08/18] acpi: cleanup vt82c686 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 16/18] apci: switch piix4 pci hotplug to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 15/18] acpi: remove acpi_gpe_blk, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 14/18] apci: switch piix4 gpe to memory api,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v2 01/18] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 12/18] acpi: switch smbus to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 10/18] apci: switch ich9 smi to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 06/18] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 04/18] apci: switch timer to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 11/18] acpi: cleanup ich9 memory region, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 05/18] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 17/18] q35: update lpc pci config space according to configured devices, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 13/18] acpi: fix piix4 smbus mapping, Gerd Hoffmann, 2012/11/27
- [Qemu-devel] [PATCH v2 09/18] apci: switch ich9 gpe to memory api, Gerd Hoffmann, 2012/11/27