[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/20] apci: switch ich9 to memory api
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 02/20] apci: switch ich9 to memory api |
Date: |
Fri, 23 Nov 2012 16:48:13 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi_ich9.c | 33 +++++++++++++++++++++++----------
hw/acpi_ich9.h | 1 +
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/hw/acpi_ich9.c b/hw/acpi_ich9.c
index 61034d3..e03b1a6 100644
--- a/hw/acpi_ich9.c
+++ b/hw/acpi_ich9.c
@@ -29,6 +29,7 @@
#include "sysemu.h"
#include "acpi.h"
#include "kvm.h"
+#include "exec-memory.h"
#include "ich9.h"
@@ -217,14 +218,31 @@ static uint32_t pm_ioport_read_fallback(void *opaque,
uint32_t addr, int len)
return val;
}
+static const MemoryRegionOps pm_io_ops = {
+ .old_portio = (MemoryRegionPortio[]) {
+ { .offset = 0, .len = ICH9_PMIO_SIZE, .size = 1,
+ .read = pm_ioport_readb, .write = pm_ioport_writeb },
+ { .offset = 0, .len = ICH9_PMIO_SIZE, .size = 2,
+ .read = pm_ioport_readw, .write = pm_ioport_writew },
+ { .offset = 0, .len = ICH9_PMIO_SIZE, .size = 4,
+ .read = pm_ioport_readl, .write = pm_ioport_writel },
+ PORTIO_END_OF_LIST(),
+ },
+ .valid.min_access_size = 1,
+ .valid.max_access_size = 4,
+ .impl.min_access_size = 1,
+ .impl.max_access_size = 4,
+ .endianness = DEVICE_LITTLE_ENDIAN,
+};
+
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base)
{
ICH9_DEBUG("to 0x%x\n", pm_io_base);
assert((pm_io_base & ICH9_PMIO_MASK) == 0);
- if (pm->pm_io_base != 0) {
- isa_unassign_ioport(pm->pm_io_base, ICH9_PMIO_SIZE);
+ if (pm->io.parent) {
+ memory_region_del_subregion(get_system_io(), &pm->io);
}
/* don't map at 0 */
@@ -232,15 +250,8 @@ void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t
pm_io_base)
return;
}
- register_ioport_write(pm_io_base, ICH9_PMIO_SIZE, 1, pm_ioport_writeb, pm);
- register_ioport_read(pm_io_base, ICH9_PMIO_SIZE, 1, pm_ioport_readb, pm);
- register_ioport_write(pm_io_base, ICH9_PMIO_SIZE, 2, pm_ioport_writew, pm);
- register_ioport_read(pm_io_base, ICH9_PMIO_SIZE, 2, pm_ioport_readw, pm);
- register_ioport_write(pm_io_base, ICH9_PMIO_SIZE, 4, pm_ioport_writel, pm);
- register_ioport_read(pm_io_base, ICH9_PMIO_SIZE, 4, pm_ioport_readl, pm);
-
+ memory_region_add_subregion(get_system_io(), pm_io_base, &pm->io);
pm->pm_io_base = pm_io_base;
- acpi_gpe_blk(&pm->acpi_regs, pm_io_base + ICH9_PMIO_GPE0_STS);
}
static int ich9_pm_post_load(void *opaque, int version_id)
@@ -311,9 +322,11 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
void ich9_pm_init(ICH9LPCPMRegs *pm, qemu_irq sci_irq, qemu_irq cmos_s3)
{
+ memory_region_init_io(&pm->io, &pm_io_ops, pm, "ich9-pm", ICH9_PMIO_SIZE);
acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn);
acpi_pm1_cnt_init(&pm->acpi_regs);
acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN);
+ acpi_gpe_blk(&pm->acpi_regs, ICH9_PMIO_GPE0_STS);
pm->irq = sci_irq;
qemu_register_reset(pm_reset, pm);
diff --git a/hw/acpi_ich9.h b/hw/acpi_ich9.h
index 180c406..0a2ee6c 100644
--- a/hw/acpi_ich9.h
+++ b/hw/acpi_ich9.h
@@ -30,6 +30,7 @@ typedef struct ICH9LPCPMRegs {
* PM1a_CNT_BLK = 2 in FADT so it is defined as uint16_t.
*/
ACPIREGS acpi_regs;
+ MemoryRegion io;
uint32_t smi_en;
uint32_t smi_sts;
--
1.7.1
- [Qemu-devel] [PATCH 00/20] acpi: switch to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 02/20] apci: switch ich9 to memory api,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 05/20] apci: switch timer to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 03/20] apci: switch vt82c686 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 17/20] apci: switch piix4 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 07/20] apci: switch cnt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 12/20] apci: switch ich9 gpe to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 08/20] apci: switch evt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 01/20] apci: switch piix4 to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 16/20] acpi: fix piix4 smbus mapping, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 06/20] apci: switch cnt to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 18/20] acpi: remove acpi_gpe_blk, Gerd Hoffmann, 2012/11/23