From patchwork Sat Mar 15 06:17:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873847 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1063213wrq; Fri, 14 Mar 2025 23:31:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWpXny26AR0hS+EFNc8kvIqgy88eJSVdqzyiO8rVhkevPV7v6mKrz2Gv0oJV2m/1x+jA+K+fA==@linaro.org X-Google-Smtp-Source: AGHT+IFu5di2neBraeOKuLGMsOvQs1PRj7UfPx/IfIvy+fNZ8iL+Ts7BH3mQe6+NlGl+fWyQDDpy X-Received: by 2002:a05:620a:1d09:b0:7c5:3da4:5bcb with SMTP id af79cd13be357-7c57c570b35mr763272385a.10.1742020274602; Fri, 14 Mar 2025 23:31:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742020274; cv=none; d=google.com; s=arc-20240605; b=Cu9rQYG7n2BLe1BJnCoWArCAWRASlt1+ztdgBKjexGP0JUdH4JS3+qrUdnYbl541u4 Zsc1tDRPP+YHs1GVL8lgemGQXKRCQSwaHuB0sfparFIwBTJK9BkZdlTnWMp2lkA3Dhkk DwR4FFxHckGvCWQ99vPAoEcLXeOgnnONOfW3mTiAtmj+Zys2aF2aB0fO2EHN8/rjpLB7 9VsVlLMFy1aqj0NuPLHULUdbn7fau04mH0NOoFIgr0y2C+Ya2QELKi/DX3dE2DSID0IB q9jxfQm7PLl027z2r/ZOJuROzOYvn2XX4ptodPqWGKF11odhsGdvnOgwlMbi+43cJVcY N00w== 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=H/SrwLlqUsOE7foSWGp7eYcpprvqsozcYXPISZ+DOyM=; fh=upfN+4mcRAuX+bX9oPqMwq1TP+fTfKlWZBqspF+lG6I=; b=htbmIJGfpw7ShKwczsoe1VzyhEwJpGzhI5H7868bNV0bR08PBRXw//mUBqIC2HD+AJ uj/9P8PsTe0OTyuJ1clbl+o0nFpBV9LaSO2a2ImN0lJLc+AOhTElwxRz2IVM5Q6dEf3G EstsGTESrzq6rjyXoBlz1MNmca9xVZOzoE1cDBCZ0SH/yrL0wq+D+H+BSD9CrOW0B4GQ pG7enpAjEEIql8Rmp9wfoPMNC2JryyvcoktwtDquxMi91ed8ACpB3aoHxm/nQMk5JfTm D6xp4X6k9Oq+Gs0ZGHz24fqflkzQycifpPKnm4ZV2yV1JnMp3lmNhrMYHT972AZcSCgK YEAQ==; 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-7c573d329dcsi521332685a.604.2025.03.14.23.31.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:31:14 -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 1ttL0S-0005r4-0s; Sat, 15 Mar 2025 02:28:24 -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 1ttL05-0005ZN-AI for qemu-devel@nongnu.org; Sat, 15 Mar 2025 02:28:06 -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 1ttL03-0004d4-KN for qemu-devel@nongnu.org; Sat, 15 Mar 2025 02:28:00 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6911FFF9CD; Sat, 15 Mar 2025 09:17:07 +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 4066C1CAC36; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 2D30D558B1; Sat, 15 Mar 2025 09:18:01 +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-9.2.3 01/51] target/arm: Report correct syndrome for UNDEFINED CNTPS_*_EL1 from EL2 and NS EL1 Date: Sat, 15 Mar 2025 09:17:07 +0300 Message-Id: <20250315061801.622606-1-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=unavailable 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 fcb13fe87e..8a0065ef60 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2652,7 +2652,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; @@ -2660,7 +2660,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: