CVS commit: src/lib/libc/sys

2013-09-06 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Fri Sep  6 17:54:09 UTC 2013

Modified Files:
src/lib/libc/sys: _lwp_getprivate.2

Log Message:
document MD ways to access private data for some platforms


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/sys/_lwp_getprivate.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libc/sys/_lwp_getprivate.2
diff -u src/lib/libc/sys/_lwp_getprivate.2:1.4 src/lib/libc/sys/_lwp_getprivate.2:1.5
--- src/lib/libc/sys/_lwp_getprivate.2:1.4	Wed Apr 30 13:10:51 2008
+++ src/lib/libc/sys/_lwp_getprivate.2	Fri Sep  6 17:54:09 2013
@@ -1,4 +1,4 @@
-.\	$NetBSD: _lwp_getprivate.2,v 1.4 2008/04/30 13:10:51 martin Exp $
+.\	$NetBSD: _lwp_getprivate.2,v 1.5 2013/09/06 17:54:09 yamt Exp $
 .\
 .\ Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -27,7 +27,7 @@
 .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\ POSSIBILITY OF SUCH DAMAGE.
 .\
-.Dd January 16, 2003
+.Dd September 7, 2013
 .Dt _LWP_GETPRIVATE 2
 .Os
 .Sh NAME
@@ -50,6 +50,26 @@ in a location private to the LWP.
 .Pp
 .Fn _lwp_getprivate
 returns the pointer to private data for the LWP.
+.Pp
+Some platforms provide alternative ways quicker than
+.Fn _lwp_getprivate
+to use the pointer.
+.Bl -tag -width amd64
+.It alpha
+The pointer can be retrieved by call_pal PAL_rdunique.
+.It amd64
+The base address of
+.Dv %fs
+register is set to the pointer so that the private data can be
+accessed using the selector.
+.It i386
+The base address of
+.Dv %gs
+register is set to the pointer so that the private data can be
+accessed using the selector.
+.It sparc
+.Dv %g7
+register is set to the pointer.
 .Sh ERRORS
 The
 .Fn _lwp_getprivate



CVS commit: src/sys/arch/arm/arm

2013-09-06 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Sep  6 21:25:34 UTC 2013

Modified Files:
src/sys/arch/arm/arm: vectors.S

Log Message:
Fix INTEGRATOR build.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm/vectors.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/arm/vectors.S
diff -u src/sys/arch/arm/arm/vectors.S:1.9 src/sys/arch/arm/arm/vectors.S:1.10
--- src/sys/arch/arm/arm/vectors.S:1.9	Fri Sep  6 09:43:32 2013
+++ src/sys/arch/arm/arm/vectors.S	Fri Sep  6 21:25:34 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: vectors.S,v 1.9 2013/09/06 09:43:32 skrll Exp $	*/
+/*	$NetBSD: vectors.S,v 1.10 2013/09/06 21:25:34 skrll Exp $	*/
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -67,12 +67,14 @@ _C_LABEL(page0rel):
 #ifdef __ARM_FIQ_INDIRECT
 	b	_C_LABEL(fiqvector)
 #else
-_C_LABEL(fiqvector):
+_C_LABEL(fiqbranch):
 	subs	pc, lr, #4
 #endif
 END(page0rel)
 
-#else /* CPU_ARMV7 || CPU_ARM11 || ARM_HAS_VBAR */
+#endif /* CPU_ARMV7 || CPU_ARM11 || ARM_HAS_VBAR */
+
+#if !defined(ARM_HAS_VBAR)
 
 	.global	_C_LABEL(page0), _C_LABEL(page0_data), _C_LABEL(page0_end)
 	.align	0



CVS commit: src/sys/arch/evbarm/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Sep  6 22:56:47 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: mk.cubie

Log Message:
Use KERNEL_BASE_PHYS for load and entry addresses for u-boot.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.cubie

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/mk.cubie
diff -u src/sys/arch/evbarm/conf/mk.cubie:1.1 src/sys/arch/evbarm/conf/mk.cubie:1.2
--- src/sys/arch/evbarm/conf/mk.cubie:1.1	Tue Sep  3 06:12:00 2013
+++ src/sys/arch/evbarm/conf/mk.cubie	Fri Sep  6 22:56:47 2013
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.cubie,v 1.1 2013/09/03 06:12:00 matt Exp $
+#	$NetBSD: mk.cubie,v 1.2 2013/09/06 22:56:47 matt Exp $
 CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
 
 SYSTEM_FIRST_OBJ=	cubie_start.o
@@ -8,15 +8,15 @@ GENASSYM_EXTRAS+=	${THISARM}/cubie/genas
 
 _OSRELEASE!=		${HOST_SH} $S/conf/osrelease.sh
 
+KERNEL_BASE_PHYS?=$(LOADADDRESS)
+KERNEL_BASE_VIRT?=$(LOADADDRESS)
+
 MKUBOOTIMAGEARGS=	-A arm -T kernel
-MKUBOOTIMAGEARGS+=	-a $(LOADADDRESS) -e $(LOADADDRESS)
+MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n NetBSD/$(BOARDTYPE) ${_OSRELEASE}
 MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none
 MKUBOOTIMAGEARGS_GZ=	${MKUBOOTIMAGEARGS} -C gz
 
-KERNEL_BASE_PHYS?=$(LOADADDRESS)
-KERNEL_BASE_VIRT?=$(LOADADDRESS)
-
 SYSTEM_LD_TAIL_EXTRA+=; \
 	echo ${OBJCOPY} -S -O binary $@ $@.bin; \
 	${OBJCOPY} -S -O binary $@ $@.bin; \



CVS commit: src/sys/arch/evbarm/cubie

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:30:17 UTC 2013

Modified Files:
src/sys/arch/evbarm/cubie: cubie_start.S

Log Message:
Make sure the core register are mapped PA:VA too.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/cubie/cubie_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/cubie/cubie_start.S
diff -u src/sys/arch/evbarm/cubie/cubie_start.S:1.1 src/sys/arch/evbarm/cubie/cubie_start.S:1.2
--- src/sys/arch/evbarm/cubie/cubie_start.S:1.1	Tue Sep  3 18:01:33 2013
+++ src/sys/arch/evbarm/cubie/cubie_start.S	Sat Sep  7 00:30:17 2013
@@ -95,7 +95,7 @@
 #include arm/allwinner/awin_reg.h
 #include evbarm/cubie/platform.h  
 
-RCSID($NetBSD: cubie_start.S,v 1.1 2013/09/03 18:01:33 matt Exp $)
+RCSID($NetBSD: cubie_start.S,v 1.2 2013/09/07 00:30:17 matt Exp $)
 
 #if defined(VERBOSE_INIT_ARM)
 #define	XPUTC(n)	mov r0, n; bl xputc
