[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/23] memory: I/O address space support
From: |
Avi Kivity |
Subject: |
[Qemu-devel] [PATCH v2 09/23] memory: I/O address space support |
Date: |
Tue, 26 Jul 2011 14:26:08 +0300 |
Allow registering I/O ports via the same mechanism as mmio ranges.
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Avi Kivity <address@hidden>
---
exec-memory.h | 3 ++
memory.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
memory.h | 2 +
3 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/exec-memory.h b/exec-memory.h
index aea1b45..c439aba 100644
--- a/exec-memory.h
+++ b/exec-memory.h
@@ -31,6 +31,9 @@ MemoryRegion *get_system_memory(void);
/* Set the root memory region. This region is the system memory map. */
void set_system_memory_map(MemoryRegion *mr);
+/* Set the I/O memory region. This region is the I/O memory map. */
+void set_system_io_map(MemoryRegion *mr);
+
#endif
#endif
diff --git a/memory.c b/memory.c
index e839c9e..df0ed0e 100644
--- a/memory.c
+++ b/memory.c
@@ -13,6 +13,7 @@
#include "memory.h"
#include "exec-memory.h"
+#include "ioport.h"
#include <assert.h>
typedef struct AddrRange AddrRange;
@@ -217,6 +218,52 @@ static AddressSpace address_space_memory = {
.ops = &address_space_ops_memory,
};
+static void memory_region_iorange_read(IORange *iorange,
+ uint64_t offset,
+ unsigned width,
+ uint64_t *data)
+{
+ MemoryRegion *mr = container_of(iorange, MemoryRegion, iorange);
+
+ *data = mr->ops->read(mr->opaque, offset, width);
+}
+
+static void memory_region_iorange_write(IORange *iorange,
+ uint64_t offset,
+ unsigned width,
+ uint64_t data)
+{
+ MemoryRegion *mr = container_of(iorange, MemoryRegion, iorange);
+
+ mr->ops->write(mr->opaque, offset, data, width);
+}
+
+static const IORangeOps memory_region_iorange_ops = {
+ .read = memory_region_iorange_read,
+ .write = memory_region_iorange_write,
+};
+
+static void as_io_range_add(AddressSpace *as, FlatRange *fr)
+{
+ iorange_init(&fr->mr->iorange, &memory_region_iorange_ops,
+ fr->addr.start,fr->addr.size);
+ ioport_register(&fr->mr->iorange);
+}
+
+static void as_io_range_del(AddressSpace *as, FlatRange *fr)
+{
+ isa_unassign_ioport(fr->addr.start, fr->addr.size);
+}
+
+static const AddressSpaceOps address_space_ops_io = {
+ .range_add = as_io_range_add,
+ .range_del = as_io_range_del,
+};
+
+static AddressSpace address_space_io = {
+ .ops = &address_space_ops_io,
+};
+
/* Render a memory region into the global view. Ranges in @view obscure
* ranges in @mr.
*/
@@ -365,7 +412,12 @@ static void address_space_update_topology(AddressSpace *as)
static void memory_region_update_topology(void)
{
- address_space_update_topology(&address_space_memory);
+ if (address_space_memory.root) {
+ address_space_update_topology(&address_space_memory);
+ }
+ if (address_space_io.root) {
+ address_space_update_topology(&address_space_io);
+ }
}
void memory_region_init(MemoryRegion *mr,
@@ -777,3 +829,9 @@ void set_system_memory_map(MemoryRegion *mr)
address_space_memory.root = mr;
memory_region_update_topology();
}
+
+void set_system_io_map(MemoryRegion *mr)
+{
+ address_space_io.root = mr;
+ memory_region_update_topology();
+}
diff --git a/memory.h b/memory.h
index c481038..88ba428 100644
--- a/memory.h
+++ b/memory.h
@@ -22,6 +22,7 @@
#include "cpu-common.h"
#include "targphys.h"
#include "qemu-queue.h"
+#include "iorange.h"
typedef struct MemoryRegionOps MemoryRegionOps;
typedef struct MemoryRegion MemoryRegion;
@@ -91,6 +92,7 @@ struct MemoryRegion {
target_phys_addr_t offset;
bool backend_registered;
ram_addr_t ram_addr;
+ IORange iorange;
bool terminates;
MemoryRegion *alias;
target_phys_addr_t alias_offset;
--
1.7.5.3
- Re: [Qemu-devel] [PATCH v2 04/23] memory: merge adjacent segments of a single memory region, (continued)
[Qemu-devel] [PATCH v2 03/23] memory: implement dirty tracking, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 10/23] memory: add backward compatibility for old portio registration, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 17/23] pc: grab system_memory, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 08/23] memory: late initialization of ram_addr, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 11/23] memory: add backward compatibility for old mmio registration, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 13/23] memory: separate building the final memory map into two steps, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 06/23] memory: abstract address space operations, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 14/23] memory: transaction API, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 09/23] memory: I/O address space support,
Avi Kivity <=
[Qemu-devel] [PATCH v2 15/23] exec.c: initialize memory map, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 05/23] Internal interfaces for memory API, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 19/23] pc: move global memory map out of pc_init1() and into its callers, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 02/23] Hierarchical memory region API, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 07/23] memory: rename MemoryRegion::has_ram_addr to ::terminates, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 22/23] sysbus: add MemoryRegion based memory management API, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 18/23] pc: convert pc_memory_init() to memory API, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 23/23] usb-ohci: convert to MemoryRegion, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 20/23] pci: pass address space to pci bus when created, Avi Kivity, 2011/07/26
[Qemu-devel] [PATCH v2 16/23] ioport: register ranges by byte aligned addresses always, Avi Kivity, 2011/07/26