[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/11] s390: Add mapping helper functions.
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 02/11] s390: Add mapping helper functions. |
Date: |
Thu, 24 Jan 2013 13:28:02 +0100 |
Add s390_cpu_physical_memory_{map,unmap} with special handling
for the lowcore.
Signed-off-by: Cornelia Huck <address@hidden>
---
v5 -> v6:
- Make lowcore/0 page handling easier to read
- Make len a pointer
---
target-s390x/cpu.h | 4 ++++
target-s390x/helper.c | 25 +++++++++++++++++++++++++
2 files changed, 29 insertions(+)
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 1f2d942..7951aab 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -302,6 +302,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 023c074..3109c77 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -490,6 +490,31 @@ static void cpu_unmap_lowcore(LowCore *lowcore)
cpu_physical_memory_unmap(lowcore, sizeof(LowCore), 1, sizeof(LowCore));
}
+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) {
+ /* Map the lowcore. */
+ start += env->psa;
+ *len = MIN(*len, 8192 - addr);
+ } else if ((addr >= env->psa) && (addr < env->psa + 8192)) {
+ /* Map the 0 page. */
+ start -= env->psa;
+ *len = MIN(*len, 8192 - start);
+ }
+
+ return cpu_physical_memory_map(start, len, is_write);
+}
+
+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 v6 00/11] s390: channel I/O support in qemu., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 02/11] s390: Add mapping helper functions.,
Cornelia Huck <=
- [Qemu-devel] [PATCH 03/11] s390: Channel I/O basic definitions., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 04/11] s390: I/O interrupt and machine check injection., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 01/11] s390: Lowcore mapping helper., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 09/11] s390-virtio: Factor out some initialization code., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 07/11] s390: Wire up channel I/O in kvm., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 11/11] s390: Add s390-ccw-virtio machine., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 10/11] s390: Add default support for SCLP console, Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 05/11] s390: Add channel I/O instructions., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 06/11] s390: Virtual channel subsystem support., Cornelia Huck, 2013/01/24
- [Qemu-devel] [PATCH 08/11] s390: Add new channel I/O based virtio transport., Cornelia Huck, 2013/01/24