From patchwork Tue Nov 13 15:42:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150984 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4552557ljp; Tue, 13 Nov 2018 07:44:18 -0800 (PST) X-Google-Smtp-Source: AJdET5cMdD+6vpPfHJmOSvWMsuUYBH/QJcwqR8GSJ49F1BsQVJFy7DfgdOfWiuO81ptvSrtf/+Ml X-Received: by 2002:a37:e406:: with SMTP id y6mr5331016qkf.216.1542123858487; Tue, 13 Nov 2018 07:44:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542123858; cv=none; d=google.com; s=arc-20160816; b=FrVmipEy9nXO5O3EzjWfnP3giC0Zhjk3od26q/i7QMyFCyPaPXGIU51STT82JCmWix a/SN26HPDqkYfaFe2PFar2+ajTpgLNNSewR145L7jC+s2wkyODozQqIYAcTA/CRiKs7J WMgJiNf2vNCk+H2Ww4/k09ut9sFK+kvxon1JC1flUqdFAziopsEBPoMpl3pVXkMfCjVs T6bR4NmP2tm2zr3lk6BFRtK5GzJm+7hGCTVtbpuAw9YKW1Gd/vsvMy9N3PDxSrSDFbRb BPs2oWnWdsLVYB4ZPWjAaQuynMAdhqHTbuQrBuxxXAVFHWXUEQEEbGlVFp8a5MGh1lod GmNQ== 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=gcjpzBDmc2ewtCNL6rBuAyjW01R7ZlfO8tHcOjDumO0=; b=iVaoSPHdRScq0Q/iKSJ6t7E7EnMWUKhd1b5V/kjxxfLlAl4B+U0rJwzF4/wE21gwxR A22V1zr3NDT5OMoJkpzf+E3HYK1fn4a3bseXED8QPKVi1r0lLEcxLfK/d1rG/mZyu1pb mw2NY5VQiTX+488Bdx7c19q9hLsfzpeOdModO5Z/FpBKqclCQg8AmruZhle+Iy9ABtRU 7U8oBno4hej16+3lf0kSx6rWn1Bw8axNPA0qc7LPTuUdEYCplpDx8LYQvLH4mOpLnttP OgCbtUHFBjMed2wLxehgM+aJ5bkDNbzYlAKodpOt9tvbKfvoqb5t4X9iFh2pNAGMeVSm BfFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CQYSFym/"; 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 48si424431qvw.102.2018.11.13.07.44.18 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Nov 2018 07:44:18 -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="CQYSFym/"; 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]:54553 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMarR-0002bE-Ok for patch@linaro.org; Tue, 13 Nov 2018 10:44:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMaqy-0002Wf-0A for qemu-devel@nongnu.org; Tue, 13 Nov 2018 10:43:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMaqr-0002RE-LL for qemu-devel@nongnu.org; Tue, 13 Nov 2018 10:43:44 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:36548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMaqg-0002EZ-M3 for qemu-devel@nongnu.org; Tue, 13 Nov 2018 10:43:32 -0500 Received: by mail-wm1-x343.google.com with SMTP id s11so2531331wmh.1 for ; Tue, 13 Nov 2018 07:43:21 -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=gcjpzBDmc2ewtCNL6rBuAyjW01R7ZlfO8tHcOjDumO0=; b=CQYSFym/mpDJaS2O7s58ALjxKVW9ZbChGXKhr8BuyjHJC3L+4RVrw/EcFGr8n+fpKQ uCuGbGWpk9cZywAnGvvrfU0LGrvhzOpLGOz8C1fWKgsCWEfr2KQXzmtV0MtmtkrEyiDF febYWJzxQx1MG37tgzqDLid6kAPxI72+Ghi1g= 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=gcjpzBDmc2ewtCNL6rBuAyjW01R7ZlfO8tHcOjDumO0=; b=Ad/EzA0mzDerNKjonywp9jmiNdGU7+d0Pq6ePOtxiTy54esFO3+vpww5po1Fr6FcPg YFDhabvS/5E7oMAIDreGflXcor8uX6iJaUfthirkNK5qu2AZQ4E1lgeKGBzy9LeA6NHF DYjUMqzAVakx1l3bv0LkNr5xW2RfBU60IJPCPrsWM09QMenuFoqlo5qM/elEKku/tp26 yh3m5vpxPntWkqsy4OTQPWqoGUy5prQ/3kD5D3CX9l6km2hDXDxENopJV4uQrOGxH4ik b7oX4WaGPFHu1JBoizoj/kpSyBoEz5YjGTMO+771tEpOouFFbAvSJedLWI383qblr0/y GxjA== X-Gm-Message-State: AGRZ1gIxvHf26o/QUMhVeL8mhpKTFPH+o3WGF8V2YumZlqC/Vk0oFxiK zzWWWDt3WWdpQqjEf8J4gYwCsEDgxMdZmg== X-Received: by 2002:a1c:545e:: with SMTP id p30-v6mr3586289wmi.69.1542123799947; Tue, 13 Nov 2018 07:43:19 -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 s16sm3479709wrt.77.2018.11.13.07.43.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Nov 2018 07:43:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 13 Nov 2018 16:42:25 +0100 Message-Id: <20181113154226.14396-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181113154226.14396-1-richard.henderson@linaro.org> References: <20181113154226.14396-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 v4 3/4] target/arm: Introduce read_sys_reg32 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" Assert that the value to be written is the correct size. No change in functionality here, just mirroring the same function from kvm64. Signed-off-by: Richard Henderson --- target/arm/kvm32.c | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index cb3fb73a96..bc0badf53d 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -28,6 +28,14 @@ static inline void set_feature(uint64_t *features, int feature) *features |= 1ULL << feature; } +static int read_sys_reg32(int fd, uint32_t *pret, uint64_t id) +{ + struct kvm_one_reg idreg = { .id = id, .addr = (uintptr_t)pret }; + + assert((id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U32); + return ioctl(fd, KVM_GET_ONE_REG, &idreg); +} + bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) { /* Identify the feature bits corresponding to the host CPU, and @@ -35,9 +43,10 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) * we have to create a scratch VM, create a single CPU inside it, * and then query that CPU for the relevant ID registers. */ - int i, ret, fdarray[3]; + int err = 0, fdarray[3]; uint32_t midr, id_pfr0, mvfr1; uint64_t features = 0; + /* Old kernels may not know about the PREFERRED_TARGET ioctl: however * we know these will only support creating one kind of guest CPU, * which is its preferred CPU type. @@ -47,23 +56,6 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) QEMU_KVM_ARM_TARGET_NONE }; struct kvm_vcpu_init init; - struct kvm_one_reg idregs[] = { - { - .id = KVM_REG_ARM | KVM_REG_SIZE_U32 - | ENCODE_CP_REG(15, 0, 0, 0, 0, 0, 0), - .addr = (uintptr_t)&midr, - }, - { - .id = KVM_REG_ARM | KVM_REG_SIZE_U32 - | ENCODE_CP_REG(15, 0, 0, 0, 1, 0, 0), - .addr = (uintptr_t)&id_pfr0, - }, - { - .id = KVM_REG_ARM | KVM_REG_SIZE_U32 - | KVM_REG_ARM_VFP | KVM_REG_ARM_VFP_MVFR1, - .addr = (uintptr_t)&mvfr1, - }, - }; if (!kvm_arm_create_scratch_host_vcpu(cpus_to_try, fdarray, &init)) { return false; @@ -77,16 +69,15 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) */ ahcf->dtb_compatible = "arm,arm-v7"; - for (i = 0; i < ARRAY_SIZE(idregs); i++) { - ret = ioctl(fdarray[2], KVM_GET_ONE_REG, &idregs[i]); - if (ret) { - break; - } - } + 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, + KVM_REG_ARM | KVM_REG_SIZE_U32 | + KVM_REG_ARM_VFP | KVM_REG_ARM_VFP_MVFR1); kvm_arm_destroy_scratch_host_vcpu(fdarray); - if (ret) { + if (err < 0) { return false; }