From nobody Tue Apr 7 21:45:14 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=1773241971; cv=none; d=zohomail.com; s=zohoarc; b=VHVGRDx0JO5XWc8kfeAc7hkDd4gazP2nvdvDGCjUHuCmi41/9bQLKK2yymRLza+/a4YSEphJWrNIAHM/fMg0c3aIL8Y8PyCLpY4fNzrk18H5KjE1mdI2FPvmwCUTo+lGFnEFoAOTcoER3XYohT02gX+U6tKb8Ed7giDJCjsCxLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773241971; 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=0yKaRJV5kJwPY7OcN7v+7slSG/wOM4OVIT+qGRVNdU0=; b=nFMK38L9qTTu5Uh69k3p0fUw4E8WRhxPHvn3jjxiEsutbLHiDkii7kptkQRArnxuR06BuVhs2dZxHXaWSmo99C1kl4+T9Bk+UZxy4KS/ujTAg0YhTGwC2CKNlOIDf9ad0lx3mn8jSCIS6qVVUMKiB/+NoA4JRoXOCBQLLt4W9tg= 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 1773241971407911.7803375670752; Wed, 11 Mar 2026 08:12:51 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w0LCy-0003PF-Kc; Wed, 11 Mar 2026 11:10: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 1w0LBE-0007MC-3u; Wed, 11 Mar 2026 11:09:00 -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 1w0LBC-0005cw-H1; Wed, 11 Mar 2026 11:08:59 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 955AD191E99; Wed, 11 Mar 2026 18:04:42 +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 7952737C2DA; Wed, 11 Mar 2026 18:05:20 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tls.msk.ru; s=202602; t=1773241482; bh=HjMOGCTo1aZscX1vCw2n+onzv51zYPcKRM6CWfJzUog=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ILtqm+dkoWyUcFgUBAN+ME7dedSXurudUfthVqLo5cvUJUDv5VuSdBxndStvLv6Fb bPH/x/62dxGUNZGZkcfJzugcqEygNG3YiisIReAC8/wmHHyjEcz6oRpAXg5XvhxVHz Qk3VPvRbdygy66b175hM+zuTgM7KjuQylEm2OLBSt6v2riykN629OpZlwpvH+QYp+e zJnvnEEWKH/nsL/JgdhsuncWRKdXyXTOAOZtTPQBnb79K0Vxt5tZ4qznPOGrDelFgz 9CBbcBdqSCnTEZlr/pqE6gPklcpmDyLtaPOJzBXJBlF431+AFPbqu1J0/2/35nbXPl qHF/eylBbsnhQ== 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.1.5 22/46] target/arm: set the correct TI bits for WFIT traps Date: Wed, 11 Mar 2026 18:02:58 +0300 Message-ID: <20260311150327.1084669-22-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: 1773241973321154100 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 575e566280..048090369f 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