From nobody Tue Apr 7 21:27:36 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1773257961; cv=none; d=zohomail.com; s=zohoarc; b=JYAUOPRXO0W37d/A36c0gSr76IMQhjOXdj/4JkfwPwzl4G0x92mz/EURSj7ubui/rnKh+e99aYDqodCXylajqiWqJuNynK6AWVJ63waD6VoEcQDlXnN0Zh2ZLtJMxTc+Y/jtgyN3H9CQOSvYP///VNLJ35WuaYdHwg1ymfLfLrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773257961; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=r4adfYDOz/8iNwSixTjewOHPMusLU7Z44oTV3lqHQFw=; b=hoXfijK0LA7bTEYNyPO+qL6sf5uPqX4NrpFqmczFDvpoEvRiV5aUHTRmUOvg/b4ioww0ApjuCIU4/yu8bj6pCOCWO02LvlmBhtX6uis6v4BUUf2zjhP2//fmq+I7QQcu4+O7w4bScK/eKQUNOmRPwIrzN6ZIMM9jnFhF6USEp3M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177325796116894.26233832188313; Wed, 11 Mar 2026 12:39:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0PMr-0002Tx-OW; Wed, 11 Mar 2026 15:37:18 -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 1w0PMS-0001qk-RY; Wed, 11 Mar 2026 15:36:53 -0400 Received: from isrv.corpit.ru ([212.248.84.144]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w0PMQ-0000Kp-RP; Wed, 11 Mar 2026 15:36:52 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 003F11920FF; Wed, 11 Mar 2026 22:34:28 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 35A3037C464; Wed, 11 Mar 2026 22:35:06 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773257667; bh=t2iW6OMCjhGEYXvayaAslMLjUl2A5vWzYAtHoFt8hxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XWoHADQDWxPujqRxqTKLhYjgKtR8JhVOUgiBBQPSN3irvZJhayQdUr2+l0mzy+KNL SzLm5vD6gpJisSiX+ZiINk2UVCm5BXZ2e86YCXeebWDo2qoPi9J7BQc283NzhkHm0e BTJaHY0asp9XXcRaHtmNKGrPrOB6HKngy4hjrCZsQr7kNXM91oXl1tOlaWxi7LAe1d ehM7LpxwoOVIpOJZ5/CktXzL3V7XpcyeAcm7yCWBw5GdSYFcggTAgfkT1IFMxTeR+i YAAfDt8HEB5X98+HOFp4DwF1pmAZkpUsNFbgfUV1Vv5AYZg2eZbcP1ju9J9vJGq7Ta f2XdWRbqoTfTA== From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Gustavo Romero , Peter Maydell , Michael Tokarev Subject: [Stable-10.2.2 23/53] target/arm: set the correct TI bits for WFIT traps Date: Wed, 11 Mar 2026 22:34:16 +0300 Message-ID: <20260311193449.1096110-23-mjt@tls.msk.ru> X-Mailer: git-send-email 2.47.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=212.248.84.144; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -2 X-Spam_score: -0.3 X-Spam_bar: / X-Spam_report: (-0.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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 development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @tls.msk.ru) X-ZM-MESSAGEID: 1773257963208154100 From: Alex Benn=C3=A9e The WFIT trap should be reported as 0b10. Cc: qemu-stable@nongnu.org Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Gustavo Romero Message-id: 20260220171945.1065102-1-alex.bennee@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell (cherry picked from commit 662fd548a027c9362df71ebfc0c9cdd7b1f349fb) Signed-off-by: Michael Tokarev diff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c index 4fbd219555..9c0651f000 100644 --- a/target/arm/tcg/op_helper.c +++ b/target/arm/tcg/op_helper.c @@ -448,7 +448,7 @@ void HELPER(wfit)(CPUARMState *env, uint64_t timeout) =20 if (target_el) { env->pc -=3D 4; - raise_exception(env, excp, syn_wfx(1, 0xe, 0, false), target_el); + raise_exception(env, excp, syn_wfx(1, 0xe, 2, false), target_el); } =20 if (uadd64_overflow(timeout, offset, &nexttick)) { --=20 2.47.3