De-orbit bus_dmamem_alloc_size(). It's a hack and was never used anyways.

No need for it to pollute the 5.x API any further.

Approved by:	re (bmah)

5 files changed, 6 insertions, 111 deletions

diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index bc6e518..c69c270 100644
--- a/sys/sparc64/include/bus.h
+++ b/sys/sparc64/include/bus.h
@@ -980,12 +980,8 @@ struct bus_dma_tag {
 	/*
 	 * DMA memory utility functions.
 	 */
-	int	(*dt_dmamem_alloc_size)(bus_dma_tag_t, bus_dma_tag_t, void **,
-	    int, bus_dmamap_t *, bus_size_t size);
 	int	(*dt_dmamem_alloc)(bus_dma_tag_t, bus_dma_tag_t, void **, int,
 	    bus_dmamap_t *);
-	void	(*dt_dmamem_free_size)(bus_dma_tag_t, bus_dma_tag_t, void *,
-	    bus_dmamap_t, bus_size_t size);
 	void	(*dt_dmamem_free)(bus_dma_tag_t, bus_dma_tag_t, void *,
 	    bus_dmamap_t);
 };
@@ -1096,19 +1092,6 @@ sparc64_dmamap_sync(bus_dma_tag_t pt, bus_dma_tag_t dt, bus_dmamap_t m, int op)
 	sparc64_dmamap_sync((t), (t), (m), (op))
 
 static __inline int
-sparc64_dmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt, void **v, int f,
-    bus_dmamap_t *m, bus_size_t s)
-{
-	bus_dma_tag_t lt;
-
-	for (lt = pt; lt->dt_dmamem_alloc_size == NULL; lt = lt->dt_parent)
-		;
-	return ((*lt->dt_dmamem_alloc_size)(lt, dt, v, f, m, s));
-}
-#define	bus_dmamem_alloc_size(t, v, f, m, s)				\
-	sparc64_dmamem_alloc_size((t), (t), (v), (f), (m), (s))
-
-static __inline int
 sparc64_dmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, void **v, int f,
     bus_dmamap_t *m)
 {
@@ -1122,19 +1105,6 @@ sparc64_dmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, void **v, int f,
 	sparc64_dmamem_alloc((t), (t), (v), (f), (m))
 
 static __inline void
-sparc64_dmamem_free_size(bus_dma_tag_t pt, bus_dma_tag_t dt, void *v,
-    bus_dmamap_t m, bus_size_t s)
-{
-	bus_dma_tag_t lt;
-
-	for (lt = pt; lt->dt_dmamem_free_size == NULL; lt = lt->dt_parent)
-		;
-	(*lt->dt_dmamem_free_size)(lt, dt, v, m, s);
-}
-#define	bus_dmamem_free_size(t, v, m, s)				\
-	sparc64_dmamem_free_size((t), (t), (v), (m), (s))
-
-static __inline void
 sparc64_dmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, void *v,
     bus_dmamap_t m)
 {
diff --git a/sys/sparc64/include/iommuvar.h b/sys/sparc64/include/iommuvar.h
index 4584001..5337d14 100644
--- a/sys/sparc64/include/iommuvar.h
+++ b/sys/sparc64/include/iommuvar.h
@@ -95,12 +95,8 @@ void iommu_dvmamap_unload(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *,
     bus_dmamap_t);
 void iommu_dvmamap_sync(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *,
     bus_dmamap_t, int);
-int iommu_dvmamem_alloc_size(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *,
-    void **, int, bus_dmamap_t *, bus_size_t size);
 int iommu_dvmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *,
     void **, int, bus_dmamap_t *);
-void iommu_dvmamem_free_size(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *,
-    void *, bus_dmamap_t, bus_size_t size);
 void iommu_dvmamem_free(bus_dma_tag_t, bus_dma_tag_t, struct iommu_state *,
     void *, bus_dmamap_t);
 
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 25234d7..5de26ba 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -112,12 +112,8 @@ static int psycho_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
     struct uio *, bus_dmamap_callback2_t *, void *, int);
 static void psycho_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t);
 static void psycho_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int);
-static int psycho_dmamem_alloc_size(bus_dma_tag_t, bus_dma_tag_t, void **, int,
-    bus_dmamap_t *, bus_size_t size);
 static int psycho_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int,
     bus_dmamap_t *);
