Commit 7705c750 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: add basic MSA features 



The STFLE bits for the MSA (extension) facilities simply indicate that
the respective instructions can be executed. The QUERY subfunction can then
be used to identify which features exactly are available.

Availability of subfunctions can also vary on real hardware. For now, we
simply implement a CPU model without any available subfunctions except
QUERY (which is always around).

As all MSA functions behave quite similarly, we can use one translation
handler for now. Prepare the code for implementation of actual subfunctions.

At least MSA is helpful for now, as older Linux kernels require this
facility when compiled for a z9 model. Allow to enable the facilities
for the qemu cpu model.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20170920153016.3858-4-david@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 7634d658

target/s390x/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
obj-y += cpu.o cpu_models.o cpu_features.o gdbstub.o interrupt.o helper.o

obj-$(CONFIG_TCG) += translate.o cc_helper.o excp_helper.o fpu_helper.o

obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o

obj-$(CONFIG_TCG) += int_helper.o mem_helper.o misc_helper.o crypto_helper.o

obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o

obj-$(CONFIG_KVM) += kvm.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o

target/s390x/cpu_models.c

+4 −0
Original line number Diff line number Diff line
@@ -825,6 +825,7 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm) 
        S390_FEAT_STFLE,

        S390_FEAT_EXTENDED_IMMEDIATE,

        S390_FEAT_EXTENDED_TRANSLATION_2,

        S390_FEAT_MSA,

        S390_FEAT_EXTENDED_TRANSLATION_3,

        S390_FEAT_LONG_DISPLACEMENT,

        S390_FEAT_LONG_DISPLACEMENT_FAST,
@@ -841,6 +842,9 @@ static void add_qemu_cpu_model_features(S390FeatBitmap fbm) 
        S390_FEAT_STFLE_49,

        S390_FEAT_LOCAL_TLB_CLEARING,

        S390_FEAT_STFLE_53,

        S390_FEAT_MSA_EXT_5,

        S390_FEAT_MSA_EXT_3,

        S390_FEAT_MSA_EXT_4,

    };

    int i;

target/s390x/crypto_helper.c

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

 *  s390x crypto helpers

 *

 *  Copyright (c) 2017 Red Hat Inc

 *

 *  Authors:

 *   David Hildenbrand <david@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "qemu/main-loop.h"

#include "internal.h"

#include "exec/helper-proto.h"

#include "exec/exec-all.h"

#include "exec/cpu_ldst.h"



uint32_t HELPER(msa)(CPUS390XState *env, uint32_t r1, uint32_t r2, uint32_t r3,

                     uint32_t type)

{

    const uintptr_t ra = GETPC();

    const uint8_t mod = env->regs[0] & 0x80ULL;

    const uint8_t fc = env->regs[0] & 0x7fULL;

    CPUState *cs = CPU(s390_env_get_cpu(env));

    uint8_t subfunc[16] = { 0 };

    uint64_t param_addr;

    int i;



    switch (type) {

    case S390_FEAT_TYPE_KMAC:

    case S390_FEAT_TYPE_KIMD:

    case S390_FEAT_TYPE_KLMD:

    case S390_FEAT_TYPE_PCKMO:

    case S390_FEAT_TYPE_PCC:

        if (mod) {

            cpu_restore_state(cs, ra);

            program_interrupt(env, PGM_SPECIFICATION, 4);

            return 0;

        }

        break;

    }



    s390_get_feat_block(type, subfunc);

    if (!test_be_bit(fc, subfunc)) {

        cpu_restore_state(cs, ra);

        program_interrupt(env, PGM_SPECIFICATION, 4);

        return 0;

    }



    switch (fc) {

    case 0: /* query subfunction */

        for (i = 0; i < 16; i++) {

            param_addr = wrap_address(env, env->regs[1] + i);

            cpu_stb_data_ra(env, param_addr, subfunc[i], ra);

        }

        break;

    default:

        /* we don't implement any other subfunction yet */

        g_assert_not_reached();

    }



    return 0;

}

target/s390x/helper.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ DEF_HELPER_4(cu21, i32, env, i32, i32, i32) 
DEF_HELPER_4(cu24, i32, env, i32, i32, i32)

DEF_HELPER_4(cu41, i32, env, i32, i32, i32)

DEF_HELPER_4(cu42, i32, env, i32, i32, i32)

DEF_HELPER_5(msa, i32, env, i32, i32, i32, i32)



#ifndef CONFIG_USER_ONLY

DEF_HELPER_3(servc, i32, env, i64, i64)

target/s390x/insn-data.def

+13 −0
Original line number Diff line number Diff line
@@ -941,6 +941,19 @@ 
/* UNPACK UNICODE */

    C(0xe200, UNPKU,   SS_a,  E2,  la1, a2, 0, 0, unpku, 0)



/* MSA Instructions */

    D(0xb91e, KMAC,    RRE,   MSA,  0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMAC)

    D(0xb928, PCKMO,   RRE,   MSA3, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PCKMO)

    D(0xb92a, KMF,     RRE,   MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMF)

    D(0xb92b, KMO,     RRE,   MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMO)

    D(0xb92c, PCC,     RRE,   MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PCC)

    D(0xb92d, KMCTR,   RRF_b, MSA4, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMCTR)

    D(0xb92e, KM,      RRE,   MSA,  0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KM)

    D(0xb92f, KMC,     RRE,   MSA,  0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KMC)

    D(0xb93c, PPNO,    RRE,   MSA5, 0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_PPNO)

    D(0xb93e, KIMD,    RRE,   MSA,  0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KIMD)

    D(0xb93f, KLMD,    RRE,   MSA,  0, 0, 0, 0, msa, 0, S390_FEAT_TYPE_KLMD)



#ifndef CONFIG_USER_ONLY

/* COMPARE AND SWAP AND PURGE */

    D(0xb250, CSP,     RRE,   Z,   r1_32u, ra2, r1_P, 0, csp, 0, MO_TEUL)