Commit 7223bcce authored by Jason J. Herne's avatar Jason J. Herne Committed by Christian Borntraeger
Browse files

s390x/cpumodel: add esop/esop2 to z12 model 



Add esop and esop2 features to z12 model where esop2 was originally
introduced. Disable esop and esop2 when using compatibility machine
v2.9 or earlier.

Signed-off-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 075e52b8

hw/s390x/s390-virtio-ccw.c

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "hw/s390x/s390-virtio-ccw.h"

#include "hw/s390x/css-bridge.h"

#include "migration/register.h"

#include "cpu_models.h"



static const char *const reset_dev_types[] = {

    TYPE_VIRTUAL_CSS_BRIDGE,
@@ -503,6 +504,8 @@ 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_ESOP);

    s390_cpudef_featoff_greater(12, 1, S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2);

    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);

target/s390x/gen-features.c

+3 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ static uint16_t full_GEN12_GA1[] = { 
    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,

    S390_FEAT_ADAPTER_INT_SUPPRESSION,

    S390_FEAT_EDAT_2,

    S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,

};



static uint16_t full_GEN12_GA2[] = {
@@ -488,6 +489,8 @@ static uint16_t default_GEN12_GA1[] = { 
    S390_FEAT_ZPCI,

    S390_FEAT_ADAPTER_EVENT_NOTIFICATION,

    S390_FEAT_EDAT_2,

    S390_FEAT_ESOP,

    S390_FEAT_SIDE_EFFECT_ACCESS_ESOP2,

};



#define default_GEN12_GA2 EmptyFeat