From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvqO2-00081A-VM for qemu-devel@nongnu.org; Thu, 17 Jan 2013 09:24:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvqNx-0007Ll-B2 for qemu-devel@nongnu.org; Thu, 17 Jan 2013 09:24:10 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:34251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvqNw-0007LD-UP for qemu-devel@nongnu.org; Thu, 17 Jan 2013 09:24:05 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 17 Jan 2013 14:22:52 -0000 Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0HENqi916908316 for ; Thu, 17 Jan 2013 14:23:52 GMT Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0HEO0uO017893 for ; Thu, 17 Jan 2013 07:24:00 -0700 From: Cornelia Huck Date: Thu, 17 Jan 2013 15:23:48 +0100 Message-Id: <1358432637-42512-4-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1358432637-42512-1-git-send-email-cornelia.huck@de.ibm.com> References: <1358432637-42512-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH 03/12] s390: Add mapping helper functions. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel , KVM , linux-s390 Cc: Carsten Otte , Anthony Liguori , Gleb Natapov , Sebastian Ott , Marcelo Tosatti , Heiko Carstens , Alexander Graf , Christian Borntraeger , Martin Schwidefsky Add s390_cpu_physical_memory_{map,unmap} with special handling for the lowcore. Signed-off-by: Cornelia Huck --- 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