From patchwork Wed Oct 24 11:37:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149490 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp474327ljp; Wed, 24 Oct 2018 04:42:39 -0700 (PDT) X-Google-Smtp-Source: AJdET5dVBe+v/VEHVQvLXwUE/35p+QD9eN0z/Pt8P3og5prtXOL0AXLsIwQenwGQt8nXr3SftlYC X-Received: by 2002:a37:b782:: with SMTP id h124-v6mr1864585qkf.340.1540381359713; Wed, 24 Oct 2018 04:42:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1540381359; cv=none; d=google.com; s=arc-20160816; b=d7jafME/5Ebg2uTxkkubYyXQrgz2mxnAcYQntY68LsyxefzIN3nInk0WrAGy6KT5+l CNsNo1bxXYZCblO5MR9y6olYsep3UyIqLJpsm2xsQpR9HHUa8S/nP5ocavWHBKi/ix18 REx2EOYVUqOyArYeuVcuXtrao3lFrb/njFPDn9t0AmKs8lw/G5HfphahDgSSvg5218Kw GCGgNFqMUOh+i66KhiMJ039SLcLEQsLyaH6mfEumRTdjQag1e+plM0oJbABCkocqEGDA vFzFN0lmisXoIa5879rq6v6v7ZzJdXb/1YTsuPb+lw2hJsIxDMsPGh/S9KQQZv7lYtZZ gbOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=yZi5AVGAaLMSQ3Y1lct303kwXwDXnulw97+9IwZojBA=; b=sTlkQjy4ODviOi+MJgG8865EvryMpqg3uerqZXK4XsKqaayIg0JhC3I0jv/Y3PRxJg FNWPAkBk/gb6GXvaQdlrP6mD80az+0qXKZCXfjhJ2K2wZcWKccFuIoDlxHuOscsvXxq7 WtyQKXlMZDeYCBsS/p19awU7GvtUXGRzqDH3+ka4H+gDykhVjS3EOfSD624MGt4MuvkM Wj4GU67hqEUUqbaEq7QEjpUdzcJTwlTpWfmuZBcPN7/etRyhbseS7Q3HrCysUrtB6Bvh 3AwKJrGhGLTpBRG4G7O7g0W6r9nFujBjr//EtdQliAzZuwSyh5gASk94LtOPfTiaE58i n+sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SKNQ5jkx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h18-v6si2259403qtr.381.2018.10.24.04.42.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 24 Oct 2018 04:42:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SKNQ5jkx; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47690 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHYd-0007ge-6e for patch@linaro.org; Wed, 24 Oct 2018 07:42:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHTk-0003AQ-Mp for qemu-devel@nongnu.org; Wed, 24 Oct 2018 07:37:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFHTg-0005Fc-Kw for qemu-devel@nongnu.org; Wed, 24 Oct 2018 07:37:36 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:39135) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFHTf-0005Co-MT for qemu-devel@nongnu.org; Wed, 24 Oct 2018 07:37:32 -0400 Received: by mail-wm1-x342.google.com with SMTP id y144-v6so5013784wmd.4 for ; Wed, 24 Oct 2018 04:37:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yZi5AVGAaLMSQ3Y1lct303kwXwDXnulw97+9IwZojBA=; b=SKNQ5jkx2RR1CQPVEACe6kp0zm024CD3gDmdhqR5BxwCVljwkxnDmIHlbBE7ZbEm56 XKyQkUDfXTQHop3LzJvQZhknIfrtvai9MibGDKBXAbkLoXSdzQ8UBLsCMCxOaf/80lEW 5M4LOuUEAPrhfRG9ZNPMNthAhDHUJVUO0p1kk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yZi5AVGAaLMSQ3Y1lct303kwXwDXnulw97+9IwZojBA=; b=rlQJ3y1ZQBsXJ3rTv8X/70qm9JZF6tsRIw4+infZc7TMME/eVHdygLjfJFH+AvEiIU qHma7HTUpywWFbmMC5F91VbGf5W48LnmBLrHZIkayOYhWAhA0CXZxwZoZ6llIVSxZT1R bgjBegh16S1uGPhivDB+5ppRYL+mjXE9NYL6ML/ZnklXlAC90GQOae0+wJ/x1MGVFdNL H1WrbGLSxLlXToS7H97ZcY0dmt8GvvdLgXp1j5YcBnhZQXDoSVdlDvvgZS5o2/FFw6ac s8T/9NS44OtxDCjlKPifbNabVuNle3yJFHE6gcdXvGql1sYhzHou6rLbCZJUDqJYySao ty3Q== X-Gm-Message-State: AGRZ1gKe+/NknmM6OwDxCTwryJ1GM+v63ALl4bFKxToGpfjwpOgNMfqF qR/hkFjCCnzzGrEt7rfdOhWS6XNhtNw= X-Received: by 2002:a1c:1b91:: with SMTP id b139-v6mr2280904wmb.147.1540381042957; Wed, 24 Oct 2018 04:37:22 -0700 (PDT) Received: from cloudburst.twiddle.net.net ([185.7.230.213]) by smtp.gmail.com with ESMTPSA id c8-v6sm6769172wrb.6.2018.10.24.04.37.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Oct 2018 04:37:22 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 Oct 2018 12:37:08 +0100 Message-Id: <20181024113709.16599-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181024113709.16599-1-richard.henderson@linaro.org> References: <20181024113709.16599-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 4/5] target/arm: Fill in ARMISARegisters for kvm32 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/kvm32.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index da08f7aab8..f23cc77d9e 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -44,7 +44,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) * and then query that CPU for the relevant ID registers. */ int i, err = 0, fdarray[3]; - uint32_t midr, id_pfr0, mvfr1; + uint32_t midr, id_pfr0; uint64_t features = 0; /* Old kernels may not know about the PREFERRED_TARGET ioctl: however @@ -71,9 +71,32 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) err |= read_sys_reg32(fdarray[2], &midr, ARM_CP15_REG32(0, 0, 0, 0)); err |= read_sys_reg32(fdarray[2], &id_pfr0, ARM_CP15_REG32(0, 0, 1, 0)); - err |= read_sys_reg32(fdarray[2], &mvfr1, + + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar0, + ARM_CP15_REG32(0, 0, 2, 0)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar1, + ARM_CP15_REG32(0, 0, 2, 1)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar2, + ARM_CP15_REG32(0, 0, 2, 2)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar3, + ARM_CP15_REG32(0, 0, 2, 3)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar4, + ARM_CP15_REG32(0, 0, 2, 4)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar5, + ARM_CP15_REG32(0, 0, 2, 5)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar6, + ARM_CP15_REG32(0, 0, 2, 7)); + + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr0, + KVM_REG_ARM | KVM_REG_SIZE_U32 | + KVM_REG_ARM_VFP | KVM_REG_ARM_VFP_MVFR0); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr1, KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_VFP | KVM_REG_ARM_VFP_MVFR1); + /* + * FIXME: There is not yet a way to read MVFR2. + * Fortunately there is not yet anything in there that affects migration. + */ kvm_arm_destroy_scratch_host_vcpu(fdarray); @@ -95,13 +118,13 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) if (extract32(id_pfr0, 12, 4) == 1) { set_feature(&features, ARM_FEATURE_THUMB2EE); } - if (extract32(mvfr1, 20, 4) == 1) { + if (extract32(ahcf->isar.mvfr1, 20, 4) == 1) { set_feature(&features, ARM_FEATURE_VFP_FP16); } - if (extract32(mvfr1, 12, 4) == 1) { + if (extract32(ahcf->isar.mvfr1, 12, 4) == 1) { set_feature(&features, ARM_FEATURE_NEON); } - if (extract32(mvfr1, 28, 4) == 1) { + if (extract32(ahcf->isar.mvfr1, 28, 4) == 1) { /* FMAC support implies VFPv4 */ set_feature(&features, ARM_FEATURE_VFP4); }