From patchwork Tue Jul 25 09:40:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 9861569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2CCD06038C for ; Tue, 25 Jul 2017 09:45:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15A0828609 for ; Tue, 25 Jul 2017 09:45:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A87F2860E; Tue, 25 Jul 2017 09:45:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E8D3C28623 for ; Tue, 25 Jul 2017 09:45:01 +0000 (UTC) Received: from localhost ([::1]:59492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZwOL-000410-Oq for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Jul 2017 05:44:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44178) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZwKn-0001w1-Ac for qemu-devel@nongnu.org; Tue, 25 Jul 2017 05:40:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZwKj-0003bb-Bs for qemu-devel@nongnu.org; Tue, 25 Jul 2017 05:40:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49948) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dZwKj-0003b9-1w for qemu-devel@nongnu.org; Tue, 25 Jul 2017 05:40:53 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1399FFB83; Tue, 25 Jul 2017 09:40:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1399FFB83 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=cohuck@redhat.com Received: from localhost (ovpn-116-214.ams2.redhat.com [10.36.116.214]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BD7395A70; Tue, 25 Jul 2017 09:40:49 +0000 (UTC) From: Cornelia Huck To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 11:40:17 +0200 Message-Id: <20170725094026.5376-6-cohuck@redhat.com> In-Reply-To: <20170725094026.5376-1-cohuck@redhat.com> References: <20170725094026.5376-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 25 Jul 2017 09:40:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL for-2.10 05/14] target/s390x: indicate query subfunction in s390_fill_feat_block X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, david@redhat.com, Cornelia Huck , qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: David Hildenbrand We'll have to do the same for TCG, so let's just move it in there. Reviewed-by: Christian Borntraeger Signed-off-by: David Hildenbrand Message-Id: <20170720123721.12366-3-david@redhat.com> Signed-off-by: Cornelia Huck --- 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 fa887d9b6f..8b1491734f 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 831492f9a2..999ea570c3 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); }