From patchwork Thu Nov 8 17:52:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150562 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1137876ljp; Thu, 8 Nov 2018 09:58:18 -0800 (PST) X-Google-Smtp-Source: AJdET5ccw7lq5t5kuoamT4cz3BFi5N+c/hJZWxJ2JKR+bvg/2q+AziI+iU9IV0mP3Qo7WNpwE9O9 X-Received: by 2002:ad4:4391:: with SMTP id s17mr5530426qvr.32.1541699898050; Thu, 08 Nov 2018 09:58:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541699898; cv=none; d=google.com; s=arc-20160816; b=KxUDh4dUUjQYsPh70EXyXBmv0x5oYkAkK84duDGGL+TIVthU/ad7AeAyex50Gp6yaZ bho1E45nVnMjuFEr31PA05MuMVOmAo87msAfFMiJlxOXPPP8LNjZ8kxFrW97yRhSh671 EpucTYPuy2grvyAoi3Be3bfKU/HLHZNZeO8TA/2MM6REAQad9PeZgmhty39nAqlAb6Es K5H296vFSbVu9ZmxaJGByydkWeM9OFSPvnW4yB2g+fYtokbFMPVwxrb2B/Ek6zrfw8jX dsxXeM/zJh9U3syU7OezVToWZoWK7LjaZxD6L3PBVIRzQGgUWIa3BH3WopkoQVx1bdDX WeDg== 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=PpLXpocO/xsWRefCIa8us272LlmFyb71GTp1lXZH/b8=; b=v+3Z5tZdHQwS8bBMSw5Z8R1gvVaEmT9TB1sDswv66HTtkc/NtLjklY5srRcJUWguWd RjwTopXN3B4hGRCMkNY5W/4zOb7o1t+CITxUL/A35lN6lEHBJGfFl/lqaR/rdQRJxZj9 DeCELwyDNh9U6jZjzRQktuVA+z5KqUv7eP9D8z9xXeLY/Wkmj53ixaiAvArdT0d8HK0D tjVF3vQbsPKnZdRIAvlxbm+GeHXj8rMczPNQKalVRxhPoJzNGyGKlH1e61/C6XQv4hxY ZNkx880uhCkh2P8uNvapzEpI+npOM6kSRMdth0pKvgsdI2PYW8f40LEVfk7BbzvGcq/k AIjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PvCg1VzE; 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 a50si3857114qva.46.2018.11.08.09.58.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Nov 2018 09:58: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=PvCg1VzE; 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]:58350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoZN-0004NU-Jk for patch@linaro.org; Thu, 08 Nov 2018 12:58:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoW8-0001cC-E8 for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKoW3-00089d-Ei 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]:44502) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKoW3-00088k-7l for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:51 -0500 Received: by mail-wr1-x443.google.com with SMTP id j17-v6so17085823wrq.11 for ; Thu, 08 Nov 2018 09:54:51 -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=PpLXpocO/xsWRefCIa8us272LlmFyb71GTp1lXZH/b8=; b=PvCg1VzEBsnl23dgv1WNw0jxyaB9jwSb+cM3kIQ/BmI076aziN1pCfP+assL2l+vVP yF5Iensrm5stQgMoK6DHvs5ohcqDeLE00MEGVp+M/oZ4HUOsti1KenkIKKmNOqq95lgi YElOfgYs/8Vhjr7Lv4ElGYDfOBYc24bRXu+Dk= 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=PpLXpocO/xsWRefCIa8us272LlmFyb71GTp1lXZH/b8=; b=fKLCtCTBZI+1/pDWZt0R38LOknqCHkMdYTfCCmmRvVNvGTdq73BRrW6ALKTJ4w3QOD sD4M2Zwh6YWRwGusQ0aWoztGua9OEsfcNGYJ4J/Ry8iBrKuV6DDnPMarBE88JDNAKIGj 3PACXbYOivqTssj75Mn44zT14mLaFwXZ5nRjlgWDhwDNZdVpFhUQ0wN4SYUf2s1CbDjV VVRrnywljoidpCS208lGO88ynItIRTJwr6Teh0sxnMgZ9tTm6eRGTDrGHuc/N071bJId tyPQMDrarBUE1mMDVhDkptEVpeLJRqC+yLgPBPXJCdSg4lW9+OGvc457D1K581ITMb45 9pvQ== X-Gm-Message-State: AGRZ1gJo4szKZBCIyKYydNUMtt0VqPft7554gnFIv27wxvlmsx0OwpaR HMQVVIwUVsptpLJ9FNInmP//yLgzisZBsQ== X-Received: by 2002:adf:f891:: with SMTP id u17-v6mr4991875wrp.178.1541699689959; Thu, 08 Nov 2018 09:54:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:54:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 8 Nov 2018 18:52:42 +0100 Message-Id: <20181108175246.13416-2-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 1/5] target/arm: Install ARMISARegisters from kvm host 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" The ID registers are replacing (some of) the feature bits. We need (some of) these values to determine the set of data to be handled during migration. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/kvm_arm.h | 1 + target/arm/kvm.c | 1 + 2 files changed, 2 insertions(+) -- 2.17.2 diff --git a/target/arm/kvm_arm.h b/target/arm/kvm_arm.h index 21c0129da2..6393455b1d 100644 --- a/target/arm/kvm_arm.h +++ b/target/arm/kvm_arm.h @@ -183,6 +183,7 @@ void kvm_arm_destroy_scratch_host_vcpu(int *fdarray); * by asking the host kernel) */ typedef struct ARMHostCPUFeatures { + ARMISARegisters isar; uint64_t features; uint32_t target; const char *dtb_compatible; diff --git a/target/arm/kvm.c b/target/arm/kvm.c index 09a86e2820..44dd0ce6ce 100644 --- a/target/arm/kvm.c +++ b/target/arm/kvm.c @@ -158,6 +158,7 @@ void kvm_arm_set_cpu_features_from_host(ARMCPU *cpu) cpu->kvm_target = arm_host_cpu_features.target; cpu->dtb_compatible = arm_host_cpu_features.dtb_compatible; + cpu->isar = arm_host_cpu_features.isar; env->features = arm_host_cpu_features.features; } From patchwork Thu Nov 8 17:52:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150564 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1142146ljp; Thu, 8 Nov 2018 10:02:04 -0800 (PST) X-Google-Smtp-Source: AJdET5df1vKBf62jz4wcOcXIh+Ig9N2ZmAGkiacJkcIAFiFZk3Ae9yVPs2okA0KSOI/2L6GOVWCZ X-Received: by 2002:ae9:e311:: with SMTP id v17mr4936319qkf.193.1541700124411; Thu, 08 Nov 2018 10:02:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541700124; cv=none; d=google.com; s=arc-20160816; b=ZXWwJmPnrPh6H93n42K9oqFjIIkQoTIMG25b5LyDhUYljL5HTGR+GdXxUUi6VMhY7/ /O3lJG9eg+SC7prgVF56qbPp7AeqPFNL6opKmqQZgUymu4lDz4UmNnOciA0sj9M3u6OT 9IiS7ixSZIr+zK/atHVgym9cgwJqU1eN9tdGPkEjHTGCED9jirmzipz7pT/ep8oM7vvd gtL2NeeOmN3BSmzHEAMqvD3KdOyhQLtEGGCAPSyM+2bdxOEk1kWBzhygRYNb0JRt7S1M Z0iTqVZAzNSr/Zgs4nvQDTkZjUXld/bULqtVvT0hbxinYYW1qyJlvrGW/Zxelk7Di7ep C1zA== 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=6uQuU327VC/BRal1lZ+nVzurXjaVdMxrSfBdC83uyXQ=; b=ztiRYtDzemG0LAJ9IQd6RNA6JXDAupFEUwMz9qDmtg7iGH+B99xmNFjLGEUvIkZdia crgdFT2VQBgFdFHSnk7WkG4WvQbXwrvAvkMU03mkvxy+Kj+WTMDzl+irJTV4JD9/iKlS I1Elt6jlvZ1SSQ3ueKrhWdkGIN+qxx7abqRsNIr3t9mO3RetgVWlTOSTITcSWFa24grK CT7OM9FZNrK327l4W2bp7cU/mNnD/GkvELKT0bCLs87Lmo1nq80drmcUuYLMeOxoYQB+ eB0In7e0d4iNnq+X+bXL+BbPegYVMfF+xgraxpsVeGq2p33qo9a3OdB5DU3nDVl0wzkW exkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AdXeHyjb; 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 g11si815453qth.320.2018.11.08.10.02.04 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Nov 2018 10:02:04 -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=AdXeHyjb; 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]:58376 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKod1-0008Od-Ur for patch@linaro.org; Thu, 08 Nov 2018 13:02:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoW8-0001c7-Dg for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKoW4-0008AR-PY for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:56 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:40272) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKoW4-00089z-Il for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:52 -0500 Received: by mail-wr1-x441.google.com with SMTP id i17-v6so22220236wre.7 for ; Thu, 08 Nov 2018 09:54:52 -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=6uQuU327VC/BRal1lZ+nVzurXjaVdMxrSfBdC83uyXQ=; b=AdXeHyjb4bhTngj2jOmlKAc+dTMxjLHweNLh6SHBSnPE0K3GeEmT3U3xirg7jyd1e/ 9umS4anC7dFpYyxGLE2d4zVVd+OS/aj2jO//ZoznjvfVngGp2SyF9ux/HAxeZ4DZXxBo DDOyDu+DmeJplsM5Wuhk/URBVkdQMAhYMXx6k= 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=6uQuU327VC/BRal1lZ+nVzurXjaVdMxrSfBdC83uyXQ=; b=qYLY/WeiFlAyrhPG8/24BXjXeyRjd0GrlbuBu3i/94UismyNRZoael7qc7Of4AxoAq j8Xe/7akM0wN5Nll+UZ++q35ODcP4T0YZEXL9bR5lmOfZEFTM7p5zykshbQzZFozpn5t xn5hsCP74Pj6VAOgzjPrs+hu2wjsmAotnQKWD6sSN5/JfRaZeqiL8SY6PDAcHZIVH1vU MsqOIBqjNAqoMaVwdOrTWN/JW9MYDDMJ35smLNDYn27VOo1VOiOyNaIcsAjLZkl3nmLj BwPWdVMoLF2zYHmDoUWdTCdg9LSC8AlRZs1LkicDd/TPRGE8inKwH7bkNepfVqnJjUO1 nhKQ== X-Gm-Message-State: AGRZ1gJTnfqE6vQCgOldzk3Ny+BzrPyNa+em6qlu+I3S74YAMCs26d8v PxBKD0Qv7kMxiyeOwyYcuXaGsS0JLYeHRg== X-Received: by 2002:adf:fb12:: with SMTP id c18-v6mr5172342wrr.200.1541699691212; Thu, 08 Nov 2018 09:54:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:54:50 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 8 Nov 2018 18:52:43 +0100 Message-Id: <20181108175246.13416-3-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::441 Subject: [Qemu-devel] [PATCH v3 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 2 deletions(-) -- 2.17.2 diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c index 5de8ff0ac5..e1128b94b2 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; + /* 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,71 @@ 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_aa64pfr0, + ARM64_SYS_REG(3, 0, 0, 4, 0)); + if (unlikely(err < 0)) { + /* + * Before v4.15, the kernel only exposed a limited number of system + * registers, not including any of the interesting AArch64 ID regs. + * For the most part we could leave these fields as zero with minimal + * effect, since this does not affect the values seen by the guest. + * + * However, it could cause problems down the line for QEMU, + * so provide a minimal v8.0 default. + * + * ??? Could read MIDR and use knowledge from cpu64.c. + * ??? Could map a page of memory into our temp guest and + * run the tiniest of hand-crafted kernels to extract + * the values seen by the guest. + * ??? Either of these sounds like too much effort just + * to work around running a modern host kernel. + */ + ahcf->isar.id_aa64pfr0 = 0x00000011; /* EL1&0, AArch64 only */ + err = 0; + } else { + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64pfr1, + ARM64_SYS_REG(3, 0, 0, 4, 1)); + 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)); + + /* + * 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. 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; } From patchwork Thu Nov 8 17:52:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150561 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1136807ljp; Thu, 8 Nov 2018 09:57:11 -0800 (PST) X-Google-Smtp-Source: AJdET5eG7q6NYX6xsGCovR5Wejpd/BPyfdhydsxQfqgxcMfWrb5ot3qcuc8VYIGkx0Jmbijpgx8w X-Received: by 2002:a0c:f392:: with SMTP id i18mr5585039qvk.30.1541699831875; Thu, 08 Nov 2018 09:57:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541699831; cv=none; d=google.com; s=arc-20160816; b=i+vLUjAQrhlWtHtkNGwUTj4VdkrvRcKLmG3KW6+4VfEyzhrF1zs7zGm3zUuhc7mIkl pC6sk4+PVUQBnsgXQjQmYXImaPjiTc88gya+9NTdpOMgaB4c3Yn25PbIJ3GnqsA3afYW RHVdQxn6PKZyNu7vBB0biTuOxTQ8ij5ax1vb99OSiuAaMR0HPCIcX815/LkA2EsAYvPM WxxtTXpWzq4BZ1a1ynIAgPjU0dqqHZM3aIVPi+K8E9sQN/4J3TFMrvOoFNoxIpPKBxQf clhnsb7GtnnkFiSnm/pdWoQgjQiHtK1+Tww0ySfhJ9jDwuvaxUTIBwdVEOFwCzlXYryi AZXw== 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=Xb8qasGGEBVJuzUJvReZfnwfw3l/sa7Djl2gXpUSNbI=; b=j28gcoN+G9jW1v93lbVwOBVIba199ZGmdqq7Y6a6DMrllDQC7zPyN9m6CKcBgMy0oQ vyYOREign+qYhj5S+F0S1cdc15lL+keFq0LGTBVN+v+ENqwy3tmSFkR7mK8l/NS7T3fP UEn04TOsDuiihCkg/8pSGUGpsQD1cbM+ZPq0PNb7tkFdhSvDWuUO5xaejPIJBstkcQ/u 8uv7RbbmXve5d5itwmbv+l4vQboGfVidp+dJrn5XTvVTc1JAXORs376MOvEI0gCQ8O/S Jnjzelf2rTTr35xTR5YkhVdE1g02Ay4amRcK25ZhCK1GpyIIxiLW5TPVRBvsqgcVeqpn QELg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Kbxa93T5; 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 i68-v6si3247080qkb.129.2018.11.08.09.57.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Nov 2018 09:57:11 -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=Kbxa93T5; 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]:58342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoYJ-00039l-Cg for patch@linaro.org; Thu, 08 Nov 2018 12:57:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoW8-0001cD-JM 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 1gKoW7-0008Cl-EG for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:56 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36225) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKoW7-0008Bw-6R for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:55 -0500 Received: by mail-wr1-x444.google.com with SMTP id z13-v6so19844123wrs.3 for ; Thu, 08 Nov 2018 09:54:54 -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=Xb8qasGGEBVJuzUJvReZfnwfw3l/sa7Djl2gXpUSNbI=; b=Kbxa93T5t7ZLwlFtc6CCj6X9YXueMS0TjwI435j0TefkO1bNI4Pky9czNZ2PmgF/z5 1xei0ZWuPWlc+2Fs9Z0PIQ0ueF7JPp6rfLplUwmNMGMNyD49kkGzqCKqJgG8kS6LLN7u aDqkeX1j/0dhI51AzjBoawlKmzksB48rusWF8= 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=Xb8qasGGEBVJuzUJvReZfnwfw3l/sa7Djl2gXpUSNbI=; b=gBtyI/ESK3zx+GkrOYZxhPIG4zMZu/STklikp1BlfxLI1Sr1iGbmVe2PXFSxJ4VmSa qDmtH++e3TO28VivJ28O3BsuSxB/NgRzMoL45PsZ3IcQIVv4TNo1oX8YqTMhaxz6OGGR PdAEy5NoTnE9ubDQtjp0o5hcxPKp7cIt9cszJRGUiEArkCcQtT3G8GuaxVpmOa6MtfQq 4j3gFrz/4w4DD3pqmXn+hf94for8VV6Qrh7ZyI1fYvcB8G+qk8rxBB0rE6HbfHIrqUPl Icu4mlEMaj6OtuV80S44DTcUVWOvljrzNFqWobMiD+C5P6R4el398nEms+GBLpCR8zPd Ly0w== X-Gm-Message-State: AGRZ1gK1077iZ5n6tq/Ybn6GMez/PaUIPTVJ7YJyYzKK1HvZTLTl9WiU +rn37oDKai8jfViT8AuNqOsXTMa0HHhv1Q== X-Received: by 2002:adf:9441:: with SMTP id 59-v6mr4860421wrq.305.1541699693655; Thu, 08 Nov 2018 09:54:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:54:53 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 8 Nov 2018 18:52:45 +0100 Message-Id: <20181108175246.13416-5-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::444 Subject: [Qemu-devel] [PATCH v3 4/5] target/arm: Fill in ARMISARegisters 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" Signed-off-by: Richard Henderson --- target/arm/kvm32.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index de573f9aa8..9ededa3c73 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -44,7 +44,7 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) * and then query that CPU for the relevant ID registers. */ int err = 0, fdarray[3]; - uint32_t midr, id_pfr0, mvfr1; + uint32_t midr, id_pfr0; uint64_t features = 0; /* Old kernels may not know about the PREFERRED_TARGET ioctl: however @@ -71,9 +71,32 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) 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, + + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar0, + ARM_CP15_REG32(0, 0, 2, 0)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar1, + ARM_CP15_REG32(0, 0, 2, 1)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar2, + ARM_CP15_REG32(0, 0, 2, 2)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar3, + ARM_CP15_REG32(0, 0, 2, 3)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar4, + ARM_CP15_REG32(0, 0, 2, 4)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar5, + ARM_CP15_REG32(0, 0, 2, 5)); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.id_isar6, + ARM_CP15_REG32(0, 0, 2, 7)); + + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr0, + KVM_REG_ARM | KVM_REG_SIZE_U32 | + KVM_REG_ARM_VFP | KVM_REG_ARM_VFP_MVFR0); + err |= read_sys_reg32(fdarray[2], &ahcf->isar.mvfr1, KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_VFP | KVM_REG_ARM_VFP_MVFR1); + /* + * FIXME: There is not yet a way to read MVFR2. + * Fortunately there is not yet anything in there that affects migration. + */ kvm_arm_destroy_scratch_host_vcpu(fdarray); @@ -95,13 +118,13 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) if (extract32(id_pfr0, 12, 4) == 1) { set_feature(&features, ARM_FEATURE_THUMB2EE); } - if (extract32(mvfr1, 20, 4) == 1) { + if (extract32(ahcf->isar.mvfr1, 20, 4) == 1) { set_feature(&features, ARM_FEATURE_VFP_FP16); } - if (extract32(mvfr1, 12, 4) == 1) { + if (extract32(ahcf->isar.mvfr1, 12, 4) == 1) { set_feature(&features, ARM_FEATURE_NEON); } - if (extract32(mvfr1, 28, 4) == 1) { + if (extract32(ahcf->isar.mvfr1, 28, 4) == 1) { /* FMAC support implies VFPv4 */ set_feature(&features, ARM_FEATURE_VFP4); } From patchwork Thu Nov 8 17:52:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 150565 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1142627ljp; Thu, 8 Nov 2018 10:02:28 -0800 (PST) X-Google-Smtp-Source: AJdET5cTYyyFBzhGp0Cg7JhrhTptFYEBdcRbaMHdV+bm6NvwfcsKraEq8UF0E1MaEiYGT6YaUySz X-Received: by 2002:a0c:a4a3:: with SMTP id x32mr5448075qvx.89.1541700147052; Thu, 08 Nov 2018 10:02:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541700147; cv=none; d=google.com; s=arc-20160816; b=xRHdOgg9QzL9gOo2kXNBr2HhK0c3sRgXzuMigSUXygmCKaftGqhV6I7V5MtIsIDpHn PiLgafoDO2vfcmj5ZmGg6/usCFND0TaUplq+RadQ+1SbERgM27scq6Ta+QmplAzrsiki lNbodx7opGS313dRxC0iLlc11MyyOKM7mtg6XfmENqJ6b6MMBwUanAlNmKjP9mtMxDlk BjFKoWGNqmyoamOgERAA9LqOn1eCWLyY1O9WaTAcisq9ZwKC9WN8u5sllwNOMP5x2WXs gbtdoXNCvusx7ujkTSRtMzsbnzAO7YD2lQFZjIOUe3+sWTAc/7/7li+EGUfazI8gRBf3 sqBA== 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=zlFdkBkZo5nt5LFadOS5kmImPmiLZuKCuNQcIkYLDuU=; b=hgIpCB0z2N+kQ+VtHVuLQqjntGQ++/tMYnLnFZyD625wdWt8RnTj0Ol6T0RTUj34Qu Butu8uyGSgzSByrg6eNem43A7zBTuvJfR3FaovcKcsVkc8TCf2KxzO1ueUn6+dwffOgl ykpz1JA/CeBmjgF2zDu1uY2R4LXR9kNeIx8TXc83gfcKaOnRC9y6h1PWio+mfrCiqNXc RAskepcR+gWKTLzoklMWWwn32AMhTO5KbRmpdwVOYY7WJGco4JuYh2goyuvI0EO2k93J BJPkaX5CYJPGMd1Zgj8DMA+9FiBJ6SAtbAJJiwL6fY1Kw3zWlSxrdjN+2wvOK8VnTV94 UBvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iKmxGaMW; 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 e17si3481731qkj.109.2018.11.08.10.02.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 08 Nov 2018 10:02:27 -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=iKmxGaMW; 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]:58378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKodO-0008TD-3E for patch@linaro.org; Thu, 08 Nov 2018 13:02:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39614) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKoWB-0001d7-Aa for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:55:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKoW8-0008Ek-MN for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:59 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38475) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gKoW8-0008Cv-8q for qemu-devel@nongnu.org; Thu, 08 Nov 2018 12:54:56 -0500 Received: by mail-wm1-x344.google.com with SMTP id f2-v6so2033299wme.3 for ; Thu, 08 Nov 2018 09:54:56 -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=zlFdkBkZo5nt5LFadOS5kmImPmiLZuKCuNQcIkYLDuU=; b=iKmxGaMW4tihGC/qQdP4MkkPVOeTV3lkT+LEx6VeHFTUeNlVXS821ei5djZx+OAh9X GGMv2/6LEyFZiAa/xrwwD2/C0bKBvMmJcNIIfMITE/frD1lrZL2TPw1ha5uMubU/ZJd3 syD7pbaYkRKxkP2j8fs55pyrTBEhuvxNOsAoE= 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=zlFdkBkZo5nt5LFadOS5kmImPmiLZuKCuNQcIkYLDuU=; b=JVwasmVQXejaxaANU1XxwGZAuJIthsEC5AbR8bWY+x1xLgEXo89UQAVPR/nfOkH9F8 KtYmuh856jwNsY6ZOzRwaY/jeCBVJRqSbC1VatfpjB1R4hUeaM/cQrIu5mexJjQx5VZU MyUJTsivH9UqgtsDDmvZiacxiAM0z3SFbxIXoTZRuL81/RKf2fOG7j3R0nwLw00Ps+ja JsU1vAQ16O70BFPCjhoKY3CdWMiKY93fIkzOnAyjryMF2Y9yGpdu3BW7SZGk7Ufgey21 TQDkgqa0Ca6Re95kgOlc5ZNCu6bEJFPYIWobXXpbwaGaYLoURo6mnJm4IvmG666lLyQH ev0w== X-Gm-Message-State: AGRZ1gLVHrqW1DPAReEIgoIORpYtDeHMGQXkhBHYCv1uzcFucggymQ2T ShBmo4bQOu45rgAwFcB8dr5RCINwGcTXDA== X-Received: by 2002:a1c:5885:: with SMTP id m127-v6mr2005469wmb.118.1541699694705; Thu, 08 Nov 2018 09:54:54 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Nov 2018 09:54:54 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 8 Nov 2018 18:52:46 +0100 Message-Id: <20181108175246.13416-6-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::344 Subject: [Qemu-devel] [PATCH v3 5/5] target/arm: Convert t32ee from feature bit to isar3 test 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" Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/cpu.h | 6 +++++- linux-user/elfload.c | 2 +- target/arm/cpu.c | 4 ---- target/arm/helper.c | 2 +- target/arm/kvm32.c | 3 --- target/arm/machine.c | 3 +-- 6 files changed, 8 insertions(+), 12 deletions(-) -- 2.17.2 Reviewed-by: Philippe Mathieu-Daudé diff --git a/target/arm/cpu.h b/target/arm/cpu.h index b5eff79f73..5c2c77c31d 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1575,7 +1575,6 @@ enum arm_features { ARM_FEATURE_NEON, ARM_FEATURE_M, /* Microcontroller profile. */ ARM_FEATURE_OMAPCP, /* OMAP specific CP15 ops handling. */ - ARM_FEATURE_THUMB2EE, ARM_FEATURE_V7MP, /* v7 Multiprocessing Extensions */ ARM_FEATURE_V7VE, /* v7 Virtualization Extensions (non-EL2 parts) */ ARM_FEATURE_V4T, @@ -3172,6 +3171,11 @@ static inline bool isar_feature_jazelle(const ARMISARegisters *id) return FIELD_EX32(id->id_isar1, ID_ISAR1, JAZELLE) != 0; } +static inline bool isar_feature_t32ee(const ARMISARegisters *id) +{ + return FIELD_EX32(id->id_isar3, ID_ISAR3, T32EE) != 0; +} + static inline bool isar_feature_aa32_aes(const ARMISARegisters *id) { return FIELD_EX32(id->id_isar5, ID_ISAR5, AES) != 0; diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 5bccd2e243..a3503c83c9 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -466,7 +466,7 @@ static uint32_t get_elf_hwcap(void) GET_FEATURE(ARM_FEATURE_V5, ARM_HWCAP_ARM_EDSP); GET_FEATURE(ARM_FEATURE_VFP, ARM_HWCAP_ARM_VFP); GET_FEATURE(ARM_FEATURE_IWMMXT, ARM_HWCAP_ARM_IWMMXT); - GET_FEATURE(ARM_FEATURE_THUMB2EE, ARM_HWCAP_ARM_THUMBEE); + GET_FEATURE_ID(t32ee, ARM_HWCAP_ARM_THUMBEE); GET_FEATURE(ARM_FEATURE_NEON, ARM_HWCAP_ARM_NEON); GET_FEATURE(ARM_FEATURE_VFP3, ARM_HWCAP_ARM_VFPv3); GET_FEATURE(ARM_FEATURE_V6K, ARM_HWCAP_ARM_TLS); diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 784a4c2dfc..d4dc0bc225 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1451,7 +1451,6 @@ static void cortex_a8_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7); set_feature(&cpu->env, ARM_FEATURE_VFP3); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_EL3); cpu->midr = 0x410fc080; @@ -1520,7 +1519,6 @@ static void cortex_a9_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_VFP3); set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_EL3); /* Note that A9 supports the MP extensions even for * A9UP and single-core A9MP (which are both different @@ -1583,7 +1581,6 @@ static void cortex_a7_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7VE); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); @@ -1629,7 +1626,6 @@ static void cortex_a15_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_V7VE); set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); set_feature(&cpu->env, ARM_FEATURE_GENERIC_TIMER); set_feature(&cpu->env, ARM_FEATURE_DUMMY_C15_REGS); set_feature(&cpu->env, ARM_FEATURE_CBAR_RO); diff --git a/target/arm/helper.c b/target/arm/helper.c index 96301930cc..e28770833a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5457,7 +5457,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) define_arm_cp_regs(cpu, vmsa_pmsa_cp_reginfo); define_arm_cp_regs(cpu, vmsa_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_THUMB2EE)) { + if (cpu_isar_feature(t32ee, cpu)) { define_arm_cp_regs(cpu, t2ee_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) { diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 9ededa3c73..8b2c9b3075 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -115,9 +115,6 @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) set_feature(&features, ARM_FEATURE_VFP3); set_feature(&features, ARM_FEATURE_GENERIC_TIMER); - if (extract32(id_pfr0, 12, 4) == 1) { - set_feature(&features, ARM_FEATURE_THUMB2EE); - } if (extract32(ahcf->isar.mvfr1, 20, 4) == 1) { set_feature(&features, ARM_FEATURE_VFP_FP16); } diff --git a/target/arm/machine.c b/target/arm/machine.c index 239fe4e84d..07f904709a 100644 --- a/target/arm/machine.c +++ b/target/arm/machine.c @@ -321,9 +321,8 @@ static const VMStateDescription vmstate_m = { static bool thumb2ee_needed(void *opaque) { ARMCPU *cpu = opaque; - CPUARMState *env = &cpu->env; - return arm_feature(env, ARM_FEATURE_THUMB2EE); + return cpu_isar_feature(t32ee, cpu); } static const VMStateDescription vmstate_thumb2ee = {