From patchwork Thu Nov 8 17:52:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150563 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1138135ljp; Thu, 8 Nov 2018 09:58:33 -0800 (PST) X-Google-Smtp-Source: AJdET5cGx63XVZzJH8JHZFasoO8ENC+ij2IAzIGq3CFaXgA5AxhMfGq1Q5r1fdr3T53jzSauS1Cj X-Received: by 2002:ac8:4595:: with SMTP id l21mr5549106qtn.124.1541699913441; Thu, 08 Nov 2018 09:58:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541699913; cv=none; d=google.com; s=arc-20160816; b=MYKOG1mYOPeVEfjClfE0LgyapY+khEcvpIOGw6pLGxUh1bXXfHoNJ2gxcTXU8CPaLD u9dNT3QS1Bia/wjI4fAeQj1YlO/uVpgGywQCqtYHHseMxod+pbNNx93dG2Mbn85qCdky UzzJ44egC/wtGT1G9oEajtyRIzgCFHIFYNXQ6cVIgIUu2M9gH6CSNcDrPskU+gGwovkn u6qTsLWpPKcXB5vymm0cuI0Th+vDilUgTEFVdXbVRcaQyuIFQwwsJna4MURXiaeZUEH1 1cUNz1pqeGdofbPPKu5uY2uRf8cWfKPDVMLMEVf691tc9GfIBxz7GChlO08ZJcGli0dp qG9g== 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=LSozu/Z4mWSl6m+X4Lb+JTsWeRVaC/5DEPXOHzkPYEWWN8pMBXOIW6lKtpj0QLUQkg qwaQYCZ8whXSv/tTQjaN7GLLCH/TLia0/DcJEOufA5rWEuwZnjChaDaQINmnfDBOonr8 IH2reHyT1ACixefi8bfeX5MBNeAJcNqFokIuUctDU06STII8rvcnc/jEI+FSBCfuu/4I KMIX6gYf3525OgNMpd1ZBx7Td9y/WoS97qQER8/5FlbzEq22Z+4yfh+gctJKUXyOTBjB 4Pj400LEn7Bvk7wgm9UF7kkyHZE/rKfRNfrmyTWhg+Hx5er+5dJauLj2Rw+anUkywcdo xbTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gQXEy2uN; 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 e93si3529420qva.182.2018.11.08.09.58.33 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Nov 2018 09:58:33 -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=gQXEy2uN; 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]:58351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoZd-0004P1-0h for patch@linaro.org; Thu, 08 Nov 2018 12:58:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoW8-0001cB-E5 for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKoW5-0008BA-OH for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:56 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34814) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKoW5-0008Af-IQ for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:53 -0500 Received: by mail-wr1-x443.google.com with SMTP id j26-v6so22245573wre.1 for ; Thu, 08 Nov 2018 09:54:53 -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=wAAqQsydo91GFkx0Iu9I74oQUpqdHqV7ni9QirCbmpY=; b=gQXEy2uN88J7Yo7w6NMfD53nZ+4U4HgzHJHSj/vAzj4EMwvD4FHsPQsy4oDvuDNnME jwsxUVwr9SVB6OCbLYj/KJxHF4GLdbpMU/72zYvdvILx8JfhglJsmlyr/nWcYFDvfT28 fgipWiKTnRibtBFmAELV5qjvXRyqtqk4PLysA= 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=p4bKMhUFfWQ2BlO7Ch886Ks0siU59cZnvQu1nHRwKhqyVWAevKK6OhSBK7kTvyu+vd sFzszC99Ye+YHtPnq/YKdrizN3g5C20smZklxpY2vWJ4JmOUsIFSRfRGuwjYT1q9Y5EU CxiAoRWgHeyPZVtHKhkm4Jqg3iLaASUM0QY3ktT4Fz3o+6BXHOH3eyJJ1YXtEPsLJU5W Hfh4kYXFDRFYlr86s26+YVLS2/bbrcIGC1W92UReJEB3SFWasaSGjAAN0LJ5LcA11SFN NbgFLRAO946AUySiynHxLyI3CmX1qPqsWRfzrpEsBaGiRzxw8dy0XOsrmzqUM+2RdJbN JTow== X-Gm-Message-State: AGRZ1gKW57ZtxanKeCWDYgKF2OHygz0Cb8/NM7YyOINhIJq0ihsGHIK5 gRUK5pyX+8vDCAjhjjFoV6nDUEN5lftkpA== X-Received: by 2002:a5d:4708:: with SMTP id y8-v6mr5438396wrq.16.1541699692309; Thu, 08 Nov 2018 09:54:52 -0800 (PST) Received: from cloudburst.twiddle.net (70.red-2-141-114.dynamicip.rima-tde.net. [2.141.114.70]) by smtp.gmail.com with ESMTPSA id l42-v6sm4411384wre.37.2018.11.08.09.54.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:54:51 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 8 Nov 2018 18:52:44 +0100 Message-Id: <20181108175246.13416-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181108175246.13416-1-richard.henderson@linaro.org> References: <20181108175246.13416-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::443 Subject: [Qemu-devel] [PATCH v3 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; }