From owner-svn-src-head@FreeBSD.ORG  Sat Sep 27 16:50:25 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6DA046EC;
 Sat, 27 Sep 2014 16:50:25 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 59ABD2EE;
 Sat, 27 Sep 2014 16:50:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8RGoP98053607;
 Sat, 27 Sep 2014 16:50:25 GMT (envelope-from kan@FreeBSD.org)
Received: (from kan@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8RGoPuP053606;
 Sat, 27 Sep 2014 16:50:25 GMT (envelope-from kan@FreeBSD.org)
Message-Id: <201409271650.s8RGoPuP053606@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kan set sender to kan@FreeBSD.org
 using -f
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Sat, 27 Sep 2014 16:50:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272215 - head/sys/dev/firewire
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 27 Sep 2014 16:50:25 -0000

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");