From owner-p4-projects@FreeBSD.ORG Sat Jul 1 21:04:07 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 4ADCE16A47E; Sat, 1 Jul 2006 21:04:04 +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 CB89C16A6AA for ; Sat, 1 Jul 2006 21:04:03 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 63B644530D for ; Sat, 1 Jul 2006 20:35:11 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k61KZ6N5020331 for ; Sat, 1 Jul 2006 20:35:06 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k61KZ5r7020328 for perforce@freebsd.org; Sat, 1 Jul 2006 20:35:05 GMT (envelope-from jb@freebsd.org) Date: Sat, 1 Jul 2006 20:35:05 GMT Message-Id: <200607012035.k61KZ5r7020328@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 100408 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: Sat, 01 Jul 2006 21:04:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=100408 Change 100408 by jb@jb_freebsd2 on 2006/07/01 20:35:00 IFsun4v_stable Affected files ... .. //depot/projects/dtrace/src/sys/boot/sun4v/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/Makefile.inc#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/_start.s#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/boot1#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/boot1/boot1.c#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/Makefile#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/hcall.S#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/help.sparc64#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/locore.S#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/main.c#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/metadata.c#1 branch .. //depot/projects/dtrace/src/sys/boot/sun4v/loader/version#1 branch .. //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#3 integrate Differences ... ==== //depot/projects/dtrace/src/sys/sun4v/sun4v/pmap.c#3 (text+ko) ==== @@ -432,7 +432,7 @@ vm_size_t physsz, virtsz, kernel_hash_size; ihandle_t pmem, vmem; int i, sz, j; - uint64_t tsb_8k_size, tsb_4m_size, error; + uint64_t tsb_8k_size, tsb_4m_size, error, physmem_tunable; /* * Find out what physical memory is available from the prom and @@ -456,20 +456,22 @@ qsort(mra, sz, sizeof (*mra), mr_cmp); physsz = 0; - getenv_quad("hw.physmem", &physmem); - physmem = ctob(physmem); + + if (TUNABLE_ULONG_FETCH("hw.physmem", &physmem_tunable)) + physmem = atop(physmem_tunable); + printf("desired physmem=0x%lx\n", physmem_tunable); for (i = 0, j = 0; i < sz; i++, j += 2) { CTR2(KTR_PMAP, "start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); KDPRINTF("start=%#lx size=%#lx\n", mra[i].mr_start, mra[i].mr_size); - if (physmem != 0 && btoc(physsz + mra[i].mr_size) >= physmem) { - if (btoc(physsz) < physmem) { + if (physmem_tunable != 0 && (physsz + mra[i].mr_size) >= physmem_tunable) { + if (physsz < physmem_tunable) { phys_avail[j] = mra[i].mr_start; phys_avail[j + 1] = mra[i].mr_start + - (ctob(physmem) - physsz); - physsz = ctob(physmem); + (physmem_tunable - physsz); + physsz = physmem_tunable; } break; } @@ -611,7 +613,7 @@ * currently (not by design) used for permanent mappings */ - tsb_4m_size = virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT); + tsb_4m_size = (virtsz >> (PAGE_SHIFT_4M - TTE_SHIFT)); pa = pmap_bootstrap_alloc(tsb_4m_size); KDPRINTF("tsb_4m_pa is 0x%lx tsb_4m_size is 0x%lx\n", pa, tsb_4m_size); @@ -692,12 +694,17 @@ * */ pa = PAGE_SIZE_4M; - for (i = 0; phys_avail[i + 2] != 0; i += 2) - for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) { - tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), - pa | TTE_KERNEL | VTD_4M, 0); - } + for (i = 0; phys_avail[i] != 0; i += 2) + for (; pa < phys_avail[i + 1]; pa += PAGE_SIZE_4M) + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + + for (i = 0; i < 2; i++) { + pa = nucleus_mappings[i]; + tsb_set_tte_real(&kernel_td[TSB4M_INDEX], TLB_PHYS_TO_DIRECT(pa), + pa | TTE_KERNEL | VTD_4M, 0); + } /* * Get the available physical memory ranges from /memory/reg. These * are only used for kernel dumps, but it may not be wise to do prom @@ -749,6 +756,9 @@ pa = TTE_GET_PA(translations[i].om_tte) + off; tte_hash_insert(pm->pm_hash, va, pa | TTE_KERNEL | VTD_8K); } + KDPRINTF("set om_size=%ld om_start=%lx om_tte=%lx\n", + translations[i].om_size, translations[i].om_start, + translations[i].om_tte); } for (i = 0; i < KSTACK_PAGES; i++) { pa = kstack0_phys + i * PAGE_SIZE; @@ -765,6 +775,11 @@ tte_hash_insert(pm->pm_hash, TLB_PHYS_TO_DIRECT(pa), pa | TTE_KERNEL | VTD_4M); #endif + /* XXX relies on the fact that memory ranges only get smaller */ + for (i = 0; phys_avail[i + 2] != 0; i += 2) + if (phys_avail[i + 1] - phys_avail[i] < PAGE_SIZE_4M) + phys_avail[i] = phys_avail[i+1] = 0; + }