From nobody Fri Mar 20 22:03:26 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1774012373; cv=none; d=zohomail.com; s=zohoarc; b=Ab+t8E8jXH5cxW3lFjT5QeHUy66qTxdMAN0k25/RCh+oBJJuAM8jtsJuQjTuEAPy64iuReN7lg/jbnwK6Uf+IqSKHDR8BZUE7T+KasQxTojOolbPaD3g1LBfSxOeL6uS2hN5oUEWwHs3AXIlj71ifiFZRlxZ+vPRIgYeXUEc26Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1774012373; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KRX6bSLNd7JglBnF8oTUHMvUmVbVrp85pY+kXHoaidI=; b=aiPrME6BBBOHCyKxOkg9+Goq4iQQQpKr1TmZnvpIfvLyTEzPVgHZntbiw8mKopxt1s2I91sCAX5jBaRzBKZtY5Y1WaSsPrLmqveR6dgqq0O02DVW/imNojQEilFStJe/9h35aC72GRdQ/LmPLQceTp5qlfdhLc0D6XgPxCo1aW8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1774012373310486.09603589779147; Fri, 20 Mar 2026 06:12:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w3ZYZ-0002yl-Qv; Fri, 20 Mar 2026 09:06:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w3ZYY-0002wH-9L for qemu-devel@nongnu.org; Fri, 20 Mar 2026 09:06:26 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w3ZYU-00064H-Eh for qemu-devel@nongnu.org; Fri, 20 Mar 2026 09:06:25 -0400 Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-b97e6e48b24so101102066b.2 for ; Fri, 20 Mar 2026 06:06:21 -0700 (PDT) Received: from draig.lan ([185.124.0.237]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b98335de3casm158540866b.35.2026.03.20.06.06.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2026 06:06:20 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D39035FAFB; Fri, 20 Mar 2026 13:06:10 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1774011981; x=1774616781; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KRX6bSLNd7JglBnF8oTUHMvUmVbVrp85pY+kXHoaidI=; b=jCOjyp6KS+VIbddUTvGRRnN5kV7xxXEQnwzwrkS5kPbRnTOsFNac05+HYFkrRRg4Co 4zcZecwcDkrd/YOMXXvpMglqLGVIU3njCLQuZyX0Ov+r+zMqK942dfVV6twRl1I1cREu V/5pUCS4MAVDLcbB8gFDyBoOac20jVuSavLUaRK/eKl2dTn/YA0WhL7Bq5ad+TnoGTDn BnWSpCmvZgJMjpqo9+0wBfC41kCyAQCD7N2iHVEcPAp+4flxNXgMaArU3qxBq3NxmuEt H+U26ZzTzgNdQT4sS2SFchUws3vkhx4C5KUJJtmaWjkLw6aDHkAb7+GqnbBrMnlcvZcD RySg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774011981; x=1774616781; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=KRX6bSLNd7JglBnF8oTUHMvUmVbVrp85pY+kXHoaidI=; b=GVpsj4KZ0qOhDMMM4CTiSBQe+GwVxPMBqOQb0mCcggDpKDJCg9tDBz4ReI1qYvcWyg oX/wIYseLH1rG1l/Y/vyzMCF2WkEc1ujF5qCi4eThCbvdUYQ57kuS781aj0K6itC//fx W9JXJE8Lu0MRYsFoVkPRD18h+gc5plJTTnm+aAX8Biq35yXO6k6GDks+BJ9sZilsqusl Ryl502WVUiDbSJI0qnzmEj89dOdeWkhxJes3MRRcM1W9Q+r6EYJM82mkGhoo958H6MiA HSzMJgmdKfJRcK665DceC3LlxLFvJhymgoDuA08oE/dX9fFgWigNaJ4WX9OxCfpLcXe3 vxKw== X-Gm-Message-State: AOJu0YwsgqNINodGE5bGtRyl1G/DCcMUb8GSLy4xg9n7xH1P19fccJ0r yv0mhLt4Ns2F11gidbTMDpWUTYzNxIfN8wTb4Nzs0D/eOY8H8BMMVaMdiqcten/dl+Q= X-Gm-Gg: ATEYQzxz4L3a6rnK9Qgq0YS9gm8E0bkH8y8g8Ic/EzNwjierUfcwV1OJZsowI4dJPob HfBxS2PB2AqleYnnEdvbUq6V3YESutEwUdzJHAm48AgJr5jtuO/b3xSHlI4cPbzRmxtQhAXdJKD +R0dtjW7rC6YZB68B67GTDDK+tc59zVB+xa+KBmn5/6OzurXSkhFPtaeWDU8cJ8QyCbjydaWupn 2+t5GV6BNXIcze7LC0giIbyrOin0l2XfVXRhpK24q+f2qSbaHcBwpOJyB6bv6x+dj84pG8YJpMF oDkwufU57A0v0kVh8rF9vsMubWK+0XlAIZEr/b3dtHTS5pG+FrpdSsNkijM8Tct9I9iMsCeG0xt hiep7rjIktOo4FjHR5ZaXPaD8UAEAxJ1/p5itd4qn/G69RRLKBjAb3Cl0nbiVj8y5sAYZFpudSG MTWVAoSHx003xonbZ+wDwYe18= X-Received: by 2002:a17:906:2099:b0:b8a:f2cb:8088 with SMTP id a640c23a62f3a-b982f37d13fmr133976766b.33.1774011980711; Fri, 20 Mar 2026 06:06:20 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Alexander Graf , Peter Maydell , qemu-arm@nongnu.org, Pedro Barbuda , Mohamed Mediouni , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [RFC PATCH 35/35] tests/tcg: add basic test for aarch64 wf[ie][t] insns Date: Fri, 20 Mar 2026 13:06:06 +0000 Message-ID: <20260320130607.2071996-36-alex.bennee@linaro.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260320130607.2071996-1-alex.bennee@linaro.org> References: <20260320130607.2071996-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.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, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1774012373630158500 Signed-off-by: Alex Benn=C3=A9e --- tests/tcg/aarch64/system/wfx.c | 126 ++++++++++++++++++++++ tests/tcg/aarch64/Makefile.softmmu-target | 8 ++ tests/tcg/aarch64/system/boot.S | 12 ++- 3 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 tests/tcg/aarch64/system/wfx.c diff --git a/tests/tcg/aarch64/system/wfx.c b/tests/tcg/aarch64/system/wfx.c new file mode 100644 index 00000000000..567d9e59c70 --- /dev/null +++ b/tests/tcg/aarch64/system/wfx.c @@ -0,0 +1,126 @@ +/* + * WFX Instructions Test (WFI, WFE, WFIT, WFET) + * + * Copyright (c) 2024 Linaro Ltd + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include +#include +#include "gicv3.h" + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +#define read_sysreg(r) ({ \ + uint64_t __val; \ + asm volatile("mrs %0, " __stringify(r) : "=3Dr" (__val)); \ + __val; \ +}) + +#define write_sysreg(r, v) do { \ + uint64_t __val =3D (uint64_t)(v); \ + asm volatile("msr " __stringify(r) ", %x0" \ + : : "rZ" (__val)); \ +} while (0) + +#define isb() asm volatile("isb" : : : "memory") +#define sev() asm volatile("sev" : : : "memory") +#define wfi() asm volatile("wfi" : : : "memory") +#define wfe() asm volatile("wfe" : : : "memory") +#define wfit(reg) asm volatile("wfit %0" : : "r" (reg) : "memory") +#define wfet(reg) asm volatile("wfet %0" : : "r" (reg) : "memory") + +#define enable_irq() asm volatile("msr daifclr, #2" : : : "memory") +#define disable_irq() asm volatile("msr daifset, #2" : : : "memory") + +static void wait_ticks(uint64_t ticks) +{ + uint64_t start =3D read_sysreg(cntvct_el0); + while ((read_sysreg(cntvct_el0) - start) < ticks) { + /* spin */ + } +} + +int main(void) +{ + uint64_t start, end, elapsed; + uint64_t timeout; + + gicv3_init(); + gicv3_enable_irq(27); /* Virtual Timer PPI */ + + ml_printf("WFX Test\n"); + + /* 1. Test WFI with timer interrupt */ + ml_printf("Testing WFI..."); + /* Setup virtual timer to fire in 100000 ticks (~2ms at 50MHz) */ + start =3D read_sysreg(cntvct_el0); + write_sysreg(cntv_tval_el0, 100000); + write_sysreg(cntv_ctl_el0, 1); /* Enable timer, no mask */ + isb(); + + /* + * We don't have a full interrupt handler, but WFI should wake up + * when the interrupt is pending even if we have it masked at the CPU. + * PSTATE.I is set by boot code. + * + * We unmask interrupts here to ensure the CPU can take the minimal + * exception handler defined in boot.S. + */ + enable_irq(); + wfi(); + disable_irq(); + end =3D read_sysreg(cntvct_el0); + elapsed =3D end - start; + if (elapsed < 100000) { + ml_printf("FAILED: WFI woke too early (%ld ticks)\n", elapsed); + return 1; + } + ml_printf("PASSED (elapsed %ld ticks)\n", elapsed); + write_sysreg(cntv_ctl_el0, 0); /* Disable timer */ + + /* 2. Test WFE and SEV */ + ml_printf("Testing WFE/SEV..."); + sev(); /* Set event register */ + start =3D read_sysreg(cntvct_el0); + wfe(); /* Should return immediately */ + end =3D read_sysreg(cntvct_el0); + elapsed =3D end - start; + /* while this should be fast there is some overhead from TCG */ + if (elapsed > 20000) { + ml_printf("FAILED: WFE slept despite SEV (%ld ticks)\n", elapsed); + return 1; + } + ml_printf("PASSED (%ld ticks)\n", elapsed); + + /* 3. Test WFIT */ + ml_printf("Testing WFIT..."); + start =3D read_sysreg(cntvct_el0); + timeout =3D start + 200000; + wfit(timeout); + end =3D read_sysreg(cntvct_el0); + elapsed =3D end - start; + if (elapsed < 200000) { + ml_printf("FAILED: WFIT woke too early (%ld ticks)\n", elapsed); + return 1; + } + ml_printf("PASSED (elapsed %ld ticks)\n", elapsed); + + /* 4. Test WFET */ + ml_printf("Testing WFET..."); + start =3D read_sysreg(cntvct_el0); + timeout =3D start + 200000; + wfet(timeout); + end =3D read_sysreg(cntvct_el0); + elapsed =3D end - start; + if (elapsed < 200000) { + ml_printf("FAILED: WFET woke too early (%ld ticks)\n", elapsed); + return 1; + } + ml_printf("PASSED (elapsed %ld ticks)\n", elapsed); + + ml_printf("ALL WFX TESTS PASSED\n"); + return 0; +} diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/= Makefile.softmmu-target index c0939a0eeca..9a5b95de621 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -105,6 +105,14 @@ endif =20 gicv3.o: gicv3.c gicv3.h $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@ + +wfx: CFLAGS +=3D -march=3Darmv8.7-a +wfx: LDFLAGS +=3D gicv3.o +wfx: gicv3.o + +QEMU_GICV3_MACHINE=3D-M virt,gic-version=3D3 -cpu max -display none +run-wfx: QEMU_OPTS=3D$(QEMU_GICV3_MACHINE) $(QEMU_BASE_ARGS) -kernel + ifneq ($(CROSS_CC_HAS_ARMV8_MTE),) QEMU_MTE_ENABLED_MACHINE=3D-M virt,mte=3Don -cpu max -display none QEMU_OPTS_WITH_MTE_ON =3D $(QEMU_MTE_ENABLED_MACHINE) $(QEMU_BASE_ARGS) -k= ernel diff --git a/tests/tcg/aarch64/system/boot.S b/tests/tcg/aarch64/system/boo= t.S index 03a5bad2ab0..6a71fc0da5a 100644 --- a/tests/tcg/aarch64/system/boot.S +++ b/tests/tcg/aarch64/system/boot.S @@ -60,7 +60,6 @@ curr_sp0_irq: curr_sp0_fiq: curr_sp0_serror: curr_spx_sync: -curr_spx_irq: curr_spx_fiq: curr_spx_serror: lower_a64_sync: @@ -379,6 +378,17 @@ _exit: semihosting_call /* never returns */ =20 + /* + * IRQ handler + */ + .global curr_spx_irq +curr_spx_irq: + /* Minimal IRQ handler: just mask the timer and return */ + mrs x0, cntv_ctl_el0 + orr x0, x0, #2 /* IMASK=3D1 */ + msr cntv_ctl_el0, x0 + eret + /* * Helper Functions */ --=20 2.47.3