Commit 38322ed6 authored by Cornelia Huck's avatar Cornelia Huck Committed by Alexander Graf
Browse files

s390: Add mapping helper functions. 



Add s390_cpu_physical_memory_{map,unmap} with special handling
for the lowcore.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent 4782a23b

target-s390x/cpu.h

+4 −0
Original line number Diff line number Diff line
@@ -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);

target-s390x/helper.c

+25 −0
Original line number Diff line number Diff line
@@ -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;