From patchwork Tue Nov 13 18:01:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150990 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4729103ljp; Tue, 13 Nov 2018 10:19:15 -0800 (PST) X-Google-Smtp-Source: AJdET5d1PqFmm6JE1KwHNMuAV7hzcG53m6lA+xxGm4BDj4nmG6fauUsc2BPjXfINrUrdiVSNCreI X-Received: by 2002:a37:c68c:: with SMTP id s12mr6013909qkl.66.1542133155180; Tue, 13 Nov 2018 10:19:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542133155; cv=none; d=google.com; s=arc-20160816; b=qON0slpW28av0zt1lqJn7X1fhLVEE/R6/KviNKxnNNV/LfEK1nrd92kXjNwu62hiwa 6OMFz3WOhaoDO4QdW01/ye8wIcBkkZgPfjrNs/pLFdO59BbqdElxkFrh52Xf703vnSUX kbOBhfw3SZcGdA5YQzZIHIdeZ+odbsxlVonRt5MQobyLM8PM2pyMd/yAWbQKI+SpE/J9 ayp4PrHZyeW6BKfqpCyck9iKxUJ7rjaVmbZHcxwOWxTgGLhBcnwpRNv1pf3vDptStGnY vsGRphWd2pqtRocFsbYsssp2ecuQmlGhaQeG17oi3aVTjvwS3QRztFv4ownqEJQcSEj9 i0OA== 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=CVcvIslv5WWkfBYxl9Mw9FAOSkXdpfKXat0+V0xS4Bs=; b=QQuocFwgVFJA5F3btlZBbN/+BO4gUyCE9H8iN+JvN/ZO9y02+XIZKSHZfZsWj1DbMP pdF7bU/byBPiG33BlpFAYN441AWM3pLQK4h8Any4pGvvyUu0mTqHQ99zrDBpqD4VvAMO ZeMcY2PSZ1oVKodgaK3aJWYhHYUMrwlk3OPKpinsBfPVviVipvd7upCI31AssrpXP9LQ vJ+EPCEK3aintfvCyyQff5oME3Ctk8a3ffztDqKQssKap7NBmkjEOGTY+p1N84kGo9RJ TFS6KNMllbozv1FOkwQKtvpD1hmruFld62susijH5vSOwBuU6wG4S11OufVfoOh2SWcK cu9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bOpPllLV; 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 o135si9428517qke.7.2018.11.13.10.19.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Nov 2018 10:19:15 -0800 (PST) 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=bOpPllLV; 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]:55584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMdHO-00073O-1a for patch@linaro.org; Tue, 13 Nov 2018 13:19:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMdE9-0003DL-On for qemu-devel@nongnu.org; Tue, 13 Nov 2018 13:15:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMd1g-00084Z-SJ for qemu-devel@nongnu.org; Tue, 13 Nov 2018 13:03:01 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54105) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMd1g-00083z-Lz for qemu-devel@nongnu.org; Tue, 13 Nov 2018 13:03:00 -0500 Received: by mail-wm1-x343.google.com with SMTP id f10-v6so12869926wme.3 for ; Tue, 13 Nov 2018 10:03:00 -0800 (PST) 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=CVcvIslv5WWkfBYxl9Mw9FAOSkXdpfKXat0+V0xS4Bs=; b=bOpPllLV9MWbjmlwJqqTv01jVkpgO1z6WpqhAbgo07bAZnS0oEPnENCSFC46hvxde9 mFZ9JzAUlVISo914WF54H7XMkUI5PEzZFvmjRFBq8d2S0S5N9wCJFyzS4WcXGEPU7LQi qxSlfz/k+uAZC9g+AFU3J7i7PutMxoEXBjVUQ= 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=CVcvIslv5WWkfBYxl9Mw9FAOSkXdpfKXat0+V0xS4Bs=; b=txe+VdZAIXRewWHyiP67XYQosu9Fz5eLjtiIbaofayqOJxaweJtO/WxeF6DkD7hxsV 67NmU7/YSdCHuJmYa7dmJVmh/s1CicmQ+mWCIubQY/N5wT8J4HT4xTUJSgQ1FCxCu9KI w6oOH1HXl9wsZbnGUFNVTngL+WIPXpSt4SfQXtHEeB6jbzPxMU5KPO5wb5L90nS61w3C 3wUmbsLqNdcV0bRI3wEb2+uqSM+8rafHAkOMORAPy153C5rPXWfNX7DRUeYTCm1z2i2/ Y5JffId48mqUeDDdSp+HUkko91NGOTSawwtOtKC6YfsoWU3LDAz+m4Fn74elR+JajBrr 7zBw== X-Gm-Message-State: AGRZ1gIZLL3VgB3893bzYG4pyDouSyqcm5HhKZeZ/7CcLa9h2l4nhH5D 7fmwGU42ENfcwHGn8zrtdKHtin2IQjuY1A== X-Received: by 2002:a1c:d14d:: with SMTP id i74mr1971100wmg.100.1542132179312; Tue, 13 Nov 2018 10:02:59 -0800 (PST) Received: from cloudburst.twiddle.net (26.red-176-87-105.dynamicip.rima-tde.net. [176.87.105.26]) by smtp.gmail.com with ESMTPSA id j124-v6sm2715978wmb.1.2018.11.13.10.02.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Nov 2018 10:02:58 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 13 Nov 2018 19:01:54 +0100 Message-Id: <20181113180154.17903-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181113180154.17903-1-richard.henderson@linaro.org> References: <20181113180154.17903-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::343 Subject: [Qemu-devel] [PATCH v5 4/4] 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, qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- target/arm/kvm32.c | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index bc0badf53d..bd51eb43c8 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 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,39 @@ 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)); + if (read_sys_reg32(fdarray[2], &ahcf->isar.id_isar6, + ARM_CP15_REG32(0, 0, 2, 7))) { + /* + * Older kernels don't support reading ID_ISAR6. This register was + * only introduced in ARMv8, so we can assume that it is zero on a + * CPU that a kernel this old is running on. + */ + ahcf->isar.id_isar6 = 0; + } + + 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 +125,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); }