@@ -164,11 +164,7 @@ _C_LABEL(cubie_start):
 	movw	ip, #:lower16:start
 	movt	ip, #:upper16:start
 	bx	ip		/* Jump to start (flushes pipeline). */
-	nop
-	nop
-	nop
-	nop
-	
+
 	/* NOTREACHED */
 
 #include arm/cortex/a9_mpsubr.S
@@ -189,6 +185,10 @@ _C_LABEL(cubie_start):
 		(AWIN_CORE_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
 		L1_S_PROTO | L1_S_APv7_KRW)
 
+	/* Map AWIN CORE (so console will work) */
+	MMU_INIT(AWIN_CORE_PBASE, AWIN_CORE_PBASE,
+		(AWIN_CORE_SIZE + L1_S_SIZE - 1) / L1_S_SIZE,
+		L1_S_PROTO | L1_S_APv7_KRW)
 	/* end of table */
 	MMU_INIT(0, 0, 0, 0)
 



CVS commit: src/sys/arch/evbarm/cubie

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:31:11 UTC 2013

Modified Files:
src/sys/arch/evbarm/cubie: cubie_machdep.c

Log Message:
call pmap_devmap before awin_bootstrap.
Don't copy bootargs yet.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/cubie/cubie_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/cubie/cubie_machdep.c
diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.3 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.4
--- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.3	Wed Sep  4 17:45:40 2013
+++ src/sys/arch/evbarm/cubie/cubie_machdep.c	Sat Sep  7 00:31:10 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cubie_machdep.c,v 1.3 2013/09/04 17:45:40 matt Exp $ */
+/*	$NetBSD: cubie_machdep.c,v 1.4 2013/09/07 00:31:10 matt Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.3 2013/09/04 17:45:40 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.4 2013/09/07 00:31:10 matt Exp $);
 
 #include opt_machdep.h
 #include opt_ddb.h
@@ -298,6 +298,7 @@ initarm(void *arg)
 	psize_t ram_size = 0;
 	char *ptr;
 
+	pmap_devmap_register(devmap);
 	awin_bootstrap(AWIN_CORE_VBASE, CONADDR_VA);
 
 	/* Heads up ... Setup the CPU / MMU / TLB functions. */
@@ -307,7 +308,6 @@ initarm(void *arg)
 	init_clocks();
 
 	/* The console is going to try to map things.  Give pmap a devmap. */
