On 6/12/19 3:25 PM, David Hildenbrand wrote: > Let's handle it just like for other crypto features.
Reviewed-by: Janosch Frank <fran...@linux.ibm.com> > > Signed-off-by: David Hildenbrand <da...@redhat.com> > --- > target/s390x/cpu_features_def.inc.h | 30 ++++++++++++++--------------- > target/s390x/gen-features.c | 30 ++++++++++++++--------------- > 2 files changed, 30 insertions(+), 30 deletions(-) > > diff --git a/target/s390x/cpu_features_def.inc.h > b/target/s390x/cpu_features_def.inc.h > index 5dffff65fa..c20c780f2e 100644 > --- a/target/s390x/cpu_features_def.inc.h > +++ b/target/s390x/cpu_features_def.inc.h > @@ -339,21 +339,21 @@ DEF_FEAT(KMA_GCM_EAES_192, "kma-gcm-eaes-192", KMA, 27, > "KMA GCM-Encrypted-AES-1 > DEF_FEAT(KMA_GCM_EAES_256, "kma-gcm-eaes-256", KMA, 28, "KMA > GCM-Encrypted-AES-256") > > /* Features exposed via the KDSA instruction. */ > -DEF_FEAT(ECDSA_VERIFY_P256, "kdsa-ecdsa-verify-p256", KDSA, 1, "KDSA > ECDSA-Verify-P256") > -DEF_FEAT(ECDSA_VERIFY_P384, "kdsa-ecdsa-verify-p384", KDSA, 2, "KDSA > ECDSA-Verify-P384") > -DEF_FEAT(ECDSA_VERIFY_P512, "kdsa-ecdsa-verify-p521", KDSA, 3, "KDSA > ECDSA-Verify-P521") > -DEF_FEAT(ECDSA_SIGN_P256, "kdsa-ecdsa-sign-p256", KDSA, 9, "KDSA > ECDSA-Sign-P256") > -DEF_FEAT(ECDSA_SIGN_P384, "kdsa-ecdsa-sign-p384", KDSA, 10, "KDSA > ECDSA-Sign-P384") > -DEF_FEAT(ECDSA_SIGN_P512, "kdsa-ecdsa-sign-p521", KDSA, 11, "KDSA > ECDSA-Sign-P521") > -DEF_FEAT(EECDSA_SIGN_P256, "kdsa-eecdsa-sign-p256", KDSA, 17, "KDSA > Encrypted-ECDSA-Sign-P256") > -DEF_FEAT(EECDSA_SIGN_P384, "kdsa-eecdsa-sign-p384", KDSA, 18, "KDSA > Encrypted-ECDSA-Sign-P384") > -DEF_FEAT(EECDSA_SIGN_P512, "kdsa-eecdsa-sign-p521", KDSA, 19, "KDSA > Encrypted-ECDSA-Sign-P521") > -DEF_FEAT(EDDSA_VERIFY_ED25519, "kdsa-eddsa-verify-ed25519", KDSA, 32, "KDSA > EdDSA-Verify-Ed25519") > -DEF_FEAT(EDDSA_VERIFY_ED448, "kdsa-eddsa-verify-ed448", KDSA, 36, "KDSA > EdDSA-Verify-Ed448") > -DEF_FEAT(EDDSA_SIGN_ED25519, "kdsa-eddsa-sign-ed25519", KDSA, 40, "KDSA > EdDSA-Sign-Ed25519") > -DEF_FEAT(EDDSA_SIGN_ED448, "kdsa-eddsa-sign-ed448", KDSA, 44, "KDSA > EdDSA-Sign-Ed448") > -DEF_FEAT(EEDDSA_SIGN_ED25519, "kdsa-eeddsa-sign-ed25519", KDSA, 48, "KDSA > Encrypted-EdDSA-Sign-Ed25519") > -DEF_FEAT(EEDDSA_SIGN_ED448, "kdsa-eeddsa-sign-ed448", KDSA, 52, "KDSA > Encrypted-EdDSA-Sign-Ed448") > +DEF_FEAT(KDSA_ECDSA_VERIFY_P256, "kdsa-ecdsa-verify-p256", KDSA, 1, "KDSA > ECDSA-Verify-P256") > +DEF_FEAT(KDSA_ECDSA_VERIFY_P384, "kdsa-ecdsa-verify-p384", KDSA, 2, "KDSA > ECDSA-Verify-P384") > +DEF_FEAT(KDSA_ECDSA_VERIFY_P512, "kdsa-ecdsa-verify-p521", KDSA, 3, "KDSA > ECDSA-Verify-P521") > +DEF_FEAT(KDSA_ECDSA_SIGN_P256, "kdsa-ecdsa-sign-p256", KDSA, 9, "KDSA > ECDSA-Sign-P256") > +DEF_FEAT(KDSA_ECDSA_SIGN_P384, "kdsa-ecdsa-sign-p384", KDSA, 10, "KDSA > ECDSA-Sign-P384") > +DEF_FEAT(KDSA_ECDSA_SIGN_P512, "kdsa-ecdsa-sign-p521", KDSA, 11, "KDSA > ECDSA-Sign-P521") > +DEF_FEAT(KDSA_EECDSA_SIGN_P256, "kdsa-eecdsa-sign-p256", KDSA, 17, "KDSA > Encrypted-ECDSA-Sign-P256") > +DEF_FEAT(KDSA_EECDSA_SIGN_P384, "kdsa-eecdsa-sign-p384", KDSA, 18, "KDSA > Encrypted-ECDSA-Sign-P384") > +DEF_FEAT(KDSA_EECDSA_SIGN_P512, "kdsa-eecdsa-sign-p521", KDSA, 19, "KDSA > Encrypted-ECDSA-Sign-P521") > +DEF_FEAT(KDSA_EDDSA_VERIFY_ED25519, "kdsa-eddsa-verify-ed25519", KDSA, 32, > "KDSA EdDSA-Verify-Ed25519") > +DEF_FEAT(KDSA_EDDSA_VERIFY_ED448, "kdsa-eddsa-verify-ed448", KDSA, 36, "KDSA > EdDSA-Verify-Ed448") > +DEF_FEAT(KDSA_EDDSA_SIGN_ED25519, "kdsa-eddsa-sign-ed25519", KDSA, 40, "KDSA > EdDSA-Sign-Ed25519") > +DEF_FEAT(KDSA_EDDSA_SIGN_ED448, "kdsa-eddsa-sign-ed448", KDSA, 44, "KDSA > EdDSA-Sign-Ed448") > +DEF_FEAT(KDSA_EEDDSA_SIGN_ED25519, "kdsa-eeddsa-sign-ed25519", KDSA, 48, > "KDSA Encrypted-EdDSA-Sign-Ed25519") > +DEF_FEAT(KDSA_EEDDSA_SIGN_ED448, "kdsa-eeddsa-sign-ed448", KDSA, 52, "KDSA > Encrypted-EdDSA-Sign-Ed448") > > /* Features exposed via the SORTL instruction. */ > DEF_FEAT(SORTL_SFLR, "sortl-sflr", SORTL, 1, "SORTL SFLR") > diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c > index dc320a06c2..af06be3e3b 100644 > --- a/target/s390x/gen-features.c > +++ b/target/s390x/gen-features.c > @@ -216,21 +216,21 @@ > > #define S390_FEAT_GROUP_MSA_EXT_9 \ > S390_FEAT_MSA_EXT_9, \ > - S390_FEAT_ECDSA_VERIFY_P256, \ > - S390_FEAT_ECDSA_VERIFY_P384, \ > - S390_FEAT_ECDSA_VERIFY_P512, \ > - S390_FEAT_ECDSA_SIGN_P256, \ > - S390_FEAT_ECDSA_SIGN_P384, \ > - S390_FEAT_ECDSA_SIGN_P512, \ > - S390_FEAT_EECDSA_SIGN_P256, \ > - S390_FEAT_EECDSA_SIGN_P384, \ > - S390_FEAT_EECDSA_SIGN_P512, \ > - S390_FEAT_EDDSA_VERIFY_ED25519, \ > - S390_FEAT_EDDSA_VERIFY_ED448, \ > - S390_FEAT_EDDSA_SIGN_ED25519, \ > - S390_FEAT_EDDSA_SIGN_ED448, \ > - S390_FEAT_EEDDSA_SIGN_ED25519, \ > - S390_FEAT_EEDDSA_SIGN_ED448, \ > + S390_FEAT_KDSA_ECDSA_VERIFY_P256, \ > + S390_FEAT_KDSA_ECDSA_VERIFY_P384, \ > + S390_FEAT_KDSA_ECDSA_VERIFY_P512, \ > + S390_FEAT_KDSA_ECDSA_SIGN_P256, \ > + S390_FEAT_KDSA_ECDSA_SIGN_P384, \ > + S390_FEAT_KDSA_ECDSA_SIGN_P512, \ > + S390_FEAT_KDSA_EECDSA_SIGN_P256, \ > + S390_FEAT_KDSA_EECDSA_SIGN_P384, \ > + S390_FEAT_KDSA_EECDSA_SIGN_P512, \ > + S390_FEAT_KDSA_EDDSA_VERIFY_ED25519, \ > + S390_FEAT_KDSA_EDDSA_VERIFY_ED448, \ > + S390_FEAT_KDSA_EDDSA_SIGN_ED25519, \ > + S390_FEAT_KDSA_EDDSA_SIGN_ED448, \ > + S390_FEAT_KDSA_EEDDSA_SIGN_ED25519, \ > + S390_FEAT_KDSA_EEDDSA_SIGN_ED448, \ > S390_FEAT_PCC_SCALAR_MULT_P256, \ > S390_FEAT_PCC_SCALAR_MULT_P384, \ > S390_FEAT_PCC_SCALAR_MULT_P512, \ >
