From owner-svn-src-projects@FreeBSD.ORG Sun Sep 6 17:24:15 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4D8A106566C; Sun, 6 Sep 2009 17:24:15 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B2B5F8FC16; Sun, 6 Sep 2009 17:24:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n86HOFZF089788; Sun, 6 Sep 2009 17:24:15 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n86HOF21089780; Sun, 6 Sep 2009 17:24:15 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909061724.n86HOF21089780@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 6 Sep 2009 17:24:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196895 - in projects/ppc64/sys/powerpc: aim aim64 include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Sep 2009 17:24:15 -0000 Author: nwhitehorn Date: Sun Sep 6 17:24:15 2009 New Revision: 196895 URL: http://svn.freebsd.org/changeset/base/196895 Log: Add some basic ability to handle segment exceptions. Init still can't die gracefully without panicing the kernel. Modified: projects/ppc64/sys/powerpc/aim/copyinout.c projects/ppc64/sys/powerpc/aim/machdep.c projects/ppc64/sys/powerpc/aim/trap.c projects/ppc64/sys/powerpc/aim64/machdep.c projects/ppc64/sys/powerpc/aim64/mmu_oea64.c projects/ppc64/sys/powerpc/aim64/trap_subr.S projects/ppc64/sys/powerpc/include/pmap.h Modified: projects/ppc64/sys/powerpc/aim/copyinout.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/copyinout.c Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/aim/copyinout.c Sun Sep 6 17:24:15 2009 (r196895) @@ -57,6 +57,8 @@ __FBSDID("$FreeBSD$"); #include +#include +#include #include #include @@ -75,14 +77,15 @@ int setfault(faultbuf); /* defined in lo */ #ifdef __powerpc64__ -uint64_t va_to_vsid(pmap_t pm, const volatile void *va); - static __inline void -set_user_sr(register_t vsid) +set_user_sr(pmap_t pm, const void *addr) { - register_t esid, slb1, slb2; + register_t esid, vsid, slb1, slb2; esid = USER_SR; + PMAP_LOCK(pm); + vsid = va_to_vsid(pm, (vm_offset_t)addr); + PMAP_UNLOCK(pm); slb1 = vsid << 12; slb2 = (((esid << 1) | 1UL) << 27) | USER_SR; @@ -92,15 +95,12 @@ set_user_sr(register_t vsid) isync(); } #else -static __inline register_t -va_to_vsid(pmap_t pm, const volatile void *va) -{ - return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); -} - static __inline void -set_user_sr(register_t vsid) +set_user_sr(pmap_t pm, const void *addr) { + register_t vsid; + + vsid = va_to_vsid(pm, (vm_offset_t)addr); isync(); __asm __volatile ("mtsr %0,%1" :: "n"(USER_SR), "r"(vsid)); @@ -136,7 +136,7 @@ copyout(const void *kaddr, void *udaddr, if (l > len) l = len; - set_user_sr(va_to_vsid(pm,up)); + set_user_sr(pm,up); bcopy(kp, p, l); @@ -177,7 +177,7 @@ copyin(const void *udaddr, void *kaddr, if (l > len) l = len; - set_user_sr(va_to_vsid(pm,up)); + set_user_sr(pm,up); bcopy(p, kp, l); @@ -252,7 +252,7 @@ subyte(void *addr, int byte) return (-1); } - set_user_sr(va_to_vsid(pm,addr)); + set_user_sr(pm,addr); *p = (char)byte; @@ -278,7 +278,7 @@ suword32(void *addr, int word) return (-1); } - set_user_sr(va_to_vsid(pm,addr)); + set_user_sr(pm,addr); *p = word; @@ -304,7 +304,7 @@ suword(void *addr, long word) return (-1); } - set_user_sr(va_to_vsid(pm,addr)); + set_user_sr(pm,addr); *p = word; @@ -345,7 +345,7 @@ fubyte(const void *addr) return (-1); } - set_user_sr(va_to_vsid(pm,addr)); + set_user_sr(pm,addr); val = *p; @@ -370,7 +370,7 @@ fuword(const void *addr) return (-1); } - set_user_sr(va_to_vsid(pm,addr)); + set_user_sr(pm,addr); val = *p; @@ -403,7 +403,7 @@ casuword(volatile u_long *addr, u_long o p = (u_long *)((uintptr_t)USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK)); - set_user_sr(va_to_vsid(pm,addr)); + set_user_sr(pm,(const void *)(vm_offset_t)addr); if (setfault(env)) { td->td_pcb->pcb_onfault = NULL; Modified: projects/ppc64/sys/powerpc/aim/machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/machdep.c Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/aim/machdep.c Sun Sep 6 17:24:15 2009 (r196895) @@ -1178,3 +1178,10 @@ db_trap_glue(struct trapframe *frame) return (0); } + +uint64_t +va_to_vsid(pmap_t pm, vm_offset_t va) +{ + return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); +} + Modified: projects/ppc64/sys/powerpc/aim/trap.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/trap.c Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/aim/trap.c Sun Sep 6 17:24:15 2009 (r196895) @@ -177,6 +177,27 @@ trap(struct trapframe *frame) sig = SIGTRAP; break; +#ifdef __powerpc64__ + case EXC_ISE: + case EXC_DSE: + /* + * Once we support more segments per process + * than the SLB size, we should reload the SLB + * cache here from the longer segment list. + * + * For now, we assume a miss, and call va_to_vsid() + * to allocate a new segment. This will then likely + * trigger a page fault immediately after. + */ + + PMAP_LOCK(&p->p_vmspace->vm_pmap); + (void)va_to_vsid(&p->p_vmspace->vm_pmap, + (type == EXC_ISE) ? frame->srr0 : + frame->cpu.aim.dar); + PMAP_UNLOCK(&p->p_vmspace->vm_pmap); + + break; +#endif case EXC_DSI: case EXC_ISI: sig = trap_pfault(frame, 1); @@ -286,10 +307,12 @@ printtrap(u_int vector, struct trapframe printf(" exception = 0x%x (%s)\n", vector >> 8, trapname(vector)); switch (vector) { + case EXC_DSE: case EXC_DSI: printf(" virtual address = 0x%" PRIxPTR "\n", frame->cpu.aim.dar); break; + case EXC_ISE: case EXC_ISI: printf(" virtual address = 0x%" PRIxPTR "\n", frame->srr0); break; Modified: projects/ppc64/sys/powerpc/aim64/machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/machdep.c Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/aim64/machdep.c Sun Sep 6 17:24:15 2009 (r196895) @@ -1120,3 +1120,42 @@ db_trap_glue(struct trapframe *frame) return (0); } + +uintptr_t moea64_get_unique_vsid(void); + +uint64_t +va_to_vsid(pmap_t pm, vm_offset_t va) +{ + uint64_t slbe, slbv, i; + + slbe = (uintptr_t)va >> ADDR_SR_SHFT; + slbe = (slbe << SLBE_ESID_SHIFT) | SLBE_VALID; + slbv = 0; + + for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { + if (pm->pm_slb[i].slbe == (slbe | i)) { + slbv = pm->pm_slb[i].slbv; + break; + } + } + + /* XXX: Have a long list for processes mapping more than 16 GB */ + + /* + * If there is no vsid for this VA, we need to add a new entry + * to the PMAP's segment table. + */ + + if (slbv == 0) { + slbv = moea64_get_unique_vsid() << SLBV_VSID_SHIFT; + for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { + if (!(pm->pm_slb[i].slbe & SLBE_VALID)) { + pm->pm_slb[i].slbv = slbv; + pm->pm_slb[i].slbe = slbe | i; + break; + } + } + } + + return ((slbv & SLBV_VSID_MASK) >> SLBV_VSID_SHIFT); +} Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Sun Sep 6 17:24:15 2009 (r196895) @@ -159,7 +159,7 @@ __FBSDID("$FreeBSD$"); #define MOEA_DEBUG #define TODO panic("%s: not implemented", __func__); -static uintptr_t moea64_get_unique_vsid(void); +uintptr_t moea64_get_unique_vsid(void); static __inline register_t cntlzd(volatile register_t a) { @@ -168,53 +168,6 @@ cntlzd(volatile register_t a) { return b; } -#ifdef __powerpc64__ -uint64_t va_to_vsid(pmap_t pm, vm_offset_t va); - -uint64_t -va_to_vsid(pmap_t pm, vm_offset_t va) -{ - uint64_t slbe, slbv, i; - - slbe = (uintptr_t)va >> ADDR_SR_SHFT; - slbe = (slbe << SLBE_ESID_SHIFT) | SLBE_VALID; - slbv = 0; - - for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { - if (pm->pm_slb[i].slbe == (slbe | i)) { - slbv = pm->pm_slb[i].slbv; - break; - } - } - - /* XXX: Have a long list for processes mapping more than 16 GB */ - - /* - * If there is no vsid for this VA, we need to add a new entry - * to the PMAP's segment table. - */ - - if (slbv == 0) { - slbv = moea64_get_unique_vsid() << SLBV_VSID_SHIFT; - for (i = 0; i < sizeof(pm->pm_slb)/sizeof(pm->pm_slb[0]); i++) { - if (!(pm->pm_slb[i].slbe & SLBE_VALID)) { - pm->pm_slb[i].slbv = slbv; - pm->pm_slb[i].slbe = slbe | i; - break; - } - } - } - - return ((slbv & SLBV_VSID_MASK) >> SLBV_VSID_SHIFT); -} -#else -static __inline uint64_t -va_to_vsid(pmap_t pm, vm_offset_t va) -{ - return ((pm->pm_sr[(uintptr_t)va >> ADDR_SR_SHFT]) & SR_VSID_MASK); -} -#endif - #define TLBSYNC() __asm __volatile("tlbsync; ptesync"); #define SYNC() __asm __volatile("sync"); #define EIEIO() __asm __volatile("eieio"); @@ -1827,7 +1780,7 @@ moea64_page_wired_mappings(mmu_t mmu, vm static uintptr_t moea64_vsidcontext; -static uintptr_t +uintptr_t moea64_get_unique_vsid(void) { u_int entropy; register_t hash; Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/aim64/trap_subr.S Sun Sep 6 17:24:15 2009 (r196895) @@ -228,15 +228,19 @@ nslb: bf 17,1f; /* branch if PSL_PR is false */ \ /* Restore user SRs */ \ GET_CPUINFO(%r3); \ + std %r27,(savearea+CPUSAVE_R27)(%r3); \ std %r28,(savearea+CPUSAVE_R28)(%r3); \ std %r29,(savearea+CPUSAVE_R29)(%r3); \ std %r30,(savearea+CPUSAVE_R30)(%r3); \ std %r31,(savearea+CPUSAVE_R31)(%r3); \ + mflr %r27; /* preserve LR */ \ RESTORE_USER_SRS(); /* uses r28-r31 */ \ + mtlr %r27; \ ld %r31,(savearea+CPUSAVE_R31)(%r3); \ ld %r30,(savearea+CPUSAVE_R30)(%r3); \ ld %r29,(savearea+CPUSAVE_R29)(%r3); \ ld %r28,(savearea+CPUSAVE_R28)(%r3); \ + ld %r27,(savearea+CPUSAVE_R27)(%r3); \ 1: mfsprg1 %r2; /* restore cr */ \ mtcr %r2; \ GET_CPUINFO(%r2); \ Modified: projects/ppc64/sys/powerpc/include/pmap.h ============================================================================== --- projects/ppc64/sys/powerpc/include/pmap.h Sun Sep 6 15:23:03 2009 (r196894) +++ projects/ppc64/sys/powerpc/include/pmap.h Sun Sep 6 17:24:15 2009 (r196895) @@ -122,6 +122,15 @@ struct md_page { #define pmap_page_is_mapped(m) (!LIST_EMPTY(&(m)->md.mdpg_pvoh)) #define pmap_page_set_memattr(m, ma) (void)0 +/* + * Return the VSID corresponding to a given virtual address. + * If no VSID is currently defined, it will allocate one, and add it to + * a free SLB slot if available. + * + * NB: The PMAP MUST be locked already. + */ +uint64_t va_to_vsid(pmap_t pm, vm_offset_t va); + #else struct pmap { From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 15:43:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D787B1065670; Mon, 7 Sep 2009 15:43:10 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9150C8FC18; Mon, 7 Sep 2009 15:43:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n87FhA2U018973; Mon, 7 Sep 2009 15:43:10 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n87FhASq018971; Mon, 7 Sep 2009 15:43:10 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909071543.n87FhASq018971@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 7 Sep 2009 15:43:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196930 - in projects/ppc64/sys/powerpc: aim64 powerpc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 15:43:11 -0000 Author: nwhitehorn Date: Mon Sep 7 15:43:09 2009 New Revision: 196930 URL: http://svn.freebsd.org/changeset/base/196930 Log: Fix stack_machdep.c to work correctly by taking into account the TOC reload slot offset when determining if we are coming out of a trap. This avoids a nested fault when init exits. Modified: projects/ppc64/sys/powerpc/aim64/swtch.S projects/ppc64/sys/powerpc/aim64/trap_subr.S projects/ppc64/sys/powerpc/powerpc/stack_machdep.c Modified: projects/ppc64/sys/powerpc/aim64/swtch.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/swtch.S Mon Sep 7 15:22:54 2009 (r196929) +++ projects/ppc64/sys/powerpc/aim64/swtch.S Mon Sep 7 15:43:09 2009 (r196930) @@ -259,5 +259,5 @@ ENTRY(fork_trampoline) trapframe to simulate FRAME_SETUP does when allocating space for a frame pointer/saved LR */ - b .trapexit + b trapexit nop Modified: projects/ppc64/sys/powerpc/aim64/trap_subr.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/trap_subr.S Mon Sep 7 15:22:54 2009 (r196929) +++ projects/ppc64/sys/powerpc/aim64/trap_subr.S Mon Sep 7 15:43:09 2009 (r196930) @@ -267,9 +267,9 @@ CNAME(rstcode): mflr %r1 addi %r1,%r1,(124-16)@l - lis %r3,1@l lis %r3,tocbase@ha ld %r2,tocbase@l(%r3) + lis %r3,1@l bla CNAME(.pmap_cpu_bootstrap) nop bla CNAME(.cpudep_ap_bootstrap) @@ -476,10 +476,9 @@ trapagain: addi %r3,%r1,48 bl CNAME(.powerpc_interrupt) nop - bl CNAME(.trapexit) - nop -ASENTRY(trapexit) /* backtrace code sentinel */ + .globl CNAME(trapexit) /* backtrace code sentinel */ +CNAME(trapexit): /* Disable interrupts: */ mfmsr %r3 andi. %r3,%r3,~PSL_EE@l @@ -500,8 +499,11 @@ ASENTRY(trapexit) /* backtrace code sent ori %r3,%r3,PSL_EE@l mtmsr %r3 isync - addi %r3,%r1,8 - bl CNAME(ast) + lis %r3,tocbase@ha + ld %r2,tocbase@l(%r3) + addi %r3,%r1,48 + bl CNAME(.ast) + nop .globl CNAME(asttrapexit) /* backtrace code sentinel #2 */ CNAME(asttrapexit): b trapexit /* test ast ret value ? */ Modified: projects/ppc64/sys/powerpc/powerpc/stack_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/powerpc/stack_machdep.c Mon Sep 7 15:22:54 2009 (r196929) +++ projects/ppc64/sys/powerpc/powerpc/stack_machdep.c Mon Sep 7 15:43:09 2009 (r196930) @@ -42,6 +42,12 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef __powerpc64__ +#define CALLOFFSET 8 /* Account for the TOC reload slot */ +#else +#define CALLOFFSET 4 +#endif + static void stack_capture(struct stack *st, register_t frame) { @@ -54,7 +60,12 @@ stack_capture(struct stack *st, register frame = *(register_t *)frame; if (frame < PAGE_SIZE) break; + + #ifdef __powerpc64__ + callpc = *(vm_offset_t *)(frame + 16) - 4; + #else callpc = *(vm_offset_t *)(frame + 4) - 4; + #endif if ((callpc & 3) || (callpc < 0x100)) break; @@ -64,8 +75,8 @@ stack_capture(struct stack *st, register * things are going wrong. Plus, prevents this shortened * version of code from accessing user-space frames */ - if (callpc + 4 == (register_t) &trapexit || - callpc + 4 == (register_t) &asttrapexit) + if (callpc + CALLOFFSET == (register_t) &trapexit || + callpc + CALLOFFSET == (register_t) &asttrapexit) break; if (stack_put(st, callpc) == -1) From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 19:01:35 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16053106566B; Mon, 7 Sep 2009 19:01:35 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0554B8FC1E; Mon, 7 Sep 2009 19:01:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n87J1YLP023805; Mon, 7 Sep 2009 19:01:34 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n87J1Yn7023803; Mon, 7 Sep 2009 19:01:34 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909071901.n87J1Yn7023803@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 7 Sep 2009 19:01:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196945 - projects/ppc64/sys/boot/common X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 19:01:35 -0000 Author: nwhitehorn Date: Mon Sep 7 19:01:34 2009 New Revision: 196945 URL: http://svn.freebsd.org/changeset/base/196945 Log: r60506 broke netbooting on PowerPC/OFW completely. We need a way of reverting this in a way that doesn't break Book-E. Modified: projects/ppc64/sys/boot/common/dev_net.c Modified: projects/ppc64/sys/boot/common/dev_net.c ============================================================================== --- projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 18:54:55 2009 (r196944) +++ projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 19:01:34 2009 (r196945) @@ -145,7 +145,7 @@ net_open(struct open_file *f, ...) return (error); } } -#if defined(__sparc64__) +#if defined(__sparc64__) || defined(__powerpc__) netdev_opens++; #endif } From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 19:15:08 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B7A41065679; Mon, 7 Sep 2009 19:15:08 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2ACF58FC14; Mon, 7 Sep 2009 19:15:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n87JF8Ro024080; Mon, 7 Sep 2009 19:15:08 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n87JF8Y8024078; Mon, 7 Sep 2009 19:15:08 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909071915.n87JF8Y8024078@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 7 Sep 2009 19:15:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196946 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 19:15:08 -0000 Author: nwhitehorn Date: Mon Sep 7 19:15:07 2009 New Revision: 196946 URL: http://svn.freebsd.org/changeset/base/196946 Log: Fix an inadvertent bug where instead of a literal '1', it was inserting bits of the stack pointer into the MSR. This should go to HEAD immediately, and to 8.0. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Mon Sep 7 19:01:34 2009 (r196945) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Mon Sep 7 19:15:07 2009 (r196946) @@ -217,7 +217,7 @@ TLBIE(pmap_t pmap, vm_offset_t va) { __asm __volatile("\ mfmsr %0; \ clrldi %1,%0,49; \ - insrdi %1,1,1,0; \ + insrdi %1,%5,1,0; \ mtmsrd %1; \ ptesync; \ \ @@ -229,7 +229,7 @@ TLBIE(pmap_t pmap, vm_offset_t va) { eieio; \ tlbsync; \ ptesync;" - : "=r"(msr), "=r"(scratch) : "r"(vpn_hi), "r"(vpn_lo), "r"(32)); + : "=r"(msr), "=r"(scratch) : "r"(vpn_hi), "r"(vpn_lo), "r"(32), "r"(1)); #endif } From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 19:46:52 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD7BC106568B; Mon, 7 Sep 2009 19:46:52 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from smtp.semihalf.com (smtp.semihalf.com [213.17.239.109]) by mx1.freebsd.org (Postfix) with ESMTP id 7E4128FC16; Mon, 7 Sep 2009 19:46:52 +0000 (UTC) Received: from [192.168.133.14] (nat2-102.ghnet.pl [91.150.223.102]) by smtp.semihalf.com (Postfix) with ESMTPSA id 76E58C4278; Mon, 7 Sep 2009 21:45:22 +0200 (CEST) Message-Id: <759008C0-032F-425F-A9CD-E9149763273C@semihalf.com> From: Rafal Jaworowski To: Nathan Whitehorn In-Reply-To: <4AA5601D.9040004@freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v936) Date: Mon, 7 Sep 2009 21:46:50 +0200 References: <200909071901.n87J1Yn7023803@svn.freebsd.org> <4AA5601D.9040004@freebsd.org> X-Mailer: Apple Mail (2.936) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r196945 - projects/ppc64/sys/boot/common X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 19:46:52 -0000 On 2009-09-07, at 21:33, Nathan Whitehorn wrote: > Rafal Jaworowski wrote: >> >> On 2009-09-07, at 21:01, Nathan Whitehorn wrote: >> >>> Author: nwhitehorn >>> Date: Mon Sep 7 19:01:34 2009 >>> New Revision: 196945 >>> URL: http://svn.freebsd.org/changeset/base/196945 >>> >>> Log: >>> r60506 broke netbooting on PowerPC/OFW completely. We need a way of >>> reverting this in a way that doesn't break Book-E. >>> >>> Modified: >>> projects/ppc64/sys/boot/common/dev_net.c >>> >>> Modified: projects/ppc64/sys/boot/common/dev_net.c >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> = >>> ==================================================================== >>> --- projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 >>> 18:54:55 2009 (r196944) >>> +++ projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 >>> 19:01:34 2009 (r196945) >>> @@ -145,7 +145,7 @@ net_open(struct open_file *f, ...) >>> return (error); >>> } >>> } >>> -#if defined(__sparc64__) >>> +#if defined(__sparc64__) || defined(__powerpc__) >>> netdev_opens++; >>> #endif >>> } >> >> In general it's not a Book-E thing at all. It's clearly a bug not >> to update the open counter (with the above change the loader will >> not reach netif_close(), which is bad); I know some firmware >> versions have had problems here, that lead to unresponsiveness or >> so, but it shouldn't really depend on powerpc/sparc64 define: it's >> rather a broken firmware/platform thing and should be handled as a >> platform workaround (build option?), not something arch-related. >> >> Rafal >> > True. Basically, we should never try to reopen the net device on > Open Firmware platforms. Maybe a new define so that the common > loader code can check for OF? This firmware bug is *very* prevalent > on Apple hardware. > -Nathan It would be ideal to push this workaround down to the Open Firmware netif_init() routine, so that it would ignore re-opening (and not pollute common loader code). Wouldn't this work? Rafal From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 19:50:21 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3ADC61065698 for ; Mon, 7 Sep 2009 19:50:21 +0000 (UTC) (envelope-from raj@semihalf.com) Received: from smtp.semihalf.com (smtp.semihalf.com [213.17.239.109]) by mx1.freebsd.org (Postfix) with ESMTP id E56928FC1D for ; Mon, 7 Sep 2009 19:50:20 +0000 (UTC) Received: from [192.168.133.14] (nat2-102.ghnet.pl [91.150.223.102]) by smtp.semihalf.com (Postfix) with ESMTPSA id 201F8C4270; Mon, 7 Sep 2009 21:30:52 +0200 (CEST) Message-Id: From: Rafal Jaworowski To: Nathan Whitehorn In-Reply-To: <200909071901.n87J1Yn7023803@svn.freebsd.org> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v936) Date: Mon, 7 Sep 2009 21:32:20 +0200 References: <200909071901.n87J1Yn7023803@svn.freebsd.org> X-Mailer: Apple Mail (2.936) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r196945 - projects/ppc64/sys/boot/common X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 19:50:21 -0000 On 2009-09-07, at 21:01, Nathan Whitehorn wrote: > Author: nwhitehorn > Date: Mon Sep 7 19:01:34 2009 > New Revision: 196945 > URL: http://svn.freebsd.org/changeset/base/196945 > > Log: > r60506 broke netbooting on PowerPC/OFW completely. We need a way of > reverting this in a way that doesn't break Book-E. > > Modified: > projects/ppc64/sys/boot/common/dev_net.c > > Modified: projects/ppc64/sys/boot/common/dev_net.c > = > = > = > = > = > = > = > = > ====================================================================== > --- projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 18:54:55 > 2009 (r196944) > +++ projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 19:01:34 > 2009 (r196945) > @@ -145,7 +145,7 @@ net_open(struct open_file *f, ...) > return (error); > } > } > -#if defined(__sparc64__) > +#if defined(__sparc64__) || defined(__powerpc__) > netdev_opens++; > #endif > } In general it's not a Book-E thing at all. It's clearly a bug not to update the open counter (with the above change the loader will not reach netif_close(), which is bad); I know some firmware versions have had problems here, that lead to unresponsiveness or so, but it shouldn't really depend on powerpc/sparc64 define: it's rather a broken firmware/platform thing and should be handled as a platform workaround (build option?), not something arch-related. Rafal From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 20:33:52 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B70921065679 for ; Mon, 7 Sep 2009 20:33:52 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from adsum.doit.wisc.edu (adsum.doit.wisc.edu [144.92.197.210]) by mx1.freebsd.org (Postfix) with ESMTP id 8AEC18FC0C for ; Mon, 7 Sep 2009 20:33:52 +0000 (UTC) MIME-version: 1.0 Content-transfer-encoding: 7BIT Content-type: text/plain; charset=ISO-8859-1; format=flowed Received: from avs-daemon.smtpauth1.wiscmail.wisc.edu by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7.0-5.01 32bit (built Feb 19 2009)) id <0KPM00A0090FZR00@smtpauth1.wiscmail.wisc.edu>; Mon, 07 Sep 2009 14:33:51 -0500 (CDT) Received: from comporellon.tachypleus.net ([unknown] [76.210.73.164]) by smtpauth1.wiscmail.wisc.edu (Sun Java(tm) System Messaging Server 7.0-5.01 32bit (built Feb 19 2009)) with ESMTPSA id <0KPM00A8P90EBU00@smtpauth1.wiscmail.wisc.edu>; Mon, 07 Sep 2009 14:33:51 -0500 (CDT) Date: Mon, 07 Sep 2009 14:33:49 -0500 From: Nathan Whitehorn In-reply-to: To: Rafal Jaworowski Message-id: <4AA5601D.9040004@freebsd.org> X-Spam-Report: AuthenticatedSender=yes, SenderIP=76.210.73.164 X-Spam-PmxInfo: Server=avs-11, Version=5.5.5.374460, Antispam-Engine: 2.7.1.369594, Antispam-Data: 2009.9.7.192417, SenderIP=76.210.73.164 References: <200909071901.n87J1Yn7023803@svn.freebsd.org> User-Agent: Thunderbird 2.0.0.23 (X11/20090905) Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r196945 - projects/ppc64/sys/boot/common X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 20:33:52 -0000 Rafal Jaworowski wrote: > > On 2009-09-07, at 21:01, Nathan Whitehorn wrote: > >> Author: nwhitehorn >> Date: Mon Sep 7 19:01:34 2009 >> New Revision: 196945 >> URL: http://svn.freebsd.org/changeset/base/196945 >> >> Log: >> r60506 broke netbooting on PowerPC/OFW completely. We need a way of >> reverting this in a way that doesn't break Book-E. >> >> Modified: >> projects/ppc64/sys/boot/common/dev_net.c >> >> Modified: projects/ppc64/sys/boot/common/dev_net.c >> = >> = >> = >> = >> = >> = >> = >> = >> ====================================================================== >> --- projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 18:54:55 >> 2009 (r196944) >> +++ projects/ppc64/sys/boot/common/dev_net.c Mon Sep 7 19:01:34 >> 2009 (r196945) >> @@ -145,7 +145,7 @@ net_open(struct open_file *f, ...) >> return (error); >> } >> } >> -#if defined(__sparc64__) >> +#if defined(__sparc64__) || defined(__powerpc__) >> netdev_opens++; >> #endif >> } > > In general it's not a Book-E thing at all. It's clearly a bug not to > update the open counter (with the above change the loader will not > reach netif_close(), which is bad); I know some firmware versions have > had problems here, that lead to unresponsiveness or so, but it > shouldn't really depend on powerpc/sparc64 define: it's rather a > broken firmware/platform thing and should be handled as a platform > workaround (build option?), not something arch-related. > > Rafal > True. Basically, we should never try to reopen the net device on Open Firmware platforms. Maybe a new define so that the common loader code can check for OF? This firmware bug is *very* prevalent on Apple hardware. -Nathan From owner-svn-src-projects@FreeBSD.ORG Mon Sep 7 20:39:04 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A40A9106566C; Mon, 7 Sep 2009 20:39:04 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9026C8FC0A; Mon, 7 Sep 2009 20:39:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n87Kd47Y026308; Mon, 7 Sep 2009 20:39:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n87Kd4Fh026295; Mon, 7 Sep 2009 20:39:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909072039.n87Kd4Fh026295@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 7 Sep 2009 20:39:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196951 - in projects/ppc64/sys: boot boot/common boot/ofw/libofw boot/powerpc boot/powerpc/ofw boot/powerpc/uboot powerpc/aim powerpc/aim64 powerpc/include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Sep 2009 20:39:04 -0000 Author: nwhitehorn Date: Mon Sep 7 20:39:04 2009 New Revision: 196951 URL: http://svn.freebsd.org/changeset/base/196951 Log: Fix up some bugs in virtual mode Open Firmware and add support to the PowerPC loader to load 64-bit executables. This provides the first 64-bit PowerPC boot on real hardware, which then crashes bringing up the VM due to remaining missing features. Added: projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c (contents, props changed) Modified: projects/ppc64/sys/boot/Makefile projects/ppc64/sys/boot/common/Makefile.inc projects/ppc64/sys/boot/ofw/libofw/Makefile projects/ppc64/sys/boot/ofw/libofw/libofw.h projects/ppc64/sys/boot/powerpc/Makefile.inc projects/ppc64/sys/boot/powerpc/ofw/Makefile projects/ppc64/sys/boot/powerpc/ofw/conf.c projects/ppc64/sys/boot/powerpc/uboot/Makefile projects/ppc64/sys/powerpc/aim/ofw_machdep.c projects/ppc64/sys/powerpc/aim64/locore.S projects/ppc64/sys/powerpc/include/elf.h Modified: projects/ppc64/sys/boot/Makefile ============================================================================== --- projects/ppc64/sys/boot/Makefile Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/Makefile Mon Sep 7 20:39:04 2009 (r196951) @@ -13,12 +13,12 @@ SUBDIR+= efi .endif # Build Open Firmware library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "sparc64" SUBDIR+= ofw .endif # Build U-Boot library. -.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "arm" SUBDIR+= uboot .endif Modified: projects/ppc64/sys/boot/common/Makefile.inc ============================================================================== --- projects/ppc64/sys/boot/common/Makefile.inc Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/common/Makefile.inc Mon Sep 7 20:39:04 2009 (r196951) @@ -9,8 +9,11 @@ SRCS+= load_elf32.c load_elf32_obj.c rel SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .elif ${MACHINE} == "pc98" SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c -.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "arm" +.elif ${MACHINE_ARCH} == "arm" SRCS+= load_elf32.c reloc_elf32.c +.elif ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" +SRCS+= load_elf32.c reloc_elf32.c +SRCS+= load_elf64.c reloc_elf64.c .elif ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" SRCS+= load_elf64.c reloc_elf64.c .endif Modified: projects/ppc64/sys/boot/ofw/libofw/Makefile ============================================================================== --- projects/ppc64/sys/boot/ofw/libofw/Makefile Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/ofw/libofw/Makefile Mon Sep 7 20:39:04 2009 (r196951) @@ -13,8 +13,9 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/li CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. CFLAGS+= -ffreestanding -.if ${MACHINE_ARCH} == "powerpc" +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpc64" CFLAGS+= -msoft-float +SRCS+= ppc64_elf_freebsd.c .endif .ifdef(BOOT_DISK_DEBUG) Modified: projects/ppc64/sys/boot/ofw/libofw/libofw.h ============================================================================== --- projects/ppc64/sys/boot/ofw/libofw/libofw.h Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/ofw/libofw/libofw.h Mon Sep 7 20:39:04 2009 (r196951) @@ -62,6 +62,9 @@ int ofw_elf_loadfile(char *, vm_offset_t int ofw_elf_exec(struct preloaded_file *); extern struct file_format ofw_elf; +#ifdef __powerpc__ +extern struct file_format ofw_elf64; +#endif extern void reboot(void); Added: projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c Mon Sep 7 20:39:04 2009 (r196951) @@ -0,0 +1,101 @@ +/*- + * Copyright (c) 2001 Benno Rice + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#define __ELF_WORD_SIZE 64 + +#include +#include + +#include +#include + +#include + +#include "bootstrap.h" +#include "libofw.h" +#include "openfirm.h" + +extern char end[]; +extern vm_offset_t reloc; /* From /conf.c */ + +int +ppc64_ofw_elf_loadfile(char *filename, u_int64_t dest, + struct preloaded_file **result) +{ + int r; + + r = __elfN(loadfile)(filename, dest, result); + if (r != 0) + return (r); + + /* + * No need to sync the icache for modules: this will + * be done by the kernel after relocation. + */ + if (!strcmp((*result)->f_type, "elf kernel")) + __syncicache((void *) (*result)->f_addr, (*result)->f_size); + return (0); +} + +int +ppc64_ofw_elf_exec(struct preloaded_file *fp) +{ + struct file_metadata *fmp; + vm_offset_t mdp; + Elf_Ehdr *e; + int error; + intptr_t entry; + + if ((fmp = file_findmetadata(fp, MODINFOMD_ELFHDR)) == NULL) { + return(EFTYPE); + } + e = (Elf_Ehdr *)&fmp->md_data; + + /* Handle function descriptor */ + entry = *(uint64_t *)e->e_entry; + + if ((error = md_load(fp->f_args, &mdp)) != 0) + return (error); + + printf("Kernel entry at 0x%lx ...\n", entry); + + dev_cleanup(); + ofw_release_heap(); + + OF_chain((void *)reloc, end - (char *)reloc, (void *)entry, + (void *)mdp, sizeof(mdp)); + + panic("exec returned"); +} + +struct file_format ofw_elf64 = +{ + ppc64_ofw_elf_loadfile, + ppc64_ofw_elf_exec +}; Modified: projects/ppc64/sys/boot/powerpc/Makefile.inc ============================================================================== --- projects/ppc64/sys/boot/powerpc/Makefile.inc Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/powerpc/Makefile.inc Mon Sep 7 20:39:04 2009 (r196951) @@ -1,3 +1,9 @@ # $FreeBSD$ +.if ${MACHINE_ARCH} == "powerpc64" +CFLAGS+= -m32 -mcpu=powerpc +LDFLAGS+= -m elf32-powerpc +AFLAGS+= --32 +.endif + .include "../Makefile.inc" Modified: projects/ppc64/sys/boot/powerpc/ofw/Makefile ============================================================================== --- projects/ppc64/sys/boot/powerpc/ofw/Makefile Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/powerpc/ofw/Makefile Mon Sep 7 20:39:04 2009 (r196951) @@ -10,6 +10,7 @@ INSTALLFLAGS= -b # Architecture-specific loader code SRCS= conf.c metadata.c vers.c start.c +SRCS+= ucmpdi2.c LOADER_DISK_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes @@ -57,9 +58,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif # Always add MI sources -.PATH: ${.CURDIR}/../../common +.PATH: ${.CURDIR}/../../common ${.CURDIR}/../../../libkern .include "${.CURDIR}/../../common/Makefile.inc" -CFLAGS+= -I${.CURDIR}/../../common +CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. CFLAGS+= -I. CLEANFILES+= vers.c loader.help Modified: projects/ppc64/sys/boot/powerpc/ofw/conf.c ============================================================================== --- projects/ppc64/sys/boot/powerpc/ofw/conf.c Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/powerpc/ofw/conf.c Mon Sep 7 20:39:04 2009 (r196951) @@ -96,6 +96,7 @@ struct netif_driver *netif_drivers[] = { struct file_format *file_formats[] = { &ofw_elf, + &ofw_elf64, NULL }; Modified: projects/ppc64/sys/boot/powerpc/uboot/Makefile ============================================================================== --- projects/ppc64/sys/boot/powerpc/uboot/Makefile Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/boot/powerpc/uboot/Makefile Mon Sep 7 20:39:04 2009 (r196951) @@ -8,6 +8,7 @@ NO_MAN= # Architecture-specific loader code SRCS= start.S conf.c vers.c +SRCS+= ucmpdi2.c LOADER_DISK_SUPPORT?= no LOADER_UFS_SUPPORT?= no @@ -55,9 +56,9 @@ LIBFICL= ${.OBJDIR}/../../ficl/libficl.a .endif # Always add MI sources -.PATH: ${.CURDIR}/../../common +.PATH: ${.CURDIR}/../../common ${.CURDIR}/../../../libkern .include "${.CURDIR}/../../common/Makefile.inc" -CFLAGS+= -I${.CURDIR}/../../common +CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. CFLAGS+= -I. CLEANFILES+= vers.c ${PROG}.help Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Mon Sep 7 20:39:04 2009 (r196951) @@ -68,16 +68,8 @@ static int (*ofwcall)(void *); static void *fdt; int ofw_real_mode; -#ifdef __powerpc64__ -/* Handle PPC64 ABI brain damage */ -struct { - int (*funcptr)(void *); - uintptr_t toc; - uintptr_t env; -} ofwcall_funcdesc; -#endif - int ofw_real_mode_entry(void *); +int ofw_32bit_mode_entry(void *); static int openfirmware(void *args); /* @@ -329,22 +321,21 @@ OF_initial_setup(void *fdt_ptr, void *ju else ofw_real_mode = 1; + ofwcall = NULL; + #ifdef __powerpc64__ /* - * For PPC64, we need to hack up a function descriptor object - * to be able to call a memory address. + * For PPC64, we need to use some hand-written + * asm trampolines to get to OF. */ - if (ofw_real_mode) { + if (ofw_real_mode && openfirm != NULL) ofwcall = ofw_real_mode_entry; - } else { - ofwcall_funcdesc.funcptr = openfirm; - ofwcall_funcdesc.toc = 0; - ofwcall_funcdesc.env = 0; - ofwcall = (int (*)(void *))&ofwcall_funcdesc; - } + else + ofwcall = ofw_32bit_mode_entry; #else ofwcall = openfirm; #endif + fdt = fdt_ptr; } Modified: projects/ppc64/sys/powerpc/aim64/locore.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/locore.S Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/powerpc/aim64/locore.S Mon Sep 7 20:39:04 2009 (r196951) @@ -87,10 +87,10 @@ GLOBAL(tmpstk) .space TMPSTKSZ GLOBAL(esym) - .long 0 /* end of symbol table */ + .llong 0 /* end of symbol table */ GLOBAL(ofmsr) - .long 0, 0, 0, 0, 0 /* msr/sprg0-3 used in Open Firmware */ + .llong 0, 0, 0, 0, 0 /* msr/sprg0-3 used in Open Firmware */ #define INTRCNT_COUNT 256 /* max(HROWPIC_IRQMAX,OPENPIC_IRQMAX) */ GLOBAL(intrnames) @@ -105,11 +105,11 @@ GLOBAL(eintrcnt) * File-scope for locore.S */ idle_u: - .long 0 /* fake uarea during idle after exit */ + .llong 0 /* fake uarea during idle after exit */ openfirmware_entry: - .long 0 /* Open Firmware entry point */ + .llong 0 /* Open Firmware entry point */ srsave: - .long 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + .llong 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 .text .globl btext @@ -146,21 +146,32 @@ ASENTRY(__start) lis 8,openfirmware_entry@ha std 5,openfirmware_entry@l(8) /* save client interface handler */ + /* Set up the stack pointer */ lis 1,(tmpstk+TMPSTKSZ-16)@ha addi 1,1,(tmpstk+TMPSTKSZ-16)@l + /* Set up the TOC pointer */ + lis 2,tocbase@ha + ld 2,tocbase@l(2) + + /* Switch to 64-bit mode */ + mfmsr 9 + li 8,1 + insrdi 9,8,1,0 + mtmsrd 9 + mfmsr 0 lis 9,ofmsr@ha - stwu 0,ofmsr@l(9) + stdu 0,ofmsr@l(9) mfsprg0 0 /* save SPRG0-3 */ - stw 0,4(9) /* ofmsr[1] = sprg0 */ + std 0,8(9) /* ofmsr[1] = sprg0 */ mfsprg1 0 - stw 0,8(9) /* ofmsr[2] = sprg1 */ + std 0,16(9) /* ofmsr[2] = sprg1 */ mfsprg2 0 - stw 0,12(9) /* ofmsr[3] = sprg2 */ + std 0,24(9) /* ofmsr[3] = sprg2 */ mfsprg3 0 - stw 0,16(9) /* ofmsr[4] = sprg3 */ + std 0,32(9) /* ofmsr[4] = sprg3 */ bl .OF_initial_setup nop @@ -217,6 +228,31 @@ ASENTRY(ofw_real_mode_entry) mtlr 0 blr +ASENTRY(ofw_32bit_mode_entry) + mflr 4 + mtsprg1 4 + + lis 4,openfirmware_entry@ha + ld 4,openfirmware_entry@l(4) /* read client interface handler */ + + /* Set up a 32-bit MSR in r5 */ + mfmsr 5 + mtsprg2 5 + clrldi 5,5,1 + + /* Set MSR, branch to OF, and come back */ + mtmsrd 5 + isync + mtctr 4 + bctrl + mfsprg2 5 + mtmsrd 5 + isync + + mfsprg1 4 + mtlr 4 + blr + /* * int setfault() * Modified: projects/ppc64/sys/powerpc/include/elf.h ============================================================================== --- projects/ppc64/sys/powerpc/include/elf.h Mon Sep 7 20:10:33 2009 (r196950) +++ projects/ppc64/sys/powerpc/include/elf.h Mon Sep 7 20:39:04 2009 (r196951) @@ -36,17 +36,19 @@ * [ppc-eabi-1995-01.pdf] for details. */ +#ifndef __ELF_WORD_SIZE #ifdef __powerpc64__ #define __ELF_WORD_SIZE 64 /* Used by */ #else #define __ELF_WORD_SIZE 32 /* Used by */ #endif +#endif #include /* Definitions common to all 32 bit architectures. */ #include /* Definitions common to all 64 bit architectures. */ #include -#ifdef __powerpc64__ +#if __ELF_WORD_SIZE == 64 #define ELF_ARCH EM_PPC64 #define ELF_MACHINE_OK(x) ((x) == EM_PPC64) #else @@ -70,7 +72,6 @@ typedef struct { /* Auxiliary vector ent } a_un; } Elf32_Auxinfo; -#ifdef __powerpc64__ /* XXX: check ABI */ typedef struct { /* Auxiliary vector entry on initial stack */ int a_type; /* Entry type. */ @@ -80,7 +81,6 @@ typedef struct { /* Auxiliary vector ent void (*a_fcn)(void); /* Function pointer (not used). */ } a_un; } Elf64_Auxinfo; -#endif __ElfType(Auxinfo); @@ -112,7 +112,7 @@ __ElfType(Auxinfo); #define R_PPC_EMB_COUNT (R_PPC_EMB_RELSDA - R_PPC_EMB_NADDR32 + 1) /* Define "machine" characteristics */ -#ifdef __powerpc64__ +#if __ELF_WORD_SIZE == 64 #define ELF_TARG_CLASS ELFCLASS64 #define ELF_TARG_DATA ELFDATA2MSB #define ELF_TARG_MACH EM_PPC64 From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 03:55:09 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBFD710656AB; Tue, 8 Sep 2009 03:55:09 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B068A8FC14; Tue, 8 Sep 2009 03:55:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n883t9uM034928; Tue, 8 Sep 2009 03:55:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n883t9FA034925; Tue, 8 Sep 2009 03:55:09 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909080355.n883t9FA034925@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 8 Sep 2009 03:55:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196957 - in projects/ppc64/sys/powerpc: aim aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 03:55:09 -0000 Author: nwhitehorn Date: Tue Sep 8 03:55:09 2009 New Revision: 196957 URL: http://svn.freebsd.org/changeset/base/196957 Log: Start fixing up 64-bit OF access on Apple hardware a little. This change gives the PMAP layer the correct physical map by deleting a useless (and wrong, for PPC64) special case for reading the memory map from firmware, and also lays the groundwork for the address space swapping to call OF once the MMU is up. Reading the OFW translations map is still broken because of 32-bit/64-bit confusion. Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Tue Sep 8 01:11:23 2009 (r196956) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Tue Sep 8 03:55:09 2009 (r196957) @@ -136,6 +136,7 @@ static int parse_ofw_memory(phandle_t node, const char *prop, struct mem_region *output) { cell_t address_cells, size_cells; + cell_t OFmem[4*(OFMEM_REGIONS + 1)]; int sz, i, j; int apple_hack_mode; phandle_t phandle; @@ -171,15 +172,13 @@ parse_ofw_memory(phandle_t node, const c /* * Get memory. */ - if (address_cells > 1 || size_cells > 1) { - cell_t OFmem[4*(OFMEM_REGIONS + 1)]; - if ((node == -1) || (sz = OF_getprop(node, prop, - OFmem, sizeof(OFmem[0]) * 4 * OFMEM_REGIONS)) <= 0) - panic("Physical memory map not found"); - - i = 0; - j = 0; - while (i < sz/sizeof(cell_t)) { + if ((node == -1) || (sz = OF_getprop(node, prop, + OFmem, sizeof(OFmem[0]) * 4 * OFMEM_REGIONS)) <= 0) + panic("Physical memory map not found"); + + i = 0; + j = 0; + while (i < sz/sizeof(cell_t)) { #ifndef __powerpc64__ /* On 32-bit PPC, ignore regions starting above 4 GB */ if (OFmem[i] > 0) { @@ -216,14 +215,10 @@ parse_ofw_memory(phandle_t node, const c output[j].mr_start; } #endif + j++; - } - sz = j*sizeof(output[0]); - } else { - if ((sz = OF_getprop(node, prop, - output, sizeof(output[0]) * OFMEM_REGIONS)) <= 0) - panic("Physical memory map not found"); } + sz = j*sizeof(output[0]); #ifdef __powerpc64__ if (apple_hack_mode) { @@ -378,20 +373,30 @@ openfirmware(void *args) int result; #ifndef __powerpc64__ register_t srsave[16]; - u_int i; #endif + u_int i; if (pmap_bootstrapped && ofw_real_mode) args = (void *)pmap_kextract((vm_offset_t)args); ofw_sprg_prepare(); - #ifndef __powerpc64__ if (pmap_bootstrapped && !ofw_real_mode) { /* * Swap the kernel's address space with Open Firmware's */ - if (!ppc64) for (i = 0; i < 16; i++) { + + #ifdef __powerpc64__ + for (i = 1; i < 16; i++) { + if (i == KERNEL_SR || i == KERNEL2_SR || i == USER_SR) + continue; + + __asm __volatile ("slbie %0; slbmte %1, %2" :: + "r"(i << 28), "r"(ofw_pmap.pm_slb[i].slbv), + "r"(ofw_pmap.pm_slb[i].slbe)); + } + #else + for (i = 0; i < 16; i++) { srsave[i] = mfsrin(i << ADDR_SR_SHFT); mtsrin(i << ADDR_SR_SHFT, ofw_pmap.pm_sr[i]); } @@ -404,8 +409,8 @@ openfirmware(void *args) "mtdbatu 3, %0" : : "r" (0)); } isync(); + #endif } - #endif __asm __volatile( "\t" "sync\n\t" @@ -424,19 +429,28 @@ openfirmware(void *args) : : "r" (oldmsr) ); - #ifndef __powerpc64__ if (pmap_bootstrapped && !ofw_real_mode) { /* * Restore the kernel's addr space. The isync() doesn;t * work outside the loop unless mtsrin() is open-coded * in an asm statement :( */ + #ifdef __powerpc64__ + for (i = 1; i < 16; i++) { + if (i == KERNEL_SR || i == KERNEL2_SR || i == USER_SR) + continue; + + __asm __volatile ("slbie %0; slbmte %1, %2" :: + "r"(i << 28), "r"(kernel_pmap->pm_slb[i].slbv), + "r"(kernel_pmap->pm_slb[i].slbe)); + } + #else for (i = 0; i < 16; i++) { mtsrin(i << ADDR_SR_SHFT, srsave[i]); isync(); } + #endif } - #endif ofw_sprg_restore(); Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 01:11:23 2009 (r196956) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 03:55:09 2009 (r196957) @@ -971,6 +971,11 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o moea64_pinit(mmup, &ofw_pmap); + #ifndef __powerpc64__ + ofw_pmap.pm_sr[KERNEL_SR] = kernel_pmap->pm_sr[KERNEL_SR]; + ofw_pmap.pm_sr[KERNEL2_SR] = kernel_pmap->pm_sr[KERNEL2_SR]; + #endif + if ((chosen = OF_finddevice("/chosen")) == -1) panic("moea64_bootstrap: can't find /chosen"); OF_getprop(chosen, "mmu", &mmui, 4); From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 04:02:34 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BEA9106566B; Tue, 8 Sep 2009 04:02:34 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EF6DF8FC1C; Tue, 8 Sep 2009 04:02:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8842XmJ035102; Tue, 8 Sep 2009 04:02:33 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8842XFY035100; Tue, 8 Sep 2009 04:02:33 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909080402.n8842XFY035100@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 8 Sep 2009 04:02:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196958 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 04:02:34 -0000 Author: nwhitehorn Date: Tue Sep 8 04:02:33 2009 New Revision: 196958 URL: http://svn.freebsd.org/changeset/base/196958 Log: Fix OFW translations map. The kernel now boots on my Xserve until after virtual memory is up, and then dies with a panic when trying to map the OFW bounce page, so there's a bug there for another day. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 03:55:09 2009 (r196957) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 04:02:33 2009 (r196958) @@ -262,11 +262,11 @@ TLBIE(pmap_t pmap, vm_offset_t va) { #define ASSERT_TABLE_LOCK() mtx_assert(&moea64_table_mutex, MA_OWNED) struct ofw_map { - vm_offset_t om_va; - vm_size_t om_len; - vm_offset_t om_pa_hi; - vm_offset_t om_pa_lo; - u_int om_mode; + cell_t om_va; + cell_t om_len; + cell_t om_pa_hi; + cell_t om_pa_lo; + cell_t om_mode; }; /* @@ -1001,8 +1001,10 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o if (translations[i].om_pa_lo % PAGE_SIZE) panic("OFW translation not page-aligned!"); + #ifndef __powerpc64__ if (translations[i].om_pa_hi) panic("OFW translations above 32-bit boundary!"); + #endif /* Now enter the pages for this mapping */ From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 04:06:41 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC6081065670; Tue, 8 Sep 2009 04:06:41 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BBE708FC12; Tue, 8 Sep 2009 04:06:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8846fBF035215; Tue, 8 Sep 2009 04:06:41 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8846f3b035213; Tue, 8 Sep 2009 04:06:41 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909080406.n8846f3b035213@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 8 Sep 2009 04:06:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196959 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 04:06:41 -0000 Author: nwhitehorn Date: Tue Sep 8 04:06:41 2009 New Revision: 196959 URL: http://svn.freebsd.org/changeset/base/196959 Log: Fix an obvious mistake -- the high bits of translations can and should be respected now. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 04:02:33 2009 (r196958) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 04:06:41 2009 (r196959) @@ -1026,6 +1026,9 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o translations[i].om_va + off); m.phys_addr = translations[i].om_pa_lo + off; + #ifdef __powerpc64 + m.phys_addr += translations[i].om_pa_hi << 32; + #endif moea64_enter_locked(&ofw_pmap, translations[i].om_va + off, &m, VM_PROT_ALL, 1); From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 04:08:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CDA06106566C; Tue, 8 Sep 2009 04:08:14 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BD58F8FC12; Tue, 8 Sep 2009 04:08:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8848EoG035275; Tue, 8 Sep 2009 04:08:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8848Edm035273; Tue, 8 Sep 2009 04:08:14 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909080408.n8848Edm035273@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 8 Sep 2009 04:08:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196960 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 04:08:14 -0000 Author: nwhitehorn Date: Tue Sep 8 04:08:14 2009 New Revision: 196960 URL: http://svn.freebsd.org/changeset/base/196960 Log: Fix the fix. Clearly it is time for bed. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 04:06:41 2009 (r196959) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Tue Sep 8 04:08:14 2009 (r196960) @@ -1026,7 +1026,7 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o translations[i].om_va + off); m.phys_addr = translations[i].om_pa_lo + off; - #ifdef __powerpc64 + #ifdef __powerpc64__ m.phys_addr += translations[i].om_pa_hi << 32; #endif moea64_enter_locked(&ofw_pmap, From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 05:24:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FA01106568B; Tue, 8 Sep 2009 05:24:10 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F36928FC16; Tue, 8 Sep 2009 05:24:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n885O9Vt036918; Tue, 8 Sep 2009 05:24:09 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n885O90e036916; Tue, 8 Sep 2009 05:24:09 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200909080524.n885O90e036916@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 8 Sep 2009 05:24:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196963 - projects/mips/sys/mips/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 05:24:10 -0000 Author: gonzo Date: Tue Sep 8 05:24:09 2009 New Revision: 196963 URL: http://svn.freebsd.org/changeset/base/196963 Log: - Add commented hint required for RouterStation(non PRO) board Modified: projects/mips/sys/mips/conf/AR71XX.hints Modified: projects/mips/sys/mips/conf/AR71XX.hints ============================================================================== --- projects/mips/sys/mips/conf/AR71XX.hints Tue Sep 8 05:02:41 2009 (r196962) +++ projects/mips/sys/mips/conf/AR71XX.hints Tue Sep 8 05:24:09 2009 (r196963) @@ -29,6 +29,9 @@ hint.arge.0.at="nexus0" hint.arge.0.maddr=0x19000000 hint.arge.0.msize=0x1000 hint.arge.0.irq=2 +# Uncomment this hint for RS (not PRO) +# hint.arge.0.phy=20 + # hint.arge.1.at="nexus0" # hint.arge.1.maddr=0x1A000000 # hint.arge.1.msize=0x1000 From owner-svn-src-projects@FreeBSD.ORG Tue Sep 8 19:15:30 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CBFD61065696; Tue, 8 Sep 2009 19:15:30 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B77428FC21; Tue, 8 Sep 2009 19:15:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n88JFUF2057087; Tue, 8 Sep 2009 19:15:30 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n88JFUTQ057083; Tue, 8 Sep 2009 19:15:30 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <200909081915.n88JFUTQ057083@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Tue, 8 Sep 2009 19:15:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r196988 - in projects/mips: . bin/chmod bin/cp bin/getfacl bin/ls bin/mv bin/setfacl bin/sh cddl/contrib/opensolaris cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libzfs... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Sep 2009 19:15:30 -0000 Author: gonzo Date: Tue Sep 8 19:15:29 2009 New Revision: 196988 URL: http://svn.freebsd.org/changeset/base/196988 Log: - MFC from head@196987 Added: projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c - copied unchanged from r196987, head/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h - copied unchanged from r196987, head/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h projects/mips/sys/dev/pty/ - copied from r196987, head/sys/dev/pty/ projects/mips/sys/modules/pty/ - copied from r196987, head/sys/modules/pty/ projects/mips/sys/sys/_sockaddr_storage.h - copied unchanged from r196987, head/sys/sys/_sockaddr_storage.h projects/mips/sys/teken/ - copied from r196987, head/sys/teken/ projects/mips/tools/regression/fstest/tests/granular/ - copied from r196987, head/tools/regression/fstest/tests/granular/ projects/mips/usr.sbin/mfiutil/ - copied from r196987, head/usr.sbin/mfiutil/ projects/mips/usr.sbin/mptutil/ - copied from r196987, head/usr.sbin/mptutil/ Replaced: projects/mips/sys/cddl/compat/opensolaris/rpc/xdr.h - copied unchanged from r196987, head/sys/cddl/compat/opensolaris/rpc/xdr.h Deleted: projects/mips/crypto/openssl/apps/md4.c projects/mips/crypto/openssl/test/bftest.c projects/mips/crypto/openssl/test/bntest.c projects/mips/crypto/openssl/test/casttest.c projects/mips/crypto/openssl/test/destest.c projects/mips/crypto/openssl/test/dhtest.c projects/mips/crypto/openssl/test/dsatest.c projects/mips/crypto/openssl/test/ecdhtest.c projects/mips/crypto/openssl/test/ecdsatest.c projects/mips/crypto/openssl/test/ectest.c projects/mips/crypto/openssl/test/enginetest.c projects/mips/crypto/openssl/test/evp_test.c projects/mips/crypto/openssl/test/exptest.c projects/mips/crypto/openssl/test/fips_aesavs.c projects/mips/crypto/openssl/test/fips_desmovs.c projects/mips/crypto/openssl/test/fips_dsatest.c projects/mips/crypto/openssl/test/fips_dssvs.c projects/mips/crypto/openssl/test/fips_hmactest.c projects/mips/crypto/openssl/test/fips_randtest.c projects/mips/crypto/openssl/test/fips_rngvs.c projects/mips/crypto/openssl/test/fips_rsagtest.c projects/mips/crypto/openssl/test/fips_rsastest.c projects/mips/crypto/openssl/test/fips_rsavtest.c projects/mips/crypto/openssl/test/fips_shatest.c projects/mips/crypto/openssl/test/fips_test_suite.c projects/mips/crypto/openssl/test/hmactest.c projects/mips/crypto/openssl/test/ideatest.c projects/mips/crypto/openssl/test/jpaketest.c projects/mips/crypto/openssl/test/md2test.c projects/mips/crypto/openssl/test/md4test.c projects/mips/crypto/openssl/test/md5test.c projects/mips/crypto/openssl/test/mdc2test.c projects/mips/crypto/openssl/test/randtest.c projects/mips/crypto/openssl/test/rc2test.c projects/mips/crypto/openssl/test/rc4test.c projects/mips/crypto/openssl/test/rc5test.c projects/mips/crypto/openssl/test/rmdtest.c projects/mips/crypto/openssl/test/rsa_test.c projects/mips/crypto/openssl/test/sha1test.c projects/mips/crypto/openssl/test/sha256t.c projects/mips/crypto/openssl/test/sha512t.c projects/mips/crypto/openssl/test/shatest.c projects/mips/crypto/openssl/test/ssltest.c projects/mips/etc/mtree/BSD.local.dist projects/mips/etc/mtree/BSD.x11-4.dist projects/mips/etc/mtree/BSD.x11.dist projects/mips/share/colldef/lt_LT.ISO8859-13.src projects/mips/share/man/man9/ieee80211_ioctl.9 projects/mips/share/mklocale/lt_LT.ISO8859-13.src projects/mips/sys/cddl/compat/opensolaris/sys/taskq.h projects/mips/sys/cddl/compat/opensolaris/sys/taskq_impl.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/rpc/ projects/mips/sys/dev/syscons/teken/ projects/mips/sys/kern/tty_pty.c Modified: projects/mips/ (props changed) projects/mips/ObsoleteFiles.inc projects/mips/UPDATING projects/mips/bin/chmod/chmod.c projects/mips/bin/cp/utils.c projects/mips/bin/getfacl/getfacl.1 projects/mips/bin/getfacl/getfacl.c projects/mips/bin/ls/print.c projects/mips/bin/mv/mv.c projects/mips/bin/setfacl/mask.c projects/mips/bin/setfacl/merge.c projects/mips/bin/setfacl/remove.c projects/mips/bin/setfacl/setfacl.1 projects/mips/bin/setfacl/setfacl.c projects/mips/bin/setfacl/setfacl.h projects/mips/bin/sh/eval.c projects/mips/bin/sh/exec.c projects/mips/bin/sh/exec.h projects/mips/bin/sh/mknodes.c projects/mips/bin/sh/nodes.c.pat projects/mips/cddl/contrib/opensolaris/ (props changed) projects/mips/cddl/contrib/opensolaris/cmd/zdb/zdb.c projects/mips/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c projects/mips/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c projects/mips/cddl/lib/libnvpair/Makefile projects/mips/contrib/bind9/ (props changed) projects/mips/contrib/bzip2/FREEBSD-vendor projects/mips/contrib/cpio/ (props changed) projects/mips/contrib/csup/ (props changed) projects/mips/contrib/ee/ (props changed) projects/mips/contrib/ee/ee.c projects/mips/contrib/file/ (props changed) projects/mips/contrib/gdb/ (props changed) projects/mips/contrib/gdtoa/ (props changed) projects/mips/contrib/gdtoa/gdtoaimp.h projects/mips/contrib/gdtoa/misc.c projects/mips/contrib/less/ (props changed) projects/mips/contrib/libpcap/ (props changed) projects/mips/contrib/ncurses/ (props changed) projects/mips/contrib/netcat/ (props changed) projects/mips/contrib/netcat/FREEBSD-vendor projects/mips/contrib/ntp/ (props changed) projects/mips/contrib/openbsm/ (props changed) projects/mips/contrib/openpam/ (props changed) projects/mips/contrib/openpam/FREEBSD-vendor projects/mips/contrib/pf/ (props changed) projects/mips/contrib/sendmail/ (props changed) projects/mips/contrib/tcpdump/ (props changed) projects/mips/contrib/tcsh/ (props changed) projects/mips/contrib/top/ (props changed) projects/mips/contrib/top/display.c projects/mips/contrib/top/install-sh (props changed) projects/mips/contrib/traceroute/as.c projects/mips/contrib/traceroute/as.h projects/mips/contrib/traceroute/traceroute.c projects/mips/crypto/openssh/ (props changed) projects/mips/crypto/openssh/FREEBSD-vendor projects/mips/crypto/openssl/ (props changed) projects/mips/crypto/openssl/crypto/pqueue/pqueue.c projects/mips/crypto/openssl/crypto/pqueue/pqueue.h projects/mips/crypto/openssl/ssl/d1_both.c projects/mips/crypto/openssl/ssl/d1_pkt.c projects/mips/etc/Makefile projects/mips/etc/defaults/periodic.conf projects/mips/etc/defaults/rc.conf projects/mips/etc/freebsd-update.conf projects/mips/etc/inetd.conf projects/mips/etc/mtree/BSD.include.dist projects/mips/etc/mtree/BSD.usr.dist projects/mips/etc/mtree/Makefile projects/mips/etc/network.subr projects/mips/etc/rc.d/Makefile projects/mips/etc/rc.d/ipsec projects/mips/etc/rc.d/wpa_supplicant projects/mips/gnu/usr.bin/groff/tmac/mdoc.local projects/mips/gnu/usr.bin/patch/pch.c projects/mips/include/Makefile projects/mips/lib/libarchive/archive_read.c projects/mips/lib/libarchive/archive_read_support_format_iso9660.c projects/mips/lib/libarchive/test/test_compat_zip.c projects/mips/lib/libarchive/test/test_read_format_isojoliet_bz2.c projects/mips/lib/libarchive/test/test_read_format_isorr_bz2.c projects/mips/lib/libc/ (props changed) projects/mips/lib/libc/db/hash/hash.c projects/mips/lib/libc/net/getifaddrs.c projects/mips/lib/libc/posix1e/Makefile.inc projects/mips/lib/libc/posix1e/acl_calc_mask.c projects/mips/lib/libc/posix1e/acl_support.c projects/mips/lib/libc/posix1e/acl_to_text.c projects/mips/lib/libc/posix1e/mac.3 projects/mips/lib/libc/posix1e/mac_free.3 projects/mips/lib/libc/posix1e/mac_get.3 projects/mips/lib/libc/posix1e/mac_set.3 projects/mips/lib/libc/posix1e/mac_text.3 projects/mips/lib/libc/posix1e/posix1e.3 projects/mips/lib/libc/stdio/asprintf.c (props changed) projects/mips/lib/libc/stdlib/malloc.c projects/mips/lib/libc/stdlib/ptsname.3 projects/mips/lib/libc/stdtime/ (props changed) projects/mips/lib/libc/stdtime/strptime.c projects/mips/lib/libc/string/ffsll.c (props changed) projects/mips/lib/libc/string/flsll.c (props changed) projects/mips/lib/libc/string/wcpcpy.c (props changed) projects/mips/lib/libc/sys/intro.2 projects/mips/lib/libkvm/kvm_vnet.c projects/mips/lib/libpam/modules/pam_lastlog/pam_lastlog.c projects/mips/lib/libpmc/pmc.3 projects/mips/lib/libpmc/pmc.atom.3 projects/mips/lib/libpmc/pmc.core.3 projects/mips/lib/libpmc/pmc.core2.3 projects/mips/lib/libpmc/pmc.iaf.3 projects/mips/lib/libpmc/pmc.k7.3 projects/mips/lib/libpmc/pmc.k8.3 projects/mips/lib/libpmc/pmc.p4.3 projects/mips/lib/libpmc/pmc.p5.3 projects/mips/lib/libpmc/pmc.p6.3 projects/mips/lib/libpmc/pmc_capabilities.3 projects/mips/lib/libpmc/pmc_read.3 projects/mips/lib/libusb/ (props changed) projects/mips/lib/libusb/libusb20.3 (props changed) projects/mips/lib/libusb/usb.h (props changed) projects/mips/lib/libutil/ (props changed) projects/mips/libexec/Makefile projects/mips/release/Makefile projects/mips/release/doc/en_US.ISO8859-1/relnotes/article.sgml projects/mips/release/scripts/lib32-make.sh projects/mips/release/scripts/package-split.py projects/mips/sbin/ (props changed) projects/mips/sbin/bsdlabel/bsdlabel.c projects/mips/sbin/camcontrol/camcontrol.8 projects/mips/sbin/camcontrol/camcontrol.c projects/mips/sbin/geom/class/label/glabel.8 projects/mips/sbin/geom/class/mirror/geom_mirror.c projects/mips/sbin/geom/class/mirror/gmirror.8 projects/mips/sbin/geom/class/part/geom_part.c projects/mips/sbin/geom/core/geom.c projects/mips/sbin/ifconfig/ifgif.c projects/mips/sbin/ipfw/ (props changed) projects/mips/sbin/route/route.8 projects/mips/sbin/route/route.c projects/mips/sbin/savecore/savecore.c projects/mips/sbin/umount/umount.8 projects/mips/share/colldef/Makefile projects/mips/share/examples/cvsup/stable-supfile projects/mips/share/examples/scsi_target/scsi_target.c projects/mips/share/examples/scsi_target/scsi_target.h projects/mips/share/man/man4/ahci.4 projects/mips/share/man/man4/ip6.4 projects/mips/share/man/man4/ips.4 projects/mips/share/man/man4/mfi.4 projects/mips/share/man/man4/mpt.4 projects/mips/share/man/man4/polling.4 projects/mips/share/man/man4/pts.4 projects/mips/share/man/man4/pty.4 projects/mips/share/man/man5/freebsd-update.conf.5 projects/mips/share/man/man5/make.conf.5 projects/mips/share/man/man5/rc.conf.5 projects/mips/share/man/man5/tmpfs.5 projects/mips/share/man/man7/release.7 projects/mips/share/man/man9/Makefile projects/mips/share/man/man9/ieee80211.9 projects/mips/share/man/man9/ieee80211_crypto.9 projects/mips/share/man/man9/ieee80211_input.9 projects/mips/share/man/man9/ieee80211_node.9 projects/mips/share/man/man9/ieee80211_output.9 projects/mips/share/man/man9/ieee80211_proto.9 projects/mips/share/man/man9/ieee80211_radiotap.9 projects/mips/share/man/man9/kproc.9 projects/mips/share/man/man9/kthread.9 projects/mips/share/man/man9/sglist.9 projects/mips/share/man/man9/taskqueue.9 projects/mips/share/mklocale/Makefile projects/mips/share/monetdef/Makefile projects/mips/share/msgdef/Makefile projects/mips/share/numericdef/Makefile projects/mips/share/timedef/Makefile projects/mips/share/timedef/ja_JP.UTF-8.src projects/mips/share/zoneinfo/ (props changed) projects/mips/share/zoneinfo/africa projects/mips/share/zoneinfo/asia projects/mips/share/zoneinfo/australasia projects/mips/share/zoneinfo/europe projects/mips/share/zoneinfo/leapseconds projects/mips/sys/ (props changed) projects/mips/sys/amd64/amd64/elf_machdep.c projects/mips/sys/amd64/amd64/local_apic.c projects/mips/sys/amd64/amd64/machdep.c projects/mips/sys/amd64/amd64/mp_machdep.c projects/mips/sys/amd64/amd64/pmap.c projects/mips/sys/amd64/amd64/trap.c projects/mips/sys/amd64/conf/GENERIC projects/mips/sys/amd64/conf/NOTES projects/mips/sys/amd64/conf/XENHVM projects/mips/sys/amd64/include/apicvar.h projects/mips/sys/amd64/include/param.h projects/mips/sys/amd64/include/pmc_mdep.h projects/mips/sys/amd64/include/smp.h projects/mips/sys/amd64/include/xen/ (props changed) projects/mips/sys/amd64/linux32/linux32_sysvec.c projects/mips/sys/arm/arm/pmap.c projects/mips/sys/arm/arm/undefined.c projects/mips/sys/arm/arm/vm_machdep.c projects/mips/sys/arm/at91/uart_dev_at91usart.c projects/mips/sys/arm/mv/common.c projects/mips/sys/arm/mv/discovery/db78xxx.c projects/mips/sys/arm/mv/kirkwood/db88f6xxx.c projects/mips/sys/arm/mv/kirkwood/files.db88f6xxx projects/mips/sys/arm/mv/kirkwood/std.db88f6xxx projects/mips/sys/arm/mv/mv_machdep.c projects/mips/sys/arm/mv/mvreg.h projects/mips/sys/arm/mv/mvvar.h projects/mips/sys/arm/mv/orion/db88f5xxx.c projects/mips/sys/arm/xscale/ixp425/ixdp425_pci.c projects/mips/sys/boot/i386/gptboot/gptboot.c projects/mips/sys/cam/ata/ata_all.c projects/mips/sys/cam/ata/ata_all.h projects/mips/sys/cam/ata/ata_da.c projects/mips/sys/cam/ata/ata_xpt.c projects/mips/sys/cam/cam_ccb.h projects/mips/sys/cam/cam_xpt.c projects/mips/sys/cam/cam_xpt_internal.h projects/mips/sys/cam/scsi/scsi_cd.c projects/mips/sys/cam/scsi/scsi_da.c projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris.c projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c projects/mips/sys/cddl/compat/opensolaris/sys/mutex.h projects/mips/sys/cddl/compat/opensolaris/sys/proc.h projects/mips/sys/cddl/compat/opensolaris/sys/vnode.h projects/mips/sys/cddl/contrib/opensolaris/ (props changed) projects/mips/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/mips/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h projects/mips/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h projects/mips/sys/compat/ia32/ia32_sysvec.c projects/mips/sys/compat/linprocfs/linprocfs.c projects/mips/sys/compat/linux/linux_ioctl.c projects/mips/sys/conf/NOTES projects/mips/sys/conf/files projects/mips/sys/conf/files.amd64 projects/mips/sys/conf/files.i386 projects/mips/sys/conf/files.ia64 projects/mips/sys/conf/files.powerpc projects/mips/sys/conf/files.sparc64 projects/mips/sys/conf/newvers.sh projects/mips/sys/conf/options projects/mips/sys/conf/options.amd64 projects/mips/sys/conf/options.arm projects/mips/sys/conf/options.i386 projects/mips/sys/conf/options.pc98 projects/mips/sys/contrib/altq/altq/altq_subr.c projects/mips/sys/contrib/dev/acpica/ (props changed) projects/mips/sys/contrib/pf/ (props changed) projects/mips/sys/contrib/pf/net/pf.c projects/mips/sys/contrib/pf/net/pf_if.c projects/mips/sys/contrib/pf/net/pfvar.h projects/mips/sys/dev/aac/aac.c projects/mips/sys/dev/acpica/acpi.c projects/mips/sys/dev/acpica/acpi_battery.c projects/mips/sys/dev/acpica/acpi_cpu.c projects/mips/sys/dev/acpica/acpi_dock.c projects/mips/sys/dev/acpica/acpi_thermal.c projects/mips/sys/dev/adb/adb_bus.c projects/mips/sys/dev/ahci/ahci.c projects/mips/sys/dev/ahci/ahci.h projects/mips/sys/dev/alc/if_alc.c projects/mips/sys/dev/amdtemp/amdtemp.c projects/mips/sys/dev/amr/amr.c projects/mips/sys/dev/asmc/asmc.c projects/mips/sys/dev/ata/ (props changed) projects/mips/sys/dev/ata/ata-all.c projects/mips/sys/dev/ata/ata-disk.c projects/mips/sys/dev/ata/ata-dma.c projects/mips/sys/dev/ata/ata-usb.c (props changed) projects/mips/sys/dev/ath/ah_osdep.c projects/mips/sys/dev/ath/ath_hal/ah_eeprom_v3.c projects/mips/sys/dev/ath/ath_hal/ah_regdomain.c projects/mips/sys/dev/ath/if_ath.c projects/mips/sys/dev/atkbdc/psm.c projects/mips/sys/dev/bge/if_bge.c projects/mips/sys/dev/bktr/bktr_os.c projects/mips/sys/dev/coretemp/coretemp.c projects/mips/sys/dev/cxgb/ (props changed) projects/mips/sys/dev/cxgb/cxgb_main.c projects/mips/sys/dev/drm/drmP.h projects/mips/sys/dev/drm/drm_bufs.c projects/mips/sys/dev/drm/drm_drv.c projects/mips/sys/dev/drm/drm_fops.c projects/mips/sys/dev/drm/drm_pciids.h projects/mips/sys/dev/drm/drm_sysctl.c projects/mips/sys/dev/drm/r600_cp.c projects/mips/sys/dev/drm/radeon_cp.c projects/mips/sys/dev/drm/radeon_drm.h projects/mips/sys/dev/drm/radeon_drv.h projects/mips/sys/dev/drm/radeon_state.c projects/mips/sys/dev/e1000/if_em.c projects/mips/sys/dev/e1000/if_igb.c projects/mips/sys/dev/ep/if_ep.c projects/mips/sys/dev/hptrr/hptrr_osm_bsd.c projects/mips/sys/dev/hwpmc/hwpmc_core.c projects/mips/sys/dev/hwpmc/hwpmc_piv.c projects/mips/sys/dev/hwpmc/hwpmc_ppro.c projects/mips/sys/dev/hwpmc/hwpmc_x86.c projects/mips/sys/dev/hwpmc/pmc_events.h projects/mips/sys/dev/ips/ips_pci.c projects/mips/sys/dev/iscsi/initiator/isc_cam.c projects/mips/sys/dev/isp/isp_freebsd.c projects/mips/sys/dev/ixgbe/ixgbe.c projects/mips/sys/dev/mfi/mfi.c projects/mips/sys/dev/mfi/mfi_ioctl.h projects/mips/sys/dev/mfi/mfireg.h projects/mips/sys/dev/mge/if_mge.c projects/mips/sys/dev/mii/e1000phy.c projects/mips/sys/dev/mlx/mlx.c projects/mips/sys/dev/mmc/mmc.c projects/mips/sys/dev/mwl/if_mwl.c projects/mips/sys/dev/null/null.c projects/mips/sys/dev/pccbb/pccbb.c projects/mips/sys/dev/ppbus/vpo.c projects/mips/sys/dev/pst/pst-iop.c projects/mips/sys/dev/re/if_re.c projects/mips/sys/dev/rp/rp.c projects/mips/sys/dev/rp/rp_pci.c projects/mips/sys/dev/siis/siis.c projects/mips/sys/dev/snp/snp.c projects/mips/sys/dev/sound/pci/hda/hdac.c projects/mips/sys/dev/sound/pci/hda/hdac_private.h projects/mips/sys/dev/sound/pci/hda/hdac_reg.h projects/mips/sys/dev/sound/usb/uaudio.c (contents, props changed) projects/mips/sys/dev/sound/usb/uaudio.h (props changed) projects/mips/sys/dev/sound/usb/uaudio_pcm.c (props changed) projects/mips/sys/dev/sound/usb/uaudioreg.h (props changed) projects/mips/sys/dev/syscons/scterm-teken.c projects/mips/sys/dev/syscons/scvgarndr.c projects/mips/sys/dev/syscons/scvidctl.c projects/mips/sys/dev/twe/twe.c projects/mips/sys/dev/txp/if_txp.c projects/mips/sys/dev/usb/controller/at91dci.c (props changed) projects/mips/sys/dev/usb/controller/at91dci.h (props changed) projects/mips/sys/dev/usb/controller/at91dci_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/atmegadci.c (props changed) projects/mips/sys/dev/usb/controller/atmegadci.h (props changed) projects/mips/sys/dev/usb/controller/atmegadci_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/ehci.c (props changed) projects/mips/sys/dev/usb/controller/ehci.h (props changed) projects/mips/sys/dev/usb/controller/ehci_ixp4xx.c (props changed) projects/mips/sys/dev/usb/controller/ehci_mbus.c (props changed) projects/mips/sys/dev/usb/controller/ehci_pci.c (props changed) projects/mips/sys/dev/usb/controller/musb_otg.c (props changed) projects/mips/sys/dev/usb/controller/musb_otg.h (props changed) projects/mips/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/ohci.c (props changed) projects/mips/sys/dev/usb/controller/ohci.h (props changed) projects/mips/sys/dev/usb/controller/ohci_atmelarm.c (props changed) projects/mips/sys/dev/usb/controller/ohci_pci.c (props changed) projects/mips/sys/dev/usb/controller/uhci.c (props changed) projects/mips/sys/dev/usb/controller/uhci.h (props changed) projects/mips/sys/dev/usb/controller/uhci_pci.c (props changed) projects/mips/sys/dev/usb/controller/usb_controller.c (contents, props changed) projects/mips/sys/dev/usb/controller/uss820dci.c (props changed) projects/mips/sys/dev/usb/controller/uss820dci.h (props changed) projects/mips/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed) projects/mips/sys/dev/usb/input/uhid.c (props changed) projects/mips/sys/dev/usb/input/ukbd.c (contents, props changed) projects/mips/sys/dev/usb/input/ums.c (props changed) projects/mips/sys/dev/usb/input/usb_rdesc.h (props changed) projects/mips/sys/dev/usb/misc/udbp.c (props changed) projects/mips/sys/dev/usb/misc/udbp.h (props changed) projects/mips/sys/dev/usb/misc/ufm.c (contents, props changed) projects/mips/sys/dev/usb/net/if_aue.c (contents, props changed) projects/mips/sys/dev/usb/net/if_auereg.h (props changed) projects/mips/sys/dev/usb/net/if_axe.c (props changed) projects/mips/sys/dev/usb/net/if_axereg.h (props changed) projects/mips/sys/dev/usb/net/if_cdce.c (contents, props changed) projects/mips/sys/dev/usb/net/if_cdcereg.h (props changed) projects/mips/sys/dev/usb/net/if_cue.c (props changed) projects/mips/sys/dev/usb/net/if_cuereg.h (props changed) projects/mips/sys/dev/usb/net/if_kue.c (props changed) projects/mips/sys/dev/usb/net/if_kuefw.h (props changed) projects/mips/sys/dev/usb/net/if_kuereg.h (props changed) projects/mips/sys/dev/usb/net/if_rue.c (props changed) projects/mips/sys/dev/usb/net/if_ruereg.h (props changed) projects/mips/sys/dev/usb/net/if_udav.c (props changed) projects/mips/sys/dev/usb/net/if_udavreg.h (props changed) projects/mips/sys/dev/usb/net/usb_ethernet.c (contents, props changed) projects/mips/sys/dev/usb/net/usb_ethernet.h (props changed) projects/mips/sys/dev/usb/quirk/usb_quirk.c (props changed) projects/mips/sys/dev/usb/quirk/usb_quirk.h (props changed) projects/mips/sys/dev/usb/serial/u3g.c (props changed) projects/mips/sys/dev/usb/serial/uark.c (props changed) projects/mips/sys/dev/usb/serial/ubsa.c (props changed) projects/mips/sys/dev/usb/serial/ubser.c (props changed) projects/mips/sys/dev/usb/serial/uchcom.c (props changed) projects/mips/sys/dev/usb/serial/ucycom.c (props changed) projects/mips/sys/dev/usb/serial/ufoma.c (props changed) projects/mips/sys/dev/usb/serial/uftdi.c (props changed) projects/mips/sys/dev/usb/serial/uftdi_reg.h (props changed) projects/mips/sys/dev/usb/serial/ugensa.c (props changed) projects/mips/sys/dev/usb/serial/uipaq.c (contents, props changed) projects/mips/sys/dev/usb/serial/ulpt.c (props changed) projects/mips/sys/dev/usb/serial/umct.c (props changed) projects/mips/sys/dev/usb/serial/umodem.c (props changed) projects/mips/sys/dev/usb/serial/umoscom.c (props changed) projects/mips/sys/dev/usb/serial/uplcom.c (props changed) projects/mips/sys/dev/usb/serial/usb_serial.c (props changed) projects/mips/sys/dev/usb/serial/usb_serial.h (props changed) projects/mips/sys/dev/usb/serial/uslcom.c (props changed) projects/mips/sys/dev/usb/serial/uvisor.c (contents, props changed) projects/mips/sys/dev/usb/serial/uvscom.c (props changed) projects/mips/sys/dev/usb/storage/rio500_usb.h (props changed) projects/mips/sys/dev/usb/storage/umass.c (contents, props changed) projects/mips/sys/dev/usb/storage/urio.c (contents, props changed) projects/mips/sys/dev/usb/storage/ustorage_fs.c (props changed) projects/mips/sys/dev/usb/template/usb_template.c (props changed) projects/mips/sys/dev/usb/template/usb_template.h (props changed) projects/mips/sys/dev/usb/template/usb_template_cdce.c (props changed) projects/mips/sys/dev/usb/template/usb_template_msc.c (props changed) projects/mips/sys/dev/usb/template/usb_template_mtp.c (props changed) projects/mips/sys/dev/usb/ufm_ioctl.h (props changed) projects/mips/sys/dev/usb/usb.h (contents, props changed) projects/mips/sys/dev/usb/usb_bus.h (props changed) projects/mips/sys/dev/usb/usb_busdma.c (contents, props changed) projects/mips/sys/dev/usb/usb_busdma.h (props changed) projects/mips/sys/dev/usb/usb_cdc.h (props changed) projects/mips/sys/dev/usb/usb_compat_linux.c (contents, props changed) projects/mips/sys/dev/usb/usb_compat_linux.h (props changed) projects/mips/sys/dev/usb/usb_controller.h (props changed) projects/mips/sys/dev/usb/usb_core.c (props changed) projects/mips/sys/dev/usb/usb_core.h (props changed) projects/mips/sys/dev/usb/usb_debug.c (props changed) projects/mips/sys/dev/usb/usb_debug.h (props changed) projects/mips/sys/dev/usb/usb_dev.c (contents, props changed) projects/mips/sys/dev/usb/usb_dev.h (props changed) projects/mips/sys/dev/usb/usb_device.c (contents, props changed) projects/mips/sys/dev/usb/usb_device.h (contents, props changed) projects/mips/sys/dev/usb/usb_dynamic.c (props changed) projects/mips/sys/dev/usb/usb_dynamic.h (props changed) projects/mips/sys/dev/usb/usb_endian.h (props changed) projects/mips/sys/dev/usb/usb_error.c (props changed) projects/mips/sys/dev/usb/usb_generic.c (props changed) projects/mips/sys/dev/usb/usb_generic.h (props changed) projects/mips/sys/dev/usb/usb_handle_request.c (contents, props changed) projects/mips/sys/dev/usb/usb_hid.c (props changed) projects/mips/sys/dev/usb/usb_hub.c (contents, props changed) projects/mips/sys/dev/usb/usb_hub.h (props changed) projects/mips/sys/dev/usb/usb_if.m (props changed) projects/mips/sys/dev/usb/usb_ioctl.h (props changed) projects/mips/sys/dev/usb/usb_lookup.c (props changed) projects/mips/sys/dev/usb/usb_mbuf.c (props changed) projects/mips/sys/dev/usb/usb_mbuf.h (props changed) projects/mips/sys/dev/usb/usb_msctest.c (props changed) projects/mips/sys/dev/usb/usb_msctest.h (props changed) projects/mips/sys/dev/usb/usb_parse.c (props changed) projects/mips/sys/dev/usb/usb_pci.h (props changed) projects/mips/sys/dev/usb/usb_process.c (contents, props changed) projects/mips/sys/dev/usb/usb_process.h (contents, props changed) projects/mips/sys/dev/usb/usb_request.c (props changed) projects/mips/sys/dev/usb/usb_request.h (props changed) projects/mips/sys/dev/usb/usb_transfer.c (contents, props changed) projects/mips/sys/dev/usb/usb_transfer.h (props changed) projects/mips/sys/dev/usb/usb_util.c (props changed) projects/mips/sys/dev/usb/usb_util.h (props changed) projects/mips/sys/dev/usb/usbdevs (contents, props changed) projects/mips/sys/dev/usb/usbhid.h (props changed) projects/mips/sys/dev/usb/wlan/if_rum.c (props changed) projects/mips/sys/dev/usb/wlan/if_rumfw.h (props changed) projects/mips/sys/dev/usb/wlan/if_rumreg.h (props changed) projects/mips/sys/dev/usb/wlan/if_rumvar.h (props changed) projects/mips/sys/dev/usb/wlan/if_upgt.c projects/mips/sys/dev/usb/wlan/if_ural.c (props changed) projects/mips/sys/dev/usb/wlan/if_uralreg.h (props changed) projects/mips/sys/dev/usb/wlan/if_uralvar.h (props changed) projects/mips/sys/dev/usb/wlan/if_zyd.c (contents, props changed) projects/mips/sys/dev/usb/wlan/if_zydfw.h (props changed) projects/mips/sys/dev/usb/wlan/if_zydreg.h (props changed) projects/mips/sys/dev/xen/blkback/blkback.c projects/mips/sys/dev/xen/blkfront/blkfront.c projects/mips/sys/dev/xen/console/console.c projects/mips/sys/dev/xen/netback/netback.c projects/mips/sys/dev/xen/netfront/ (props changed) projects/mips/sys/dev/xen/xenpci/ (props changed) projects/mips/sys/fs/fifofs/fifo_vnops.c projects/mips/sys/fs/nfsclient/nfs_clsubs.c projects/mips/sys/fs/nfsclient/nfs_clvnops.c projects/mips/sys/fs/pseudofs/pseudofs_vncache.c projects/mips/sys/fs/pseudofs/pseudofs_vnops.c projects/mips/sys/geom/geom_dev.c projects/mips/sys/geom/geom_disk.c projects/mips/sys/geom/geom_io.c projects/mips/sys/geom/geom_vfs.c projects/mips/sys/geom/mirror/g_mirror_ctl.c projects/mips/sys/geom/multipath/g_multipath.c projects/mips/sys/geom/part/g_part_gpt.c projects/mips/sys/geom/stripe/g_stripe.c projects/mips/sys/i386/acpica/acpi_machdep.c projects/mips/sys/i386/bios/smapi.c projects/mips/sys/i386/bios/smbios.c projects/mips/sys/i386/bios/vpd.c projects/mips/sys/i386/conf/GENERIC projects/mips/sys/i386/conf/NOTES projects/mips/sys/i386/i386/elf_machdep.c projects/mips/sys/i386/i386/local_apic.c projects/mips/sys/i386/i386/machdep.c projects/mips/sys/i386/i386/mp_machdep.c projects/mips/sys/i386/i386/pmap.c projects/mips/sys/i386/i386/trap.c projects/mips/sys/i386/include/apicvar.h projects/mips/sys/i386/include/pcpu.h projects/mips/sys/i386/include/pmap.h projects/mips/sys/i386/include/pmc_mdep.h projects/mips/sys/i386/include/smp.h projects/mips/sys/i386/linux/linux_sysvec.c projects/mips/sys/i386/xen/mp_machdep.c projects/mips/sys/i386/xen/pmap.c projects/mips/sys/ia64/ia64/genassym.c projects/mips/sys/ia64/ia64/interrupt.c projects/mips/sys/ia64/ia64/machdep.c projects/mips/sys/ia64/ia64/mp_machdep.c projects/mips/sys/ia64/include/smp.h projects/mips/sys/isa/isahint.c projects/mips/sys/kern/imgact_elf.c projects/mips/sys/kern/kern_conf.c projects/mips/sys/kern/kern_cons.c projects/mips/sys/kern/kern_exit.c projects/mips/sys/kern/kern_fork.c projects/mips/sys/kern/kern_jail.c projects/mips/sys/kern/kern_kthread.c projects/mips/sys/kern/kern_lock.c projects/mips/sys/kern/kern_mutex.c projects/mips/sys/kern/kern_poll.c projects/mips/sys/kern/kern_proc.c projects/mips/sys/kern/kern_rwlock.c projects/mips/sys/kern/kern_shutdown.c projects/mips/sys/kern/kern_subr.c projects/mips/sys/kern/kern_sx.c projects/mips/sys/kern/kern_sysctl.c projects/mips/sys/kern/kern_thr.c projects/mips/sys/kern/kern_thread.c projects/mips/sys/kern/kern_uuid.c projects/mips/sys/kern/subr_bus.c projects/mips/sys/kern/subr_kdb.c projects/mips/sys/kern/subr_pcpu.c projects/mips/sys/kern/subr_sglist.c projects/mips/sys/kern/subr_smp.c projects/mips/sys/kern/subr_taskqueue.c projects/mips/sys/kern/subr_witness.c projects/mips/sys/kern/sys_generic.c projects/mips/sys/kern/tty_pts.c projects/mips/sys/kern/tty_ttydisc.c projects/mips/sys/kern/uipc_domain.c projects/mips/sys/kern/vfs_cache.c projects/mips/sys/kern/vfs_syscalls.c projects/mips/sys/kern/vfs_vnops.c projects/mips/sys/mips/conf/OCTEON1 (props changed) projects/mips/sys/mips/include/smp.h projects/mips/sys/mips/mips/mp_machdep.c projects/mips/sys/mips/octeon1/ (props changed) projects/mips/sys/modules/Makefile projects/mips/sys/modules/drm/radeon/Makefile projects/mips/sys/modules/dtrace/dtnfsclient/ (props changed) projects/mips/sys/modules/ip6_mroute_mod/ (props changed) projects/mips/sys/modules/ipmi/ipmi_linux/ (props changed) projects/mips/sys/modules/zfs/Makefile projects/mips/sys/net/bpf.c projects/mips/sys/net/bpf_buffer.c projects/mips/sys/net/bpf_zerocopy.c projects/mips/sys/net/bpfdesc.h projects/mips/sys/net/bridgestp.c projects/mips/sys/net/flowtable.c projects/mips/sys/net/flowtable.h projects/mips/sys/net/if.c projects/mips/sys/net/if_arp.h projects/mips/sys/net/if_bridge.c projects/mips/sys/net/if_ef.c projects/mips/sys/net/if_llatbl.c projects/mips/sys/net/if_llatbl.h projects/mips/sys/net/if_var.h projects/mips/sys/net/if_vlan.c projects/mips/sys/net/rtsock.c projects/mips/sys/net/vnet.c projects/mips/sys/net/vnet.h projects/mips/sys/net80211/ieee80211.c projects/mips/sys/net80211/ieee80211_dfs.c projects/mips/sys/net80211/ieee80211_input.c projects/mips/sys/net80211/ieee80211_sta.c projects/mips/sys/netatalk/at_control.c projects/mips/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c (props changed) projects/mips/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h (props changed) projects/mips/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c (props changed) projects/mips/sys/netgraph/ng_gif.c projects/mips/sys/netinet/if_ether.c projects/mips/sys/netinet/in.c projects/mips/sys/netinet/in.h projects/mips/sys/netinet/in_mcast.c projects/mips/sys/netinet/ip_carp.c projects/mips/sys/netinet/ip_divert.c projects/mips/sys/netinet/ip_divert.h projects/mips/sys/netinet/ip_fastfwd.c projects/mips/sys/netinet/ip_fw.h projects/mips/sys/netinet/ip_output.c projects/mips/sys/netinet/ipfw/ip_dummynet.c (props changed) projects/mips/sys/netinet/ipfw/ip_fw2.c (contents, props changed) projects/mips/sys/netinet/ipfw/ip_fw_nat.c (props changed) projects/mips/sys/netinet/ipfw/ip_fw_pfil.c (contents, props changed) projects/mips/sys/netinet/sctp_bsd_addr.c projects/mips/sys/netinet/sctp_indata.c projects/mips/sys/netinet/sctp_input.c projects/mips/sys/netinet/sctp_os_bsd.h projects/mips/sys/netinet/sctp_output.c projects/mips/sys/netinet/sctp_pcb.c projects/mips/sys/netinet/sctp_timer.c projects/mips/sys/netinet/sctputil.c projects/mips/sys/netinet/sctputil.h projects/mips/sys/netinet/tcp_timewait.c projects/mips/sys/netinet6/icmp6.c projects/mips/sys/netinet6/in6.c projects/mips/sys/netinet6/in6_ifattach.c projects/mips/sys/netinet6/in6_src.c projects/mips/sys/netinet6/ip6_input.c projects/mips/sys/netinet6/ip6_output.c projects/mips/sys/netinet6/nd6.c projects/mips/sys/netinet6/nd6_rtr.c projects/mips/sys/netipsec/ipsec.h projects/mips/sys/netipsec/key.c projects/mips/sys/netipsec/xform_ipip.c projects/mips/sys/netipx/spx_reass.c (props changed) projects/mips/sys/nfsclient/bootp_subr.c projects/mips/sys/nfsclient/nfs_subs.c projects/mips/sys/nfsclient/nfs_vnops.c projects/mips/sys/opencrypto/cryptodev.c projects/mips/sys/pc98/cbus/fdc.c projects/mips/sys/pc98/conf/NOTES projects/mips/sys/pci/if_rlreg.h projects/mips/sys/powerpc/include/smp.h projects/mips/sys/powerpc/powerpc/mp_machdep.c projects/mips/sys/rpc/clnt_dg.c projects/mips/sys/rpc/clnt_rc.c projects/mips/sys/rpc/clnt_vc.c projects/mips/sys/rpc/rpc_generic.c projects/mips/sys/rpc/svc_dg.c projects/mips/sys/rpc/svc_generic.c projects/mips/sys/rpc/svc_vc.c projects/mips/sys/security/audit/audit.h projects/mips/sys/security/audit/audit_bsm_token.c projects/mips/sys/sparc64/include/smp.h projects/mips/sys/sun4v/include/smp.h projects/mips/sys/sys/bus.h projects/mips/sys/sys/conf.h projects/mips/sys/sys/cons.h projects/mips/sys/sys/imgact_elf.h projects/mips/sys/sys/ioctl_compat.h projects/mips/sys/sys/jail.h projects/mips/sys/sys/lock.h projects/mips/sys/sys/param.h projects/mips/sys/sys/pcpu.h projects/mips/sys/sys/proc.h projects/mips/sys/sys/sglist.h projects/mips/sys/sys/smp.h projects/mips/sys/sys/socket.h projects/mips/sys/sys/sysctl.h projects/mips/sys/sys/systm.h projects/mips/sys/sys/taskqueue.h projects/mips/sys/sys/tty.h projects/mips/sys/sys/ttycom.h projects/mips/sys/sys/ttydisc.h projects/mips/sys/sys/types.h projects/mips/sys/ufs/ffs/ffs_softdep.c projects/mips/sys/ufs/ffs/ffs_vfsops.c projects/mips/sys/ufs/ufs/ufs_acl.c projects/mips/sys/vm/device_pager.c projects/mips/sys/vm/sg_pager.c projects/mips/sys/vm/vm.h projects/mips/sys/vm/vm_extern.h projects/mips/sys/vm/vm_glue.c projects/mips/sys/xdr/xdr_mbuf.c projects/mips/sys/xen/evtchn.h (props changed) projects/mips/sys/xen/hypervisor.h (props changed) projects/mips/sys/xen/xen_intr.h (props changed) projects/mips/sys/xen/xenbus/xenbus_probe.c projects/mips/tools/kerneldoc/subsys/Dependencies projects/mips/tools/kerneldoc/subsys/Doxyfile-cam projects/mips/tools/kerneldoc/subsys/Doxyfile-crypto projects/mips/tools/kerneldoc/subsys/Doxyfile-dev_pci projects/mips/tools/kerneldoc/subsys/Doxyfile-dev_sound projects/mips/tools/kerneldoc/subsys/Doxyfile-dev_usb projects/mips/tools/kerneldoc/subsys/Doxyfile-geom projects/mips/tools/kerneldoc/subsys/Doxyfile-kern projects/mips/tools/kerneldoc/subsys/Doxyfile-libkern projects/mips/tools/kerneldoc/subsys/Doxyfile-linux projects/mips/tools/kerneldoc/subsys/Doxyfile-net80211 projects/mips/tools/kerneldoc/subsys/Doxyfile-netgraph projects/mips/tools/kerneldoc/subsys/Doxyfile-netinet projects/mips/tools/kerneldoc/subsys/Doxyfile-netinet6 projects/mips/tools/kerneldoc/subsys/Doxyfile-netipsec projects/mips/tools/kerneldoc/subsys/Doxyfile-opencrypto projects/mips/tools/kerneldoc/subsys/Doxyfile-vm projects/mips/tools/kerneldoc/subsys/Makefile projects/mips/tools/kerneldoc/subsys/common-Doxyfile projects/mips/tools/regression/acltools/00.t projects/mips/tools/regression/acltools/tools-posix.test projects/mips/tools/regression/fstest/Makefile projects/mips/tools/regression/fstest/fstest.c projects/mips/tools/regression/lib/msun/test-conj.t (props changed) projects/mips/tools/regression/poll/Makefile projects/mips/tools/regression/priv/Makefile projects/mips/tools/regression/priv/main.c projects/mips/tools/regression/priv/priv_netinet_ipsec.c projects/mips/tools/regression/priv/priv_vfs_extattr_system.c projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) projects/mips/tools/tools/ath/athpoke/athpoke.c projects/mips/tools/tools/ath/common/dumpregs.h (props changed) projects/mips/tools/tools/ath/common/dumpregs_5210.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5211.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5212.c (props changed) projects/mips/tools/tools/ath/common/dumpregs_5416.c (props changed) projects/mips/tools/tools/vimage/Makefile projects/mips/tools/tools/vimage/vimage.8 projects/mips/tools/tools/vimage/vimage.c projects/mips/usr.bin/calendar/calendars/calendar.freebsd projects/mips/usr.bin/csup/ (props changed) projects/mips/usr.bin/ee/Makefile projects/mips/usr.bin/find/function.c projects/mips/usr.bin/fstat/fstat.c projects/mips/usr.bin/fstat/zfs.c projects/mips/usr.bin/look/look.c projects/mips/usr.bin/netstat/inet.c projects/mips/usr.bin/netstat/main.c projects/mips/usr.bin/netstat/netstat.h projects/mips/usr.bin/procstat/ (props changed) projects/mips/usr.bin/procstat/procstat.1 projects/mips/usr.bin/tar/Makefile projects/mips/usr.bin/unzip/unzip.1 projects/mips/usr.bin/unzip/unzip.c projects/mips/usr.bin/w/extern.h projects/mips/usr.bin/w/pr_time.c projects/mips/usr.bin/w/w.c projects/mips/usr.sbin/Makefile projects/mips/usr.sbin/acpi/acpidump/acpi.c projects/mips/usr.sbin/acpi/acpidump/acpi_user.c projects/mips/usr.sbin/acpi/acpidump/acpidump.c projects/mips/usr.sbin/acpi/acpidump/acpidump.h projects/mips/usr.sbin/arp/arp.c projects/mips/usr.sbin/diskinfo/diskinfo.c projects/mips/usr.sbin/dumpcis/cardinfo.h (props changed) projects/mips/usr.sbin/dumpcis/cis.h (props changed) projects/mips/usr.sbin/freebsd-update/freebsd-update.sh projects/mips/usr.sbin/iostat/iostat.c projects/mips/usr.sbin/jls/jls.c projects/mips/usr.sbin/kbdcontrol/kbdcontrol.c projects/mips/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) projects/mips/usr.sbin/makefs/ffs/ffs_subr.c (props changed) projects/mips/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) projects/mips/usr.sbin/makefs/getid.c (props changed) projects/mips/usr.sbin/ndp/ndp.c projects/mips/usr.sbin/ntp/scripts/mkver projects/mips/usr.sbin/pkg_install/add/main.c projects/mips/usr.sbin/pkg_install/lib/lib.h projects/mips/usr.sbin/ppp/ether.c projects/mips/usr.sbin/ppp/exec.c projects/mips/usr.sbin/ppp/exec.h projects/mips/usr.sbin/ppp/main.c projects/mips/usr.sbin/ppp/netgraph.c projects/mips/usr.sbin/ppp/physical.c projects/mips/usr.sbin/ppp/ppp.8.m4 projects/mips/usr.sbin/ppp/tty.c projects/mips/usr.sbin/pstat/pstat.c projects/mips/usr.sbin/sysinstall/devices.c projects/mips/usr.sbin/sysinstall/install.c projects/mips/usr.sbin/sysinstall/media.c projects/mips/usr.sbin/sysinstall/sysinstall.8 projects/mips/usr.sbin/traceroute6/Makefile projects/mips/usr.sbin/traceroute6/traceroute6.8 projects/mips/usr.sbin/traceroute6/traceroute6.c projects/mips/usr.sbin/wpa/wpa_cli/Makefile projects/mips/usr.sbin/zic/ (props changed) projects/mips/usr.sbin/zic/zic.c Modified: projects/mips/ObsoleteFiles.inc ============================================================================== --- projects/mips/ObsoleteFiles.inc Tue Sep 8 17:23:32 2009 (r196987) +++ projects/mips/ObsoleteFiles.inc Tue Sep 8 19:15:29 2009 (r196988) @@ -14,6 +14,15 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090904: remove lukemftpd +OLD_FILES+=usr/libexec/lukemftpd +OLD_FILES+=usr/share/man/man5/ftpd.conf.5.gz +OLD_FILES+=usr/share/man/man5/ftpusers.5.gz +OLD_FILES+=usr/share/man/man8/lukemftpd.8.gz +# 20090902: BSD.{x11,x11-4}.dist are dead and BSD.local.dist lives in ports/ +OLD_FILES+=etc/mtree/BSD.local.dist +OLD_FILES+=etc/mtree/BSD.x11.dist +OLD_FILES+=etc/mtree/BSD.x11-4.dist # 20090801: vimage.h removed in favour of vnet.h OLD_FILES+=usr/include/sys/vimage.h # 20090719: library version bump for 8.0 @@ -803,8 +812,6 @@ OLD_FILES+=rescue/bsdlabel OLD_FILES+=rescue/fdisk OLD_FILES+=rescue/gpt .endif -# 20071026: kthread(9)/kproc(9) API changes -OLD_FILES+=usr/share/man/man9/kthread_create.9.gz # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd Modified: projects/mips/UPDATING ============================================================================== --- projects/mips/UPDATING Tue Sep 8 17:23:32 2009 (r196987) +++ projects/mips/UPDATING Tue Sep 8 19:15:29 2009 (r196988) @@ -1,45 +1,60 @@ Updating Information for FreeBSD current users -This file is maintained and copyrighted by M. Warner Losh -. See end of file for further details. For commonly -done items, please see the COMMON ITEMS: section later in the file. +This file is maintained and copyrighted by M. Warner Losh . +See end of file for further details. For commonly done items, please see the +COMMON ITEMS: section later in the file. These instructions assume that you +basically know what you are doing. If not, then please consult the FreeBSD +handbook. Items affecting the ports and packages system can be found in -/usr/ports/UPDATING. Please read that file before running -portupgrade. +/usr/ports/UPDATING. Please read that file before running portupgrade. -NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.x IS SLOW: - FreeBSD 8.x has many debugging features turned on, in - both the kernel and userland. These features attempt to detect - incorrect use of system primitives, and encourage loud failure - through extra sanity checking and fail stop semantics. They - also substantially impact system performance. If you want to - do performance measurement, benchmarking, and optimization, - you'll want to turn them off. This includes various WITNESS- - related kernel options, INVARIANTS, malloc debugging flags - in userland, and various verbose features in the kernel. Many - developers choose to disable these features on build machines - to maximize performance. (To disable malloc debugging, run +NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.x IS SLOW: + FreeBSD 9.x has many debugging features turned on, in both the kernel + and userland. These features attempt to detect incorrect use of + system primitives, and encourage loud failure through extra sanity + checking and fail stop semantics. They also substantially impact + system performance. If you want to do performance measurement, + benchmarking, and optimization, you'll want to turn them off. This + includes various WITNESS- related kernel options, INVARIANTS, malloc + debugging flags in userland, and various verbose features in the + kernel. Many developers choose to disable these features on build + machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090825: + The old tunable hw.bus.devctl_disable has been superseded by + hw.bus.devctl_queue. hw.bus.devctl_disable=1 in loader.conf should be + replaced by hw.bus.devctl_queue=0. The default for this new tunable + is 1000. + +20090813: + Remove the option STOP_NMI. The default action is now to use NMI only + for KDB via the newly introduced function stop_cpus_hard() and + maintain stop_cpus() to just use a normal IPI_STOP on ia32 and amd64. + +20090803: + The stable/8 branch created in subversion. This corresponds to the + RELENG_8 branch in CVS. + 20090719: - Bump the shared library version numbers for all libraries that - do not use symbol versioning as part of the 8.0-RELEASE cycle. - Bump __FreeBSD_version to 800105. + Bump the shared library version numbers for all libraries that do not + use symbol versioning as part of the 8.0-RELEASE cycle. Bump + __FreeBSD_version to 800105. 20090714: - Due to changes in the implementation of virtual network stack - support, all network-related kernel modules must be recompiled. - As this change breaks the ABI, bump __FreeBSD_version to 800104. + Due to changes in the implementation of virtual network stack support, + all network-related kernel modules must be recompiled. As this change + breaks the ABI, bump __FreeBSD_version to 800104. 20090713: - The TOE interface to the TCP syncache has been modified to remove struct - tcpopt () from the ABI of the network stack. The - cxgb driver is the only TOE consumer affected by this change, and needs - to be recompiled along with the kernel. As this change breaks the ABI, - bump __FreeBSD_version to 800103. + The TOE interface to the TCP syncache has been modified to remove + struct tcpopt () from the ABI of the network stack. + The cxgb driver is the only TOE consumer affected by this change, and + needs to be recompiled along with the kernel. As this change breaks + the ABI, bump __FreeBSD_version to 800103. -20090712: +20090712: Padding has been added to struct tcpcb, sackhint and tcpstat in to facilitate future MFCs and bug fixes whilst maintainig the ABI. However, this change breaks the ABI, so bump @@ -47,79 +62,75 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. any of these structs (e.g. sockstat) need to be recompiled. 20090630: - The NFS_LEGACYRPC option has been removed along with the old - kernel RPC implementation that this option selected. Kernel - configurations may need to be adjusted. + The NFS_LEGACYRPC option has been removed along with the old kernel + RPC implementation that this option selected. Kernel configurations + may need to be adjusted. 20090629: - The network interface device nodes at /dev/net/ have - been removed. All ioctl operations can be performed the normal - way using routing sockets. The kqueue functionality can - generally be replaced with routing sockets. + The network interface device nodes at /dev/net/ have been + removed. All ioctl operations can be performed the normal way using + routing sockets. The kqueue functionality can generally be replaced + with routing sockets. 20090628: - The documentation from the FreeBSD Documentation Project - (Handbook, FAQ, etc.) is now installed via packages by - sysinstall(8) and under the /usr/local/share/doc/freebsd - directory instead of /usr/share/doc. + The documentation from the FreeBSD Documentation Project (Handbook, + FAQ, etc.) is now installed via packages by sysinstall(8) and under + the /usr/local/share/doc/freebsd directory instead of /usr/share/doc. 20090624: - The ABI of various structures related to the SYSV IPC API have - been changed. As a result, the COMPAT_FREEBSD[456] and COMPAT_43 - kernel options now all require COMPAT_FREEBSD7. - Bump __FreeBSD_version to 800100. + The ABI of various structures related to the SYSV IPC API have been + changed. As a result, the COMPAT_FREEBSD[456] and COMPAT_43 kernel + options now all require COMPAT_FREEBSD7. Bump __FreeBSD_version to + 800100. 20090622: - Layout of struct vnet has changed as routing related variables - were moved to their own Vimage module. Modules need to be - recompiled. Bump __FreeBSD_version to 800099. + Layout of struct vnet has changed as routing related variables were + moved to their own Vimage module. Modules need to be recompiled. Bump + __FreeBSD_version to 800099. 20090619: - NGROUPS_MAX and NGROUPS have been increased from 16 to 1023 - and 1024 respectively. As long as no more than 16 groups per - process are used, no changes should be visible. When more - than 16 groups are used, old binaries may fail if they call - getgroups() or getgrouplist() with statically sized storage. - Recompiling will work around this, but applications should be - modified to use dynamically allocated storage for group arrays - as POSIX.1-2008 does not cap an implementation's number of - supported groups at NGROUPS_MAX+1 as previous versions did. - - NFS and portalfs mounts may also be affected as the list of - groups is truncated to 16. Users of NFS who use more than 16 - groups, should take care that negative group permissions are not - used on the exported file systems as they will not be reliable - unless a GSSAPI based authentication method is used. - -20090616: - The compiling option ADAPTIVE_LOCKMGRS has been introduced. - This option compiles in the support for adaptive spinning for lockmgrs - which want to enable it. The lockinit() function now accepts the - flag LK_ADAPTIVE in order to make the lock object subject to - adaptive spinning when both held in write and read mode. + NGROUPS_MAX and NGROUPS have been increased from 16 to 1023 and 1024 + respectively. As long as no more than 16 groups per process are used, + no changes should be visible. When more than 16 groups are used, old + binaries may fail if they call getgroups() or getgrouplist() with + statically sized storage. Recompiling will work around this, but + applications should be modified to use dynamically allocated storage + for group arrays as POSIX.1-2008 does not cap an implementation's + number of supported groups at NGROUPS_MAX+1 as previous versions did. + + NFS and portalfs mounts may also be affected as the list of groups is + truncated to 16. Users of NFS who use more than 16 groups, should + take care that negative group permissions are not used on the exported + file systems as they will not be reliable unless a GSSAPI based + authentication method is used. + +20090616: + The compiling option ADAPTIVE_LOCKMGRS has been introduced. This + option compiles in the support for adaptive spinning for lockmgrs + which want to enable it. The lockinit() function now accepts the flag + LK_ADAPTIVE in order to make the lock object subject to adaptive + spinning when both held in write and read mode. 20090613: - The layout of the structure returned by IEEE80211_IOC_STA_INFO - has changed. User applications that use this ioctl need to be - rebuilt. + The layout of the structure returned by IEEE80211_IOC_STA_INFO has + changed. User applications that use this ioctl need to be rebuilt. 20090611: - The layout of struct thread has changed. Kernel and modules - need to be rebuilt. + The layout of struct thread has changed. Kernel and modules need to + be rebuilt. 20090608: - The layout of structs ifnet, domain, protosw and vnet_net has - changed. Kernel modules need to be rebuilt. - Bump __FreeBSD_version to 800097. + The layout of structs ifnet, domain, protosw and vnet_net has changed. + Kernel modules need to be rebuilt. Bump __FreeBSD_version to 800097. 20090602: window(1) has been removed from the base system. It can now be installed from ports. The port is called misc/window. 20090601: - The way we are storing and accessing `routing table' entries - has changed. Programs reading the FIB, like netstat, need to - be re-compiled. + The way we are storing and accessing `routing table' entries has + changed. Programs reading the FIB, like netstat, need to be + re-compiled. 20090601: A new netisr implementation has been added for FreeBSD 8. Network @@ -128,24 +139,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. Bump __FreeBSD_version to 800096. 20090530: - Remove the tunable/sysctl debug.mpsafevfs as its initial purpose - is no more valid. + Remove the tunable/sysctl debug.mpsafevfs as its initial purpose is no + more valid. 20090530: Add VOP_ACCESSX(9). File system modules need to be rebuilt. Bump __FreeBSD_version to 800094. 20090529: - Add mnt_xflag field to 'struct mount'. File system modules - need to be rebuilt. + Add mnt_xflag field to 'struct mount'. File system modules need to be + rebuilt. Bump __FreeBSD_version to 800093. 20090528: The compiling option ADAPTIVE_SX has been retired while it has been introduced the option NO_ADAPTIVE_SX which handles the reversed logic. The KPI for sx_init_flags() changes as accepting flags: - SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag - has been introduced in order to handle the reversed logic. + SX_ADAPTIVESPIN flag has been retired while the SX_NOADAPTIVE flag has + been introduced in order to handle the reversed logic. Bump __FreeBSD_version to 800092. 20090527: @@ -158,20 +169,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. Bump __FreeBSD_version to 800090. 20090523: - The newly imported zic(8) produces a new format in the - output. Please run tzsetup(8) to install the newly created - data to /etc/localtime. + The newly imported zic(8) produces a new format in the output. Please + run tzsetup(8) to install the newly created data to /etc/localtime. 20090520: The sysctl tree for the usb stack has renamed from hw.usb2.* to hw.usb.* and is now consistent again with previous releases. 20090520: - 802.11 monitor mode support was revised and driver api's - were changed. Drivers dependent on net80211 now support - DLT_IEEE802_11_RADIO instead of DLT_IEEE802_11. No - user-visible data structures were changed but applications - that use DLT_IEEE802_11 may require changes. + 802.11 monitor mode support was revised and driver api's were changed. + Drivers dependent on net80211 now support DLT_IEEE802_11_RADIO instead + of DLT_IEEE802_11. No user-visible data structures were changed but + applications that use DLT_IEEE802_11 may require changes. Bump __FreeBSD_version to 800088. 20090430: @@ -762,730 +771,29 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8. 20071010: RELENG_7 branched. -20071009: - Setting WITHOUT_LIBPTHREAD now means WITHOUT_LIBKSE and - WITHOUT_LIBTHR are set. - -20070930: - The PCI code has been made aware of PCI domains. This means that - the location strings as used by pciconf(8) etc are now in the - following format: pci::[:]. It - also means that consumers of potentially need to - be recompiled; this includes the hal and xorg-server ports. - -20070928: - The caching daemon (cached) was renamed to nscd. nscd.conf - configuration file should be used instead of cached.conf and - nscd_enable, nscd_pidfile and nscd_flags options should be used - instead of cached_enable, cached_pidfile and cached_flags in - rc.conf. - -20070921: - The getfacl(1) utility now prints owning user and group name - instead of owning uid and gid in the three line comment header. - This is the same behavior as getfacl(1) on Solaris and Linux. - -20070704: - The new IPsec code is now compiled in using the IPSEC option. The - IPSEC option now requires "device crypto" be defined in your kernel - configuration. The FAST_IPSEC kernel option is now deprecated. - -20070702: - The packet filter (pf) code has been updated to OpenBSD 4.1 Please - note the changed syntax - keep state is now on by default. Also - note the fact that ftp-proxy(8) has been changed from bottom up and - has been moved from libexec to usr/sbin. Changes in the ALTQ - handling also affect users of IPFW's ALTQ capabilities. - -20070701: - Remove KAME IPsec in favor of FAST_IPSEC, which is now the - only IPsec supported by FreeBSD. The new IPsec stack - supports both IPv4 and IPv6. The kernel option will change - after the code changes have settled in. For now the kernel - option IPSEC is deprecated and FAST_IPSEC is the only option, that - will change after some settling time. - -20070701: - The wicontrol(8) utility has been removed from the base system. wi(4) - cards should be configured using ifconfig(8), see the man page for more - information. - -20070612: - The i386/amd64 GENERIC kernel now defaults to the nfe(4) driver - instead of the nve(4) driver. Please update your configuration - accordingly. - -20070612: - By default, /etc/rc.d/sendmail no longer rebuilds the aliases - database if it is missing or older than the aliases file. If - desired, set the new rc.conf option sendmail_rebuild_aliases - to "YES" to restore that functionality. - -20070612: - The IPv4 multicast socket code has been considerably modified, and - moved to the file sys/netinet/in_mcast.c. Initial support for the - RFC 3678 Source-Specific Multicast Socket API has been added to - the IPv4 network stack. - - Strict multicast and broadcast reception is now the default for - UDP/IPv4 sockets; the net.inet.udp.strict_mcast_mship sysctl variable - has now been removed. - - The RFC 1724 hack for interface selection has been removed; the use - of the Linux-derived ip_mreqn structure with IP_MULTICAST_IF has - been added to replace it. Consumers such as routed will soon be - updated to reflect this. - - These changes affect users who are running routed(8) or rdisc(8) - from the FreeBSD base system on point-to-point or unnumbered - interfaces. - -20070610: - The net80211 layer has changed significantly and all wireless - drivers that depend on it need to be recompiled. Further these - changes require that any program that interacts with the wireless - support in the kernel be recompiled; this includes: ifconfig, - wpa_supplicant, hostapd, and wlanstats. Users must also, for - the moment, kldload the wlan_scan_sta and/or wlan_scan_ap modules - if they use modules for wireless support. These modules implement - scanning support for station and ap modes, respectively. Failure - to load the appropriate module before marking a wireless interface - up will result in a message to the console and the device not - operating properly. - -20070610: - The pam_nologin(8) module ceases to provide an authentication - function and starts providing an account management function. - Consequent changes to /etc/pam.d should be brought in using - mergemaster(8). Third-party files in /usr/local/etc/pam.d may - need manual editing as follows. Locate this line (or similar): - - auth required pam_nologin.so no_warn - - and change it according to this example: - - account required pam_nologin.so no_warn - - That is, the first word needs to be changed from "auth" to - "account". The new line can be moved to the account section - within the file for clarity. Not updating pam.conf(5) files - will result in nologin(5) ignored by the respective services. - -20070529: - The ether_ioctl() function has been synchronized with ioctl(2) - and ifnet.if_ioctl. Due to that, the size of one of its arguments - has changed on 64-bit architectures. All kernel modules using - ether_ioctl() need to be rebuilt on such architectures. - -20070516: - Improved INCLUDE_CONFIG_FILE support has been introduced to the - config(8) utility. In order to take advantage of this new - functionality, you are expected to recompile and install - src/usr.sbin/config. If you don't rebuild config(8), and your - kernel configuration depends on INCLUDE_CONFIG_FILE, the kernel - build will be broken because of a missing "kernconfstring" - symbol. - -20070513: - Symbol versioning is enabled by default. To disable it, use - option WITHOUT_SYMVER. It is not advisable to attempt to - disable symbol versioning once it is enabled; your installworld - will break because a symbol version-less libc will get installed - before the install tools. As a result, the old install tools, - which previously had symbol dependencies to FBSD_1.0, will fail - because the freshly installed libc will not have them. - - The default threading library (providing "libpthread") has been - changed to libthr. If you wish to have libkse as your default, - use option DEFAULT_THREAD_LIB=libkse for the buildworld. - -20070423: - The ABI breakage in sendmail(8)'s libmilter has been repaired - so it is no longer necessary to recompile mail filters (aka, - milters). If you recompiled mail filters after the 20070408 - note, it is not necessary to recompile them again. - -20070417: - The new trunk(4) driver has been renamed to lagg(4) as it better - reflects its purpose. ifconfig will need to be recompiled. - -20070408: - sendmail(8) has been updated to version 8.14.1. Mail filters - (aka, milters) compiled against the libmilter included in the - base operating system should be recompiled. - -20070302: - Firmwares for ipw(4) and iwi(4) are now included in the base tree. - In order to use them one must agree to the respective LICENSE in - share/doc/legal and define legal.intel_.license_ack=1 via - loader.conf(5) or kenv(1). Make sure to deinstall the now - deprecated modules from the respective firmware ports. - -20070228: - The name resolution/mapping functions addr2ascii(3) and ascii2addr(3) - were removed from FreeBSD's libc. These originally came from INRIA - IPv6. Nothing in FreeBSD ever used them. They may be regarded as - deprecated in previous releases. - The AF_LINK support for getnameinfo(3) was merged from NetBSD to - replace it as a more portable (and re-entrant) API. - -20070224: - To support interrupt filtering a modification to the newbus API - has occurred, ABI was broken and __FreeBSD_version was bumped - to 700031. Please make sure that your kernel and modules are in - sync. For more info: - http://docs.freebsd.org/cgi/mid.cgi?20070221233124.GA13941 - -20070224: - The IPv6 multicast forwarding code may now be loaded into GENERIC - kernels by loading the ip_mroute.ko module. This is built into the - module unless WITHOUT_INET6 or WITHOUT_INET6_SUPPORT options are - set; see src.conf(5) for more information. - -20070214: - The output of netstat -r has changed. Without -n, we now only - print a "network name" without the prefix length if the network - address and mask exactly match a Class A/B/C network, and an entry - exists in the nsswitch "networks" map. - With -n, we print the full unabbreviated CIDR network prefix in - the form "a.b.c.d/p". 0.0.0.0/0 is always printed as "default". - This change is in preparation for changes such as equal-cost - multipath, and to more generally assist operational deployment - of FreeBSD as a modern IPv4 router. - -20070210: - PIM has been turned on by default in the IPv4 multicast - routing code. The kernel option 'PIM' has now been removed. - PIM is now built by default if option 'MROUTING' is specified. - It may now be loaded into GENERIC kernels by loading the - ip_mroute.ko module. - -20070207: - Support for IPIP tunnels (VIFF_TUNNEL) in IPv4 multicast routing - has been removed. Its functionality may be achieved by explicitly - configuring gif(4) interfaces and using the 'phyint' keyword in - mrouted.conf. - XORP does not support source-routed IPv4 multicast tunnels nor the - integrated IPIP tunneling, therefore it is not affected by this - change. The __FreeBSD_version macro has been bumped to 700030. - -20061221: - Support for PCI Message Signalled Interrupts has been - re-enabled in the bge driver, only for those chips which are - believed to support it properly. If there are any problems, - MSI can be disabled completely by setting the - 'hw.pci.enable_msi' and 'hw.pci.enable_msix' tunables to 0 - in the loader. - -20061214: - Support for PCI Message Signalled Interrupts has been - disabled again in the bge driver. Many revisions of the - hardware fail to support it properly. Support can be - re-enabled by removing the #define of BGE_DISABLE_MSI in - "src/sys/dev/bge/if_bge.c". - -20061214: - Support for PCI Message Signalled Interrupts has been added - to the bge driver. If there are any problems, MSI can be - disabled completely by setting the 'hw.pci.enable_msi' and - 'hw.pci.enable_msix' tunables to 0 in the loader. - -20061205: - The removal of several facets of the experimental Threading - system from the kernel means that the proc and thread structures - have changed quite a bit. I suggest all kernel modules that might - reference these structures be recompiled.. Especially the - linux module. - -20061126: - Sound infrastructure has been updated with various fixes and - improvements. Most of the changes are pretty much transparent, - with exceptions of followings: - 1) All sound driver specific sysctls (hw.snd.pcm%d.*) have been - moved to their own dev sysctl nodes, for example: - hw.snd.pcm0.vchans -> dev.pcm.0.vchans - 2) /dev/dspr%d.%d has been deprecated. Each channel now has its - own chardev in the form of "dsp%d.%d", where - is p = playback, r = record and v = virtual, respectively. Users - are encouraged to use these devs instead of (old) "/dev/dsp%d.%d". - This does not affect those who are using "/dev/dsp". - -20061122: - geom(4)'s gmirror(8) class metadata structure has been - rev'd from v3 to v4. If you update across this point and - your metadata is converted for you, you will not be easily - able to downgrade since the /boot/kernel.old/geom_mirror.ko - kernel module will be unable to read the v4 metadata. You - can resolve this by doing from the loader(8) prompt: - - set vfs.root.mountfrom="ufs:/dev/XXX" - - where XXX is the root slice of one of the disks that composed - the mirror (i.e.: /dev/ad0s1a). You can then rebuild - the array the same way you built it originally. - -20061122: - The following binaries have been disconnected from the build: - mount_devfs, mount_ext2fs, mount_fdescfs, mount_procfs, mount_linprocfs, - and mount_std. The functionality of these programs has been - moved into the mount program. For example, to mount a devfs - filesystem, instead of using mount_devfs, use: "mount -t devfs". - This does not affect entries in /etc/fstab, since entries in - /etc/fstab are always processed with "mount -t fstype". - -20061113: - Support for PCI Message Signalled Interrupts on i386 and amd64 - has been added to the kernel and various drivers will soon be - updated to use MSI when it is available. If there are any problems, - MSI can be disabled completely by setting the 'hw.pci.enable_msi' - and 'hw.pci.enable_msix' tunables to 0 in the loader. - -20061110: - The MUTEX_PROFILING option has been renamed to LOCK_PROFILING. - The lockmgr object layout has been changed as a result of having - a lock_object embedded in it. As a consequence all file system - kernel modules must be re-compiled. The mutex profiling man page - has not yet been updated to reflect this change. - -20061026: - KSE in the kernel has now been made optional and turned on by - default. Use 'nooption KSE' in your kernel config to turn it - off. All kernel modules *must* be recompiled after this change. - There-after, modules from a KSE kernel should be compatible with - modules from a NOKSE kernel due to the temporary padding fields - added to 'struct proc'. - -20060929: - mrouted and its utilities have been removed from the base system. - -20060927: - Some ioctl(2) command codes have changed. Full backward ABI - compatibility is provided if the "options COMPAT_FREEBSD6" is - present in the kernel configuration file. Make sure to add - this option to your kernel config file, or recompile X.Org - and the rest of ports; otherwise they may refuse to work. - -20060924: - tcpslice has been removed from the base system. - -20060913: - The sizes of struct tcpcb (and struct xtcpcb) have changed due to - the rewrite of TCP syncookies. Tools like netstat, sockstat, and - systat needs to be rebuilt. - -20060903: - libpcap updated to v0.9.4 and tcpdump to v3.9.4 - -20060816: - The IPFIREWALL_FORWARD_EXTENDED option is gone and the behaviour - for IPFIREWALL_FORWARD is now as it was before when it was first - committed and for years after. The behaviour is now ON. - -20060725: - enigma(1)/crypt(1) utility has been changed on 64 bit architectures. - Now it can decrypt files created from different architectures. - Unfortunately, it is no longer able to decrypt a cipher text - generated with an older version on 64 bit architectures. - If you have such a file, you need old utility to decrypt it. - -20060709: - The interface version of the i4b kernel part has changed. So - after updating the kernel sources and compiling a new kernel, - the i4b user space tools in "/usr/src/usr.sbin/i4b" must also - be rebuilt, and vice versa. - -20060627: - The XBOX kernel now defaults to the nfe(4) driver instead of - the nve(4) driver. Please update your configuration - accordingly. - -20060514: - The i386-only lnc(4) driver for the AMD Am7900 LANCE and Am79C9xx - PCnet family of NICs has been removed. The new le(4) driver serves - as an equivalent but cross-platform replacement with the pcn(4) - driver still providing performance-optimized support for the subset - of AMD Am79C971 PCnet-FAST and greater chips as before. - -20060511: - The machdep.* sysctls and the adjkerntz utility have been - modified a bit. The new adjkerntz utility uses the new - sysctl names and sysctlbyname() calls, so it may be impossible - to run an old /sbin/adjkerntz utility in single-user mode - with a new kernel. Replace the `adjkerntz -i' step before - `make installworld' with: - - /usr/obj/usr/src/sbin/adjkerntz/adjkerntz -i - - and proceed as usual with the rest of the installworld-stage - steps. Otherwise, you risk installing binaries with their - timestamp set several hours in the future, especially if - you are running with local time set to GMT+X hours. - -20060412: - The ip6fw utility has been removed. The behavior provided by - ip6fw has been in ipfw2 for a good while and the rc.d scripts - have been updated to deal with it. There are some rules that - might not migrate cleanly. Use rc.firewall6 as a template to - rewrite rules. - -20060428: - The puc(4) driver has been overhauled. The ebus(4) and sbus(4) - attachments have been removed. Make sure to configure scc(4) - on sparc64. Note also that by default puc(4) will use uart(4) - and not sio(4) for serial ports because interrupt handling has - been optimized for multi-port serial cards and only uart(4) - implements the interface to support it. - -20060330: - The scc(4) driver replaces puc(4) for Serial Communications - Controllers (SCCs) like the Siemens SAB82532 and the Zilog - Z8530. On sparc64, it is advised to add scc(4) to the kernel - configuration to make sure that the serial ports remain - functional. - -20060317: - Most world/kernel related NO_* build options changed names. - New knobs have common prefixes WITHOUT_*/WITH_* (modelled - after FreeBSD ports) and should be set in /etc/src.conf - (the src.conf(5) manpage is provided). Full backwards - compatibility is maintained for the time being though it's - highly recommended to start moving old options out of the - system-wide /etc/make.conf file into the new /etc/src.conf - while also properly renaming them. More conversions will - likely follow. Posting to current@: - - http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html - -20060305: - The NETSMBCRYPTO kernel option has been retired because its - functionality is always included in NETSMB and smbfs.ko now. - -20060303: - The TDFX_LINUX kernel option was retired and replaced by the - tdfx_linux device. The latter can be loaded as the 3dfx_linux.ko - kernel module. Loading it alone should suffice to get 3dfx support - for Linux apps because it will pull in 3dfx.ko and linux.ko through - its dependencies. - -20060204: - The 'audit' group was added to support the new auditing functionality - in the base system. Be sure to follow the directions for updating, - including the requirement to run mergemaster -p. - -20060201: - The kernel ABI to file system modules was changed on i386. - Please make sure that your kernel and modules are in sync. - -20060118: - This actually occured some time ago, but installing the kernel - now also installs a bunch of symbol files for the kernel modules. - This increases the size of /boot/kernel to about 67Mbytes. You - will need twice this if you will eventually back this up to kernel.old - on your next install. - If you have a shortage of room in your root partition, you should add - -DINSTALL_NODEBUG to your make arguments or add INSTALL_NODEBUG="yes" - to your /etc/make.conf. - -20060113: - libc's malloc implementation has been replaced. This change has the - potential to uncover application bugs that previously went unnoticed. - See the malloc(3) manual page for more details. - -20060112: - The generic netgraph(4) cookie has been changed. If you upgrade - kernel passing this point, you also need to upgrade userland - and netgraph(4) utilities like ports/net/mpd or ports/net/mpd4. - -20060106: - si(4)'s device files now contain the unit number. - Uses of {cua,tty}A[0-9a-f] should be replaced by {cua,tty}A0[0-9a-f]. - -20060106: - The kernel ABI was mostly destroyed due to a change in the size - of struct lock_object which is nested in other structures such - as mutexes which are nested in all sorts of other structures. - Make sure your kernel and modules are in sync. - -20051231: - The page coloring algorithm in the VM subsystem was converted - from tuning with kernel options to autotuning. Please remove - any PQ_* option except PQ_NOOPT from your kernel config. - -20051211: - The net80211-related tools in the tools/tools/ath directory - have been moved to tools/tools/net80211 and renamed with a - "wlan" prefix. Scripts that use them should be adjusted - accordingly. - -20051202: - Scripts in the local_startup directories (as defined in - /etc/defaults/rc.conf) that have the new rc.d semantics will - now be run as part of the base system rcorder. If there are - errors or problems with one of these local scripts, it could - cause boot problems. If you encounter such problems, boot in - single user mode, remove that script from the */rc.d directory. - Please report the problem to the port's maintainer, and the - freebsd-ports@freebsd.org mailing list. - -20051129: - The nodev mount option was deprecated in RELENG_6 (where it - was a no-op), and is now unsupported. If you have nodev or dev listed - in /etc/fstab, remove it, otherwise it will result in a mount error. - -20051129: - ABI between ipfw(4) and ipfw(8) has been changed. You need - to rebuild ipfw(8) when rebuilding kernel. - -20051108: - rp(4)'s device files now contain the unit number. - Uses of {cua,tty}R[0-9a-f] should be replaced by {cua,tty}R0[0-9a-f]. - -20051029: - /etc/rc.d/ppp-user has been renamed to /etc/rc.d/ppp. - Its /etc/rc.conf.d configuration file has been `ppp' from - the beginning, and hence there is no need to touch it. - -20051014: - Now most modules get their build-time options from the kernel - configuration file. A few modules still have fixed options - due to their non-conformant implementation, but they will be - corrected eventually. You may need to review the options of - the modules in use, explicitly specify the non-default options - in the kernel configuration file, and rebuild the kernel and - modules afterwards. - -20051001: - kern.polling.enable sysctl MIB is now deprecated. Use ifconfig(8) - to turn polling(4) on your interfaces. - -20050927: - The old bridge(4) implementation was retired. The new - if_bridge(4) serves as a full functional replacement. - -20050722: - The ai_addrlen of a struct addrinfo was changed to a socklen_t - to conform to POSIX-2001. This change broke an ABI - compatibility on 64 bit architecture. You have to recompile - userland programs that use getaddrinfo(3) on 64 bit - architecture. - -20050711: - RELENG_6 branched here. - -20050629: - The pccard_ifconfig rc.conf variable has been removed and a new - variable, ifconfig_DEFAULT has been introduced. Unlike - pccard_ifconfig, ifconfig_DEFAULT applies to ALL interfaces that - do not have ifconfig_ifn entries rather than just those in - removable_interfaces. - -20050616: - Some previous versions of PAM have permitted the use of - non-absolute paths in /etc/pam.conf or /etc/pam.d/* when referring - to third party PAM modules in /usr/local/lib. A change has been - made to require the use of absolute paths in order to avoid - ambiguity and dependence on library path configuration, which may - affect existing configurations. - -20050610: - Major changes to network interface API. All drivers must be - recompiled. Drivers not in the base system will need to be - updated to the new APIs. - -20050609: - Changes were made to kinfo_proc in sys/user.h. Please recompile - userland, or commands like `fstat', `pkill', `ps', `top' and `w' - will not behave correctly. - - The API and ABI for hwpmc(4) have changed with the addition - of sampling support. Please recompile lib/libpmc(3) and - usr.sbin/{pmcstat,pmccontrol}. - -20050606: - The OpenBSD dhclient was imported in place of the ISC dhclient - and the network interface configuration scripts were updated - accordingly. If you use DHCP to configure your interfaces, you - must now run devd. Also, DNS updating was lost so you will need - to find a workaround if you use this feature. - - The '_dhcp' user was added to support the OpenBSD dhclient. Be - sure to run mergemaster -p (like you are supposed to do every time - anyway). - -20050605: - if_bridge was added to the tree. This has changed struct ifnet. - Please recompile userland and all network related modules. - -20050603: - The n_net of a struct netent was changed to an uint32_t, and - 1st argument of getnetbyaddr() was changed to an uint32_t, to - conform to POSIX-2001. These changes broke an ABI - compatibility on 64 bit architecture. With these changes, - shlib major of libpcap was bumped. You have to recompile - userland programs that use getnetbyaddr(3), getnetbyname(3), - getnetent(3) and/or libpcap on 64 bit architecture. - -20050528: - Kernel parsing of extra options on '#!' first lines of shell - scripts has changed. Lines with multiple options likely will - fail after this date. For full details, please see - http://people.freebsd.org/~gad/Updating-20050528.txt - -20050503: - The packet filter (pf) code has been updated to OpenBSD 3.7 - Please note the changed anchor syntax and the fact that - authpf(8) now needs a mounted fdescfs(5) to function. - -20050415: - The NO_MIXED_MODE kernel option has been removed from the i386 - amd64 platforms as its use has been superceded by the new local - APIC timer code. Any kernel config files containing this option - should be updated. - -20050227: - The on-disk format of LC_CTYPE files was changed to be machine - independent. Please make sure NOT to use NO_CLEAN buildworld - when crossing this point. Crossing this point also requires - recompile or reinstall of all locale depended packages. - -20050225: - The ifi_epoch member of struct if_data has been changed to - contain the uptime at which the interface was created or the - statistics zeroed rather then the wall clock time because - wallclock time may go backwards. This should have no impact - unless an snmp implementation is using this value (I know of - none at this point.) - -20050224: - The acpi_perf and acpi_throttle drivers are now part of the - acpi(4) main module. They are no longer built separately. - -20050223: - The layout of struct image_params has changed. You have to - recompile all compatibility modules (linux, svr4, etc) for use - with the new kernel. - -20050223: - The p4tcc driver has been merged into cpufreq(4). This makes - "options CPU_ENABLE_TCC" obsolete. Please load cpufreq.ko or - compile in "device cpufreq" to restore this functionality. - -20050220: - The responsibility of recomputing the file system summary of - a SoftUpdates-enabled dirty volume has been transferred to the - background fsck. A rebuild of fsck(8) utility is recommended - if you have updated the kernel. - - To get the old behavior (recompute file system summary at mount - time), you can set vfs.ffs.compute_summary_at_mount=1 before - mounting the new volume. - -20050206: - The cpufreq import is complete. As part of this, the sysctls for - acpi(4) throttling have been removed. The power_profile script - has been updated, so you can use performance/economy_cpu_freq in - rc.conf(5) to set AC on/offline cpu frequencies. - -20050206: - NG_VERSION has been increased. Recompiling kernel (or ng_socket.ko) - requires recompiling libnetgraph and userland netgraph utilities. - -20050114: - Support for abbreviated forms of a number of ipfw options is - now deprecated. Warnings are printed to stderr indicating the - correct full form when a match occurs. Some abbreviations may - be supported at a later date based on user feedback. To be - considered for support, abbreviations must be in use prior to - this commit and unlikely to be confused with current key words. - -20041221: - By a popular demand, a lot of NOFOO options were renamed - to NO_FOO (see bsd.compat.mk for a full list). The old - spellings are still supported, but will cause annoying - warnings on stderr. Make sure you upgrade properly (see - the COMMON ITEMS: section later in this file). - -20041219: - Auto-loading of ancillary wlan modules such as wlan_wep has - been temporarily disabled; you need to statically configure - the modules you need into your kernel or explicitly load them - prior to use. Specifically, if you intend to use WEP encryption - with an 802.11 device load/configure wlan_wep; if you want to - use WPA with the ath driver load/configure wlan_tkip, wlan_ccmp, - and wlan_xauth as required. - -20041213: - The behaviour of ppp(8) has changed slightly. If lqr is enabled - (``enable lqr''), older versions would revert to LCP ECHO mode on - negotiation failure. Now, ``enable echo'' is required for this - behaviour. The ppp version number has been bumped to 3.4.2 to - reflect the change. - -20041201: - The wlan support has been updated to split the crypto support - into separate modules. For static WEP you must configure the - wlan_wep module in your system or build and install the module - in place where it can be loaded (the kernel will auto-load - the module when a wep key is configured). - -20041201: - The ath driver has been updated to split the tx rate control - algorithm into a separate module. You need to include either - ath_rate_onoe or ath_rate_amrr when configuring the kernel. - -20041116: - Support for systems with an 80386 CPU has been removed. Please - use FreeBSD 5.x or earlier on systems with an 80386. - -20041110: - We have had a hack which would mount the root filesystem - R/W if the device were named 'md*'. As part of the vnode - work I'm doing I have had to remove this hack. People - building systems which use preloaded MD root filesystems - may need to insert a "/sbin/mount -u -o rw /dev/md0 /" in - their /etc/rc scripts. - -20041104: - FreeBSD 5.3 shipped here. - -20041102: - The size of struct tcpcb has changed again due to the removal - of RFC1644 T/TCP. You have to recompile userland programs that - read kmem for tcp sockets directly (netstat, sockstat, etc.) - -20041022: *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 00:46:11 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52E4F106566B; Wed, 9 Sep 2009 00:46:11 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 43D198FC0A; Wed, 9 Sep 2009 00:46:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n890kBgS066923; Wed, 9 Sep 2009 00:46:11 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n890kBkC066921; Wed, 9 Sep 2009 00:46:11 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090046.n890kBkC066921@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 00:46:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197003 - projects/mips/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 00:46:11 -0000 Author: imp Date: Wed Sep 9 00:46:11 2009 New Revision: 197003 URL: http://svn.freebsd.org/changeset/base/197003 Log: Put back KERNLOADADDR. Modified: projects/mips/sys/conf/ldscript.mips.mips64 Modified: projects/mips/sys/conf/ldscript.mips.mips64 ============================================================================== --- projects/mips/sys/conf/ldscript.mips.mips64 Wed Sep 9 00:16:49 2009 (r197002) +++ projects/mips/sys/conf/ldscript.mips.mips64 Wed Sep 9 00:46:11 2009 (r197003) @@ -43,7 +43,7 @@ PROVIDE (_DYNAMIC = 0); SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0x80100000 + SIZEOF_HEADERS; + . = KERNLOADADDR + SIZEOF_HEADERS; .interp : { *(.interp) } .hash : { *(.hash) } .dynsym : { *(.dynsym) } From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 00:47:13 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 622C9106566C; Wed, 9 Sep 2009 00:47:13 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 38D5F8FC08; Wed, 9 Sep 2009 00:47:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n890lDXf066985; Wed, 9 Sep 2009 00:47:13 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n890lDVR066983; Wed, 9 Sep 2009 00:47:13 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090047.n890lDVR066983@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 00:47:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197004 - projects/mips/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 00:47:13 -0000 Author: imp Date: Wed Sep 9 00:47:12 2009 New Revision: 197004 URL: http://svn.freebsd.org/changeset/base/197004 Log: Use ${LDSCRIPT_NAME} in preference to ldscript.$M. Modified: projects/mips/sys/conf/Makefile.mips Modified: projects/mips/sys/conf/Makefile.mips ============================================================================== --- projects/mips/sys/conf/Makefile.mips Wed Sep 9 00:46:11 2009 (r197003) +++ projects/mips/sys/conf/Makefile.mips Wed Sep 9 00:47:12 2009 (r197004) @@ -28,8 +28,9 @@ S= ../../.. .endif .include "$S/conf/kern.pre.mk" -SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M} -SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M} +LDSCRIPT_NAME?=ldscript.$M +SYSTEM_LD:= ${SYSTEM_LD:$S/conf/${LDSCRIPT_NAME}=${LDSCRIPT_NAME}} +SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/${LDSCRIPT_NAME}=${LDSCRIPT_NAME}} # XXX: Such sweeping assumptions... MACHINE=mips @@ -84,8 +85,8 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/ $S/$M/$M/inckern.S ${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \ -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp - sed s/${KERNLOADADDR}/${TRAMPLOADADDR}/ ldscript.$M | \ - sed s/" + SIZEOF_HEADERS"// > ldscript.$M.tramp.noheader + sed s/${KERNLOADADDR}/${TRAMPLOADADDR}/ ${LDSCRIPT_NAME} | \ + sed s/" + SIZEOF_HEADERS"// > ${LDSCRIPT_NAME}.tramp.noheader # Generate .S file that setups stack and jumps to trampoline echo "#include " >tmphack.S echo "ENTRY(_start)" >>tmphack.S @@ -98,7 +99,7 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/ echo "END(_start)" >>tmphack.S echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h ${CC} -O -nostdlib -I. -I$S ${EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \ - -T -Xlinker ldscript.$M.tramp.noheader tmphack.S \ + -T -Xlinker ${LDSCRIPT_NAME}.tramp.noheader tmphack.S \ $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ -o ${KERNEL_KO}.tramp.noheader ${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \ @@ -116,12 +117,12 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/ %CLEAN -CLEAN+= ldscript.$M ldscript.$M.tramp.noheader \ +CLEAN+= ${LDSCRIPT_NAME} ${LDSCRIPT_NAME}.tramp.noheader \ ${KERNEL_KO}.tramp.noheader ${KERNEL_KO}.tramp.bin -ldscript.$M: $S/conf/ldscript.$M - cat $S/conf/ldscript.$M|sed s/KERNLOADADDR/${KERNLOADADDR}/g \ - > ldscript.$M +${LDSCRIPT_NAME}: $S/conf/${LDSCRIPT_NAME} + cat $S/conf/${LDSCRIPT_NAME}|sed s/KERNLOADADDR/${KERNLOADADDR}/g \ + > ${LDSCRIPT_NAME} %RULES .include "$S/conf/kern.post.mk" From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 00:50:17 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC0271065672; Wed, 9 Sep 2009 00:50:17 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DD2B78FC19; Wed, 9 Sep 2009 00:50:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n890oHlx067103; Wed, 9 Sep 2009 00:50:17 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n890oHtb067101; Wed, 9 Sep 2009 00:50:17 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090050.n890oHtb067101@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 00:50:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197005 - projects/mips/sys/mips/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 00:50:18 -0000 Author: imp Date: Wed Sep 9 00:50:17 2009 New Revision: 197005 URL: http://svn.freebsd.org/changeset/base/197005 Log: Set the ldscript for malta64 correctly. Modified: projects/mips/sys/mips/conf/MALTA64 Modified: projects/mips/sys/mips/conf/MALTA64 ============================================================================== --- projects/mips/sys/mips/conf/MALTA64 Wed Sep 9 00:47:12 2009 (r197004) +++ projects/mips/sys/mips/conf/MALTA64 Wed Sep 9 00:50:17 2009 (r197005) @@ -22,6 +22,7 @@ ident MALTA makeoptions ARCH_FLAGS="-march=mips64 -mabi=64" makeoptions MIPS_LITTLE_ENDIAN=defined makeoptions TARGET_64BIT=t +makeoptions LDSCRIPT_NAME= ldscript.mips.mips64 options YAMON From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 03:46:05 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A11E6106566B; Wed, 9 Sep 2009 03:46:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8F8968FC15; Wed, 9 Sep 2009 03:46:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n893k4pF071507; Wed, 9 Sep 2009 03:46:04 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n893k4CI071505; Wed, 9 Sep 2009 03:46:04 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090346.n893k4CI071505@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 03:46:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197012 - projects/mips/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 03:46:05 -0000 Author: imp Date: Wed Sep 9 03:46:04 2009 New Revision: 197012 URL: http://svn.freebsd.org/changeset/base/197012 Log: Use proper set of flags to build the tramp. this gets 64-bit almost building and lets me debug the 'almost' :) Modified: projects/mips/sys/conf/Makefile.mips Modified: projects/mips/sys/conf/Makefile.mips ============================================================================== --- projects/mips/sys/conf/Makefile.mips Wed Sep 9 03:41:40 2009 (r197011) +++ projects/mips/sys/conf/Makefile.mips Wed Sep 9 03:46:04 2009 (r197012) @@ -98,7 +98,7 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/ echo "j t0" >>tmphack.S echo "END(_start)" >>tmphack.S echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h - ${CC} -O -nostdlib -I. -I$S ${EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \ + ${CC} -O -nostdlib -I. -I$S ${HACK_EXTRA_FLAGS} ${TRAMP_LDFLAGS} -Xlinker \ -T -Xlinker ${LDSCRIPT_NAME}.tramp.noheader tmphack.S \ $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \ -o ${KERNEL_KO}.tramp.noheader From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 03:54:56 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44477106566C; Wed, 9 Sep 2009 03:54:56 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 310B78FC0C; Wed, 9 Sep 2009 03:54:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n893susQ071700; Wed, 9 Sep 2009 03:54:56 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n893sukj071698; Wed, 9 Sep 2009 03:54:56 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090354.n893sukj071698@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 03:54:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197013 - projects/mips/sys/mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 03:54:56 -0000 Author: imp Date: Wed Sep 9 03:54:55 2009 New Revision: 197013 URL: http://svn.freebsd.org/changeset/base/197013 Log: First half of making this 64-bit clean: fix prototypes. Modified: projects/mips/sys/mips/mips/elf_trampoline.c Modified: projects/mips/sys/mips/mips/elf_trampoline.c ============================================================================== --- projects/mips/sys/mips/mips/elf_trampoline.c Wed Sep 9 03:46:04 2009 (r197012) +++ projects/mips/sys/mips/mips/elf_trampoline.c Wed Sep 9 03:54:55 2009 (r197013) @@ -26,6 +26,7 @@ __FBSDID("$FreeBSD$"); #include #include + #include #include #include @@ -43,7 +44,7 @@ extern char kernel_start[]; extern char kernel_end[]; static __inline void * -memcpy(void *dst, const void *src, int len) +memcpy(void *dst, const void *src, size_t len) { const char *s = src; char *d = dst; @@ -64,7 +65,7 @@ memcpy(void *dst, const void *src, int l } static __inline void -bzero(void *addr, int count) +bzero(void *addr, size_t count) { char *tmp = (char *)addr; From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 03:57:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B41E71065670; Wed, 9 Sep 2009 03:57:10 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A29C78FC0A; Wed, 9 Sep 2009 03:57:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n893vAef071785; Wed, 9 Sep 2009 03:57:10 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n893vAWu071783; Wed, 9 Sep 2009 03:57:10 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090357.n893vAWu071783@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 03:57:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197014 - projects/mips/sys/mips/mips X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 03:57:10 -0000 Author: imp Date: Wed Sep 9 03:57:10 2009 New Revision: 197014 URL: http://svn.freebsd.org/changeset/base/197014 Log: Ugly hack to get this to compile. I'm sure there's a better way... Modified: projects/mips/sys/mips/mips/elf_trampoline.c Modified: projects/mips/sys/mips/mips/elf_trampoline.c ============================================================================== --- projects/mips/sys/mips/mips/elf_trampoline.c Wed Sep 9 03:54:55 2009 (r197013) +++ projects/mips/sys/mips/mips/elf_trampoline.c Wed Sep 9 03:57:10 2009 (r197014) @@ -27,7 +27,11 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef __mips_n64 +#include +#else #include +#endif #include #include #include @@ -89,12 +93,21 @@ bzero(void *addr, size_t count) void * load_kernel(void * kstart) { +#ifdef __mips_n64 + Elf64_Ehdr *eh; + Elf64_Phdr phdr[64] /* XXX */; +#else Elf32_Ehdr *eh; Elf32_Phdr phdr[64] /* XXX */; +#endif int i; void *entry_point; +#ifdef __mips_n64 + eh = (Elf64_Ehdr *)kstart; +#else eh = (Elf32_Ehdr *)kstart; +#endif entry_point = (void*)eh->e_entry; memcpy(phdr, (void *)(kstart + eh->e_phoff ), eh->e_phnum * sizeof(phdr[0])); From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 03:59:47 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 42BFF1065670; Wed, 9 Sep 2009 03:59:47 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 30F308FC16; Wed, 9 Sep 2009 03:59:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n893xlCl071873; Wed, 9 Sep 2009 03:59:47 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n893xlXg071871; Wed, 9 Sep 2009 03:59:47 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200909090359.n893xlXg071871@svn.freebsd.org> From: Warner Losh Date: Wed, 9 Sep 2009 03:59:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197015 - projects/mips/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 03:59:47 -0000 Author: imp Date: Wed Sep 9 03:59:46 2009 New Revision: 197015 URL: http://svn.freebsd.org/changeset/base/197015 Log: Prefer PTR_LA over a naked la to work with 64-bits.. Modified: projects/mips/sys/conf/Makefile.mips Modified: projects/mips/sys/conf/Makefile.mips ============================================================================== --- projects/mips/sys/conf/Makefile.mips Wed Sep 9 03:57:10 2009 (r197014) +++ projects/mips/sys/conf/Makefile.mips Wed Sep 9 03:59:46 2009 (r197015) @@ -90,11 +90,11 @@ ${KERNEL_KO}.tramp.bin: ${KERNEL_KO} $S/ # Generate .S file that setups stack and jumps to trampoline echo "#include " >tmphack.S echo "ENTRY(_start)" >>tmphack.S - echo "la t0, kernel_end" >>tmphack.S + echo "PTR_LA t0, kernel_end" >>tmphack.S echo "move sp, t0" >>tmphack.S echo "add sp, 0x2000" >>tmphack.S echo "and sp, ~0x7" >>tmphack.S - echo "la t0, _startC" >>tmphack.S + echo "PTR_LA t0, _startC" >>tmphack.S echo "j t0" >>tmphack.S echo "END(_start)" >>tmphack.S echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 10:13:56 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88BE7106566B; Wed, 9 Sep 2009 10:13:56 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 79CCB8FC16; Wed, 9 Sep 2009 10:13:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89ADuFx080440; Wed, 9 Sep 2009 10:13:56 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89ADutQ080414; Wed, 9 Sep 2009 10:13:56 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091013.n89ADutQ080414@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 10:13:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197027 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 10:13:56 -0000 Author: pho Date: Wed Sep 9 10:13:56 2009 New Revision: 197027 URL: http://svn.freebsd.org/changeset/base/197027 Log: Use bsdlabel and not disklabel in all test scenarios. Modified: projects/stress2/misc/extattr.sh projects/stress2/misc/extattrctl.sh projects/stress2/misc/mac_chkexec.sh projects/stress2/misc/md.sh projects/stress2/misc/mount2.sh projects/stress2/misc/mountro3.sh projects/stress2/misc/newfs.sh projects/stress2/misc/newfs4.sh projects/stress2/misc/quota1.sh projects/stress2/misc/quota10.sh projects/stress2/misc/quota2.sh projects/stress2/misc/quota3.sh projects/stress2/misc/quota4.sh projects/stress2/misc/quota6.sh projects/stress2/misc/quota7.sh projects/stress2/misc/quota8.sh projects/stress2/misc/quota9.sh projects/stress2/misc/snap8.sh projects/stress2/misc/umount.sh projects/stress2/misc/umountf.sh projects/stress2/misc/umountf2.sh projects/stress2/misc/umountf3.sh projects/stress2/misc/umountf4.sh projects/stress2/misc/unionfs.sh projects/stress2/misc/unionfs3.sh Modified: projects/stress2/misc/extattr.sh ============================================================================== --- projects/stress2/misc/extattr.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/extattr.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -47,7 +47,7 @@ mount | grep "${mntpoint}" | grep -q md$ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 20m -u $mdstart -disklabel -r -w md$mdstart auto +bsdlabel -w md$mdstart auto newfs -O 2 md${mdstart}${part} > /dev/null mount /dev/md${mdstart}${part} $mntpoint Modified: projects/stress2/misc/extattrctl.sh ============================================================================== --- projects/stress2/misc/extattrctl.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/extattrctl.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -48,7 +48,7 @@ mount | grep "${mntpoint}" | grep -q md$ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 20m -u $mdstart -disklabel -r -w md$mdstart auto +bsdlabel -w md$mdstart auto newfs -O 1 md${mdstart}${part} > /dev/null mount /dev/md${mdstart}${part} $mntpoint Modified: projects/stress2/misc/mac_chkexec.sh ============================================================================== --- projects/stress2/misc/mac_chkexec.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/mac_chkexec.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -40,7 +40,7 @@ mount | grep "${mntpoint}" | grep -q md$ mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart mdconfig -a -t swap -s 12m -u $mdstart -disklabel -r -w md$mdstart auto +bsdlabel -w md$mdstart auto newfs md${mdstart}${part} > /dev/null tunefs -l enable /dev/md${mdstart}${part} Modified: projects/stress2/misc/md.sh ============================================================================== --- projects/stress2/misc/md.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/md.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -39,7 +39,7 @@ mount | grep "${mntpoint}" | grep md${md mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t swap -s 2m -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs md${mdstart}${part} > /dev/null mount /dev/md${mdstart}${part} ${mntpoint} Modified: projects/stress2/misc/mount2.sh ============================================================================== --- projects/stress2/misc/mount2.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/mount2.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -47,7 +47,7 @@ if [ $# -eq 0 ]; then dd if=/dev/zero of=$D$m bs=1m count=1 > /dev/null 2>&1 mdconfig -a -t vnode -f $D$m -u $m - disklabel -r -w md$m auto + bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 done Modified: projects/stress2/misc/mountro3.sh ============================================================================== --- projects/stress2/misc/mountro3.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/mountro3.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -42,7 +42,7 @@ mount | grep "$mntpoint" | grep md${mdst mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null 2>&1 mount /dev/md${mdstart}${part} $mntpoint Modified: projects/stress2/misc/newfs.sh ============================================================================== --- projects/stress2/misc/newfs.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/newfs.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep md${mdst mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $diskimage -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto for opt in "-O1" "-O2" "-O2 -U"; do Modified: projects/stress2/misc/newfs4.sh ============================================================================== --- projects/stress2/misc/newfs4.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/newfs4.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -55,7 +55,7 @@ truncate -s ${size}G $diskimage blocksize="-b 65536" opt="-O2 -U" mdconfig -a -t vnode -f $diskimage -u $mdstart -disklabel -r -w md$mdstart auto +bsdlabel -w md$mdstart auto newfs $blocksize $opt md${mdstart}${part} > /dev/null mount /dev/md${mdstart}${part} $mntpoint Modified: projects/stress2/misc/quota1.sh ============================================================================== --- projects/stress2/misc/quota1.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota1.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -43,7 +43,7 @@ mount | grep "${mntpoint}" | grep md${md mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null mount /dev/md${mdstart}${part} ${mntpoint} export RUNDIR=${mntpoint}/stressX Modified: projects/stress2/misc/quota10.sh ============================================================================== --- projects/stress2/misc/quota10.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota10.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -48,7 +48,7 @@ if [ $# -eq 0 ]; then dede $D$m 1m 1 mdconfig -a -t vnode -f $D$m -u $m - disklabel -r -w md$m auto + bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 echo "/dev/md${m}${part} ${mntpoint}$m ufs rw,userquota 2 2" >> /etc/fstab mount ${mntpoint}$m Modified: projects/stress2/misc/quota2.sh ============================================================================== --- projects/stress2/misc/quota2.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota2.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -40,7 +40,7 @@ mount | grep "${mntpoint}" | grep md${md mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab mount ${mntpoint} Modified: projects/stress2/misc/quota3.sh ============================================================================== --- projects/stress2/misc/quota3.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota3.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -40,7 +40,7 @@ mount | grep "${mntpoint}" | grep md${md mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab mount ${mntpoint} Modified: projects/stress2/misc/quota4.sh ============================================================================== --- projects/stress2/misc/quota4.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota4.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -42,7 +42,7 @@ mount | grep "${mntpoint}" | grep md${md mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab mount ${mntpoint} Modified: projects/stress2/misc/quota6.sh ============================================================================== --- projects/stress2/misc/quota6.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota6.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -40,7 +40,7 @@ mount | grep "/mnt" | grep md0c > /dev/n mdconfig -l | grep md0 > /dev/null && mdconfig -d -u 0 mdconfig -a -t vnode -f $D -u 0 -disklabel -r -w md0 auto +bsdlabel -w md0 auto newfs -U md0c > /dev/null echo "/dev/md0c /mnt ufs rw,userquota 2 2" >> /etc/fstab mount /mnt Modified: projects/stress2/misc/quota7.sh ============================================================================== --- projects/stress2/misc/quota7.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota7.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -41,7 +41,7 @@ mount | grep "/mnt" | grep -q md0 && umo mdconfig -l | grep -q md0 && mdconfig -d -u 0 mdconfig -a -t vnode -f $D -u 0 -disklabel -r -w md0 auto +bsdlabel -w md0 auto newfs -U md0c > /dev/null echo "/dev/md0c /mnt ufs rw,userquota 2 2" >> /etc/fstab mount /mnt Modified: projects/stress2/misc/quota8.sh ============================================================================== --- projects/stress2/misc/quota8.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota8.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -43,7 +43,7 @@ mount | grep "${mntpoint}" | grep -q md$ mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab mount ${mntpoint} Modified: projects/stress2/misc/quota9.sh ============================================================================== --- projects/stress2/misc/quota9.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/quota9.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -50,7 +50,7 @@ if [ $# -eq 0 ]; then mdconfig -l | grep -q md${mdstart} && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} - disklabel -r -w md${mdstart} auto + bsdlabel -w md${mdstart} auto newfs -U md${mdstart}${part} > /dev/null echo "/dev/md${mdstart}${part} ${mntpoint} ufs rw,userquota 2 2" >> /etc/fstab mount ${mntpoint} Modified: projects/stress2/misc/snap8.sh ============================================================================== --- projects/stress2/misc/snap8.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/snap8.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -49,7 +49,7 @@ size=25 # Gb truncate -s ${size}G $diskimage mdconfig -a -t vnode -f $diskimage -u $mdstart -disklabel -r -w md$mdstart auto +bsdlabel -w md$mdstart auto newfs -O2 -U md${mdstart}${part} > /dev/null mount /dev/md${mdstart}${part} $mntpoint Modified: projects/stress2/misc/umount.sh ============================================================================== --- projects/stress2/misc/umount.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/umount.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep md${mdst mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs md${mdstart}${part} mount /dev/md${mdstart}${part} $mntpoint export RUNDIR=$mntpoint/stressX Modified: projects/stress2/misc/umountf.sh ============================================================================== --- projects/stress2/misc/umountf.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/umountf.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -41,7 +41,7 @@ mount | grep "$mntpoint" | grep md${mdst mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs md${mdstart}${part} mount /dev/md${mdstart}${part} $mntpoint Modified: projects/stress2/misc/umountf2.sh ============================================================================== --- projects/stress2/misc/umountf2.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/umountf2.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -48,7 +48,7 @@ mount | grep "$mntpoint" | grep md${mdst mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs md${mdstart}${part} > /dev/null 2>&1 mount /dev/md${mdstart}${part} $mntpoint df -ih $mntpoint Modified: projects/stress2/misc/umountf3.sh ============================================================================== --- projects/stress2/misc/umountf3.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/umountf3.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -50,7 +50,7 @@ mount | grep "$mntpoint" | grep md${mdst mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t vnode -f $D -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto newfs md${mdstart}${part} > /dev/null 2>&1 mount /dev/md${mdstart}${part} $mntpoint #newfs_msdos -F 32 -b 8192 /dev/md${mdstart}a Modified: projects/stress2/misc/umountf4.sh ============================================================================== --- projects/stress2/misc/umountf4.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/umountf4.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -47,7 +47,7 @@ if [ $# -eq 0 ]; then dede $D$m 1m 10 mdconfig -a -t vnode -f $D$m -u $m - disklabel -r -w md$m auto + bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 done Modified: projects/stress2/misc/unionfs.sh ============================================================================== --- projects/stress2/misc/unionfs.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/unionfs.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -40,7 +40,7 @@ mount | grep "/mnt" | grep md0c > /dev/n mdconfig -l | grep md0 > /dev/null && mdconfig -d -u 0 mdconfig -a -t vnode -f $D -u 0 -disklabel -r -w md0 auto +bsdlabel -w md0 auto newfs -U md0c > /dev/null mount /dev/md0c /mnt mount -t unionfs -o noatime /mnt /tmp Modified: projects/stress2/misc/unionfs3.sh ============================================================================== --- projects/stress2/misc/unionfs3.sh Wed Sep 9 10:05:50 2009 (r197026) +++ projects/stress2/misc/unionfs3.sh Wed Sep 9 10:13:56 2009 (r197027) @@ -40,7 +40,7 @@ mount | grep "/mnt" | grep md0c > /dev/n mdconfig -l | grep md0 > /dev/null && mdconfig -d -u 0 mdconfig -a -t vnode -f $D -u 0 -disklabel -r -w md0 auto +bsdlabel -w md0 auto newfs -U md0c > /dev/null mount /dev/md0c /mnt mount -t unionfs -o noatime /tmp /mnt From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 11:09:43 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA9F3106566B; Wed, 9 Sep 2009 11:09:43 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 85D528FC13; Wed, 9 Sep 2009 11:09:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89B9hjj083656; Wed, 9 Sep 2009 11:09:43 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89B9hFp083654; Wed, 9 Sep 2009 11:09:43 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091109.n89B9hFp083654@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 11:09:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197032 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 11:09:43 -0000 Author: pho Date: Wed Sep 9 11:09:43 2009 New Revision: 197032 URL: http://svn.freebsd.org/changeset/base/197032 Log: Use bsdlabel not disklabel. Modified: projects/stress2/misc/backingstore.sh Modified: projects/stress2/misc/backingstore.sh ============================================================================== --- projects/stress2/misc/backingstore.sh Wed Sep 9 10:52:36 2009 (r197031) +++ projects/stress2/misc/backingstore.sh Wed Sep 9 11:09:43 2009 (r197032) @@ -46,7 +46,7 @@ dede $D$m 100m 1 || exit 1 mdconfig -a -t vnode -f $D$m -u $m -disklabel -r -w md$m auto +bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 mount $opt /dev/md${m}${part} ${mntpoint}$m @@ -59,7 +59,7 @@ mdconfig -l | grep -q md$m && mdconfig truncate -s 500M ${mntpoint}$n/diskimage mdconfig -a -t vnode -f ${mntpoint}$n/diskimage -u $m -disklabel -r -w md$m auto +bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 mount $opt /dev/md${m}${part} ${mntpoint}$m From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 11:12:42 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 622BF106568B; Wed, 9 Sep 2009 11:12:42 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 522858FC0A; Wed, 9 Sep 2009 11:12:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89BCg2s083766; Wed, 9 Sep 2009 11:12:42 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89BCgst083764; Wed, 9 Sep 2009 11:12:42 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091112.n89BCgst083764@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 11:12:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197033 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 11:12:42 -0000 Author: pho Date: Wed Sep 9 11:12:41 2009 New Revision: 197033 URL: http://svn.freebsd.org/changeset/base/197033 Log: Use bsdlabel not disklabel. Modified: projects/stress2/misc/crossmp.sh Modified: projects/stress2/misc/crossmp.sh ============================================================================== --- projects/stress2/misc/crossmp.sh Wed Sep 9 11:09:43 2009 (r197032) +++ projects/stress2/misc/crossmp.sh Wed Sep 9 11:12:41 2009 (r197033) @@ -28,7 +28,7 @@ # $FreeBSD$ # -# Hunt for deadlock that could occur when lookup crosses mount point and mp is being unmounted. +# Copy of crossmp.sh, but with SU enabled. [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 @@ -47,7 +47,7 @@ if [ $# -eq 0 ]; then dede $D$m 1m 1 mdconfig -a -t vnode -f $D$m -u $m - disklabel -r -w md$m auto + bsdlabel -w md$m auto newfs md${m}${part} > /dev/null 2>&1 done From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 11:14:03 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5631E106566C; Wed, 9 Sep 2009 11:14:03 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 464B18FC08; Wed, 9 Sep 2009 11:14:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89BE3jE083827; Wed, 9 Sep 2009 11:14:03 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89BE3Si083825; Wed, 9 Sep 2009 11:14:03 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091114.n89BE3Si083825@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 11:14:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197034 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 11:14:03 -0000 Author: pho Date: Wed Sep 9 11:14:03 2009 New Revision: 197034 URL: http://svn.freebsd.org/changeset/base/197034 Log: Use bsdlabel and trim the number of test cycles. Modified: projects/stress2/misc/fs.sh Modified: projects/stress2/misc/fs.sh ============================================================================== --- projects/stress2/misc/fs.sh Wed Sep 9 11:12:41 2009 (r197033) +++ projects/stress2/misc/fs.sh Wed Sep 9 11:14:03 2009 (r197034) @@ -45,7 +45,7 @@ ftest () { # fstype, soft update, disk f export KBLOCKS=$(($1 * disk)) export INODES=$(($2 * disk)) - for i in `jot 50`; do + for i in `jot 10`; do (cd ../testcases/rw;./rw -t 2m -i 20) done @@ -59,7 +59,7 @@ mount | grep "${mntpoint}" | grep md${md mdconfig -l | grep md${mdstart} > /dev/null && mdconfig -d -u ${mdstart} mdconfig -a -t swap -s 20m -u ${mdstart} -disklabel -r -w md${mdstart} auto +bsdlabel -w md${mdstart} auto ftest 1 0 0 # ufs1 ftest 1 0 1 # ufs1, disk full From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 11:16:08 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B8BE106566B; Wed, 9 Sep 2009 11:16:08 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B9E38FC0C; Wed, 9 Sep 2009 11:16:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89BG8P4083916; Wed, 9 Sep 2009 11:16:08 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89BG8mj083914; Wed, 9 Sep 2009 11:16:08 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091116.n89BG8mj083914@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 11:16:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197035 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 11:16:08 -0000 Author: pho Date: Wed Sep 9 11:16:08 2009 New Revision: 197035 URL: http://svn.freebsd.org/changeset/base/197035 Log: Use the correct program name when checking to see if mkisofs is installed. Modified: projects/stress2/misc/isofs.sh Modified: projects/stress2/misc/isofs.sh ============================================================================== --- projects/stress2/misc/isofs.sh Wed Sep 9 11:14:03 2009 (r197034) +++ projects/stress2/misc/isofs.sh Wed Sep 9 11:16:08 2009 (r197035) @@ -30,7 +30,7 @@ [ `id -u ` -ne 0 ] && echo "Must not be root!" && exit 1 -[ -z "`type isofs 2>/dev/null`" ] && echo "isofs not found" && exit 1 +[ -z "`type mkisofs 2>/dev/null`" ] && echo "mkisofs not found" && exit 1 . ../default.cfg From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 11:34:46 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A6195106568D; Wed, 9 Sep 2009 11:34:46 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7C9908FC21; Wed, 9 Sep 2009 11:34:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89BYk1W084357; Wed, 9 Sep 2009 11:34:46 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89BYkSY084355; Wed, 9 Sep 2009 11:34:46 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091134.n89BYkSY084355@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 11:34:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197036 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 11:34:46 -0000 Author: pho Date: Wed Sep 9 11:34:46 2009 New Revision: 197036 URL: http://svn.freebsd.org/changeset/base/197036 Log: Do not use libpthread as this is not a threaded test. Modified: projects/stress2/misc/jail.sh Modified: projects/stress2/misc/jail.sh ============================================================================== --- projects/stress2/misc/jail.sh Wed Sep 9 11:16:08 2009 (r197035) +++ projects/stress2/misc/jail.sh Wed Sep 9 11:34:46 2009 (r197036) @@ -36,7 +36,7 @@ odir=`pwd` cd /tmp sed '1,/^EOF/d' < $odir/$0 > jail.c -cc -o jail -Wall jail.c -pthread +cc -o jail -Wall jail.c rm -f jail.c cd $RUNDIR /tmp/jail From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 11:36:31 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32865106566C; Wed, 9 Sep 2009 11:36:31 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 085DB8FC12; Wed, 9 Sep 2009 11:36:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n89BaUDL084425; Wed, 9 Sep 2009 11:36:30 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n89BaUJ6084423; Wed, 9 Sep 2009 11:36:30 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909091136.n89BaUJ6084423@svn.freebsd.org> From: Peter Holm Date: Wed, 9 Sep 2009 11:36:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197037 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 11:36:31 -0000 Author: pho Date: Wed Sep 9 11:36:30 2009 New Revision: 197037 URL: http://svn.freebsd.org/changeset/base/197037 Log: Document the panic that this scenario causes. Modified: projects/stress2/misc/md2.sh Modified: projects/stress2/misc/md2.sh ============================================================================== --- projects/stress2/misc/md2.sh Wed Sep 9 11:34:46 2009 (r197036) +++ projects/stress2/misc/md2.sh Wed Sep 9 11:36:30 2009 (r197037) @@ -28,6 +28,8 @@ # $FreeBSD$ # +# panic: ufs_dirbad: /mnt: bad dir ino 32899 at offset 16896: mangled entry + [ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 . ../default.cfg From owner-svn-src-projects@FreeBSD.ORG Wed Sep 9 13:12:35 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7958D1065670 for ; Wed, 9 Sep 2009 13:12:35 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (skuns.zoral.com.ua [91.193.166.194]) by mx1.freebsd.org (Postfix) with ESMTP id D7DE88FC17 for ; Wed, 9 Sep 2009 13:12:34 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id n89CdODD008880 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 9 Sep 2009 15:39:24 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3) with ESMTP id n89CdO3j032838; Wed, 9 Sep 2009 15:39:24 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id n89CdOUu032837; Wed, 9 Sep 2009 15:39:24 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 9 Sep 2009 15:39:24 +0300 From: Kostik Belousov To: Peter Holm Message-ID: <20090909123924.GZ47688@deviant.kiev.zoral.com.ua> References: <200909091136.n89BaUJ6084423@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="sMP3l7aO1Ldl3x+Z" Content-Disposition: inline In-Reply-To: <200909091136.n89BaUJ6084423@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r197037 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Sep 2009 13:12:35 -0000 --sMP3l7aO1Ldl3x+Z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, Sep 09, 2009 at 11:36:30AM +0000, Peter Holm wrote: > +# panic: ufs_dirbad: /mnt: bad dir ino 32899 at offset 16896: mangled entry It is reproducable, I assume ? --sMP3l7aO1Ldl3x+Z Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (FreeBSD) iEYEARECAAYFAkqnofsACgkQC3+MBN1Mb4j1MgCgqZvicBZty1RdJ9YzAoHDd06A c5QAnjSl2usZYklBsJ0Ee55Ibd4LoI+u =p8qo -----END PGP SIGNATURE----- --sMP3l7aO1Ldl3x+Z-- From owner-svn-src-projects@FreeBSD.ORG Thu Sep 10 01:54:04 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CFF1D106566B; Thu, 10 Sep 2009 01:54:04 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BE4248FC15; Thu, 10 Sep 2009 01:54:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8A1s4Zn003848; Thu, 10 Sep 2009 01:54:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8A1s4hL003843; Thu, 10 Sep 2009 01:54:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909100154.n8A1s4hL003843@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 10 Sep 2009 01:54:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197053 - in projects/ppc64/sys/powerpc: aim aim64 ofw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2009 01:54:04 -0000 Author: nwhitehorn Date: Thu Sep 10 01:54:04 2009 New Revision: 197053 URL: http://svn.freebsd.org/changeset/base/197053 Log: Make calls to Open Firmware work correctly with virtual memory enabled. This gets quite a lot of the kernel startup working on the XServe -- the PCI buses are probed, the ethernet controllers attach and initialize, etc. It does, however, appear that macio(4) is not 64-bit clean, so the boot stops there. Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c projects/ppc64/sys/powerpc/aim64/mmu_oea64.c projects/ppc64/sys/powerpc/ofw/ofw_real.c Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Thu Sep 10 01:26:45 2009 (r197052) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Thu Sep 10 01:54:04 2009 (r197053) @@ -373,29 +373,20 @@ openfirmware(void *args) int result; #ifndef __powerpc64__ register_t srsave[16]; - #endif u_int i; + #endif if (pmap_bootstrapped && ofw_real_mode) args = (void *)pmap_kextract((vm_offset_t)args); ofw_sprg_prepare(); + #ifndef __powerpc64__ if (pmap_bootstrapped && !ofw_real_mode) { /* * Swap the kernel's address space with Open Firmware's */ - #ifdef __powerpc64__ - for (i = 1; i < 16; i++) { - if (i == KERNEL_SR || i == KERNEL2_SR || i == USER_SR) - continue; - - __asm __volatile ("slbie %0; slbmte %1, %2" :: - "r"(i << 28), "r"(ofw_pmap.pm_slb[i].slbv), - "r"(ofw_pmap.pm_slb[i].slbe)); - } - #else for (i = 0; i < 16; i++) { srsave[i] = mfsrin(i << ADDR_SR_SHFT); mtsrin(i << ADDR_SR_SHFT, ofw_pmap.pm_sr[i]); @@ -409,8 +400,8 @@ openfirmware(void *args) "mtdbatu 3, %0" : : "r" (0)); } isync(); - #endif } + #endif __asm __volatile( "\t" "sync\n\t" @@ -429,28 +420,20 @@ openfirmware(void *args) : : "r" (oldmsr) ); - if (pmap_bootstrapped && !ofw_real_mode) { + #ifndef __powerpc64__ + if (pmap_bootstrapped && !ofw_real_mode && 0) { /* * Restore the kernel's addr space. The isync() doesn;t * work outside the loop unless mtsrin() is open-coded * in an asm statement :( */ - #ifdef __powerpc64__ - for (i = 1; i < 16; i++) { - if (i == KERNEL_SR || i == KERNEL2_SR || i == USER_SR) - continue; - - __asm __volatile ("slbie %0; slbmte %1, %2" :: - "r"(i << 28), "r"(kernel_pmap->pm_slb[i].slbv), - "r"(kernel_pmap->pm_slb[i].slbe)); - } - #else + for (i = 0; i < 16; i++) { mtsrin(i << ADDR_SR_SHFT, srsave[i]); isync(); } - #endif } + #endif ofw_sprg_restore(); Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Thu Sep 10 01:26:45 2009 (r197052) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Thu Sep 10 01:54:04 2009 (r197053) @@ -1017,20 +1017,30 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o for (off = 0; off < translations[i].om_len; off += PAGE_SIZE) { struct vm_page m; + m.phys_addr = translations[i].om_pa_lo + off; + + #ifdef __powerpc64__ + m.phys_addr += (vm_offset_t)translations[i].om_pa_hi + << 32; + + /* + * ofw_pmap is unused on PPC64 since slb replacement + * is non-atomic, so map the kernel and OFW into + * the same address space. + */ + moea64_kenter(mmup, translations[i].om_va + off, + m.phys_addr); + #else /* Map low memory mappings into the kernel pmap, too. * These are typically mappings made by the loader, * so we need them if we want to keep executing. */ if (translations[i].om_va + off < SEGMENT_LENGTH) moea64_kenter(mmup, translations[i].om_va + off, - translations[i].om_va + off); - m.phys_addr = translations[i].om_pa_lo + off; - #ifdef __powerpc64__ - m.phys_addr += translations[i].om_pa_hi << 32; - #endif moea64_enter_locked(&ofw_pmap, translations[i].om_va + off, &m, VM_PROT_ALL, 1); + #endif ofw_mappings++; } Modified: projects/ppc64/sys/powerpc/ofw/ofw_real.c ============================================================================== --- projects/ppc64/sys/powerpc/ofw/ofw_real.c Thu Sep 10 01:26:45 2009 (r197052) +++ projects/ppc64/sys/powerpc/ofw/ofw_real.c Thu Sep 10 01:54:04 2009 (r197053) @@ -192,8 +192,6 @@ ofw_real_stop(void) static void ofw_real_bounce_alloc(void *junk) { - struct vm_page m; - /* * Check that ofw_real is actually in use before allocating wads * of memory. Do this by checking if our mutex has been set up. @@ -210,18 +208,17 @@ ofw_real_bounce_alloc(void *junk) of_bounce_virt = contigmalloc(PAGE_SIZE, M_OFWREAL, 0, 0, BUS_SPACE_MAXADDR_32BIT, PAGE_SIZE, PAGE_SIZE); - of_bounce_phys = vtophys(of_bounce_virt); - of_bounce_size = PAGE_SIZE; /* - * Add this to the OFW pmap if we are running in virtual mode. + * XXX: Use of_bounce_virt in 32-bit mode. This assumes that kernel + * VA space is always < 0xffffffff. */ + if (ofw_real_mode) + of_bounce_phys = vtophys(of_bounce_virt); + else + of_bounce_phys = (vm_offset_t)of_bounce_virt; - if (!ofw_real_mode) { - m.phys_addr = of_bounce_phys; - pmap_enter(&ofw_pmap, of_bounce_phys, VM_PROT_ALL, &m, - VM_PROT_ALL, 1); - } + of_bounce_size = PAGE_SIZE; mtx_unlock(&of_bounce_mtx); } From owner-svn-src-projects@FreeBSD.ORG Thu Sep 10 02:00:28 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F0B91065670; Thu, 10 Sep 2009 02:00:28 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6E4848FC08; Thu, 10 Sep 2009 02:00:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8A20SLT004059; Thu, 10 Sep 2009 02:00:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8A20S3n004057; Thu, 10 Sep 2009 02:00:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909100200.n8A20S3n004057@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 10 Sep 2009 02:00:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197054 - projects/ppc64/sys/powerpc/aim X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2009 02:00:28 -0000 Author: nwhitehorn Date: Thu Sep 10 02:00:28 2009 New Revision: 197054 URL: http://svn.freebsd.org/changeset/base/197054 Log: Fix accidental debug code. Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Thu Sep 10 01:54:04 2009 (r197053) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Thu Sep 10 02:00:28 2009 (r197054) @@ -421,7 +421,7 @@ openfirmware(void *args) ); #ifndef __powerpc64__ - if (pmap_bootstrapped && !ofw_real_mode && 0) { + if (pmap_bootstrapped && !ofw_real_mode) { /* * Restore the kernel's addr space. The isync() doesn;t * work outside the loop unless mtsrin() is open-coded From owner-svn-src-projects@FreeBSD.ORG Thu Sep 10 02:23:55 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 805051065670; Thu, 10 Sep 2009 02:23:55 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6F90F8FC16; Thu, 10 Sep 2009 02:23:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8A2Ntq6004541; Thu, 10 Sep 2009 02:23:55 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8A2NtFE004539; Thu, 10 Sep 2009 02:23:55 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909100223.n8A2NtFE004539@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 10 Sep 2009 02:23:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197055 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2009 02:23:55 -0000 Author: nwhitehorn Date: Thu Sep 10 02:23:55 2009 New Revision: 197055 URL: http://svn.freebsd.org/changeset/base/197055 Log: Fix an obvious bug. I'm a mess today. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Thu Sep 10 02:00:28 2009 (r197054) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Thu Sep 10 02:23:55 2009 (r197055) @@ -1037,6 +1037,7 @@ moea64_bridge_bootstrap(mmu_t mmup, vm_o if (translations[i].om_va + off < SEGMENT_LENGTH) moea64_kenter(mmup, translations[i].om_va + off, + translations[i].om_pa_lo + off); moea64_enter_locked(&ofw_pmap, translations[i].om_va + off, &m, VM_PROT_ALL, 1); From owner-svn-src-projects@FreeBSD.ORG Thu Sep 10 08:52:08 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC0711065679 for ; Thu, 10 Sep 2009 08:52:08 +0000 (UTC) (envelope-from pho@holm.cc) Received: from relay02.pair.com (relay02.pair.com [209.68.5.16]) by mx1.freebsd.org (Postfix) with SMTP id 4B9B18FC15 for ; Thu, 10 Sep 2009 08:52:08 +0000 (UTC) Received: (qmail 80911 invoked from network); 10 Sep 2009 08:25:26 -0000 Received: from 93.166.52.54 (HELO x2.osted.lan) (93.166.52.54) by relay02.pair.com with SMTP; 10 Sep 2009 08:25:26 -0000 X-pair-Authenticated: 93.166.52.54 Received: from x2.osted.lan (localhost.osted.lan [127.0.0.1]) by x2.osted.lan (8.14.2/8.14.2) with ESMTP id n8A8PPqr097837; Thu, 10 Sep 2009 10:25:25 +0200 (CEST) (envelope-from pho@x2.osted.lan) Received: (from pho@localhost) by x2.osted.lan (8.14.2/8.14.2/Submit) id n8A8PPsl097836; Thu, 10 Sep 2009 10:25:25 +0200 (CEST) (envelope-from pho) Date: Thu, 10 Sep 2009 10:25:25 +0200 From: Peter Holm To: Kostik Belousov Message-ID: <20090910082525.GA97219@x2.osted.lan> References: <200909091136.n89BaUJ6084423@svn.freebsd.org> <20090909123924.GZ47688@deviant.kiev.zoral.com.ua> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090909123924.GZ47688@deviant.kiev.zoral.com.ua> User-Agent: Mutt/1.4.2.3i Cc: svn-src-projects@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r197037 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Sep 2009 08:52:08 -0000 On Wed, Sep 09, 2009 at 03:39:24PM +0300, Kostik Belousov wrote: > On Wed, Sep 09, 2009 at 11:36:30AM +0000, Peter Holm wrote: > > +# panic: ufs_dirbad: /mnt: bad dir ino 32899 at offset 16896: mangled entry > > It is reproducable, I assume ? The last time I saw a problem with this test scenario was on April 6th. I suspect that the problem was a failed umount followed by a mdconfig -d. A test thru the night shows that this scenario no longer causes the ufs_dirbad panic. I'll mark this test as being a regression test. - Peter From owner-svn-src-projects@FreeBSD.ORG Fri Sep 11 15:31:14 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06221106566B; Fri, 11 Sep 2009 15:31:14 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id EA2908FC16; Fri, 11 Sep 2009 15:31:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8BFVD8w055882; Fri, 11 Sep 2009 15:31:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8BFVD3t055880; Fri, 11 Sep 2009 15:31:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909111531.n8BFVD3t055880@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 11 Sep 2009 15:31:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197090 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2009 15:31:14 -0000 Author: nwhitehorn Date: Fri Sep 11 15:31:13 2009 New Revision: 197090 URL: http://svn.freebsd.org/changeset/base/197090 Log: Use a more rational scheme to restore the USER_SR SLB bits. Modified: projects/ppc64/sys/powerpc/aim64/swtch.S Modified: projects/ppc64/sys/powerpc/aim64/swtch.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/swtch.S Fri Sep 11 15:07:36 2009 (r197089) +++ projects/ppc64/sys/powerpc/aim64/swtch.S Fri Sep 11 15:31:13 2009 (r197090) @@ -200,10 +200,15 @@ cpu_switchin: mtcr %r5 ld %r5,PCB_LR(%r3) /* Load the link register */ mtlr %r5 - ld %r5,PCB_AIM_USR_VSID(%r3) /* Load the USER_SR segment reg */ + + li %r5,USER_SR /* Load the USER_SR segment reg */ + sldi %r5,%r5,28 + slbie %r5 + ld %r5,PCB_AIM_USR_VSID(%r3) ld %r6,PCB_AIM_USR_ESID(%r3) ori %r6,%r6,USER_SR slbmte %r5,%r6 + isync ld %r1,PCB_SP(%r3) /* Load the stack pointer */ ld %r2,PCB_TOC(%r3) /* Load the TOC pointer */ From owner-svn-src-projects@FreeBSD.ORG Fri Sep 11 15:35:29 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1FA4F106566C; Fri, 11 Sep 2009 15:35:29 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0FA798FC19; Fri, 11 Sep 2009 15:35:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8BFZS77056018; Fri, 11 Sep 2009 15:35:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8BFZSVq056016; Fri, 11 Sep 2009 15:35:28 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909111535.n8BFZSVq056016@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 11 Sep 2009 15:35:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197091 - projects/ppc64/sys/powerpc/aim X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2009 15:35:29 -0000 Author: nwhitehorn Date: Fri Sep 11 15:35:28 2009 New Revision: 197091 URL: http://svn.freebsd.org/changeset/base/197091 Log: Fix 64-bit copyin/out() routines to use constants instead of magic numbers when setting SLB entries. Modified: projects/ppc64/sys/powerpc/aim/copyinout.c Modified: projects/ppc64/sys/powerpc/aim/copyinout.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/copyinout.c Fri Sep 11 15:31:13 2009 (r197090) +++ projects/ppc64/sys/powerpc/aim/copyinout.c Fri Sep 11 15:35:28 2009 (r197091) @@ -87,8 +87,8 @@ set_user_sr(pmap_t pm, const void *addr) vsid = va_to_vsid(pm, (vm_offset_t)addr); PMAP_UNLOCK(pm); - slb1 = vsid << 12; - slb2 = (((esid << 1) | 1UL) << 27) | USER_SR; + slb1 = vsid << SLBV_VSID_SHIFT; + slb2 = (esid << SLBE_ESID_SHIFT) | SLBE_VALID | USER_SR; __asm __volatile ("slbie %0; slbmte %1, %2" :: "r"(esid << 28), "r"(slb1), "r"(slb2)); From owner-svn-src-projects@FreeBSD.ORG Fri Sep 11 15:38:28 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 062061065670; Fri, 11 Sep 2009 15:38:28 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E91628FC1B; Fri, 11 Sep 2009 15:38:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8BFcR6i056128; Fri, 11 Sep 2009 15:38:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8BFcR7x056124; Fri, 11 Sep 2009 15:38:27 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909111538.n8BFcR7x056124@svn.freebsd.org> From: Nathan Whitehorn Date: Fri, 11 Sep 2009 15:38:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197092 - in projects/ppc64/sys/powerpc: aim aim64 ofw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2009 15:38:28 -0000 Author: nwhitehorn Date: Fri Sep 11 15:38:27 2009 New Revision: 197092 URL: http://svn.freebsd.org/changeset/base/197092 Log: Fix a number of problems related to calling into a 32-bit OFW implementation. OFW cannot save the non-volatile registers properly, since it stores them as 32-bit quantities, so we have to do that, and also properly sign-extend its output, and take care that type promotion maintains sign info when passing things from firmware back to 64-bit C code. This brings the boot much further on real hardware. Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c projects/ppc64/sys/powerpc/aim64/locore.S projects/ppc64/sys/powerpc/ofw/ofw_real.c Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Fri Sep 11 15:35:28 2009 (r197091) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Fri Sep 11 15:38:27 2009 (r197092) @@ -68,7 +68,6 @@ static int (*ofwcall)(void *); static void *fdt; int ofw_real_mode; -int ofw_real_mode_entry(void *); int ofw_32bit_mode_entry(void *); static int openfirmware(void *args); @@ -323,9 +322,7 @@ OF_initial_setup(void *fdt_ptr, void *ju * For PPC64, we need to use some hand-written * asm trampolines to get to OF. */ - if (ofw_real_mode && openfirm != NULL) - ofwcall = ofw_real_mode_entry; - else + if (openfirm != NULL) ofwcall = ofw_32bit_mode_entry; #else ofwcall = openfirm; @@ -369,9 +366,9 @@ OF_bootstrap() static int openfirmware(void *args) { - long oldmsr; int result; #ifndef __powerpc64__ + long oldmsr; register_t srsave[16]; u_int i; #endif @@ -401,7 +398,6 @@ openfirmware(void *args) } isync(); } - #endif __asm __volatile( "\t" "sync\n\t" @@ -411,16 +407,17 @@ openfirmware(void *args) : "=r" (oldmsr) : "r" (ofmsr[0]) ); + #endif result = ofwcall(args); + #ifndef __powerpc64__ __asm( "\t" "mtmsr %0\n\t" "isync\n" : : "r" (oldmsr) ); - #ifndef __powerpc64__ if (pmap_bootstrapped && !ofw_real_mode) { /* * Restore the kernel's addr space. The isync() doesn;t Modified: projects/ppc64/sys/powerpc/aim64/locore.S ============================================================================== --- projects/ppc64/sys/powerpc/aim64/locore.S Fri Sep 11 15:35:28 2009 (r197091) +++ projects/ppc64/sys/powerpc/aim64/locore.S Fri Sep 11 15:38:27 2009 (r197092) @@ -154,12 +154,6 @@ ASENTRY(__start) lis 2,tocbase@ha ld 2,tocbase@l(2) - /* Switch to 64-bit mode */ - mfmsr 9 - li 8,1 - insrdi 9,8,1,0 - mtmsrd 9 - mfmsr 0 lis 9,ofmsr@ha stdu 0,ofmsr@l(9) @@ -172,6 +166,12 @@ ASENTRY(__start) std 0,24(9) /* ofmsr[3] = sprg2 */ mfsprg3 0 std 0,32(9) /* ofmsr[4] = sprg3 */ + + /* Switch to 64-bit mode */ + mfmsr 9 + li 8,1 + insrdi 9,8,1,0 + mtmsrd 9 bl .OF_initial_setup nop @@ -210,47 +210,97 @@ tocbase: * Open Firmware Real-mode Entry Point. This is a huge pain. */ -ASENTRY(ofw_real_mode_entry) - mflr 0 - lis 4,openfirmware_entry@ha - ld 4,openfirmware_entry@l(4) /* read client interface handler */ - - mfmsr 5 - mtsprg3 5 - andi. 5, 5, ~(PSL_DR | PSL_IR | PSL_EE)@l - mtmsrd 5 - - mtctr 4 - bctrl - - mfsprg3 5 - mtmsrd 5 - mtlr 0 - blr - ASENTRY(ofw_32bit_mode_entry) - mflr 4 - mtsprg1 4 - - lis 4,openfirmware_entry@ha - ld 4,openfirmware_entry@l(4) /* read client interface handler */ + mflr %r0 + std %r0,16(%r1) + stdu %r1,-224(%r1) + + /* + * We need to save the following, because OF's register save/ + * restore code assumes that the contents of registers are + * at most 32 bits wide: lr, cr, r2, r13-r31, the old MSR. These + * get placed in that order in the stack. + */ + + mfcr %r4 + std %r4,48(%r1) + std %r13,56(%r1) + std %r14,64(%r1) + std %r15,72(%r1) + std %r16,80(%r1) + std %r17,88(%r1) + std %r18,96(%r1) + std %r19,104(%r1) + std %r20,112(%r1) + std %r21,120(%r1) + std %r22,128(%r1) + std %r23,136(%r1) + std %r24,144(%r1) + std %r25,152(%r1) + std %r26,160(%r1) + std %r27,168(%r1) + std %r28,176(%r1) + std %r29,184(%r1) + std %r30,192(%r1) + std %r31,200(%r1) + std %r2,208(%r1) + + /* Save the old MSR */ + mfmsr %r4 + std %r4,216(%r1) + mr %r14,%r4 /* Save in a non-volatile reg */ - /* Set up a 32-bit MSR in r5 */ - mfmsr 5 - mtsprg2 5 - clrldi 5,5,1 + lis %r4,openfirmware_entry@ha + ld %r4,openfirmware_entry@l(%r4) /* read client interface handler */ /* Set MSR, branch to OF, and come back */ - mtmsrd 5 + lis %r5,ofmsr@ha + ld %r5,ofmsr@l(%r5) + mtmsrd %r5 isync - mtctr 4 + mtctr %r4 bctrl - mfsprg2 5 - mtmsrd 5 + + /* Turn translation back on to get to the stack */ + mtmsr %r14 isync - mfsprg1 4 - mtlr 4 + /* Now we can use the stack again, so get the real MSR */ + ld %r5,216(%r1) + mtmsrd %r5 + isync + + /* Sign-extend the return value from OF */ + extsw %r3,%r3 + + /* Restore all the non-volatile registers */ + ld %r5,48(%r1) + mtcr %r5 + ld %r13,56(%r1) + ld %r14,64(%r1) + ld %r15,72(%r1) + ld %r16,80(%r1) + ld %r17,88(%r1) + ld %r18,96(%r1) + ld %r19,104(%r1) + ld %r20,112(%r1) + ld %r21,120(%r1) + ld %r22,128(%r1) + ld %r23,136(%r1) + ld %r24,144(%r1) + ld %r25,152(%r1) + ld %r26,160(%r1) + ld %r27,168(%r1) + ld %r28,176(%r1) + ld %r29,184(%r1) + ld %r30,192(%r1) + ld %r31,200(%r1) + ld %r2,208(%r1) + + /* Restore the stack and link register */ + ld %r1,0(%r1) + ld %r0,16(%r1) + mtlr %r0 blr /* Modified: projects/ppc64/sys/powerpc/ofw/ofw_real.c ============================================================================== --- projects/ppc64/sys/powerpc/ofw/ofw_real.c Fri Sep 11 15:35:28 2009 (r197091) +++ projects/ppc64/sys/powerpc/ofw/ofw_real.c Fri Sep 11 15:38:27 2009 (r197092) @@ -423,7 +423,7 @@ ofw_real_getproplen(ofw_t ofw, phandle_t cell_t nreturns; cell_t package; cell_t propname; - cell_t proplen; + int32_t proplen; } args; args.name = (cell_t)(uintptr_t)"getproplen"; @@ -455,7 +455,7 @@ ofw_real_getprop(ofw_t ofw, phandle_t pa cell_t propname; cell_t buf; cell_t buflen; - cell_t size; + int32_t size; } args; args.name = (cell_t)(uintptr_t)"getprop"; @@ -558,7 +558,7 @@ ofw_real_canon(ofw_t ofw, const char *de cell_t device; cell_t buf; cell_t len; - cell_t size; + int32_t size; } args; args.name = (cell_t)(uintptr_t)"canon"; @@ -618,7 +618,7 @@ ofw_real_instance_to_path(ofw_t ofw, iha cell_t instance; cell_t buf; cell_t len; - cell_t size; + int32_t size; } args; args.name = (cell_t)(uintptr_t)"instance-to-path"; @@ -651,7 +651,7 @@ ofw_real_package_to_path(ofw_t ofw, phan cell_t package; cell_t buf; cell_t len; - cell_t size; + int32_t size; } args; args.name = (cell_t)(uintptr_t)"package-to-path"; @@ -779,7 +779,7 @@ ofw_real_read(ofw_t ofw, ihandle_t insta cell_t instance; cell_t addr; cell_t len; - cell_t actual; + int32_t actual; } args; args.name = (cell_t)(uintptr_t)"read"; @@ -812,7 +812,7 @@ ofw_real_write(ofw_t ofw, ihandle_t inst cell_t instance; cell_t addr; cell_t len; - cell_t actual; + int32_t actual; } args; args.name = (cell_t)(uintptr_t)"write"; From owner-svn-src-projects@FreeBSD.ORG Fri Sep 11 19:23:12 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50702106566B; Fri, 11 Sep 2009 19:23:12 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2703D8FC0A; Fri, 11 Sep 2009 19:23:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8BJNBNK061288; Fri, 11 Sep 2009 19:23:11 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8BJNBGf061286; Fri, 11 Sep 2009 19:23:11 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <200909111923.n8BJNBGf061286@svn.freebsd.org> From: Peter Holm Date: Fri, 11 Sep 2009 19:23:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197100 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Sep 2009 19:23:12 -0000 Author: pho Date: Fri Sep 11 19:23:11 2009 New Revision: 197100 URL: http://svn.freebsd.org/changeset/base/197100 Log: Cleaned up the test scenario, added comments and retested in order to verify that the apparent name cache problem still exists. Modified: projects/stress2/misc/namecache.sh Modified: projects/stress2/misc/namecache.sh ============================================================================== --- projects/stress2/misc/namecache.sh Fri Sep 11 18:48:49 2009 (r197099) +++ projects/stress2/misc/namecache.sh Fri Sep 11 19:23:11 2009 (r197100) @@ -57,6 +57,10 @@ # Consistency is restored by a umount + mount of the FS +# Observations: +# No problems seen with vfs.lookup_shared=0. +# Does not fail in a "private" subdirectory + . ../default.cfg odir=`pwd` @@ -65,7 +69,11 @@ sed '1,/^EOF/d' < $odir/$0 > namecache.c cc -o namecache -Wall namecache.c rm -f namecache.c -rm -f file.0* +#dir=/tmp/namecache.dir # No problems seen +dir=/tmp +[ -d $dir ] || mkdir -p $dir +cd $dir + for i in `jot 30`; do for j in `jot 10`; do /tmp/namecache & @@ -76,12 +84,12 @@ for i in `jot 30`; do done done -if ls -l /tmp/file.* 2>/dev/null | grep -q file.0; then - echo "ls -l /tmp/file.0*" - ls -l /tmp/file.0* +if ls -l ${dir}/file.0* 2>&1 | egrep "file.0[0-9]" | grep -q "No such file"; then + echo "ls -l ${dir}/file.0*" + ls -l ${dir}/file.0* fi -rm -f /tmp/namecache # /tmp/file.0* +rm -f /tmp/namecache # /${dir}/file.0* exit EOF /* Test scenario for possible name cache problem */ @@ -103,7 +111,7 @@ __FBSDID("$FreeBSD$"); #include static char path[MAXPATHLEN+1]; -static char buf[8096]; +static char buf[64 * 1024]; void pm(void) @@ -115,12 +123,6 @@ pm(void) struct dirent *dp; char *bp = buf; - if (stat(".", &statb) != 0) - err(1, "stat(%s)", "."); - - if (!S_ISDIR(statb.st_mode)) - return; - if ((fd = open(".", O_RDONLY)) == -1) err(1, "open(%s)", "."); @@ -130,6 +132,7 @@ pm(void) space = space - n; bp = bp + n; } while (n != 0); + close(fd); bp = buf; dp = (struct dirent *)bp; From owner-svn-src-projects@FreeBSD.ORG Sat Sep 12 04:49:33 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2E9E1065676; Sat, 12 Sep 2009 04:49:33 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D23558FC14; Sat, 12 Sep 2009 04:49:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8C4nXwU075172; Sat, 12 Sep 2009 04:49:33 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8C4nXnv075170; Sat, 12 Sep 2009 04:49:33 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909120449.n8C4nXnv075170@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 12 Sep 2009 04:49:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197112 - projects/ppc64/sys/powerpc/aim X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2009 04:49:34 -0000 Author: nwhitehorn Date: Sat Sep 12 04:49:33 2009 New Revision: 197112 URL: http://svn.freebsd.org/changeset/base/197112 Log: Make physical memory map detection work on 32-bit systems again. Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c Modified: projects/ppc64/sys/powerpc/aim/ofw_machdep.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/ofw_machdep.c Sat Sep 12 01:37:22 2009 (r197111) +++ projects/ppc64/sys/powerpc/aim/ofw_machdep.c Sat Sep 12 04:49:33 2009 (r197112) @@ -180,7 +180,7 @@ parse_ofw_memory(phandle_t node, const c while (i < sz/sizeof(cell_t)) { #ifndef __powerpc64__ /* On 32-bit PPC, ignore regions starting above 4 GB */ - if (OFmem[i] > 0) { + if (address_cells > 1 && OFmem[i] > 0) { i += address_cells + size_cells; continue; } From owner-svn-src-projects@FreeBSD.ORG Sat Sep 12 05:39:52 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E53D106566C; Sat, 12 Sep 2009 05:39:52 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CA4A8FC0C; Sat, 12 Sep 2009 05:39:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8C5dqJi076139; Sat, 12 Sep 2009 05:39:52 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8C5dqdf076136; Sat, 12 Sep 2009 05:39:52 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909120539.n8C5dqdf076136@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 12 Sep 2009 05:39:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197113 - in projects/ppc64/sys/boot: ofw/libofw powerpc/ofw X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2009 05:39:52 -0000 Author: nwhitehorn Date: Sat Sep 12 05:39:51 2009 New Revision: 197113 URL: http://svn.freebsd.org/changeset/base/197113 Log: Teach the PowerPC loader how to emit metadata for 64-bit kernels, as well. Hopefully I don't have to muck around with the loader any more. Modified: projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c projects/ppc64/sys/boot/powerpc/ofw/metadata.c Modified: projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c ============================================================================== --- projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c Sat Sep 12 04:49:33 2009 (r197112) +++ projects/ppc64/sys/boot/ofw/libofw/ppc64_elf_freebsd.c Sat Sep 12 05:39:51 2009 (r197113) @@ -80,7 +80,7 @@ ppc64_ofw_elf_exec(struct preloaded_file /* Handle function descriptor */ entry = *(uint64_t *)e->e_entry; - if ((error = md_load(fp->f_args, &mdp)) != 0) + if ((error = md_load64(fp->f_args, &mdp)) != 0) return (error); printf("Kernel entry at 0x%lx ...\n", entry); Modified: projects/ppc64/sys/boot/powerpc/ofw/metadata.c ============================================================================== --- projects/ppc64/sys/boot/powerpc/ofw/metadata.c Sat Sep 12 04:49:33 2009 (r197112) +++ projects/ppc64/sys/boot/powerpc/ofw/metadata.c Sat Sep 12 05:39:51 2009 (r197113) @@ -175,6 +175,9 @@ md_copyenv(vm_offset_t addr) * MOD_SIZE sizeof(size_t) module size * MOD_METADATA (variable) type-specific metadata */ + +static int align; + #define COPY32(v, a, c) { \ u_int32_t x = (v); \ if (c) \ @@ -187,7 +190,7 @@ md_copyenv(vm_offset_t addr) COPY32(strlen(s) + 1, a, c) \ if (c) \ archsw.arch_copyin(s, a, strlen(s) + 1);\ - a += roundup(strlen(s) + 1, sizeof(u_long));\ + a += roundup(strlen(s) + 1, align); \ } #define MOD_NAME(a, s, c) MOD_STR(MODINFO_NAME, a, s, c) @@ -199,7 +202,7 @@ md_copyenv(vm_offset_t addr) COPY32(sizeof(s), a, c); \ if (c) \ archsw.arch_copyin(&s, a, sizeof(s)); \ - a += roundup(sizeof(s), sizeof(u_long)); \ + a += roundup(sizeof(s), align); \ } #define MOD_ADDR(a, s, c) MOD_VAR(MODINFO_ADDR, a, s, c) @@ -210,7 +213,7 @@ md_copyenv(vm_offset_t addr) COPY32(mm->md_size, a, c); \ if (c) \ archsw.arch_copyin(mm->md_data, a, mm->md_size);\ - a += roundup(mm->md_size, sizeof(u_long)); \ + a += roundup(mm->md_size, align); \ } #define MOD_END(a, c) { \ @@ -219,10 +222,11 @@ md_copyenv(vm_offset_t addr) } vm_offset_t -md_copymodules(vm_offset_t addr) +md_copymodules(vm_offset_t addr, int kern64) { struct preloaded_file *fp; struct file_metadata *md; + uint64_t scratch64; int c; c = addr != 0; @@ -233,8 +237,15 @@ md_copymodules(vm_offset_t addr) MOD_TYPE(addr, fp->f_type, c); if (fp->f_args) MOD_ARGS(addr, fp->f_args, c); - MOD_ADDR(addr, fp->f_addr, c); - MOD_SIZE(addr, fp->f_size, c); + if (kern64) { + scratch64 = fp->f_addr; + MOD_ADDR(addr, scratch64, c); + scratch64 = fp->f_size; + MOD_SIZE(addr, scratch64, c); + } else { + MOD_ADDR(addr, fp->f_addr, c); + MOD_SIZE(addr, fp->f_size, c); + } for (md = fp->f_metadata; md != NULL; md = md->md_next) { if (!(md->md_type & MODINFOMD_NOCOPY)) { MOD_METADATA(addr, md, c); @@ -254,7 +265,7 @@ md_copymodules(vm_offset_t addr) * - Module metadata are formatted and placed in kernel space. */ int -md_load(char *args, vm_offset_t *modulep) +md_load_dual(char *args, vm_offset_t *modulep, int kern64) { struct preloaded_file *kfp; struct preloaded_file *xp; @@ -263,11 +274,11 @@ md_load(char *args, vm_offset_t *modulep vm_offset_t addr; vm_offset_t envp; vm_offset_t size; + uint64_t scratch64; char *rootdevname; int howto; - int dtlb_slots; - int itlb_slots; + align = kern64 ? 8 : 4; howto = md_getboothowto(args); /* @@ -298,23 +309,48 @@ md_load(char *args, vm_offset_t *modulep addr = roundup(addr, PAGE_SIZE); kernend = 0; - kfp = file_findfile(NULL, "elf32 kernel"); + kfp = file_findfile(NULL, kern64 ? "elf64 kernel" : "elf32 kernel"); if (kfp == NULL) kfp = file_findfile(NULL, "elf kernel"); if (kfp == NULL) panic("can't find kernel file"); file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); - file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); - file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); + if (kern64) { + scratch64 = envp; + file_addmetadata(kfp, MODINFOMD_ENVP, sizeof scratch64, &scratch64); + scratch64 = kernend; + file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof scratch64, &scratch64); + } else { + file_addmetadata(kfp, MODINFOMD_ENVP, sizeof envp, &envp); + file_addmetadata(kfp, MODINFOMD_KERNEND, sizeof kernend, &kernend); + } *modulep = addr; - size = md_copymodules(0); + size = md_copymodules(0, kern64); kernend = roundup(addr + size, PAGE_SIZE); md = file_findmetadata(kfp, MODINFOMD_KERNEND); - bcopy(&kernend, md->md_data, sizeof kernend); - - (void)md_copymodules(addr); + if (kern64) { + scratch64 = kernend; + bcopy(&scratch64, md->md_data, sizeof scratch64); + } else { + bcopy(&kernend, md->md_data, sizeof kernend); + } + + (void)md_copymodules(addr, kern64); return(0); } + +int +md_load(char *args, vm_offset_t *modulep) +{ + return (md_load_dual(args, modulep, 0)); +} + +int +md_load64(char *args, vm_offset_t *modulep) +{ + return (md_load_dual(args, modulep, 1)); +} + From owner-svn-src-projects@FreeBSD.ORG Sat Sep 12 16:13:20 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55215106566B; Sat, 12 Sep 2009 16:13:20 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 441EC8FC14; Sat, 12 Sep 2009 16:13:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8CGDKOb090946; Sat, 12 Sep 2009 16:13:20 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8CGDKgo090944; Sat, 12 Sep 2009 16:13:20 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909121613.n8CGDKgo090944@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 12 Sep 2009 16:13:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197120 - projects/ppc64/sys/powerpc/aim64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2009 16:13:20 -0000 Author: nwhitehorn Date: Sat Sep 12 16:13:19 2009 New Revision: 197120 URL: http://svn.freebsd.org/changeset/base/197120 Log: Decide that the way we compute the VPN in TLBIE works, and is the only way it can work when running in 64-bit mode, so delete the other case. Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Modified: projects/ppc64/sys/powerpc/aim64/mmu_oea64.c ============================================================================== --- projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Sat Sep 12 15:50:08 2009 (r197119) +++ projects/ppc64/sys/powerpc/aim64/mmu_oea64.c Sat Sep 12 16:13:19 2009 (r197120) @@ -189,18 +189,13 @@ TLBIE(pmap_t pmap, vm_offset_t va) { uint64_t vpn; -#if 1 /* - * CPU documentation says that tlbie takes the VPN, not the - * VA. I think the code below does this correctly. We will see. + * Compute the virtual page number we wish to invalidate. */ vpn = (uint64_t)(va & ADDR_PIDX); if (pmap != NULL) vpn |= (va_to_vsid(pmap,va) << 28); -#else - vpn = va; -#endif #ifdef __powerpc64__ __asm __volatile("\ From owner-svn-src-projects@FreeBSD.ORG Sat Sep 12 17:36:00 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 978D3106566B; Sat, 12 Sep 2009 17:36:00 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 86C6C8FC16; Sat, 12 Sep 2009 17:36:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n8CHa0we092541; Sat, 12 Sep 2009 17:36:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8CHa0ZK092539; Sat, 12 Sep 2009 17:36:00 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200909121736.n8CHa0ZK092539@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 12 Sep 2009 17:36:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197121 - projects/ppc64/sys/powerpc/aim X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Sep 2009 17:36:00 -0000 Author: nwhitehorn Date: Sat Sep 12 17:36:00 2009 New Revision: 197121 URL: http://svn.freebsd.org/changeset/base/197121 Log: long is no longer 32 bits, so avoid confusing OF about that. We still have some kind of memory corruption issue that I don't understand when running on my G5. Modified: projects/ppc64/sys/powerpc/aim/platform_chrp.c Modified: projects/ppc64/sys/powerpc/aim/platform_chrp.c ============================================================================== --- projects/ppc64/sys/powerpc/aim/platform_chrp.c Sat Sep 12 16:13:19 2009 (r197120) +++ projects/ppc64/sys/powerpc/aim/platform_chrp.c Sat Sep 12 17:36:00 2009 (r197121) @@ -102,7 +102,7 @@ static u_long chrp_timebase_freq(platform_t plat, struct cpuref *cpuref) { phandle_t phandle; - long ticks = -1; + int32_t ticks = -1; phandle = cpuref->cr_hwref;