From patchwork Fri Nov 2 14:54:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150046 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2178967ljp; Fri, 2 Nov 2018 07:59:48 -0700 (PDT) X-Google-Smtp-Source: AJdET5f1sm/o6wejo/btF7Pa6aGCe0rYgKD0vgittcWwKs0hMH0r0aeSyWwlb3/UR4cPLkbsbpXu X-Received: by 2002:a0c:d646:: with SMTP id e6-v6mr5670343qvj.209.1541170788326; Fri, 02 Nov 2018 07:59:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541170788; cv=none; d=google.com; s=arc-20160816; b=EcjAKzpobiijdJVVxIFzWCbDodxPevoJvURQwL0ukNfrf3ssqNLDk7YCkXDtNF48g8 mm8k6CXnP3mSOkezG87rWlJVBRmFvL4Ok9zd1LppfIyxhV/GG0Jw3+jvXMi+QfbIq8dt YLCW6D7mtA2TrkQmLl7Yb/M+ojogFN4psfvEmSl7kek/pI8SKY/WTy4odTv4anXPNRxi WTaMJMmbwLlSu98rgG7b/hbg7qy7CLVGNDH3ceKiTskATBgtCxzqhNkv/0Npj8LIGK+Q oL5G18ixdF4XXeIvNQt3DhNDQX5k+6L9ipJ0QCIMnqW0ENY4Kqb7SvGWol4UkNpVtm32 /b+w== 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=Xb8qasGGEBVJuzUJvReZfnwfw3l/sa7Djl2gXpUSNbI=; b=btdOLeErPNlYgwPMt3/v+voS/HHQAQAGrAS75qY4GAOvbl/IC9oZ68tjj4WetZKw4n 12n6eOEA7PxJSyXKtNxrFzYDn1T7AkoY0pMq/wdacLX47iMwpvEJxPYwM2ADooAChvOv F8PbA+OK0NXzGc2gb10n2uujIdfrXD4QfLyPhYNz8FeXVhbK7y3Hexp8mhwIkJyKNRP/ KjbVFMAJK0eZbgKshLe0czNp74gnwus6Y8sbObqZAwX+nzhQLPVNLQJmHI+uQs46B2Vz MUeyAGacy9nlvkr2dNYA0IcV4gJWyhnn0COHrx+BkeMndQb4xLh9cjg0+R7xrn6vgamR t6Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H02un9kK; 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 i3-v6si772588qti.112.2018.11.02.07.59.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Nov 2018 07:59:48 -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=H02un9kK; 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]:52054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIavL-0007SB-SN for patch@linaro.org; Fri, 02 Nov 2018 10:59:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIaqX-0002G5-J0 for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIaqW-0003J1-5H for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:49 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:34881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIaqV-0003FV-TB for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:48 -0400 Received: by mail-wm1-x343.google.com with SMTP id q12-v6so2147713wmq.0 for ; Fri, 02 Nov 2018 07:54:43 -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=Xb8qasGGEBVJuzUJvReZfnwfw3l/sa7Djl2gXpUSNbI=; b=H02un9kKY4HwUC6DAMGOmRsimNiZIkBVj9UB9ZOzhB2TDviQfJz9JeKYE+UtduRbZD VGB7ILbyYQwqjMDHlGhJsp5Y7TUD4X+EVmRZq3VgV6tKS2lQz74TRtX4tsyO1BNGh4It I2RKLKdUggwd5fSsKpFzzhLuBYeumuUE/MHCQ= 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=Xb8qasGGEBVJuzUJvReZfnwfw3l/sa7Djl2gXpUSNbI=; b=oyYH+AYmfCkYDG7Akb1v+EXp1ucJF51ihiLVSzDXqK/nC3ZC9eOTfAwMs6g5pict7U BnPFVXS/EmI0rEHA41bDaqkUE3NAwqe2XBncZI/lIIHFZXWeratgH/OiXLLf6HJoZt3A MCgAZ9NgDIb/SMPK2qmu/Q0GdGcpZW3yDPGwXfjwxgdmofhhYKq/RTpmOUaoN0nhhCPd mS559znfwZMMXdThyaOxQRPf1Bpz+9UaXYS0r/eYfM6/i1LkJeMG4TA4hOEWGi98vJJ0 bw0l6UaDlof4tZ96bSCh+wUXxOMQZiysvEIAF51SPNA/OTcvw70CMRZAsccwqGgDU6Q0 OhCA== X-Gm-Message-State: AGRZ1gI/19CgOCGQKdX3l1kWLfT8/rxiTUmX2jf04EriypiYqY1e/ZMr x0xGLvpqgGo8JiELJR8pTVLsWYHeyG8= X-Received: by 2002:a1c:1984:: with SMTP id 126-v6mr36015wmz.7.1541170482142; Fri, 02 Nov 2018 07:54:42 -0700 (PDT) Received: from cloudburst.Home ([2a02:c7f:504f:6300:a3de:88d8:75ae:bf4c]) by smtp.gmail.com with ESMTPSA id l5-v6sm10698454wrv.84.2018.11.02.07.54.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Nov 2018 07:54:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 14:54:32 +0000 Message-Id: <20181102145433.4553-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181102145433.4553-1-richard.henderson@linaro.org> References: <20181102145433.4553-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 v2 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, 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 | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index de573f9aa8..9ededa3c73 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,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); }