-	pmap_devmap_register(devmap);
 	consinit();
 
 	printf(\nuboot arg = %#x, %#x, %#x, %#x\n,
@@ -367,10 +367,14 @@ initarm(void *arg)
 #endif
 	KASSERT((armreg_pfr1_read()  ARM_PFR1_SEC_MASK) != 0);
 
+#if 0
 	/* bootargs env variable is passed as 4th argument to kernel */
+	printf(Copy bootargs);
 	if (uboot_args[3] - AWIN_SDRAM_PBASE  ram_size) {
 		strlcpy(bootargs, (char *)uboot_args[3], sizeof(bootargs));
 	}
+	printf(\n);
+#endif
 
 	arm32_bootmem_init(bootconfig.dram[0].address, ram_size,
 	KERNEL_BASE_PHYS);
@@ -509,10 +513,39 @@ cubie_device_register(device_t self, voi
 	}
 #endif
 
+	if (device_is_a(self, awingpio)) {
+		/*
+		 * These are GPIOs being used for various functions.
+		 */
+		prop_dictionary_set_cstring(dict, out-satapwren, PB8);
+		prop_dictionary_set_cstring(dict, out-usb0drv, PB9);
+		prop_dictionary_set_cstring(dict, out-usb1drv, PH6);
+		prop_dictionary_set_cstring(dict, out-usb2drv, PH3);
+		prop_dictionary_set_cstring(dict, out-hdd5ven, PH17);
+		prop_dictionary_set_cstring(dict, out-emacpwren, PH19);
+		prop_dictionary_set_cstring(dict, out-status-led1, PH21);
+		prop_dictionary_set_cstring(dict, out-status-led2, PH20);
+
+		/*
+		 * These pins have no connections.
+		 */
+		prop_dictionary_set_uint32(dict, nc-b, 0x0003d0e8);
+		prop_dictionary_set_uint32(dict, nc-c, 0x00ff);
+		prop_dictionary_set_uint32(dict, nc-h, 0x03c53f04);
+		prop_dictionary_set_uint32(dict, nc-i, 0x003fc03f);
+		return;
+	}
+
 	if (device_is_a(self, ehci)) {
 		return;
 	}
 
+	if (device_is_a(self, ahcisata)) {
+		/* PIO PB8 output */
+		prop_dictionary_set_cstring(dict, power-gpio, satapwren);
+		return;
+	}
+
 	if (device_is_a(self, sdhc)) {
 #if 0
 		prop_dictionary_set_uint32(dict, clkmask, 0);



CVS commit: src/sys/arch/arm/pic

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:32:02 UTC 2013

Modified Files:
src/sys/arch/arm/pic: pic.c

Log Message:
Use KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/pic/pic.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/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.16 src/sys/arch/arm/pic/pic.c:1.17
--- src/sys/arch/arm/pic/pic.c:1.16	Mon Aug 19 07:06:06 2013
+++ src/sys/arch/arm/pic/pic.c	Sat Sep  7 00:32:02 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: pic.c,v 1.16 2013/08/19 07:06:06 skrll Exp $	*/
+/*	$NetBSD: pic.c,v 1.17 2013/09/07 00:32:02 matt Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.16 2013/08/19 07:06:06 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: pic.c,v 1.17 2013/09/07 00:32:02 matt Exp $);
 
 #define _INTR_PRIVATE
 #include sys/param.h
@@ -527,7 +527,8 @@ pic_add(struct pic_softc *pic, int irqba
 	printf(%s: pic_sourcebase=%zu pic_maxsources=%zu\n,
 	pic-pic_name, pic_sourcebase, pic-pic_maxsources);
 #endif
-	KASSERT(pic-pic_maxsources = PIC_MAXSOURCES);
+	KASSERTMSG(pic-pic_maxsources = PIC_MAXSOURCES, %zu,
+	pic-pic_maxsources);
 	KASSERT(pic_sourcebase + pic-pic_maxsources = PIC_MAXMAXSOURCES);
 
 	/*



CVS commit: src/sys/arch/arm/arm32

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:32:54 UTC 2013

Modified Files:
src/sys/arch/arm/arm32: cpu.c

Log Message:
Add CPU_ID_CORTEXA7R0 entry


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/arm/arm32/cpu.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/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.97 src/sys/arch/arm/arm32/cpu.c:1.98
--- src/sys/arch/arm/arm32/cpu.c:1.97	Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm32/cpu.c	Sat Sep  7 00:32:54 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.97 2013/08/18 06:28:18 matt Exp $	*/
+/*	$NetBSD: cpu.c,v 1.98 2013/09/07 00:32:54 matt Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include sys/param.h
 
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.97 2013/08/18 06:28:18 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.98 2013/09/07 00:32:54 matt Exp $);
 
 #include sys/systm.h
 #include sys/conf.h
@@ -471,6 +471,8 @@ const struct cpuidtab cpuids[] = {
 
 	{ CPU_ID_CORTEXA5R0,	CPU_CLASS_CORTEX,	Cortex-A5 r0,
 	  pN_steppings, 7A },
+	{ CPU_ID_CORTEXA7R0,	CPU_CLASS_CORTEX,	Cortex-A7 r0,
+	  pN_steppings, 7A },
 	{ CPU_ID_CORTEXA8R1,	CPU_CLASS_CORTEX,	Cortex-A8 r1,
 	  pN_steppings, 7A },
 	{ CPU_ID_CORTEXA8R2,	CPU_CLASS_CORTEX,	Cortex-A8 r2,



CVS commit: src/sys/arch/arm/cortex

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:33:32 UTC 2013

Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S

Log Message:
Remove brain fart with TTBCR


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.8 src/sys/arch/arm/cortex/a9_mpsubr.S:1.9
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.8	Mon Aug  5 00:59:19 2013
+++ src/sys/arch/arm/cortex/a9_mpsubr.S	Sat Sep  7 00:33:32 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: a9_mpsubr.S,v 1.8 2013/08/05 00:59:19 matt Exp $	*/
+/*	$NetBSD: a9_mpsubr.S,v 1.9 2013/09/07 00:33:32 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -166,14 +166,10 @@ arm_cpuinit:
 	mov r1, #((DOMAIN_CLIENT  (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT)
 	mcr	p15, 0, r1, c3, c0, 0
 
-	XPUTC(#74)
-	mov	r0, #0			/* make sure TTBCR is 0 */
-	mcr	p15, 0, r0, c1, c0, 2
-	
 	/*
 	 * Enable the MMU, etc.
 	 */
-	XPUTC(#75)
+	XPUTC(#74)
 	mrc	p15, 0, r0, c1, c0, 0
 
 	movw	r3, #:lower16:CPU_CONTROL_SET



CVS commit: src/sys/arch/arm/cortex

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 01:42:44 UTC 2013

Modified Files:
src/sys/arch/arm/cortex: gtmr.c

Log Message:
Fix some bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gtmr.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/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.2 src/sys/arch/arm/cortex/gtmr.c:1.3
--- src/sys/arch/arm/cortex/gtmr.c:1.2	Thu Jun 20 05:30:21 2013
+++ src/sys/arch/arm/cortex/gtmr.c	Sat Sep  7 01:42:44 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: gtmr.c,v 1.2 2013/06/20 05:30:21 matt Exp $	*/
+/*	$NetBSD: gtmr.c,v 1.3 2013/09/07 01:42:44 matt Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.2 2013/06/20 05:30:21 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.3 2013/09/07 01:42:44 matt Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -128,37 +128,50 @@ void
 gtmr_init_cpu_clock(struct cpu_info *ci)
 {
 	struct gtmr_softc * const sc = gtmr_sc;
-	uint64_t now = armreg_cntv_ct_read();
 
 	KASSERT(ci == curcpu());
 
-	ci-ci_lastintr = now;
-
+	int s = splsched();
 	/*
-	 * Schedule the next interrupt.
+	 * enable timer and stop masking the timer.
 	 */
-	now += sc-sc_autoinc;
-	armreg_cntv_tval_write(sc-sc_autoinc);
+	armreg_cntv_ctl_write(ARM_CNTCTL_ENABLE);
 
 	/*
-	 * enable timer and stop masking the timer.
+	 * Get now and update the compare timer.
 	 */
-	armreg_cntv_ctl_write(ARM_CNTCTL_ENABLE);
+	ci-ci_lastintr = armreg_cntv_ct_read();
+	armreg_cntv_tval_write(sc-sc_autoinc);
+#if 0
+	printf(%s: %s: delta cval = %PRIu64\n,
+	__func__, ci-ci_data.cpu_name,
+	armreg_cntv_cval_read() - ci-ci_lastintr);
+#endif
+	splx(s);
 #if 0
 	printf(%s: %s: ctl %#x cmp %#PRIx64 now %#PRIx64\n,
 	__func__, ci-ci_data.cpu_name, armreg_cntv_ctl_read(),
 	armreg_cntv_cval_read(), armreg_cntv_ct_read());
 
-	int s = splsched();
-	uint64_t when = now;
-	u_int n = 0;
-	while ((now = armreg_cntv_ct_read())  when) {
-		/* spin */
-		n++;
-		KASSERTMSG(n = sc-sc_autoinc,
-		spun %u times but only %PRIu64 has passed,
-		n, when - now);
-	}
+	s = splsched();
+
+	uint64_t now64;
+	uint64_t start64 = armreg_cntv_ct_read();
+	do {
+		now64 = armreg_cntv_ct_read();
+	} while (start64 == now64);
+	start64 = now64;
+	uint64_t end64 = start64 + 64;
+	uint32_t start32 = armreg_pmccntr_read();
+	do {
+		now64 = armreg_cntv_ct_read();
+	} while (end64 != now64);
+	uint32_t end32 = armreg_pmccntr_read();
+
+	uint32_t diff32 = end64 - start64;
+	printf(%s: %s: %u cycles per tick\n, 
+	__func__, ci-ci_data.cpu_name, (end32 - start32) / diff32);
+
 	printf(%s: %s: status %#x cmp %#PRIx64 now %#PRIx64\n,
 	__func__, ci-ci_data.cpu_name, armreg_cntv_ctl_read(),
 	armreg_cntv_cval_read(), armreg_cntv_ct_read());
@@ -226,25 +239,33 @@ clockhandler(void *arg)
 	const uint64_t now = armreg_cntv_ct_read();
 	uint64_t delta = now - ci-ci_lastintr;
 
+#ifdef DIAGNOSTIC
+	const uint64_t then = armreg_cntv_cval_read();
+	KASSERTMSG(then = now, %PRId64, now - then);
+	KASSERTMSG(then - ci-ci_lastintr = sc-sc_autoinc, %PRId64,
+	then - ci-ci_lastintr - sc-sc_autoinc);
+#endif
+
 #if 0
 	printf(%s(%p): %s: now %#PRIx64 delta %PRIu64\n, 
 	 __func__, cf, ci-ci_data.cpu_name, now, delta);
 #endif
 	KASSERTMSG(delta  sc-sc_autoinc / 100,
-	%s: interrupting too quickly (delta=%PRIu64),
-	ci-ci_data.cpu_name, delta);
+	%s: interrupting too quickly (delta=%PRIu64) autoinc=%lu,
+	ci-ci_data.cpu_name, delta, sc-sc_autoinc);
 
 	/*
 	 * If we got interrutped too soon (delta  sc-sc_autoinc) or
 	 * we missed a tick (delta = 2 * sc-sc_autoinc), don't try to
 	 * adjust for jitter.
 	 */
-	if (delta  sc-sc_autoinc || delta = 2 * sc-sc_autoinc) {
+	delta -= sc-sc_autoinc;
+	if (delta  0 || delta = sc-sc_autoinc) {
 		delta = 0;
 	}
 	armreg_cntv_tval_write(sc-sc_autoinc - delta);
 
-	ci-ci_lastintr = now;
+	ci-ci_lastintr = now - delta;
 
 	hardclock(cf);
 



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 01:50:12 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_com.c

Log Message:
This uses an EDGE interrupt. (D'oh)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_com.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/allwinner/awin_com.c
diff -u src/sys/arch/arm/allwinner/awin_com.c:1.2 src/sys/arch/arm/allwinner/awin_com.c:1.3
--- src/sys/arch/arm/allwinner/awin_com.c:1.2	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_com.c	Sat Sep  7 01:50:12 2013
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_com.c,v 1.2 2013/09/07 00:35:52 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_com.c,v 1.3 2013/09/07 01:50:12 matt Exp $);
 
 #include sys/bus.h
 #include sys/device.h
@@ -150,7 +150,7 @@ awin_com_attach(device_t parent, device_
 	aprint_naive(\n);
 
 	KASSERT(loc-loc_intr != AWINIO_INTR_DEFAULT);
-	asc-asc_ih = intr_establish(loc-loc_intr, IPL_SERIAL, IST_LEVEL,
+	asc-asc_ih = intr_establish(loc-loc_intr, IPL_SERIAL, IST_EDGE,
 	comintr, sc);
 	if (asc-asc_ih == NULL)
 		panic(%s: failed to establish interrupt %d,



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:08:56 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_io.c

Log Message:
Add awingpio


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_io.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/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.2 src/sys/arch/arm/allwinner/awin_io.c:1.3
--- src/sys/arch/arm/allwinner/awin_io.c:1.2	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_io.c	Sat Sep  7 02:08:56 2013
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.2 2013/09/07 00:35:52 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.3 2013/09/07 02:08:56 matt Exp $);
 
 #include sys/bus.h
 #include sys/cpu.h
@@ -90,6 +90,7 @@ awinio_print(void *aux, const char *pnp)
 
 static const struct awin_locators awin_locators[] = {
 	{ awinicu, OFFANDSIZE(INTC), NOPORT, NOINTR, A10|REQ },
+	{ awingpio, OFFANDSIZE(PIO), NOPORT, NOINTR, AANY|REQ },
 	{ awintmr, OFFANDSIZE(TMR), NOPORT, AWIN_IRQ_TMR0, A10 },
 	{ com, OFFANDSIZE(UART0), 0, AWIN_IRQ_UART0, AANY },
 	{ com, OFFANDSIZE(UART1), 1, AWIN_IRQ_UART1, AANY },



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:09:24 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_board.c awin_gpio.c

Log Message:
Add #ifdef VERBOSE_INIT_ARM


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_board.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_gpio.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/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.3 src/sys/arch/arm/allwinner/awin_board.c:1.4
--- src/sys/arch/arm/allwinner/awin_board.c:1.3	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_board.c	Sat Sep  7 02:09:23 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: awin_board.c,v 1.3 2013/09/07 00:35:52 matt Exp $	*/
+/*	$NetBSD: awin_board.c,v 1.4 2013/09/07 02:09:23 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.3 2013/09/07 00:35:52 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_board.c,v 1.4 2013/09/07 02:09:23 matt Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -146,13 +146,21 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
 		__func__, io, error);
 	KASSERT(awin_core_bsh == iobase);
 
+#ifdef VERBOSE_INIT_ARM
 	printf(CPU Speed is);
+#endif
 	awin_cpu_clk();
+#ifdef VERBOSE_INIT_ARM
 	printf( %PRIu64\n, curcpu()-ci_data.cpu_cc_freq);
+#endif
 
+#ifdef VERBOSE_INIT_ARM
 	printf(Determining GPIO configuration);
+#endif
 	awin_gpio_init();
+#ifdef VERBOSE_INIT_ARM
 	printf(\n);
+#endif
 }
 
 #ifdef MULTIPROCESSOR

Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.2 src/sys/arch/arm/allwinner/awin_gpio.c:1.3
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.2	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_gpio.c	Sat Sep  7 02:09:23 2013
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.2 2013/09/07 00:35:52 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.3 2013/09/07 02:09:23 matt Exp $);
 
 #include sys/bus.h
 #include sys/device.h
@@ -162,7 +162,9 @@ awin_gpio_init(void)
 	struct awin_gpio_softc * const sc = awin_gpio_sc;
 	bus_size_t offset = AWIN_PIO_OFFSET;
 
+#ifdef VERBOSE_INIT_ARM
 	printf( free);
+#endif
 	for (u_int i = 0;
 	 i  __arraycount(pin_groups);
 	 i++, offset += AWIN_PIO_GRP_SIZE) {
@@ -183,8 +185,10 @@ awin_gpio_init(void)
 grp-grp_pin_inuse_mask |= mask;
 			}
 		}
+#ifdef VERBOSE_INIT_ARM
 		printf( P%c=%d, 'A' + i,
 		popcount32(grp-grp_pin_mask  ~grp-grp_pin_inuse_mask));
+#endif
 	}
 }
 



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:10:02 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_ahcisata.c awin_var.h

Log Message:
Move awin_ahci_set_clear to awin_var.h and rename to awin_reg_set_clear.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_ahcisata.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_var.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/allwinner/awin_ahcisata.c
diff -u src/sys/arch/arm/allwinner/awin_ahcisata.c:1.3 src/sys/arch/arm/allwinner/awin_ahcisata.c:1.4
--- src/sys/arch/arm/allwinner/awin_ahcisata.c:1.3	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_ahcisata.c	Sat Sep  7 02:10:02 2013
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_ahcisata.c,v 1.3 2013/09/07 00:35:52 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_ahcisata.c,v 1.4 2013/09/07 02:10:02 matt Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -72,17 +72,6 @@ awin_ahci_match(device_t parent, cfdata_
 	return 1;
 }
 
-static void inline
-awin_ahci_set_clear(bus_space_tag_t bst, bus_space_handle_t bsh,
-bus_size_t o, uint32_t set_mask, uint32_t clr_mask)
-{
-	const uint32_t old = bus_space_read_4(bst, bsh, o);
-	const uint32_t new = set_mask | (old  ~clr_mask);
-	if (old != new) {
-		bus_space_write_4(bst, bsh, o, new);
-	}
-}
-
 static void
 awin_ahci_enable(bus_space_tag_t bst, bus_space_handle_t bsh)
 {
@@ -94,7 +83,7 @@ awin_ahci_enable(bus_space_tag_t bst, bu
 	/*
 	 * Make sure it's enabled for the AHB.
 	 */
-	awin_ahci_set_clear(bst, bsh, AWIN_AHB_GATING0_REG,
+	awin_reg_set_clear(bst, bsh, AWIN_AHB_GATING0_REG,
 	AWIN_AHB_GATING0_SATA, 0);
 	delay(1);
 

Index: src/sys/arch/arm/allwinner/awin_var.h
diff -u src/sys/arch/arm/allwinner/awin_var.h:1.4 src/sys/arch/arm/allwinner/awin_var.h:1.5
--- src/sys/arch/arm/allwinner/awin_var.h:1.4	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_var.h	Sat Sep  7 02:10:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.4 2013/09/07 00:35:52 matt Exp $ */
+/* $NetBSD: awin_var.h,v 1.5 2013/09/07 02:10:02 matt Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -79,4 +79,15 @@ void	awin_gpio_pinset_release(const stru
 
 void	awin_wdog_reset(void);
 
+static void inline
+awin_reg_set_clear(bus_space_tag_t bst, bus_space_handle_t bsh,
+bus_size_t o, uint32_t set_mask, uint32_t clr_mask)
+{
+	const uint32_t old = bus_space_read_4(bst, bsh, o);
+	const uint32_t new = set_mask | (old  ~clr_mask);
+	if (old != new) {
+		bus_space_write_4(bst, bsh, o, new);
+	}
+}
+
 #endif /* _ARM_ALLWINNER_AWIN_VAR_H_ */



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:10:37 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c

Log Message:
Make sure to turn on the phys and clocks and crap.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_usb.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/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.2 src/sys/arch/arm/allwinner/awin_usb.c:1.3
--- src/sys/arch/arm/allwinner/awin_usb.c:1.2	Sat Sep  7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c	Sat Sep  7 02:10:37 2013
@@ -32,7 +32,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.2 2013/09/07 00:35:52 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.3 2013/09/07 02:10:37 matt Exp $);
 
 #include sys/bus.h
 #include sys/device.h
@@ -80,6 +80,17 @@ struct awinusb_attach_args {
 
 static const int awinusb_ohci_irqs[2] = { AWIN_IRQ_USB3, AWIN_IRQ_USB4 };
 static const int awinusb_ehci_irqs[2] = { AWIN_IRQ_USB1, AWIN_IRQ_USB2 };
+static const uint32_t awinusb_ohci_ahb_gating[2] = {
+	AWIN_AHB_GATING0_USB_OHCI0, AWIN_AHB_GATING0_USB_OHCI1,
+};
+static const uint32_t awinusb_ehci_ahb_gating[2] = {
+	AWIN_AHB_GATING0_USB_EHCI0, AWIN_AHB_GATING0_USB_EHCI1,
+};
+static const uint32_t awinusb_ohci_usb_clk_set[2] = {
+	AWIN_USB_CLK_OHCI0_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY1_ENABLE,
+	AWIN_USB_CLK_OHCI1_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY2_ENABLE,
+};
+
 
 #ifdef OHCI_DEBUG
 #define OHCI_DPRINTF(x)	if (ohcidebug) printf x
@@ -114,10 +125,11 @@ ohci_awinusb_attach(device_t parent, dev
 
 	sc-sc_dev = self;
 
-#if 0
-	awinusb_enable(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
-	AWIN_USB_CLK_USBPHY1_RST, AWIN_APB_GATING1_OHCI0);
-#endif
+	awin_reg_set_clear(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
+	AWIN_AHB_GATING0_REG, awinusb_ohci_ahb_gating[usbaa-usbaa_port],
+	0);
+	awin_reg_set_clear(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
+	AWIN_USB_CLK_REG, awinusb_ohci_usb_clk_set[usbaa-usbaa_port], 0);
 
 	sc-iot = usbaa-usbaa_bst;
 	sc-ioh = usbaa-usbaa_bsh;
@@ -183,6 +195,10 @@ ehci_awinusb_attach(device_t parent, dev
 
 	sc-sc_dev = self;
 
+	awin_reg_set_clear(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
+	AWIN_AHB_GATING0_REG, awinusb_ehci_ahb_gating[usbaa-usbaa_port],
+	0);
+
 	sc-iot = usbaa-usbaa_bst;
 	sc-ioh = usbaa-usbaa_bsh;
 	sc-sc_size = usbaa-usbaa_size;



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:32:53 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c

Log Message:
Allow either ohci or ehci to be missing.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_usb.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/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.3 src/sys/arch/arm/allwinner/awin_usb.c:1.4
--- src/sys/arch/arm/allwinner/awin_usb.c:1.3	Sat Sep  7 02:10:37 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c	Sat Sep  7 02:32:53 2013
@@ -29,10 +29,12 @@
 #define USBH_PRIVATE
 
 #include locators.h
+#include ohci.h
+#include ehci.h
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.3 2013/09/07 02:10:37 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.4 2013/09/07 02:32:53 matt Exp $);
 
 #include sys/bus.h
 #include sys/device.h
@@ -47,11 +49,15 @@ __KERNEL_RCSID(1, $NetBSD: awin_usb.c,v
 #include dev/usb/usbdivar.h
 #include dev/usb/usb_mem.h
 
+#if NOHCI  0
 #include dev/usb/ohcireg.h
 #include dev/usb/ohcivar.h
+#endif
 
+#if NEHCI  0
 #include dev/usb/ehcireg.h
 #include dev/usb/ehcivar.h
+#endif
 
 #include dev/pci/pcidevs.h
 
@@ -78,14 +84,11 @@ struct awinusb_attach_args {
 	int usbaa_port;
 };
 
+#if NOHCI  0
 static const int awinusb_ohci_irqs[2] = { AWIN_IRQ_USB3, AWIN_IRQ_USB4 };
-static const int awinusb_ehci_irqs[2] = { AWIN_IRQ_USB1, AWIN_IRQ_USB2 };
 static const uint32_t awinusb_ohci_ahb_gating[2] = {
 	AWIN_AHB_GATING0_USB_OHCI0, AWIN_AHB_GATING0_USB_OHCI1,
 };
-static const uint32_t awinusb_ehci_ahb_gating[2] = {
-	AWIN_AHB_GATING0_USB_EHCI0, AWIN_AHB_GATING0_USB_EHCI1,
-};
 static const uint32_t awinusb_ohci_usb_clk_set[2] = {
 	AWIN_USB_CLK_OHCI0_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY1_ENABLE,
 	AWIN_USB_CLK_OHCI1_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY2_ENABLE,
@@ -161,7 +164,9 @@ ohci_awinusb_attach(device_t parent, dev
 	}
 	aprint_normal_dev(self, interrupting on irq %d\n, irq);
 }
+#endif /* NOHCI  0 */
 
+#if NEHCI  0
 #ifdef EHCI_DEBUG
 #define EHCI_DPRINTF(x)	if (ehcidebug) printf x
 extern int ehcidebug;
@@ -172,6 +177,11 @@ extern int ehcidebug;
 static int ehci_awinusb_match(device_t, cfdata_t, void *);
 static void ehci_awinusb_attach(device_t, device_t, void *);
 
+static const int awinusb_ehci_irqs[2] = { AWIN_IRQ_USB1, AWIN_IRQ_USB2 };
+static const uint32_t awinusb_ehci_ahb_gating[2] = {
+	AWIN_AHB_GATING0_USB_EHCI0, AWIN_AHB_GATING0_USB_EHCI1,
+};
+
 CFATTACH_DECL_NEW(ehci_awinusb, sizeof(struct ehci_softc),
 	ehci_awinusb_match, ehci_awinusb_attach, NULL, NULL);
 
@@ -234,6 +244,7 @@ ehci_awinusb_attach(device_t parent, dev
 	}
 	aprint_normal_dev(self, interrupting on irq %d\n, irq);
 }
+#endif /* NEHCI  0 */
 
 static int awinusb_match(device_t, cfdata_t, void *);
 static void awinusb_attach(device_t, device_t, void *);
@@ -248,16 +259,11 @@ awinusb_match(device_t parent, cfdata_t 
 {
 	struct awinio_attach_args * const aio = aux;
 	const struct awin_locators * const loc = aio-aio_loc;
-	const int port = cf-cf_loc[AWINIOCF_PORT];
 
 	KASSERT(loc-loc_port != AWINIOCF_PORT_DEFAULT);
-
-	if (strcmp(cf-cf_name, loc-loc_name) != 0)
-		return 0;
-
-	if (port == AWINIOCF_PORT_DEFAULT || port != loc-loc_port)
-		return 0;
-
+	KASSERT(!strcmp(cf-cf_name, loc-loc_name));
+	KASSERT(cf-cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT 
+	|| cf-cf_loc[AWINIOCF_PORT] == loc-loc_port);
 	KASSERT((awinusb_ports  __BIT(loc-loc_port)) == 0);
 
 	return 1;
@@ -281,33 +287,24 @@ awinusb_attach(device_t parent, device_t
 	loc-loc_offset + AWIN_OHCI_OFFSET, AWIN_OHCI_SIZE,
 	usbsc-usbsc_ohci_bsh);
 
-#if 0
-	/*
-	 * Bring the PHYs out of reset.
-	 */
-	uint32_t v = bus_space_read_4(usbsc-usbsc_bst, aio-aio_ccm_bsh,
-	AWIN_USB_CLK_REG);
-	
-	v = ~(loc-loc_port == 0 ? AWIN_USB_CLK_PHY1_RST : AWIN_USB_CLK_PHY2_RST);
-	bus_space_write_4(usbsc-usbsc_bst, aio-aio_ccm_bsh,
-	USBH_PHY_CTRL_P0, USBH_PHY_CTRL_INIT);
-	bus_space_write_4(usbsc-usbsc_bst, aio-aio_ccm_bsh,
-	USBH_PHY_CTRL_P1, USBH_PHY_CTRL_INIT);
-#endif
-
 	/*
 	 * Disable interrupts
 	 */
+#if NOHCI  0
 	bus_space_write_4(usbsc-usbsc_bst, usbsc-usbsc_ohci_bsh,
 	OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS);
+#endif
+#if NEHCI  0
 	bus_size_t caplength = bus_space_read_1(usbsc-usbsc_bst,
 	usbsc-usbsc_ehci_bsh, EHCI_CAPLENGTH);
 	bus_space_write_4(usbsc-usbsc_bst, usbsc-usbsc_ehci_bsh,
 	caplength + EHCI_USBINTR, 0);
+#endif
 
 	aprint_naive(\n);
 	aprint_normal(\n);
 
+#if NOHCI  0
 	struct awinusb_attach_args usbaa_ohci = {
 		.usbaa_name = ohci,
 		.usbaa_dmat = usbsc-usbsc_dmat,
@@ -319,7 +316,9 @@ awinusb_attach(device_t parent, device_t
 	};
 
 	usbsc-usbsc_ohci_dev = config_found(self, usbaa_ohci, NULL);
+#endif
 
+#if NEHCI  0
 	struct awinusb_attach_args usbaa_ehci = {
 		.usbaa_name 

CVS commit: src/sys/arch/evbarm/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:34:01 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: CUBIEBOARD

Log Message:
Comment out ohci


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/CUBIEBOARD

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/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.3 src/sys/arch/evbarm/conf/CUBIEBOARD:1.4
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.3	Sat Sep  7 00:29:22 2013
+++ src/sys/arch/evbarm/conf/CUBIEBOARD	Sat Sep  7 02:34:01 2013
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: CUBIEBOARD,v 1.3 2013/09/07 00:29:22 matt Exp $
+#	$NetBSD: CUBIEBOARD,v 1.4 2013/09/07 02:34:01 matt Exp $
 #
 #	CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
 #
@@ -198,15 +198,7 @@ flash4		at nand0 offset 0x68 size 0	
 
 # Interrupt Controller
 awinicu0	at awinio0 
-awingpio0	at awinio0 port 0		# 18 pins
-awingpio1	at awinio0 port 1		# 24 pins
-awingpio2	at awinio0 port 2		# 25 pins
-awingpio3	at awinio0 port 3		# 28 pins
-awingpio4	at awinio0 port 4		# 12 pins
-awingpio5	at awinio0 port 5		#  6 pins
-awingpio6	at awinio0 port 6		# 12 pins
-awingpio7	at awinio0 port 7		# 28 pins
-awingpio8	at awinio0 port 8		# 22 pins
+awingpio0	at awinio0
 
 gpio*		at awingpio?
 
@@ -258,10 +250,11 @@ awinwdt*	at awinio?
 
 # On-board USB
 awinusb0	at awinio0 port 0
-ohci*		at awinusb?
+awinusb1	at awinio0 port 1
+#ohci*		at awinusb?
 ehci*		at awinusb?
+#usb*		at ohci?
 usb*		at ehci?
-usb*		at ohci?
 
 # SATA (A20)
 ahcisata*	at awinio0



CVS commit: src/sys/arch/evbarm/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:36:59 UTC 2013

Added Files:
src/sys/arch/evbarm/conf: CUBIEBOARD_INSTALL

Log Message:
Add an INSTALL kernel for CUBIEBOARD


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL
diff -u /dev/null src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL:1.1
--- /dev/null	Sat Sep  7 02:36:59 2013
+++ src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL	Sat Sep  7 02:36:59 2013
@@ -0,0 +1,10 @@
+#	$NetBSD: CUBIEBOARD_INSTALL,v 1.1 2013/09/07 02:36:59 matt Exp $
+#
+#	CUBIEBOARD_INSTALL -- CUBIEBOARD kernel with installation-sized
+#	ramdisk
+#
+
+include arch/evbarm/conf/CUBIEBOARD
+include arch/evbarm/conf/INSTALL
+
+options BOOTHOWTO=RB_SINGLE



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:46:06 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_io.c

Log Message:
correct twi - awiniic entries


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_io.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/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.3 src/sys/arch/arm/allwinner/awin_io.c:1.4
--- src/sys/arch/arm/allwinner/awin_io.c:1.3	Sat Sep  7 02:08:56 2013
+++ src/sys/arch/arm/allwinner/awin_io.c	Sat Sep  7 02:46:06 2013
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.3 2013/09/07 02:08:56 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.4 2013/09/07 02:46:06 matt Exp $);
 
 #include sys/bus.h
 #include sys/cpu.h
@@ -109,11 +109,11 @@ static const struct awin_locators awin_l
 	{ sdhc, OFFANDSIZE(SDMMC3), 3, AWIN_IRQ_SDMMC3, AANY },
 	{ sdhc, OFFANDSIZE(SDMMC1), 4, AWIN_IRQ_SDMMC1, AANY },
 	{ ahcisata, OFFANDSIZE(SATA), NOPORT, AWIN_IRQ_SATA, AANY },
-	{ twi, OFFANDSIZE(TWI0), 0, AWIN_IRQ_TWI0, AANY },
-	{ twi, OFFANDSIZE(TWI1), 1, AWIN_IRQ_TWI1, AANY },
-	{ twi, OFFANDSIZE(TWI2), 2, AWIN_IRQ_TWI2, AANY },
-	{ twi, OFFANDSIZE(TWI3), 3, AWIN_IRQ_TWI3, AANY },
-	{ twi, OFFANDSIZE(TWI4), 4, AWIN_IRQ_TWI4, AANY },
+	{ awiniic, OFFANDSIZE(TWI0), 0, AWIN_IRQ_TWI0, AANY },
+	{ awiniic, OFFANDSIZE(TWI1), 1, AWIN_IRQ_TWI1, AANY },
+	{ awiniic, OFFANDSIZE(TWI2), 2, AWIN_IRQ_TWI2, AANY },
+	{ awiniic, OFFANDSIZE(TWI3), 3, AWIN_IRQ_TWI3, AANY },
+	{ awiniic, OFFANDSIZE(TWI4), 4, AWIN_IRQ_TWI4, AANY },
 	{ spi, OFFANDSIZE(SPI0), 0, AWIN_IRQ_SPI0, AANY },
 	{ spi, OFFANDSIZE(SPI1), 1, AWIN_IRQ_SPI1, AANY },
 	{ spi, OFFANDSIZE(SPI2), 1, AWIN_IRQ_SPI2, AANY },



CVS commit: src/sys/arch/evbarm/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:46:26 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: CUBIEBOARD

Log Message:
Only configure awiniic0 for now


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/CUBIEBOARD

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/CUBIEBOARD
diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.4 src/sys/arch/evbarm/conf/CUBIEBOARD:1.5
--- src/sys/arch/evbarm/conf/CUBIEBOARD:1.4	Sat Sep  7 02:34:01 2013
+++ src/sys/arch/evbarm/conf/CUBIEBOARD	Sat Sep  7 02:46:26 2013
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: CUBIEBOARD,v 1.4 2013/09/07 02:34:01 matt Exp $
+#	$NetBSD: CUBIEBOARD,v 1.5 2013/09/07 02:46:26 matt Exp $
 #
 #	CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel
 #
@@ -207,7 +207,7 @@ gpio*		at awingpio?
 
 # I2C Controller
 awiniic0	at awinio? port 0
-awiniic*	at awinio? port ?
+#awiniic*	at awinio? port ?
 iic*		at awiniic?
 
 # On-board 16550 UARTs



CVS commit: src/sys/kern

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 03:34:59 UTC 2013

Modified Files:
src/sys/kern: kern_softint.c

Log Message:
Change two KASSERTs to KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/kern_softint.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/kern_softint.c
diff -u src/sys/kern/kern_softint.c:1.39 src/sys/kern/kern_softint.c:1.40
--- src/sys/kern/kern_softint.c:1.39	Mon Jan  7 23:21:31 2013
+++ src/sys/kern/kern_softint.c	Sat Sep  7 03:34:59 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_softint.c,v 1.39 2013/01/07 23:21:31 rmind Exp $	*/
+/*	$NetBSD: kern_softint.c,v 1.40 2013/09/07 03:34:59 matt Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -176,7 +176,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_softint.c,v 1.39 2013/01/07 23:21:31 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_softint.c,v 1.40 2013/09/07 03:34:59 matt Exp $);
 
 #include sys/param.h
 #include sys/proc.h
@@ -403,7 +403,8 @@ softint_disestablish(void *arg)
 	u_int flags;
 
 	offset = (uintptr_t)arg;
-	KASSERT(offset != 0  offset  softint_bytes);
+	KASSERTMSG(offset != 0  offset  softint_bytes, %PRIuPTR %u,
+	offset, softint_bytes);
 
 	/*
 	 * Run a cross call so we see up to date values of sh_flags from
@@ -462,7 +463,8 @@ softint_schedule(void *arg)
 
 	/* Find the handler record for this CPU. */
 	offset = (uintptr_t)arg;
-	KASSERT(offset != 0  offset  softint_bytes);
+	KASSERTMSG(offset != 0  offset  softint_bytes, %PRIuPTR %u,
+	offset, softint_bytes);
 	sh = (softhand_t *)((uint8_t *)curcpu()-ci_data.cpu_softcpu + offset);
 
 	/* If it's already pending there's nothing to do. */



CVS commit: src/sys/arch/evbarm/cubie

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 03:34:20 UTC 2013

Modified Files:
src/sys/arch/evbarm/cubie: cubie_machdep.c

Log Message:
Fix comment.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/cubie/cubie_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/cubie/cubie_machdep.c
diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.4 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.5
--- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.4	Sat Sep  7 00:31:10 2013
+++ src/sys/arch/evbarm/cubie/cubie_machdep.c	Sat Sep  7 03:34:20 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: cubie_machdep.c,v 1.4 2013/09/07 00:31:10 matt Exp $ */
+/*	$NetBSD: cubie_machdep.c,v 1.5 2013/09/07 03:34:20 matt Exp $ */
 
 /*
  * Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.4 2013/09/07 00:31:10 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cubie_machdep.c,v 1.5 2013/09/07 03:34:20 matt Exp $);
 
 #include opt_machdep.h
 #include opt_ddb.h
@@ -506,8 +506,8 @@ cubie_device_register(device_t self, voi
 #if defined(CPU_CORTEXA7) || defined(CPU_CORTEXA15)
 	if (device_is_a(self, armgtmr)) {
 		/*
-		 * The frequency of the generic timer was figured out when
-		 * determined the cpu frequency.
+		 * The frequency of the generic timer is the reference
+		 * frequency.
 		 */
 prop_dictionary_set_uint32(dict, frequency, AWIN_REF_FREQ);
 	}



CVS commit: src/sys/arch/arm/arm

2013-09-06 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Sep  6 09:43:32 UTC 2013

Modified Files:
src/sys/arch/arm/arm: vectors.S

Log Message:
Improve the #ifdefs

it's not worse. from matt@


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/vectors.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/dev/usb

2013-09-06 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Sep  6 11:15:14 UTC 2013

Modified Files:
src/sys/dev/usb: TODO.usbmp

Log Message:
Minor update.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/TODO.usbmp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/sun3/sun3x

2013-09-06 Thread Izumi Tsutsui
Module Name:src
Committed By:   tsutsui
Date:   Fri Sep  6 17:43:20 UTC 2013

Modified Files:
src/sys/arch/sun3/sun3x: bus_subr.c clock.c dvma.c enable.c enable.h
idprom.c iommu.c iommu.h locore2.c machdep.c mm_md.c obio.c pmap.c
pmap_pvt.h vme.c

Log Message:
Tab/whitespace cleanup.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/sun3/sun3x/bus_subr.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/sun3/sun3x/clock.c \
src/sys/arch/sun3/sun3x/locore2.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sun3/sun3x/dvma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun3/sun3x/enable.c \
src/sys/arch/sun3/sun3x/iommu.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun3/sun3x/enable.h \
src/sys/arch/sun3/sun3x/mm_md.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun3/sun3x/idprom.c \
src/sys/arch/sun3/sun3x/pmap_pvt.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun3/sun3x/iommu.c
cvs rdiff -u -r1.133 -r1.134 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun3/sun3x/obio.c
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sun3/sun3x/pmap.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun3/sun3x/vme.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/lib/libc/sys

2013-09-06 Thread YAMAMOTO Takashi
Module Name:src
Committed By:   yamt
Date:   Fri Sep  6 17:54:09 UTC 2013

Modified Files:
src/lib/libc/sys: _lwp_getprivate.2

Log Message:
document MD ways to access private data for some platforms


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/sys/_lwp_getprivate.2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/arm

2013-09-06 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Sep  6 21:25:34 UTC 2013

Modified Files:
src/sys/arch/arm/arm: vectors.S

Log Message:
Fix INTEGRATOR build.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm/vectors.S

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/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Fri Sep  6 22:56:47 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: mk.cubie

Log Message:
Use KERNEL_BASE_PHYS for load and entry addresses for u-boot.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.cubie

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/cubie

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:30:17 UTC 2013

Modified Files:
src/sys/arch/evbarm/cubie: cubie_start.S

Log Message:
Make sure the core register are mapped PA:VA too.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/cubie/cubie_start.S

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/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:29:22 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: CUBIEBOARD

Log Message:
Add AWIN_CONSOLE_EARLY and comment out sdhc


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/CUBIEBOARD

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/cubie

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:31:11 UTC 2013

Modified Files:
src/sys/arch/evbarm/cubie: cubie_machdep.c

Log Message:
call pmap_devmap before awin_bootstrap.
Don't copy bootargs yet.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/cubie/cubie_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/pic

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:32:02 UTC 2013

Modified Files:
src/sys/arch/arm/pic: pic.c

Log Message:
Use KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/pic/pic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/arm32

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:32:54 UTC 2013

Modified Files:
src/sys/arch/arm/arm32: cpu.c

Log Message:
Add CPU_ID_CORTEXA7R0 entry


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/arm/arm32/cpu.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/cortex

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:33:32 UTC 2013

Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S

Log Message:
Remove brain fart with TTBCR


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 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.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 00:35:53 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_ahcisata.c awin_board.c awin_com.c
awin_gpio.c awin_intr.h awin_io.c awin_reg.h awin_sdhc.c awin_twi.c
awin_usb.c awin_var.h files.awin

Log Message:
Flesh out allwinner support.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_ahcisata.c \
src/sys/arch/arm/allwinner/awin_board.c \
src/sys/arch/arm/allwinner/awin_intr.h \
src/sys/arch/arm/allwinner/awin_sdhc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/allwinner/awin_com.c \
src/sys/arch/arm/allwinner/awin_gpio.c \
src/sys/arch/arm/allwinner/awin_io.c \
src/sys/arch/arm/allwinner/awin_twi.c \
src/sys/arch/arm/allwinner/awin_usb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_reg.h \
src/sys/arch/arm/allwinner/awin_var.h \
src/sys/arch/arm/allwinner/files.awin

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/cortex

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 01:42:44 UTC 2013

Modified Files:
src/sys/arch/arm/cortex: gtmr.c

Log Message:
Fix some bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gtmr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 01:50:12 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_com.c

Log Message:
This uses an EDGE interrupt. (D'oh)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_com.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:08:56 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_io.c

Log Message:
Add awingpio


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_io.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:10:02 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_ahcisata.c awin_var.h

Log Message:
Move awin_ahci_set_clear to awin_var.h and rename to awin_reg_set_clear.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_ahcisata.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_var.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/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:09:24 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_board.c awin_gpio.c

Log Message:
Add #ifdef VERBOSE_INIT_ARM


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_board.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_gpio.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:10:37 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c

Log Message:
Make sure to turn on the phys and clocks and crap.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_usb.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:32:53 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c

Log Message:
Allow either ohci or ehci to be missing.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_usb.c

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/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:34:01 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: CUBIEBOARD

Log Message:
Comment out ohci


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/CUBIEBOARD

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/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:36:59 UTC 2013

Added Files:
src/sys/arch/evbarm/conf: CUBIEBOARD_INSTALL

Log Message:
Add an INSTALL kernel for CUBIEBOARD


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/CUBIEBOARD_INSTALL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/arch/arm/allwinner

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:46:06 UTC 2013

Modified Files:
src/sys/arch/arm/allwinner: awin_io.c

Log Message:
correct twi - awiniic entries


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_io.c

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/conf

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 02:46:26 UTC 2013

Modified Files:
src/sys/arch/evbarm/conf: CUBIEBOARD

Log Message:
Only configure awiniic0 for now


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/CUBIEBOARD

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/cubie

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 03:34:20 UTC 2013

Modified Files:
src/sys/arch/evbarm/cubie: cubie_machdep.c

Log Message:
Fix comment.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/cubie/cubie_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/sys/kern

2013-09-06 Thread Matt Thomas
Module Name:src
Committed By:   matt
Date:   Sat Sep  7 03:34:59 UTC 2013

Modified Files:
src/sys/kern: kern_softint.c

Log Message:
Change two KASSERTs to KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/kern_softint.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.