From patchwork Thu Jun 2 21:48:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 578155 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp964045max; Thu, 2 Jun 2022 15:29:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxc81Q75s4ghHaKkrSSwkz4F692IXDIx3bZgi7p8p/aiS76qgbDhdeXhOrnjkNf3pB+ek7i X-Received: by 2002:a05:620a:40cb:b0:6a0:922b:2d67 with SMTP id g11-20020a05620a40cb00b006a0922b2d67mr4995478qko.20.1654208953000; Thu, 02 Jun 2022 15:29:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654208952; cv=none; d=google.com; s=arc-20160816; b=raNUfFEqyi4DYBydCMV7+0xuUPfYqHofIN/q7sAxCJDCmJEP9orijuM/P5KKJUBtyR vI5IlgD7Y3a50asYZ+zhegcJoj0MG9mkqLpnUP7JESxS9DAt8spLkQV6U+4yk3jif/D/ TP7YyqWnlFKWLUhQsqIhj4mjFQU69lV4J3xjcejFwPjF1Q8DtBwAm9diMQlJPFCg689u lS4zhkcsYELL4RG6U1jSc9Fyzef9DsC7kQ6Ybdf/1YqdRAWEpUKOQW6lRbNo/ChMDD1d gXfCL9VDxKbKAFqPPwLyV+qoz3V383iV20Jv6ZgM9HoKY/23WlMyga2m2GB2+UpFBozW ulQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iCOG6DsXO7r1GwfN6wKfqvV2SzATr8uc1yKAbhFIADk=; b=TK5OG1Jdhzd5Vq5vQft4tjGdv/B5cofxGkkU7H85XR/h+qR79v0lwrAhImwb2Loe2g SvZasCMrHILicP6cZW7ePycIcBrS36qX72WdSNUeX+BRiNYTXvp6bAmj577vpQCjrb64 /yQ+tn/Eu0VYTka0LTAMDSBEFeL/WRZJlVVR74EbZMvCTfal/7smI8XeZ/MuwCJz8XZu YOsRHQllmgTG59L4GwRm9w6W+95iCWom5ll+6+4bNydbQz/j3/554I7ZEcuv0zWOpnSA VBp+2otCwhb6/HWXKbGkIoyqhOLh/z/skqIx5jnd4eXJUbFHFVdjjtPmIIVCnGRduSto JiQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WHTZ1Ajz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id x82-20020a376355000000b006a648fa7b96si2560570qkb.374.2022.06.02.15.29.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Jun 2022 15:29:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WHTZ1Ajz; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nwtJY-0002yo-HO for patch@linaro.org; Thu, 02 Jun 2022 18:29:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nwsh3-0004xL-4l for qemu-devel@nongnu.org; Thu, 02 Jun 2022 17:49:25 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]:52095) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nwsh0-0000DL-Rp for qemu-devel@nongnu.org; Thu, 02 Jun 2022 17:49:24 -0400 Received: by mail-pj1-x102b.google.com with SMTP id cx11so6028962pjb.1 for ; Thu, 02 Jun 2022 14:49:22 -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 :mime-version:content-transfer-encoding; bh=iCOG6DsXO7r1GwfN6wKfqvV2SzATr8uc1yKAbhFIADk=; b=WHTZ1AjzKSx6vBe8d+WassEtCMBWyrCv8R6MB+aGns5aLIh5dmWbrYAqAlEBvrNUf2 fZrLPelzQtSjTOWqIP9zHrBzt4d9bDw5tVqB+kGZ//G1jWb0PebijjU0rbE4CcqndRVK Jz1U3/zO9I2nRWkLlJFUfgYdYg1GhxPiYLK0kQJROvJjh0WU7cXcfKHBECrtUBA/vQFv 6gsFuzPg8uJN6Zi4InFl3v21YNIZpwCusaO90FjClSqlYvupr6vC94a4zdL5ioHTeo/b ZxUzDwnwJm3BTu/iF1xEOMALbgLkz+fQAU+9RQeSpYMGvS1nEt66xSCxlzv6bKaQDqVD 5U+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iCOG6DsXO7r1GwfN6wKfqvV2SzATr8uc1yKAbhFIADk=; b=Fu2W4BSeSuQc+8xwCWjJEvDWZEJYM84Ut3t9nQsIiFT68b6hUHFzozY4kad06/XrnJ ToCdDokHVQA88uMO5MQaqxNtbyYY9jZ4C714cp9uCR8iXS6IZTjFfBedwwk2zhvaPRYs aggwZHQ758ICV0Mn+MZfJWZt57uc+jxwLhPz8B6fEFLqfx/yohkmuIkIsbcOvR2Y6cet 8lggkzAmX0P6EfL+bZ1cwydhROFSZT31W47mDG1rQ8HFOhX7j7VzTYtxusDNFGVQf7df Jn2/z4vumRam5YrP8+9jz9F9aMxUHONdC7vFxhVa3zlgEkxY9axwOQKe5xuAYa5jjcOb SmEg== X-Gm-Message-State: AOAM531mNiDw0A1Evz5ennS9wJqWHJxi3WMWd/zatZb0WfZAkPFA50Rp OqAVPfEjH+VNtM/0K7yFWsZoLZY1XY4BZA== X-Received: by 2002:a17:903:288:b0:15f:a13:dfd5 with SMTP id j8-20020a170903028800b0015f0a13dfd5mr7035089plr.55.1654206561568; Thu, 02 Jun 2022 14:49:21 -0700 (PDT) Received: from stoup.. (174-21-71-225.tukw.qwest.net. [174.21.71.225]) by smtp.gmail.com with ESMTPSA id bf7-20020a170902b90700b00163c6ac211fsm3988760plb.111.2022.06.02.14.49.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jun 2022 14:49:21 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 31/71] target/arm: Move error for sve%d property to arm_cpu_sve_finalize Date: Thu, 2 Jun 2022 14:48:13 -0700 Message-Id: <20220602214853.496211-32-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220602214853.496211-1-richard.henderson@linaro.org> References: <20220602214853.496211-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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" Keep all of the error messages together. This does mean that when setting many sve length properties we'll only generate one error, but we only really need one. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- target/arm/cpu64.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 51c5d8d4bc..e18f585fa7 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -487,8 +487,13 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp) "using only sve properties.\n"); } else { error_setg(errp, "cannot enable sve%d", vq * 128); - error_append_hint(errp, "This CPU does not support " - "the vector length %d-bits.\n", vq * 128); + if (vq_supported) { + error_append_hint(errp, "This CPU does not support " + "the vector length %d-bits.\n", vq * 128); + } else { + error_append_hint(errp, "SVE not supported by KVM " + "on this host\n"); + } } return; } else { @@ -606,12 +611,6 @@ static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name, return; } - if (value && kvm_enabled() && !kvm_arm_sve_supported()) { - error_setg(errp, "cannot enable %s", name); - error_append_hint(errp, "SVE not supported by KVM on this host\n"); - return; - } - cpu->sve_vq_map = deposit32(cpu->sve_vq_map, vq - 1, 1, value); cpu->sve_vq_init |= 1 << (vq - 1); }