[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 2/5] target/s390x: indicate query subfunction
From: |
Christian Borntraeger |
Subject: |
Re: [Qemu-devel] [PATCH v1 2/5] target/s390x: indicate query subfunction in s390_fill_feat_block |
Date: |
Wed, 19 Jul 2017 13:27:54 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 |
On 07/19/2017 11:50 AM, David Hildenbrand wrote:
> We'll have to do the same for TCG, so let's just move it in there.
>
> Signed-off-by: David Hildenbrand <address@hidden>
looks sane.
Reviewed-by: Christian Borntraeger <address@hidden>
> ---
> target/s390x/cpu_features.c | 31 ++++++++++++++++++++++++++-----
> target/s390x/kvm.c | 13 -------------
> 2 files changed, 26 insertions(+), 18 deletions(-)
>
> diff --git a/target/s390x/cpu_features.c b/target/s390x/cpu_features.c
> index fa887d9..8b14917 100644
> --- a/target/s390x/cpu_features.c
> +++ b/target/s390x/cpu_features.c
> @@ -336,11 +336,32 @@ 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)) {
> - /* Features that are always active */
> - data[0] |= 0x20; /* z/Architecture */
> - data[17] |= 0x20; /* Configuration-z-architectural-mode */
> - }
> + 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 */
> + }
> + 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:
> + data[0] |= 0x80; /* query is always available */
> + break;
> + default:
> + break;
> + };
>
> feat = find_first_bit(features, S390_FEAT_MAX);
> while (feat < S390_FEAT_MAX) {
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index 831492f..999ea57 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -2506,41 +2506,28 @@ static int configure_cpu_subfunc(const S390FeatBitmap
> features)
> s390_fill_feat_block(features, S390_FEAT_TYPE_PLO, prop.plo);
> if (test_bit(S390_FEAT_TOD_CLOCK_STEERING, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_PTFF, prop.ptff);
> - prop.ptff[0] |= 0x80; /* query is always available */
> }
> if (test_bit(S390_FEAT_MSA, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_KMAC, prop.kmac);
> - prop.kmac[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_KMC, prop.kmc);
> - prop.kmc[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_KM, prop.km);
> - prop.km[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_KIMD, prop.kimd);
> - prop.kimd[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_KLMD, prop.klmd);
> - prop.klmd[0] |= 0x80; /* query is always available */
> }
> if (test_bit(S390_FEAT_MSA_EXT_3, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_PCKMO, prop.pckmo);
> - prop.pckmo[0] |= 0x80; /* query is always available */
> }
> if (test_bit(S390_FEAT_MSA_EXT_4, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_KMCTR, prop.kmctr);
> - prop.kmctr[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_KMF, prop.kmf);
> - prop.kmf[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_KMO, prop.kmo);
> - prop.kmo[0] |= 0x80; /* query is always available */
> s390_fill_feat_block(features, S390_FEAT_TYPE_PCC, prop.pcc);
> - prop.pcc[0] |= 0x80; /* query is always available */
> }
> if (test_bit(S390_FEAT_MSA_EXT_5, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_PPNO, prop.ppno);
> - prop.ppno[0] |= 0x80; /* query is always available */
> }
> if (test_bit(S390_FEAT_MSA_EXT_8, features)) {
> s390_fill_feat_block(features, S390_FEAT_TYPE_KMA, prop.kma);
> - prop.kma[0] |= 0x80; /* query is always available */
> }
> return kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr);
> }
>
- [Qemu-devel] [PATCH v1 0/5] target/s390x: cpu model cleanups + improvements, David Hildenbrand, 2017/07/19
- [Qemu-devel] [PATCH v1 3/5] target/s390x: introduce (test|set)_be_bit, David Hildenbrand, 2017/07/19
- [Qemu-devel] [PATCH v1 4/5] s390x/kvm: better comment regarding zPCI feature availability, David Hildenbrand, 2017/07/19
- [Qemu-devel] [PATCH v1 5/5] target/s390x: improve baselining if certain base features are missing, David Hildenbrand, 2017/07/19
- [Qemu-devel] [PATCH v1 1/5] target/s390x: drop BE_BIT(), David Hildenbrand, 2017/07/19
- [Qemu-devel] [PATCH v1 2/5] target/s390x: indicate query subfunction in s390_fill_feat_block, David Hildenbrand, 2017/07/19
- Re: [Qemu-devel] [PATCH v1 2/5] target/s390x: indicate query subfunction in s390_fill_feat_block,
Christian Borntraeger <=
- Re: [Qemu-devel] [PATCH v1 0/5] target/s390x: cpu model cleanups + improvements, no-reply, 2017/07/19