From patchwork Fri Nov 2 14:54:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150044 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2177108ljp; Fri, 2 Nov 2018 07:57:43 -0700 (PDT) X-Google-Smtp-Source: AJdET5cOfzahB2dg47Gl6YjTlXIw3MjTfSNr9k8iMW6gPZgSWcqe/NXuO68H+Tom6h11ppiriyzh X-Received: by 2002:ac8:2c3a:: with SMTP id d55-v6mr1532817qta.152.1541170663067; Fri, 02 Nov 2018 07:57:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541170663; cv=none; d=google.com; s=arc-20160816; b=o3vh88be64TAc83sqJPnh8MEvWwEqaxVzNUPxduWGu/vcViKdo8WjoTRC/OqjWIWnr W032914ITRXZ0EqWWT5uQw1TeHafZCIkviPRigNtD+EsMzcu89aTX5G+G0MFRYTHo9+L igQdzreDi+0bjaN3Gm3eWRvfCH7or8TtdinbIc71RUmg4kPI/XVTgd5QmEOhAZZazDhg RnU0zVw1zqk/n/WbkcdpgqQYetuvDHpXyvVDsnWSrqwpyHtsQBENF9d5sV4n990tkwwL KmcFUJgjkteYqWbW+N1LMhTN+Mi/Yl9TbTLviOVGba1OhKCC567BHTdHmA7B2uCf0ARM X8VA== 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=ffmgcNzfXibNpDQsqKV4PQiksneuZIsACAOYCKu/8+E=; b=tQlc/w9H0D6cp45CpO54lI6h1zhZ+FQVMJ/5TWtKwmdU6iwTCW+OUImn5Vz3V0EcyS DniYzgLqm8NgM5v5iFKPXXKx4oWywFGQtlmQiMd0/WXi2+aDWqX9iN3iurArDdw6cEEi kxgpAx6iytvVdaE028Myc8QWeOrmfVSL36I0L4JHC3ViRfUyAW1cHhx/5Jvuu+KQSbhQ pyVOBGPeh31XorROQkELe+LECvSvtdsDU4P/VsYcuHIK2iVkuWAJjsr+jGEYQiBcDUz3 hsuF2MzLq1HZKJSJMvw6HvKqgEdnV76tDUIFGkPsbGOmtAS50h+BfYDpLYDLfW2XpKjW QVTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FsqeCJ3x; 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 r23-v6si2951842qtm.319.2018.11.02.07.57.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 02 Nov 2018 07:57:43 -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=FsqeCJ3x; 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]:52042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIatK-0004nC-G3 for patch@linaro.org; Fri, 02 Nov 2018 10:57:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gIaqX-0002Ft-Ap 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-0003Ip-0G for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:49 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53716) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gIaqV-0003F2-NT for qemu-devel@nongnu.org; Fri, 02 Nov 2018 10:54:47 -0400 Received: by mail-wm1-x341.google.com with SMTP id v24-v6so2237479wmh.3 for ; Fri, 02 Nov 2018 07:54:41 -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=ffmgcNzfXibNpDQsqKV4PQiksneuZIsACAOYCKu/8+E=; b=FsqeCJ3xN7NjX/11jKkWQcXlrZiBFo0WbKa+EOUcDVOZpXQ4NtumdEEgGe0JnCPUJl yxh++xHkIT9+RgY9cAjJ4KW1PmTRM5h5cmDD65GphmCjANSOIm/50RzKrPLfbw6MLH9W /EaB7YrtFR7yHbKq568OGN6fK2NUd0uo5cVfI= 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=ffmgcNzfXibNpDQsqKV4PQiksneuZIsACAOYCKu/8+E=; b=c3sKHCERq/e5Dj18CF6v+8EOTafk9UY/JmFZ/d5egmQRQ/Qz4FJPBGjuC21qhPPA04 a1Z1onJj80K+FbpvWoYplFIBjU2fGnV8yWQggyof/qHTv97OQrTbcEK+Ba74K2Tm7uIk mylDoxW9d0vpnrYhleQAozZK8Of0Kbf0dn4SQ6ZjRlciXi+EYnQiS12w1JViVR1pxyMx xKuBi8sSrDlq+Bi2RjafQdV6m1c6NldSf/wbhV2XzZK95pJyBdCdp7z9/AQciYQ7F2LO 55iSjGZKOYvkIB8nMTK0K9jFxOs5YFBLnvKFDYR1a9RioV1ytBO4e92os9MCGz2Elmad BlBg== X-Gm-Message-State: AGRZ1gLEcSU9PR0U93OLTS8U67/wKC0S30+ClNjQYqZC2zbQTxDayPUv PFHOQo23pBcJrRYBM02g3sA5ZBXqjQM= X-Received: by 2002:a1c:3492:: with SMTP id b140-v6mr19250wma.115.1541170479869; Fri, 02 Nov 2018 07:54:39 -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:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2018 14:54:30 +0000 Message-Id: <20181102145433.4553-3-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::341 Subject: [Qemu-devel] [PATCH v2 2/5] target/arm: Fill in ARMISARegisters for kvm64 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/kvm64.c | 69 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 5de8ff0ac5..d4d4e63140 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -443,17 +443,40 @@ static inline void unset_feature(uint64_t *features, int feature) *features &= ~(1ULL << feature); } +static int read_sys_reg32(int fd, uint32_t *pret, uint64_t id) +{ + uint64_t ret; + struct kvm_one_reg idreg = { .id = id, .addr = (uintptr_t)&ret }; + int err; + + assert((id & KVM_REG_SIZE_MASK) == KVM_REG_SIZE_U64); + err = ioctl(fd, KVM_GET_ONE_REG, &idreg); + if (err < 0) { + return -1; + } + *pret = ret; + return 0; +} + +static int read_sys_reg64(int fd, uint64_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_U64); + 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 * fill out the ARMHostCPUClass fields accordingly. To do this * we have to create a scratch VM, create a single CPU inside it, * and then query that CPU for the relevant ID registers. - * For AArch64 we currently don't care about ID registers at - * all; we just want to know the CPU type. */ int fdarray[3]; uint64_t features = 0; + int err = 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. Fortunately these old kernels @@ -474,8 +497,50 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ahcf->target = init.target; ahcf->dtb_compatible = "arm,arm-v8"; + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64isar0, + ARM64_SYS_REG(3, 0, 0, 6, 0)); + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64isar1, + ARM64_SYS_REG(3, 0, 0, 6, 1)); + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64pfr0, + ARM64_SYS_REG(3, 0, 0, 4, 0)); + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64pfr1, + ARM64_SYS_REG(3, 0, 0, 4, 1)); + + /* + * Note that if AArch32 support is not present in the host, + * the AArch32 sysregs are present to be read, but will + * return UNKNOWN values. This is neither better nor worse + * than skipping the reads and leaving 0, as we must avoid + * considering the values in every case. + */ + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar0, + ARM64_SYS_REG(3, 0, 0, 2, 0)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar1, + ARM64_SYS_REG(3, 0, 0, 2, 1)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar2, + ARM64_SYS_REG(3, 0, 0, 2, 2)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar3, + ARM64_SYS_REG(3, 0, 0, 2, 3)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar4, + ARM64_SYS_REG(3, 0, 0, 2, 4)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar5, + ARM64_SYS_REG(3, 0, 0, 2, 5)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar6, + ARM64_SYS_REG(3, 0, 0, 2, 7)); + + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr0, + ARM64_SYS_REG(3, 0, 0, 3, 0)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr1, + ARM64_SYS_REG(3, 0, 0, 3, 1)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr2, + ARM64_SYS_REG(3, 0, 0, 3, 2)); + kvm_arm_destroy_scratch_host_vcpu(fdarray); + if (err < 0) { + return false; + } + /* We can assume any KVM supporting CPU is at least a v8 * with VFPv4+Neon; this in turn implies most of the other * feature bits.