-static void psycho_dmamem_free_size(bus_dma_tag_t, bus_dma_tag_t, void *,
-    bus_dmamap_t, bus_size_t size);
 static void psycho_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *,
     bus_dmamap_t);
 
@@ -501,9 +497,7 @@ psycho_attach(device_t dev)
 	sc->sc_dmat->dt_dmamap_load_uio = psycho_dmamap_load_uio;
 	sc->sc_dmat->dt_dmamap_unload = psycho_dmamap_unload;
 	sc->sc_dmat->dt_dmamap_sync = psycho_dmamap_sync;
-	sc->sc_dmat->dt_dmamem_alloc_size = psycho_dmamem_alloc_size;
 	sc->sc_dmat->dt_dmamem_alloc = psycho_dmamem_alloc;
-	sc->sc_dmat->dt_dmamem_free_size = psycho_dmamem_free_size;
 	sc->sc_dmat->dt_dmamem_free = psycho_dmamem_free;
 	/* XXX: register as root dma tag (kluge). */
 	sparc64_root_dma_tag = sc->sc_dmat;
@@ -1320,17 +1314,6 @@ psycho_alloc_bus_tag(struct psycho_softc *sc, int type)
  * hooks into the iommu dvma calls.
  */
 static int
-psycho_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
-    int flags, bus_dmamap_t *mapp, bus_size_t size)
-{
-	struct psycho_softc *sc;
-
-	sc = (struct psycho_softc *)pdmat->dt_cookie;
-	return (iommu_dvmamem_alloc_size(pdmat, ddmat, sc->sc_is, vaddr, flags,
-	    mapp, size));
-}
-
-static int
 psycho_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
     int flags, bus_dmamap_t *mapp)
 {
@@ -1342,16 +1325,6 @@ psycho_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 }
 
 static void
