From patchwork Tue Nov 13 15:42:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150986 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4554722ljp; Tue, 13 Nov 2018 07:46:18 -0800 (PST) X-Google-Smtp-Source: AJdET5cdtEGwhFvkA+yxeFHSkGiOJN4aebKUJ2q2uHqjgarS/RCLdMQrOqJ+8DwnvbIAtrOBi14W X-Received: by 2002:ac8:3171:: with SMTP id h46mr5499259qtb.334.1542123978237; Tue, 13 Nov 2018 07:46:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542123978; cv=none; d=google.com; s=arc-20160816; b=xTbzRQ+csSeEPURiZ0JUQ5N499aVjdvbda/ZhjP5yVFr00LNbgU2xQrA8lcu2ak1VE qfiRUh+ufz7BLCtCDisuTa9N9gP6cSt9JGIGH8MS8Wk+B8wIdVqO+hoMSqbswlfAysTx zYgdEA5JMqARqsNNjIscMzkTx8SvpEMMWXGszVfca1JhFzIqHZqzq/XHwLxzx0fjoT42 kIP2ZT7PQ3I3bsGvu1F/OXRW83mCDBrzkXDlnyFGY0rktEFdw0tIT1hMveaIQO/Ym9MW 9OnNzZ9czr+mUIA3E1x0GqQs6ENutkloRzoB29zlIS/AKS2NS1z8pIHbvnmo9QSN59NA Jg+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=cLRClBlTM1MdU6W5hsPIhDK5ftDIufuY11txlyX8/WA=; b=RVXRhd/dEF29Tl3XeC6BIdS4+VAaCFAG5qRVJvPkh4NB12ZfjBKp4HLHl0ArDiE916 ehTWjGrIYfWg/f4FZEVFiiu/LqqvreI9O5Hv66P/hLrqjm7N/ObDRMmvjWeq7x45HC9N DeiXYx3xF/jkIqDrjvV3S3Bzofgc37m8RsFcdIBAlA5Ulvx2IwwlfmXu9yD3pImV59Bg R7c142POFglLQk9B7d9gLkndv23rI3CZkvDhz8Bj70I/AhAJSa/wsUztJWJefBtu1ZNi IeY4TsHTH1gR5y63R1e13/L1Rz7o3Mt6lCU+KAxZ7nWMus4lql48fCXPjszYH4irNXzs q8hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Bxm4pa+v; 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 e32si227238qtd.187.2018.11.13.07.46.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Nov 2018 07:46: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=Bxm4pa+v; 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]:54567 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMatN-0003yf-ID for patch@linaro.org; Tue, 13 Nov 2018 10:46:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMar6-0002dT-Q7 for qemu-devel@nongnu.org; Tue, 13 Nov 2018 10:43:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMar5-0002XE-PP for qemu-devel@nongnu.org; Tue, 13 Nov 2018 10:43:56 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:46009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gMar3-0002De-SU for qemu-devel@nongnu.org; Tue, 13 Nov 2018 10:43:54 -0500 Received: by mail-wr1-x444.google.com with SMTP id k15-v6so13803121wre.12 for ; Tue, 13 Nov 2018 07:43:19 -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=cLRClBlTM1MdU6W5hsPIhDK5ftDIufuY11txlyX8/WA=; b=Bxm4pa+vpccCdTFuYgTLB3AdeRhUuyCNkxISb0M+E44DSqSjF6jDlMSjHhnHVmgWgR sewMX7oFy6RIZgh3fy5tKOfOZUGivAaSkAUJjgQQnWDBwmrgpDZkGcvfWfyVB+7Cu/oi 8JNtZg9v4IwLvKyl3GcqP5smNcBQsq8B1/SFA= 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=cLRClBlTM1MdU6W5hsPIhDK5ftDIufuY11txlyX8/WA=; b=TG1OvLDQ3kdj70RcXM5PkYB96uHPhDzxfv7PsL7z6gLQcy7aXuyXQj2hp+De15AfZX MwKSTBQNMpvEgo0YL2lQwHQrG9PceJraMJSYhQFIO4etm8M7lL5pXg07cd6l4zCWJUKT lpIv3i2GRCJUgbmGCaBdvXCJeQdYx8cLHHO138ieYoht/bnlB4Gwd+A78vGYeVLJc44W LZyVrlb7D6wWWKlmV7Esbvs4ghJ/EWm0RmgytcBR9TYEET09DKc7/VWFthD9JD/LW7fC qVX/jXUZ/lEXVPu8FB3LCvjKxD07WTwFh9nxMD0A2eqiPwi4IMmvYjPmZeP/BP5Lo2jd aOWw== X-Gm-Message-State: AGRZ1gKJGWvvw3tPDxWySL74VbiPcdzvo1cqJhwvZGnZUxJ2em4KG/6Q 4wGlzHuRIilGPa8SIKncHvwBoLywn97j4g== X-Received: by 2002:a5d:530c:: with SMTP id e12-v6mr5343995wrv.29.1542123798668; Tue, 13 Nov 2018 07:43:18 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Nov 2018 07:43:18 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 13 Nov 2018 16:42:24 +0100 Message-Id: <20181113154226.14396-3-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::444 Subject: [Qemu-devel] [PATCH v4 2/4] 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 | 62 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 46fbe6d8ff..8dff8749c9 100644 --- a/target/arm/kvm64.c +++ b/target/arm/kvm64.c @@ -456,17 +456,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 @@ -487,8 +510,43 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) ahcf->target = init.target; ahcf->dtb_compatible = "arm,arm-v8"; + 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)); + + 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)); + 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.