From owner-p4-projects@FreeBSD.ORG  Fri Mar 31 08:28:50 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 6487C16A423; Fri, 31 Mar 2006 08:28:50 +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 22D2A16A400
	for <perforce@freebsd.org>; Fri, 31 Mar 2006 08:28:50 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B8A0643D45
	for <perforce@freebsd.org>; Fri, 31 Mar 2006 08:28:49 +0000 (GMT)
	(envelope-from kmacy@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 k2V8SnCJ044702
	for <perforce@freebsd.org>; Fri, 31 Mar 2006 08:28:49 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2V8SnLq044699
	for perforce@freebsd.org; Fri, 31 Mar 2006 08:28:49 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 31 Mar 2006 08:28:49 GMT
Message-Id: <200603310828.k2V8SnLq044699@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94349 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: Fri, 31 Mar 2006 08:28:50 -0000

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

Change 94349 by kmacy@kmacy_storage:sun4v_work on 2006/03/31 08:28:15

	quick workaround for TSB alignment errors

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#34 edit

Differences ...

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

@@ -471,7 +471,13 @@
 	 * Set up TSB descriptors for the hypervisor
 	 *
 	 */
+#ifdef notyet
 	tsb_8k_size = virtsz >> (PAGE_SHIFT - TTE_SHIFT);
+	DPRINTF("tsb_8k_size is 0x%lx\n", tsb_8k_size);
+#else
+	/* avoid alignment complaints from the hypervisor */
+	tsb_8k_size = PAGE_SIZE_4M;
+#endif
 
 	pa = pmap_bootstrap_alloc(tsb_8k_size);
 	if (pa & PAGE_MASK_4M)
@@ -506,6 +512,7 @@
 	tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT);
 	pa = pmap_bootstrap_alloc(tsb_4m_size);
 
+	DPRINTF("tsb_4m_pa is 0x%lx tsb_4m_size is 0x%lx\n", pa, tsb_4m_size);
 	kernel_td[TSB4M_INDEX].hvtsb_idxpgsz = TTE4M;
 	kernel_td[TSB4M_INDEX].hvtsb_assoc = 1;
 	kernel_td[TSB4M_INDEX].hvtsb_ntte = (tsb_4m_size >> TTE_SHIFT);
@@ -635,7 +642,7 @@
 
 	PMAP_LOCK_INIT(kernel_pmap);
 	TAILQ_INIT(&kernel_pmap->pm_pvlist);
-	
+
 	error = hv_set_ctx0(MAX_TSB_INFO, vtophys((vm_offset_t)&kernel_td));
 	if (error != H_EOK)
 		panic("failed to set ctx0 TSBs error: %ld", error);