[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/20] apci: switch piix4 to memory api
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 01/20] apci: switch piix4 to memory api |
Date: |
Fri, 23 Nov 2012 16:48:12 +0100 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/acpi_piix4.c | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/hw/acpi_piix4.c b/hw/acpi_piix4.c
index 519269a..086f230 100644
--- a/hw/acpi_piix4.c
+++ b/hw/acpi_piix4.c
@@ -28,6 +28,7 @@
#include "range.h"
#include "ioport.h"
#include "fw_cfg.h"
+#include "exec-memory.h"
//#define DEBUG
@@ -55,7 +56,7 @@ struct pci_status {
typedef struct PIIX4PMState {
PCIDevice dev;
- IORange ioport;
+ MemoryRegion io;
ACPIREGS ar;
APMState apm;
@@ -109,10 +110,10 @@ static void pm_tmr_timer(ACPIREGS *ar)
pm_update_sci(s);
}
-static void pm_ioport_write(IORange *ioport, uint64_t addr, unsigned width,
- uint64_t val)
+static void pm_ioport_write(void *opaque, hwaddr addr, uint64_t val,
+ unsigned width)
{
- PIIX4PMState *s = container_of(ioport, PIIX4PMState, ioport);
+ PIIX4PMState *s = opaque;
if (width != 2) {
PIIX4_DPRINTF("PM write port=0x%04x width=%d val=0x%08x\n",
@@ -138,10 +139,9 @@ static void pm_ioport_write(IORange *ioport, uint64_t
addr, unsigned width,
(unsigned int)val);
}
-static void pm_ioport_read(IORange *ioport, uint64_t addr, unsigned width,
- uint64_t *data)
+static uint64_t pm_ioport_read(void *opaque, hwaddr addr, unsigned width)
{
- PIIX4PMState *s = container_of(ioport, PIIX4PMState, ioport);
+ PIIX4PMState *s = opaque;
uint32_t val;
switch(addr) {
@@ -162,12 +162,17 @@ static void pm_ioport_read(IORange *ioport, uint64_t
addr, unsigned width,
break;
}
PIIX4_DPRINTF("PM readw port=0x%04x val=0x%04x\n", (unsigned int)addr,
val);
- *data = val;
+ return val;
}
-static const IORangeOps pm_iorange_ops = {
+static const MemoryRegionOps pm_io_ops = {
.read = pm_ioport_read,
.write = pm_ioport_write,
+ .valid.min_access_size = 1,
+ .valid.max_access_size = 4,
+ .impl.min_access_size = 1,
+ .impl.max_access_size = 4,
+ .endianness = DEVICE_LITTLE_ENDIAN,
};
static void apm_ctrl_changed(uint32_t val, void *arg)
@@ -193,14 +198,16 @@ static void pm_io_space_update(PIIX4PMState *s)
{
uint32_t pm_io_base;
+ if (s->io.parent) {
+ memory_region_del_subregion(get_system_io(), &s->io);
+ }
if (s->dev.config[0x80] & 1) {
pm_io_base = le32_to_cpu(*(uint32_t *)(s->dev.config + 0x40));
pm_io_base &= 0xffc0;
/* XXX: need to improve memory and ioport allocation */
PIIX4_DPRINTF("PM: mapping to 0x%x\n", pm_io_base);
- iorange_init(&s->ioport, &pm_iorange_ops, pm_io_base, 64);
- ioport_register(&s->ioport);
+ memory_region_add_subregion(get_system_io(), pm_io_base, &s->io);
}
}
@@ -456,6 +463,7 @@ static int piix4_pm_initfn(PCIDevice *dev)
register_ioport_write(s->smb_io_base, 64, 1, smb_ioport_writeb, &s->smb);
register_ioport_read(s->smb_io_base, 64, 1, smb_ioport_readb, &s->smb);
+ memory_region_init_io(&s->io, &pm_io_ops, s, "piix4-pm", 64);
acpi_pm_tmr_init(&s->ar, pm_tmr_timer);
acpi_gpe_init(&s->ar, GPE_LEN);
--
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, 2012/11/23
- [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 <=
- [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
- [Qemu-devel] [PATCH 20/20] q35: update lpc pci config space according to configured devices, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 11/20] acpi: cleanup vt82c686 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 09/20] apci: switch evt to memory api [ich9], Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 14/20] acpi: cleanup ich9 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 10/20] acpi: cleanup piix4 memory region, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 04/20] apci: switch timer to memory api, Gerd Hoffmann, 2012/11/23
- [Qemu-devel] [PATCH 15/20] acpi: switch smbus to memory api, Gerd Hoffmann, 2012/11/23