From: David Hill <dhill@mindcry.org>
Subject: envy(4): replace uvm_km_kmemalloc_pla
To: tech@openbsd.org
Date: Fri, 15 Aug 2025 18:06:24 +0000

Hello,

This replaces uvm_km_kmemalloc_pla with bus_dmamem_alloc_range, like was 
done with bce(4).

This is the last user of uvm_km_kmemalloc_pla outside malloc()

Untested...

Index: envy.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/envy.c,v
diff -u -p -r1.88 envy.c
--- envy.c	24 May 2024 06:02:53 -0000	1.88
+++ envy.c	15 Aug 2025 18:00:39 -0000
@@ -1811,6 +1811,8 @@ envy_allocm(void *self, int dir, size_t
  	int err, wait;
  	struct envy_buf *buf;
  	bus_addr_t dma_addr;
+	bus_dma_segment_t segs;
+	int rsegs;

  	buf = (dir == AUMODE_RECORD) ? &sc->ibuf : &sc->obuf;
  	if (buf->addr != NULL) {
@@ -1823,12 +1825,18 @@ envy_allocm(void *self, int dir, size_t
  #define ENVY_ALIGN	4
  #define ENVY_MAXADDR	((1 << 28) - 1)

-	buf->addr = (caddr_t)uvm_km_kmemalloc_pla(kernel_map,
-	    uvm.kernel_object, buf->size, 0, UVM_KMF_NOWAIT, 0,
-	    (paddr_t)ENVY_MAXADDR, 0, 0, 1);
-	if (buf->addr == NULL) {
-		DPRINTF("%s: unable to alloc dma segment\n", DEVNAME(sc));
+	if ((err = bus_dmamem_alloc_range(sc->pci_dmat, buf->size,
+	    (bus_size_t)ENVY_ALIGN, 0, &segs, 1, &rsegs, BUS_DMA_NOWAIT,
+	    (bus_addr_t)0, (bus_addr_t)ENVY_MAXADDR)) != 0) {
+		DPRINTF("%s: unable to alloc dma segment: error %d\n",
+		    DEVNAME(sc), err);
  		goto err_ret;
+	}
+	if ((err = bus_dmamem_map(sc->pci_dmat, &segs, rsegs, buf->size,
+	    &buf->addr, BUS_DMA_NOWAIT))) {
+		DPRINTF("%s: unable to map data, error %d\n",
+		    DEVNAME(sc), err);
+		goto err_unmap;
  	}
  	err = bus_dmamap_create(sc->pci_dmat, buf->size, 1, buf->size, 0,
  	    wait, &buf->map);
@@ -1855,7 +1863,7 @@ envy_allocm(void *self, int dir, size_t
   err_destroy:
  	bus_dmamap_destroy(sc->pci_dmat, buf->map);
   err_unmap:
-	uvm_km_free(kernel_map, (vaddr_t)buf->addr, buf->size);
+	bus_dmamem_free(sc->pci_dmat, &segs, rsegs);
   err_ret:
  	return NULL;
  }