git: 0de6295af231 - main - powerpc: refactor dmamap setup; free dmamap in error paths

The branch main has been updated by adrian:

URL: https://cgit.FreeBSD.org/src/commit/?id=0de6295af231aa5c13e1da2f40b29106962b6363

commit 0de6295af231aa5c13e1da2f40b29106962b6363
Author:     Adrian Chadd <adrian@FreeBSD.org>
AuthorDate: 2026-04-01 05:21:15 +0000
Commit:     Adrian Chadd <adrian@FreeBSD.org>
CommitDate: 2026-05-01 21:15:06 +0000

    powerpc: refactor dmamap setup; free dmamap in error paths
    
    * refactor the dmamap allocation / setup path for future code changes
      to align with arm64 busdma code;
    * free the dmamap allocation if the dma segment list can't be allocated;
    * free the dmamap allocation during the busdma dmamem allocation path
      if the actual memory allocation itself fails.
    
    Locally tested:
    
    * POWER9 ppc64le native boot, Raptor Engineering Blackbird
    * POWER8 ppc6le, IBM POWER S822LC
    
    https://reviews.freebsd.org/D56244
---
 sys/powerpc/powerpc/busdma_bounce.c | 48 +++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/sys/powerpc/powerpc/busdma_bounce.c b/sys/powerpc/powerpc/busdma_bounce.c
index 39e40b3a4284..b3f629a50472 100644
--- a/sys/powerpc/powerpc/busdma_bounce.c
+++ b/sys/powerpc/powerpc/busdma_bounce.c
@@ -246,6 +246,25 @@ out:
 	return (error);
 }
 
+static bus_dmamap_t
+alloc_dmamap(bus_dma_tag_t dmat, int flags)
+{
+	u_long mapsize;
+	bus_dmamap_t map;
+
+	mapsize = sizeof(*map);
+	/* TODO: sync_list */
+	map = malloc_domainset(mapsize, M_DEVBUF,
+	    DOMAINSET_PREF(dmat->common.domain), flags | M_ZERO);
+	if (map == NULL)
+		return (NULL);
+
+	/* Initialize the new map */
+	STAILQ_INIT(&map->bpages);
+
+	return (map);
+}
+
 /*
  * Allocate a handle for mapping from kva/uva/physical
  * address space into bus device space.
@@ -257,17 +276,13 @@ bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 
 	error = 0;
 
-	*mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF,
-				     M_NOWAIT | M_ZERO);
+	*mapp = alloc_dmamap(dmat, M_NOWAIT);
 	if (*mapp == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 		    __func__, dmat, ENOMEM);
 		return (ENOMEM);
 	}
 
-	/* Initialize the new map */
-	STAILQ_INIT(&((*mapp)->bpages));
-
 	/*
 	 * Bouncing might be required if the driver asks for an active
 	 * exclusion region, a data alignment that is stricter than 1, and/or
@@ -319,11 +334,16 @@ bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 	if ((*mapp)->segments == NULL) {
 		CTR3(KTR_BUSDMA, "%s: tag %p error %d",
 		    __func__, dmat, ENOMEM);
-		return (ENOMEM);
+		error = ENOMEM;
 	}
 
-	if (error == 0)
+	if (error == 0) {
 		dmat->map_count++;
+	} else {
+		free((*mapp)->segments, M_DEVBUF);
+		free(*mapp, M_DEVBUF);
+		*mapp = NULL;
+	}
 	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 	    __func__, dmat, dmat->common.flags, error);
 	return (error);
@@ -369,7 +389,12 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 	else
 		mflags = M_WAITOK;
 
-	bus_dmamap_create(dmat, flags, mapp);
+	bounce_bus_dmamap_create(dmat, mflags, mapp);
+	if (*mapp == NULL) {
+		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d\n",
+		    __func__, dmat, dmat->common.flags, ENOMEM);
+		return (ENOMEM);
+	}
 
 	if (flags & BUS_DMA_ZERO)
 		mflags |= M_ZERO;
@@ -406,6 +431,8 @@ bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 	if (*vaddr == NULL) {
 		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
 		    __func__, dmat, dmat->common.flags, ENOMEM);
+		bounce_bus_dmamap_destroy(dmat, *mapp);
+		*mapp = NULL;
 		return (ENOMEM);
 	} else if (!vm_addr_align_ok(vtophys(*vaddr), dmat->common.alignment)) {
 		printf("bus_dmamem_alloc failed to align memory properly.\n");
@@ -427,8 +454,9 @@ bounce_bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 		free(vaddr, M_DEVBUF);
 	else
 		kmem_free(vaddr, dmat->common.maxsize);
-	bus_dmamap_destroy(dmat, map);
-	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->common.flags);
+	bounce_bus_dmamap_destroy(dmat, map);
+	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat,
+	    dmat->common.flags);
 }
 
 static void