{"id":2232956,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2232956/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505112014.102993-7-alex.bennee@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260505112014.102993-7-alex.bennee@linaro.org>","list_archive_url":null,"date":"2026-05-05T11:20:12","name":"[v5,6/7] target/arm: handle the WFE trap case","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"9b5da4885807e9aca7310e593ff03e483d53619c","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/1.2/people/39532/?format=json","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505112014.102993-7-alex.bennee@linaro.org/mbox/","series":[{"id":502820,"url":"http://patchwork.ozlabs.org/api/1.2/series/502820/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502820","date":"2026-05-05T11:20:06","name":"target/arm: fully model WFxT instructions for A-profile","version":5,"mbox":"http://patchwork.ozlabs.org/series/502820/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2232956/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2232956/checks/","tags":{},"related":[],"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=kv/UuOD5;\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 4g8x0C5H3pz1yKX\n\tfor ; Tue, 05 May 2026 21:20:59 +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 1wKDpI-0007KX-R2; Tue, 05 May 2026 07:20:32 -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 1wKDpA-0007Hf-Sw\n for qemu-devel@nongnu.org; Tue, 05 May 2026 07:20:25 -0400","from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e])\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 1wKDp7-0005qP-Tw\n for qemu-devel@nongnu.org; Tue, 05 May 2026 07:20:24 -0400","by mail-wm1-x32e.google.com with SMTP id\n 5b1f17b1804b1-488a8ca4aadso54217845e9.3\n for ; Tue, 05 May 2026 04:20:21 -0700 (PDT)","from draig.lan ([185.124.0.195]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48d17ff35eesm15818675e9.14.2026.05.05.04.20.16\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 05 May 2026 04:20:18 -0700 (PDT)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id E06465FAF9;\n Tue, 05 May 2026 12:20:14 +0100 (BST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777980020; x=1778584820; 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=qtXqU1v3S6F08KlnlXStnvY5Za2Hngy695ogoXb86Wc=;\n b=kv/UuOD5OzmuMRRNsE4R8nM/aTlHRfBamolRmWSaDXKKAfAwpsi26mJPIYg3rAoS0+\n ivsNa3P3PCuvdx+ndHkh8pS+F0nsGI+SDFefmCOC7B8mmnNP8irUr9wMDb7PPB97ugJX\n Uefd4vPUU/9jfgsf29/z8eIbpg7gn8r2hjxceLaNIIyRk7oMOoQkqSh4YfQharnRjBsg\n +5VJ0PgNX66YHaCeBbmjWDhGRJFkY19bRWDBLGK4IfUtPTgpt7q1zFrk975IZ63DT6eC\n QPJdXD6i6f3vyfJqRHyTGRU8EgUt0FPVK/6PuvkJjivh92WC/5Yvk5YJxMrQ0m+R9gEF\n ccGA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777980020; x=1778584820;\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=qtXqU1v3S6F08KlnlXStnvY5Za2Hngy695ogoXb86Wc=;\n b=nIIzv7ts1erEDdfg3XnK7407L6btNFMJ1Qxl779ToppI8Iwfxy4AifXEMe5YslHDT2\n KQWs3fPe/XRW1vZwCMt2e/ofwD+GdLeSkvNOGTciOuLrbxXqw7VfT89+C1Nkwb7G/naY\n MT4FLTcd4tsET/hrSQKcl9MQPnW5hHPsno7MhXwFfWjEc6XA9lQA4ycAmlDDFyo0v6Pc\n 3m1OgcGa6PCLQc/Abxh66QPmOcJ93ZK3MaIcDb4+LfMKsjnEkFTU7mmPR+YkkVG12IYW\n kIiMRbcCfNmMgsceHbheFlgtctCbkeqJezIpECU/m/MQSnbqorZilNj+lQnLiKLyMzSz\n WzcQ==","X-Gm-Message-State":"AOJu0YwAFSe9Yo5NdO+ZAEeOoN3DCbDlo4xE0geV6uWUOD2+1H291Mug\n e41mEsZnENnZ0lCdyXKVqcdEedoMfTNL6QR5yhK4ExizyfNObKb9H9dm9MBnLV29LLk=","X-Gm-Gg":"AeBDiev4HgwEutJgl2qLUrgRKjmL3stb68swhqxOO8odphBInAAWlDukWZzXOr3EuCa\n 7U+LOVUZWTj3GxzyVvAkiL6OM8UxTUJkb+2EzQ3W9s7tVMqFNv9hCK1ty9yEVTCUgwMOqtbQhUK\n yLeMMC8jPF/J1Em7fK6b0RUXNfYXuTivI7I/iYqKwx/MntY9iVamyytJX79opI/VZxZRvuQFc5r\n GCC06NUmSKODIGU/wTHF9lkxSgpbuukAgXgMmNUWLJA/DA4ymMOu34Im6mrbKio5uLxol4CUV+P\n dxOD99S9q9WT2QdFYvCmnetpGF/o/neqhXG+NeZhp34fd6XYCRADqA6Ps9vpXBRtVXSNrbR/6Yb\n Xmgr5Ix4wf2keJ1AqicXmHIwBXz7uE6huLFEx/GHIn+Smg5w4TO4fz8LcUumXLQGncARQ1GfSk8\n mUoT1kHlAQEnuHh6WY21mymCPteBVV2D6d4g==","X-Received":"by 2002:a05:600c:c089:b0:48a:7965:b943 with SMTP id\n 5b1f17b1804b1-48a98676d56mr196011525e9.29.1777980020274;\n Tue, 05 May 2026 04:20:20 -0700 (PDT)","From":"=?utf-8?q?Alex_Benn=C3=A9e?= ","To":"qemu-devel@nongnu.org","Cc":"Peter Maydell , kvm@vger.kernel.org,\n Alexander Graf ,\n Mohamed Mediouni ,\n Paolo Bonzini , Pedro Barbuda ,\n qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= ,\n Richard Henderson ","Subject":"[PATCH v5 6/7] target/arm: handle the WFE trap case","Date":"Tue, 5 May 2026 12:20:12 +0100","Message-ID":"<20260505112014.102993-7-alex.bennee@linaro.org>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260505112014.102993-1-alex.bennee@linaro.org>","References":"<20260505112014.102993-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::32e;\n envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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=unavailable 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":"Now WFE can actually suspend on A-profile we also need to handle when\nits trapped. To do this we need to pass the instruction size so we can\ndeal with the is_16bit syndrome encoding.\n\nReviewed-by: Richard Henderson \nSigned-off-by: Alex Bennée \n---\n target/arm/tcg/helper-defs.h | 2 +-\n target/arm/tcg/op_helper.c | 13 ++++++++++++-\n target/arm/tcg/translate-a64.c | 2 +-\n target/arm/tcg/translate.c | 2 +-\n 4 files changed, 15 insertions(+), 4 deletions(-)","diff":"diff --git a/target/arm/tcg/helper-defs.h b/target/arm/tcg/helper-defs.h\nindex a05f2258f29..ebdf09be38a 100644\n--- a/target/arm/tcg/helper-defs.h\n+++ b/target/arm/tcg/helper-defs.h\n@@ -54,7 +54,7 @@ DEF_HELPER_2(exception_swstep, noreturn, env, i32)\n 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(wfe, void, env, i32)\n DEF_HELPER_2(wfit, void, env, i32)\n DEF_HELPER_1(yield, void, env)\n DEF_HELPER_1(pre_hvc, void, env)\ndiff --git a/target/arm/tcg/op_helper.c b/target/arm/tcg/op_helper.c\nindex 8284dacbdf6..1349bcc7929 100644\n--- a/target/arm/tcg/op_helper.c\n+++ b/target/arm/tcg/op_helper.c\n@@ -574,7 +574,7 @@ static int64_t gt_calc_next_event_stream(CPUARMState *env)\n }\n #endif\n \n-void HELPER(wfe)(CPUARMState *env)\n+void HELPER(wfe)(CPUARMState *env, uint32_t insn_len)\n {\n #ifdef CONFIG_USER_ONLY\n /*\n@@ -600,6 +600,17 @@ void HELPER(wfe)(CPUARMState *env)\n return;\n }\n \n+ /* We might sleep, so now we check to see if we should trap */\n+ if (target_el) {\n+ if (env->aarch64) {\n+ env->pc -= insn_len;\n+ } else {\n+ env->regs[15] -= insn_len;\n+ }\n+ raise_exception(env, excp, syn_wfx(1, 0xe, 0, false, WFE, insn_len == 2),\n+ target_el);\n+ }\n+\n /*\n * If the CPU has entered the exclusive region we could sleep\n * until the global monitor moves from Exclusive to Open Access.\ndiff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c\nindex 8b97136e78b..a6f392a28f8 100644\n--- a/target/arm/tcg/translate-a64.c\n+++ b/target/arm/tcg/translate-a64.c\n@@ -10938,7 +10938,7 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)\n */\n case DISAS_WFE:\n gen_a64_update_pc(dc, 4);\n- gen_helper_wfe(tcg_env);\n+ gen_helper_wfe(tcg_env, tcg_constant_i32(4));\n tcg_gen_exit_tb(NULL, 0);\n break;\n case DISAS_WFI:\ndiff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c\nindex 3ab49887ce6..686980b58e3 100644\n--- a/target/arm/tcg/translate.c\n+++ b/target/arm/tcg/translate.c\n@@ -6836,7 +6836,7 @@ static void arm_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)\n tcg_gen_exit_tb(NULL, 0);\n break;\n case DISAS_WFE:\n- gen_helper_wfe(tcg_env);\n+ gen_helper_wfe(tcg_env, tcg_constant_i32(curr_insn_len(dc)));\n /*\n * The helper can return if the event register is set, so we\n * must go back to the main loop to check for events.\n","prefixes":["v5","6/7"]}