{"id":2226482,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2226482/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422125250.1303100-24-alex.bennee@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260422125250.1303100-24-alex.bennee@linaro.org>","date":"2026-04-22T12:52:40","name":"[v3,23/32] target/arm: report register in WFIT syndromes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"710274731b6fd18f298437029808fc655eec0171","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/1.1/people/39532/?format=json","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422125250.1303100-24-alex.bennee@linaro.org/mbox/","series":[{"id":501008,"url":"http://patchwork.ozlabs.org/api/1.1/series/501008/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=501008","date":"2026-04-22T12:52:20","name":"target/arm: fully model WFxT instructions for A-profile","version":3,"mbox":"http://patchwork.ozlabs.org/series/501008/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2226482/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2226482/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=MMEEiQmR;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g0zvp4rSbz1y2d\n\tfor ; Wed, 22 Apr 2026 23:04:38 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wFXE8-0001PG-AY; Wed, 22 Apr 2026 09:02:48 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wFXE3-0001Fh-65\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 09:02:43 -0400","from mail-wm1-x344.google.com ([2a00:1450:4864:20::344])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1wFXE1-0001BL-A3\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 09:02:42 -0400","by mail-wm1-x344.google.com with SMTP id\n 5b1f17b1804b1-488d2079582so63700465e9.2\n for ; Wed, 22 Apr 2026 06:02:40 -0700 (PDT)","from draig.lan ([185.124.0.195]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48a55dc9f58sm287208155e9.6.2026.04.22.06.02.31\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 22 Apr 2026 06:02:36 -0700 (PDT)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id C9F185FC04;\n Wed, 22 Apr 2026 13:52:52 +0100 (BST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776862960; x=1777467760; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=reUwRDuVhNbhnF2K13EHapoGcij9kmY6U8ucQNXXySM=;\n b=MMEEiQmRlZ3MV2KBUcrY5lRbCH+qGOIHqA7oh59ryQ1HPQTpM+OSJdANIm3iF9iR6I\n JeDX73CLK6K0tCaEBrb1MzEr26OzTq7QYwxCqgiQIK0+iFTuA0FH4ZpI1qjEkX+V8Cdm\n pjl01ea5r4g0FWfOoc5mLT7JgMfjPDMnpjRQx5QWtgy70ogEGY/w4KYMaMGOqSuSxR2p\n 5bzdI9UQBIm24UvviRcEuKYCsCxDSPqFk9Z7eYw4PXW2RmVtkyqo+C/K6PZHwTqjfcXw\n lzKuU+My9P8tqIbHk/nDWWBYwNEsPFc/ZR6RxDuU2UxyOv5UmEj/MUz05ar/U+0dLVbk\n Dkhg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776862960; x=1777467760;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=reUwRDuVhNbhnF2K13EHapoGcij9kmY6U8ucQNXXySM=;\n b=KQ2QQZFM2kAgKfwebHxzC8Ngw1ABxjWlEHIjuji8OWFw8c6b9OYfdx6vTMhWQ0yBWn\n BPBvznyXxI9y3/L2TzbpKSTZxKakD7s/MXP/QA7PC0TucO8QPLk3M/tsEWLhpWfhpHOJ\n 53s+v7Yka5e3NyuaQffhAvin7jdMXZ/+BoWah4RAeguO7i+VggatacjGKkjTZqn73p/g\n M6Oy2hfezkzTBWVXr/JLcR0EWHY/LemCFNQdU3YslOHUcXrz4p47v92brnETFoDZIsld\n TyA60SwmL3W/XyuCPdZYPHcwiDw0D+mqBoGPW9PtnzcIxlnrHZuKlLKp3oVaA4FB0n9n\n ehmA==","X-Gm-Message-State":"AOJu0YzCc22LXLzcis3fjlQjG+4M+K9FFTWWvnEb22fs9Dgvstr3QLNA\n H3wf5ihD7WV3i9R3p4te4ZuGgCpT6j4F+y406JrPZYuxKxdiSkX8yEm64uTZ4Or0Cog=","X-Gm-Gg":"AeBDiev06ZrvTlAYH569OE7muEjCbVCOIkfZj2qS6+oOYb7IEs70N8LxtYA6f97Saz/\n xnWl7nQoRc1YTPBZXwXik/sGIieX/Njh+gXj+0k4Cfyy6yQ4mE/vpzC2tvTVtVQ9MZZs9iYynvF\n kVKDlWmWv+N6ZEbkkKxIfzAM6KQ4EZTPc6VL2azrFL5PPeGMMEMZg0p6SwT8QvaUJQXiHTdZHGF\n HqKdvrzdue/BEAeyS3Gcq9kdlAnqlwwjKfFDWC0oJw8QjO14BgUppx48ojDbkkmzpF2a2tN9VGP\n 8HTXYMgVjitfNxWmNMD5AseD4V1A/bmlfHNfVe2EtEIpDcD0NZ7r3reiS1ySgd6AyPz9QVy7xbl\n CHUbnE1NFdtsOug/G3OWEpokHc1+hNJjfzWGtYEbUmK1Yu1+zWKB1XaKV6KHLwZqMdBaKv56Sd+\n vV9ymB6VfSrqYtzVPnC8vM6EX1YEl9vEG02g==","X-Received":"by 2002:a05:600c:8908:b0:48a:58e1:6d02 with SMTP id\n 5b1f17b1804b1-48a58e16eb2mr53254275e9.19.1776862958236;\n Wed, 22 Apr 2026 06:02:38 -0700 (PDT)","From":"=?utf-8?q?Alex_Benn=C3=A9e?= ","To":"qemu-devel@nongnu.org","Cc":"Pedro Barbuda , Alexander Graf ,\n Peter Maydell ,\n Paolo Bonzini ,\n Mohamed Mediouni , kvm@vger.kernel.org,\n qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= ,\n Richard Henderson ","Subject":"[PATCH v3 23/32] target/arm: report register in WFIT syndromes","Date":"Wed, 22 Apr 2026 13:52:40 +0100","Message-ID":"<20260422125250.1303100-24-alex.bennee@linaro.org>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260422125250.1303100-1-alex.bennee@linaro.org>","References":"<20260422125250.1303100-1-alex.bennee@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::344;\n envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x344.google.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,\n 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 development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Pass the register number (rd) to the wfit helper and report it in the\nsyndrome ISS.\n\nReviewed-by: Richard Henderson \nSigned-off-by: Alex Bennée \n\n---\nv2\n - drop stale TODO\n - fixup stale commit comment (WFIT fix already merged)\n - make rv a bool\n - make ti a enum type\n---\n target/arm/syndrome.h | 11 ++++++++++-\n target/arm/tcg/helper-defs.h | 2 +-\n target/arm/tcg/op_helper.c | 7 ++++---\n target/arm/tcg/translate-a64.c | 2 +-\n 4 files changed, 16 insertions(+), 6 deletions(-)","diff":"diff --git a/target/arm/syndrome.h b/target/arm/syndrome.h\nindex 04a71eebcb5..4d1f1c529e2 100644\n--- a/target/arm/syndrome.h\n+++ b/target/arm/syndrome.h\n@@ -670,7 +670,14 @@ FIELD(WFX_ISS, RN, 5, 5)\n FIELD(WFX_ISS, COND, 20, 4)\n FIELD(WFX_ISS, CV, 24, 1)\n \n-static inline uint32_t syn_wfx(int cv, int cond, int ti, bool is_16bit)\n+typedef enum {\n+ WFI = 0b00,\n+ WFE = 0b01,\n+ WFIT = 0b10,\n+ WFET = 0xb11\n+} wfx_ti;\n+\n+static inline uint32_t syn_wfx(int cv, int cond, int rn, bool rv, wfx_ti ti, bool is_16bit)\n {\n uint32_t res = syn_set_ec(0, EC_WFX_TRAP);\n res = FIELD_DP32(res, SYNDROME, IL, !is_16bit);\n@@ -678,6 +685,8 @@ static inline uint32_t syn_wfx(int cv, int cond, int ti, bool is_16bit)\n res = FIELD_DP32(res, WFX_ISS, CV, cv);\n res = FIELD_DP32(res, WFX_ISS, COND, cond);\n res = FIELD_DP32(res, WFX_ISS, TI, ti);\n+ res = FIELD_DP32(res, WFX_ISS, RN, rn);\n+ res = FIELD_DP32(res, WFX_ISS, RV, rv);\n \n return res;\n }\ndiff --git a/target/arm/tcg/helper-defs.h b/target/arm/tcg/helper-defs.h\nindex 5a10a9fba3b..a05f2258f29 100644\n--- a/target/arm/tcg/helper-defs.h\n+++ b/target/arm/tcg/helper-defs.h\n@@ -55,7 +55,7 @@ DEF_HELPER_2(exception_pc_alignment, noreturn, env, vaddr)\n DEF_HELPER_1(setend, void, env)\n DEF_HELPER_2(wfi, void, env, i32)\n DEF_HELPER_1(wfe, void, env)\n-DEF_HELPER_2(wfit, void, env, i64)\n+DEF_HELPER_2(wfit, void, env, i32)\n DEF_HELPER_1(yield, void, env)\n DEF_HELPER_1(pre_hvc, void, env)\n DEF_HELPER_2(pre_smc, void, env, i32)\ndiff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c\nindex aa14f15eb62..652611b4313 100644\n--- a/target/arm/tcg/op_helper.c\n+++ b/target/arm/tcg/op_helper.c\n@@ -399,7 +399,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len)\n env->regs[15] -= insn_len;\n }\n \n- raise_exception(env, excp, syn_wfx(1, 0xe, 0, insn_len == 2),\n+ raise_exception(env, excp, syn_wfx(1, 0xe, 0, false, WFI, insn_len == 2),\n target_el);\n }\n \n@@ -409,7 +409,7 @@ void HELPER(wfi)(CPUARMState *env, uint32_t insn_len)\n #endif\n }\n \n-void HELPER(wfit)(CPUARMState *env, uint64_t timeout)\n+void HELPER(wfit)(CPUARMState *env, uint32_t rd)\n {\n #ifdef CONFIG_USER_ONLY\n /*\n@@ -428,6 +428,7 @@ void HELPER(wfit)(CPUARMState *env, uint64_t timeout)\n int target_el = check_wfx_trap(env, false, &excp);\n /* The WFIT should time out when CNTVCT_EL0 >= the specified value. */\n uint64_t cntval = gt_get_countervalue(env);\n+ uint64_t timeout = env->xregs[rd];\n /*\n * We want the value that we would get if we read CNTVCT_EL0 from\n * the current exception level, so the direct_access offset, not\n@@ -448,7 +449,7 @@ void HELPER(wfit)(CPUARMState *env, uint64_t timeout)\n \n if (target_el) {\n env->pc -= 4;\n- raise_exception(env, excp, syn_wfx(1, 0xe, 2, false), target_el);\n+ raise_exception(env, excp, syn_wfx(1, 0xe, rd, true, WFIT, false), target_el);\n }\n \n if (uadd64_overflow(timeout, offset, &nexttick)) {\ndiff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c\nindex 5d261a5e32b..073454b9195 100644\n--- a/target/arm/tcg/translate-a64.c\n+++ b/target/arm/tcg/translate-a64.c\n@@ -2064,7 +2064,7 @@ static bool trans_WFIT(DisasContext *s, arg_WFIT *a)\n }\n \n gen_a64_update_pc(s, 4);\n- gen_helper_wfit(tcg_env, cpu_reg(s, a->rd));\n+ gen_helper_wfit(tcg_env, tcg_constant_i32(a->rd));\n /* Go back to the main loop to check for interrupts */\n s->base.is_jmp = DISAS_EXIT;\n return true;\n","prefixes":["v3","23/32"]}