From nobody Mon Sep 21 15:26:09 2026 X-Original-To: dev-commits-src-main@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 4hpRrx5V1Zz6slmr for ; Mon, 21 Sep 2026 15:26:09 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hpRrx2Jdxz4b0W for ; Mon, 21 Sep 2026 15:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790004369; 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=1FOuJZQ3wDvR8OaUOa1BrDUrqywsnuc8UisPVwY6FOs=; b=TUMHznzavwy79mc55khqAX2tqDytHFuVqPyf+CO3iBRdG0+R5X0CaRaPJCSuVIWqiG/m16 JtGZD5/vgGSdUwCs+c+eCilM2bgZgUYmmNn/rihqY5dmVHvo8Q2OmAnGIVg0dCHlwmhYg5 Kxy94LTB6/okyzTvDnJhCCdrS4ocBc7LfcsFDZKtkgQB0Suwsair1x9sYTiWMxpaFSjg4B UlyeppcK5EmPejGueUb7dYnx9AQcbrwehsuESTj5dkciF6yQZtXtOipbs2yKojuIVZ34eX VHYINsxa58CZt8tUvjjOyU4P8FSJemgmFaDCZ0klFzVdyP/NwoziZ59oMPLn2w== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790004369; b=esWnzE+LG2jrTcpReeT9Tq7gTZish2Sc3+GfEZeXTAx+tZ/Tl91INWz5Q3ogMuM7ISuiWT OlLnRYulq+RuSwclMTR3BcTUUj+AwdJvg21p+tFSAqkOljdtJW9tEP9ijaHi/R8lD6s4Xs NcgkEM2Qh5cPo0L6Kmg/k3eUrBle7ZJIxohSDtsyE5NijfymtHzQNrnvM4znkeMKkRAHK0 PFt54H9KwlMX3Y9PougohOhha5jJFiKO2wLfS6RbEwvzATBtc7B/+gwwwSpte+IOjpH3pv 4NuY02mKaPAtv9a96rAMeKuchofcfcm5rHFQ1z0v+ES+IHuzTam50jqtJGrqCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790004369; 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=1FOuJZQ3wDvR8OaUOa1BrDUrqywsnuc8UisPVwY6FOs=; b=KYu5kg64JH11ROkATVa3Er8IU0+YuOEvoaz0KcdxkD2dQWidQLahRxHzSnCk8iLtmZjMDE 2zkkzHW1sH4i5X0PG+6JH/RPv1azKR2QqI06Hc7R2CW63q/TBqOucSgUgRgJBPDtWqaSin 4yD7kvobKfTXXezOGjRuuOBfpxQbPLwRbnRLWsdtqeSVabksCus3YJBgB5tDLMZMSc3LUk 09CuGf55cHXbSeXeevSfkacMx/Ig7a4ncGhARrZ5SfpzrA75vr0TDAzt/+rTNRmK77Zsp0 hh+RyWMk9rZg1c6TFOWM2vZ5EimJ4RbBrxPm8QrJUGiDL08DPawqNiMDzLjJOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hpRrx184hzPKx for ; Mon, 21 Sep 2026 15:26:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 308c3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 21 Sep 2026 15:26:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 54393bf5361a - main - arm64/smmu: Split out waiting for sync completion List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 54393bf5361a653c530170da20323181e515d7a1 Auto-Submitted: auto-generated Date: Mon, 21 Sep 2026 15:26:09 +0000 Message-Id: <6ab14c91.308c3.3dea9c14@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=54393bf5361a653c530170da20323181e515d7a1 commit 54393bf5361a653c530170da20323181e515d7a1 Author: Andrew Turner AuthorDate: 2026-09-18 11:28:51 +0000 Commit: Andrew Turner CommitDate: 2026-09-18 11:28:51 +0000 arm64/smmu: Split out waiting for sync completion In preparation for adding a non-MSI method split out waiting for sync completions from smmu_sync. While here fix the loop to wait for sync timeout to the worst case Linux uses. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D59487 --- sys/arm64/iommu/smmu.c | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/sys/arm64/iommu/smmu.c b/sys/arm64/iommu/smmu.c index 38cdd507a9c2..d5f79c9a2801 100644 --- a/sys/arm64/iommu/smmu.c +++ b/sys/arm64/iommu/smmu.c @@ -567,43 +567,48 @@ smmu_poll_until_consumed(struct smmu_softc *sc, struct smmu_queue *q) } } -static int -smmu_sync(struct smmu_softc *sc) +static void +smmu_sync_wait_msi(struct smmu_softc *sc, struct smmu_queue *q) { - struct smmu_cmdq_entry cmd; - struct smmu_queue *q; + sbintime_t start; uint32_t *base; - int timeout; int prod; - q = &sc->cmdq; prod = q->lc.prod; - /* Enqueue sync command. */ - cmd.opcode = CMD_SYNC; - cmd.sync.msiaddr = q->paddr + Q_IDX(q, prod) * CMDQ_ENTRY_DWORDS * 8; - smmu_cmdq_enqueue_cmd(sc, &cmd); - /* Wait for the sync completion. */ base = (void *)((uint64_t)q->vaddr + Q_IDX(q, prod) * CMDQ_ENTRY_DWORDS * 8); - /* - * It takes around 200 loops (6 instructions each) - * on Neoverse N1 to complete the sync. - */ - timeout = 10000; - + start = getsbinuptime(); do { - if (*base == 0) { + if (atomic_load_32(base) == 0) { /* MSI write completed. */ - break; + return; } - cpu_spinwait(); - } while (timeout--); + DELAY(100); + } while ((getsbinuptime() - start) < SBT_1S); - if (timeout < 0) + if (atomic_load_32(base) != 0) device_printf(sc->dev, "Failed to sync\n"); +} + +static int +smmu_sync(struct smmu_softc *sc) +{ + struct smmu_cmdq_entry cmd; + struct smmu_queue *q; + int prod; + + q = &sc->cmdq; + prod = q->lc.prod; + + /* Enqueue sync command. */ + cmd.opcode = CMD_SYNC; + cmd.sync.msiaddr = q->paddr + Q_IDX(q, prod) * CMDQ_ENTRY_DWORDS * 8; + smmu_cmdq_enqueue_cmd(sc, &cmd); + + smmu_sync_wait_msi(sc, q); return (0); }