From owner-p4-projects@FreeBSD.ORG Mon Mar 13 04:42:29 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41CA816A423; Mon, 13 Mar 2006 04:42:28 +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 C08F816A401 for ; Mon, 13 Mar 2006 04:42:27 +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 549C443D67 for ; Mon, 13 Mar 2006 04:42:27 +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 k2D4gRUH075032 for ; Mon, 13 Mar 2006 04:42:27 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2D4gRjD075029 for perforce@freebsd.org; Mon, 13 Mar 2006 04:42:27 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 13 Mar 2006 04:42:27 GMT Message-Id: <200603130442.k2D4gRjD075029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 93226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Mar 2006 04:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=93226 Change 93226 by kmacy@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; }