From owner-p4-projects@FreeBSD.ORG  Tue Apr 11 22:15:45 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 358AA16A406; Tue, 11 Apr 2006 22:15:45 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1264416A404
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 22:15:45 +0000 (UTC)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D35F243D45
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 22:15:44 +0000 (GMT)
	(envelope-from jmg@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3BMFiR3000985
	for <perforce@freebsd.org>; Tue, 11 Apr 2006 22:15:44 GMT
	(envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3BMFiIh000979
	for perforce@freebsd.org; Tue, 11 Apr 2006 22:15:44 GMT
	(envelope-from jmg@freebsd.org)
Date: Tue, 11 Apr 2006 22:15:44 GMT
Message-Id: <200604112215.k3BMFiIh000979@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95032 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Apr 2006 22:15:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=95032

Change 95032 by jmg@jmg_arlene on 2006/04/11 22:15:38

	remove the entire mapping, not just part of it...  and assert that
	va and len are page aligned...

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#12 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hviommu.c#12 (text+ko) ====

@@ -233,7 +233,6 @@
 	return him;
 }
 
-/* XXX - vm_size_t better be signed */
 static void
 hviommu_remove(struct hviommu *him, vm_offset_t va, vm_size_t len)
 {
@@ -244,8 +243,8 @@
 	    ("%s: va 0x%lx not in DVMA space", __func__, (u_long)va));
 	KASSERT(va + len >= va,
 	    ("%s: va 0x%lx + len 0x%lx wraps", __func__, (long)va, (long)len));
-	len = round_page(len + (va & IO_PAGE_MASK));
-	va = trunc_io_page(va);
+	KASSERT((va & IO_PAGE_MASK) == 0 && (len & IO_PAGE_MASK) == 0,
+	    ("%s: va %#lx or len %#lx not page aligned", __func__, va, len));
 	while (len > 0) {
 		if ((error = hvio_iommu_demap(him->him_handle,
 		    VA_TO_TSBID(him, va), len >> IO_PAGE_SHIFT, &demapped))) {
@@ -306,7 +305,7 @@
 	struct bus_dmamap_res *r;
 
 	SLIST_FOREACH(r, &map->dm_reslist, dr_link) {
-		hviommu_remove(him, BDR_START(r) + r->dr_offset, r->dr_used);
+		hviommu_remove(him, BDR_START(r), BDR_SIZE(r));
 		r->dr_used = 0;
 	}
 }