{"id":2232957,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2232957/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505112014.102993-4-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-4-alex.bennee@linaro.org>","list_archive_url":null,"date":"2026-05-05T11:20:09","name":"[v5,3/7] target/arm: ensure aarch64 DISAS_WFE will exit","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"bb03decc505980d32e9af1f14bd46c57f35650fb","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-4-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/2232957/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2232957/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=VcEbhw/t;\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 4g8x0K2Bbhz1yJV\n\tfor ; Tue, 05 May 2026 21:21:05 +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 1wKDp9-0007G0-FB; Tue, 05 May 2026 07:20:23 -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 1wKDp7-0007Ej-KP\n for qemu-devel@nongnu.org; Tue, 05 May 2026 07:20:21 -0400","from mail-wr1-x432.google.com ([2a00:1450:4864:20::432])\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 1wKDp5-0005pJ-ER\n for qemu-devel@nongnu.org; Tue, 05 May 2026 07:20:21 -0400","by mail-wr1-x432.google.com with SMTP id\n ffacd0b85a97d-449de065cb3so2754460f8f.2\n for ; Tue, 05 May 2026 04:20:19 -0700 (PDT)","from draig.lan ([185.124.0.195]) by smtp.gmail.com with ESMTPSA id\n ffacd0b85a97d-45054b03d59sm3787813f8f.20.2026.05.05.04.20.15\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 05 May 2026 04:20:15 -0700 (PDT)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id 92A0C5F9CD;\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=1777980018; x=1778584818; 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=SJ3nvH0CdgnQGuiZq72mX6EJh1rauF0iDM3crLBhnzQ=;\n b=VcEbhw/t7kKXz1zdaXb8ZiTotxl5PlrjAet853UXSBa3SxJTnFZelbv2uwB0TC9cQE\n bj/PenbWoV0OHMKlKuEhX0L2H/dD0jkFYl2HCm/DSa10ZatrRPkF/jOm9XXQdhnKKleJ\n 5eb9XXBeadOxGVTaMDfdyJDCJLoaWOQ4up+ZI1KM10V6+/ScYubuZKrIaIHenVpRAF08\n RhwjiRVm8b2zPvY/vHVFP1H7V949x/XCDdh7hWX3/5hrdhC2SeUYKKyBV5N02mfTjLJt\n ATHrJkvRnGkzRcK3BQbdB4to+D6AFTbRnl/X70WCysOrcdLp1CCg0Lf6+mZL6/4/zebg\n cQTQ==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1777980018; x=1778584818;\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=SJ3nvH0CdgnQGuiZq72mX6EJh1rauF0iDM3crLBhnzQ=;\n b=p1oTX0usPXLO2cKHxfjk8eKnj8t+fDole5ln3xHc0RBTz3T/dR00RnEXJR89NyvdBW\n xMKRNEXIu0acghTAPgEyGNVMcSLL5LkkdVyuY0q7LnEPPH1Kh89pGt0ht18R1hX0YLV0\n lLSAim2p1BOQlypybfGpwStxkfFkhJ4VTrBE18OAWU+JE/EobD9iG1rT9zveyxhjikuu\n V779f+7npcLXoS8LrVw/Rtdx/m9k6ZuDlUg+4vInr1MalKuX2rY+bG9hD7vdRcu/niN5\n OmHk78PgYo2Hq0Z42/tlIZguGWYOfcH9dTjw4N4vdh1Yep7Cjp3Jw4edYeneEseX1biE\n 4Wug==","X-Gm-Message-State":"AOJu0YwIm5uBaQfP0s6DWTZ0/5h3QItizuyyUisyUrS4XJ4t45Qz+UHB\n kY6qaPyFELkPOq1Oua4qsH3f5cbexwnm4iwh0ykqHGmz7UCQ+MB7K3sG4x/Gm7fEFQg=","X-Gm-Gg":"AeBDieu4/n6AbCUyBq4jvmCW6X68W6Cak+L4vCO72Nebsh47n0PavwQpMcS8ZyBqUSN\n WtGSxw2v+x9Lzv+lwhktWsmsPDxrtIXC7wjZY7CglDeMyYhz+ZM+QoSgyEXDz0vQyvZCZxjkD86\n AvUp5IMD8FciMGmBZjk6XQR7ljolYBJWCyo7hm10nyit8yleJsQmSA/49dsM/X60qAvettx/kY4\n DUCJshqG32UQmOZ49+23TyZCRo5ALVs9bW4qdC6WzRTrt0l4XegbquA4C1w0+V5+5nb08TMNH4L\n Genak/74O8cXlspn+DS2F2GtJqCuDQPMihKm9CD1SjwdHaU6IpHl3NBJFJG2tcegBCrMDwUl+sB\n /Izzuq7yBE615TcThMWimY15dIqIsSDoYK21GtUJqQLqQM7udJkwOf6/H/17bcW9ZfGRTMrae1P\n gIGTrI6dmx84+YndSfTpw3f/F2OHTUhWOU9Q==","X-Received":"by 2002:a5d:5f87:0:b0:44f:f8f2:665a with SMTP id\n ffacd0b85a97d-44ff8f26672mr5117226f8f.10.1777980017867;\n Tue, 05 May 2026 04:20:17 -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 3/7] target/arm: ensure aarch64 DISAS_WFE will exit","Date":"Tue, 5 May 2026 12:20:09 +0100","Message-ID":"<20260505112014.102993-4-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::432;\n envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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":"This mirrors the logic for DISAS_WFE in 32 bit world. As the WFE/WFI\nhave similar behaviours shuffle the case statements around a little\nand update the commentary to cover both.\n\nFixes: 252ec405768 (target-arm: implement WFE/YIELD as a yield for AArch64)\nReviewed-by: Richard Henderson \nSigned-off-by: Alex Bennée \n\n---\nv4\n - shuffle case statements, unify the comments.\n---\n target/arm/tcg/translate-a64.c | 24 ++++++++++++------------\n 1 file changed, 12 insertions(+), 12 deletions(-)","diff":"diff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c\nindex 9a27c4c6ec7..25f0a806512 100644\n--- a/target/arm/tcg/translate-a64.c\n+++ b/target/arm/tcg/translate-a64.c\n@@ -10916,25 +10916,25 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)\n case DISAS_NORETURN:\n case DISAS_SWI:\n break;\n- case DISAS_WFE:\n- gen_a64_update_pc(dc, 4);\n- gen_helper_wfe(tcg_env);\n- break;\n case DISAS_YIELD:\n gen_a64_update_pc(dc, 4);\n gen_helper_yield(tcg_env);\n break;\n+ /*\n+ * Both WFE/WFI can cause exceptions or exit the loop to\n+ * halt so we have to make sure we have rectified the PC.\n+ * However they can also return directly if they don't\n+ * enter a wait state so we must add an exit block so we exit\n+ * the loop and check for interrupts.\n+ */\n+ case DISAS_WFE:\n+ gen_a64_update_pc(dc, 4);\n+ gen_helper_wfe(tcg_env);\n+ tcg_gen_exit_tb(NULL, 0);\n+ break;\n case DISAS_WFI:\n- /*\n- * This is a special case because we don't want to just halt\n- * the CPU if trying to debug across a WFI.\n- */\n gen_a64_update_pc(dc, 4);\n gen_helper_wfi(tcg_env, tcg_constant_i32(4));\n- /*\n- * The helper doesn't necessarily throw an exception, but we\n- * must go back to the main loop to check for interrupts anyway.\n- */\n tcg_gen_exit_tb(NULL, 0);\n break;\n }\n","prefixes":["v5","3/7"]}