{"id":2231090,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2231090/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260430104434.1482407-7-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":"<20260430104434.1482407-7-alex.bennee@linaro.org>","date":"2026-04-30T10:44:33","name":"[v4,6/7] target/arm: handle the WFE trap case","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"90787b87dbe4de5e6fcb41907b910d037b4e3c07","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/20260430104434.1482407-7-alex.bennee@linaro.org/mbox/","series":[{"id":502271,"url":"http://patchwork.ozlabs.org/api/1.1/series/502271/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502271","date":"2026-04-30T10:44:31","name":"target/arm: fully model WFxT instructions for A-profile","version":4,"mbox":"http://patchwork.ozlabs.org/series/502271/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2231090/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2231090/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=DsfR6PUz;\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 4g5rTY0pXhz1yHZ\n\tfor ; Thu, 30 Apr 2026 20:47:13 +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 1wIOt7-0008MY-70; Thu, 30 Apr 2026 06:44:57 -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 1wIOt1-0008If-Ls\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 06:44:51 -0400","from mail-wm1-x334.google.com ([2a00:1450:4864:20::334])\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 1wIOsv-0005LC-NR\n for qemu-devel@nongnu.org; Thu, 30 Apr 2026 06:44:51 -0400","by mail-wm1-x334.google.com with SMTP id\n 5b1f17b1804b1-488b150559bso5380835e9.1\n for ; Thu, 30 Apr 2026 03:44:42 -0700 (PDT)","from draig.lan ([185.124.0.195]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-48a7c31c6ddsm39447895e9.27.2026.04.30.03.44.37\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 30 Apr 2026 03:44:38 -0700 (PDT)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id 64EE35F944;\n Thu, 30 Apr 2026 11:44:35 +0100 (BST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1777545881; x=1778150681; 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=IcPSBiwzrF8PlqagZ+bzBqOtmIa2hTG8ka0zp0wOeJQ=;\n b=DsfR6PUzNJ8BWzigpIAZjf1xA7tNoZELc2oceB618l5Em9IP9AK2Y/1hxVKry8r6V1\n ZYYF9QES1wVz68R+vgaipJy4d0hfxh9O4oFZ3ok9NyG3xwx4j2pWodQDGKAi2/xVN5oS\n oX8STPHa+s+r5HQ/GhgH9V7VHzkUuxecseLltYBe+tPWTSzFCn6How2iGg35jGxaO1yP\n ilQwB5Jq1c6IwHRMA5JxDNa+lwS4TLxjtTKmSx3+ygR7fT4nzk9N7Ez9+Hid70EZpXzC\n QaQMzecuDvvp7e/pI49xZ1pnhSvle9ttujTNKq2xxnDCIiodC+bO5fJgcKCsKWH3Zuwo\n S9tw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777545881; x=1778150681;\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=IcPSBiwzrF8PlqagZ+bzBqOtmIa2hTG8ka0zp0wOeJQ=;\n b=OfAR2XASVZreT6Y0nj2w/akC0x0u+RSg+hCHWXqJb8WXGyPjj6dhwtTS/K1DDXwJzD\n Md74UBeXRe2Lu4l/SbXWcXVX/34L0Cu9NJ7aGW675rsw6tPPCqy4zaE85SCIeS4AoZXq\n qL4BpN7UqqTMzK9U37myKH/XA3ABXn6rFXE8mnTFDwUB+6HQOKXVdpEjyxCKQZoZE2kd\n 9juTOBJU3KH6YwGpB8H52MmEGne8Qx96+6PWz7JNgJcPftzFFzhbz+ja/2mGypVoKcjA\n VQMqcdEAlTsVre9e3xNgv6ZhupyvrQw0dX0WNIqv/X5EZnBhVNH+EV0MpfUcwr7YT+uQ\n w0EQ==","X-Gm-Message-State":"AOJu0YxBcViUJHg3KIrgrwVILXD5/1p6dQvoro+zaZyWXsTJO8khVAVE\n t89RIE2aBZDs/86lUMVficWde6tJlBGvtABCOoyVkeEIXDtoc0Df/C/Jxehtdhr1Fa0=","X-Gm-Gg":"AeBDieuMyQRblOWQGGWi1AL970kpah5t+80Si73oQylnIAKmSbhUGpLZPFOazSg604A\n I2i3rYcMe4jm8CulJREFyBa1id5J6WN74A0WjBPzGc3jRvDKxBlNTL5AGWG0swd30nFnTkaAfkD\n C8xIs41PhotdKqk4Ng1V5VBbZhSncwQmnbLE3da18V70Jxvr46Ybz7VGqMEXKcJQRUTOHC0NyhD\n EZkp5b3L/+dYBuzvOgYHBrL6DoHiCyg2r8Z1PwkidBsvBDowKwLwZky3A9wfWl3S37gqVFxQQBK\n T5Y7WV8LCWq3j3KGwRIec43T/3nGm3PrILHZhJZooOj/SwuteMn3DbGprzHww1Pnc2BvwE8LPQ/\n Xf7plivaQ/IuE58i+OnJ2p+xCCGFXX3jpowTYNDEpApnl8WYL2IZuN8W8OkKygKdEGlMcwEADV0\n qBkS54w0iK84q89rwqnWJRTkV7Sv/OLX1PXg==","X-Received":"by 2002:a05:600c:3e10:b0:488:bc6a:528d with SMTP id\n 5b1f17b1804b1-48a844721d9mr41943205e9.22.1777545880894;\n Thu, 30 Apr 2026 03:44:40 -0700 (PDT)","From":"=?utf-8?q?Alex_Benn=C3=A9e?= ","To":"qemu-devel@nongnu.org","Cc":"Mohamed Mediouni , qemu-arm@nongnu.org,\n Pedro Barbuda ,\n Peter Maydell ,\n Paolo Bonzini , kvm@vger.kernel.org,\n Alexander Graf ,\n =?utf-8?q?Alex_Benn=C3=A9e?= ","Subject":"[PATCH v4 6/7] target/arm: handle the WFE trap case","Date":"Thu, 30 Apr 2026 11:44:33 +0100","Message-ID":"<20260430104434.1482407-7-alex.bennee@linaro.org>","X-Mailer":"git-send-email 2.47.3","In-Reply-To":"<20260430104434.1482407-1-alex.bennee@linaro.org>","References":"<20260430104434.1482407-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::334;\n envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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\nSigned-off-by: Alex Bennée \n---\n target/arm/tcg/helper-defs.h | 2 +-\n target/arm/tcg/op_helper.c | 15 ++++++++++++++-\n target/arm/tcg/translate-a64.c | 2 +-\n target/arm/tcg/translate.c | 2 +-\n 4 files changed, 17 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 d0f45522b05..77ac6161e93 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@@ -592,12 +592,25 @@ void HELPER(wfe)(CPUARMState *env)\n */\n CPUState *cs = env_cpu(env);\n ARMCPU *cpu = ARM_CPU(cs);\n+ uint32_t excp;\n+ int target_el = check_wfx_trap(env, true, &excp);\n \n if (env->event_register) {\n env->event_register = false;\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":["v4","6/7"]}