From owner-svn-src-projects@FreeBSD.ORG Sun Dec 20 17:53: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 8C6921065743; Sun, 20 Dec 2009 17:53:35 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7C2768FC15; Sun, 20 Dec 2009 17:53: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 nBKHrZX0070974; Sun, 20 Dec 2009 17:53:35 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBKHrZwS070972; Sun, 20 Dec 2009 17:53:35 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200912201753.nBKHrZwS070972@svn.freebsd.org> From: Randall Stewart Date: Sun, 20 Dec 2009 17:53:35 +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: r200755 - projects/mips/sys/mips/rmi 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, 20 Dec 2009 17:53:35 -0000 Author: rrs Date: Sun Dec 20 17:53:35 2009 New Revision: 200755 URL: http://svn.freebsd.org/changeset/base/200755 Log: Adds JC's fix to get rid of stray intr's. Obtained from: JC - jayachandraanc@netlogicmicro.com Modified: projects/mips/sys/mips/rmi/iodi.c Modified: projects/mips/sys/mips/rmi/iodi.c ============================================================================== --- projects/mips/sys/mips/rmi/iodi.c Sun Dec 20 16:23:11 2009 (r200754) +++ projects/mips/sys/mips/rmi/iodi.c Sun Dec 20 17:53:35 2009 (r200755) @@ -119,7 +119,7 @@ iodi_setup_intr(device_t dev, device_t c xlr_write_reg(mmio, PIC_IRT_1_UART_0, ((1 << 31) | (level << 30) | (1 << 6) | (PIC_UART_0_IRQ))); if (rmi_spin_mutex_safe) mtx_unlock_spin(&xlr_pic_lock); - cpu_establish_hardintr("uart", NULL, + cpu_establish_hardintr("uart", filt, (driver_intr_t *) intr, (void *)arg, PIC_UART_0_IRQ, flags, cookiep); } else if (strcmp(device_get_name(child), "rge") == 0) { @@ -133,7 +133,7 @@ iodi_setup_intr(device_t dev, device_t c xlr_write_reg(mmio, PIC_IRT_1_BASE + irq - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31)); if (rmi_spin_mutex_safe) mtx_unlock_spin(&xlr_pic_lock); - cpu_establish_hardintr("rge", NULL, (driver_intr_t *) intr, (void *)arg, irq, flags, cookiep); + cpu_establish_hardintr("rge", filt, (driver_intr_t *) intr, (void *)arg, irq, flags, cookiep); } else if (strcmp(device_get_name(child), "ehci") == 0) { if (rmi_spin_mutex_safe) @@ -142,7 +142,7 @@ iodi_setup_intr(device_t dev, device_t c xlr_write_reg(mmio, PIC_IRT_1_BASE + PIC_USB_IRQ - PIC_IRQ_BASE, reg | (1 << 6) | (1 << 30) | (1 << 31)); if (rmi_spin_mutex_safe) mtx_unlock_spin(&xlr_pic_lock); - cpu_establish_hardintr("ehci", NULL, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep); + cpu_establish_hardintr("ehci", filt, (driver_intr_t *) intr, (void *)arg, PIC_USB_IRQ, flags, cookiep); } /* * This causes a panic and looks recursive to me (RRS). From owner-svn-src-projects@FreeBSD.ORG Mon Dec 21 11:29: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 639FA106566B; Mon, 21 Dec 2009 11:29:30 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 53D2E8FC13; Mon, 21 Dec 2009 11:29: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 nBLBTU7i026410; Mon, 21 Dec 2009 11:29:30 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBLBTU9U026408; Mon, 21 Dec 2009 11:29:30 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200912211129.nBLBTU9U026408@svn.freebsd.org> From: Randall Stewart Date: Mon, 21 Dec 2009 11:29: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: r200769 - projects/mips/sys/mips/rmi 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, 21 Dec 2009 11:29:30 -0000 Author: rrs Date: Mon Dec 21 11:29:30 2009 New Revision: 200769 URL: http://svn.freebsd.org/changeset/base/200769 Log: Fixes so kdb works. Modified: projects/mips/sys/mips/rmi/xlr_machdep.c Modified: projects/mips/sys/mips/rmi/xlr_machdep.c ============================================================================== --- projects/mips/sys/mips/rmi/xlr_machdep.c Mon Dec 21 11:06:41 2009 (r200768) +++ projects/mips/sys/mips/rmi/xlr_machdep.c Mon Dec 21 11:29:30 2009 (r200769) @@ -28,6 +28,8 @@ #include __FBSDID("$FreeBSD$"); +#include "opt_ddb.h" + #include #include #include @@ -49,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include /* cinit() */ +#include #include #include #include @@ -363,7 +366,7 @@ mips_init(void) #endif /* SMP */ kdb_init(); if (boothowto & RB_KDB) { - kdb_enter("Boot flags requested debugger"); + kdb_enter("Boot flags requested debugger", NULL); } #endif } From owner-svn-src-projects@FreeBSD.ORG Wed Dec 23 08:13:44 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 C5932106568B; Wed, 23 Dec 2009 08:13:44 +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 B53828FC1E; Wed, 23 Dec 2009 08:13:44 +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 nBN8Di0A090453; Wed, 23 Dec 2009 08:13:44 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBN8DiAx090451; Wed, 23 Dec 2009 08:13:44 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200912230813.nBN8DiAx090451@svn.freebsd.org> From: Warner Losh Date: Wed, 23 Dec 2009 08:13:44 +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: r200892 - projects/mips/lib/csu/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, 23 Dec 2009 08:13:44 -0000 Author: imp Date: Wed Dec 23 08:13:44 2009 New Revision: 200892 URL: http://svn.freebsd.org/changeset/base/200892 Log: Load gp for N32 and N64 operations. Obtained from: Cavium's Octeon port Modified: projects/mips/lib/csu/mips/crtn.S Modified: projects/mips/lib/csu/mips/crtn.S ============================================================================== --- projects/mips/lib/csu/mips/crtn.S Wed Dec 23 06:52:12 2009 (r200891) +++ projects/mips/lib/csu/mips/crtn.S Wed Dec 23 08:13:44 2009 (r200892) @@ -9,6 +9,9 @@ __FBSDID("$FreeBSD$"); .section .fini,"ax",%progbits lw ra, 28(sp) +#if defined(__mips_n64) || defined(__mips_n32) + lw gp, 16(sp) +#endif .set noreorder j ra addu sp, sp, 32 From owner-svn-src-projects@FreeBSD.ORG Wed Dec 23 08:16:53 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 C1A7A1065676; Wed, 23 Dec 2009 08:16:53 +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 B106A8FC21; Wed, 23 Dec 2009 08:16:53 +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 nBN8GrKU090551; Wed, 23 Dec 2009 08:16:53 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBN8Grjd090549; Wed, 23 Dec 2009 08:16:53 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200912230816.nBN8Grjd090549@svn.freebsd.org> From: Warner Losh Date: Wed, 23 Dec 2009 08:16:53 +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: r200893 - projects/mips/lib/csu/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, 23 Dec 2009 08:16:53 -0000 Author: imp Date: Wed Dec 23 08:16:53 2009 New Revision: 200893 URL: http://svn.freebsd.org/changeset/base/200893 Log: Start to add support for N32 and N64 ABIs. In addition, add a work around for (or maybe you would call it increase compatibility with) Cavium toolchain: the .cprestore macro references fp rather than sp, so we need to copy sp to fp in a couple of places. Also add a couple of comments to explain what's going on. Obtained from: Cavium FreeBSD/octeon port. Modified: projects/mips/lib/csu/mips/crti.S Modified: projects/mips/lib/csu/mips/crti.S ============================================================================== --- projects/mips/lib/csu/mips/crti.S Wed Dec 23 08:13:44 2009 (r200892) +++ projects/mips/lib/csu/mips/crti.S Wed Dec 23 08:16:53 2009 (r200893) @@ -5,6 +5,13 @@ __FBSDID("$FreeBSD$"); .align 4 .globl _init .type _init,%function + + /* + * The Cavium toolchain apparently has code that references $fp + * instead of $sp for the .cprestore 16 macro. The move doesn't + * hurt on other toolchains, so unconditionally compile it in for + * now. + */ _init: #ifdef __ABICALLS__ .set noreorder @@ -13,7 +20,7 @@ _init: subu sp, sp, 32 .cprestore 16 sw ra, 28(sp) - + move s8, sp /* See note above */ #else subu sp, sp, 32 sw ra, 28(sp) @@ -24,14 +31,30 @@ _init: .globl _fini .type _fini,%function _fini: + +#if defined (__mips_n64) || defined (__mips_n32) +#ifdef __ABICALLS__ + subu sp, sp, 32 + sw gp, 16(sp) + sw ra, 28(sp) + move s8, sp +#else + subu sp, sp, 32 + sw ra, 28(sp) +#endif /*__ABICALLS__*/ + +#else #ifdef __ABICALLS__ .set noreorder .cpload $25 .set reorder subu sp, sp, 32 - .cprestore 16 + move s8, sp /* See note above */ + .cprestore 16 /* xxx missing in Cavium's version -- why? */ sw ra, 28(sp) #else subu sp, sp, 32 sw ra, 28(sp) -#endif +#endif /* __ABICALLS__ */ + +#endif /* __mips_n64 || __mips_n32 */ From owner-svn-src-projects@FreeBSD.ORG Wed Dec 23 08:22:48 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 955EE106566C; Wed, 23 Dec 2009 08:22:48 +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 844BA8FC13; Wed, 23 Dec 2009 08:22:48 +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 nBN8MmJH090764; Wed, 23 Dec 2009 08:22:48 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBN8Mm3j090762; Wed, 23 Dec 2009 08:22:48 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <200912230822.nBN8Mm3j090762@svn.freebsd.org> From: Warner Losh Date: Wed, 23 Dec 2009 08:22:48 +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: r200894 - projects/mips/lib/csu/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, 23 Dec 2009 08:22:48 -0000 Author: imp Date: Wed Dec 23 08:22:48 2009 New Revision: 200894 URL: http://svn.freebsd.org/changeset/base/200894 Log: Bring in support for n64 and n32 ABIs, at least at the base. o Rename __start to __start_mips and change the args a little o Create a new __start written in assembler that copes with the different ABIs and rewrites the args a little to make their passing more abi agnostic. o Add an alias _start for __start for the Cavium toolchain (in the cavium port, a custom ld script is used which references _start instead of the traditional mips __start). o call _init_tls() when we aren't being an a.out shared library (which is the only time _DYNAMIC is != NULL, I think). We could likely retire support for a.out shared libraries entirely, but that will be in the future when I'm sure there's not some subtle reason to keep them around. # Note: the reason mips starts at __start instead of _start is purely # historical, but I didn't want to change it here and in the # toolchain. The Cavium build process is kind of the odd duck here, # but it is trivial to support both, so why not... Modified: projects/mips/lib/csu/mips/crt1.c Modified: projects/mips/lib/csu/mips/crt1.c ============================================================================== --- projects/mips/lib/csu/mips/crt1.c Wed Dec 23 08:16:53 2009 (r200893) +++ projects/mips/lib/csu/mips/crt1.c Wed Dec 23 08:22:48 2009 (r200894) @@ -1,6 +1,4 @@ /*- - * Copyright 1996-1998 John D. Polstra. - * All rights reserved. * Copyright (c) 1995 Christopher G. Demetriou * All rights reserved. * @@ -65,37 +63,94 @@ extern int etext; char **environ; const char *__progname = ""; +struct ps_strings *__ps_strings; void __gccmain(void) {} void __main(void) {} +/* + * Historically, mips has used __start for the beginning address of programs. + * However, the Cavium toolchain (and maybe others) use _start. Define both + * here. The assembler code here tries to juggle the arguments such that they + * are right for all ABIs and then calls __start_mips which is what used to + * be just plain __start, and still is on other BSD ports. + */ + /* The entry function. */ +__asm(" .text \n" +" .align 8 \n" +" .globl _start \n" +" _start: \n" +" .globl __start \n" +" __start: \n" +#if defined(__mips_n32) || defined(__mips_n64) +" .cpsetup $25, $24, __start\n" +#else +" .set noreorder \n" +" .cpload $25 \n" +" .set reorder \n" +#endif +" /* Get cleanup routine and main object set by rtld */\n" +" /* Note that a2 is already set to ps_string by _rtld_start */\n" +" /* move a3, a0 */\n" +" /* move t0, a1 */\n" +" /* Get argc, argv from stack */ \n" +" /* lw a0, 0(sp) */\n" +" /* move a1, sp */\n" +" /* addu a1, 4 */\n" +" \n" +" /* Stack should 8bytes aligned */\n" +" /* required by ABI to pass */\n" +" /* 64-bits arguments */\n" +" /* and sp, ~8 */\n" +" /* subu sp, sp, 20 */\n" +" /* sw t0, 16(sp) */\n" +" \n" +" move $7, $4 /* atexit */\n" +" move $8, $5 /* main_obj entry */\n" +#if defined(__mips_n64) +" ld $4, 0($29) \n" +" move $5, $29 \n" +" addu $5, 8 \n" +#else +" lw $4, 0($29) \n" +" move $5, $29 \n" +" addu $5, 4 \n" +#endif +" \n" +" and $29, 0xfffffff8 \n" +" subu $29, $29, 24 /* args slot + cleanup + 4 bytes padding */ \n" +" sw $8, 16($29) \n" +"\n" +" la $25, __start_mips \n" +" nop \n" +" j $25\n"); +/* ARGSUSED */ + void -__start(char **ap, - void (*cleanup)(void), /* from shared loader */ - struct Struct_Obj_Entry *obj, /* from shared loader */ - struct ps_strings *ps_strings) +__start_mips(int argc, char **argv, struct ps_strings *ps_strings, + void (*cleanup)(void), struct Struct_Obj_Entry *obj __unused) { - int argc; - char **argv; char **env; + const char *s; - argc = * (long *) ap; - argv = ap + 1; - env = ap + 2 + argc; + env = argv + argc + 1; environ = env; + if(argc > 0 && argv[0] != NULL) { - const char *s; __progname = argv[0]; for (s = __progname; *s != '\0'; s++) if (*s == '/') __progname = s + 1; } -#ifndef NOSHARED + __ps_strings = ps_strings; + if (&_DYNAMIC != NULL) atexit(cleanup); -#endif + else + _init_tls(); + #ifdef GCRT atexit(_mcleanup); #endif From owner-svn-src-projects@FreeBSD.ORG Wed Dec 23 14:48:26 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 BB11D1065670; Wed, 23 Dec 2009 14:48:26 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A927D8FC17; Wed, 23 Dec 2009 14:48:26 +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 nBNEmQRD000901; Wed, 23 Dec 2009 14:48:26 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBNEmQO2000900; Wed, 23 Dec 2009 14:48:26 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200912231448.nBNEmQO2000900@svn.freebsd.org> From: Randall Stewart Date: Wed, 23 Dec 2009 14:48:26 +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: r200900 - projects/mips/sys/mips/rmi 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, 23 Dec 2009 14:48:26 -0000 Author: rrs Date: Wed Dec 23 14:48:26 2009 New Revision: 200900 URL: http://svn.freebsd.org/changeset/base/200900 Log: This is a list of the files for RMI's md_root file system to get to multi-user. There are still some rough edges, rge has an issue. And someone held a spin lock to long.. But its coming along :-) Added: projects/mips/sys/mips/rmi/rootfs_list.txt Added: projects/mips/sys/mips/rmi/rootfs_list.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mips/sys/mips/rmi/rootfs_list.txt Wed Dec 23 14:48:26 2009 (r200900) @@ -0,0 +1,676 @@ +# This is the list of files that +# should be in your rootfs (copy it from +# the build world nfsmount dir. When the rge0 +# driver gets fixed we should be able to start +# using nfs mount... for now we need to use MD_ROOT +./.cshrc +./.profile +./COPYRIGHT +./bin +./bin/cat +./bin/chflags +./bin/chio +./bin/chmod +./bin/cp +./bin/csh +./bin/tcsh +./bin/date +./bin/dd +./bin/df +./bin/domainname +./bin/echo +./bin/ed +./bin/red +./bin/expr +./bin/getfacl +./bin/hostname +./bin/kenv +./bin/kill +./bin/ln +./bin/link +./bin/ls +./bin/mkdir +./bin/mv +./bin/pax +./bin/pkill +./bin/pgrep +./bin/ps +./bin/pwd +./bin/rcp +./bin/realpath +./bin/rm +./bin/unlink +./bin/rmail +./bin/rmdir +./bin/setfacl +./bin/sh +./bin/sleep +./bin/stty +./bin/sync +./bin/test +./bin/[ +./bin/uuidgen +./etc +./etc/bluetooth +./etc/bluetooth/hcsecd.conf +./etc/bluetooth/hosts +./etc/bluetooth/protocols +./etc/defaults +./etc/defaults/bluetooth.device.conf +./etc/defaults/devfs.rules +./etc/defaults/periodic.conf +./etc/defaults/rc.conf +./etc/devd +./etc/devd/asus.conf +./etc/gnats +./etc/gnats/freefall +./etc/gss +./etc/gss/mech +./etc/gss/qop +./etc/mail +./etc/mail/mailer.conf +./etc/mail/freebsd.mc +./etc/mail/freebsd.cf +./etc/mail/freebsd.submit.mc +./etc/mail/freebsd.submit.cf +./etc/mail/helpfile +./etc/mail/sendmail.cf +./etc/mail/submit.cf +./etc/mail/Makefile +./etc/mail/README +./etc/mail/access.sample +./etc/mail/virtusertable.sample +./etc/mail/mailertable.sample +./etc/mail/aliases +./etc/mtree +./etc/mtree/BSD.include.dist +./etc/mtree/BSD.root.dist +./etc/mtree/BSD.usr.dist +./etc/mtree/BSD.var.dist +./etc/mtree/BSD.sendmail.dist +./etc/mtree/BIND.chroot.dist +./etc/pam.d +./etc/pam.d/README +./etc/pam.d/atrun +./etc/pam.d/cron +./etc/pam.d/ftpd +./etc/pam.d/imap +./etc/pam.d/kde +./etc/pam.d/login +./etc/pam.d/other +./etc/pam.d/passwd +./etc/pam.d/pop3 +./etc/pam.d/rsh +./etc/pam.d/sshd +./etc/pam.d/su +./etc/pam.d/system +./etc/pam.d/telnetd +./etc/pam.d/xdm +./etc/pam.d/ftp +./etc/periodic +./etc/periodic/daily +./etc/periodic/daily/100.clean-disks +./etc/periodic/daily/110.clean-tmps +./etc/periodic/daily/120.clean-preserve +./etc/periodic/daily/200.backup-passwd +./etc/periodic/daily/330.news +./etc/periodic/daily/400.status-disks +./etc/periodic/daily/404.status-zfs +./etc/periodic/daily/405.status-ata-raid +./etc/periodic/daily/406.status-gmirror +./etc/periodic/daily/407.status-graid3 +./etc/periodic/daily/408.status-gstripe +./etc/periodic/daily/409.status-gconcat +./etc/periodic/daily/420.status-network +./etc/periodic/daily/450.status-security +./etc/periodic/daily/999.local +./etc/periodic/daily/310.accounting +./etc/periodic/daily/470.status-named +./etc/periodic/daily/300.calendar +./etc/periodic/daily/130.clean-msgs +./etc/periodic/daily/480.status-ntpd +./etc/periodic/daily/140.clean-rwho +./etc/periodic/daily/430.status-rwho +./etc/periodic/daily/150.clean-hoststat +./etc/periodic/daily/210.backup-aliases +./etc/periodic/daily/440.status-mailq +./etc/periodic/daily/460.status-mail-rejects +./etc/periodic/daily/500.queuerun +./etc/periodic/monthly +./etc/periodic/monthly/999.local +./etc/periodic/monthly/200.accounting +./etc/periodic/security +./etc/periodic/security/100.chksetuid +./etc/periodic/security/200.chkmounts +./etc/periodic/security/300.chkuid0 +./etc/periodic/security/400.passwdless +./etc/periodic/security/410.logincheck +./etc/periodic/security/700.kernelmsg +./etc/periodic/security/800.loginfail +./etc/periodic/security/900.tcpwrap +./etc/periodic/security/security.functions +./etc/periodic/security/510.ipfdenied +./etc/periodic/security/500.ipfwdenied +./etc/periodic/security/550.ipfwlimit +./etc/periodic/security/520.pfdenied +./etc/periodic/weekly +./etc/periodic/weekly/340.noid +./etc/periodic/weekly/999.local +./etc/periodic/weekly/310.locate +./etc/periodic/weekly/320.whatis +./etc/periodic/weekly/330.catman +./etc/periodic/weekly/400.status-pkg +./etc/ppp +./etc/ppp/ppp.conf +./etc/rc.d +./etc/rc.d/DAEMON +./etc/rc.d/FILESYSTEMS +./etc/rc.d/LOGIN +./etc/rc.d/NETWORKING +./etc/rc.d/SERVERS +./etc/rc.d/abi +./etc/rc.d/accounting +./etc/rc.d/addswap +./etc/rc.d/adjkerntz +./etc/rc.d/amd +./etc/rc.d/apm +./etc/rc.d/apmd +./etc/rc.d/archdep +./etc/rc.d/atm1 +./etc/rc.d/atm2 +./etc/rc.d/atm3 +./etc/rc.d/auditd +./etc/rc.d/bgfsck +./etc/rc.d/bluetooth +./etc/rc.d/bootparams +./etc/rc.d/bridge +./etc/rc.d/bthidd +./etc/rc.d/ccd +./etc/rc.d/cleanvar +./etc/rc.d/cleartmp +./etc/rc.d/cron +./etc/rc.d/ddb +./etc/rc.d/defaultroute +./etc/rc.d/devd +./etc/rc.d/devfs +./etc/rc.d/dhclient +./etc/rc.d/dmesg +./etc/rc.d/dumpon +./etc/rc.d/encswap +./etc/rc.d/faith +./etc/rc.d/fsck +./etc/rc.d/ftp-proxy +./etc/rc.d/ftpd +./etc/rc.d/gbde +./etc/rc.d/geli +./etc/rc.d/geli2 +./etc/rc.d/gssd +./etc/rc.d/hcsecd +./etc/rc.d/hostapd +./etc/rc.d/hostid +./etc/rc.d/hostid_save +./etc/rc.d/hostname +./etc/rc.d/inetd +./etc/rc.d/initrandom +./etc/rc.d/ip6addrctl +./etc/rc.d/ip6fw +./etc/rc.d/ipfilter +./etc/rc.d/ipfs +./etc/rc.d/ipfw +./etc/rc.d/ipmon +./etc/rc.d/ipnat +./etc/rc.d/ipsec +./etc/rc.d/ipxrouted +./etc/rc.d/jail +./etc/rc.d/kadmind +./etc/rc.d/kerberos +./etc/rc.d/keyserv +./etc/rc.d/kldxref +./etc/rc.d/kpasswdd +./etc/rc.d/ldconfig +./etc/rc.d/local +./etc/rc.d/localpkg +./etc/rc.d/lockd +./etc/rc.d/lpd +./etc/rc.d/mixer +./etc/rc.d/motd +./etc/rc.d/mountcritlocal +./etc/rc.d/mountcritremote +./etc/rc.d/mountlate +./etc/rc.d/mdconfig +./etc/rc.d/mdconfig2 +./etc/rc.d/mountd +./etc/rc.d/moused +./etc/rc.d/mroute6d +./etc/rc.d/mrouted +./etc/rc.d/msgs +./etc/rc.d/named +./etc/rc.d/natd +./etc/rc.d/netif +./etc/rc.d/netoptions +./etc/rc.d/newsyslog +./etc/rc.d/pf +./etc/rc.d/nfscbd +./etc/rc.d/nfsclient +./etc/rc.d/nfsd +./etc/rc.d/nfsserver +./etc/rc.d/nfsuserd +./etc/rc.d/nisdomain +./etc/rc.d/nsswitch +./etc/rc.d/ntpd +./etc/rc.d/ntpdate +./etc/rc.d/othermta +./etc/rc.d/pflog +./etc/rc.d/pfsync +./etc/rc.d/powerd +./etc/rc.d/power_profile +./etc/rc.d/ppp +./etc/rc.d/pppoed +./etc/rc.d/pwcheck +./etc/rc.d/quota +./etc/rc.d/random +./etc/rc.d/rarpd +./etc/rc.d/resolv +./etc/rc.d/rfcomm_pppd_server +./etc/rc.d/root +./etc/rc.d/route6d +./etc/rc.d/routed +./etc/rc.d/routing +./etc/rc.d/rpcbind +./etc/rc.d/rtadvd +./etc/rc.d/rwho +./etc/rc.d/savecore +./etc/rc.d/sdpd +./etc/rc.d/securelevel +./etc/rc.d/sendmail +./etc/rc.d/serial +./etc/rc.d/sppp +./etc/rc.d/statd +./etc/rc.d/static_arp +./etc/rc.d/stf +./etc/rc.d/swap1 +./etc/rc.d/syscons +./etc/rc.d/sysctl +./etc/rc.d/syslogd +./etc/rc.d/timed +./etc/rc.d/tmp +./etc/rc.d/ugidfw +./etc/rc.d/var +./etc/rc.d/virecover +./etc/rc.d/watchdogd +./etc/rc.d/wpa_supplicant +./etc/rc.d/ypbind +./etc/rc.d/yppasswdd +./etc/rc.d/ypserv +./etc/rc.d/ypset +./etc/rc.d/ypupdated +./etc/rc.d/ypxfrd +./etc/rc.d/zfs +./etc/rc.d/zvol +./etc/rc.d/sshd +./etc/rc.d/nscd +./etc/security +./etc/security/audit_class +./etc/security/audit_event +./etc/security/audit_control +./etc/security/audit_user +./etc/security/audit_warn +./etc/ssh +./etc/ssh/ssh_config +./etc/ssh/sshd_config +./etc/ssh/moduli +./etc/ssl +./etc/ssl/openssl.cnf +./etc/auth.conf +./etc/crontab +./etc/devd.conf +./etc/devfs.conf +./etc/ddb.conf +./etc/dhclient.conf +./etc/disktab +./etc/fbtab +./etc/ftpusers +./etc/gettytab +./etc/group +./etc/hosts +./etc/hosts.allow +./etc/hosts.equiv +./etc/inetd.conf +./etc/libalias.conf +./etc/login.access +./etc/login.conf +./etc/mac.conf +./etc/motd +./etc/netconfig +./etc/network.subr +./etc/networks +./etc/newsyslog.conf +./etc/nsswitch.conf +./etc/phones +./etc/profile +./etc/protocols +./etc/rc +./etc/rc.bsdextended +./etc/rc.firewall +./etc/rc.firewall6 +./etc/rc.initdiskless +./etc/rc.sendmail +./etc/rc.shutdown +./etc/rc.subr +./etc/remote +./etc/rpc +./etc/services +./etc/shells +./etc/sysctl.conf +./etc/syslog.conf +./etc/ttys +./etc/amd.map +./etc/apmd.conf +./etc/freebsd-update.conf +./etc/locate.rc +./etc/hosts.lpd +./etc/printcap +./etc/mail.rc +./etc/manpath.config +./etc/ntp.conf +./etc/nscd.conf +./etc/portsnap.conf +./etc/pf.os +./etc/csh.cshrc +./etc/csh.login +./etc/csh.logout +./etc/regdomain.xml +./etc/login.conf.db +./etc/pwd.db +./etc/netstart +./etc/pccard_ether +./etc/rc.suspend +./etc/rc.resume +./etc/master.passwd +./etc/nsmb.conf +./etc/opieaccess +./etc/spwd.db +./etc/passwd +./etc/dumpdates +./etc/fstab +./etc/rc.conf +./etc/resolv.conf +./etc/termcap +./lib +./lib/geom +./lib/geom/geom_cache.so +./lib/geom/geom_concat.so +./lib/geom/geom_eli.so +./lib/geom/geom_journal.so +./lib/geom/geom_label.so +./lib/geom/geom_mirror.so +./lib/geom/geom_multipath.so +./lib/geom/geom_nop.so +./lib/geom/geom_part.so +./lib/geom/geom_raid3.so +./lib/geom/geom_shsec.so +./lib/geom/geom_stripe.so +./lib/geom/geom_virstor.so +./lib/libc.so.7 +./lib/libcrypt.so.5 +./lib/libkvm.so.5 +./lib/libm.so.5 +./lib/libmd.so.5 +./lib/libncurses.so.8 +./lib/libncursesw.so.8 +./lib/libsbuf.so.5 +./lib/libutil.so.8 +./lib/libalias.so.7 +./lib/libalias_cuseeme.so +./lib/libalias_dummy.so +./lib/libalias_ftp.so +./lib/libalias_irc.so +./lib/libalias_nbt.so +./lib/libalias_pptp.so +./lib/libalias_skinny.so +./lib/libalias_smedia.so +./lib/libbegemot.so.4 +./lib/libcam.so.5 +./lib/libdevstat.so.7 +./lib/libedit.so.7 +./lib/libbsdxml.so.4 +./lib/libgeom.so.5 +./lib/libipsec.so.4 +./lib/libipx.so.5 +./lib/libjail.so.1 +./lib/libkiconv.so.4 +./lib/libpcap.so.7 +./lib/libthr.so.3 +./lib/libufs.so.5 +./lib/libz.so.5 +./lib/libgcc_s.so.1 +./lib/libreadline.so.8 +./lib/libssp.so.0 +./lib/libcrypto.so.6 +./libexec +./libexec/ld-elf.so.1 +./libexec/ld-elf.so.1.old +./sbin +./sbin/adjkerntz +./sbin/atacontrol +./sbin/badsect +./sbin/bsdlabel +./sbin/camcontrol +./sbin/ccdconfig +./sbin/clri +./sbin/comcontrol +./sbin/conscontrol +./sbin/devd +./sbin/devfs +./sbin/dhclient +./sbin/dhclient-script +./sbin/dmesg +./sbin/dump +./sbin/rdump +./sbin/dumpfs +./sbin/dumpon +./sbin/fdisk +./sbin/ffsinfo +./sbin/fsck +./sbin/fsck_ffs +./sbin/fsck_ufs +./sbin/fsck_4.2bsd +./sbin/fsdb +./sbin/fsirand +./sbin/gbde +./sbin/fsck_msdosfs +./sbin/geom +./sbin/gcache +./sbin/gconcat +./sbin/geli +./sbin/gjournal +./sbin/glabel +./sbin/gmirror +./sbin/gmultipath +./sbin/gnop +./sbin/gpart +./sbin/graid3 +./sbin/gshsec +./sbin/gstripe +./sbin/gvirstor +./sbin/ggatec +./sbin/ggated +./sbin/ggatel +./sbin/growfs +./sbin/gvinum +./sbin/ifconfig +./sbin/init +./sbin/ipf +./sbin/ipfs +./sbin/ipfstat +./sbin/ipftest +./sbin/ipmon +./sbin/ipnat +./sbin/ippool +./sbin/md5 +./sbin/ipfw +./sbin/ipresend +./sbin/iscontrol +./sbin/kldconfig +./sbin/kldload +./sbin/kldstat +./sbin/kldunload +./sbin/ldconfig +./sbin/rmd160 +./sbin/sha1 +./sbin/sha256 +./sbin/mdconfig +./sbin/mdmfs +./sbin/mount_mfs +./sbin/mknod +./sbin/mksnap_ffs +./sbin/mount +./sbin/mount_cd9660 +./sbin/mount_msdosfs +./sbin/mount_nfs +./sbin/mount_newnfs +./sbin/mount_ntfs +./sbin/mount_nullfs +./sbin/mount_udf +./sbin/mount_unionfs +./sbin/natd +./sbin/ddb +./sbin/newfs +./sbin/newfs_msdos +./sbin/nfsiod +./sbin/nos-tun +./sbin/pfctl +./sbin/pflogd +./sbin/ping +./sbin/ping6 +./sbin/quotacheck +./sbin/rcorder +./sbin/reboot +./sbin/nextboot +./sbin/halt +./sbin/fastboot +./sbin/fasthalt +./sbin/recoverdisk +./sbin/restore +./sbin/rrestore +./sbin/route +./sbin/routed +./sbin/rtquery +./sbin/rtsol +./sbin/savecore +./sbin/setkey +./sbin/shutdown +./sbin/spppcontrol +./sbin/swapon +./sbin/swapoff +./sbin/swapctl +./sbin/sysctl +./sbin/tunefs +./sbin/umount +./sbin/init.bak +./var +./var/crash +./var/crash/minfree +./var/db +./var/db/locate.database +./var/log +./var/log/sendmail.st +./var/named +./var/named/etc +./var/named/etc/namedb +./var/named/etc/namedb/master +./var/named/etc/namedb/master/empty.db +./var/named/etc/namedb/master/localhost-forward.db +./var/named/etc/namedb/master/localhost-reverse.db +./var/named/etc/namedb/named.conf +./var/named/etc/namedb/named.root +./var/yp +./var/yp/Makefile.dist +./var/run +./var/cron +./var/cron/tabs +./root +./root/.k5login +./root/.profile +./root/.cshrc +./root/.login +./list +./dev +./usr +./usr/sbin +./usr/sbin/newsyslog +./usr/sbin/syslogd +./usr/sbin/ip6addrctl +./usr/sbin/sendmail +./usr/sbin/cron +./usr/lib +./usr/lib/libpam.so.5 +./usr/lib/libpam.so +./usr/lib/pam_opie.so.5 +./usr/lib/libbsm.so.3 +./usr/lib/libbsm.so +./usr/lib/pam_chroot.so.5 +./usr/lib/pam_tacplus.so.5 +./usr/lib/pam_ssh.so.5 +./usr/lib/pam_self.so.5 +./usr/lib/pam_securetty.so.5 +./usr/lib/pam_rootok.so.5 +./usr/lib/pam_rhosts.so.5 +./usr/lib/pam_radius.so.5 +./usr/lib/pam_permit.so.5 +./usr/lib/pam_passwdqc.so.5 +./usr/lib/libcom_err.so.5 +./usr/lib/libcom_err.so +./usr/lib/pam_opieaccess.so.5 +./usr/lib/pam_nologin.so.5 +./usr/lib/libc.so.7 +./usr/lib/pam_login_access.so.5 +./usr/lib/pam_lastlog.so.5 +./usr/lib/pam_ksu.so.5 +./usr/lib/pam_krb5.so.5 +./usr/lib/pam_guest.so.5 +./usr/lib/pam_group.so.5 +./usr/lib/pam_ftpusers.so.5 +./usr/lib/pam_exec.so.5 +./usr/lib/pam_echo.so.5 +./usr/lib/pam_deny.so.5 +./usr/lib/pam_unix.so.5 +./usr/lib/pam_chroot.so +./usr/lib/libopie.so +./usr/lib/pam_deny.so +./usr/lib/pam_echo.so +./usr/lib/pam_exec.so +./usr/lib/pam_ftpusers.so +./usr/lib/pam_group.so +./usr/lib/pam_guest.so +./usr/lib/pam_krb5.so +./usr/lib/pam_ksu.so +./usr/lib/pam_lastlog.so +./usr/lib/pam_login_access.so +./usr/lib/pam_nologin.so +./usr/lib/pam_opie.so +./usr/lib/pam_opieaccess.so +./usr/lib/pam_passwdqc.so +./usr/lib/pam_permit.so +./usr/lib/pam_radius.so +./usr/lib/pam_rhosts.so +./usr/lib/pam_rootok.so +./usr/lib/pam_securetty.so +./usr/lib/pam_self.so +./usr/lib/pam_ssh.so +./usr/lib/pam_tacplus.so +./usr/lib/pam_unix.so +./usr/lib/libmd.so.5 +./usr/lib/libbz2.so.4 +./usr/lib/libgnuregex.so.5 +./usr/lib/libypclnt.so.4 +./usr/bin +./usr/bin/mktemp +./usr/bin/login +./usr/bin/uname +./usr/bin/awk +./usr/bin/logger +./usr/bin/grep +./usr/bin/ftp +./usr/libexec +./usr/libexec/getty From owner-svn-src-projects@FreeBSD.ORG Wed Dec 23 14:55: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 8E8C01065676; Wed, 23 Dec 2009 14:55:33 +0000 (UTC) (envelope-from rrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7EAEA8FC16; Wed, 23 Dec 2009 14:55: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 nBNEtXYZ001092; Wed, 23 Dec 2009 14:55:33 GMT (envelope-from rrs@svn.freebsd.org) Received: (from rrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBNEtXqT001090; Wed, 23 Dec 2009 14:55:33 GMT (envelope-from rrs@svn.freebsd.org) Message-Id: <200912231455.nBNEtXqT001090@svn.freebsd.org> From: Randall Stewart Date: Wed, 23 Dec 2009 14:55: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: r200901 - projects/mips/sys/mips/rmi 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, 23 Dec 2009 14:55:33 -0000 Author: rrs Date: Wed Dec 23 14:55:33 2009 New Revision: 200901 URL: http://svn.freebsd.org/changeset/base/200901 Log: Add missing function that doesintr naming and init. Modified: projects/mips/sys/mips/rmi/intr_machdep.c Modified: projects/mips/sys/mips/rmi/intr_machdep.c ============================================================================== --- projects/mips/sys/mips/rmi/intr_machdep.c Wed Dec 23 14:48:26 2009 (r200900) +++ projects/mips/sys/mips/rmi/intr_machdep.c Wed Dec 23 14:55:33 2009 (r200901) @@ -50,8 +50,9 @@ __FBSDID("$FreeBSD$"); #include /*#include */ - +static mips_intrcnt_t mips_intr_counters[XLR_MAX_INTR]; struct mips_intrhand mips_intr_handlers[XLR_MAX_INTR]; +static int intrcnt_index; static void mips_mask_hard_irq(void *source) @@ -113,8 +114,6 @@ cpu_establish_softintr(const char *name, cpu_establish_hardintr(name, filt, handler, arg, irq, flags, cookiep); } - - void cpu_intr(struct trapframe *tf) { @@ -180,3 +179,39 @@ cpu_intr(struct trapframe *tf) } critical_exit(); } + +void +mips_intrcnt_setname(mips_intrcnt_t counter, const char *name) +{ + int idx = counter - intrcnt; + + KASSERT(counter != NULL, ("mips_intrcnt_setname: NULL counter")); + + snprintf(intrnames + (MAXCOMLEN + 1) * idx, + MAXCOMLEN + 1, "%-*s", MAXCOMLEN, name); +} + +mips_intrcnt_t +mips_intrcnt_create(const char* name) +{ + mips_intrcnt_t counter = &intrcnt[intrcnt_index++]; + + mips_intrcnt_setname(counter, name); + return counter; +} + +void +cpu_init_interrupts() +{ + int i; + char name[MAXCOMLEN + 1]; + + /* + * Initialize all available vectors so spare IRQ + * would show up in systat output + */ + for (i = 0; i < XLR_MAX_INTR; i++) { + snprintf(name, MAXCOMLEN + 1, "int%d:", i); + mips_intr_counters[i] = mips_intrcnt_create(name); + } +}