Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2226468/?format=api
{ "id": 2226468, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2226468/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422125250.1303100-32-alex.bennee@linaro.org/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/1.1/projects/14/?format=api", "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-32-alex.bennee@linaro.org>", "date": "2026-04-22T12:52:48", "name": "[v3,31/32] target/arm: handle the WFE trap case", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e52cbb5252933d108ee8af4c945e3e7c48c38d39", "submitter": { "id": 39532, "url": "http://patchwork.ozlabs.org/api/1.1/people/39532/?format=api", "name": "Alex Bennée", "email": "alex.bennee@linaro.org" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260422125250.1303100-32-alex.bennee@linaro.org/mbox/", "series": [ { "id": 501008, "url": "http://patchwork.ozlabs.org/api/1.1/series/501008/?format=api", "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/2226468/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2226468/checks/", "tags": {}, "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=l76bWmdp;\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 4g0zjN1Xpnz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 22 Apr 2026 22:55:36 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1wFX5n-0007Js-B7; Wed, 22 Apr 2026 08:54:11 -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 <alex.bennee@linaro.org>)\n id 1wFX4r-000660-45\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 08:53:13 -0400", "from mail-wm1-x331.google.com ([2a00:1450:4864:20::331])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from <alex.bennee@linaro.org>)\n id 1wFX4m-0005XT-Vy\n for qemu-devel@nongnu.org; Wed, 22 Apr 2026 08:53:11 -0400", "by mail-wm1-x331.google.com with SMTP id\n 5b1f17b1804b1-4891b0786beso30438975e9.1\n for <qemu-devel@nongnu.org>; Wed, 22 Apr 2026 05:53:08 -0700 (PDT)", "from draig.lan ([185.124.0.195]) by smtp.gmail.com with ESMTPSA id\n 5b1f17b1804b1-488fb79ecb9sm186670245e9.8.2026.04.22.05.52.59\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 22 Apr 2026 05:53:02 -0700 (PDT)", "from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id 8C3B0617D8;\n Wed, 22 Apr 2026 13:52:53 +0100 (BST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1776862387; x=1777467187; 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=7kLDDoOYtEyqQijc0QmTmJ1dX5SOzFgUIzyhmwCFraY=;\n b=l76bWmdp3ixKUCLuHZSeUhOubhhjmfImA6u4cAV/UzYzsKqwKPmrbYNJfMMVZA+E2O\n rMbVlBTQFzcu2QgsnLTnk1b7ElPmlD8vxVQGe/F+XSh7UHvCOWG65oGSUwLiZ7MGgXmi\n B5tEMNsMthNz/ChaV+3AQBgE64xm5BxXJ0yUXMJKXPnLmjf7V5CnQNYMnNPK102GLIVn\n /TbbJX7/rQ1G70CXMT5nbh+RtoHpVAPXxL24gUcZv37IZgFC+WaIvZ577XQlwrWqnQ7X\n Td9ov3u8okwP/4iJFCGrrHTH18WOGDSQXHIlJOk0qvGyXwwtNMFafMfyO+sqFdqfRzmg\n 0jPA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776862387; x=1777467187;\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=7kLDDoOYtEyqQijc0QmTmJ1dX5SOzFgUIzyhmwCFraY=;\n b=T2eFNRtJS9AH1G5IEphP97DnXKxt0Pqzz+LpS0vyUCON4BPQdNPu5zi5azvOi8nMII\n 54WjGat29MFiu7yqGaxsXpdfZrtC7o+qtabjTmWpeZCC/q/qTDJGgJOHxXyOgCoP90Tx\n tW5JDlxUKnraQLOPWVrJTJH35Ib7+XlMmSurFDgeMk2uIP+4rjC0SbYcMMNcQXVf4x6l\n dYPijph5uLxez7zXLOuzGO3VnCOXuOj0OLp46XTj3SSdn7vlf7emY8FY4KSg44prK1an\n UVzhYxHLOQpddLTfEwIoFmP4zpeNZk2v/3Nkqhjd7pGQiF8MY44XVroM6hOXk3ifQ/U5\n Dnfg==", "X-Gm-Message-State": "AOJu0YzsYrxsVuGEAj8/pdmteG/rXZSmIW0A+7Bf0rxSayd/FlczepKs\n 5W+xHLvkUnKThkZQuNUqo16GekBTWqP1aHSYrSIQG+v1iQgTwTHEc3aSo9yEX1Xlo30=", "X-Gm-Gg": "AeBDieucgy0AZQPoYrdxJNcj3sU5ibtopYstj2EDphoKKh32TYnXTEXZaR8yDgVuUXZ\n Tx2R4HRohacnEJ2BxeQFhn9U/JS7IMXUiMJlDxCy1v1hfQJOw0ZQ4kLEmL//JJh7MynncuCAhL1\n YASf04GP0xnayR7fnd1m3wj/16nlRe1aReBcLNHN+TMDPkJ+EZd8BhM37MK8CnMY4k1fFFeFkqN\n mRibc7yQcJYrNMhXq7nvr8BXE5TZ63HrSQCLgvDUZ9CbKZ4CLUGJfrHB2xWkCjMOXlXbp3sPZtl\n ewhb1HpmUA9HdfJzf9o3S7/vG1M91vFof2oci3hS18swJN2qRcOsewJUbSOR0Dm0g5/cyM0p8Jp\n sWiCWFpNHksweS0cWuz0JA3w9rtt6Gi7CAUb0p7wqyB8h/gn76Mz1UlDfGHorYu0pJMSQ/f+Lky\n fGdAttSvV2O+cs89pB8FD48MDCp35Mn2InJQ==", "X-Received": "by 2002:a05:600c:c4a1:b0:488:c014:34da with SMTP id\n 5b1f17b1804b1-488fb77ed1bmr305546735e9.26.1776862387494;\n Wed, 22 Apr 2026 05:53:07 -0700 (PDT)", "From": "=?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>", "To": "qemu-devel@nongnu.org", "Cc": "Pedro Barbuda <pbarbuda@microsoft.com>, Alexander Graf <agraf@csgraf.de>,\n Peter Maydell <peter.maydell@linaro.org>,\n Paolo Bonzini <pbonzini@redhat.com>,\n Mohamed Mediouni <mohamed@unpredictable.fr>, kvm@vger.kernel.org,\n qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>", "Subject": "[PATCH v3 31/32] target/arm: handle the WFE trap case", "Date": "Wed, 22 Apr 2026 13:52:48 +0100", "Message-ID": "<20260422125250.1303100-32-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::331;\n envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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 <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "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 <alex.bennee@linaro.org>\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 030209360e8..fe34c94e890 100644\n--- a/target/arm/tcg/op_helper.c\n+++ b/target/arm/tcg/op_helper.c\n@@ -568,7 +568,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@@ -586,12 +586,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 /* For A-profile we also can be woken by the event stream */\n if (arm_feature(env, ARM_FEATURE_AARCH64) && cpu->wfxt_timer) {\n int64_t next_event = gt_calc_next_event_stream(env);\ndiff --git a/target/arm/tcg/translate-a64.c b/target/arm/tcg/translate-a64.c\nindex a1b0cc9508e..83b2a6e848f 100644\n--- a/target/arm/tcg/translate-a64.c\n+++ b/target/arm/tcg/translate-a64.c\n@@ -10956,7 +10956,7 @@ static void aarch64_tr_tb_stop(DisasContextBase *dcbase, CPUState *cpu)\n break;\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_YIELD:\ndiff --git a/target/arm/tcg/translate.c b/target/arm/tcg/translate.c\nindex 18d64620e40..c30ea2261da 100644\n--- a/target/arm/tcg/translate.c\n+++ b/target/arm/tcg/translate.c\n@@ -6845,7 +6845,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": [ "v3", "31/32" ] }