Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Aug 2012 16:58:51 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r239865 - head/sys/dev/ath
Message-ID:  <201208291658.q7TGwpH1081831@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adrian
Date: Wed Aug 29 16:58:51 2012
New Revision: 239865
URL: http://svn.freebsd.org/changeset/base/239865

Log:
  There's no nede to allocate a DMA map just before calling bus_dmamem_alloc().
  
  In fact, bus_dmamem_alloc() happily NULLs the dmat pointer passed in,
  before replacing it with its own.
  
  This fixes a MIPS crash when kldload'ing if_ath/if_ath_pci -
  bus_dmamap_destroy() was passed in a NULL dmat pointer and was doing
  all kinds of very bad things.
  
  Reviewed by:	scottl

Modified:
  head/sys/dev/ath/if_ath.c

Modified: head/sys/dev/ath/if_ath.c
==============================================================================
--- head/sys/dev/ath/if_ath.c	Wed Aug 29 16:56:50 2012	(r239864)
+++ head/sys/dev/ath/if_ath.c	Wed Aug 29 16:58:51 2012	(r239865)
@@ -2856,13 +2856,6 @@ ath_descdma_alloc_desc(struct ath_softc 
 	}
 
 	/* allocate descriptors */
-	error = bus_dmamap_create(dd->dd_dmat, BUS_DMA_NOWAIT, &dd->dd_dmamap);
-	if (error != 0) {
-		if_printf(ifp, "unable to create dmamap for %s descriptors, "
-			"error %u\n", dd->dd_name, error);
-		goto fail0;
-	}
-
 	error = bus_dmamem_alloc(dd->dd_dmat, (void**) &dd->dd_desc,
 				 BUS_DMA_NOWAIT | BUS_DMA_COHERENT,
 				 &dd->dd_dmamap);
@@ -2892,8 +2885,6 @@ ath_descdma_alloc_desc(struct ath_softc 
 fail2:
 	bus_dmamem_free(dd->dd_dmat, dd->dd_desc, dd->dd_dmamap);
 fail1:
-	bus_dmamap_destroy(dd->dd_dmat, dd->dd_dmamap);
-fail0:
 	bus_dma_tag_destroy(dd->dd_dmat);
 	memset(dd, 0, sizeof(*dd));
 	return error;
@@ -2976,7 +2967,6 @@ ath_descdma_setup(struct ath_softc *sc,
 fail3:
 	bus_dmamap_unload(dd->dd_dmat, dd->dd_dmamap);
 	bus_dmamem_free(dd->dd_dmat, dd->dd_desc, dd->dd_dmamap);
-	bus_dmamap_destroy(dd->dd_dmat, dd->dd_dmamap);
 	bus_dma_tag_destroy(dd->dd_dmat);
 	memset(dd, 0, sizeof(*dd));
 	return error;
@@ -3057,7 +3047,6 @@ ath_descdma_cleanup(struct ath_softc *sc
 	if (dd->dd_dmamap != 0) {
 		bus_dmamap_unload(dd->dd_dmat, dd->dd_dmamap);
 		bus_dmamem_free(dd->dd_dmat, dd->dd_desc, dd->dd_dmamap);
-		bus_dmamap_destroy(dd->dd_dmat, dd->dd_dmamap);
 		bus_dma_tag_destroy(dd->dd_dmat);
 	}
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208291658.q7TGwpH1081831>