From nobody Mon Feb 17 16:37:00 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YxSws52qyz5nrgy; Mon, 17 Feb 2025 16:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YxSws10N5z42Y5; Mon, 17 Feb 2025 16:37:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739810221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4MvsKNFpVQZ/XBp4TZsfiBLSzm65EDkdIo5LuLoJQjg=; b=cGjk89pjY1F5P4/1PAI+1iL3GWMMSXXtFHPUyedotBnPcv1qr/Zh10g3G6KvPzz43u0wpu Z4iIxwJqcURobPmFzLFSNYw+iYJSAEHpXWg5Z5eCDog3T4DMjoudViHz0idRw97yV27Y1+ k8Ms06lN9+S9CIg1LwKS6ktkG9fBaamcKDzFZNd/5MNl+W9LX7a2iH3Ril/Cgwpg8WO+0r jE3DExsn9GpDFLWgjfPNqr1agQ688jYSiT4bBKpnZVZzH6JIiPu5SRYMfFW+TjHj3e/LuW RM82GfRX4Zm7a0fRKJ3c1opX2/QLTorxWMzUYyMZGj7ILOajbULuvR85tf6OFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739810221; a=rsa-sha256; cv=none; b=HUlzwjfqQq52unpYj4KQwr3jsw9MtTZJTx9bYcm+oy376v9nCZG0DZZX80cO8A+tLh2/vL eYpQYjou051xmE6tdmZdX4e0SRvWqtHDD2HlxXiAAxd2AE7tl8MgEL3nJmtYF9g5sIpgZa ejJDhzmS83pTMb4G5X4XtYD0Qk2dK9T3N/V0Rk2FxUXfbvR2t0f6bSFPxE5AQe/VOmO3Wi heZ0WwH0PhDLnc7YAvrIqwR/1Lk37G4qRe3AKaZxjR4zoJP20TuWV0eD+Wfs8pQBde3lxn ALc57UT/rP3zBunYx0vdm8PwjFNAYKJzUkFrJfQH9cQv82uSnxF/BgWeltgPbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739810221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4MvsKNFpVQZ/XBp4TZsfiBLSzm65EDkdIo5LuLoJQjg=; b=o8Id+KzlftJYoGDT0W7bpjqcEpLMEQoZr2GA1JvZvBkggKkwoLM+9OaF0PDp7lamo+eQO3 M8PGYub0C5RC+oQbdFWRPFBs80Nfrr7wHJV7SlXTBPvKPtBRfG1HGTL79TbFB2mCRgSz6n QllQMb89yWoXp1wJ9fMG006pw1EXMGcQmfSF3+kwCBX6TsyRaxhenoUKlgOs3uLnRMQPOT 1nEkLO6yJWIpOxT/VTkhYARQ0QMzUyMMnRWx7L0w796s+ZV+JHDeeYDkk8B/T1Jelj+yCV zhd+QpJJvBsqnnsm0KwHjBtJFX3ASgwgK13fC4H0HInraXCuKDI6do3JgP49zw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YxSwr4svhzhtH; Mon, 17 Feb 2025 16:37:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51HGb0lb082901; Mon, 17 Feb 2025 16:37:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51HGb0kT082898; Mon, 17 Feb 2025 16:37:00 GMT (envelope-from git) Date: Mon, 17 Feb 2025 16:37:00 GMT Message-Id: <202502171637.51HGb0kT082898@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 43b3e755d075 - main - arm64: use FEAT_WFxT for DELAY() when available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43b3e755d07576da8a169a2d000d0f4b4ce33f19 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=43b3e755d07576da8a169a2d000d0f4b4ce33f19 commit 43b3e755d07576da8a169a2d000d0f4b4ce33f19 Author: Harry Moulton AuthorDate: 2025-02-17 16:01:48 +0000 Commit: Andrew Turner CommitDate: 2025-02-17 16:07:36 +0000 arm64: use FEAT_WFxT for DELAY() when available Use a wfet, rather than a busy wait, in DELAY() when the FEAT_WFxT extension is available. Reviewed by: andrew Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D48580 Signed-off-by: Harry Moulton --- sys/arm/arm/generic_timer.c | 86 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 67 insertions(+), 19 deletions(-) diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c index 775290960ebd..685398117396 100644 --- a/sys/arm/arm/generic_timer.c +++ b/sys/arm/arm/generic_timer.c @@ -60,6 +60,8 @@ #if defined(__aarch64__) #include +#include +#include #endif #ifdef FDT @@ -94,6 +96,10 @@ #define GT_CNTKCTL_PL0VCTEN (1 << 1) /* PL0 CNTVCT and CNTFRQ access */ #define GT_CNTKCTL_PL0PCTEN (1 << 0) /* PL0 CNTPCT and CNTFRQ access */ +#if defined(__aarch64__) +static bool __read_mostly enable_wfxt = false; +#endif + struct arm_tmr_softc; struct arm_tmr_irq { @@ -805,12 +811,10 @@ EARLY_DRIVER_MODULE(timer, acpi, arm_tmr_acpi_driver, 0, 0, BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); #endif -static void -arm_tmr_do_delay(int usec, void *arg) +static int64_t +arm_tmr_get_counts(int usec) { - struct arm_tmr_softc *sc = arg; - int32_t counts, counts_per_usec; - uint32_t first, last; + int64_t counts, counts_per_usec; /* Get the number of times to count */ counts_per_usec = ((arm_tmr_timecount.tc_frequency / 1000000) + 1); @@ -826,12 +830,30 @@ arm_tmr_do_delay(int usec, void *arg) else counts = usec * counts_per_usec; + return counts; +} + +static void +arm_tmr_do_delay(int usec, void *arg) +{ + struct arm_tmr_softc *sc = arg; + int64_t counts; + uint64_t first; +#if defined(__aarch64__) + int64_t end; +#endif + + counts = arm_tmr_get_counts(usec); first = sc->get_cntxct(sc->physical_sys); +#if defined(__aarch64__) + end = first + counts; +#endif - while (counts > 0) { - last = sc->get_cntxct(sc->physical_sys); - counts -= (int32_t)(last - first); - first = last; + while ((sc->get_cntxct(sc->physical_sys) - first) < counts) { +#if defined(__aarch64__) + if (enable_wfxt) + wfet(end); +#endif } } @@ -843,21 +865,47 @@ DELAY(int usec) TSENTER(); /* - * Check the timers are setup, if not just - * use a for loop for the meantime - */ - if (arm_tmr_sc == NULL) { + * We have two options for a delay: using the timer, or using the wfet + * instruction. However, both of these are dependent on timers being + * setup, and if they're not just use a loop for the meantime. + */ + if (arm_tmr_sc != NULL) { + arm_tmr_do_delay(usec, arm_tmr_sc); + } else { for (; usec > 0; usec--) for (counts = 200; counts > 0; counts--) - /* - * Prevent the compiler from optimizing - * out the loop - */ + /* Prevent the compiler from optimizing out the loop */ cpufunc_nullop(); - } else - arm_tmr_do_delay(usec, arm_tmr_sc); + } TSEXIT(); } + +static bool +wfxt_check(const struct cpu_feat *feat __unused, u_int midr __unused) +{ + uint64_t id_aa64isar2; + + if (!get_kernel_reg(ID_AA64ISAR2_EL1, &id_aa64isar2)) + return (false); + return (ID_AA64ISAR2_WFxT_VAL(id_aa64isar2) != ID_AA64ISAR2_WFxT_NONE); +} + +static void +wfxt_enable(const struct cpu_feat *feat __unused, + cpu_feat_errata errata_status __unused, u_int *errata_list __unused, + u_int errata_count __unused) +{ + /* will be called if wfxt_check returns true */ + enable_wfxt = true; +} + +static struct cpu_feat feat_wfxt = { + .feat_name = "FEAT_WFXT", + .feat_check = wfxt_check, + .feat_enable = wfxt_enable, + .feat_flags = CPU_FEAT_AFTER_DEV | CPU_FEAT_SYSTEM, +}; +DATA_SET(cpu_feat_set, feat_wfxt); #endif static uint32_t