From patchwork Sat Mar 15 09:14:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873868 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1104896wrq; Sat, 15 Mar 2025 02:17:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUj+LhEumDRI2Dno/mXQN1COh/8MquPin+9vFeDFHdgaYgaKEcTkWgCuL0ZVKUnMzbjbSDAvg==@linaro.org X-Google-Smtp-Source: AGHT+IGnSCYQZ98JCmJEzpxq0i2Bs/75FoH6fMosv697NnlBUJmz9qZW/gS6dG5uJoVwTjtoPE+D X-Received: by 2002:a05:622a:10e:b0:476:5fd5:4df8 with SMTP id d75a77b69052e-476c81d92cbmr77537451cf.45.1742030255926; Sat, 15 Mar 2025 02:17:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742030255; cv=none; d=google.com; s=arc-20240605; b=AlPS3pFgnSqf10qqnyoB1f/tzJLBlNjedxjXHl6y/0GjV94A2hYdQIN13kfO/KDrw4 DC1sBF5p/9q9Rv3eAIvrxdsrwdxvJANplV69tu1lpq/4w0hlk/SWL1PB1SGOsUVdbZim K6SUJFKSA0iHxEuA6hhRJ/GRIs1Xz4aVKOR4VAeBY37lTrL8XR3Rm7sBIOqcnr4t+h98 m00M5rzW8gnYEzvXaOKA9sfBDxkqiE0ciA3o1UKpj68SUFSrOB3YQ/zzGUszOxyhwJ5w WJp0knaFzwL8ViTNB6d54wQcYry9Ny5uLOsoZKYjOU6hE60eFJdvjg8nhSKzwo0vgF2S thVw== 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=1IzR4071OHmfWfS91TaKToJcj2cmOblh7XtcAwG61VU=; fh=upfN+4mcRAuX+bX9oPqMwq1TP+fTfKlWZBqspF+lG6I=; b=EmSiihseYbdjIYEKsnS3NZ/dkmCh3kBiLM1wVQIAoYqLdTxaErMM+p7jP2OUSInpi8 N5v64sv9Yl7RIcBJWNJHwUw+ibKbDwp5qVyRiH9sbAgqd/3+/5kqQZLdMMaJNzmcrV5M vlJ7w9/Jn0ASEvG4PPokaE/n1JGF8c9RUcGXLSHt4zYgjG3Ev+mAn8P1o81F9HvxkUih 5qmVkv5BC0YN4s3Usnhrm5X6Likf+eual3fm+sL6td1VZuQXAPb1feO9KGVTlDbi1ffM 2X6oQ/vt3QsOjory9mO9ycP46qJVXSjuL8LWoH7aKb6aCPxmOrdwY6v0I0TyjS8E9q08 sQog==; 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-476bb819604si57092621cf.412.2025.03.15.02.17.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Mar 2025 02:17:35 -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 1ttNbz-0002tg-GD; Sat, 15 Mar 2025 05:15:19 -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 1ttNbi-0002fw-NJ; Sat, 15 Mar 2025 05:15:03 -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 1ttNbg-0007lx-Uc; Sat, 15 Mar 2025 05:15:02 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BA680FFBB8; Sat, 15 Mar 2025 12:13:45 +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 C2E1C1CAD51; Sat, 15 Mar 2025 12:14:39 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id A343D55A38; Sat, 15 Mar 2025 12:14:39 +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-7.2.17 07/27] target/arm: Report correct syndrome for UNDEFINED LOR sysregs when NS=0 Date: Sat, 15 Mar 2025 12:14:18 +0300 Message-Id: <20250315091439.657371-7-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 pseudocode for the accessors for the LOR sysregs says they are UNDEFINED if SCR_EL3.NS is 0. We were reporting the wrong syndrome value here; use CP_ACCESS_TRAP_UNCATEGORIZED. Cc: qemu-stable@nongnu.org Fixes: 2d7137c10faf ("target/arm: Implement the ARMv8.1-LOR extension") Signed-off-by: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-id: 20250130182309.717346-5-peter.maydell@linaro.org (cherry picked from commit 707d478ed8f2da6f2327e5af780890c1fd9c371a) Signed-off-by: Michael Tokarev diff --git a/target/arm/helper.c b/target/arm/helper.c index f33fc5c4a6..24585d528b 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6650,8 +6650,8 @@ static CPAccessResult access_lor_other(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) { if (arm_is_secure_below_el3(env)) { - /* Access denied in secure mode. */ - return CP_ACCESS_TRAP; + /* UNDEF if SCR_EL3.NS == 0 */ + return CP_ACCESS_TRAP_UNCATEGORIZED; } return access_lor_ns(env, ri, isread); }