From patchwork Sat Mar 15 07:42:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873859 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1081489wrq; Sat, 15 Mar 2025 00:49:02 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+w1Hk4Xc+frOme6qo3YExa1nHQskdl1Narc23pBEO3lsAldLpdLDc18Rzk/pzroh834Aw8A==@linaro.org X-Google-Smtp-Source: AGHT+IHsjPyCYxeHe+wmhgg3H3d3yqKqTVR2t7s4sU6O95tuECnfVVGgl0et81IhRu3nbf+xY6FW X-Received: by 2002:a05:620a:470e:b0:7c5:59a6:bae6 with SMTP id af79cd13be357-7c57c73d882mr648174685a.3.1742024942254; Sat, 15 Mar 2025 00:49:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742024942; cv=none; d=google.com; s=arc-20240605; b=Q10QPQW/nylMGaXlqrq0PDUDWZfnnxX7Ml+SCyXKPC1CiTteDA8KzwDvqRfsz9yL2L MpC4USVI61jimq7KOHemNgAoO0sH9G1p6eB842k3m0Rc8XTPnYvZwh2A8Y29ARp9r0yH 4+YCoTdHepNKixC3lz9o7P0I+QBWwiuNlZ7IFnxvY/e2JU3TJ8O3AQv82M+YjYFRti8r UnCqiDVUIbW137R7va/t8AqlZtx+yRbedjratFw4+eQi/MzBrerqrHdYUDNKL5guH/3e wv6s/fjJIisUMCzSYdqmSLsgtAps3NoNNdXAZuOTmELUKb6ev7/sBRU1/2jIJCv3OEN9 ezeQ== 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=fBb9m0YwWtut93SJjWvQ7jwv4BukV2TiJycyaUhmqjs=; fh=upfN+4mcRAuX+bX9oPqMwq1TP+fTfKlWZBqspF+lG6I=; b=Ub2n5hQ2ZY3ROoy2AdtMTfFvL++LAU7ukt26kUW35hzAL6/MtYPsfV8u9VOYZX0Dh5 RtjBMmT2qnE+28QoZElSxvxqgUBH4sjS63es3jYO5eKGZSpgCpSJRzVAYTTxNWBRM1hS kYp8hMLyK1JLp/0i7p1qNoHKTMZRKZiDvuEjRaHgzQ55hBY+2NVhyXeluTBpNv5hGWWn /ExlGDUKsuO/dZSspD3YdiwwFzqG9KFehtliMnAv8JcKkpr2IF0vsEyXlXkegBynHl0Q MyIlKvFWubG/5En55/ygRZfWtBCmpBJQ9I30Y4W3/iYpFpvavg+dr2DVFSRqHhz7QWkC I6Sw==; 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 af79cd13be357-7c573ccb174si534068385a.322.2025.03.15.00.49.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Mar 2025 00:49:02 -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 1ttMAs-00026c-VR; Sat, 15 Mar 2025 03:43:15 -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 1ttMAp-00023E-Fd; Sat, 15 Mar 2025 03:43:11 -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 1ttMAn-0004oJ-Cf; Sat, 15 Mar 2025 03:43:11 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id A29B6FFAFD; Sat, 15 Mar 2025 10:41:55 +0300 (MSK) Received: from gandalf.tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with ESMTP id 914661CACC7; Sat, 15 Mar 2025 10:42:49 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 6DBD7559E6; Sat, 15 Mar 2025 10:42:49 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell , =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Michael Tokarev Subject: [Stable-8.2.10 09/42] target/arm: Report correct syndrome for UNDEFINED CNTPS_*_EL1 from EL2 and NS EL1 Date: Sat, 15 Mar 2025 10:42:11 +0300 Message-Id: <20250315074249.634718-9-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 The access pseudocode for the CNTPS_TVAL_EL1, CNTPS_CTL_EL1 and CNTPS_CVAL_EL1 secure timer registers says that they are UNDEFINED from EL2 or NS EL1. We incorrectly return CP_ACCESS_TRAP from the access function in these cases, which means that we report the wrong syndrome value to the target EL. Use CP_ACCESS_TRAP_UNCATEGORIZED, which reports the correct syndrome value for an UNDEFINED instruction. Cc: qemu-stable@nongnu.org Fixes: b4d3978c2fd ("target-arm: Add the AArch64 view of the Secure physical timer") Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-id: 20250130182309.717346-2-peter.maydell@linaro.org (cherry picked from commit b819fd6994243aee6f9613edbbacedce4f511c32) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index 7bef2c6675..92d5ee95e6 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2579,7 +2579,7 @@ static CPAccessResult gt_stimer_access(CPUARMState *env, switch (arm_current_el(env)) { case 1: if (!arm_is_secure(env)) { - return CP_ACCESS_TRAP; + return CP_ACCESS_TRAP_UNCATEGORIZED; } if (!(env->cp15.scr_el3 & SCR_ST)) { return CP_ACCESS_TRAP_EL3; @@ -2587,7 +2587,7 @@ static CPAccessResult gt_stimer_access(CPUARMState *env, return CP_ACCESS_OK; case 0: case 2: - return CP_ACCESS_TRAP; + return CP_ACCESS_TRAP_UNCATEGORIZED; case 3: return CP_ACCESS_OK; default: