==== //depot/user/benno/arm/sys/arm/arm/db_trace.c#1 - /home/suleiman/p4/arm/sys/arm/arm/db_trace.c ==== --- /tmp/tmp.1907.0 Sun Jun 4 03:18:38 2006 +++ /home/suleiman/p4/arm/sys/arm/arm/db_trace.c Mon May 29 20:10:37 2006 @@ -103,10 +103,12 @@ db_stack_trace_cmd(db_expr_t addr, db_ex db_setup_paging(db_simple_pager, &quit, db_lines_per_page); while (count-- && frame != NULL && !quit) { db_addr_t scp; +#if 0 u_int32_t savecode; int r; u_int32_t *rp; const char *sep; +#endif /* * In theory, the SCP isn't guaranteed to be in the function @@ -123,6 +125,7 @@ db_stack_trace_cmd(db_expr_t addr, db_ex db_printf("%s() at ", name); db_printsym(scp, DB_STGY_PROC); db_printf("\n"); +#if 0 #ifdef __PROG26 db_printf("scp=0x%08x rlv=0x%08x (", scp, frame[FR_RLV] & R15_PC); db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC); @@ -150,6 +153,7 @@ db_stack_trace_cmd(db_expr_t addr, db_ex } db_printf("\n"); +#endif /* * Switch to next frame up ==== //depot/user/benno/arm/sys/arm/arm/pmap.c#1 - /home/suleiman/p4/arm/sys/arm/arm/pmap.c ==== --- /tmp/tmp.1907.1 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/arm/arm/pmap.c Thu Jun 1 16:58:29 2006 @@ -148,6 +148,7 @@ #include __FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.47 2006/04/22 22:51:32 cognet Exp $"); +#define _KERNEL 1 #include #include #include @@ -176,6 +177,7 @@ __FBSDID("$FreeBSD: src/sys/arm/arm/pmap #include #include #include +#include #ifdef PMAP_DEBUG #define PDEBUG(_lev_,_stat_) \ @@ -3067,7 +3069,7 @@ pmap_is_prefaultable(pmap_t pmap, vm_off if (!pmap_get_pde_pte(pmap, addr, &pde, &pte)) return (FALSE); - if (*pte == 0) + if (pte && *pte == 0) return (TRUE); return (FALSE); } ==== //depot/user/benno/arm/sys/arm/conf/PXA2X0#6 - /home/suleiman/p4/arm/sys/arm/conf/PXA2X0 ==== --- /tmp/tmp.1907.2 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/arm/conf/PXA2X0 Thu Jun 1 19:52:46 2006 @@ -23,7 +23,7 @@ ident PXA2X0 # This probably wants to move somewhere else. Maybe we can create a basic # PXA2X0 config, then make a GUMSTIX config that includes the basic one, # adds the sn and smcphy devices and pulls in this hints file. -hints "GUMSTIX.hints" +#hints "GUMSTIX.hints" options PHYSADDR=0xa0000000 options KERNPHYSADDR=0xa0200000 @@ -86,8 +86,10 @@ options DDB #Enable the kernel debugg options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable checks to detect deadlocks and cycles -options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed +#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed options DIAGNOSTIC +options BREAK_TO_DEBUGGER + options XSCALE_CACHE_READ_WRITE_ALLOCATE ==== //depot/user/benno/arm/sys/arm/xscale/pxa2x0/pxa2x0_gpio.c#4 - /home/suleiman/p4/arm/sys/arm/xscale/pxa2x0/pxa2x0_gpio.c ==== --- /tmp/tmp.1907.3 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/arm/xscale/pxa2x0/pxa2x0_gpio.c Sat Jun 3 19:22:47 2006 @@ -178,12 +178,14 @@ pxa2x0_gpio_intrN(void *arg) gedr0 >>= 1; i++; } + i = 32; while (gedr1 != 0) { if (gedr1 & 1) pxa2x0_gpio_intr_handler(i); gedr1 >>= 1; i++; } + i = 64; while (gedr2 != 0) { if (gedr2 & 1) pxa2x0_gpio_intr_handler(i); @@ -317,7 +319,7 @@ pxa2x0_gpio_setup_intrhandler(const char event = gpio_events[gpio]; if (event == NULL) { error = intr_event_create(&event, (void *)gpio, 0, - (void (*)(void *))pxa2x0_gpio_intr_mask, "gpio%d:", gpio); + (void (*)(void *))pxa2x0_gpio_intr_unmask, "gpio%d:", gpio); if (error != 0) return (error); gpio_events[gpio] = event; ==== //depot/user/benno/arm/sys/arm/xscale/pxa2x0/pxa2x0_machdep.c#11 - /home/suleiman/p4/arm/sys/arm/xscale/pxa2x0/pxa2x0_machdep.c ==== --- /tmp/tmp.1907.4 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/arm/xscale/pxa2x0/pxa2x0_machdep.c Sat Jun 3 19:18:00 2006 @@ -212,7 +212,7 @@ initarm(void *arg, void *arg2) i = 0; j = 0; - boothowto |= RB_SERIAL; + boothowto |= RB_SERIAL | RB_SINGLE; bootverbose = 1; set_cpufuncs(); ==== //depot/user/benno/arm/sys/arm/xscale/pxa2x0/pxa2x0_timer.c#5 - /home/suleiman/p4/arm/sys/arm/xscale/pxa2x0/pxa2x0_timer.c ==== ==== //depot/user/benno/arm/sys/dev/sn/if_sn.c#9 - /home/suleiman/p4/arm/sys/dev/sn/if_sn.c ==== --- /tmp/tmp.1907.5 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/dev/sn/if_sn.c Sat Jun 3 19:07:45 2006 @@ -90,6 +90,8 @@ __FBSDID("$FreeBSD: src/sys/dev/sn/if_sn #include #include +#include + #include #include @@ -795,7 +797,7 @@ try_start: * Now pass control to snstart() to queue any additional packets */ ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; - snstart(ifp); + snstart_locked(ifp); /* * We've sent something, so we're active. Set a watchdog in case the @@ -839,6 +841,7 @@ sn_intr(void *arg) mask = CSR_READ_1(sc, INTR_MASK_REG_B); CSR_WRITE_1(sc, INTR_MASK_REG_B, 0x00); +again: /* * Get the set of interrupts which occurred and eliminate any which * are masked. @@ -846,6 +849,9 @@ sn_intr(void *arg) interrupts = CSR_READ_1(sc, INTR_STAT_REG_B); status = interrupts & mask; + if (status == 0) + goto out; + /* * Now, process each of the interrupt types. */ @@ -1003,6 +1009,7 @@ sn_intr(void *arg) snstop(sc); sninit_locked(sc); } + goto again; out: /* ==== //depot/user/benno/arm/sys/dev/uart/uart_dev_ns8250.c#8 - /home/suleiman/p4/arm/sys/dev/uart/uart_dev_ns8250.c ==== --- /tmp/tmp.1907.6 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/dev/uart/uart_dev_ns8250.c Sat Jun 3 17:44:53 2006 @@ -391,7 +391,7 @@ ns8250_bus_attach(struct uart_softc *sc) bas = &sc->sc_bas; ns8250->mcr = uart_getreg(bas, REG_MCR); - ns8250->fcr = FCR_ENABLE | FCR_RX_MEDH; + ns8250->fcr = FCR_ENABLE | FCR_RX_LOW; uart_setreg(bas, REG_FCR, ns8250->fcr); uart_barrier(bas); ns8250_bus_flush(sc, UART_FLUSH_RECEIVER|UART_FLUSH_TRANSMITTER); ==== //depot/user/benno/arm/sys/kern/kern_timeout.c#1 - /home/suleiman/p4/arm/sys/kern/kern_timeout.c ==== ==== //depot/user/benno/arm/sys/nfs/nfsproto.h#1 - /home/suleiman/p4/arm/sys/nfs/nfsproto.h ==== --- /tmp/tmp.1907.7 Sun Jun 4 03:18:39 2006 +++ /home/suleiman/p4/arm/sys/nfs/nfsproto.h Tue May 30 16:58:53 2006 @@ -53,7 +53,7 @@ #define NFS_VER3 3 #define NFS_VER4 4 -#define NFS_V2MAXDATA 8192 +#define NFS_V2MAXDATA 4096 #define NFS_MAXDGRAMDATA 16384 #define NFS_MAXDATA 32768 #define NFS_MAXPATHLEN 1024 ==== //depot/user/benno/arm/sys/nfsclient/bootp_subr.c#1 - /home/suleiman/p4/arm/sys/nfsclient/bootp_subr.c ==== --- /tmp/tmp.1907.8 Sun Jun 4 03:18:40 2006 +++ /home/suleiman/p4/arm/sys/nfsclient/bootp_subr.c Tue May 30 19:56:30 2006 @@ -1262,8 +1262,8 @@ mountopts(struct nfs_args *args, char *p char *tmp; args->version = NFS_ARGSVERSION; - args->rsize = 8192; - args->wsize = 8192; + args->rsize = 4096; + args->wsize = 4096; args->flags = NFSMNT_RSIZE | NFSMNT_WSIZE | NFSMNT_RESVPORT; args->sotype = SOCK_DGRAM; if (p == NULL) ==== //depot/user/benno/arm/sys/nfsclient/nfs.h#4 - /home/suleiman/p4/arm/sys/nfsclient/nfs.h ==== --- /tmp/tmp.1907.9 Sun Jun 4 03:18:40 2006 +++ /home/suleiman/p4/arm/sys/nfsclient/nfs.h Tue May 30 16:54:02 2006 @@ -68,9 +68,9 @@ #ifndef NFS_MAXDIRATTRTIMO #define NFS_MAXDIRATTRTIMO 60 #endif -#define NFS_WSIZE 8192 /* Def. write data size <= 8192 */ -#define NFS_RSIZE 8192 /* Def. read data size <= 8192 */ -#define NFS_READDIRSIZE 8192 /* Def. readdir size */ +#define NFS_WSIZE 4096 /* Def. write data size <= 8192 */ +#define NFS_RSIZE 4096 /* Def. read data size <= 8192 */ +#define NFS_READDIRSIZE 4096 /* Def. readdir size */ #define NFS_DEFRAHEAD 1 /* Def. read ahead # blocks */ #define NFS_MAXRAHEAD 4 /* Max. read ahead # blocks */ #define NFS_MAXASYNCDAEMON 64 /* Max. number async_daemons runnable */ ==== //depot/user/benno/arm/sys/nfsclient/nfs_diskless.c#1 - /home/suleiman/p4/arm/sys/nfsclient/nfs_diskless.c ==== --- /tmp/tmp.1907.10 Sun Jun 4 03:18:40 2006 +++ /home/suleiman/p4/arm/sys/nfsclient/nfs_diskless.c Tue May 30 17:01:01 2006 @@ -156,8 +156,8 @@ match_done: inaddr_to_sockaddr("boot.netif.gateway", &nd->mygateway); /* set up root mount */ - nd->root_args.rsize = 8192; /* XXX tunable? */ - nd->root_args.wsize = 8192; + nd->root_args.rsize = 4096; /* XXX tunable? */ + nd->root_args.wsize = 4096; nd->root_args.sotype = SOCK_DGRAM; nd->root_args.flags = (NFSMNT_WSIZE | NFSMNT_RSIZE | NFSMNT_RESVPORT); if (inaddr_to_sockaddr("boot.nfsroot.server", &nd->root_saddr)) {