From owner-p4-projects@FreeBSD.ORG  Wed Apr 26 05:56:58 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 DE59116A403; Wed, 26 Apr 2006 05:56:57 +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 BE0FE16A401
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 05:56:57 +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 8A3D443D46
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 05:56:57 +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 k3Q5uvWD089849
	for <perforce@freebsd.org>; Wed, 26 Apr 2006 05:56:57 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3Q5uvfs089846
	for perforce@freebsd.org; Wed, 26 Apr 2006 05:56:57 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 26 Apr 2006 05:56:57 GMT
Message-Id: <200604260556.k3Q5uvfs089846@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 96141 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: Wed, 26 Apr 2006 05:56:58 -0000

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

Change 96141 by kmacy@kmacy_storage:sun4v_rwbuf on 2006/04/26 05:56:20

	tsb_lookup_tte only called on kernel context anyway remove check
	SCRATCHPAD regs may be RMO - membar #Sync

Affected files ...

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

Differences ...

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

@@ -168,7 +168,6 @@
 	tsb_index = (va >> tsb_shift) & TSB_MASK(tsb);
 	tsb_store_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t);
 
-
 	store_real(tsb_store_pa, 0); 
 	store_real(tsb_store_pa + sizeof(uint64_t), 0);
 }
@@ -182,7 +181,7 @@
 	
 	tsb_mask = TSB_MASK(tsb);
 	tsb_shift = TTE_PAGE_SHIFT(tsb->hvtsb_idxpgsz);
-	
+
 	for (tva = sva; tva < eva; tva += PAGE_SIZE) {
 		tsb_index = (tva >> tsb_shift) & tsb_mask;
 		tsb_store_pa = tsb->hvtsb_pa + 2*tsb_index*sizeof(uint64_t);
@@ -190,6 +189,7 @@
 		store_real(tsb_store_pa, 0); 
 		store_real(tsb_store_pa + sizeof(uint64_t), 0);
 	}
+
 }
 
 tte_t
@@ -220,12 +220,12 @@
 	tte_t tte_data;
 
 	tte_data = 0;
-	if (ctx == 0) {
-		if ((tte_data = tsb_get_tte(&kernel_td[TSB4M_INDEX], va)) != 0)
-			goto done;
-		if ((tte_data = tsb_get_tte(&kernel_td[TSB8K_INDEX], va)) != 0)
-			goto done;
-	}
+
+	if ((tte_data = tsb_get_tte(&kernel_td[TSB4M_INDEX], va)) != 0)
+		goto done;
+	if ((tte_data = tsb_get_tte(&kernel_td[TSB8K_INDEX], va)) != 0)
+		goto done;
+
 	/*
 	 * handle user data 
 	 */
@@ -241,6 +241,7 @@
 	tsb_scratch = tsb->hvtsb_pa | tsb_pages;
 	
 	set_tsb_kernel_scratchpad(tsb_scratch);
+	membar(Sync);
 	return tsb_scratch;
 }
 
@@ -251,6 +252,6 @@
 	tsb_pages = tsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT);
 	tsb_scratch = tsb->hvtsb_pa | tsb_pages;
 	set_tsb_user_scratchpad(tsb_scratch);
-	
+	membar(Sync);
 	return tsb_scratch;
 }