date:20150110

CVS commit: src/sys/arch

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 12:11:39 UTC 2015

Modified Files:
src/sys/arch/arm/imx: files.imx23
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
imx23_olinuxino_start.S

Log Message:
define MEMSIZE in opt_imx.h, fixes build of IMX23_OLINUXINO kernel


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/files.imx23
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_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/imx/files.imx23
diff -u src/sys/arch/arm/imx/files.imx23:1.2 src/sys/arch/arm/imx/files.imx23:1.3
--- src/sys/arch/arm/imx/files.imx23:1.2	Mon Oct  7 17:36:40 2013
+++ src/sys/arch/arm/imx/files.imx23	Sat Jan 10 12:11:39 2015
@@ -1,8 +1,10 @@
-# $Id: files.imx23,v 1.2 2013/10/07 17:36:40 matt Exp $
+# $Id: files.imx23,v 1.3 2015/01/10 12:11:39 jmcneill Exp $
 #
 # Freescale i.MX23 applications processor configuration info.
 #
 
+defparam opt_imx.h			MEMSIZE
+
 file	arch/arm/arm32/irq_dispatch.S	icoll
 file	arch/arm/imx/imx23_space.c	ahb|apbh|apbx
 file	arch/arm/imx/imx23_dma.c	ahb|apbh|apbx

Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.4 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.5
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.4	Wed Oct 29 11:21:51 2014
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c	Sat Jan 10 12:11:39 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.4 2014/10/29 11:21:51 skrll Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.5 2015/01/10 12:11:39 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include opt_imx.h
+
 #include sys/bus.h
 #include sys/cdefs.h
 #include sys/device.h

Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_start.S
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_start.S:1.2 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_start.S:1.3
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_start.S:1.2	Mon Oct  7 17:36:40 2013
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_start.S	Sat Jan 10 12:11:39 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_start.S,v 1.2 2013/10/07 17:36:40 matt Exp $ */
+/* $Id: imx23_olinuxino_start.S,v 1.3 2015/01/10 12:11:39 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include opt_imx.h
+
 #include machine/asm.h
 #include machine/pmap.h
 #include arm/armreg.h

CVS commit: src/sys/arch/evbmips/loongson

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 14:07:26 UTC 2015

Modified Files:
src/sys/arch/evbmips/loongson: autoconf.c

Log Message:
if MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/loongson/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/evbmips/loongson/autoconf.c
diff -u src/sys/arch/evbmips/loongson/autoconf.c:1.5 src/sys/arch/evbmips/loongson/autoconf.c:1.6
--- src/sys/arch/evbmips/loongson/autoconf.c:1.5	Wed Mar 13 21:17:43 2013
+++ src/sys/arch/evbmips/loongson/autoconf.c	Sat Jan 10 14:07:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.6 2015/01/10 14:07:26 jmcneill Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -35,8 +35,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include opt_md.h
+
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.6 2015/01/10 14:07:26 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -46,7 +48,9 @@ __KERNEL_RCSID(0, $NetBSD: autoconf.c,v
 #include sys/cpu.h
 #include evbmips/loongson/autoconf.h
 
+#ifndef MEMORY_DISK_IS_ROOT
 static void	findroot(void);
+#endif
 
 enum devclass bootdev_class = DV_DULL;
 char  bootdev[16];
@@ -74,7 +78,9 @@ cpu_configure(void)
 void
 cpu_rootconf(void)
 {
+#ifndef MEMORY_DISK_IS_ROOT
 	findroot();
+#endif
 
 	printf(boot device: %s\n,
 		booted_device ? device_xname(booted_device) : unknown);
@@ -85,6 +91,7 @@ cpu_rootconf(void)
 extern char	bootstring[];
 extern int	netboot;
 
+#ifndef MEMORY_DISK_IS_ROOT
 static void
 findroot(void)
 {
@@ -111,6 +118,7 @@ findroot(void)
 
 	return;
 }
+#endif
 
 void
 device_register(device_t dev, void *aux)

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

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 12:13:00 UTC 2015

Modified Files:
src/sys/arch/arm/imx: imx23_apbdma.c imx23_apbdmareg.h
imx23_apbdmavar.h

Log Message:
From Petri Laakso petri.laa...@asd.fi:
-   Fix typo: AHBH should be APBH
-   Add support for APBX DMA
-   New function apbdma_wait(); wait for DMA completion


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx23_apbdma.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx23_apbdmareg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx23_apbdmavar.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/imx/imx23_apbdma.c
diff -u src/sys/arch/arm/imx/imx23_apbdma.c:1.3 src/sys/arch/arm/imx/imx23_apbdma.c:1.4
--- src/sys/arch/arm/imx/imx23_apbdma.c:1.3	Sun Mar  3 10:33:56 2013
+++ src/sys/arch/arm/imx/imx23_apbdma.c	Sat Jan 10 12:13:00 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbdma.c,v 1.3 2013/03/03 10:33:56 jkunz Exp $ */
+/* $Id: imx23_apbdma.c,v 1.4 2015/01/10 12:13:00 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -92,10 +92,10 @@ apbdma_attach(device_t parent, device_t 
 	static u_int apbdma_attached = 0;
 
 	if ((strncmp(device_xname(parent), apbh, 4) == 0) 
-	(apbdma_attached  F_AHBH_DMA))
+	(apbdma_attached  F_APBH_DMA))
 		return;
 	if ((strncmp(device_xname(parent), apbx, 4) == 0) 
-	(apbdma_attached  F_AHBX_DMA))
+	(apbdma_attached  F_APBX_DMA))
 		return;
 
 	sc-sc_dev = self;
@@ -109,25 +109,30 @@ apbdma_attach(device_t parent, device_t 
 	}
 
 	if (strncmp(device_xname(parent), apbh, 4) == 0)
-		sc-flags = F_AHBH_DMA;
+		sc-flags = F_APBH_DMA;
 
 	if (strncmp(device_xname(parent), apbx, 4) == 0)
-		sc-flags = F_AHBX_DMA;
+		sc-flags = F_APBX_DMA;
 
 	apbdma_reset(sc);
 	apbdma_init(sc);
 
-	if (sc-flags  F_AHBH_DMA)
-		apbdma_attached |= F_AHBH_DMA;
-	if (sc-flags  F_AHBX_DMA)
-		apbdma_attached |= F_AHBX_DMA;
+	if (sc-flags  F_APBH_DMA)
+		apbdma_attached |= F_APBH_DMA;
+	if (sc-flags  F_APBX_DMA)
+		apbdma_attached |= F_APBX_DMA;
 
 	sc_parent-dmac = self;
 
 	/* Initialize mutex to control concurrent access from the drivers. */
 	mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH);
 
-	aprint_normal(\n);
+	if (sc-flags  F_APBH_DMA)
+		aprint_normal(: APBH DMA\n);
+	else if (sc-flags  F_APBX_DMA)
+		aprint_normal(: APBX DMA\n);
+	else
+		panic(dma flag missing!\n);
 
 	return;
 }
