[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/12] s390: Add mapping helper functions.
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 03/12] s390: Add mapping helper functions. |
Date: |
Thu, 17 Jan 2013 15:23:48 +0100 |
Add s390_cpu_physical_memory_{map,unmap} with special handling
for the lowcore.
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/cpu.h | 4 ++++
target-s390x/helper.c | 26 ++++++++++++++++++++++++++
2 files changed, 30 insertions(+)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 6700fe9..cd729d3 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -299,6 +299,10 @@ int cpu_s390x_handle_mmu_fault (CPUS390XState *env,
target_ulong address, int rw
#ifndef CONFIG_USER_ONLY
+void *s390_cpu_physical_memory_map(CPUS390XState *env, hwaddr addr, hwaddr len,
+ int is_write);
+void s390_cpu_physical_memory_unmap(CPUS390XState *env, void *addr, hwaddr len,
+ int is_write);
void s390x_tod_timer(void *opaque);
void s390x_cpu_timer(void *opaque);
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index bf2b4d3..d350f28 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -490,6 +490,32 @@ static void cpu_unmap_lowcore(LowCore *lowcore, hwaddr len)
cpu_physical_memory_unmap(lowcore, len, 1, len);
}
+void *s390_cpu_physical_memory_map(CPUS390XState *env, hwaddr addr, hwaddr len,
+ int is_write)
+{
+ hwaddr start = addr;
+
+ /* Mind the prefix area. */
+ if (addr < 8192) {
+ start += env->psa;
+ } else if ((env->psa <= addr) && (addr < env->psa + 8192)) {
+ start -= env->psa;
+ }
+
+ if ((addr + len <= env->psa) || (addr >= env->psa + 8192)) {
+ return cpu_physical_memory_map(start, &len, is_write);
+ }
+
+ DPRINTF("mapping across lowcore boundaries not yet supported\n");
+ return NULL;
+}
+
+void s390_cpu_physical_memory_unmap(CPUS390XState *env, void *addr, hwaddr len,
+ int is_write)
+{
+ cpu_physical_memory_unmap(addr, len, is_write, len);
+}
+
static void do_svc_interrupt(CPUS390XState *env)
{
uint64_t mask, addr;
--
1.7.12.4
- [Qemu-devel] [PATCH v5 00/12] s390: channel I/O support in qemu., Cornelia Huck, 2013/01/17
- [Qemu-devel] [PATCH 06/12] s390: I/O interrupt and machine check injection., Cornelia Huck, 2013/01/17
- [Qemu-devel] [PATCH 05/12] s390: Channel I/O basic defintions., Cornelia Huck, 2013/01/17
- [Qemu-devel] [PATCH 07/12] s390: Add channel I/O instructions., Cornelia Huck, 2013/01/17
- [Qemu-devel] [PATCH 12/12] s390: Add s390-ccw-virtio machine., Cornelia Huck, 2013/01/17