PERFORCE change 93226 for review

[Kip Macy]

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

Change 93226 by kmacy at kmacy_storage:sun4v_work on 2006/03/13 04:42:16

	reduce debugging noise

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tsb.c#11 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/tte_hash.c#8 edit

Differences ...

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

@@ -94,7 +94,6 @@
 	tsb_pages = hvtsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT);
 	*scratchval = hvtsb->hvtsb_pa | tsb_pages;
 
-	printf("hvtsb_pa=0x%lx\n", hvtsb->hvtsb_pa);
 	return vtophys(hvtsb);
 }
 
@@ -238,12 +237,10 @@
 tsb_set_scratchpad_kernel(hv_tsb_info_t *tsb)
 {
 	uint64_t tsb_pages, tsb_scratch;	
-	hv_magic_trap_on();
 	tsb_pages = tsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT);
 	tsb_scratch = tsb->hvtsb_pa | tsb_pages;
 	
 	set_tsb_kernel_scratchpad(tsb_scratch);
-		hv_magic_trap_off();
 	return tsb_scratch;
 }
 
@@ -251,11 +248,9 @@
 tsb_set_scratchpad_user(hv_tsb_info_t *tsb)
 {
 	uint64_t tsb_pages, tsb_scratch;	
-	hv_magic_trap_on();
 	tsb_pages = tsb->hvtsb_ntte >> (PAGE_SHIFT - TTE_SHIFT);
 	tsb_scratch = tsb->hvtsb_pa | tsb_pages;
 	set_tsb_user_scratchpad(tsb_scratch);
-	hv_magic_trap_off();
 	
 	return tsb_scratch;
 }

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

@@ -253,6 +253,7 @@
 	hash_index = (va >> hash_shift) & HASH_MASK(th);
 	fields = (th->th_hashtable[hash_index].the_fields);
 	tte_tag = (((uint64_t)th->th_context << TTARGET_CTX_SHIFT)|(va >> TTARGET_VA_SHIFT));
+
 	for (i = 0; i <= 3; i++) {
 		if ((fields[i].tte.tag == 0) || (fields[i].tte.tag == tte_tag)) {
 			fields[i].tte.data = tte_data;
@@ -298,11 +299,8 @@
 	/* This will break if a hash table ever grows above 64MB
 	 * 2^(13+13)
 	 */
-	hv_magic_trap_on();
-
 	hash_scratch = ((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size);
 	set_hash_kernel_scratchpad(hash_scratch);
-	hv_magic_trap_off();
 	
 	return hash_scratch;
 }
@@ -315,12 +313,10 @@
 	/* This will break if a hash table ever grows above 64MB
 	 * 2^(13+13)
 	 */
-	hv_magic_trap_on();
 
 	hash_scratch = ((vm_offset_t)th->th_hashtable) | ((vm_offset_t)th->th_size);
 	
 	set_hash_user_scratchpad(hash_scratch);
-	hv_magic_trap_off();
 	
 	return hash_scratch;
 }