-psycho_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
-    bus_dmamap_t map, bus_size_t size)
-{
-	struct psycho_softc *sc;
-
-	sc = (struct psycho_softc *)pdmat->dt_cookie;
-	iommu_dvmamem_free_size(pdmat, ddmat, sc->sc_is, vaddr, map, size);
-}
-
-static void
 psycho_dmamem_free(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
     bus_dmamap_t map)
 {
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index f695d5a..8debb26 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -243,12 +243,8 @@ static int sbus_dmamap_load_uio(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t,
     struct uio *, bus_dmamap_callback2_t *, void *, int);
 static void sbus_dmamap_unload(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t);
 static void sbus_dmamap_sync(bus_dma_tag_t, bus_dma_tag_t, bus_dmamap_t, int);
-static int sbus_dmamem_alloc_size(bus_dma_tag_t, bus_dma_tag_t, void **, int,
-    bus_dmamap_t *, bus_size_t size);
 static int sbus_dmamem_alloc(bus_dma_tag_t, bus_dma_tag_t, void **, int,
     bus_dmamap_t *);
-static void sbus_dmamem_free_size(bus_dma_tag_t, bus_dma_tag_t, void *,
-    bus_dmamap_t, bus_size_t);
 static void sbus_dmamem_free(bus_dma_tag_t, bus_dma_tag_t, void *,
     bus_dmamap_t);
 
@@ -352,9 +348,7 @@ sbus_probe(device_t dev)
 	sc->sc_cdmatag->dt_dmamap_load_uio = sbus_dmamap_load_uio;
 	sc->sc_cdmatag->dt_dmamap_unload = sbus_dmamap_unload;
 	sc->sc_cdmatag->dt_dmamap_sync = sbus_dmamap_sync;
-	sc->sc_cdmatag->dt_dmamem_alloc_size = sbus_dmamem_alloc_size;
 	sc->sc_cdmatag->dt_dmamem_alloc = sbus_dmamem_alloc;
-	sc->sc_cdmatag->dt_dmamem_free_size = sbus_dmamem_free_size;
 	sc->sc_cdmatag->dt_dmamem_free = sbus_dmamem_free;
 	/* XXX: register as root dma tag (kluge). */
 	sparc64_root_dma_tag = sc->sc_cdmatag;
@@ -993,16 +987,6 @@ sbus_dmamap_sync(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, bus_dmamap_t map,
 }
 
 static int
-sbus_dmamem_alloc_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
-    int flags, bus_dmamap_t *mapp, bus_size_t size)
-{
-	struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
-
-	return (iommu_dvmamem_alloc_size(pdmat, ddmat, &sc->sc_is, vaddr, flags,
-		    mapp, size));
-}
-
-static int
 sbus_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
     int flags, bus_dmamap_t *mapp)
 {
@@ -1013,15 +997,6 @@ sbus_dmamem_alloc(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void **vaddr,
 }
 
 static void
-sbus_dmamem_free_size(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
-    bus_dmamap_t map, bus_size_t size)
-{
-	struct sbus_softc *sc = (struct sbus_softc *)pdmat->dt_cookie;
-
-	iommu_dvmamem_free_size(pdmat, ddmat, &sc->sc_is, vaddr, map, size);
-}
-
-static void
 sbus_dmamem_free(bus_dma_tag_t pdmat, bus_dma_tag_t ddmat, void *vaddr,
     bus_dmamap_t map)
 {
diff --git a/sys/sparc64/sparc64/iommu.c b/sys/sparc64/sparc64/iommu.c
index ccfe1af..c42e25d 100644
--- a/sys/sparc64/sparc64/iommu.c
+++ b/sys/sparc64/sparc64/iommu.c
@@ -668,22 +668,18 @@ iommu_dvma_vallocseg(bus_dma_tag_t dt, struct iommu_state *is, bus_dmamap_t map,
 }
 
 int
-iommu_dvmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
-    struct iommu_state *is, void **vaddr, int flags, bus_dmamap_t *mapp,
-    bus_size_t size)
+iommu_dvmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
+    void **vaddr, int flags, bus_dmamap_t *mappe)
 {
 	int error;
 
-	if (size > dt->dt_maxsize)
-		return (ENOMEM);
-
 	/*
 	 * XXX: This will break for 32 bit transfers on machines with more than
 	 * 16G (1 << 34 bytes) of memory.
 	 */
 	if ((error = sparc64_dmamem_alloc_map(dt, mapp)) != 0)
 		return (error);
-	if ((*vaddr = malloc(size, M_IOMMU,
+	if ((*vaddr = malloc(dt->dt_maxsize, M_IOMMU,
 	    (flags & BUS_DMA_NOWAIT) ? M_NOWAIT : M_WAITOK)) == NULL) {
 		error = ENOMEM;
 		sparc64_dmamem_free_map(dt, *mapp);
@@ -694,21 +690,13 @@ iommu_dvmamem_alloc_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
 	 * Try to preallocate DVMA space. If this fails, it is retried at load
 	 * time.
 	 */
-	iommu_dvma_valloc(dt, is, *mapp, IOMMU_SIZE_ROUNDUP(size));
+	iommu_dvma_valloc(dt, is, *mapp, IOMMU_SIZE_ROUNDUP(dt->dt_maxsize));
 	return (0);
 }
 
-int
-iommu_dvmamem_alloc(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
-    void **vaddr, int flags, bus_dmamap_t *mapp)
-{
-	return (iommu_dvmamem_alloc_size(pt, dt, is, vaddr, flags, mapp,
-	    dt->dt_maxsize));
-}
-
 void
-iommu_dvmamem_free_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
-    struct iommu_state *is, void *vaddr, bus_dmamap_t map, bus_size_t size)
+iommu_dvmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
+    void *vaddr, bus_dmamap_t map)
 {
 
 	iommu_dvma_vfree(is, map);
@@ -716,13 +704,6 @@ iommu_dvmamem_free_size(bus_dma_tag_t pt, bus_dma_tag_t dt,
 	free(vaddr, M_IOMMU);
 }
 
-void
-iommu_dvmamem_free(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
-    void *vaddr, bus_dmamap_t map)
-{
-	iommu_dvmamem_free_size(pt, dt, is, vaddr, map, dt->dt_maxsize);
-}
-
 int
 iommu_dvmamap_create(bus_dma_tag_t pt, bus_dma_tag_t dt, struct iommu_state *is,
     int flags, bus_dmamap_t *mapp)