Commit 238e2d93 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180122' into staging 



Various fixes/improvements, and support for the new 81/82
facility bits.

# gpg: Signature made Mon 22 Jan 2018 11:54:46 GMT
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180122:
  s390x/kvm: provide stfle.81
  s390x/kvm: Handle bpb feature
  linux-headers: update
  s390x/tcg: fixup TEST PROTECTION
  s390x: fix storage attributes migration for non-small guests
  hw/s390x: Replace fprintf(stderr, "*\n" with qemu_log_mask()
  s390x/sclp: fix missing be conversion
  s390x/tcg: implement TEST PROTECTION
  s390x/sclp: fixup highest CPU address

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 52483b06 9f0d13f4

hw/s390x/s390-stattrib-kvm.c

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) 
        for (cx = 0; cx + len <= max; cx += len) {

            clog.start_gfn = cx;

            clog.count = len;

            clog.values = (uint64_t)(sas->incoming_buffer + cx * len);

            clog.values = (uint64_t)(sas->incoming_buffer + cx);

            r = kvm_vm_ioctl(kvm_state, KVM_S390_SET_CMMA_BITS, &clog);

            if (r) {

                error_report("KVM_S390_SET_CMMA_BITS failed: %s", strerror(-r));
@@ -126,7 +126,7 @@ static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) 
        if (cx < max) {

            clog.start_gfn = cx;

            clog.count = max - cx;

            clog.values = (uint64_t)(sas->incoming_buffer + cx * len);

            clog.values = (uint64_t)(sas->incoming_buffer + cx);

            r = kvm_vm_ioctl(kvm_state, KVM_S390_SET_CMMA_BITS, &clog);

            if (r) {

                error_report("KVM_S390_SET_CMMA_BITS failed: %s", strerror(-r));

hw/s390x/sclp.c

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) 
    prepare_cpu_entries(sclp, read_info->entries, &cpu_count);

    read_info->entries_cpu = cpu_to_be16(cpu_count);

    read_info->offset_cpu = cpu_to_be16(offsetof(ReadInfo, entries));

    read_info->highest_cpu = cpu_to_be16(max_cpus);

    read_info->highest_cpu = cpu_to_be16(max_cpus - 1);



    read_info->ibc_val = cpu_to_be32(s390_get_ibc_val());
@@ -233,7 +233,7 @@ static void assign_storage(SCLPDevice *sclp, SCCB *sccb) 
        sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND);

        return;

    }

    assign_addr = (assign_info->rn - 1) * mhd->rzm;

    assign_addr = (be16_to_cpu(assign_info->rn) - 1) * mhd->rzm;



    if ((assign_addr % MEM_SECTION_SIZE == 0) &&

        (assign_addr >= mhd->padded_ram_size)) {
@@ -292,7 +292,7 @@ static void unassign_storage(SCLPDevice *sclp, SCCB *sccb) 
        sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND);

        return;

    }

    unassign_addr = (assign_info->rn - 1) * mhd->rzm;

    unassign_addr = (be16_to_cpu(assign_info->rn) - 1) * mhd->rzm;



    /* if the addr is a multiple of 256 MB */

    if ((unassign_addr % MEM_SECTION_SIZE == 0) &&

hw/s390x/virtio-ccw.c

+3 −2
Original line number Diff line number Diff line
@@ -426,7 +426,8 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw) 
                 * passes us zeroes for those we don't support.

                 */

                if (features.features) {

                    fprintf(stderr, "Guest bug: features[%i]=%x (expected 0)\n",

                    qemu_log_mask(LOG_GUEST_ERROR,

                                  "Guest bug: features[%i]=%x (expected 0)",

                                  features.index, features.features);

                    /* XXX: do a unit check here? */

                }

include/standard-headers/asm-s390/virtio-ccw.h

+1 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */

/*

 * Definitions for virtio-ccw devices.

 *

 * Copyright IBM Corp. 2013

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License (version 2 only)

 * as published by the Free Software Foundation.

 *

 *  Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 */

#ifndef __KVM_VIRTIO_CCW_H

linux-headers/asm-powerpc/kvm.h

+25 −0
Original line number Diff line number Diff line
@@ -443,6 +443,31 @@ struct kvm_ppc_rmmu_info { 
	__u32	ap_encodings[8];

};



/* For KVM_PPC_GET_CPU_CHAR */

struct kvm_ppc_cpu_char {

	__u64	character;		/* characteristics of the CPU */

	__u64	behaviour;		/* recommended software behaviour */

	__u64	character_mask;		/* valid bits in character */

	__u64	behaviour_mask;		/* valid bits in behaviour */

};



/*

 * Values for character and character_mask.

 * These are identical to the values used by H_GET_CPU_CHARACTERISTICS.

 */

#define KVM_PPC_CPU_CHAR_SPEC_BAR_ORI31		(1ULL << 63)

#define KVM_PPC_CPU_CHAR_BCCTRL_SERIALISED	(1ULL << 62)

#define KVM_PPC_CPU_CHAR_L1D_FLUSH_ORI30	(1ULL << 61)

#define KVM_PPC_CPU_CHAR_L1D_FLUSH_TRIG2	(1ULL << 60)

#define KVM_PPC_CPU_CHAR_L1D_THREAD_PRIV	(1ULL << 59)

#define KVM_PPC_CPU_CHAR_BR_HINT_HONOURED	(1ULL << 58)

#define KVM_PPC_CPU_CHAR_MTTRIG_THR_RECONF	(1ULL << 57)

#define KVM_PPC_CPU_CHAR_COUNT_CACHE_DIS	(1ULL << 56)



#define KVM_PPC_CPU_BEHAV_FAVOUR_SECURITY	(1ULL << 63)

#define KVM_PPC_CPU_BEHAV_L1D_FLUSH_PR		(1ULL << 62)

#define KVM_PPC_CPU_BEHAV_BNDS_CHK_SPEC_BAR	(1ULL << 61)



/* Per-vcpu XICS interrupt controller state */

#define KVM_REG_PPC_ICP_STATE	(KVM_REG_PPC | KVM_REG_SIZE_U64 | 0x8c)