DPAA2: Simplify software portal locking.

New universal structure (dpaa2_buf) added to describe all of the DMA mapped buffers for DPAA2 drivers. Software portals use sleep mutexes from now on only to simplify locking.
mcusim · Aug 1, 2022 · e95fb52 · e95fb52
1 parent 1a7aba9
commit e95fb52
Show file tree

Hide file tree

Showing 6 changed files with 436 additions and 416 deletions.
diff --git a/sys/dev/dpaa2/dpaa2_io.c b/sys/dev/dpaa2/dpaa2_io.c
@@ -284,8 +284,7 @@ dpaa2_io_attach(device_t dev)
 	    (sc->swp_desc.swp_clk / 1000000);
 
 	/* Initialize QBMan software portal. */
-	error = dpaa2_swp_init_portal(&sc->swp, &sc->swp_desc, DPAA2_SWP_DEF,
-	    true);
+	error = dpaa2_swp_init_portal(&sc->swp, &sc->swp_desc, DPAA2_SWP_DEF);
 	if (error) {
 		device_printf(dev, "%s: failed to initialize dpaa2_swp: "
 		    "error=%d\n", __func__, error);
@@ -503,10 +502,10 @@ dpaa2_io_intr(void *arg)
 	if (status == 0)
 		return;
 
-	dpaa2_swp_lock(sc->swp, &flags);
+	DPAA2_SWP_LOCK(sc->swp, &flags);
 	if (flags & DPAA2_SWP_DESTROYED) {
 		/* Terminate operation if portal is destroyed. */
-		dpaa2_swp_unlock(sc->swp);
+		DPAA2_SWP_UNLOCK(sc->swp);
 		return;
 	}
 
@@ -524,7 +523,7 @@ dpaa2_io_intr(void *arg)
 
 		dpaa2_swp_write_reg(sc->swp, DPAA2_SWP_CINH_DCAP, idx);
 	}
-	dpaa2_swp_unlock(sc->swp);
+	DPAA2_SWP_UNLOCK(sc->swp);
 
 	/* Enqueue notification tasks. */
 	for (int i = 0; i < cdan_n; i++)