svn commit: r272215 - head/sys/dev/firewire

[Alexander Kabaev]

Author: kan
Date: Sat Sep 27 16:50:24 2014
New Revision: 272215
URL: http://svnweb.freebsd.org/changeset/base/272215

Log:
  Do not pass whole descriptor block size as align to fwdma_malloc_multiseg
  
  Do not pass wrong alignment value to fwdma_malloc_multiseg and ultimately
  to contigalloc. In addition to being wrong, this causes insta-panic in
  certain cases due to safety assertion - the alignment is required to be
  the power of two and the value we calculate here seldom is.
  
  MFC after:  1 month

Modified:
  head/sys/dev/firewire/fwohci.c

Modified: head/sys/dev/firewire/fwohci.c
==============================================================================
--- head/sys/dev/firewire/fwohci.c	Sat Sep 27 16:50:21 2014	(r272214)
+++ head/sys/dev/firewire/fwohci.c	Sat Sep 27 16:50:24 2014	(r272215)
@@ -1253,7 +1253,7 @@ fwohci_db_init(struct fwohci_softc *sc, 
 	}
 
 #define DB_SIZE(x) (sizeof(struct fwohcidb) * (x)->ndesc)
-	dbch->am = fwdma_malloc_multiseg(&sc->fc, DB_SIZE(dbch),
+	dbch->am = fwdma_malloc_multiseg(&sc->fc, sizeof(struct fwohcidb),
 		DB_SIZE(dbch), dbch->ndb, BUS_DMA_WAITOK);
 	if (dbch->am == NULL) {
 		printf("fwohci_db_init: fwdma_malloc_multiseg failed\n");