Commit 5fb203a1 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Various changes for the s390x code:
- updates for cpu model handling
- fix compilation with --disable-tcg
- fixes in vfio-ccw and I/O instruction handling

# gpg: Signature made Tue 25 Jul 2017 10:15:37 BST
# 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>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170725:
  s390x/css: fix ilen in IO instruction handlers
  target/s390x: Add remaining switches to compile with --disable-tcg
  target/s390x: Move exception-related functions to a new excp_helper.c file
  target/s390x: Rework program_interrupt() and related functions
  target/s390x: Move diag helpers to a separate file
  target/s390x: Move s390_cpu_dump_state() to helper.c
  target/s390x: improve baselining if certain base features are missing
  s390x/kvm: better comment regarding zPCI feature availability
  target/s390x: introduce (test|set)_be_bit
  target/s390x: indicate query subfunction in s390_fill_feat_block
  target/s390x: drop BE_BIT()
  s390/cpumodel: remove KSS from the default model of z14
  vfio/ccw: fix initialization of the Object DeviceState pointer in the common base-device
  vfio/ccw: allocate irq info with the right size

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 08cf4b5e 7e01376d

hw/vfio/ccw.c

+2 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static void vfio_ccw_register_io_notifier(VFIOCCWDevice *vcdev, Error **errp) 
        return;

    }



    argsz = sizeof(*irq_set);

    argsz = sizeof(*irq_info);

    irq_info = g_malloc0(argsz);

    irq_info->index = VFIO_CCW_IO_IRQ_INDEX;

    irq_info->argsz = argsz;
@@ -338,6 +338,7 @@ static void vfio_ccw_realize(DeviceState *dev, Error **errp) 
    vcdev->vdev.type = VFIO_DEVICE_TYPE_CCW;

    vcdev->vdev.name = g_strdup_printf("%x.%x.%04x", cdev->hostid.cssid,

                                       cdev->hostid.ssid, cdev->hostid.devid);

    vcdev->vdev.dev = dev;

    QLIST_FOREACH(vbasedev, &group->device_list, next) {

        if (strcmp(vbasedev->name, vcdev->vdev.name) == 0) {

            error_setg(&err, "vfio: subchannel %s has already been attached",

target/s390x/Makefile.objs

+4 −4
Original line number Diff line number Diff line 
obj-y += translate.o helper.o cpu.o interrupt.o

obj-y += int_helper.o fpu_helper.o cc_helper.o mem_helper.o misc_helper.o

obj-y += gdbstub.o cpu_models.o cpu_features.o

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

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_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o

obj-$(CONFIG_KVM) += kvm.o



# build and run feature list generator

target/s390x/cpu.c

+4 −0
Original line number Diff line number Diff line
@@ -417,7 +417,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) 
    cc->reset = s390_cpu_full_reset;

    cc->class_by_name = s390_cpu_class_by_name,

    cc->has_work = s390_cpu_has_work;

#ifdef CONFIG_TCG

    cc->do_interrupt = s390_cpu_do_interrupt;

#endif

    cc->dump_state = s390_cpu_dump_state;

    cc->set_pc = s390_cpu_set_pc;

    cc->gdb_read_register = s390_cpu_gdb_read_register;
@@ -428,9 +430,11 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) 
    cc->get_phys_page_debug = s390_cpu_get_phys_page_debug;

    cc->vmsd = &vmstate_s390_cpu;

    cc->write_elf64_note = s390_cpu_write_elf64_note;

#ifdef CONFIG_TCG

    cc->cpu_exec_interrupt = s390_cpu_exec_interrupt;

    cc->debug_excp_handler = s390x_cpu_debug_excp_handler;

    cc->do_unaligned_access = s390x_cpu_do_unaligned_access;

#endif

#endif

    cc->disas_set_info = s390_cpu_disas_set_info;

target/s390x/cpu.h

+13 −4
Original line number Diff line number Diff line
@@ -474,10 +474,6 @@ static inline bool get_per_in_range(CPUS390XState *env, uint64_t addr) 
    }

}



#ifndef CONFIG_USER_ONLY

void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen);

#endif



S390CPU *cpu_s390x_init(const char *cpu_model);

S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp);

S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp);
@@ -805,6 +801,8 @@ static inline void setcc(S390CPU *cpu, uint64_t cc) 
    env->cc_op = cc;

}



#ifndef CONFIG_USER_ONLY



typedef struct LowCore

{

    /* prefix area: defined by architecture */
@@ -922,6 +920,11 @@ typedef struct LowCore 
    uint8_t         pad18[0x2000-0x1400];      /* 0x1400 */

} QEMU_PACKED LowCore;



LowCore *cpu_map_lowcore(CPUS390XState *env);

void cpu_unmap_lowcore(LowCore *lowcore);



#endif



/* STSI */

#define STSI_LEVEL_MASK         0x00000000f0000000ULL

#define STSI_LEVEL_CURRENT      0x0000000000000000ULL
@@ -1098,6 +1101,7 @@ struct sysib_322 { 
#define SIGP_ORDER_MASK 0x000000ff



void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);

uint64_t get_psw_mask(CPUS390XState *env);

target_ulong mmu_real2abs(CPUS390XState *env, target_ulong raddr);

int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc,

                  target_ulong *raddr, int *flags, bool exc);
@@ -1146,10 +1150,12 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3); 
/* automatically detect the instruction length */

#define ILEN_AUTO                   0xff

void program_interrupt(CPUS390XState *env, uint32_t code, int ilen);

void trigger_pgm_exception(CPUS390XState *env, uint32_t code, uint32_t ilen);

void QEMU_NORETURN runtime_exception(CPUS390XState *env, int excp,

                                     uintptr_t retaddr);



#ifdef CONFIG_KVM

void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code);

void kvm_s390_io_interrupt(uint16_t subchannel_id,

                           uint16_t subchannel_nr, uint32_t io_int_parm,

                           uint32_t io_int_word);
@@ -1170,6 +1176,9 @@ int kvm_s390_get_ri(void); 
int kvm_s390_get_gs(void);

void kvm_s390_crypto_reset(void);

#else

static inline void kvm_s390_program_interrupt(S390CPU *cpu, uint16_t code)

{

}

static inline void kvm_s390_io_interrupt(uint16_t subchannel_id,

                                        uint16_t subchannel_nr,

                                        uint32_t io_int_parm,

target/s390x/cpu_features.c

+27 −6
Original line number Diff line number Diff line
@@ -336,18 +336,39 @@ void s390_fill_feat_block(const S390FeatBitmap features, S390FeatType type, 
    S390Feat feat;

    int bit_nr;



    if (type == S390_FEAT_TYPE_STFL && test_bit(S390_FEAT_ZARCH, features)) {

    switch (type) {

    case S390_FEAT_TYPE_STFL:

        if (test_bit(S390_FEAT_ZARCH, features)) {

            /* Features that are always active */

        data[0] |= 0x20;  /* z/Architecture */

        data[17] |= 0x20; /* Configuration-z-architectural-mode */

            set_be_bit(2, data);   /* z/Architecture */

            set_be_bit(138, data); /* Configuration-z-architectural-mode */

        }

        break;

    case S390_FEAT_TYPE_PTFF:

    case S390_FEAT_TYPE_KMAC:

    case S390_FEAT_TYPE_KMC:

    case S390_FEAT_TYPE_KM:

    case S390_FEAT_TYPE_KIMD:

    case S390_FEAT_TYPE_KLMD:

    case S390_FEAT_TYPE_PCKMO:

    case S390_FEAT_TYPE_KMCTR:

    case S390_FEAT_TYPE_KMF:

    case S390_FEAT_TYPE_KMO:

    case S390_FEAT_TYPE_PCC:

    case S390_FEAT_TYPE_PPNO:

    case S390_FEAT_TYPE_KMA:

        set_be_bit(0, data); /* query is always available */

        break;

    default:

        break;

    };



    feat = find_first_bit(features, S390_FEAT_MAX);

    while (feat < S390_FEAT_MAX) {

        if (s390_features[feat].type == type) {

            bit_nr = s390_features[feat].bit;

            /* big endian on uint8_t array */

            data[bit_nr / 8] |= 0x80 >> (bit_nr % 8);

            set_be_bit(bit_nr, data);

        }

        feat = find_next_bit(features, S390_FEAT_MAX, feat + 1);

    }