From patchwork Fri Sep 6 11:12:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 825953 Delivered-To: patch@linaro.org Received: by 2002:adf:a345:0:b0:367:895a:4699 with SMTP id d5csp749451wrb; Fri, 6 Sep 2024 04:28:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFZjdcGanAZv399n5OSiaSn3L2HS9IexCOPJ06svr/Sn9Qy82CrmRh7mNhbRKdjDSYZvgNTA==@linaro.org X-Google-Smtp-Source: AGHT+IFzs+Yg7BqKd8VBK2/pZVQZyB5ragUKSFxlFOV3X1xemdbjgtPS7UZ4FGI5t6EGeO9q4zuW X-Received: by 2002:a05:600c:3b9a:b0:426:62df:bdf0 with SMTP id 5b1f17b1804b1-42c9f983b92mr16306325e9.10.1725622097911; Fri, 06 Sep 2024 04:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725622097; cv=none; d=google.com; s=arc-20240605; b=CUJnAAOIliy1f9PgYfToS++71zegpGdK0rB5fyaSG2zTSrXJ9/9/X3iTHW21wyS6lO RT35NRbDSyBRBA7TqLTir9MvPVnofUFi5epB6wpYlRoydAYONZgM9l4z/msFrevrO2Ei ibKoezQXoSUvOXnoDkn8tQYlQpb8pp/n6YQfyyfCYYuhkgMUpXk2QVPNr6vMFk2BTxyp m5B0UFalIKs85kC1Rc/OrL9wMrflmgqcZfvLGmu3GTFcI0g8XSJM4ON2rKFSWHkvooqx dfArZ2c9qK+aG2yzKkuTQNkCAUjtm90HeCr4H1nuh7XmyaNxbVBooOEWEQKl8i0N8UE+ Ag4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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; bh=3IvW9hu07ExpPxcrbPRslYgjxhr7uj5vhgS/mPWpNBI=; fh=xJ1URYKcMN3TM0/XAv5v+aCN+5tIbzAdcfBx5UNgoLw=; b=gTyMY8e56fCgVWwr4C4W/j6pDB7oEiV/Jr0bYJTEWfcsUomLdLxzmvop18IcFnCi4f BiCe2uVyilh8RR4/TObkmd9ET2PvQKLiK8BgsBFY4DFQnhTulnRuO18XIDvYuEu9ImvV 41XohTYXsjIudok3NFQDkq//3k/rKDSAbSp2HHq2w2c6Pw4ZkMPkdv1t9cyIho4BHPNJ a+I+8QxSe7QciuZ9ZHYX4bf7tjUxUWTLxElOjHtTjbZUA+6TUgLaOdiVpjYbWPhDlkV+ 0Wz4XFkLvxWuamYBdzua/y/mOtta4Ea97Z0EpDUOxZ+2skFfbkqUAxLVEOG/xc3ShJuV g9uw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 5b1f17b1804b1-42ca05bedcesi6220105e9.14.2024.09.06.04.28.17 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Sep 2024 04:28:17 -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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smWx1-0005TS-II; Fri, 06 Sep 2024 07:16:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smWwI-0001yU-9Z; Fri, 06 Sep 2024 07:15:45 -0400 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smWwG-00080r-IQ; Fri, 06 Sep 2024 07:15:41 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 612858C48C; Fri, 6 Sep 2024 14:12:08 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 6E0C21336F6; Fri, 6 Sep 2024 14:13:26 +0300 (MSK) Received: (nullmailer pid 353633 invoked by uid 1000); Fri, 06 Sep 2024 11:13:24 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , Richard Henderson , Michael Tokarev Subject: [Stable-9.0.3 28/69] target/arm: Ignore SMCR_EL2.LEN and SVCR_EL2.LEN if EL2 is not enabled Date: Fri, 6 Sep 2024 14:12:37 +0300 Message-Id: <20240906111324.353230-28-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, 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-bounces+patch=linaro.org@nongnu.org From: Peter Maydell When determining the current vector length, the SMCR_EL2.LEN and SVCR_EL2.LEN settings should only be considered if EL2 is enabled (compare the pseudocode CurrentSVL and CurrentNSVL which call EL2Enabled()). We were checking against ARM_FEATURE_EL2 rather than calling arm_is_el2_enabled(), which meant that we would look at SMCR_EL2/SVCR_EL2 when in Secure EL1 or Secure EL0 even if Secure EL2 was not enabled. Use the correct check in sve_vqm1_for_el_sm(). Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20240722172957.1041231-5-peter.maydell@linaro.org (cherry picked from commit f573ac059ed060234fcef4299fae9e500d357c33) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index a620481d7c..42044ae14b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7191,7 +7191,7 @@ uint32_t sve_vqm1_for_el_sm(CPUARMState *env, int el, bool sm) if (el <= 1 && !el_is_in_host(env, el)) { len = MIN(len, 0xf & (uint32_t)cr[1]); } - if (el <= 2 && arm_feature(env, ARM_FEATURE_EL2)) { + if (el <= 2 && arm_is_el2_enabled(env)) { len = MIN(len, 0xf & (uint32_t)cr[2]); } if (arm_feature(env, ARM_FEATURE_EL3)) {