Received: by 2002:adf:c793:0:0:0:0:0 with SMTP id l19csp849087wrg; Fri, 21 Jun 2019 09:34:57 -0700 (PDT) X-Google-Smtp-Source: APXvYqwmz/XDgnAnlOiPG1IjkXF+aSUNLwbgJwKmCPBBNaRmK1mXiXBk1ysR/8k7yQ+deGfB2O8s X-Received: by 2002:a0c:984b:: with SMTP id e11mr45835612qvd.174.1561134897678; Fri, 21 Jun 2019 09:34:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561134897; cv=none; d=google.com; s=arc-20160816; b=l2LdTqgBqnUlAQjVWeX68nwrkfRrTmO06H+IPafax5kFP5DHOL6+mgATdd6idR3PkE Q8SMvdR4q1o7+dlEWs1hpwNgcNoa0j1MiT6yHadUYw7xhqIVN/VP+fF7QvD4YAd/lBCf hzeI7kYF4uDRRfhlunWSk+CeVw9ATLNa4NE9GUCIWe2tZbahVJ/AgKoBoxx824/VKCHI qhd0+47mdEewDjWhOrDGuTt6bbUas9noHCE7D+hQXpef1Xuatc66XLiZ5TMaHvSBRASj GLhOG0+I+ejy91v9UOuIDnkF/2n4AY4FrReB9/oOnDz5oFya07jxCE1hnLZ0BDRIaEmM TL3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=P+S0KoOVlwqZle5eUoF9eI0kjFYDDhrHi1u8qCe0AFk=; b=ZqocoR2VHNHPcwv3qn9R2QvB3uV5+SovkydClY+8LgZ8bQws3NiuOHLzU73iMCbuAL l3ORr6qeEtnseJD6QHKe0IqhuMQxS07HY3IRldo3Izr0TMGz94tNQrRGLkxejP2lU8VI /dnjM4LZuMHim3nYLL+nGbOhYQZkSW7InQM+FHf56OUsx3jzLkZoa33oa3u5Y5JazbnW l+G+gp6jgHkbRj5HEa34tFxSnX4FFZ1NEf0A8AP3QTs1REIqrr5SVyhZsnO1gdwj9eHs wNV3naOz+KXsd7GF5hni7p0Wx3hPZHNBeArL9o1ix7IfJuedhPDc63gm/wxsqBQpRWwE 94cg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of drjones@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=drjones@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTPS id t3si2241646qvt.202.2019.06.21.09.34.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Jun 2019 09:34:57 -0700 (PDT) Received-SPF: pass (google.com: domain of drjones@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Authentication-Results: mx.google.com; spf=pass (google.com: domain of drjones@redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=drjones@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9579B3002E1D; Fri, 21 Jun 2019 16:34:56 +0000 (UTC) Received: from kamzik.brq.redhat.com (unknown [10.43.2.160]) by smtp.corp.redhat.com (Postfix) with ESMTP id 615211001DE1; Fri, 21 Jun 2019 16:34:50 +0000 (UTC) From: Andrew Jones To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: peter.maydell@linaro.org, richard.henderson@linaro.org, alex.bennee@linaro.org, armbru@redhat.com, eblake@redhat.com, Dave.Martin@arm.com, eric.auger@redhat.com, imammedo@redhat.com Subject: [PATCH v2 06/14] target/arm: Allow SVE to be disabled via a CPU property Date: Fri, 21 Jun 2019 18:34:14 +0200 Message-Id: <20190621163422.6127-7-drjones@redhat.com> In-Reply-To: <20190621163422.6127-1-drjones@redhat.com> References: <20190621163422.6127-1-drjones@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 21 Jun 2019 16:34:56 +0000 (UTC) X-TUID: WWC8EGE5pgUP Since 97a28b0eeac14 ("target/arm: Allow VFP and Neon to be disabled via a CPU property") we can disable the 'max' cpu model's VFP and neon features, but there's no way to disable SVE. Add the 'sve=on|off' property to give it that flexibility. We also rename cpu_max_get/set_sve_vq to cpu_max_get/set_sve_max_vq in order for them to follow the typical *_get/set_ pattern. Signed-off-by: Andrew Jones --- target/arm/cpu.c | 10 +++++- target/arm/cpu64.c | 72 ++++++++++++++++++++++++++++++++++------ target/arm/helper.c | 8 +++-- target/arm/monitor.c | 2 +- tests/arm-cpu-features.c | 1 + 5 files changed, 78 insertions(+), 15 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 858f668d226e..f08e178fc84b 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -198,7 +198,7 @@ static void arm_cpu_reset(CPUState *s) env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 16, 2, 3); env->cp15.cptr_el[3] |= CPTR_EZ; /* with maximum vector length */ - env->vfp.zcr_el[1] = cpu->sve_max_vq - 1; + env->vfp.zcr_el[1] = cpu->sve_max_vq ? cpu->sve_max_vq - 1 : 0; env->vfp.zcr_el[2] = env->vfp.zcr_el[1]; env->vfp.zcr_el[3] = env->vfp.zcr_el[1]; /* @@ -1129,6 +1129,14 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) cpu->isar.mvfr0 = u; } + if (!cpu->sve_max_vq) { + uint64_t t; + + t = cpu->isar.id_aa64pfr0; + t = FIELD_DP64(t, ID_AA64PFR0, SVE, 0); + cpu->isar.id_aa64pfr0 = t; + } + if (arm_feature(env, ARM_FEATURE_M) && !cpu->has_dsp) { uint32_t u; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 946994838d8a..02ada65f240c 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -257,27 +257,75 @@ static void aarch64_a72_initfn(Object *obj) define_arm_cp_regs(cpu, cortex_a72_a57_a53_cp_reginfo); } -static void cpu_max_get_sve_vq(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void cpu_max_get_sve_max_vq(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { ARMCPU *cpu = ARM_CPU(obj); visit_type_uint32(v, name, &cpu->sve_max_vq, errp); } -static void cpu_max_set_sve_vq(Object *obj, Visitor *v, const char *name, - void *opaque, Error **errp) +static void cpu_max_set_sve_max_vq(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) { ARMCPU *cpu = ARM_CPU(obj); Error *err = NULL; + uint32_t value; - visit_type_uint32(v, name, &cpu->sve_max_vq, &err); + visit_type_uint32(v, name, &value, &err); + if (err) { + error_propagate(errp, err); + return; + } - if (!err && (cpu->sve_max_vq == 0 || cpu->sve_max_vq > ARM_MAX_VQ)) { - error_setg(&err, "unsupported SVE vector length"); - error_append_hint(&err, "Valid sve-max-vq in range [1-%d]\n", + if (!cpu->sve_max_vq) { + error_setg(errp, "cannot set sve-max-vq"); + error_append_hint(errp, "SVE has been disabled with sve=off\n"); + return; + } + + cpu->sve_max_vq = value; + + if (cpu->sve_max_vq == 0 || cpu->sve_max_vq > ARM_MAX_VQ) { + error_setg(errp, "unsupported SVE vector length"); + error_append_hint(errp, "Valid sve-max-vq in range [1-%d]\n", ARM_MAX_VQ); } - error_propagate(errp, err); +} + +static void cpu_arm_get_sve(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + bool value = !!cpu->sve_max_vq; + + visit_type_bool(v, name, &value, errp); +} + +static void cpu_arm_set_sve(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + ARMCPU *cpu = ARM_CPU(obj); + Error *err = NULL; + bool value; + + visit_type_bool(v, name, &value, &err); + if (err) { + error_propagate(errp, err); + return; + } + + if (value) { + /* + * We handle the -cpu ,sve=off,sve=on case by reinitializing, + * but otherwise we don't do anything as an sve=on could come after + * a sve-max-vq setting. + */ + if (!cpu->sve_max_vq) { + cpu->sve_max_vq = ARM_MAX_VQ; + } + } else { + cpu->sve_max_vq = 0; + } } /* -cpu max: if KVM is enabled, like -cpu host (best possible with this host); @@ -373,8 +421,10 @@ static void aarch64_max_initfn(Object *obj) #endif cpu->sve_max_vq = ARM_MAX_VQ; - object_property_add(obj, "sve-max-vq", "uint32", cpu_max_get_sve_vq, - cpu_max_set_sve_vq, NULL, NULL, &error_fatal); + object_property_add(obj, "sve-max-vq", "uint32", cpu_max_get_sve_max_vq, + cpu_max_set_sve_max_vq, NULL, NULL, &error_fatal); + object_property_add(obj, "sve", "bool", cpu_arm_get_sve, + cpu_arm_set_sve, NULL, NULL, &error_fatal); } } diff --git a/target/arm/helper.c b/target/arm/helper.c index edba94004e0b..f500ccb6d31b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5314,9 +5314,13 @@ uint32_t sve_zcr_len_for_el(CPUARMState *env, int el) static void zcr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) { + ARMCPU *cpu = env_archcpu(env); int cur_el = arm_current_el(env); - int old_len = sve_zcr_len_for_el(env, cur_el); - int new_len; + int old_len, new_len; + + assert(cpu->sve_max_vq); + + old_len = sve_zcr_len_for_el(env, cur_el); /* Bits other than [3:0] are RAZ/WI. */ QEMU_BUILD_BUG_ON(ARM_MAX_VQ > 16); diff --git a/target/arm/monitor.c b/target/arm/monitor.c index 19e3120eef95..157c487a1551 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -90,7 +90,7 @@ GICCapabilityList *qmp_query_gic_capabilities(Error **errp) } static const char *cpu_model_advertised_features[] = { - "aarch64", "pmu", + "aarch64", "pmu", "sve", NULL }; diff --git a/tests/arm-cpu-features.c b/tests/arm-cpu-features.c index 31b1c15bb979..509e458e9c2f 100644 --- a/tests/arm-cpu-features.c +++ b/tests/arm-cpu-features.c @@ -158,6 +158,7 @@ static void test_query_cpu_model_expansion(const void *data) if (g_str_equal(qtest_get_arch(), "aarch64")) { assert_has_feature(qts, "max", "aarch64"); + assert_has_feature(qts, "max", "sve"); assert_has_feature(qts, "cortex-a57", "pmu"); assert_has_feature(qts, "cortex-a57", "aarch64"); -- 2.20.1