From patchwork Thu Feb 12 05:53:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 44584 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 738A521527 for ; Thu, 12 Feb 2015 05:54:45 +0000 (UTC) Received: by lams18 with SMTP id s18sf5007781lam.1 for ; Wed, 11 Feb 2015 21:54:44 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=ZyQOaLMoxILJXWGLPUu+zoAgr+Itw08KwW6rOaUp14M=; b=gS6IMiLCvnTtfG+QKPuSsQadT79ybs6QiWGKL7jRiO9CiOYJOT2BEJQ986+/MzO67M ZS8NcgSPkT4HBXslfrfH8rwUs5uGGZYYcEoqliWX36HIZTEp49NQXeAX8wEzSZXMTxQY xaLyxaxVWbluNdLH4qA78+k+JbdRaNXrIkCab+r6TLdguM2WwVIMylhN1YeCy63SsWfZ pipXqh/Zyt5W3sMYqRrXhfD/9fb1TL3nzB+vsqVXWQoP3pJ/dJ6V3rfKiSjf4XslwVwO uOgNckzRlwePtYf7Qdd22On1xOiTBVQXmWGIAEuMca1I9mkIWfCk9CLM2OwOGGNy4sCG GHMw== X-Gm-Message-State: ALoCoQmG3DfsmCGIP9iYpVH92Y7gynkAcoHBHlg+C8WqkhLlIW4fY3jT9kp2x9zu3dOVjHxvZbGT X-Received: by 10.112.90.226 with SMTP id bz2mr273394lbb.6.1423720484147; Wed, 11 Feb 2015 21:54:44 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.38 with SMTP id p6ls153216lah.52.gmail; Wed, 11 Feb 2015 21:54:43 -0800 (PST) X-Received: by 10.152.115.206 with SMTP id jq14mr1663333lab.69.1423720483858; Wed, 11 Feb 2015 21:54:43 -0800 (PST) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id 2si2241392laq.1.2015.02.11.21.54.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Feb 2015 21:54:43 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by labpn19 with SMTP id pn19so7924083lab.4 for ; Wed, 11 Feb 2015 21:54:43 -0800 (PST) X-Received: by 10.152.87.3 with SMTP id t3mr35084laz.19.1423720483226; Wed, 11 Feb 2015 21:54:43 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp238405lbj; Wed, 11 Feb 2015 21:54:42 -0800 (PST) X-Received: by 10.170.88.194 with SMTP id f185mr2187466yka.33.1423720482304; Wed, 11 Feb 2015 21:54:42 -0800 (PST) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id l8si3951004qaj.25.2015.02.11.21.54.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 11 Feb 2015 21:54:42 -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; Received: from localhost ([::1]:48550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmjZ-0000ry-FR for patch@linaro.org; Thu, 12 Feb 2015 00:54:41 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmin-0008VM-VW for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YLmij-00013e-Cn for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:53 -0500 Received: from mail-ig0-f174.google.com ([209.85.213.174]:45098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YLmij-00013X-88 for qemu-devel@nongnu.org; Thu, 12 Feb 2015 00:53:49 -0500 Received: by mail-ig0-f174.google.com with SMTP id b16so1735516igk.1 for ; Wed, 11 Feb 2015 21:53:48 -0800 (PST) X-Received: by 10.107.152.209 with SMTP id a200mr2974887ioe.14.1423720428641; Wed, 11 Feb 2015 21:53:48 -0800 (PST) Received: from localhost.localdomain ([113.28.134.59]) by mx.google.com with ESMTPSA id hi15sm638526igb.19.2015.02.11.21.53.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 11 Feb 2015 21:53:47 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org, alex.bennee@linaro.org Date: Thu, 12 Feb 2015 13:53:31 +0800 Message-Id: <1423720414-32041-2-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1423720414-32041-1-git-send-email-greg.bellows@linaro.org> References: <1423720414-32041-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.213.174 Cc: edgar.iglesias@gmail.com, Greg Bellows , a.spyridakis@virtualopensystems.com Subject: [Qemu-devel] [PATCH v6 1/4] target-arm: Add CPU property to disable AArch64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: greg.bellows@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Adds registration and get/set functions for enabling/disabling the AArch64 execution state on AArch64 CPUs. By default AArch64 execution state is enabled on AArch64 CPUs, setting the property to off, will disable the execution state. The below QEMU invocation would have AArch64 execution state disabled. $ ./qemu-system-aarch64 -machine virt -cpu cortex-a57,aarch64=off Also adds stripping of features from CPU model string in acquiring the ARM CPU by name. Signed-off-by: Greg Bellows Reviewed-by: Peter Maydell --- v4 -> v5 - Fix error message. v3 -> v4 - Switch from using strtok to g_strsplit - Add disablement of aarch64 option if KVM is not enabled. v1 -> v2 - Scrap the custom CPU feature parsing in favor of using the default CPU parsing. - Add registration of CPU AArch64 property to disable/enable the AArch64 feature. --- target-arm/cpu.c | 5 ++++- target-arm/cpu64.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index d38af74..986f04c 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -544,13 +544,16 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; char *typename; + char **cpuname; if (!cpu_model) { return NULL; } - typename = g_strdup_printf("%s-" TYPE_ARM_CPU, cpu_model); + cpuname = g_strsplit(cpu_model, ",", 1); + typename = g_strdup_printf("%s-" TYPE_ARM_CPU, cpuname[0]); oc = object_class_by_name(typename); + g_strfreev(cpuname); g_free(typename); if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) || object_class_is_abstract(oc)) { diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c index bb778b3..823c739 100644 --- a/target-arm/cpu64.c +++ b/target-arm/cpu64.c @@ -32,6 +32,11 @@ static inline void set_feature(CPUARMState *env, int feature) env->features |= 1ULL << feature; } +static inline void unset_feature(CPUARMState *env, int feature) +{ + env->features &= ~(1ULL << feature); +} + #ifndef CONFIG_USER_ONLY static uint64_t a57_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *ri) { @@ -170,8 +175,42 @@ static const ARMCPUInfo aarch64_cpus[] = { { .name = NULL } }; +static bool aarch64_cpu_get_aarch64(Object *obj, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + + return arm_feature(&cpu->env, ARM_FEATURE_AARCH64); +} + +static void aarch64_cpu_set_aarch64(Object *obj, bool value, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + + /* At this time, this property is only allowed if KVM is enabled. This + * restriction allows us to avoid fixing up functionality that assumes a + * uniform execution state like do_interrupt. + */ + if (!kvm_enabled()) { + error_setg(errp, "'aarch64' feature cannot be disabled " + "unless KVM is enabled"); + return; + } + + if (value == false) { + unset_feature(&cpu->env, ARM_FEATURE_AARCH64); + } else { + set_feature(&cpu->env, ARM_FEATURE_AARCH64); + } +} + static void aarch64_cpu_initfn(Object *obj) { + object_property_add_bool(obj, "aarch64", aarch64_cpu_get_aarch64, + aarch64_cpu_set_aarch64, NULL); + object_property_set_description(obj, "aarch64", + "Set on/off to enable/disable aarch64 " + "execution state ", + NULL); } static void aarch64_cpu_finalizefn(Object *obj)