From patchwork Sat Mar 15 06:17:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 873832 Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1061198wrq; Fri, 14 Mar 2025 23:21:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUjtwzfIGVuLIjia8Pe/ONvee5yHfrF7b2ILjFWeY6lDQLkxkNIzadpbKHL7dQvouRSKfpGew==@linaro.org X-Google-Smtp-Source: AGHT+IHkJBfQB9p5E+ny3VXc/dGxVhtYAyWZ7VR5ltKvV8oZvjJqO9MFAZ1mOr9UU9gHaYYvtlKF X-Received: by 2002:a05:622a:6bca:b0:476:add4:d2cf with SMTP id d75a77b69052e-476c813ef05mr61514041cf.16.1742019678631; Fri, 14 Mar 2025 23:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742019678; cv=none; d=google.com; s=arc-20240605; b=RO8gNh5mDQvrGoYalFzXJUXNaIrv4LP/SfIz/olNo1yyON3HOkLDrMxJz+jwYoxZyf DNoA/nBxo5f8pZCKHUIAhMsEQqGkpzM3Q0cKd6YWvtiqhKsE5gZi5JKWJNHC4JQZZW4w TczBYuLMFghLj2I3uVx27b3U1p7zLoc2h3LWY+5LPkAlgCIRwS33yBWrQo0bP2TAHAKQ e/h6cYPitHyzKYqh7fyiAuvOyAer3j8UYKw9kO5OkbmYY4HIvXIPtq3xtB6C28ZsqpGW pC7LSQKfnc52FJQvbQmD5WL9o7PGNDxQ2iaacaOixt1TJsDy6Ee8cdWYTjJQCKdd1ugD PnzQ== 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=kBJYZ0wBHDOM55ndMIEUhAvQhVNFtBV6p3mmV+mUG7Y=; fh=upfN+4mcRAuX+bX9oPqMwq1TP+fTfKlWZBqspF+lG6I=; b=FukMTAV+iPCGZw8MFBgOtfCR4WBRTUQaMqwWL641yXx9T3sJvVpkyQDhwqc/D1NAFz mn55wQH2UDxY/l30UhMRVBRZ+xiNeUm2lddZUu7yB2vGzXvIuDuZ9eiT57ZMx7p4YmvS htLYPIRdMipKc3riJsaxlPq6Q2Iv2aLqHT30QhWl4u9Amh2BkV07LgkY6mx2HO5apHs6 CEKD8rXvFRLU/grZAk+KngWzJ0OP9Q0IwvP9H/q0eSz0KPwku6w0COPoxm1ZG0ROmJj0 CmZ5ArYYsIgju3XZuMgqc+0vw8V2l/9pGmmQHqUTXWnIlryBfUGwuL+0wGtrEanNvTUU qsHQ==; 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-476bb856c5csi50499271cf.495.2025.03.14.23.21.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Mar 2025 23:21:18 -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 1ttKrC-00038B-8A; Sat, 15 Mar 2025 02:18:50 -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 1ttKr0-0002xu-4Q; Sat, 15 Mar 2025 02:18:41 -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 1ttKqw-0003Cr-AY; Sat, 15 Mar 2025 02:18:35 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 743CEFF9D0; 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 4BC0A1CAC39; Sat, 15 Mar 2025 09:18:01 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 346EB558B7; 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 04/51] target/arm: Report correct syndrome for UNDEFINED LOR sysregs when NS=0 Date: Sat, 15 Mar 2025 09:17:10 +0300 Message-Id: <20250315061801.622606-4-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 63cdb29510..0e386c9ae5 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7737,8 +7737,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); }