From 54393bf5361a653c530170da20323181e515d7a1 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 18 Sep 2026 12:28:51 +0100
Subject: [PATCH] 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,13 +567,37 @@ smmu_poll_until_consumed(struct smmu_softc *sc, struct smmu_queue *q)
 	}
 }
 
+static void
+smmu_sync_wait_msi(struct smmu_softc *sc, struct smmu_queue *q)
+{
+	sbintime_t start;
+	uint32_t *base;
+	int prod;
+
+	prod = q->lc.prod;
+
+	/* Wait for the sync completion. */
+	base = (void *)((uint64_t)q->vaddr +
+	    Q_IDX(q, prod) * CMDQ_ENTRY_DWORDS * 8);
+
+	start = getsbinuptime();
+	do {
+		if (atomic_load_32(base) == 0) {
+			/* MSI write completed. */
+			return;
+		}
+		DELAY(100);
+	} while ((getsbinuptime() - start) < SBT_1S);
+
+	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;
-	uint32_t *base;
-	int timeout;
 	int prod;
 
 	q = &sc->cmdq;
@@ -584,26 +608,7 @@ smmu_sync(struct smmu_softc *sc)
 	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;
-
-	do {
-		if (*base == 0) {
-			/* MSI write completed. */
-			break;
-		}
-		cpu_spinwait();
-	} while (timeout--);
-
-	if (timeout < 0)
-		device_printf(sc->dev, "Failed to sync\n");
+	smmu_sync_wait_msi(sc, q);
 
 	return (0);
 }