From patchwork Sat Mar 15 06:17:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873838 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1062487wrq; Fri, 14 Mar 2025 23:27:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVA+ge+9+E9b/CIDflmLnhiZo+MTzIfQiw3u0ap4VmO8fpvdZ1uCJE7Lu6nRTT7CkTgv5w5RA==@linaro.org X-Google-Smtp-Source: AGHT+IGy6crw0jszgmjJz1S6sS1n7/x38QZ4t8akFwT0QlHTo50zBNBmcUTm2kFdVpVzaqBlMbBv X-Received: by 2002:a05:622a:11c9:b0:476:95dd:520e with SMTP id d75a77b69052e-476c8149c0amr80031181cf.16.1742020053047; Fri, 14 Mar 2025 23:27:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742020053; cv=none; d=google.com; s=arc-20240605; b=MedAvwn90ptBH2nWDjQtTODgYjJ9QtcgLHYw20cGumfXFtA9JNVX+eRVckUEDm9c09 RpW5032vyldTqAQ0jBpBQ3l8dmaY4pKbh0LpTDlXBSJUT4FxNeRoGBdMtf8c5dwM1J0G gnHIav8sqxmmM64aeIFPgUDqoHb4xmP5WByxgGSWH9Fwz1FRsG9++bQhVFMUjQr9Ryod d7D/cMREdQ7okfY7ULgU8wcVxrAEwmic3tXns2Uz7oupcvoFucvf01zlpXUXExn6fVPE 5+AgjPJMpMXUheyXJNOmXayP9SjVMtOErc9pH1xrrqfWKCFcyoVyEtJm4bpANNOT7FIb JecA== 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=Ec8FPpK+rtzezAa506DRtpAHmgC5e3vVEeCK2i1JZbc=; fh=AguBzhNxG2iiwyQKHwF5YtCZ+FV/izMb9THQLjUeXjw=; b=hLJ08pKK+W/0G+7VniJT+ED7Z5WU9MXqXpDxtrtJrH+QFsVgn/dEODmtyEAjbEKWqb FYoBk/8gDsuF7ylLo3aOXBGlnnPeXWj7AMIjKyw6JCaPaa9M+hDZUMRrmXp/5YzUeS5M PnboA5rkmVg/XJUcrhO/SPHKhktbBARIjoGvfd4ZhZMPszNF5bMArfNCsS+wOompiSN0 GwqG1QakJjJpAvdWEY1CLF5p0jRFrOpOQv2zgo0DpiFJrOBw+OrUQ3X0uhYzfmuZFwCf 5oLP2ukrxhzVsmpIKzbC4cDTUNJd1dowf6MBLW+HDaituqwxXM0qrIm4cb0l2UWvDrRc K5Ag==; 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 d75a77b69052e-476bb64cad7si49656221cf.141.2025.03.14.23.27.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:27:33 -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 1ttKvi-00054H-G2; Sat, 15 Mar 2025 02:23:30 -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 1ttKtW-0007cJ-Ng; Sat, 15 Mar 2025 02:21:16 -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 1ttKtU-0003iw-Ds; Sat, 15 Mar 2025 02:21:14 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id E74FAFF9ED; 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 BEDEA1CAC56; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 79E4B558F1; 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?= , Michael Tokarev Subject: [Stable-9.2.3 33/51] target/arm: Make CNTPS_* UNDEF from Secure EL1 when Secure EL2 is enabled Date: Sat, 15 Mar 2025 09:17:39 +0300 Message-Id: <20250315061801.622606-33-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 When we added Secure EL2 support, we missed that this needs an update to the access code for the EL3 physical timer registers. These are supposed to UNDEF from Secure EL1 when Secure EL2 is enabled. (Note for stable backporting: for backports to branches where CP_ACCESS_UNDEFINED is not defined, the old name to use instead is CP_ACCESS_TRAP_UNCATEGORIZED.) Cc: qemu-stable@nongnu.org Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Message-id: 20250204125009.2281315-4-peter.maydell@linaro.org (cherry picked from commit bdd641541fbef0a27bf9f60e7eba6f8a31d4706c) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index 404ef983f3..a881e890e9 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2654,6 +2654,9 @@ static CPAccessResult gt_stimer_access(CPUARMState *env, if (!arm_is_secure(env)) { return CP_ACCESS_TRAP_UNCATEGORIZED; } + if (arm_is_el2_enabled(env)) { + return CP_ACCESS_UNDEFINED; + } if (!(env->cp15.scr_el3 & SCR_ST)) { return CP_ACCESS_TRAP_EL3; }