Commit 3b00f702 authored by Yi Min Zhao's avatar Yi Min Zhao Committed by Christian Borntraeger
Browse files

s390x/cpumodel: add zpci, aen and ais facilities 



zPCI instructions and facilities are available since IBM zEnterprise
EC12. To support z/PCI in QEMU we enable zpci, aen and ais facilities
starting with zEC12 GA1. And we always set zpci and aen bits in max cpu
model. Later they might be switched off due to applied real cpu model.
For ais bit, we only provide it in the full cpu model beginning with
zEC12 and defer its enablement in the default cpu model to a later point
in time. At the same time, disable them for 2.9 and older machines.

Because of introducing AIS facility, we could check if it's enabled to
initialize flic->ais_supported with the real value.

Signed-off-by: default avatarYi Min Zhao <zyimin@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 3720d335

hw/intc/s390_flic.c

+2 −1
Original line number Diff line number Diff line
@@ -163,9 +163,10 @@ static void s390_flic_common_realize(DeviceState *dev, Error **errp) 
    if (max_batch > ADAPTER_ROUTES_MAX_GSI) {

        error_setg(errp, "flic property adapter_routes_max_batch too big"

                   " (%d > %d)", max_batch, ADAPTER_ROUTES_MAX_GSI);

        return;

    }



    fs->ais_supported = true;

    fs->ais_supported = s390_has_feat(S390_FEAT_ADAPTER_INT_SUPPRESSION);

}



static void s390_flic_class_init(ObjectClass *oc, void *data)

hw/intc/s390_flic_kvm.c

+0 −3
Original line number Diff line number Diff line
@@ -444,7 +444,6 @@ typedef struct KVMS390FLICStateClass { 


static void kvm_s390_flic_realize(DeviceState *dev, Error **errp)

{

    S390FLICState *fs = S390_FLIC_COMMON(dev);

    KVMS390FLICState *flic_state = KVM_S390_FLIC(dev);

    struct kvm_create_device cd = {0};

    struct kvm_device_attr test_attr = {0};
@@ -476,8 +475,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp) 
    test_attr.group = KVM_DEV_FLIC_CLEAR_IO_IRQ;

    flic_state->clear_io_supported = !ioctl(flic_state->fd,

                                            KVM_HAS_DEVICE_ATTR, test_attr);



    fs->ais_supported = false;

    return;

fail:

    error_propagate(errp, errp_local);

hw/s390x/s390-virtio-ccw.c

+3 −0
Original line number Diff line number Diff line
@@ -503,6 +503,9 @@ DEFINE_CCW_MACHINE(2_10, "2.10", true); 
static void ccw_machine_2_9_instance_options(MachineState *machine)

{

    ccw_machine_2_10_instance_options(machine);

    s390_cpudef_featoff_greater(12, 1, S390_FEAT_ZPCI);

    s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_INT_SUPPRESSION);

    s390_cpudef_featoff_greater(12, 1, S390_FEAT_ADAPTER_EVENT_NOTIFICATION);

}



static void ccw_machine_2_9_class_options(MachineClass *mc)

target/s390x/cpu_features.c

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ static const S390FeatDef s390_features[] = { 
    FEAT_INIT("stfle53", S390_FEAT_TYPE_STFL, 53, "Various facilities introduced with z13"),

    FEAT_INIT("msa5-base", S390_FEAT_TYPE_STFL, 57, "Message-security-assist-extension-5 facility (excluding subfunctions)"),

    FEAT_INIT("ri", S390_FEAT_TYPE_STFL, 64, "CPU runtime-instrumentation facility"),

    FEAT_INIT("zpci", S390_FEAT_TYPE_STFL, 69, "z/PCI facility"),

    FEAT_INIT("aen", S390_FEAT_TYPE_STFL, 71, "General-purpose-adapter-event-notification facility"),

    FEAT_INIT("ais", S390_FEAT_TYPE_STFL, 72, "General-purpose-adapter-interruption-suppression facility"),

    FEAT_INIT("te", S390_FEAT_TYPE_STFL, 73, "Transactional-execution facility"),

    FEAT_INIT("sthyi", S390_FEAT_TYPE_STFL, 74, "Store-hypervisor-information facility"),

    FEAT_INIT("aefsi", S390_FEAT_TYPE_STFL, 75, "Access-exception-fetch/store-indication facility"),

target/s390x/cpu_features_def.h

+3 −0
Original line number Diff line number Diff line
@@ -65,6 +65,9 @@ typedef enum { 
    S390_FEAT_STFLE_53,

    S390_FEAT_MSA_EXT_5,

    S390_FEAT_RUNTIME_INSTRUMENTATION,

    S390_FEAT_ZPCI,

    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,

    S390_FEAT_ADAPTER_INT_SUPPRESSION,

    S390_FEAT_TRANSACTIONAL_EXE,

    S390_FEAT_STORE_HYPERVISOR_INFO,

    S390_FEAT_ACCESS_EXCEPTION_FS_INDICATION,