CVS commit: src/sys/dev/pci
Module Name:src
Committed By: matt
Date: Sun Sep 2 06:29:56 UTC 2012
Modified Files:
src/sys/dev/pci: pcireg.h
Log Message:
Finish devices the bits in PCIE capability LCSR field.
To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.73 src/sys/dev/pci/pcireg.h:1.74
--- src/sys/dev/pci/pcireg.h:1.73 Wed Aug 17 00:59:47 2011
+++ src/sys/dev/pci/pcireg.h Sun Sep 2 06:29:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.73 2011/08/17 00:59:47 dyoung Exp $ */
+/* $NetBSD: pcireg.h,v 1.74 2012/09/02 06:29:56 matt Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -656,6 +656,17 @@ struct pci_msix_table_entry {
#define PCI_PCIE_LCSR 0x10 /* Link Control & Status Register */
#define PCI_PCIE_LCSR_ASPM_L0S __BIT(0)
#define PCI_PCIE_LCSR_ASPM_L1 __BIT(1)
+#define PCI_PCIE_LCSR_RCB __BIT(3)
+#define PCI_PCIE_LCSR_LINK_DIS __BIT(4)
+#define PCI_PCIE_LCSR_RETRAIN __BIT(5)
+#define PCI_PCIE_LCSR_COMCLKCFG __BIT(6)
+#define PCI_PCIE_LCSR_EXTNDSYNC __BIT(7)
+#define PCI_PCIE_LCSR_ENCLKPM __BIT(8)
+#define PCI_PCIE_LCSR_LINKSPEED __BITS(19,16)
+#define PCI_PCIE_LCSR_NLW __BITS(25,20)
+#define PCI_PCIE_LCSR_LINKTRAIN __BIT(27)
+#define PCI_PCIE_LCSR_SLOTCLKCFG __BIT(28)
+#define PCI_PCIE_LCSR_DLACTIVE __BIT(29)
#define PCI_PCIE_SLCAP 0x14 /* Slot Capabilities Register */
#define PCI_PCIE_SLCAP_ABP __BIT(0) /* Attention Button Present */
#define PCI_PCIE_SLCAP_PCP __BIT(1) /* Power Controller Present */
CVS commit: src/sys/arch/evbarm/bcm53xx
Module Name:src
Committed By: matt
Date: Sun Sep 2 05:02:36 UTC 2012
Modified Files:
src/sys/arch/evbarm/bcm53xx: bcm53xx_start.S
Log Message:
Use the common code in
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S
diff -u src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.1 src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.2
--- src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S:1.1 Sat Sep 1 00:15:11 2012
+++ src/sys/arch/evbarm/bcm53xx/bcm53xx_start.S Sun Sep 2 05:02:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_start.S,v 1.1 2012/09/01 00:15:11 matt Exp $ */
+/* $NetBSD: bcm53xx_start.S,v 1.2 2012/09/02 05:02:36 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,15 +41,20 @@
#include
-RCSID("$NetBSD: bcm53xx_start.S,v 1.1 2012/09/01 00:15:11 matt Exp $")
+#ifndef CONADDR
+#define CONADDR 0x18000300
+#endif
+
+RCSID("$NetBSD: bcm53xx_start.S,v 1.2 2012/09/02 05:02:36 matt Exp $")
#undef VERBOSE_INIT_ARM
#define VERBOSE_INIT_ARM
#if defined(VERBOSE_INIT_ARM)
-#define PUTC(n) mov r0, n; bl xputc
+#define XPUTC(n) mov r0, n; bl xputc
+#define XPUTC_COM 1
#else
-#define PUTC(n)
+#define XPUTC(n)
#endif
/*
@@ -61,150 +66,55 @@ RCSID("$NetBSD: bcm53xx_start.S,v 1.1 20
.global _C_LABEL(bcm53xx_start)
_C_LABEL(bcm53xx_start):
- cpsid if, #PSR_SVC32_MODE
-
- PUTC(#64)
- bl _C_LABEL(armv7_icache_inv_all) @ invalidate i-cache
-
- /*
- * Step 1a, invalidate the all cache tags in all ways on the SCU.
- */
- PUTC(#65)
- mrc p15, 4, r3, c15, c0, 0 @ read cbar
-
- mrc p15, 0, r0, c0, c0, 5 @ get MPIDR
- and r0, r0, #7 @ get our cpu numder
- lsl r0, r0, #2 @ multiply by 4
- mov r1, #0xf @ select all ways
- lsl r1, r1, r0 @ shift into place
- str r1, [r3, #12] @ write scu invalidate all
- dsb
- isb
-
- /*
- * Step 1b, invalidate the data cache
- */
- PUTC(#66)
- bl _C_LABEL(armv7_dcache_wbinv_all) @ writeback/invalidate d-cache
-
- /*
- * Step 2, disable the data cache
- */
- mrc p15, 0, r2, c1, c0, 0 @ get system ctl register (save)
- bic r1, r2, #CPU_CONTROL_DC_ENABLE @ clear data cache enable
- mcr p15, 0, r1, c1, c0, 0 @ set system ctl register
- isb
-
- /*
- * Step 3, enable the SCU (and set SMP mode)
- */
- ldr r1, [r3, #4] @ read scu config
- orr r1, r1, #0xf0 @ set smp mode
- str r1, [r3, #4] @ write scu config
- ldr r1, [r3, #0] @ read scu control
- orr r1, r1, #1 @ set scu enable flag
- str r1, [r3, #4] @ write scu control
- dsb
- isb
-
/*
- * Step 4a, enable the data cache
+ * Let's turn on the CCA watchdog in case something goes horribly wrong.
*/
- mcr p15, 0, r2, c1, c0, 0 @ reenable caches
- isb
+ ldr r0, .Lcca_wdog
+ ldr r1, .Lcca_wdog + 4
+ str r1, [r0]
/*
- * Step 4b, set ACTLR.SMP=1 (and ACTRL.FX=1)
+ * Cal the initial start code for the a9
*/
- mrc p15, 0, r0, c1, c0, 1 @ read aux ctl
- orr r0, #0x40 @ enable SMP mode
- mcr p15, 0, r0, c1, c0, 1 @ write aux ctl
- isb
- orr r0, #0x1 @ enable cache/tlb/coherency
- mcr p15, 0, r0, c1, c0, 1 @ write aux ctl
- isb
+ bl a9_start
- PUTC(#67)
/*
* Set up a preliminary mapping in the MMU to allow us to run
* at KERNEL_BASE with caches on.
*/
- /* Build page table from scratch */
- ldr r0, .Ltemp_l1_table /* The page table address - entered into TTB later */
- mov r1, r0 /* Start address to clear memory. */
- /* Zero the entire table so all virtual addresses are invalid. */
- mov r2, #L1_TABLE_SIZE /* in bytes */
- mov r3, #0
- mov r4, r3
- mov r5, r3
- mov r6, r3
- mov r7, r3
- mov r8, r3
- mov r10, r3
- mov r11, r3
-1: stmia r1!, {r3-r8,r10-r11}
- stmia r1!, {r3-r8,r10-r11}
- stmia r1!, {r3-r8,r10-r11}
- stmia r1!, {r3-r8,r10-r11}
- subs r2, r2, #(4 * 4 * 8) /* bytes per loop */
- bne 1b
-
- /* Now create our entries per the mmu_init_table. */
- l1table .req r0
- va .req r1
- pa .req r2
- n_sec .req r3
- attr .req r4
- itable .req r5
-
- adr itable, mmu_init_table
- b 3f
-
-2: str pa, [l1table, va]
- add va, va, #4
- add pa, pa, #(L1_S_SIZE)
- subs n_sec, n_sec, #1
- bhi 2b
-
-3: ldmia itable!, {va,pa,n_sec,attr}
- /* Convert va to l1 offset: va = 4 * (va >> L1_S_SHIFT) */
- lsr va, va, #L1_S_SHIFT
- lsl va, va, #2
- /* Convert pa to l1 entry: pa = (pa & L1_S_FRAME) | attr */
- bfc pa, #0, #L1_S_SHIFT
- orr pa, pa, attr
- cmp n_sec, #0
- bne 2b
-
- .unreq va
- .unreq pa
- .unreq n_sec
- .unreq attr
- .unreq itable
- .unreq l1table
+ ldr r0, .Ltemp_l1_table /* The L1PT address - entered into TTB later */
+ adr r1, mmu_init_table
+ bl arm_boot_l1pt_init
- PUTC(#68)
+ XPUTC(#68)
/*
* Before we turn on the MMU, let's the other process out of the
* SKU ROM but setting the magic LUT address to our own mp_start
* routine.
*/
ldr r1, .Lsku_rom_lut
- adr r2
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: matt
Date: Sun Sep 2 05:01:54 UTC 2012
Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S
Log Message:
Cleanup and bring forwards from bcm53xx_start.S
Use more symbolic names ...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/cortex/a9_mpsubr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.1 src/sys/arch/arm/cortex/a9_mpsubr.S:1.2
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.1 Sat Sep 1 00:03:14 2012
+++ src/sys/arch/arm/cortex/a9_mpsubr.S Sun Sep 2 05:01:54 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: a9_mpsubr.S,v 1.1 2012/09/01 00:03:14 matt Exp $ */
+/* $NetBSD: a9_mpsubr.S,v 1.2 2012/09/02 05:01:54 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,14 +34,23 @@
#include
#include
+#include
#include "assym.h"
+
+/* We'll modify va and pa at run time so we can use relocatable addresses. */
+#define MMU_INIT(va,pa,n_sec,attr) \
+ .word va ; \
+ .word pa ; \
+ .word n_sec ; \
+ .word attr ;
+
/*
* Set up a preliminary mapping in the MMU to allow us to run
* at KERNEL_BASE with caches on.
*/
arm_boot_l1pt_init:
- mv ip, r1 @ save mmu table addr
+ mov ip, r1 @ save mmu table addr
/* Build page table from scratch */
mov r1, r0 /* Start address to clear memory. */
/* Zero the entire table so all virtual addresses are invalid. */
@@ -72,8 +81,8 @@ arm_boot_l1pt_init:
mov itable, ip @ reclaim table address
b 3f
-2: str pa, [l1table, va]
- add va, va, #4
+2: str pa, [l1table, va, lsl #2]
+ add va, va, #1
add pa, pa, #(L1_S_SIZE)
subs n_sec, n_sec, #1
bhi 2b
@@ -81,14 +90,13 @@ arm_boot_l1pt_init:
3: ldmia itable!, {va,pa,n_sec,attr}
/* Convert va to l1 offset: va = 4 * (va >> L1_S_SHIFT) */
lsr va, va, #L1_S_SHIFT
- lsl va, va, #2
/* Convert pa to l1 entry: pa = (pa & L1_S_FRAME) | attr */
#ifdef _ARM_ARCH_7
bfc pa, #0, #L1_S_SHIFT
#else
lsr pa, pa, #L1_S_SHIFT
lsl pa, pa, #L1_S_SHIFT
-#ndif
+#endif
orr pa, pa, attr
cmp n_sec, #0
bne 2b
@@ -101,9 +109,6 @@ arm_boot_l1pt_init:
.unreq itable
.unreq l1table
-.Lctl_ID:
- .word CPU_CONTROL_IC_ENABLE|CPU_CONTROL_DC_ENABLE
-
a9_cpuinit:
/*
* In theory, because the MMU is off, we shouldn't need all of this,
@@ -159,8 +164,29 @@ a9_cpuinit:
bx ip /* return */
-#if defined(VERBOSE_INIT_ARM) && XPUTC
+/*
+ * Coprocessor register initialization values
+ */
+
+ .p2align 2
+ /* bits to clear in the Control Register */
+.Lcontrol_clr:
+ .word 0
+
+ /* bits to set in the Control Register */
+.Lcontrol_set:
+ .word CPU_CONTROL_MMU_ENABLE | \
+ CPU_CONTROL_AFLT_ENABLE | \
+ CPU_CONTROL_DC_ENABLE | \
+ CPU_CONTROL_SYST_ENABLE | \
+ CPU_CONTROL_SWP_ENABLE | \
+ CPU_CONTROL_IC_ENABLE
+
+#if defined(VERBOSE_INIT_ARM) && XPUTC_COM
#define TIMO 0x25000
+#ifndef COM_MULT
+#define COM_MULT 1
+#endif
xputc:
#ifdef MULTIPROCESSOR
mov r2, #1
@@ -172,11 +198,12 @@ xputc:
strex r1, r2, [r3]
cmp r1, #0
bne 10b
+ dsb
#endif
mov r2, #TIMO
ldr r3, .Luart0
-1: ldrb r1, [r3, #COM_LSR]
+1: ldrb r1, [r3, #(COM_LSR*COM_MULT)]
tst r1, #LSR_TXRDY
bne 2f
subs r2, r2, #1
@@ -185,7 +212,7 @@ xputc:
strb r0, [r3, #COM_DATA]
mov r2, #TIMO
-3: ldrb r1, [r3, #COM_LSR]
+3: ldrb r1, [r3, #(COM_LSR*COM_MULT)]
tst r1, #LSR_TSRE
bne 4f
subs r2, r2, #1
@@ -200,7 +227,7 @@ xputc:
bx lr
.Luart0:
- .word CONSADDR
+ .word CONADDR
#ifdef MULTIPROCESSOR
.Lcomlock:
@@ -229,12 +256,12 @@ a9_start:
*/
XPUTC(#65)
mrc p15, 4, r3, c15, c0, 0 @ read cbar
- ldr r0, [r3, #4] @ read scu config
+ ldr r0, [r3, #SCU_CFG] @ read scu config
and r0, r0, #7 @ get cpu max
- add r0, r0, #1 @ adjust to cpu num
- lsl r0, r0, #4 @ multiply by 16
- sub r0, r0, #1 @ make it into a mask
- str r0, [r3, #12] @ write scu invalidate all
+ add r0, r0, #2 @ adjust to cpu num
+ mov r1, #0xf @ select all ways
+ lsl r1, r1, r0 @ shift into place
+ str r1, [r3, #SCU_INV_ALL_REG] @ write scu invalidate all
dsb
isb
@@ -255,12 +282,9 @@ a9_start:
/*
* Step 3, enable the SCU (and set SMP mode)
*/
- ldr r1, [r3, #4] @ read scu config
- orr r1, r1, #0xf0 @ set smp mode
- str r1, [r3, #4] @ write scu config
- ldr r1, [r3, #0] @ read scu control
- orr r1, r1, #1 @ set scu enable flag
- str r1, [r3, #4] @ write scu control
+ ldr r1, [r3, #SCU_CTL] @ read scu control
+ orr r1, r1, #SCU_CTL_SCU_ENA @ set scu enable flag
+ str r1, [r3, #SCU_CTL] @ write scu control
dsb
isb
@@ -274,12 +298,15 @@ a9_start:
* Step 4b, set ACTLR.SMP=1 (and ACTRL.FX=1)
*/
mrc p15, 0, r0, c1, c0, 1 @ read aux ctl
- orr r0, #0x41 @ enable cache/tlb/coherency
+ orr r0, #CORTEXA9_AUXCTL_SMP @ enable SMP
+ mcr p15, 0, r0, c1, c0
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: cherry Date: Sat Sep 1 23:19:47 UTC 2012 Modified Files: src/sys/arch/i386/i386: locore.S Log Message: Restrict export of the tmpgdt symbol to XEN kernels Spotted by uwe@ To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/sys/arch/i386/i386/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/locore.S diff -u src/sys/arch/i386/i386/locore.S:1.101 src/sys/arch/i386/i386/locore.S:1.102 --- src/sys/arch/i386/i386/locore.S:1.101 Wed Jun 27 00:37:08 2012 +++ src/sys/arch/i386/i386/locore.S Sat Sep 1 23:19:46 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.101 2012/06/27 00:37:08 jym Exp $ */ +/* $NetBSD: locore.S,v 1.102 2012/09/01 23:19:46 cherry Exp $ */ /* * Copyright-o-rama! @@ -129,7 +129,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.101 2012/06/27 00:37:08 jym Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.102 2012/09/01 23:19:46 cherry Exp $"); #include "opt_compat_oldboot.h" #include "opt_ddb.h" @@ -233,10 +233,10 @@ _C_LABEL(tablesize): .long 0 tmpstk: #ifdef XEN .align PAGE_SIZE, 0x0 # Align on page boundary + .globl tmpgdt _C_LABEL(tmpgdt): .space PAGE_SIZE # Xen expects a page #endif /* XEN */ - .globl tmpgdt #ifndef XEN #define _RELOC(x) ((x) - KERNBASE) #else
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Sat Sep 1 22:20:52 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S
Log Message:
Need to do a GET_CURCPU(r4) before invoking DO_AST_AND_RESTORE_ALIGNMENT_FAULTS
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/arm32/cpuswitch.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.70 src/sys/arch/arm/arm32/cpuswitch.S:1.71
--- src/sys/arch/arm/arm32/cpuswitch.S:1.70 Sat Sep 1 14:46:51 2012
+++ src/sys/arch/arm/arm32/cpuswitch.S Sat Sep 1 22:20:52 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.71 2012/09/01 22:20:52 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
#include
#include
- RCSID("$NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.71 2012/09/01 22:20:52 matt Exp $")
/* LINTSTUB: include */
@@ -347,6 +347,7 @@ ENTRY(lwp_trampoline)
GET_CPSR(r0)
CPSID_I(r0, r0) /* Kill irq's */
+ GET_CURCPU(r4) /* for DO_AST */
DO_AST_AND_RESTORE_ALIGNMENT_FAULTS
PULLFRAME
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Sat Sep 1 19:08:01 UTC 2012
Modified Files:
src/usr.sbin/npf/npfctl: npfctl.c
Log Message:
npfctl usage: minor formatting fix.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/npf/npfctl/npfctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npfctl.c
diff -u src/usr.sbin/npf/npfctl/npfctl.c:1.18 src/usr.sbin/npf/npfctl/npfctl.c:1.19
--- src/usr.sbin/npf/npfctl/npfctl.c:1.18 Sun Aug 12 03:35:13 2012
+++ src/usr.sbin/npf/npfctl/npfctl.c Sat Sep 1 19:08:01 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: npfctl.c,v 1.18 2012/08/12 03:35:13 rmind Exp $ */
+/* $NetBSD: npfctl.c,v 1.19 2012/09/01 19:08:01 rmind Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: npfctl.c,v 1.18 2012/08/12 03:35:13 rmind Exp $");
+__RCSID("$NetBSD: npfctl.c,v 1.19 2012/09/01 19:08:01 rmind Exp $");
#include
#include
@@ -139,7 +139,7 @@ usage(void)
"usage:\t%s [ start | stop | reload | flush | show | stats ]\n",
progname);
fprintf(stderr,
- "usage:\t%s [ sess-save | sess-load ]\n",
+ "\t%s ( sess-save | sess-load )\n",
progname);
fprintf(stderr,
"\t%s table [ flush ]\n",
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jakllsch Date: Sat Sep 1 19:05:46 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: When we do get a working and stable USB HCD, we'll want to use usbdevices.config. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/RPI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.6 src/sys/arch/evbarm/conf/RPI:1.7 --- src/sys/arch/evbarm/conf/RPI:1.6 Sat Sep 1 14:50:11 2012 +++ src/sys/arch/evbarm/conf/RPI Sat Sep 1 19:05:46 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.6 2012/09/01 14:50:11 matt Exp $ +# $NetBSD: RPI,v 1.7 2012/09/01 19:05:46 jakllsch Exp $ # # RPi -- Raspberry Pi # @@ -194,6 +194,13 @@ sdmmc* at sdhc? ld* at sdmmc? +# On-SoC USB 2.0 OTG Controller (as USB host) - some day soon(tm) +#unimplementedusbhcd* at obio? +#usb* at unimplementedusbhcd? + +# USB device drivers, just as soon as we have something to attach them to +#include "dev/usb/usbdevices.config" + # various options for wscons - we try to look as much like a standard # sun console as possible options WSEMUL_VT100 # sun terminal emulation @@ -210,19 +217,6 @@ options FONT_QVSS8x15 pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont -# On-board USB - some day soon(tm) -#uhub* at usb? -#uhub* at uhub? port ? -#umass* at uhub? port ? configuration ? interface ? -#wd* at umass? -#uhidev* at uhub? -#ukbd* at uhidev? -#ums* at uhidev? -#wskbd* at ukbd? -#wsmouse* at ums? - -#axe* at uhub? port ? configuration ? interface ? - # Pseudo-Devices # disk/mass storage pseudo-devices
CVS commit: src/sys
Module Name:src Committed By: jakllsch Date: Sat Sep 1 18:17:51 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/evbarm/conf: HDL_G HPT5325 MMNET_GENERIC MPCSA_GENERIC NSLU2 OPENBLOCKS_A6 SHEEVAPLUG src/sys/arch/evbppc/conf: OPENBLOCKS266_OPT src/sys/arch/hp700/conf: GENERIC src/sys/arch/hpcarm/conf: WZERO3 src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0 src/sys/arch/iyonix/conf: GENERIC src/sys/arch/landisk/conf: GENERIC src/sys/arch/macppc/conf: GENERIC src/sys/arch/ofppc/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/dev/usb: files.usb usbdevices.config Log Message: Rename RT2500USB driver to ural(4) as it was originally in OpenBSD, as ural(4) and ral(4) do not actually share any code. Enable ural(4) in hpcarm WZERO3 kernel too, as it will now build. Fixes PR#43520. To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.85 -r1.86 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/conf/HDL_G \ src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/HPT5325 \ src/sys/arch/evbarm/conf/OPENBLOCKS_A6 cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/NSLU2 cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/SHEEVAPLUG cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbppc/conf/OPENBLOCKS266_OPT cvs rdiff -u -r1.115 -r1.116 src/sys/arch/hp700/conf/GENERIC cvs rdiff -u -r1.26 -r1.27 src/sys/arch/hpcarm/conf/WZERO3 cvs rdiff -u -r1.342 -r1.343 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1078 -r1.1079 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.67 -r1.68 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.71 -r1.72 src/sys/arch/iyonix/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/landisk/conf/GENERIC cvs rdiff -u -r1.302 -r1.303 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.142 -r1.143 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.151 -r1.152 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.124 -r1.125 src/sys/dev/usb/files.usb cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/usbdevices.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.362 src/sys/arch/amd64/conf/GENERIC:1.363 --- src/sys/arch/amd64/conf/GENERIC:1.362 Sat Sep 1 15:25:33 2012 +++ src/sys/arch/amd64/conf/GENERIC Sat Sep 1 18:17:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.362 2012/09/01 15:25:33 jakllsch Exp $ +# $NetBSD: GENERIC,v 1.363 2012/09/01 18:17:49 jakllsch Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.362 $" +#ident "GENERIC-$Revision: 1.363 $" maxusers 64 # estimated number of users @@ -964,7 +964,7 @@ uscanner* at uhub? port ? # USB 802.11 adapters atu* at uhub? port ? # Atmel at76c50x 802.11b otus* at uhub? port ? # Atheros AR9001U -ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g +ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.85 src/sys/arch/amd64/conf/XEN3_DOM0:1.86 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.85 Fri Jun 22 22:38:39 2012 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Sep 1 18:17:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.85 2012/06/22 22:38:39 khorben Exp $ +# $NetBSD: XEN3_DOM0,v 1.86 2012/09/01 18:17:49 jakllsch Exp $ include "arch/amd64/conf/std.xen" @@ -621,7 +621,7 @@ urndis* at uhub? port ? # Microsoft RND # USB 802.11 adapters atu* at uhub? port ? # Atmel AT76C50XX based adapters -ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g +ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g # Prolific PL2301/PL2302 host-to-host adapter Index: src/sys/arch/evbarm/conf/HDL_G diff -u src/sys/arch/evbarm/conf/HDL_G:1.29 src/sys/arch/evbarm/conf/HDL_G:1.30 --- src/sys/arch/evbarm/conf/HDL_G:1.29 Sat Sep 1 14:50:11 2012 +++ src/sys/arch/evbarm/conf/HDL_G Sat Sep 1 18:17:49 2012 @@ -1,4 +1,4 @@ -# $NetBSD: HDL_G,v 1.29 2012/09/01 14:50:11 matt Exp $ +# $NetBSD: HDL_G,v 1.30 2012/09/01 18:17:49 jakllsch Exp $ # # HDL_G -- I-O DATA HDL-G Kernel # @@ -326,7 +326,7 @@ url* at uhub? port ? # Realtek RTL8150L # USB 802.11b adapters atu* at uhub? port ? # Atmel AT76C50XX based adapters -ral* at uh
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jakllsch Date: Sat Sep 1 17:36:07 UTC 2012 Modified Files: src/sys/dev/usb: usbdevices.config Log Message: Add urtw(4) and cir* at emdtv? bringing this up to speed with x86 GENERIC To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/usbdevices.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevices.config diff -u src/sys/dev/usb/usbdevices.config:1.14 src/sys/dev/usb/usbdevices.config:1.15 --- src/sys/dev/usb/usbdevices.config:1.14 Wed May 30 14:30:35 2012 +++ src/sys/dev/usb/usbdevices.config Sat Sep 1 17:36:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: usbdevices.config,v 1.14 2012/05/30 14:30:35 nonaka Exp $ +# $NetBSD: usbdevices.config,v 1.15 2012/09/01 17:36:07 jakllsch Exp $ # # This file contains all USB related configuration. # It is suitable for inclusion in a kernel config(5) file. @@ -117,6 +117,7 @@ ral* at uhub? port ? # Ralink Technolog rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g run* at uhub? port ? # Ralink Technology RT(2[78]|30)00 802.11a/b/g/n upgt* at uhub? port ? # Intersil PrismGT +urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g urtwn* at uhub? port ? # Realtek RTL8188CU/RTL8192CU 802.11b/g/n zyd* at uhub? port ? # Zydas ZD1211 @@ -207,6 +208,7 @@ pseye* at uhub? # Sony PLAYSTATION(R) E uvideo* at uhub? # USB Video Class capture devices auvitek* at uhub? # Auvitek AU0828 video capture devices emdtv* at uhub? # Empia EM28xx video capture devices +cir* at emdtv? # Empia EM28xx infrared remote video* at videobus? dtv* at dtvbus?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sat Sep 1 17:15:43 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: files.rpi Log Message: Switch RaspberryPI to use the new boot/init code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/files.rpi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/files.rpi diff -u src/sys/arch/evbarm/conf/files.rpi:1.1 src/sys/arch/evbarm/conf/files.rpi:1.2 --- src/sys/arch/evbarm/conf/files.rpi:1.1 Thu Jul 26 06:21:57 2012 +++ src/sys/arch/evbarm/conf/files.rpi Sat Sep 1 17:15:43 2012 @@ -1,8 +1,12 @@ -# $NetBSD: files.rpi,v 1.1 2012/07/26 06:21:57 skrll Exp $ +# $NetBSD: files.rpi,v 1.2 2012/09/01 17:15:43 skrll Exp $ # # Raspberry Pi # +file arch/arm/arm32/arm32_boot.c +file arch/arm/arm32/arm32_kvminit.c +file arch/arm/arm32/arm32_reboot.c + file arch/evbarm/rpi/rpi_machdep.c # Kernel boot arguments
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: skrll
Date: Sat Sep 1 17:14:56 UTC 2012
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Switch RaspberryPI to use the new boot/init code.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/rpi/rpi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.6 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.7
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.6 Wed Aug 22 12:36:35 2012
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sat Sep 1 17:14:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.6 2012/08/22 12:36:35 jakllsch Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.7 2012/09/01 17:14:56 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.6 2012/08/22 12:36:35 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpi_machdep.c,v 1.7 2012/09/01 17:14:56 skrll Exp $");
#include "opt_evbarm_boardtype.h"
@@ -158,43 +158,16 @@ __KERNEL_RCSID(0, "$NetBSD: rpi_machdep.
#include "ksyms.h"
-static void setup_real_page_tables(void);
BootConfig bootconfig; /* Boot config storage */
static char bootargs[MAX_BOOT_STRING];
char *boot_args = NULL;
-vm_offset_t physical_start;
-vm_offset_t physical_freestart;
-vm_offset_t physical_freeend;
-vm_offset_t physical_end;
-u_int free_pages;
-
-vm_offset_t msgbufphys;
-
-extern char etext[];
-extern char __data_start[], _edata[];
-extern char __bss_start[], __bss_end__[];
-extern char _end[];
-
-#define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */
-#define KERNEL_PT_KERNEL 1 /* Page table for mapping kernel */
-#define KERNEL_PT_KERNEL_NUM 4
-
-#define KERNEL_PT_VMDATA (KERNEL_PT_KERNEL + KERNEL_PT_KERNEL_NUM)
-/* Page tables for mapping kernel VM */
-#define KERNEL_PT_VMDATA_NUM 4 /* start with 16MB of KVM */
-#define NUM_KERNEL_PTS (KERNEL_PT_VMDATA + KERNEL_PT_VMDATA_NUM)
-
-pv_addr_t kernel_pt_table[NUM_KERNEL_PTS];
-
/*
* Macros to translate between physical and virtual for a subset of the
* kernel address space. *Not* for general use.
*/
-#define KERNEL_BASE_PHYS physical_start
-#define KERN_VTOPHYS(va) \
- ((paddr_t)((vaddr_t)va - KERNEL_BASE + KERNEL_BASE_PHYS))
+#define KERNEL_BASE_PHYS (paddr_t)0
#define KERN_PHYSTOV(pa) \
((vaddr_t)((paddr_t)pa - KERNEL_BASE_PHYS + KERNEL_BASE))
@@ -229,57 +202,6 @@ int plcomcnmode = PLCONMODE;
/* Smallest amount of RAM start.elf could give us. */
#define RPI_MINIMUM_ARM_RAM_SPLIT (128U * 1024 * 1024)
-void
-cpu_reboot(int howto, char *bootstr)
-{
-
- /*
- * If we are still cold then hit the air brakes
- * and crash to earth fast
- */
- if (cold) {
- doshutdownhooks();
- printf("The operating system has halted.\r\n");
- printf("Please press any key to reboot.\r\n");
- cngetc();
- printf("rebooting...\r\n");
- bcm2835_system_reset();
- }
-
- /*
- * If RB_NOSYNC was not specified sync the discs.
- * Note: Unless cold is set to 1 here, syslogd will die during the
- * unmount. It looks like syslogd is getting woken up only to find
- * that it cannot page part of the binary in as the filesystem has
- * been unmounted.
- */
- if (!(howto & RB_NOSYNC))
- bootsync();
-
- /* Say NO to interrupts */
- splhigh();
-
- /* Do a dump if requested. */
- if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
- dumpsys();
-
- /* Run any shutdown hooks */
- doshutdownhooks();
-
- /* Make sure IRQ's are disabled */
- IRQdisable;
-
- if (howto & RB_HALT) {
- printf("The operating system has halted.\r\n");
- printf("Please press any key to reboot.\r\n");
- cngetc();
- }
-
- printf("rebooting...\r\n");
- bcm2835_system_reset();
-
- /*NOTREACHED*/
-}
/*
* Static device mappings. These peripheral registers are mapped at
@@ -369,12 +291,10 @@ parse_linux_atags(void *atag_base)
atp->u.mem.size - 1);
continue;
}
- physical_end = atp->u.mem.size;
- physmem = physical_end / PAGE_SIZE;
KASSERT(atp->u.mem.start == 0);
- physical_start = atp->u.mem.start;
bootconfig.dram[bootconfig.dramblocks].address = 0x0;
- bootconfig.dram[bootconfig.dramblocks].pages = physmem;
+ bootconfig.dram[bootconfig.dramblocks].pages =
+ atp->u.mem.size / PAGE_SIZE;
++bootconfig.dramblocks;
}
@@ -431,132 +351,16 @@ initarm(void *arg)
parse_linux_atags((void *)KERN_PHYSTOV(rpi_boot_regs[2]));
} else {
bootconfig.dramblocks = 1;
- physical_end = RPI_MINIMUM_ARM_RAM_SPLIT;
- physmem = physical_end / PAGE_SIZE;
- physical_start = 0;
bootconfig.dram[0].address = 0x0;
- bootconfig.dram[0].pages = physmem;
+ bootconfig.dram[0].pages =
+ RPI_MINIMUM_ARM_RAM_SPLIT / PAGE_SIZE;
}
+ arm32_bootmem_init(bootconfig.dram[0].address,
+ bootconfig.dram[0].pages * PAGE_SIZE
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Sat Sep 1 17:11:56 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: std.rpi Log Message: Define __HAVE_CPU_UAREA_ALLOC_IDLELWP and TPIDRPRW_IS_CURCPU To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.rpi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/std.rpi diff -u src/sys/arch/evbarm/conf/std.rpi:1.1 src/sys/arch/evbarm/conf/std.rpi:1.2 --- src/sys/arch/evbarm/conf/std.rpi:1.1 Thu Jul 26 06:21:57 2012 +++ src/sys/arch/evbarm/conf/std.rpi Sat Sep 1 17:11:56 2012 @@ -1,4 +1,4 @@ -# $NetBSD: std.rpi,v 1.1 2012/07/26 06:21:57 skrll Exp $ +# $NetBSD: std.rpi,v 1.2 2012/09/01 17:11:56 skrll Exp $ # # standard NetBSD/evbarm for Raspberry Pi options @@ -13,8 +13,9 @@ options EXEC_SCRIPT # To support easy transit to ../arch/arm/arm32 options ARM32 -#options ARM11_CACHE_WRITE_THROUGH options __HAVE_FAST_SOFTINTS # should be in types.h +options __HAVE_CPU_UAREA_ALLOC_IDLELWP +options TPIDRPRW_IS_CURCPU options KERNEL_BASE_EXT=0xc000 options EVBARM_BOARDTYPE="rpi"
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: christos
Date: Sat Sep 1 17:01:24 UTC 2012
Modified Files:
src/sys/ufs/ext2fs: ext2fs.h ext2fs_vfsops.c
Log Message:
really print the incompatible bits.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/ufs/ext2fs/ext2fs.h
cvs rdiff -u -r1.165 -r1.166 src/sys/ufs/ext2fs/ext2fs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs.h
diff -u src/sys/ufs/ext2fs/ext2fs.h:1.29 src/sys/ufs/ext2fs/ext2fs.h:1.30
--- src/sys/ufs/ext2fs/ext2fs.h:1.29 Fri Nov 27 06:16:54 2009
+++ src/sys/ufs/ext2fs/ext2fs.h Sat Sep 1 13:01:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs.h,v 1.29 2009/11/27 11:16:54 tsutsui Exp $ */
+/* $NetBSD: ext2fs.h,v 1.30 2012/09/01 17:01:24 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -198,15 +198,39 @@ struct m_ext2fs {
/* compatible/incompatible features */
#define EXT2F_COMPAT_PREALLOC 0x0001
+#define EXT2F_COMPAT_AFS 0x0002
#define EXT2F_COMPAT_HASJOURNAL 0x0004
+#define EXT2F_COMPAT_EXTATTR 0x0008
#define EXT2F_COMPAT_RESIZE 0x0010
+#define EXT2F_COMPAT_DIRHASHINDEX 0x0020
+#define EXT2F_COMPAT_BITS \
+ "\20" \
+"\06COMPAT_DIRHASHINDEX" \
+ "\05COMPAT_RESIZE" \
+ "\04COMPAT_EXTATTR" \
+ "\03COMPAT_HASJOURNAL" \
+ "\02COMPAT_AFS" \
+ "\01COMPAT_PREALLOC"
#define EXT2F_ROCOMPAT_SPARSESUPER 0x0001
#define EXT2F_ROCOMPAT_LARGEFILE 0x0002
#define EXT2F_ROCOMPAT_BTREE_DIR 0x0004
+#define EXT2F_ROCOMPAT_BITS \
+ "\20" \
+ "\03ROCOMPAT_BTREE_DIR" \
+ "\02ROCOMPAT_LARGEFILE" \
+ "\01ROCOMPAT_SPARSEBUFFER"
#define EXT2F_INCOMPAT_COMP 0x0001
#define EXT2F_INCOMPAT_FTYPE 0x0002
+#define EXT2F_INCOMPAT_REPLAY_JOURNAL 0x0004
+#define EXT2F_INCOMPAT_USES_JOURNAL 0x0008
+#define EXT2F_INCOMPAT_BITS \
+ "\20" \
+ "\04INCOMPAT_USES_JOURNAL" \
+ "\03INCOMPAT_REPLAY_JOURNAL" \
+ "\02INCOMPAT_FTYPE" \
+ "\01INCOMPAT_COMP"
/*
* Features supported in this implementation
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.165 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.166
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.165 Sat Sep 1 11:46:11 2012
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Sep 1 13:01:24 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.165 2012/09/01 15:46:11 chs Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.166 2012/09/01 17:01:24 christos Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.165 2012/09/01 15:46:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.166 2012/09/01 17:01:24 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1249,21 +1249,24 @@ ext2fs_checksb(struct ext2fs *fs, int ro
return (EINVAL); /* XXX needs translation */
}
if (fs2h32(fs->e2fs_rev) > E2FS_REV0) {
+ char buf[256];
if (fs2h32(fs->e2fs_first_ino) != EXT2_FIRSTINO) {
printf("ext2fs: unsupported first inode position\n");
return (EINVAL); /* XXX needs translation */
}
u32 = fs2h32(fs->e2fs_features_incompat) & ~EXT2F_INCOMPAT_SUPP;
if (u32) {
- printf("ext2fs: unsupported incompat feature 0x%x\n",
- u32);
- return (EINVAL); /* XXX needs translation */
+ snprintb(buf, sizeof(buf), EXT2F_INCOMPAT_BITS, u32);
+ printf("ext2fs: unsupported incompat features: %s\n",
+ buf);
+ return EINVAL; /* XXX needs translation */
}
u32 = fs2h32(fs->e2fs_features_rocompat) & ~EXT2F_ROCOMPAT_SUPP;
if (!ronly && u32) {
- printf("ext2fs: unsupported ro-incompat feature 0x%x\n",
- u32);
- return (EROFS); /* XXX needs translation */
+ snprintb(buf, sizeof(buf), EXT2F_ROCOMPAT_BITS, u32);
+ printf("ext2fs: unsupported ro-incompat features: %s\n",
+ buf);
+ return EROFS; /* XXX needs translation */
}
}
return (0);
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src
Committed By: pooka
Date: Sat Sep 1 16:19:01 UTC 2012
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c
Log Message:
For now, make vop_islocked more like vop_lock and vop_unlock (i.e. don't
even attempt to do anything).
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.9 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.10
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.9 Sun Nov 20 02:54:25 2011
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sat Sep 1 16:19:00 2012
@@ -5439,6 +5439,14 @@ zfs_netbsd_unlock(void *v)
return 0;
}
+
+static int
+zfs_netbsd_islocked(void *v)
+{
+
+ return LK_EXCLUSIVE;
+}
+
/*
int
zfs_netbsd_getpages(void *v)
@@ -5485,7 +5493,6 @@ zfs_netbsd_putpages(void *v)
#define zfs_netbsd_mmap genfs_mmap
#define zfs_netbsd_getpages genfs_compat_getpages
//#define zfs_netbsd_putpages genfs_putpages
-#define zfs_netbsd_islocked genfs_islocked
int (**zfs_vnodeop_p)(void *);
const struct vnodeopv_entry_desc zfs_vnodeop_entries[] = {
CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: chs
Date: Sat Sep 1 15:46:11 UTC 2012
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vfsops.c
Log Message:
when failing a mount due to unsupported features,
print which features are involved.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/ufs/ext2fs/ext2fs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs_vfsops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.164 src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.165
--- src/sys/ufs/ext2fs/ext2fs_vfsops.c:1.164 Mon Apr 30 22:51:28 2012
+++ src/sys/ufs/ext2fs/ext2fs_vfsops.c Sat Sep 1 15:46:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vfsops.c,v 1.164 2012/04/30 22:51:28 rmind Exp $ */
+/* $NetBSD: ext2fs_vfsops.c,v 1.165 2012/09/01 15:46:11 chs Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.164 2012/04/30 22:51:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vfsops.c,v 1.165 2012/09/01 15:46:11 chs Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1228,20 +1228,21 @@ ext2fs_cgupdate(struct ufsmount *mp, int
static int
ext2fs_checksb(struct ext2fs *fs, int ronly)
{
+ uint32_t u32;
if (fs2h16(fs->e2fs_magic) != E2FS_MAGIC) {
return (EINVAL); /* XXX needs translation */
}
if (fs2h32(fs->e2fs_rev) > E2FS_REV1) {
#ifdef DIAGNOSTIC
- printf("Ext2 fs: unsupported revision number: %x\n",
+ printf("ext2fs: unsupported revision number: %x\n",
fs2h32(fs->e2fs_rev));
#endif
return (EINVAL); /* XXX needs translation */
}
if (fs2h32(fs->e2fs_log_bsize) > 2) { /* block size = 1024|2048|4096 */
#ifdef DIAGNOSTIC
- printf("Ext2 fs: bad block size: %d "
+ printf("ext2fs: bad block size: %d "
"(expected <= 2 for ext2 fs)\n",
fs2h32(fs->e2fs_log_bsize));
#endif
@@ -1249,16 +1250,19 @@ ext2fs_checksb(struct ext2fs *fs, int ro
}
if (fs2h32(fs->e2fs_rev) > E2FS_REV0) {
if (fs2h32(fs->e2fs_first_ino) != EXT2_FIRSTINO) {
- printf("Ext2 fs: unsupported first inode position\n");
+ printf("ext2fs: unsupported first inode position\n");
return (EINVAL); /* XXX needs translation */
}
- if (fs2h32(fs->e2fs_features_incompat) &
- ~EXT2F_INCOMPAT_SUPP) {
- printf("Ext2 fs: unsupported optional feature\n");
+ u32 = fs2h32(fs->e2fs_features_incompat) & ~EXT2F_INCOMPAT_SUPP;
+ if (u32) {
+ printf("ext2fs: unsupported incompat feature 0x%x\n",
+ u32);
return (EINVAL); /* XXX needs translation */
}
- if (!ronly && fs2h32(fs->e2fs_features_rocompat) &
- ~EXT2F_ROCOMPAT_SUPP) {
+ u32 = fs2h32(fs->e2fs_features_rocompat) & ~EXT2F_ROCOMPAT_SUPP;
+ if (!ronly && u32) {
+ printf("ext2fs: unsupported ro-incompat feature 0x%x\n",
+ u32);
return (EROFS); /* XXX needs translation */
}
}
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: jakllsch Date: Sat Sep 1 15:25:33 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: back out unintentional change in 1.352. To generate a diff of this commit: cvs rdiff -u -r1.361 -r1.362 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.361 src/sys/arch/amd64/conf/GENERIC:1.362 --- src/sys/arch/amd64/conf/GENERIC:1.361 Mon Aug 27 03:18:12 2012 +++ src/sys/arch/amd64/conf/GENERIC Sat Sep 1 15:25:33 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.361 2012/08/27 03:18:12 dholland Exp $ +# $NetBSD: GENERIC,v 1.362 2012/09/01 15:25:33 jakllsch Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.361 $" +#ident "GENERIC-$Revision: 1.362 $" maxusers 64 # estimated number of users @@ -1204,7 +1204,7 @@ pseudo-device gif # IPv[46] over IPv[4 pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging -options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too +#options BRIDGE_IPF # bridge uses IP/IPv6 pfil hooks too pseudo-device agr # IEEE 802.3ad link aggregation #
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: jakllsch Date: Sat Sep 1 15:06:57 UTC 2012 Removed Files: src/sys/dev/i2c: pic16lcreg.h Log Message: pic16lcreg.h has been unused since removal of Xbox support, remove. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/sys/dev/i2c/pic16lcreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/beagle
Module Name:src
Committed By: matt
Date: Sat Sep 1 14:54:59 UTC 2012
Modified Files:
src/sys/arch/evbarm/beagle: beagle_start.S
Log Message:
shrink a little
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/beagle/beagle_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/beagle/beagle_start.S
diff -u src/sys/arch/evbarm/beagle/beagle_start.S:1.9 src/sys/arch/evbarm/beagle/beagle_start.S:1.10
--- src/sys/arch/evbarm/beagle/beagle_start.S:1.9 Wed Aug 29 18:04:23 2012
+++ src/sys/arch/evbarm/beagle/beagle_start.S Sat Sep 1 14:54:59 2012
@@ -92,7 +92,7 @@
#include
#include
-RCSID("$NetBSD: beagle_start.S,v 1.9 2012/08/29 18:04:23 matt Exp $")
+RCSID("$NetBSD: beagle_start.S,v 1.10 2012/09/01 14:54:59 matt Exp $")
#define Invalidate_I_cache(reg) \
mcr p15, 0, reg, c7, c5, 0 /* Invalidate Entire I cache */
@@ -144,15 +144,14 @@ _C_LABEL(beagle_start):
adr itable, mmu_init_table
ldr l1sfrm, Ll1_s_frame
b 3f
-2: str pa, [l1table, va]
- add va, va, #4
+2: str pa, [l1table, va, lsl #2]
+ add va, va, #1
add pa, pa, #(L1_S_SIZE)
adds n_sec, n_sec, #-1
bhi 2b
3: ldmia itable!, {va,pa,n_sec,attr}
/* Convert va to l1 offset: va = 4 * (va >> L1_S_SHIFT) */
- mov va, va, LSR #L1_S_SHIFT
- mov va, va, LSL #2
+ lsr va, va, #L1_S_SHIFT
/* Convert pa to l1 entry: pa = (pa & L1_S_FRAME) | attr */
and pa, pa, l1sfrm
orr pa, pa, attr
CVS commit: src/sys/arch/evbarm/gumstix
Module Name:src
Committed By: matt
Date: Sat Sep 1 14:52:35 UTC 2012
Modified Files:
src/sys/arch/evbarm/gumstix: gumstix_start.S
Log Message:
Don't shift VA in table since that generates errors
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/gumstix/gumstix_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/gumstix/gumstix_start.S
diff -u src/sys/arch/evbarm/gumstix/gumstix_start.S:1.9 src/sys/arch/evbarm/gumstix/gumstix_start.S:1.10
--- src/sys/arch/evbarm/gumstix/gumstix_start.S:1.9 Mon Jan 31 06:28:03 2011
+++ src/sys/arch/evbarm/gumstix/gumstix_start.S Sat Sep 1 14:52:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_start.S,v 1.9 2011/01/31 06:28:03 matt Exp $ */
+/* $NetBSD: gumstix_start.S,v 1.10 2012/09/01 14:52:35 matt Exp $ */
/*
* Copyright (C) 2005, 2006 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -66,7 +66,7 @@
#include
#include "assym.h"
-RCSID("$NetBSD: gumstix_start.S,v 1.9 2011/01/31 06:28:03 matt Exp $")
+RCSID("$NetBSD: gumstix_start.S,v 1.10 2012/09/01 14:52:35 matt Exp $")
/*
* CPWAIT -- Canonical method to wait for CP15 update.
@@ -168,13 +168,14 @@ _C_LABEL(gumstix_start):
b 5f
4:
- str r3, [r0, r2]
- add r2, r2, #4
+ str r3, [r0, r2, lsl #2]
+ add r2, r2, #1
add r3, r3, #(L1_S_SIZE)
adds r1, r1, #-1
bhi 4b
5:
ldmia r4!, {r1, r2, r3} /* # of sections, PA|attr, VA */
+ lsr r2, r2, #L1_S_SHIFT
cmp r1, #0
bne 4b
@@ -211,8 +212,8 @@ _C_LABEL(gumstix_start):
CPWAIT(r0)
/* Jump to kernel code in TRUE VA */
- adr r0, Lstart
- ldr pc, [r0]
+ ldr r0, Lstart
+ bx r0
Lstart:
.word start
@@ -238,15 +239,15 @@ ram_size:
#define MMU_INIT(va, pa, n_sec, attr) \
.word n_sec ; \
- .word (va) >> (L1_S_SHIFT-2) ; \
+ .word (va) ; \
.word (pa) | (attr) ;
mmu_init_table:
+#if defined(GUMSTIX)
/* fill all table VA==PA */
MMU_INIT(0x, 0x,
1 << (32 - L1_S_SHIFT), L1_S_PROTO | L1_S_AP_KRW)
-#if defined(GUMSTIX)
#define SDRAM_START 0xa000
/* map SDRAM VA==PA, write-back cacheable (first 64M only)*/
@@ -258,6 +259,10 @@ mmu_init_table:
64, L1_S_PROTO | L1_S_C | L1_S_AP_KRW)
#elif defined(OVERO)
+ /* fill all table VA==PA */
+ MMU_INIT(0x, 0x,
+ 1 << (32 - L1_S_SHIFT), L1_S_PROTO | L1_S_APv7_KRW)
+
#define SDRAM_START 0x8000
/* Map VA to PA, write-back cacheable (first 64M only) */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Sep 1 14:51:22 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: OVERO Log Message: Bump SYMTAB_SPACE Use cortex-a8 since it is a OMAP3530 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/conf/OVERO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/OVERO diff -u src/sys/arch/evbarm/conf/OVERO:1.15 src/sys/arch/evbarm/conf/OVERO:1.16 --- src/sys/arch/evbarm/conf/OVERO:1.15 Wed Aug 29 08:29:58 2012 +++ src/sys/arch/evbarm/conf/OVERO Sat Sep 1 14:51:21 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: OVERO,v 1.15 2012/08/29 08:29:58 skrll Exp $ +# $NetBSD: OVERO,v 1.16 2012/09/01 14:51:21 matt Exp $ # # OVERO -- Gumstix. Inc. Overo platforms kernel # @@ -17,7 +17,7 @@ maxusers 32 options CPU_CORTEXA8 options OMAP_3530 options PMAPCOUNTERS -makeoptions CPUFLAGS="-march=arm11k -mtune=arm1136jf-s" +makeoptions CPUFLAGS="-mcpu=cortex-a8" # Architecture options @@ -154,7 +154,7 @@ options DDB_ONPANIC=1 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #options KGDB makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=35 +options SYMTAB_SPACE=60 config netbsd root on ? type ?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Sep 1 14:50:12 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: ADI_BRH ARMADILLO210 ARMADILLO9 CP3100 HDL_G IMX31LITE INTEGRATOR IQ31244 IQ80310 IXDP425 IXM1200 NAPPI NSLU2 OPENRD RPI TEAMASA_NPWR TS7200 VIPER ZAO425 Log Message: Bump up SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/ADI_BRH \ src/sys/arch/evbarm/conf/IQ31244 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/ARMADILLO210 cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/ARMADILLO9 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/CP3100 cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/HDL_G cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/IMX31LITE cvs rdiff -u -r1.67 -r1.68 src/sys/arch/evbarm/conf/INTEGRATOR cvs rdiff -u -r1.75 -r1.76 src/sys/arch/evbarm/conf/IQ80310 cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/conf/IXDP425 cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/IXM1200 cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/NAPPI cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbarm/conf/NSLU2 cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/OPENRD cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.72 -r1.73 src/sys/arch/evbarm/conf/TEAMASA_NPWR cvs rdiff -u -r1.50 -r1.51 src/sys/arch/evbarm/conf/TS7200 cvs rdiff -u -r1.25 -r1.26 src/sys/arch/evbarm/conf/VIPER cvs rdiff -u -r1.45 -r1.46 src/sys/arch/evbarm/conf/ZAO425 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/ADI_BRH diff -u src/sys/arch/evbarm/conf/ADI_BRH:1.57 src/sys/arch/evbarm/conf/ADI_BRH:1.58 --- src/sys/arch/evbarm/conf/ADI_BRH:1.57 Sat Apr 7 03:25:00 2012 +++ src/sys/arch/evbarm/conf/ADI_BRH Sat Sep 1 14:50:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ADI_BRH,v 1.57 2012/04/07 03:25:00 tsutsui Exp $ +# $NetBSD: ADI_BRH,v 1.58 2012/09/01 14:50:11 matt Exp $ # # ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board # @@ -133,7 +133,7 @@ options DIAGNOSTIC # internally consist options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=40 +options SYMTAB_SPACE=60 config netbsd root on ? type ? config netbsd-fxp0 root on fxp0 type nfs Index: src/sys/arch/evbarm/conf/IQ31244 diff -u src/sys/arch/evbarm/conf/IQ31244:1.57 src/sys/arch/evbarm/conf/IQ31244:1.58 --- src/sys/arch/evbarm/conf/IQ31244:1.57 Wed Aug 29 08:29:58 2012 +++ src/sys/arch/evbarm/conf/IQ31244 Sat Sep 1 14:50:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: IQ31244,v 1.57 2012/08/29 08:29:58 skrll Exp $ +# $NetBSD: IQ31244,v 1.58 2012/09/01 14:50:11 matt Exp $ # # IQ31244 -- Intel IQ31244 Evaluation Board Kernel # @@ -132,7 +132,7 @@ options DIAGNOSTIC # internally consist options DDB # in-kernel debugger options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=39 +options SYMTAB_SPACE=55 config netbsd root on ? type ? config netbsd-wm0 root on wm0 type nfs Index: src/sys/arch/evbarm/conf/ARMADILLO210 diff -u src/sys/arch/evbarm/conf/ARMADILLO210:1.22 src/sys/arch/evbarm/conf/ARMADILLO210:1.23 --- src/sys/arch/evbarm/conf/ARMADILLO210:1.22 Sat Apr 7 03:25:00 2012 +++ src/sys/arch/evbarm/conf/ARMADILLO210 Sat Sep 1 14:50:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO210,v 1.22 2012/04/07 03:25:00 tsutsui Exp $ +# $NetBSD: ARMADILLO210,v 1.23 2012/09/01 14:50:11 matt Exp $ # # ARMADILLO210 -- Atmark Techno, Armadillo-210 # @@ -125,7 +125,7 @@ options PIPE_SOCKETPAIR # smaller, but #options DDB_ONPANIC=1 #options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #makeoptions DEBUG="-g" # compile full symbol table -#options SYMTAB_SPACE=45 +#options SYMTAB_SPACE=60 #options PMAP_INCLUDE_PTE_SYNC #options LOCKDEBUG Index: src/sys/arch/evbarm/conf/ARMADILLO9 diff -u src/sys/arch/evbarm/conf/ARMADILLO9:1.35 src/sys/arch/evbarm/conf/ARMADILLO9:1.36 --- src/sys/arch/evbarm/conf/ARMADILLO9:1.35 Tue Jun 5 08:44:08 2012 +++ src/sys/arch/evbarm/conf/ARMADILLO9 Sat Sep 1 14:50:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO9,v 1.35 2012/06/05 08:44:08 abs Exp $ +# $NetBSD: ARMADILLO9,v 1.36 2012/09/01 14:50:11 matt Exp $ # # ARMADILLO9 -- Atmark Techno, Armadillo-9 # @@ -125,7 +125,7 @@ options DDB # in-kernel debugger #options DDB_ONPANIC=1 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #makeoptions DEBUG="-g" # compile full symbol table -options SYMTAB_SPACE=45 +options SYMTAB_SPACE=60 #options PMAP_INCLUDE_PTE_SYNC #options LOCKDEBUG Index: src/sys/arch/evbarm/conf/CP3100 diff -u src/sys/arch/evbarm/conf/CP3100:1.27 src/sys/arch/evbarm/conf/CP3100:1.28 --- src/sys/arch/evbarm/conf/CP3100:1.27 Wed Aug 29 08:29:57 2012 +++
CVS commit: src/sys/arch/arm/omap
Module Name:src Committed By: matt Date: Sat Sep 1 14:48:29 UTC 2012 Modified Files: src/sys/arch/arm/omap: omap_intr.h Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/omap/omap_intr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/omap/omap_intr.h diff -u src/sys/arch/arm/omap/omap_intr.h:1.7 src/sys/arch/arm/omap/omap_intr.h:1.8 --- src/sys/arch/arm/omap/omap_intr.h:1.7 Sat Sep 1 00:05:36 2012 +++ src/sys/arch/arm/omap/omap_intr.h Sat Sep 1 14:48:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_intr.h,v 1.7 2012/09/01 00:05:36 matt Exp $ */ +/* $NetBSD: omap_intr.h,v 1.8 2012/09/01 14:48:29 matt Exp $ */ /* * Redistribution and use in source and binary forms, with or without @@ -142,7 +142,7 @@ omap_splx(int new) write_icu(bases[2], OMAP_INTB_MIR, masks[2] | omap_global_masks[2]); write_icu(bases[3], OMAP_INTB_MIR, masks[3] | omap_global_masks[3]); write_icu(bases[4], OMAP_INTB_MIR, masks[4] | omap_global_masks[4]); - cpu_dosoftintrs(); + cpu_dosoftints(); restore_interrupts(psw); }
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sat Sep 1 14:48:06 UTC 2012 Modified Files: src/sys/arch/arm/at91: at91bus.c src/sys/arch/arm/sa11x0: sa11x0_irqhandler.c src/sys/arch/hpcarm/hpcarm: autoconf.c Log Message: Move things around for To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/at91/at91bus.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hpcarm/hpcarm/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/at91/at91bus.c diff -u src/sys/arch/arm/at91/at91bus.c:1.13 src/sys/arch/arm/at91/at91bus.c:1.14 --- src/sys/arch/arm/at91/at91bus.c:1.13 Mon Jul 30 23:35:27 2012 +++ src/sys/arch/arm/at91/at91bus.c Sat Sep 1 14:48:06 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: at91bus.c,v 1.13 2012/07/30 23:35:27 matt Exp $ */ +/* $NetBSD: at91bus.c,v 1.14 2012/09/01 14:48:06 matt Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -27,12 +27,21 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.13 2012/07/30 23:35:27 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.14 2012/09/01 14:48:06 matt Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_pmap_debug.h" +/* Define various stack sizes in pages */ +#define IRQ_STACK_SIZE 8 +#define ABT_STACK_SIZE 8 +#ifdef IPKDB +#define UND_STACK_SIZE 16 +#else +#define UND_STACK_SIZE 8 +#endif + #include #include #include @@ -91,15 +100,6 @@ int cnmode = CONMODE; -/* Define various stack sizes in pages */ -#define IRQ_STACK_SIZE 8 -#define ABT_STACK_SIZE 8 -#ifdef IPKDB -#define UND_STACK_SIZE 16 -#else -#define UND_STACK_SIZE 8 -#endif - /* boot configuration: */ vm_offset_t physical_start; vm_offset_t physical_freestart; Index: src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c diff -u src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c:1.17 src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c:1.18 --- src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c:1.17 Mon Dec 20 00:25:29 2010 +++ src/sys/arch/arm/sa11x0/sa11x0_irqhandler.c Sat Sep 1 14:48:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: sa11x0_irqhandler.c,v 1.17 2010/12/20 00:25:29 matt Exp $ */ +/* $NetBSD: sa11x0_irqhandler.c,v 1.18 2012/09/01 14:48:05 matt Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. @@ -69,7 +69,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.17 2010/12/20 00:25:29 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.18 2012/09/01 14:48:05 matt Exp $"); #include "opt_irqstats.h" @@ -77,15 +77,16 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_irqha #include #include #include +#include +#include #include +#include + #include #include #include -#include -#include - irqhandler_t *irqhandlers[NIRQS]; u_int actual_mask; Index: src/sys/arch/hpcarm/hpcarm/autoconf.c diff -u src/sys/arch/hpcarm/hpcarm/autoconf.c:1.20 src/sys/arch/hpcarm/hpcarm/autoconf.c:1.21 --- src/sys/arch/hpcarm/hpcarm/autoconf.c:1.20 Sun Jul 29 18:05:43 2012 +++ src/sys/arch/hpcarm/hpcarm/autoconf.c Sat Sep 1 14:48:05 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $ */ +/* $NetBSD: autoconf.c,v 1.21 2012/09/01 14:48:05 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -36,23 +36,26 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2012/09/01 14:48:05 matt Exp $"); #include "opt_md.h" #include #include -#include -#include -#include #include +#include +#include +#include #include #include +#include + +#include + +#include #include #include -#include -#include #include "opt_cputypes.h" #if defined(CPU_SA1100) || defined(CPU_SA1110)
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Sat Sep 1 14:46:51 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S
Log Message:
blx reg is V5, not V4T
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/arm/arm32/cpuswitch.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.69 src/sys/arch/arm/arm32/cpuswitch.S:1.70
--- src/sys/arch/arm/arm32/cpuswitch.S:1.69 Fri Aug 31 11:45:38 2012
+++ src/sys/arch/arm/arm32/cpuswitch.S Sat Sep 1 14:46:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.69 2012/08/31 11:45:38 skrll Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
#include
#include
- RCSID("$NetBSD: cpuswitch.S,v 1.69 2012/08/31 11:45:38 skrll Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $")
/* LINTSTUB: include */
@@ -337,7 +337,7 @@ ENTRY(lwp_trampoline)
mov r0, r5
mov r1, sp
-#ifdef _ARM_ARCH_4T
+#ifdef _ARM_ARCH_5
blx r4
#else
mov lr, pc
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Sat Sep 1 14:46:25 UTC 2012 Modified Files: src/sys/arch/arm/arm32: genassym.cf src/sys/arch/arm/imx: imxuartreg.h src/sys/arch/arm/include: asm.h src/sys/arch/arm/omap: omap_start.S Log Message: Add __BITS to asm.h (remove from imxuartreg.h) Add L1_S_AP_KR to genassym.h Use L1_S_AP_* in omap_start.S and don't include pmap.h To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm32/genassym.cf cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imxuartreg.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/asm.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/genassym.cf diff -u src/sys/arch/arm/arm32/genassym.cf:1.52 src/sys/arch/arm/arm32/genassym.cf:1.53 --- src/sys/arch/arm/arm32/genassym.cf:1.52 Fri Aug 31 23:59:51 2012 +++ src/sys/arch/arm/arm32/genassym.cf Sat Sep 1 14:46:25 2012 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.52 2012/08/31 23:59:51 matt Exp $ +# $NetBSD: genassym.cf,v 1.53 2012/09/01 14:46:25 matt Exp $ # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -92,6 +92,7 @@ define L1_S_SHIFT L1_S_SHIFT define L1_S_SIZE L1_S_SIZE define L1_S_B L1_S_B define L1_S_C L1_S_C +define L1_S_AP_KR L1_S_AP(AP_KR) define L1_S_AP_KRW L1_S_AP(AP_KRW) define L1_S_APv7_KRW L1_S_AP(AP7_KRW) define L1_TABLE_SIZE L1_TABLE_SIZE Index: src/sys/arch/arm/imx/imxuartreg.h diff -u src/sys/arch/arm/imx/imxuartreg.h:1.4 src/sys/arch/arm/imx/imxuartreg.h:1.5 --- src/sys/arch/arm/imx/imxuartreg.h:1.4 Sat Nov 13 06:12:17 2010 +++ src/sys/arch/arm/imx/imxuartreg.h Sat Sep 1 14:46:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: imxuartreg.h,v 1.4 2010/11/13 06:12:17 bsh Exp $ */ +/* $NetBSD: imxuartreg.h,v 1.5 2012/09/01 14:46:25 matt Exp $ */ /* * register definitions for Freescale i.MX31 and i.MX31L UARTs * @@ -18,13 +18,6 @@ #ifndef _IMXUARTREG_H #define _IMXUARTREG_H -#ifdef __ASSEMBLER__ -#define __BIT(n) (1<<(n)) -#define __BITS(hi,lo) ((~((~0)<<((hi)+1)))&((~0)<<(lo))) -#else -#include -#endif - /* * Registers are 32 bits wide; the 16 MSBs are unused -- * they read as zeros and are ignored on write. Index: src/sys/arch/arm/include/asm.h diff -u src/sys/arch/arm/include/asm.h:1.15 src/sys/arch/arm/include/asm.h:1.16 --- src/sys/arch/arm/include/asm.h:1.15 Wed Aug 29 22:25:05 2012 +++ src/sys/arch/arm/include/asm.h Sat Sep 1 14:46:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.15 2012/08/29 22:25:05 matt Exp $ */ +/* $NetBSD: asm.h,v 1.16 2012/09/01 14:46:25 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -40,6 +40,7 @@ #include #define __BIT(n) (1 << (n)) +#define __BITS(hi,lo) ((~((~0)<<((hi)+1)))&((~0)<<(lo))) #define _C_LABEL(x) x #define _ASM_LABEL(x) x Index: src/sys/arch/arm/omap/omap_start.S diff -u src/sys/arch/arm/omap/omap_start.S:1.4 src/sys/arch/arm/omap/omap_start.S:1.5 --- src/sys/arch/arm/omap/omap_start.S:1.4 Thu Jun 30 20:09:20 2011 +++ src/sys/arch/arm/omap/omap_start.S Sat Sep 1 14:46:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: omap_start.S,v 1.4 2011/06/30 20:09:20 wiz Exp $ */ +/* $NetBSD: omap_start.S,v 1.5 2012/09/01 14:46:25 matt Exp $ */ /* * Machine dependent startup code for OMAP boards. @@ -88,8 +88,6 @@ #include #include -#undef DOMAIN_CLIENT /* assym.h defines as 1, but pte.h defines as 0x01 */ -#include #include /* @@ -228,14 +226,14 @@ mmu_init_table: /* Map SDRAM where we're executing from VA==PA, read-only */ MMU_INIT(KERNEL_BASE_phys, KERNEL_BASE_phys, 1, - L1_S_PROTO | L1_S_AP(AP_KR)) + L1_S_PROTO | L1_S_AP_KR) /* Map KERNEL_BASE VA to SDRAM PA, write-back cacheable */ MMU_INIT(KERNEL_BASE, KERNEL_BASE_phys, (MEMSIZE_BYTES + L1_S_SIZE - 1) / L1_S_SIZE, - L1_S_PROTO | L1_S_AP(AP_KRW) | L1_S_B | L1_S_C) + L1_S_PROTO | L1_S_AP_KRW | L1_S_B | L1_S_C) /* Map TIPB VA==PA so peripherals will work. */ MMU_INIT(OMAP_TIPB_PBASE, OMAP_TIPB_PBASE, (OMAP_TIPB_SIZE + L1_S_SIZE - 1) / L1_S_SIZE, - L1_S_PROTO | L1_S_AP(AP_KRW)) + L1_S_PROTO | L1_S_AP_KRW) /* end of table */ MMU_INIT(0, 0, 0, 0)
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: matt
Date: Sat Sep 1 14:44:43 UTC 2012
Modified Files:
src/sys/arch/arm/imx: imx_space.c
src/sys/arch/arm/omap: omap_space.c
Log Message:
Use PMAP_NOCACHE
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/imx_space.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap_space.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/imx/imx_space.c
diff -u src/sys/arch/arm/imx/imx_space.c:1.4 src/sys/arch/arm/imx/imx_space.c:1.5
--- src/sys/arch/arm/imx/imx_space.c:1.4 Sat Sep 1 00:06:54 2012
+++ src/sys/arch/arm/imx/imx_space.c Sat Sep 1 14:44:42 2012
@@ -1,7 +1,7 @@
-/* $Id: imx_space.c,v 1.4 2012/09/01 00:06:54 matt Exp $ */
+/* $Id: imx_space.c,v 1.5 2012/09/01 14:44:42 matt Exp $ */
/* derived from: */
-/* $NetBSD: imx_space.c,v 1.4 2012/09/01 00:06:54 matt Exp $ */
+/* $NetBSD: imx_space.c,v 1.5 2012/09/01 14:44:42 matt Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -206,10 +206,9 @@ int
imx_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
int flag, bus_space_handle_t *bshp)
{
- u_long startpa, endpa, pa;
- vaddr_t va;
- pt_entry_t *pte;
const struct pmap_devmap *pd;
+ paddr_t startpa, endpa, pa;
+ vaddr_t va;
if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
/* Device was statically mapped. */
Index: src/sys/arch/arm/omap/omap_space.c
diff -u src/sys/arch/arm/omap/omap_space.c:1.5 src/sys/arch/arm/omap/omap_space.c:1.6
--- src/sys/arch/arm/omap/omap_space.c:1.5 Sun Jul 15 20:54:15 2012
+++ src/sys/arch/arm/omap/omap_space.c Sat Sep 1 14:44:43 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_space.c,v 1.5 2012/07/15 20:54:15 matt Exp $ */
+/* $NetBSD: omap_space.c,v 1.6 2012/09/01 14:44:43 matt Exp $ */
/*
* bus_space functions for Texas Instruments OMAP processor.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: omap_space.c,v 1.5 2012/07/15 20:54:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_space.c,v 1.6 2012/09/01 14:44:43 matt Exp $");
#include
#include
@@ -207,10 +207,9 @@ int
omap_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
int flag, bus_space_handle_t *bshp)
{
- u_long startpa, endpa, pa;
- vaddr_t va;
- pt_entry_t *pte;
const struct pmap_devmap *pd;
+ paddr_t startpa, endpa, pa;
+ vaddr_t va;
if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
/* Device was statically mapped. */
@@ -231,15 +230,8 @@ omap_bs_map(void *t, bus_addr_t bpa, bus
*bshp = (bus_space_handle_t)(va + (bpa - startpa));
for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
- pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
- if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0) {
- pte = vtopte(va);
- *pte &= ~L2_S_CACHE_MASK;
- PTE_SYNC(pte);
- /* XXX: pmap_kenter_pa() also does PTE_SYNC(). a bit of
- * waste.
- */
- }
+ pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE,
+ (flag & BUS_SPACE_MAP_CACHEABLE) ? 0 : PMAP_NOCACHE);
}
pmap_update(pmap_kernel());
CVS commit: src/sys/kern
Module Name:src
Committed By: para
Date: Sat Sep 1 12:28:59 UTC 2012
Modified Files:
src/sys/kern: subr_vmem.c
Log Message:
rework boundary-tag reserve calculation, make it more precise.
add comment about the rational behind the sizing of certain vars
used by allocation and bootstrap.
as requested by yamt@
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/kern/subr_vmem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_vmem.c
diff -u src/sys/kern/subr_vmem.c:1.74 src/sys/kern/subr_vmem.c:1.75
--- src/sys/kern/subr_vmem.c:1.74 Mon Jul 30 17:49:24 2012
+++ src/sys/kern/subr_vmem.c Sat Sep 1 12:28:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_vmem.c,v 1.74 2012/07/30 17:49:24 njoly Exp $ */
+/* $NetBSD: subr_vmem.c,v 1.75 2012/09/01 12:28:58 para Exp $ */
/*-
* Copyright (c)2006,2007,2008,2009 YAMAMOTO Takashi,
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.74 2012/07/30 17:49:24 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_vmem.c,v 1.75 2012/09/01 12:28:58 para Exp $");
#if defined(_KERNEL)
#include "opt_ddb.h"
@@ -241,13 +241,23 @@ static LIST_HEAD(, vmem) vmem_list = LIS
#else /* defined(_KERNEL) */
#define xmalloc(sz, flags) \
-kmem_alloc(sz, ((flags) & VM_SLEEP) ? KM_SLEEP : KM_NOSLEEP);
-#define xfree(p, sz) kmem_free(p, sz);
+kmem_intr_alloc(sz, ((flags) & VM_SLEEP) ? KM_SLEEP : KM_NOSLEEP);
+#define xfree(p, sz) kmem_intr_free(p, sz);
-#define BT_MINRESERVE 6
-#define BT_MAXFREE 64
-#define STATIC_VMEM_COUNT 5
+/*
+ * Memory for arenas initialized during bootstrap.
+ * There is memory for STATIC_VMEM_COUNT bootstrap arenas.
+ *
+ * BT_RESERVE calculation:
+ * we allocate memory for boundry tags with vmem, therefor we have
+ * to keep a reserve of bts used to allocated memory for bts.
+ * This reserve is 4 for each arena involved in allocating vmems memory.
+ * BT_MAXFREE: don't cache excessive counts of bts in arenas
+ */
+#define STATIC_VMEM_COUNT 4
#define STATIC_BT_COUNT 200
+#define BT_MINRESERVE 4
+#define BT_MAXFREE 64
/* must be equal or greater then qcache multiplier for kmem_va_arena */
#define STATIC_QC_POOL_COUNT 8
@@ -283,7 +293,7 @@ bt_refillglobal(vm_flag_t flags)
int i;
mutex_enter(&vmem_btag_lock);
- if (vmem_btag_freelist_count > (BT_MINRESERVE * 16)) {
+ if (vmem_btag_freelist_count > 0) {
mutex_exit(&vmem_btag_lock);
return 0;
}
@@ -325,7 +335,7 @@ bt_refill(vmem_t *vm, vm_flag_t flags)
VMEM_LOCK(vm);
mutex_enter(&vmem_btag_lock);
while (!LIST_EMPTY(&vmem_btag_freelist) &&
- vm->vm_nfreetags < (BT_MINRESERVE * 2)) {
+ vm->vm_nfreetags <= BT_MINRESERVE) {
bt = LIST_FIRST(&vmem_btag_freelist);
LIST_REMOVE(bt, bt_freelist);
LIST_INSERT_HEAD(&vm->vm_freetags, bt, bt_freelist);
@@ -349,7 +359,7 @@ bt_alloc(vmem_t *vm, vm_flag_t flags)
bt_t *bt;
again:
VMEM_LOCK(vm);
- if (vm->vm_nfreetags < BT_MINRESERVE &&
+ if (vm->vm_nfreetags <= BT_MINRESERVE &&
(flags & VM_POPULATING) == 0) {
VMEM_UNLOCK(vm);
if (bt_refill(vm, VM_NOSLEEP | VM_INSTANTFIT)) {
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src
Committed By: martin
Date: Sat Sep 1 12:19:32 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: machdep.h pmap.h
Log Message:
Backout previous, Matt fixed it differently
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/arm/include/arm32/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/arm32/machdep.h
diff -u src/sys/arch/arm/include/arm32/machdep.h:1.15 src/sys/arch/arm/include/arm32/machdep.h:1.16
--- src/sys/arch/arm/include/arm32/machdep.h:1.15 Sat Sep 1 12:05:09 2012
+++ src/sys/arch/arm/include/arm32/machdep.h Sat Sep 1 12:19:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.15 2012/09/01 12:05:09 martin Exp $ */
+/* $NetBSD: machdep.h,v 1.16 2012/09/01 12:19:32 martin Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
@@ -30,21 +30,6 @@ extern u_int prefetch_abort_handler_addr
// extern u_int undefined_handler_address;
#define undefined_handler_address (curcpu()->ci_undefsave[2])
-/*
- * Physical / virtual address structure. In a number of places (particularly
- * during bootstrapping) we need to keep track of the physical and virtual
- * addresses of various pages
- */
-typedef struct pv_addr {
- SLIST_ENTRY(pv_addr) pv_list;
- paddr_t pv_pa;
- vaddr_t pv_va;
- vsize_t pv_size;
- uint8_t pv_cache;
- uint8_t pv_prot;
-} pv_addr_t;
-typedef SLIST_HEAD(, pv_addr) pv_addrqh_t;
-
struct bootmem_info {
paddr_t bmi_start;
paddr_t bmi_kernelstart;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.105 src/sys/arch/arm/include/arm32/pmap.h:1.106
--- src/sys/arch/arm/include/arm32/pmap.h:1.105 Sat Sep 1 12:05:09 2012
+++ src/sys/arch/arm/include/arm32/pmap.h Sat Sep 1 12:19:32 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.105 2012/09/01 12:05:09 martin Exp $ */
+/* $NetBSD: pmap.h,v 1.106 2012/09/01 12:19:32 martin Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -72,7 +72,6 @@
#include
#include
-#include
#ifndef _LOCORE
#if defined(_KERNEL_OPT)
#include "opt_arm32_pmap.h"
@@ -198,6 +197,21 @@ struct pmap {
LIST_ENTRY(pmap) pm_list;
};
+/*
+ * Physical / virtual address structure. In a number of places (particularly
+ * during bootstrapping) we need to keep track of the physical and virtual
+ * addresses of various pages
+ */
+typedef struct pv_addr {
+ SLIST_ENTRY(pv_addr) pv_list;
+ paddr_t pv_pa;
+ vaddr_t pv_va;
+ vsize_t pv_size;
+ uint8_t pv_cache;
+ uint8_t pv_prot;
+} pv_addr_t;
+typedef SLIST_HEAD(, pv_addr) pv_addrqh_t;
+
extern pv_addrqh_t pmap_freeq;
extern pv_addr_t kernelstack;
extern pv_addr_t abtstack;
CVS commit: src/sys/arch/arm/conf
Module Name:src
Committed By: matt
Date: Sat Sep 1 12:17:04 UTC 2012
Modified Files:
src/sys/arch/arm/conf: kern.ldscript.head
Log Message:
Add missing ;
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/conf/kern.ldscript.head
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/conf/kern.ldscript.head
diff -u src/sys/arch/arm/conf/kern.ldscript.head:1.3 src/sys/arch/arm/conf/kern.ldscript.head:1.4
--- src/sys/arch/arm/conf/kern.ldscript.head:1.3 Wed Aug 29 22:43:57 2012
+++ src/sys/arch/arm/conf/kern.ldscript.head Sat Sep 1 12:17:04 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript.head,v 1.3 2012/08/29 22:43:57 matt Exp $ */
+/* $NetBSD: kern.ldscript.head,v 1.4 2012/09/01 12:17:04 matt Exp $ */
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm",
"elf32-littlearm")
@@ -12,8 +12,8 @@ SECTIONS
{
*(.text)
*(.text.*)
-__stub_start = .
+__stub_start = .;
*(.stub)
-__stub_end = .
+__stub_end = .;
*(.glue_7t) *(.glue_7)
*(.rodata) *(.rodata.*)
CVS commit: src/sys/arch
Module Name:src Committed By: matt Date: Sat Sep 1 12:15:40 UTC 2012 Modified Files: src/sys/arch/arm/arm32: intr.c src/sys/arch/shark/shark: autoconf.c Log Message: Rework includes and include for pmap.h To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/arm32/intr.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/shark/shark/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/intr.c diff -u src/sys/arch/arm/arm32/intr.c:1.33 src/sys/arch/arm/arm32/intr.c:1.34 --- src/sys/arch/arm/arm32/intr.c:1.33 Fri Jul 27 05:36:09 2012 +++ src/sys/arch/arm/arm32/intr.c Sat Sep 1 12:15:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.33 2012/07/27 05:36:09 matt Exp $ */ +/* $NetBSD: intr.c,v 1.34 2012/09/01 12:15:39 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -36,16 +36,16 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.33 2012/07/27 05:36:09 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.34 2012/09/01 12:15:39 matt Exp $"); #include #include -#include -#include #include +#include +#include +#include -#include -#include +#include #include Index: src/sys/arch/shark/shark/autoconf.c diff -u src/sys/arch/shark/shark/autoconf.c:1.18 src/sys/arch/shark/shark/autoconf.c:1.19 --- src/sys/arch/shark/shark/autoconf.c:1.18 Sun Jul 29 18:05:46 2012 +++ src/sys/arch/shark/shark/autoconf.c Sat Sep 1 12:15:39 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:46 mlelstv Exp $ */ +/* $NetBSD: autoconf.c,v 1.19 2012/09/01 12:15:39 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.18 2012/07/29 18:05:46 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2012/09/01 12:15:39 matt Exp $"); #include "opt_md.h" @@ -53,11 +53,15 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v #include #include #include +#include #include #include + +#include + #include + #include -#include #include #include "isa.h"
CVS commit: src/sys/arch/arm/include/arm32
Module Name:src
Committed By: martin
Date: Sat Sep 1 12:05:09 UTC 2012
Modified Files:
src/sys/arch/arm/include/arm32: machdep.h pmap.h
Log Message:
Move struct pv_addr next to struct bootmem_info into machdep.h and have
pmap.h include that.
Seems to be the least intrusive build fix; Matt: feel free to revamp.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/include/arm32/machdep.h
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/arm/include/arm32/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/include/arm32/machdep.h
diff -u src/sys/arch/arm/include/arm32/machdep.h:1.14 src/sys/arch/arm/include/arm32/machdep.h:1.15
--- src/sys/arch/arm/include/arm32/machdep.h:1.14 Fri Aug 31 23:59:52 2012
+++ src/sys/arch/arm/include/arm32/machdep.h Sat Sep 1 12:05:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.h,v 1.14 2012/08/31 23:59:52 matt Exp $ */
+/* $NetBSD: machdep.h,v 1.15 2012/09/01 12:05:09 martin Exp $ */
#ifndef _ARM32_BOOT_MACHDEP_H_
#define _ARM32_BOOT_MACHDEP_H_
@@ -30,6 +30,21 @@ extern u_int prefetch_abort_handler_addr
// extern u_int undefined_handler_address;
#define undefined_handler_address (curcpu()->ci_undefsave[2])
+/*
+ * Physical / virtual address structure. In a number of places (particularly
+ * during bootstrapping) we need to keep track of the physical and virtual
+ * addresses of various pages
+ */
+typedef struct pv_addr {
+ SLIST_ENTRY(pv_addr) pv_list;
+ paddr_t pv_pa;
+ vaddr_t pv_va;
+ vsize_t pv_size;
+ uint8_t pv_cache;
+ uint8_t pv_prot;
+} pv_addr_t;
+typedef SLIST_HEAD(, pv_addr) pv_addrqh_t;
+
struct bootmem_info {
paddr_t bmi_start;
paddr_t bmi_kernelstart;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.104 src/sys/arch/arm/include/arm32/pmap.h:1.105
--- src/sys/arch/arm/include/arm32/pmap.h:1.104 Thu Aug 30 02:10:15 2012
+++ src/sys/arch/arm/include/arm32/pmap.h Sat Sep 1 12:05:09 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.104 2012/08/30 02:10:15 matt Exp $ */
+/* $NetBSD: pmap.h,v 1.105 2012/09/01 12:05:09 martin Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -72,6 +72,7 @@
#include
#include
+#include
#ifndef _LOCORE
#if defined(_KERNEL_OPT)
#include "opt_arm32_pmap.h"
@@ -197,21 +198,6 @@ struct pmap {
LIST_ENTRY(pmap) pm_list;
};
-/*
- * Physical / virtual address structure. In a number of places (particularly
- * during bootstrapping) we need to keep track of the physical and virtual
- * addresses of various pages
- */
-typedef struct pv_addr {
- SLIST_ENTRY(pv_addr) pv_list;
- paddr_t pv_pa;
- vaddr_t pv_va;
- vsize_t pv_size;
- uint8_t pv_cache;
- uint8_t pv_prot;
-} pv_addr_t;
-typedef SLIST_HEAD(, pv_addr) pv_addrqh_t;
-
extern pv_addrqh_t pmap_freeq;
extern pv_addr_t kernelstack;
extern pv_addr_t abtstack;
CVS commit: src/sys/lib/libkern/arch/arm
Module Name:src Committed By: matt Date: Sat Sep 1 11:24:37 UTC 2012 Modified Files: src/sys/lib/libkern/arch/arm: clzsi2.S Log Message: Add ARMv5 support the clz instruction To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/lib/libkern/arch/arm/clzsi2.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/arch/arm/clzsi2.S diff -u src/sys/lib/libkern/arch/arm/clzsi2.S:1.3 src/sys/lib/libkern/arch/arm/clzsi2.S:1.4 --- src/sys/lib/libkern/arch/arm/clzsi2.S:1.3 Wed Oct 15 18:07:46 2008 +++ src/sys/lib/libkern/arch/arm/clzsi2.S Sat Sep 1 11:24:36 2012 @@ -1,3 +1,4 @@ +/* $NetBSD: clzsi2.S,v 1.4 2012/09/01 11:24:36 matt Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. * All rights reserved. @@ -30,17 +31,36 @@ .text ENTRY(__clzdi2) - movs r3, r0 +#ifdef __ARMEB__ +#define HI r0 +#define LO r1 +#else +#define HI r1 +#define LO r0 +#endif +#if defined(_ARM_ARCH_5) + teq HI, #0 /* high word all zero? */ + clzne r0, HI /* count leading zeros in high word */ + clzeq r0, LO /* yes, count in low word */ + addeq r0, r0, #32 /* and add the bits in the high word */ + RET +#else + movs r3, HI movne r0, #31 bne .L_clz - movs r3, r1 + movs r3, LO movne r0, #63 bne .L_clz mov r0, #64 RET +#endif END(__clzdi2) ENTRY(__clzsi2) +#if defined(_ARM_ARCH_5) + clz r0, r0 + RET +#else movs r3, r0 moveq r0, #32 RETc(eq) @@ -85,4 +105,5 @@ ENTRY(__clzsi2) #endif #endif /* __OPTIMIZE_SIZE__ */ RET +#endif /* _ARM_ARCH_5 */ END(__clzsi2)
CVS commit: src/sys/conf
Module Name:src Committed By: matt Date: Sat Sep 1 11:21:22 UTC 2012 Modified Files: src/sys/conf: files Log Message: Add xhci placeholder To generate a diff of this commit: cvs rdiff -u -r1.1056 -r1.1057 src/sys/conf/files Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/files diff -u src/sys/conf/files:1.1056 src/sys/conf/files:1.1057 --- src/sys/conf/files:1.1056 Fri Aug 3 07:41:47 2012 +++ src/sys/conf/files Sat Sep 1 11:21:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1056 2012/08/03 07:41:47 matt Exp $ +# $NetBSD: files,v 1.1057 2012/09/01 11:21:22 matt Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1184,11 +1184,16 @@ file dev/usb/uhci.c uhci needs-flag device ohci: usbus, usbroothub, usb_dma file dev/usb/ohci.c ohci needs-flag -# EHCI USB controller +# EHCI USB2 controller # device ehci: usbus, usbroothub, usb_dma file dev/usb/ehci.c ehci needs-flag +# XHCI USB3 controller +# +device xhci: usbus, usbroothub, usb_dma +file dev/usb/xhci.c xhci needs-flag + # SL811HS/T USB controller defflag opt_slhci.h SLHCI_DEBUG SLHCI_TRY_LSVH SLHCI_PROFILE_TRANSFER device slhci: usbus, usbroothub
CVS commit: src/sys/dev
Module Name:src Committed By: matt Date: Sat Sep 1 11:19:59 UTC 2012 Modified Files: src/sys/dev: DEVNAMES Log Message: More devnames from BCM5301X work To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/dev/DEVNAMES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/DEVNAMES diff -u src/sys/dev/DEVNAMES:1.278 src/sys/dev/DEVNAMES:1.279 --- src/sys/dev/DEVNAMES:1.278 Mon Jul 23 13:05:48 2012 +++ src/sys/dev/DEVNAMES Sat Sep 1 11:19:58 2012 @@ -1,4 +1,4 @@ -# $NetBSD: DEVNAMES,v 1.278 2012/07/23 13:05:48 matt Exp $ +# $NetBSD: DEVNAMES,v 1.279 2012/09/01 11:19:58 matt Exp $ # # This file contains all used device names and defined attributes in # alphabetical order. New devices added to the system somewhere should first @@ -13,6 +13,8 @@ a2kbbc amiga a2kbbc amigappc a34kbbc amiga a34kbbc amigappc +a9tmr arm +a9wdt arm aac MI abtn macppc abus vax @@ -93,6 +95,9 @@ arcmsr MI arcpp acorn26 arcvideo acorn26 aria MI +armgic arm +arml2cc arm +armperiph arm arp MI Attribute artsata MI asc acorn32 @@ -170,6 +175,16 @@ bioscall i386 Attribute bivideo hpcmips bktr MI bm macppc +bcmcca arm +bcmccb arm +bcmeth arm +bcmi2c arm +bcmmdio arm +bcmnand arm +bcmpax arm +bcmrng arm +bcmsw arm +bcmusb arm bmd x68k bmtphy MI boca MI @@ -353,6 +368,7 @@ drsupio amigappc dsrtc cats dsrtc evbppc dtide MI +dtimer arm duart powerpc dvbox hp300 dwlpx alpha @@ -1504,6 +1520,7 @@ xencons xen xenevt xen xennet xen xge MI +xhci MI xi MI xmi MI xsii pmax
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Sep 1 11:11:31 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Log Message: Add some more kernels To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/README.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.3 src/sys/arch/evbarm/conf/README.evbarm:1.4 --- src/sys/arch/evbarm/conf/README.evbarm:1.3 Wed Aug 1 10:50:05 2012 +++ src/sys/arch/evbarm/conf/README.evbarm Sat Sep 1 11:11:31 2012 @@ -1,11 +1,14 @@ -$NetBSD: README.evbarm,v 1.3 2012/08/01 10:50:05 kiyohara Exp $ +$NetBSD: README.evbarm,v 1.4 2012/09/01 11:11:31 matt Exp $ config date boards --- ADI_BRH 2003/01/25 ADI Eng. Big Read Head i80200 eval board ARMADILLO210 2006/02/06 Atmark Techno Armadillo-210 ARMADILLO9 2005/11/13 Atmark Techno Armadillo-9 +BCM5301X 2012/08/31 Broadcom BCM95301X evaluation/reference board BEAGLEBOARD 2008/10/22 TI OMAP3530 BeagleBoard +BEAGLEBOARDXM 2008/08/20 TI DM37xx BeagleBoard-XM +BEAGLEBONE 2012/08/20 TI AM335x BeagleBone CP3100 2006/11/08 Certance IOP321 CP-3100 DEVKIT8000 2010/09/08 Embest OMAP3530 DevKit8000 eval Kit DNS323 2010/10/02 D-Link DNS-323 Marvell SoC based NAS @@ -32,8 +35,10 @@ NAPPI 2002/07/15 Netwise APlication Pla NETWALKER 2010/11/13 Sharp NetWalker NSLU2 2006/02/28 Linksys NSLU2 (a.k.a. "Slug") OPENBLOCKS_A6 2012/08/01 Plat'Home. OpenBlockS A6 +OPENRD 2012/08/10 open-rd.org Marvell Orion board OSK5912 2007/01/06 TI OMAP 5912 OSK board OVERO 2010/07/10 Gumstix Inc. OMAP3530 based Overo boards +PANDABOARD 2012/08/20 TI OMAP4430 PandaBoard SHEEVAPLUG 2010/10/02 Marvell SheevaPlug SMDK2410 2003/07/31 Samsung SMDK2410 S3C2410 eval board SMDK2800 2002/11/20 Samsung SMDK2800 S3C2800 eval board
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Sep 1 11:04:19 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: BCM5301X std.bcm53xx Log Message: Add DKWEDGE support Add __HAVE_CPU_COUNTER To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/BCM5301X \ src/sys/arch/evbarm/conf/std.bcm53xx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/BCM5301X diff -u src/sys/arch/evbarm/conf/BCM5301X:1.1 src/sys/arch/evbarm/conf/BCM5301X:1.2 --- src/sys/arch/evbarm/conf/BCM5301X:1.1 Sat Sep 1 00:15:11 2012 +++ src/sys/arch/evbarm/conf/BCM5301X Sat Sep 1 11:04:17 2012 @@ -1,5 +1,5 @@ # -# $NetBSD: BCM5301X,v 1.1 2012/09/01 00:15:11 matt Exp $ +# $NetBSD: BCM5301X,v 1.2 2012/09/01 11:04:17 matt Exp $ # # BCM5301X -- Broadcom BCM5301X Eval Board Kernel # @@ -121,6 +121,9 @@ options SYSVSHM # System V-like memory #options MINIROOTSIZE=1000 # Size in blocks #options MEMORY_DISK_IS_ROOT # use memory disk as root +options DKWEDGE_AUTODISCOVER +options DKWEDGE_METHOD_GPT + # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) #options KMEMSTATS # kernel memory statistics @@ -260,3 +263,4 @@ pseudo-device pty # pseudo-terminals #options RND_COM #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms +pseudo-device drvctl # device control Index: src/sys/arch/evbarm/conf/std.bcm53xx diff -u src/sys/arch/evbarm/conf/std.bcm53xx:1.1 src/sys/arch/evbarm/conf/std.bcm53xx:1.2 --- src/sys/arch/evbarm/conf/std.bcm53xx:1.1 Sat Sep 1 00:15:11 2012 +++ src/sys/arch/evbarm/conf/std.bcm53xx Sat Sep 1 11:04:17 2012 @@ -1,4 +1,4 @@ -# $NetBSD: std.bcm53xx,v 1.1 2012/09/01 00:15:11 matt Exp $ +# $NetBSD: std.bcm53xx,v 1.2 2012/09/01 11:04:17 matt Exp $ # # standard NetBSD/evbarm for BEAGLEBAORD options @@ -15,9 +15,9 @@ options EXEC_SCRIPT options COM_TOLERANCE=40 options ARM32 options CORTEX_PMC -options CORTEX_PMC_CCNT_HZ=5 options __HAVE_FAST_SOFTINTS # should be in types.h options __HAVE_CPU_UAREA_ALLOC_IDLELWP +options __HAVE_CPU_COUNTER options TPIDRPRW_IS_CURCPU options KERNEL_BASE_EXT=0x8000 options EVBARM_BOARDTYPE="bcm53xx"
