Message ID | 20250315091439.657371-5-mjt@tls.msk.ru |
---|---|
State | New |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a5d:4308:0:b0:38f:210b:807b with SMTP id h8csp1106563wrq; Sat, 15 Mar 2025 02:24:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV6vsCodw+CwjIML5BfBOZwF22ZuUpAs9S4A0Aqz5CRWGX5zchMUPNeOlcbKOyOD23ILqiQ4Q==@linaro.org X-Google-Smtp-Source: AGHT+IH2H7W6EPbmL3qk9dxmo7iB4N1xFAWxehS5Nv+o4vclo7sqqfS2OFFClA+t9AuGMnvUNEl+ X-Received: by 2002:a05:620a:460d:b0:7c5:3b8d:9f2f with SMTP id af79cd13be357-7c573791ffamr1598592585a.17.1742030640464; Sat, 15 Mar 2025 02:24:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742030640; cv=none; d=google.com; s=arc-20240605; b=DiTH+sXyF4vrGMaAS+tO1ClTRhnc8X+x1NbPlJHJUoqjFqRNbD/FbMH10AbjUErnmF ng67L8t+mdw0SKGGXyL9/+Vn0qEECJNExnUQq7kB+FL4dN6F40/Ia7fRftPwvNkFQxKh Byh/Dho95+iiwGkSym8ARgpU94Ad7XWVzyCzTRM1r4UziHiIzt5sCs6nFboireEXX5c6 o8NBsI72bJ0yqofBO9foorh+nQ5FXXA2heoAN5sO7dqvS1XuwqIQxnnLRJhnFOSdae2D 9A4rAH5N6MDIdNTl6AxUF6qPP2zNzVHmsEdQfCIVTUFhjXV5XLHOhuq+XJajxGGP139B zSgw== 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=mGjOK9eLGYukp71ghfhJJr9G6lJNX13KGLmpIPayoDw=; fh=upfN+4mcRAuX+bX9oPqMwq1TP+fTfKlWZBqspF+lG6I=; b=I3KnPGe4SQJpSLp7YBSj2iCyfNGECgD8D/ZugeCoIogeaWlcbZxPCuq1/wW4Y7oOW9 M9qJISb0JLrQa+njmxpP4vJIVGYgN28zpR7Hj1Jzb/nqvIxAQd31smCGiCzHCiGho0We XPde0Unwk1kHAa8Z+YesTrve4VsbavUXA7uo1BcsmgVM/PacDAi6WFrQK4DMaFetc0ym wgK4qj66PIJU/igZLOCkdgT+IG8eVToo6U5wWFTE0KX4y047Sb1JV6imP81ra2/F9O76 zUwGkRA8oERpLJ+NqyqTNLVCBkNR0ZWZ0gwKGjIFsPl4jrWwIcvGpfmaRoSM+qnJpPfH ts3Q==; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c573caaee7si585871685a.297.2025.03.15.02.24.00 for <patch@linaro.org> (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Mar 2025 02:24:00 -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 <qemu-devel-bounces@nongnu.org>) id 1ttNbx-0002ro-3N; Sat, 15 Mar 2025 05:15:17 -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 <mjt@tls.msk.ru>) id 1ttNbf-0002dv-Ax; Sat, 15 Mar 2025 05:14:59 -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 <mjt@tls.msk.ru>) id 1ttNbc-0007l3-3U; Sat, 15 Mar 2025 05:14:59 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id B2DBFFFBB6; 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 BB0681CAD4F; Sat, 15 Mar 2025 12:14:39 +0300 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 9E9D555A34; Sat, 15 Mar 2025 12:14:39 +0300 (MSK) From: Michael Tokarev <mjt@tls.msk.ru> To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Peter Maydell <peter.maydell@linaro.org>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, Richard Henderson <richard.henderson@linaro.org>, Michael Tokarev <mjt@tls.msk.ru> Subject: [Stable-7.2.17 05/27] target/arm: Report correct syndrome for UNDEFINED CNTPS_*_EL1 from EL2 and NS EL1 Date: Sat, 15 Mar 2025 12:14:16 +0300 Message-Id: <20250315091439.657371-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: <qemu-stable-7.2.17-20250315101625@cover.tls.msk.ru> References: <qemu-stable-7.2.17-20250315101625@cover.tls.msk.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org |
Series |
None
|
expand
|
diff --git a/target/arm/helper.c b/target/arm/helper.c index 5c22626b80..d1e176e711 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2505,7 +2505,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; @@ -2513,7 +2513,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: