From patchwork Fri Nov 2 14:54:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150043 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2176961ljp; Fri, 2 Nov 2018 07:57:32 -0700 (PDT) X-Google-Smtp-Source: AJdET5fooxUKa6OOW2dd04y0dTbBTaVLWEifDGfBJCdAbh7DTyj4idX7wxdwvN2G+CcIL3GTE1WN X-Received: by 2002:ac8:73c2:: with SMTP id v2mr2113087qtp.377.1541170652875; Fri, 02 Nov 2018 07:57:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541170652; cv=none; d=google.com; s=arc-20160816; b=qD/Y08vqNbRj5KoKSz0QoNXDImojMjo7I/bpfFS3uxl49TMfv4MxSVigqHQDNgAl2g qx/1Mv8DCTE0HzO0fXbTcKjuu9MdNmcLubeTZzd4Pn2XFqAgQHboG1T/B5idDaQf/9tx AzwL3gEVtkGO/maB6bd3wC4sWXyHM0EiCgHro3wSfxz+tmP/RxH/f6fkAC3Rd9bXtZ+H K8gIJq83QFo5eURZw9rAcN0prfuxBYSi2YQarzjUSMqZjV4Esx/A4kK9GhmX/cFrHPR7 8ER+D6VdVdh1SQvjcpBymQcY3YgM2CSeGKXq73ymWa82NvUuJqMZcMcUQYJIP5nMGbz8 wAAw== 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=wAAqQsydo91GFkx0Iu9I74oQUpqdHqV7ni9QirCbmpY=; b=dM3Mt2Ap4WswofWo70YO6pI2Z2Q/nHTIPBrHAW1QK7VFR5sRBCGYYKehTVa81AcQts gGb4RrCkfeUpGL8VTs7gmemG02E6LCE3Us47OuYg9jJTQeswfkpW1VRRU2ZYvoeyrGni Wi+qHJHemloQLBr/Be9aVAgANMryhUXmAto59itDVPASKD41jOVcuCYL9t6FI9512izl joPFQLrAmTyOssszHZ3tzb5gFgKlFIL6oyoRoe+nMguBk+HOHjdX/Lp9v0q0flnfVhZb D2nIy/v3vIho0JO29PbjKY8ttWquw+EkeCal8ooh8DkAjbYGPlNFrv58p6vQbmR+8Ami iF/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UYvBjr3z; 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 o51si8122209qtj.204.2018.11.02.07.57.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Nov 2018 07:57:32 -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=UYvBjr3z; 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]:52038 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIatA-00042n-Cw for patch@linaro.org; Fri, 02 Nov 2018 10:57:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIaqV-0002EK-CO for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gIaqT-0003Gi-AG for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:47 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:55791) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIaqR-0003FD-CU for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:44 -0400 Received: by mail-wm1-x342.google.com with SMTP id s10-v6so2225026wmc.5 for ; Fri, 02 Nov 2018 07:54:42 -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=wAAqQsydo91GFkx0Iu9I74oQUpqdHqV7ni9QirCbmpY=; b=UYvBjr3z8o1dCoQo5frgyu7JKU+sxs/+594og/R7epdFtVon5VsHsxFftKoK3ZUO/q taM1Tu9gs/rBnCvDOfjxdJJb+jYa/ae432U9pXWDpdteEJ2XlOWpYSSjV3+jqDYA5SBd cLB//WbNeKx8ugwCGd7aXEew8S02Gy4c6YCAg= 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=wAAqQsydo91GFkx0Iu9I74oQUpqdHqV7ni9QirCbmpY=; b=P2f1K7R/KKMbi55lzfNh9qnLeItcCS2aF2wSAPQ/bHw/vjgWA152eoKxz6RKLP97Y9 R6tW7aB1+GrR7Rf8VkwHV7Z1rUOiKFISJkuWuecfmKcocjtmnqRXpkMTCkTn446xpbl4 GhzGixGLnXWgCJ+/3ypBRYBFkn9C67OLAaW10y8c9++BQ27M8kYBmeuO6pleCfWpegHT TBwq0vkBlCM1ytpxeghpcR25uUuFAxcxbA5aZzLg/HSPodhdvtbJeTpYiBflyA2TBPkn N/kXiBPdtIzl0WAW7cHZFiKVRvdOBxj9ZWWOj/7N91c87F+iNjilncqpiD/b6BWQ69CM 5UFQ== X-Gm-Message-State: AGRZ1gKl8P4Xj3cU364vpeu944cLL9S39gpdlUxUbJaACv0y6v/i6ijI RYpgNh+Hed/26MxQwwv/kfHOHs3g7MU= X-Received: by 2002:a1c:49c2:: with SMTP id w185-v6mr38843wma.144.1541170480873; Fri, 02 Nov 2018 07:54:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 02 Nov 2018 07:54:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 14:54:31 +0000 Message-Id: <20181102145433.4553-4-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::342 Subject: [Qemu-devel] [PATCH v2 3/5] 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. Reviewed-by: Peter Maydell 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 0f1e94c7b5..de573f9aa8 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; }