@@ -192,7 +197,7 @@ static void
 apbdma_init(struct apbdma_softc *sc)
 {
 
-	if (sc-flags  F_AHBH_DMA) {
+	if (sc-flags  F_APBH_DMA) {
 		DMA_WR(sc, HW_APBH_CTRL0_SET, HW_APBH_CTRL0_AHB_BURST8_EN);
 		DMA_WR(sc, HW_APBH_CTRL0_SET, HW_APBH_CTRL0_APB_BURST4_EN);
 	}
@@ -279,7 +284,7 @@ apbdma_chan_set_chain(struct apbdma_soft
 {
 	uint32_t reg;
 
-	if (sc-flags  F_AHBH_DMA)
+	if (sc-flags  F_APBH_DMA)
 		reg = HW_APB_CHN_NXTCMDAR(HW_APBH_CH0_NXTCMDAR, channel);
 	else
 		reg = HW_APB_CHN_NXTCMDAR(HW_APBX_CH0_NXTCMDAR, channel);
@@ -301,7 +306,7 @@ apbdma_run(struct apbdma_softc *sc, unsi
 	uint32_t reg;
 	uint8_t val;
 
-	if (sc-flags  F_AHBH_DMA) {
+	if (sc-flags  F_APBH_DMA) {
 		reg = HW_APB_CHN_SEMA(HW_APBH_CH0_SEMA, channel);
 		val = __SHIFTIN(1, HW_APBH_CH0_SEMA_INCREMENT_SEMA);
 	 } else {
@@ -324,7 +329,11 @@ apbdma_ack_intr(struct apbdma_softc *sc,
 {
 
 	mutex_enter(sc-sc_lock);
-	DMA_WR(sc, HW_APB_CTRL1_CLR, (1channel));
+	if (sc-flags  F_APBH_DMA) {
+		DMA_WR(sc, HW_APB_CTRL1_CLR, (1channel));
+	} else {
+		DMA_WR(sc, HW_APB_CTRL1_CLR, (1channel));
+	}
 	mutex_exit(sc-sc_lock);
 
 	return;
@@ -383,11 +392,34 @@ apbdma_chan_reset(struct apbdma_softc *s
 	
 	mutex_enter(sc-sc_lock);
 
-	DMA_WR(sc, HW_APB_CTRL0_SET,
-	__SHIFTIN((1channel), HW_APBH_CTRL0_RESET_CHANNEL));
-	while(DMA_RD(sc, HW_APB_CTRL0)  HW_APBH_CTRL0_RESET_CHANNEL);
+	if (sc-flags  F_APBH_DMA) {
+		DMA_WR(sc, HW_APB_CTRL0_SET,
+		__SHIFTIN((1channel), HW_APBH_CTRL0_RESET_CHANNEL));
+		while(DMA_RD(sc, HW_APB_CTRL0)  HW_APBH_CTRL0_RESET_CHANNEL);
+	} else {
+		DMA_WR(sc, HW_APBX_CHANNEL_CTRL_SET,
+			__SHIFTIN((1channel), HW_APBH_CTRL0_RESET_CHANNEL));
+		while(DMA_RD(sc, HW_APBX_CHANNEL_CTRL)  (1channel));
+	}
 
 	mutex_exit(sc-sc_lock);
 
 	return;
 }
+
+void
+apbdma_wait(struct apbdma_softc *sc, unsigned int channel)
+{
+
+	mutex_enter(sc-sc_lock);
+	
+	if (sc-flags  F_APBH_DMA) {
+		while (DMA_RD(sc, HW_APB_CHN_SEMA(HW_APBH_CH0_SEMA, channel))  HW_APBH_CH0_SEMA_PHORE)
+			;
+	 } else {
+		while (DMA_RD(sc, HW_APB_CHN_SEMA(HW_APBX_CH0_SEMA, channel))  HW_APBX_CH0_SEMA_PHORE)
+			;
+	}
+
+	mutex_exit(sc-sc_lock);
+}

Index: src/sys/arch/arm/imx/imx23_apbdmareg.h
diff -u src/sys/arch/arm/imx/imx23_apbdmareg.h:1.2 src/sys/arch/arm/imx/imx23_apbdmareg.h:1.3
--- src/sys/arch/arm/imx/imx23_apbdmareg.h:1.2	Sun Mar  3 10:33:56 2013
+++ src/sys/arch/arm/imx/imx23_apbdmareg.h	Sat Jan 10 12:13:00 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_apbdmareg.h,v 1.2

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

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 12:50:54 UTC 2015

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

Log Message:
add rlphy


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/ROCKCHIP

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/ROCKCHIP
diff -u src/sys/arch/evbarm/conf/ROCKCHIP:1.14 src/sys/arch/evbarm/conf/ROCKCHIP:1.15
--- src/sys/arch/evbarm/conf/ROCKCHIP:1.14	Mon Jan  5 22:17:38 2015
+++ src/sys/arch/evbarm/conf/ROCKCHIP	Sat Jan 10 12:50:54 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: ROCKCHIP,v 1.14 2015/01/05 22:17:38 jmcneill Exp $
+#	$NetBSD: ROCKCHIP,v 1.15 2015/01/10 12:50:54 jmcneill Exp $
 #
 #	Rockchip RK3066/RK3188 based SBC (Single Board Computer)
 #
@@ -202,6 +202,7 @@ ld*		at sdmmc?
 
 # Ethernet
 rkemac0		at obio0 addr 0x10204000 size 0x4000 intr 51
+rlphy*		at mii? phy ?
 ukphy*		at mii? phy ?
 
 #options DWC_MMC_DEBUG

CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson

2015-01-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jan 10 16:46:56 UTC 2015

Modified Files:
src/sys/arch/evbmips/loongson [netbsd-7]: autoconf.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #399):
sys/arch/evbmips/loongson/autoconf.c: revision 1.6
if MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.12.1 src/sys/arch/evbmips/loongson/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/evbmips/loongson/autoconf.c
diff -u src/sys/arch/evbmips/loongson/autoconf.c:1.5 src/sys/arch/evbmips/loongson/autoconf.c:1.5.12.1
--- src/sys/arch/evbmips/loongson/autoconf.c:1.5	Wed Mar 13 21:17:43 2013
+++ src/sys/arch/evbmips/loongson/autoconf.c	Sat Jan 10 16:46:56 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.5.12.1 2015/01/10 16:46:56 martin Exp $	*/
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -35,8 +35,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include opt_md.h
+
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.5 2013/03/13 21:17:43 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.5.12.1 2015/01/10 16:46:56 martin Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -46,7 +48,9 @@ __KERNEL_RCSID(0, $NetBSD: autoconf.c,v
 #include sys/cpu.h
 #include evbmips/loongson/autoconf.h
 
+#ifndef MEMORY_DISK_IS_ROOT
 static void	findroot(void);
+#endif
 
 enum devclass bootdev_class = DV_DULL;
 char  bootdev[16];
@@ -74,7 +78,9 @@ cpu_configure(void)
 void
 cpu_rootconf(void)
 {
+#ifndef MEMORY_DISK_IS_ROOT
 	findroot();
+#endif
 
 	printf(boot device: %s\n,
 		booted_device ? device_xname(booted_device) : unknown);
@@ -85,6 +91,7 @@ cpu_rootconf(void)
 extern char	bootstring[];
 extern int	netboot;
 
+#ifndef MEMORY_DISK_IS_ROOT
 static void
 findroot(void)
 {
@@ -111,6 +118,7 @@ findroot(void)
 
 	return;
 }
+#endif
 
 void
 device_register(device_t dev, void *aux)

CVS commit: [netbsd-7] src/doc

2015-01-10 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Jan 10 16:47:57 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.0

Log Message:
Ticket #399


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.156 -r1.1.2.157 src/doc/CHANGES-7.0

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.156 src/doc/CHANGES-7.0:1.1.2.157
--- src/doc/CHANGES-7.0:1.1.2.156	Fri Jan  9 14:51:50 2015
+++ src/doc/CHANGES-7.0	Sat Jan 10 16:47:57 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.156 2015/01/09 14:51:50 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.157 2015/01/10 16:47:57 martin Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -13212,3 +13212,8 @@ sys/kern/vfs_mount.c1.32
 	prevent an assertion from vnfree().
 	[hannken, ticket #398]
 
+sys/arch/evbmips/loongson/autoconf.c		1.6
+
+	If MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device.
+	[jmcneill, ticket #399]
+

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

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 12:13:56 UTC 2015

Modified Files:
src/sys/arch/arm/imx: imx23_clkctrl.c imx23_clkctrlvar.h

Log Message:
From: Petri Laakso petri.laa...@asd.fi
-   Enable 24MHz clock for the Digital Filter.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx23_clkctrl.c \
src/sys/arch/arm/imx/imx23_clkctrlvar.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/imx/imx23_clkctrl.c
diff -u src/sys/arch/arm/imx/imx23_clkctrl.c:1.1 src/sys/arch/arm/imx/imx23_clkctrl.c:1.2
--- src/sys/arch/arm/imx/imx23_clkctrl.c:1.1	Mon Oct  7 17:36:40 2013
+++ src/sys/arch/arm/imx/imx23_clkctrl.c	Sat Jan 10 12:13:56 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_clkctrl.c,v 1.1 2013/10/07 17:36:40 matt Exp $ */
+/* $Id: imx23_clkctrl.c,v 1.2 2015/01/10 12:13:56 jmcneill Exp $ */
 
 /*
 * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -149,3 +149,22 @@ clkctrl_en_usb(void)
 
 	return;
 }
+
+/*
+ * Enable 24MHz clock for the Digital Filter. 
+ *
+ */
+void
+clkctrl_en_filtclk(void)
+{
+	struct clkctrl_softc *sc = _sc;
+
+	if (sc == NULL) {
+		aprint_error(clkctrl is not initalized);
+		return;
+	}
+
+	CLKCTRL_WR(sc, HW_CLKCTRL_XTAL_CLR, HW_CLKCTRL_XTAL_FILT_CLK24M_GATE);
+
+	return;
+}
Index: src/sys/arch/arm/imx/imx23_clkctrlvar.h
diff -u src/sys/arch/arm/imx/imx23_clkctrlvar.h:1.1 src/sys/arch/arm/imx/imx23_clkctrlvar.h:1.2
--- src/sys/arch/arm/imx/imx23_clkctrlvar.h:1.1	Mon Oct  7 17:36:40 2013
+++ src/sys/arch/arm/imx/imx23_clkctrlvar.h	Sat Jan 10 12:13:56 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_clkctrlvar.h,v 1.1 2013/10/07 17:36:40 matt Exp $ */
+/* $Id: imx23_clkctrlvar.h,v 1.2 2015/01/10 12:13:56 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -33,5 +33,6 @@
 #define _ARM_IMX_IMX23_CLKCTRLVAR_H_
 
 void clkctrl_en_usb(void);
+void clkctrl_en_filtclk(void);
 
 #endif /* !_ARM_IMX_IMX23_CLKCTRLVAR_H_ */

CVS commit: src/sys/arch

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 12:18:09 UTC 2015

Modified Files:
src/sys/arch/arm/imx: files.imx23
src/sys/arch/evbarm/conf: IMX23_OLINUXINO files.imx23_olinuxino
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c

Log Message:
Petri Laakso petri.laa...@asd.fi
-   New audio driver
-   Add new devices rtc and digfilt
-   Use BOOT_ARGS if defined in kernel configuration


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/files.imx23
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/IMX23_OLINUXINO
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/files.imx23_olinuxino
cvs rdiff -u -r1.5 -r1.6 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_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/arm/imx/files.imx23
diff -u src/sys/arch/arm/imx/files.imx23:1.3 src/sys/arch/arm/imx/files.imx23:1.4
--- src/sys/arch/arm/imx/files.imx23:1.3	Sat Jan 10 12:11:39 2015
+++ src/sys/arch/arm/imx/files.imx23	Sat Jan 10 12:18:09 2015
@@ -1,10 +1,12 @@
-# $Id: files.imx23,v 1.3 2015/01/10 12:11:39 jmcneill Exp $
+# $Id: files.imx23,v 1.4 2015/01/10 12:18:09 jmcneill Exp $
 #
 # Freescale i.MX23 applications processor configuration info.
 #
 
 defparam opt_imx.h			MEMSIZE
 
+defflag opt_imx.h   IMX23
+
 file	arch/arm/arm32/irq_dispatch.S	icoll
 file	arch/arm/imx/imx23_space.c	ahb|apbh|apbx
 file	arch/arm/imx/imx23_dma.c	ahb|apbh|apbx
@@ -82,3 +84,13 @@ file	arch/arm/imx/imx23_usb.c	imxusbc
 # EHCI
 attach	ehci at imxusbc with imxehci
 file	arch/arm/imx/imxusb.c		imxehci
+
+# RTC 
+device rtc
+attach rtc at apbx
+file arch/arm/imx/imx23_rtc.c		rtc
+
+# Digital filter: Audio I/O
+device digfilt: audiobus
+attach digfilt at apbx with digfilt
+file arch/arm/imx/imx23_digfilt.c	digfilt

Index: src/sys/arch/evbarm/conf/IMX23_OLINUXINO
diff -u src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.10 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.11
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.10	Sat Oct 11 11:55:07 2014
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO	Sat Jan 10 12:18:09 2015
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.10 2014/10/11 11:55:07 uebayasi Exp $
+# $Id: IMX23_OLINUXINO,v 1.11 2015/01/10 12:18:09 jmcneill Exp $
 #
 # IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
 #
@@ -66,6 +66,13 @@ usbphy0		at apbx? addr 0x8007C000 size 0
 # Clock control
 clkctrl0	at apbx? addr 0x8004 size 0x2000 irq -1
 
+# RTC
+rtc0		at apbx? addr 0x8005C000 size 0x2000 irq -1
+
+# Digital filter: Audio I/O
+digfilt0	at apbx? addr 0x80048000 size 0x8000 irq -1
+audio0		at digfilt0
+
 # USB host
 ehci0		at imxusbc0 unit 0 irq 11
 # USB OTG

Index: src/sys/arch/evbarm/conf/files.imx23_olinuxino
diff -u src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.2 src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.3
--- src/sys/arch/evbarm/conf/files.imx23_olinuxino:1.2	Mon Oct  7 17:36:40 2013
+++ src/sys/arch/evbarm/conf/files.imx23_olinuxino	Sat Jan 10 12:18:09 2015
@@ -1,4 +1,4 @@
-# $Id: files.imx23_olinuxino,v 1.2 2013/10/07 17:36:40 matt Exp $
+# $Id: files.imx23_olinuxino,v 1.3 2015/01/10 12:18:09 jmcneill Exp $
 #
 # Olimex i.MX23 OLinuXino board configuration info.
 #
@@ -6,6 +6,9 @@
 # Pull in SoC support
 include arch/arm/imx/files.imx23
 
+# Kernel boot arguments
+defparam opt_machdep.hBOOT_ARGS
+
 file	arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
 file	arch/arm/arm32/arm32_kvminit.c
 file	arch/arm/arm32/arm32_boot.c

Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.5 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.6
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.5	Sat Jan 10 12:11:39 2015
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c	Sat Jan 10 12:18:09 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.5 2015/01/10 12:11:39 jmcneill Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.6 2015/01/10 12:18:09 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -67,6 +67,7 @@
 #endif
 
 #include opt_evbarm_boardtype.h
+#include opt_machdep.h
 
 #define	KERNEL_VM_BASE	(KERNEL_BASE + 0x800)
 #define	KERNEL_VM_SIZE	0x2000
@@ -163,6 +164,9 @@ initarm(void *arg)
 	/* Copy boot arguments passed from bootimx23. */
 	boot_args = (char *)KERN_PHYSTOV(BOOTIMX23_ARGS);
 	memcpy(kernel_boot_args, boot_args, MAX_BOOT_STRING);
+#ifdef BOOT_ARGS
+	strcpy(kernel_boot_args, BOOT_ARGS);
+#endif
 	boot_args = kernel_boot_args;
 #ifdef VERBOSE_INIT_ARM
 	printf(boot_args @ %lx: '%s'\n, KERN_PHYSTOV(BOOTIMX23_ARGS),

CVS commit: src/usr.bin/mail

2015-01-10 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sat Jan 10 17:16:01 UTC 2015

Modified Files:
src/usr.bin/mail: fio.c names.c

Log Message:
fix incorrect arg size computation


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/mail/fio.c
cvs rdiff -u -r1.31 -r1.32 src/usr.bin/mail/names.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.bin/mail/fio.c
diff -u src/usr.bin/mail/fio.c:1.41 src/usr.bin/mail/fio.c:1.42
--- src/usr.bin/mail/fio.c:1.41	Tue Dec 16 14:30:24 2014
+++ src/usr.bin/mail/fio.c	Sat Jan 10 12:16:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: fio.c,v 1.41 2014/12/16 19:30:24 christos Exp $	*/
+/*	$NetBSD: fio.c,v 1.42 2015/01/10 17:16:01 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)fio.c	8.2 (Berkeley) 4/20/95;
 #else
-__RCSID($NetBSD: fio.c,v 1.41 2014/12/16 19:30:24 christos Exp $);
+__RCSID($NetBSD: fio.c,v 1.42 2015/01/10 17:16:01 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -475,6 +475,7 @@ expand(const char *name)
 
 	switch (e) {
 	case 0: /* OK */
+		break;
 	case WRDE_NOSPACE:
 		warnx(Out of memory expanding `%s', name);
 		return NULL;
@@ -497,9 +498,9 @@ expand(const char *name)
 		warnx(No match for `%s', name);
 		break;
 	case 1:
-		if (strlen(we.we_wordv[1]) = PATHSIZE)
+		if (strlen(we.we_wordv[0]) = PATHSIZE)
 			warnx(Expansion too long for `%s', name);
-		strlcpy(xname, we.we_wordv[1], PATHSIZE);
+		strlcpy(xname, we.we_wordv[0], PATHSIZE);
 		break;
 	default:
 		warnx(Ambiguous expansion for `%s', name);

Index: src/usr.bin/mail/names.c
diff -u src/usr.bin/mail/names.c:1.31 src/usr.bin/mail/names.c:1.32
--- src/usr.bin/mail/names.c:1.31	Tue Dec 16 14:30:24 2014
+++ src/usr.bin/mail/names.c	Sat Jan 10 12:16:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: names.c,v 1.31 2014/12/16 19:30:24 christos Exp $	*/
+/*	$NetBSD: names.c,v 1.32 2015/01/10 17:16:01 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = @(#)names.c	8.1 (Berkeley) 6/6/93;
 #else
-__RCSID($NetBSD: names.c,v 1.31 2014/12/16 19:30:24 christos Exp $);
+__RCSID($NetBSD: names.c,v 1.32 2015/01/10 17:16:01 christos Exp $);
 #endif
 #endif /* not lint */
 
@@ -550,7 +550,7 @@ unpack(struct name *smopts, struct name 
 	 * the terminating 0 pointer.  Additional spots may be needed
 	 * to pass along -f to the host mailer.
 	 */
-	extra = 3 * count(smopts);
+	extra = 3 + count(smopts);
 	extra++;
 	metoo = value(ENAME_METOO) != NULL;
 	if (metoo)

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

2015-01-10 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Jan 10 12:16:28 UTC 2015

Modified Files:
src/sys/arch/arm/imx: imx23_rtcreg.h
Added Files:
src/sys/arch/arm/imx: imx23_digfilt.c imx23_digfiltreg.h
imx23_digfiltvar.h imx23_rtc.c imx23_rtcvar.h

Log Message:
From Petri Laakso petri.laa...@asd.fi:
-   Audio output driver for imx23
-   Supporting code for audio driver


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/imx23_digfilt.c \
src/sys/arch/arm/imx/imx23_digfiltreg.h \
src/sys/arch/arm/imx/imx23_digfiltvar.h src/sys/arch/arm/imx/imx23_rtc.c \
src/sys/arch/arm/imx/imx23_rtcvar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx23_rtcreg.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/imx/imx23_rtcreg.h
diff -u src/sys/arch/arm/imx/imx23_rtcreg.h:1.1 src/sys/arch/arm/imx/imx23_rtcreg.h:1.2
--- src/sys/arch/arm/imx/imx23_rtcreg.h:1.1	Tue Nov 20 19:06:13 2012
+++ src/sys/arch/arm/imx/imx23_rtcreg.h	Sat Jan 10 12:16:28 2015
@@ -1,4 +1,4 @@
-/* $Id: imx23_rtcreg.h,v 1.1 2012/11/20 19:06:13 jkunz Exp $ */
+/* $Id: imx23_rtcreg.h,v 1.2 2015/01/10 12:16:28 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -35,6 +35,7 @@
 #include sys/cdefs.h
 
 #define HW_RTC_BASE 0x8005C000
+#define HW_RTC_BASE_SIZE 0x2000
 
 /*
  * Real-Time Clock Control Register.

Added files:

Index: src/sys/arch/arm/imx/imx23_digfilt.c
diff -u /dev/null src/sys/arch/arm/imx/imx23_digfilt.c:1.1
--- /dev/null	Sat Jan 10 12:16:28 2015
+++ src/sys/arch/arm/imx/imx23_digfilt.c	Sat Jan 10 12:16:28 2015
@@ -0,0 +1,1130 @@
+/* $Id: imx23_digfilt.c,v 1.1 2015/01/10 12:16:28 jmcneill Exp $ */
+
+/*
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Petri Laakso.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/param.h
+#include sys/cdefs.h
+#include sys/types.h
+#include sys/device.h
+#include sys/errno.h
+#include sys/systm.h
+#include sys/bus.h
+#include sys/mutex.h
+#include sys/audioio.h
+#include dev/audio_if.h
+#include dev/auconv.h
+#include sys/mallocvar.h
+#include arm/imx/imx23_digfiltreg.h
+#include arm/imx/imx23_rtcvar.h
+#include arm/imx/imx23_clkctrlvar.h
+#include arm/imx/imx23_apbdmavar.h
+#include arm/imx/imx23_icollreg.h
+#include arm/imx/imx23var.h
+
+#include arm/pic/picvar.h
+
+/* Autoconf. */
+static int digfilt_match(device_t, cfdata_t, void *);
+static void digfilt_attach(device_t, device_t, void *);
+static int digfilt_activate(device_t, enum devact);
+
+/* Audio driver interface. */
+static int digfilt_drain(void *);
+static int digfilt_query_encoding(void *, struct audio_encoding *);
+static int digfilt_set_params(void *, int, int, audio_params_t *,
+audio_params_t *, stream_filter_list_t *,
+stream_filter_list_t *);
+static int digfilt_round_blocksize(void *, int, int, const audio_params_t *);
+static int digfilt_init_output(void *, void *, int );
+static int digfilt_start_output(void *, void *, int, void (*)(void *), void *);
+static int digfilt_halt_output(void *);
+static int digfilt_getdev(void *, struct audio_device *);
+static int digfilt_set_port(void *, mixer_ctrl_t *);
+static int digfilt_get_port(void *, mixer_ctrl_t *);
+static int digfilt_query_devinfo(void *, mixer_devinfo_t *);
+static void *digfilt_allocm(void *, int, size_t);
+static void digfilt_freem(void *, void *, size_t);
+static size_t digfilt_round_buffersize(void *, int, size_t);
+static int digfilt_get_props(void *);
+static

CVS commit: src/sys/arch/sparc64

2015-01-10 Thread Palle Lyckegaard

Module Name:src
Committed By:   palle
Date:   Sat Jan 10 22:19:26 UTC 2015

Modified Files:
src/sys/arch/sparc64/conf: files.sparc64
src/sys/arch/sparc64/sparc64: autoconf.c
Added Files:
src/sys/arch/sparc64/include: mdesc.h
src/sys/arch/sparc64/sparc64: mdesc.c

Log Message:
sun4v: add hypervisor machine description (mdesc) functions - from OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/sparc64/conf/files.sparc64
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/include/mdesc.h
cvs rdiff -u -r1.200 -r1.201 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc64/sparc64/mdesc.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/sparc64/conf/files.sparc64
diff -u src/sys/arch/sparc64/conf/files.sparc64:1.145 src/sys/arch/sparc64/conf/files.sparc64:1.146
--- src/sys/arch/sparc64/conf/files.sparc64:1.145	Sat Feb  1 17:01:35 2014
+++ src/sys/arch/sparc64/conf/files.sparc64	Sat Jan 10 22:19:26 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.sparc64,v 1.145 2014/02/01 17:01:35 nakayama Exp $
+#	$NetBSD: files.sparc64,v 1.146 2015/01/10 22:19:26 palle Exp $
 
 # @(#)files.sparc64	8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -249,6 +249,7 @@ file	arch/sparc64/sparc64/vm_machdep.c
 file	arch/sparc64/sparc64/ipifuncs.c		multiprocessor
 file	arch/sparc64/sparc64/lock_stubs.s
 file	arch/sparc64/sparc64/hvcall.S		sun4v
+file	arch/sparc64/sparc64/mdesc.c		sun4v
 
 file	arch/sparc64/sparc64/db_interface.c	ddb | kgdb
 file	arch/sparc64/sparc64/db_machdep.c	ddb

Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.200 src/sys/arch/sparc64/sparc64/autoconf.c:1.201
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.200	Sat Oct 18 08:33:27 2014
+++ src/sys/arch/sparc64/sparc64/autoconf.c	Sat Jan 10 22:19:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.200 2014/10/18 08:33:27 snj Exp $ */
+/*	$NetBSD: autoconf.c,v 1.201 2015/01/10 22:19:26 palle Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.200 2014/10/18 08:33:27 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.201 2015/01/10 22:19:26 palle Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -93,6 +93,7 @@ __KERNEL_RCSID(0, $NetBSD: autoconf.c,v
 #include machine/bootinfo.h
 #include sparc64/sparc64/cache.h
 #include sparc64/sparc64/timerreg.h
+#include machine/mdesc.h
 
 #include dev/ata/atavar.h
 #include dev/pci/pcivar.h
@@ -469,6 +470,10 @@ get_bootpath_from_prom(void)
 void
 cpu_configure(void)
 {
+	
+	if (CPU_ISSUN4V)
+		mdesc_init();
+	
 	bool userconf = (boothowto  RB_USERCONF) != 0;
 
 	/* fetch boot device settings */

Added files:

Index: src/sys/arch/sparc64/include/mdesc.h
diff -u /dev/null src/sys/arch/sparc64/include/mdesc.h:1.1
--- /dev/null	Sat Jan 10 22:19:26 2015
+++ src/sys/arch/sparc64/include/mdesc.h	Sat Jan 10 22:19:26 2015
@@ -0,0 +1,51 @@
+/*	$NetBSD: mdesc.h,v 1.1 2015/01/10 22:19:26 palle Exp $	*/
+/*	$OpenBSD: mdesc.h,v 1.3 2014/11/30 22:26:14 kettenis Exp $	*/
+/*
+ * Copyright (c) 2009 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+struct md_header {
+	uint32_t	transport_version;
+	uint32_t	node_blk_sz;
+	uint32_t	name_blk_sz;
+	uint32_t	data_blk_sz;
+};
+
+struct md_element {
+	uint8_t		tag;
+	uint8_t		name_len;
+	uint16_t	_reserved_field;
+	uint32_t	name_offset;
+	union {
+		struct {
+			uint32_t	data_len;
+			uint32_t	data_offset;
+		} y;
+		uint64_t	val;
+	} d;
+};
+
+#ifdef _KERNEL
+extern vaddr_t mdesc;
+extern size_t mdesc_len;
+
+void	 mdesc_init(void);
+uint64_t mdesc_get_prop_val(int, const char *);
+const char *mdesc_get_prop_str(int, const char *);
+const char *mdesc_get_prop_data(int, const char *, size_t *);
+int	mdesc_find(const char *, uint64_t);
+int	mdesc_find_child(int, const char *, uint64_t);
+int	mdesc_find_node(const char *);
+#endif

Index: src/sys/arch/sparc64/sparc64/mdesc.c
diff -u /dev/null src/sys/arch/sparc64/sparc64/mdesc.c:1.1
--- /dev/null	Sat Jan 10 22:19:26 2015
+++ src/sys/arch/sparc64/sparc64/mdesc.c	Sat Jan 10 22:19:26 2015
@@ -0,0 +1,237 @@
+/*	$NetBSD: mdesc.c,v

CVS commit: src/sys/external/bsd/drm/dist/bsd-core

2015-01-10 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Sat Jan 10 23:34:49 UTC 2015

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core: drm_bufs.c

Log Message:
initialize addr before passing its address to uvm_mmap_dev().
from Onno van der Linden in PR 49536.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.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/external/bsd/drm/dist/bsd-core/drm_bufs.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.12 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.13
--- src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.12	Sun Dec 14 23:48:59 2014
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c	Sat Jan 10 23:34:49 2015
@@ -1122,6 +1122,7 @@ int drm_mapbufs(struct drm_device *dev, 
 #elif   defined(__NetBSD__)
 	/* XXXNETBSD */
 	rsize = round_page(size);
+	addr = NULL;
 	retcode = uvm_mmap_dev(curproc, addr, rsize, dev-kdev, foff);
 	vaddr = (vaddr_t)addr;
 	DRM_DEBUG(mmap %#lx/%#lx foff %#llx\n, vaddr, rsize, (long long)foff);

CVS commit: src

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 04:03:47 UTC 2015

Modified Files:
src/distrib/notes/amd64: contents
src/distrib/notes/common: contents main
src/etc/etc.amd64: Makefile.inc
Removed Files:
src/distrib/amd64: Makefile
src/distrib/amd64/floppies: Makefile
src/distrib/amd64/floppies/bootfloppy: Makefile
src/distrib/amd64/floppies/bootfloppy-big: Makefile
src/distrib/amd64/floppies/bootfloppy-com: Makefile
src/distrib/amd64/floppies/common: Makefile.bootfloppy boot.cfg

Log Message:
Nuke the five(!) install floppies.  Welcome to 2015.  Approved by
dsl@, Master of Port.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r0 src/distrib/amd64/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/floppies/Makefile
cvs rdiff -u -r1.5 -r0 src/distrib/amd64/floppies/bootfloppy/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/floppies/bootfloppy-big/Makefile
cvs rdiff -u -r1.6 -r0 src/distrib/amd64/floppies/bootfloppy-com/Makefile
cvs rdiff -u -r1.11 -r0 src/distrib/amd64/floppies/common/Makefile.bootfloppy
cvs rdiff -u -r1.3 -r0 src/distrib/amd64/floppies/common/boot.cfg
cvs rdiff -u -r1.2 -r1.3 src/distrib/notes/amd64/contents
cvs rdiff -u -r1.170 -r1.171 src/distrib/notes/common/contents
cvs rdiff -u -r1.514 -r1.515 src/distrib/notes/common/main
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.amd64/Makefile.inc

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

Modified files:

Index: src/distrib/notes/amd64/contents
diff -u src/distrib/notes/amd64/contents:1.2 src/distrib/notes/amd64/contents:1.3
--- src/distrib/notes/amd64/contents:1.2	Fri Aug 17 20:10:53 2012
+++ src/distrib/notes/amd64/contents	Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: contents,v 1.2 2012/08/17 20:10:53 riz Exp $
+.\	$NetBSD: contents,v 1.3 2015/01/11 04:03:47 snj Exp $
 .\
 .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -75,10 +75,6 @@ see below.
 .
 \*M bootable cdrom images; see below.
 .
-.		It Pa floppy/
-.
-\*M boot and installation floppies; see below.
-.
 .		It Pa misc/
 .
 Miscellaneous \*M installation utilities; see

Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.170 src/distrib/notes/common/contents:1.171
--- src/distrib/notes/common/contents:1.170	Tue Feb 14 15:09:02 2012
+++ src/distrib/notes/common/contents	Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: contents,v 1.170 2012/02/14 15:09:02 jakllsch Exp $
+.\	$NetBSD: contents,v 1.171 2015/01/11 04:03:47 snj Exp $
 .\
 .\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -272,7 +272,7 @@ see below.
 .		It Pa bootfs/
 Netbootable RAM disk kernel and the file system in the RAM disk; see below.
 .\}
-.if \n[alpha]:\n[amd64]:\n[amiga]:\n[atari]:\n[bebox]:\n[ews4800mips]:\
+.if \n[alpha]:\n[amiga]:\n[atari]:\n[bebox]:\n[ews4800mips]:\
 \n[i386]:\n[news68k]:\n[newsmips]:\n[sparc]:\n[x68k]:\n[prep] \{\
 .		It Pa floppy/
 \*M boot and installation floppies; see below.

Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.514 src/distrib/notes/common/main:1.515
--- src/distrib/notes/common/main:1.514	Wed Jan  7 10:22:54 2015
+++ src/distrib/notes/common/main	Sun Jan 11 04:03:47 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: main,v 1.514 2015/01/07 10:22:54 knakahara Exp $
+.\	$NetBSD: main,v 1.515 2015/01/11 04:03:47 snj Exp $
 .\
 .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
 .\ All rights reserved.
@@ -137,6 +137,8 @@ is for VGA console installation, and
 .Pa boot-com.iso
 is for installation over serial console (com0, 9600 baud).
 .Pp
+.\} \ amd64:i386
+.if \n[i386] \{\
 Option 3: boot floppy images from
 .Pa \*M/installation/floppy/ .
 .Pp
@@ -148,6 +150,8 @@ are floppy images for VGA console instal
 and
 .Pa boot-com2.fs
 are for installation via serial console (com0, 9600 baud).
+.\} \ i386
+.if \n[i386]:\n[amd64] \{\
 .It
 The default kernel on CD-ROMs has ACPI enabled.
 This is known to cause issues on a few machines which have buggy ACPI
@@ -205,7 +209,7 @@ The actual binary distribution is in the
 .Pa \*M/binary/sets/
 directory.
 When you boot the install
-.if \n[amd64] image, CD-ROM or floppies,
+.if \n[amd64] image or CD-ROM,
 .if \n[i386] image, CD-ROM or floppies,
 .if \n[macppc] kernel from floppies, hard drive, or CD-ROM,
 .if \n[sparc] floppies or CD-ROM,
@@ -233,10 +237,11 @@ In a typical workstation installation yo
 all the installation sets.
 .ie \n[i386]:\n[amd64] \{\
 .It
-Write the CD-ROM images or floppy images out.
+Write the boot images
 .Pp
 Many commercial and freeware programs are available to burn CD-ROMs.
 .Pp
+.if \n[i386] \{\
 If you have problems writing a raw image to a floppy,
 the
 .Ic rawrite.exe
@@ -249,6 +254,7 @@ in the
 .Pa i386/installation/misc/
 directory may be of help.
 .\}
+.\}
 .if \n[macppc] \{\
 .It
 If your \*M has a floppy drive,

CVS commit: src/sys/dev/pci

2015-01-10 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Sun Jan 11 04:19:18 UTC 2015

Modified Files:
src/sys/dev/pci: if_dge.c

Log Message:
fix device/softc split botch.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/if_dge.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/dev/pci/if_dge.c
diff -u src/sys/dev/pci/if_dge.c:1.38 src/sys/dev/pci/if_dge.c:1.39
--- src/sys/dev/pci/if_dge.c:1.38	Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_dge.c	Sun Jan 11 04:19:18 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_dge.c,v 1.38 2014/08/10 16:44:36 tls Exp $ */
+/*	$NetBSD: if_dge.c,v 1.39 2015/01/11 04:19:18 chs Exp $ */
 
 /*
  * Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_dge.c,v 1.38 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_dge.c,v 1.39 2015/01/11 04:19:18 chs Exp $);
 
 
 
@@ -630,7 +630,7 @@ static uint16_t	dge_eeprom_word(struct d
 static int	dge_xgmii_mediachange(struct ifnet *);
 static void	dge_xgmii_mediastatus(struct ifnet *, struct ifmediareq *);
 static void	dge_xgmii_reset(struct dge_softc *);
-static void	dge_xgmii_writereg(device_t, int, int, int);
+static void	dge_xgmii_writereg(struct dge_softc *, int, int, int);
 
 
 CFATTACH_DECL_NEW(dge, sizeof(struct dge_softc),
@@ -2379,11 +2379,9 @@ phwait(struct dge_softc *sc, int p, int 
 return mdic;
 }
 
-
 static void
-dge_xgmii_writereg(device_t self, int phy, int reg, int val)
+dge_xgmii_writereg(struct dge_softc *sc, int phy, int reg, int val)
 {
-	struct dge_softc *sc = device_private(self);
 	int mdic;
 
 	CSR_WRITE(sc, DGE_MDIRW, val);
@@ -2393,7 +2391,7 @@ dge_xgmii_writereg(device_t self, int ph
 		return;
 	}
 	if (((mdic = phwait(sc, phy, reg, 1, MDIO_WRITE))  MDIO_CMD)) {
-		printf(%s: read cycle timeout; phy %d reg %d\n,
+		printf(%s: write cycle timeout; phy %d reg %d\n,
 		device_xname(sc-sc_dev), phy, reg);
 		return;
 	}
@@ -2402,7 +2400,7 @@ dge_xgmii_writereg(device_t self, int ph
 static void
 dge_xgmii_reset(struct dge_softc *sc)
 {
-	dge_xgmii_writereg((void *)sc, 0, 0, BMCR_RESET);
+	dge_xgmii_writereg(sc, 0, 0, BMCR_RESET);
 }
 
 static int

CVS commit: [netbsd-7] src/usr.sbin/sysinst

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 04:32:39 UTC 2015

Modified Files:
src/usr.sbin/sysinst [netbsd-7]: defs.h disks.c install.c partman.c
upgrade.c
src/usr.sbin/sysinst/arch/arc [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/cobalt [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/evbsh3 [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/hp300 [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/hpcsh [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/i386 [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/luna68k [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/mvme68k [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/news68k [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/sgimips [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/vax [netbsd-7]: md.c
src/usr.sbin/sysinst/arch/x68k [netbsd-7]: md.c

Log Message:
Pull up following revision(s) (requested by abs in ticket #400):
usr.sbin/sysinst/arch/arc/md.c: revision 1.3
usr.sbin/sysinst/arch/cobalt/md.c: revision 1.3
usr.sbin/sysinst/arch/evbsh3/md.c: revision 1.3
usr.sbin/sysinst/arch/hp300/md.c: revision 1.3
usr.sbin/sysinst/arch/hpcsh/md.c: revision 1.3
usr.sbin/sysinst/arch/i386/md.c: revision 1.5
usr.sbin/sysinst/arch/luna68k/md.c: revision 1.4
usr.sbin/sysinst/arch/mvme68k/md.c: revision 1.3
usr.sbin/sysinst/arch/news68k/md.c: revision 1.3
usr.sbin/sysinst/arch/sgimips/md.c: revision 1.3
usr.sbin/sysinst/arch/vax/md.c: revision 1.3
usr.sbin/sysinst/arch/x68k/md.c: revision 1.3
usr.sbin/sysinst/defs.h: revision 1.6
usr.sbin/sysinst/disks.c: revision 1.7
usr.sbin/sysinst/install.c: revision 1.3
usr.sbin/sysinst/partman.c: revision 1.8
usr.sbin/sysinst/upgrade.c: revision 1.3
Rather than scatter set_swap() calls wrapped in ram size checks through
md_post_disklabel() and md_pre_update(), abstract them out to an MI
set_swap_if_low_ram() and call from the appropriate MI places.
Now all platforms add swap if the system has = 32M of RAM.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.4.4.2 -r1.4.4.3 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/install.c \
src/usr.sbin/sysinst/upgrade.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/usr.sbin/sysinst/partman.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/evbsh3/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/hp300/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/usr.sbin/sysinst/arch/i386/md.c
cvs rdiff -u -r1.3 -r1.3.4.1 src/usr.sbin/sysinst/arch/luna68k/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/mvme68k/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/news68k/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/sgimips/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/vax/md.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/usr.sbin/sysinst/arch/x68k/md.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/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.3 src/usr.sbin/sysinst/defs.h:1.3.4.1
--- src/usr.sbin/sysinst/defs.h:1.3	Wed Aug  6 10:03:49 2014
+++ src/usr.sbin/sysinst/defs.h	Sun Jan 11 04:32:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: defs.h,v 1.3 2014/08/06 10:03:49 martin Exp $	*/
+/*	$NetBSD: defs.h,v 1.3.4.1 2015/01/11 04:32:38 snj Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -451,6 +451,7 @@ int	write_disklabel(void);
 int	make_filesystems(void);
 int	make_fstab(void);
 int	mount_disks(void);
+int	set_swap_if_low_ram(const char *, partinfo *);
 int	set_swap(const char *, partinfo *);
 int	check_swap(const char *, int);
 char *bootxx_name(void);

Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.4.4.2 src/usr.sbin/sysinst/disks.c:1.4.4.3
--- src/usr.sbin/sysinst/disks.c:1.4.4.2	Wed Dec 31 06:19:19 2014
+++ src/usr.sbin/sysinst/disks.c	Sun Jan 11 04:32:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: disks.c,v 1.4.4.2 2014/12/31 06:19:19 snj Exp $ */
+/*	$NetBSD: disks.c,v 1.4.4.3 2015/01/11 04:32:38 snj Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1213,6 +1213,13 @@ mount_disks(void)
 }
 
 int
+set_swap_if_low_ram(const char *disk, partinfo *pp) {
+if (get_ramsize() = 32) 
+return set_swap(disk, pp);
+return 0;
+}
+
+int
 set_swap(const char *disk, partinfo *pp)
 {
 	int i;

Index: src/usr.sbin/sysinst/install.c
diff -u src/usr.sbin/sysinst/install.c:1.2 src/usr.sbin/sysinst/install.c:1.2.4.1
--- src/usr.sbin/sysinst/install.c:1.2	Sun Aug  3 16:09:38 2014
+++

CVS commit: src/external/gpl3/gcc

2015-01-10 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Sat Jan 10 22:58:38 UTC 2015

Modified Files:
src/external/gpl3/gcc: README.gcc48

Log Message:
update for more reality.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/README.gcc48

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

Modified files:

Index: src/external/gpl3/gcc/README.gcc48
diff -u src/external/gpl3/gcc/README.gcc48:1.5 src/external/gpl3/gcc/README.gcc48:1.6
--- src/external/gpl3/gcc/README.gcc48:1.5	Mon Jul 28 22:12:16 2014
+++ src/external/gpl3/gcc/README.gcc48	Sat Jan 10 22:58:38 2015
@@ -1,4 +1,4 @@
-$Id: README.gcc48,v 1.5 2014/07/28 22:12:16 mrg Exp $
+$Id: README.gcc48,v 1.6 2015/01/10 22:58:38 mrg Exp $
 
 usr.bin:
 	note:
@@ -16,8 +16,6 @@ new stuff:
 
 	- what is libitm?
 
-	- asan/libsanitizer
-
 x86_64 port:
 - copied manually i386-builtin-types.inc instead of generating it.
 
@@ -26,18 +24,11 @@ arch/feature list.  anything not here ha
 
 architecture	tools	kernels	libgcc	native-gcc	make release	runs	atf
 	-	---	--	--			---
-coldfire	yes	N/A[9]	yes	yes		yes[7]		?	?
+coldfire	yes	N/A[9]	yes	yes		yes		?	?
 m68000		yes	?	yes	no[3]		
-m68k		yes	yes	yes	yes		no[7]
-powerpc		yes	yes[1]	yes	yes		yes		yes	yes
+m68k		yes	yes	yes	yes		yes
 powerpc64	yes[4]
 
-[1] ofppc/pegasos has issues with symtab loading.
-sandpoint works fine in multi-user, found an annoyance by com(4) change.
 [3] relocations fail in libgcc
 [4] cc1 gets segv compiling libgcc.
-[7] m68k/vax/sh3 gcc seem to randomly get -fstack-protector/-Wstack-protector
-wrong, for example m68k flags alarm() as unprotected in
-libc/gen/alarm.c:53, vax ifinit() in sbin/routed/if.c:680.
-   -- hacked around, now fixed?
 [9] no kernels in evbcf port yet

CVS commit: src/sys/uvm

2015-01-10 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Sat Jan 10 23:35:02 UTC 2015

Modified Files:
src/sys/uvm: uvm_mmap.c

Log Message:
in uvm_mmap_dev(), use the passed-in offset instead of 0.
from Onno van der Linden in PR 49536.


To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/uvm/uvm_mmap.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/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.150 src/sys/uvm/uvm_mmap.c:1.151
--- src/sys/uvm/uvm_mmap.c:1.150	Sun Dec 14 23:48:58 2014
+++ src/sys/uvm/uvm_mmap.c	Sat Jan 10 23:35:02 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.150 2014/12/14 23:48:58 chs Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.151 2015/01/10 23:35:02 chs Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.150 2014/12/14 23:48:58 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.151 2015/01/10 23:35:02 chs Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_pax.h
@@ -1084,13 +1084,13 @@ uvm_mmap_dev(struct proc *p, void **addr
 		*addrp = (void *)p-p_emul-e_vm_default_addr(p,
 		(vaddr_t)p-p_vmspace-vm_daddr, len);
 
-	uobj = udv_attach(dev, prot, 0, len);
+	uobj = udv_attach(dev, prot, off, len);
 	if (uobj == NULL)
 		return EINVAL;
 
 	error = uvm_mmap(p-p_vmspace-vm_map, (vaddr_t *)addrp,
 			 (vsize_t)len, prot, prot, flags, UVM_ADV_RANDOM,
-			 uobj, 0, p-p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
+			 uobj, off, p-p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
 	return error;
 }

CVS commit: [netbsd-7] src

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 05:59:18 UTC 2015

Modified Files:
src/distrib/sets/lists/modules [netbsd-7]: md.amd64 md.i386
src/sys/dev/ic [netbsd-7]: pcdisplayvar.h vgavar.h
src/sys/external/bsd/drm/dist/bsd-core [netbsd-7]: drm_drv.c
src/sys/external/bsd/drm2/dist/drm [netbsd-7]: drm_stub.c
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_drv.h
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: cik.c ni.c si.c
src/sys/external/bsd/drm2/dist/include/drm [netbsd-7]: drmP.h
src/sys/external/bsd/drm2/drm [netbsd-7]: drm_drv.c drm_module.c
drm_vm.c files.drmkms
src/sys/external/bsd/drm2/i915drm [netbsd-7]: files.i915drmkms
i915_module.c
src/sys/external/bsd/drm2/include/linux [netbsd-7]: hdmi.h module.h
moduleparam.h pci.h
src/sys/external/bsd/drm2/linux [netbsd-7]: linux_module.c
src/sys/external/bsd/drm2/nouveau [netbsd-7]: files.nouveau
nouveau_module.c
src/sys/external/bsd/drm2/pci [netbsd-7]: drm_pci.c drm_pci_module.c
src/sys/external/bsd/drm2/radeon [netbsd-7]: radeon_module.c
src/sys/modules [netbsd-7]: Makefile
src/sys/modules/drmkms [netbsd-7]: Makefile
src/sys/modules/drmkms_linux [netbsd-7]: Makefile
src/sys/modules/i915drmkms [netbsd-7]: Makefile
Added Files:
src/sys/external/bsd/drm2/drm [netbsd-7]: drm_sysctl.c
src/sys/external/bsd/drm2/include/drm [netbsd-7]: drm_sysctl.h
src/sys/external/bsd/drm2/ttm [netbsd-7]: files.ttm
Removed Files:
src/sys/modules/drm2pci [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by chs in ticket #401):
distrib/sets/lists/modules/md.amd64: revisions 1.46, 1.47 via patch
distrib/sets/lists/modules/md.i386: revisions 1.49, 1.50
sys/dev/ic/pcdisplayvar.h: revision 1.20
sys/dev/ic/vgavar.h: revision 1.32
sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.26
sys/external/bsd/drm2/dist/drm/drm_agpsupport.c: revisions 1.5, 1.6
sys/external/bsd/drm2/dist/drm/drm_pci.c: revisions 1.4, 1.5
sys/external/bsd/drm2/dist/drm/drm_stub.c: revisions 1.6-1.8
sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.11
sys/external/bsd/drm2/dist/drm/radeon/cik.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/ni.c: revision 1.3
sys/external/bsd/drm2/dist/drm/radeon/si.c: revision 1.3
sys/external/bsd/drm2/dist/include/drm/drmP.h: revisions 1.8, 1.9
sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h: revisions 1.3, 
1.4
sys/external/bsd/drm2/drm/drm_drv.c: revision 1.11
sys/external/bsd/drm2/drm/drm_module.c: revision 1.9
sys/external/bsd/drm2/drm/drm_sysctl.c: revisions 1.1-1.4
sys/external/bsd/drm2/drm/drm_vm.c: revision 1.7
sys/external/bsd/drm2/drm/files.drmkms: revisions 1.8, 1.9
sys/external/bsd/drm2/i915drm/files.i915drmkms: revision 1.9
sys/external/bsd/drm2/i915drm/i915_module.c: revisions 1.4, 1.5
sys/external/bsd/drm2/include/drm/drm_sysctl.h: revisions 1.1, 1.2
sys/external/bsd/drm2/include/linux/hdmi.h: revisions 1.3-1.5
sys/external/bsd/drm2/include/linux/module.h: revision 1.5
sys/external/bsd/drm2/include/linux/moduleparam.h: revisions 1.3, 1.4
sys/external/bsd/drm2/include/linux/pci.h: revision 1.11
sys/external/bsd/drm2/linux/linux_module.c: revision 1.5
sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.4
sys/external/bsd/drm2/nouveau/nouveau_module.c: revision 1.3
sys/external/bsd/drm2/pci/drm_pci.c: revision 1.8
sys/external/bsd/drm2/pci/drm_pci_module.c: revision 1.3
sys/external/bsd/drm2/radeon/radeon_module.c: revision 1.3
sys/external/bsd/drm2/ttm/files.ttm: revision 1.1
sys/modules/drm2pci/Makefile: file removal
sys/modules/drmkms/Makefile: revisions 1.4-1.7
sys/modules/drmkms_linux/Makefile: revision 1.5
sys/modules/drmkms_pci/Makefile: revisions 1.3, 1.4
sys/modules/i915drmkms/Makefile: revisions 1.5-1.7
Split drm ttm config into a separate file.
--
Fix module build of drmkms_linux.
--
Remove vestigial drm2pci module, replaced by drmkms_pci.
--
fix the module class.
--
add the drmkms modules
--
make a drm_agp_destroy() function to resolve the circular dependency between
drmkms and drmkms_pci
--
finalize the idr code.
--
add drm_agp_destroy
--
fix drmkms module path for xen.
--
fix build failure.
/tmp/bracket/build/2014.11.10.22.43.46-i386/src/sys/external/bsd/drm2/include/linux/pci.h:36:20:
 fatal error: acpica.h: No such file or directory
--
make this work: add agpsupport and sysctl code
--
move agpsupport to drmkms to avoid circular dependencies.
--
turn on dynamic ldscript creation to handle link set symbol definitions
used in the automatic

CVS commit: [netbsd-7] src/sys/external/bsd/drm/dist/bsd-core

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 06:25:31 UTC 2015

Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-7]: drm_bufs.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #402):
sys/external/bsd/drm/dist/bsd-core/drm_bufs.c: revision 1.13
initialize addr before passing its address to uvm_mmap_dev().
from Onno van der Linden in PR 49536.


To generate a diff of this commit:
cvs rdiff -u -r1.11.14.1 -r1.11.14.2 \
src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.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/external/bsd/drm/dist/bsd-core/drm_bufs.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.11.14.1 src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.11.14.2
--- src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c:1.11.14.1	Wed Dec 31 06:44:00 2014
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_bufs.c	Sun Jan 11 06:25:31 2015
@@ -1122,6 +1122,7 @@ int drm_mapbufs(struct drm_device *dev, 
 #elif   defined(__NetBSD__)
 	/* XXXNETBSD */
 	rsize = round_page(size);
+	addr = NULL;
 	retcode = uvm_mmap_dev(curproc, addr, rsize, dev-kdev, foff);
 	vaddr = (vaddr_t)addr;
 	DRM_DEBUG(mmap %#lx/%#lx foff %#llx\n, vaddr, rsize, (long long)foff);

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/radeon

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 06:29:15 UTC 2015

Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]: radeon_ttm.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #404):
sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c: revision 1.6
apply a patch from rjs@, which is necessary for radeondrmkms on i386:
set DRM_FILE_PAGE_OFFSET to 0xa000UL for 32 bit platforms.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.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/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5.4.1
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.5	Sat Jul 26 21:19:45 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c	Sun Jan 11 06:29:15 2015
@@ -50,7 +50,11 @@
 #include drm/bus_dma_hacks.h
 #endif
 
+#ifdef _LP64
 #define DRM_FILE_PAGE_OFFSET (0x1ULL  PAGE_SHIFT)
+#else
+#define DRM_FILE_PAGE_OFFSET (0xa000UL  PAGE_SHIFT)
+#endif
 
 static int radeon_ttm_debugfs_init(struct radeon_device *rdev);
 static void radeon_ttm_debugfs_fini(struct radeon_device *rdev);

CVS commit: [netbsd-7] src/doc

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 06:30:55 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.0

Log Message:
tickets 400-404


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.157 -r1.1.2.158 src/doc/CHANGES-7.0

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

Modified files:

Index: src/doc/CHANGES-7.0
diff -u src/doc/CHANGES-7.0:1.1.2.157 src/doc/CHANGES-7.0:1.1.2.158
--- src/doc/CHANGES-7.0:1.1.2.157	Sat Jan 10 16:47:57 2015
+++ src/doc/CHANGES-7.0	Sun Jan 11 06:30:55 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.157 2015/01/10 16:47:57 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.158 2015/01/11 06:30:55 snj Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -13217,3 +13217,87 @@ sys/arch/evbmips/loongson/autoconf.c		1.
 	If MEMORY_DISK_IS_ROOT is defined, dont try to guess the root device.
 	[jmcneill, ticket #399]
 
+usr.sbin/sysinst/arch/arc/md.c			1.3
+usr.sbin/sysinst/arch/cobalt/md.c		1.3
+usr.sbin/sysinst/arch/evbsh3/md.c		1.3
+usr.sbin/sysinst/arch/hp300/md.c		1.3
+usr.sbin/sysinst/arch/hpcsh/md.c		1.3
+usr.sbin/sysinst/arch/i386/md.c			1.5
+usr.sbin/sysinst/arch/luna68k/md.c		1.4
+usr.sbin/sysinst/arch/mvme68k/md.c		1.3
+usr.sbin/sysinst/arch/news68k/md.c		1.3
+usr.sbin/sysinst/arch/sgimips/md.c		1.3
+usr.sbin/sysinst/arch/vax/md.c			1.3
+usr.sbin/sysinst/arch/x68k/md.c			1.3
+usr.sbin/sysinst/defs.h1.6
+usr.sbin/sysinst/disks.c			1.7
+usr.sbin/sysinst/install.c			1.3
+usr.sbin/sysinst/partman.c			1.8
+usr.sbin/sysinst/upgrade.c			1.3
+
+	Rather than scatter set_swap() calls wrapped in ram size checks
+	through md_post_disklabel() and md_pre_update(), abstract them
+	out to an MI set_swap_if_low_ram() and call from the appropriate
+	MI places.  Now all platforms add swap if the system has = 32M
+	of RAM.
+	[abs, ticket #400]
+
+distrib/sets/lists/modules/md.amd64		1.46, 1.47 via patch
+distrib/sets/lists/modules/md.i386		1.49, 1.50
+sys/dev/ic/pcdisplayvar.h			1.20
+sys/dev/ic/vgavar.h1.32
+sys/external/bsd/drm/dist/bsd-core/drm_drv.c	1.26
+sys/external/bsd/drm2/dist/drm/drm_agpsupport.c	1.5, 1.6
+sys/external/bsd/drm2/dist/drm/drm_pci.c	1.4, 1.5
+sys/external/bsd/drm2/dist/drm/drm_stub.c	1.6-1.8
+sys/external/bsd/drm2/dist/drm/i915/i915_drv.h	1.11
+sys/external/bsd/drm2/dist/drm/radeon/cik.c	1.3
+sys/external/bsd/drm2/dist/drm/radeon/ni.c	1.3
+sys/external/bsd/drm2/dist/drm/radeon/si.c	1.3
+sys/external/bsd/drm2/dist/include/drm/drmP.h	1.8, 1.9
+sys/external/bsd/drm2/dist/include/drm/drm_agpsupport.h 1.3, 1.4
+sys/external/bsd/drm2/drm/drm_drv.c		1.11
+sys/external/bsd/drm2/drm/drm_module.c		1.9
+sys/external/bsd/drm2/drm/drm_sysctl.c		1.1-1.4
+sys/external/bsd/drm2/drm/drm_vm.c		1.7
+sys/external/bsd/drm2/drm/files.drmkms		1.8, 1.9
+sys/external/bsd/drm2/i915drm/files.i915drmkms	1.9
+sys/external/bsd/drm2/i915drm/i915_module.c	1.4, 1.5
+sys/external/bsd/drm2/include/drm/drm_sysctl.h	1.1, 1.2
+sys/external/bsd/drm2/include/linux/hdmi.h	1.3-1.5
+sys/external/bsd/drm2/include/linux/module.h	1.5
+sys/external/bsd/drm2/include/linux/moduleparam.h 1.3, 1.4
+sys/external/bsd/drm2/include/linux/pci.h	1.11
+sys/external/bsd/drm2/linux/linux_module.c	1.5
+sys/external/bsd/drm2/nouveau/files.nouveau	1.4
+sys/external/bsd/drm2/nouveau/nouveau_module.c	1.3
+sys/external/bsd/drm2/pci/drm_pci.c		1.8
+sys/external/bsd/drm2/pci/drm_pci_module.c	1.3
+sys/external/bsd/drm2/radeon/radeon_module.c	1.3
+sys/external/bsd/drm2/ttm/files.ttm		1.1
+sys/modules/drm2pci/Makefile			delete
+sys/modules/drmkms/Makefile			1.4-1.7
+sys/modules/drmkms_linux/Makefile		1.5
+sys/modules/drmkms_pci/Makefile			1.3, 1.4
+sys/modules/i915drmkms/Makefile			1.5-1.7
+
+	Code cleanup, module fixes, and small bugfixes for drm2.
+	[chs, ticket #401]
+
+sys/external/bsd/drm/dist/bsd-core/drm_bufs.c	1.13
+
+	initialize addr before passing its address to uvm_mmap_dev().
+	PR 49536.
+	[chs, ticket #402]
+
+sys/uvm/uvm_mmap.c1.151
+
+	in uvm_mmap_dev(), use the passed-in offset instead of 0.
+	PR 49536.
+	[chs, ticket #403]
+
+sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c 1.6
+
+	set DRM_FILE_PAGE_OFFSET to 0xa000UL for 32 bit platforms.
+	[chs, ticket #404]
+

CVS commit: [netbsd-7] src/sys/uvm

2015-01-10 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Jan 11 06:27:40 UTC 2015

Modified Files:
src/sys/uvm [netbsd-7]: uvm_mmap.c

Log Message:
Pull up following revision(s) (requested by chs in ticket #403):
sys/uvm/uvm_mmap.c: revision 1.151
in uvm_mmap_dev(), use the passed-in offset instead of 0.
from Onno van der Linden in PR 49536.


To generate a diff of this commit:
cvs rdiff -u -r1.148.4.1 -r1.148.4.2 src/sys/uvm/uvm_mmap.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/uvm/uvm_mmap.c
diff -u src/sys/uvm/uvm_mmap.c:1.148.4.1 src/sys/uvm/uvm_mmap.c:1.148.4.2
--- src/sys/uvm/uvm_mmap.c:1.148.4.1	Wed Dec 31 06:44:01 2014
+++ src/sys/uvm/uvm_mmap.c	Sun Jan 11 06:27:40 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_mmap.c,v 1.148.4.1 2014/12/31 06:44:01 snj Exp $	*/
+/*	$NetBSD: uvm_mmap.c,v 1.148.4.2 2015/01/11 06:27:40 snj Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -46,7 +46,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.148.4.1 2014/12/31 06:44:01 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_mmap.c,v 1.148.4.2 2015/01/11 06:27:40 snj Exp $);
 
 #include opt_compat_netbsd.h
 #include opt_pax.h
@@ -1084,13 +1084,13 @@ uvm_mmap_dev(struct proc *p, void **addr
 		*addrp = (void *)p-p_emul-e_vm_default_addr(p,
 		(vaddr_t)p-p_vmspace-vm_daddr, len);
 
-	uobj = udv_attach(dev, prot, 0, len);
+	uobj = udv_attach(dev, prot, off, len);
 	if (uobj == NULL)
 		return EINVAL;
 
 	error = uvm_mmap(p-p_vmspace-vm_map, (vaddr_t *)addrp,
 			 (vsize_t)len, prot, prot, flags, UVM_ADV_RANDOM,
-			 uobj, 0, p-p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
+			 uobj, off, p-p_rlimit[RLIMIT_MEMLOCK].rlim_cur);
 	return error;
 }

CVS commit: src/sys/arch

CVS commit: src/sys/arch/evbmips/loongson

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

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

CVS commit: [netbsd-7] src/sys/arch/evbmips/loongson

CVS commit: [netbsd-7] src/doc

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

CVS commit: src/sys/arch

CVS commit: src/usr.bin/mail

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

CVS commit: src/sys/arch/sparc64

CVS commit: src/sys/external/bsd/drm/dist/bsd-core

CVS commit: src

CVS commit: src/sys/dev/pci

CVS commit: [netbsd-7] src/usr.sbin/sysinst

CVS commit: src/external/gpl3/gcc

CVS commit: src/sys/uvm

CVS commit: [netbsd-7] src

CVS commit: [netbsd-7] src/sys/external/bsd/drm/dist/bsd-core

CVS commit: [netbsd-7] src/sys/external/bsd/drm2/dist/drm/radeon

CVS commit: [netbsd-7] src/doc

CVS commit: [netbsd-7] src/sys/uvm

22 matches

Site Navigation

Mail list logo

Footer information