date:20151226

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

2015-12-26 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Sat Dec 26 16:48:54 UTC 2015

Modified Files:
src/sys/arch/arm/allwinner: awin_reg.h

Log Message:
add registers for TV encoder / VGA output


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/arm/allwinner/awin_reg.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_reg.h
diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.84 src/sys/arch/arm/allwinner/awin_reg.h:1.85
--- src/sys/arch/arm/allwinner/awin_reg.h:1.84	Sun Nov 15 21:28:54 2015
+++ src/sys/arch/arm/allwinner/awin_reg.h	Sat Dec 26 16:48:54 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_reg.h,v 1.84 2015/11/15 21:28:54 bouyer Exp $ */
+/* $NetBSD: awin_reg.h,v 1.85 2015/12/26 16:48:54 macallan Exp $ */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -2305,6 +2305,47 @@ struct awin_mmc_idma_descriptor {
 #define AWIN_MP_CMDQUESTS_FINISHIRQ_FLAG	__BIT(8)
 
 /*
+ * TVE registers
+ */
+
+#define AWIN_TVE_ENABLE			0x
+#define AWIN_TVE_CONFIG			0x0004
+#define AWIN_TVE_DAC_1			0x0008
+#define AWIN_TVE_NOTCH			0x000c
+#define AWIN_TVE_CHROMA			0x0010
+#define AWIN_TVE_PORCH			0x0014
+#define AWIN_TVE_VSYNC			0x0018
+#define AWIN_TVE_LINENUMBER		0x001C
+#define AWIN_TVE_LEVEL			0x0020
+#define AWIN_TVE_DAC_2			0x0024
+#define AWIN_TVE_AUTODETECT_E		0x0030
+#define AWIN_TVE_AUTODETECT_INTR	0x0034
+#define AWIN_TVE_AUTODETECT_STATUS	0x0038
+#define AWIN_TVE_AUTODETECT_DEBOUNCE	0x003C
+#define AWIN_TVE_CSC_1			0x0040
+#define AWIN_TVE_CSC_2			0x0044
+#define AWIN_TVE_CSC_3			0x0048
+#define AWIN_TVE_CSC_4			0x004C
+#define AWIN_TVE_COLOR_BURST		0x0100
+#define AWIN_TVE_VSYNC_NUMBER		0x0104
+#define AWIN_TVE_NOTCH_FREQ		0x0108
+#define AWIN_TVE_CBCR			0x010C
+#define AWIN_TVE_TINT			0x0110
+#define AWIN_TVE_BURST_WIDTH		0x0114
+#define AWIN_TVE_CBCR_GAIN		0x0118
+#define AWIN_TVE_SYNC_VBI		0x011C
+#define AWIN_TVE_WHITE_LEVEL		0x0120
+#define AWIN_TVE_ACTIVE_LINE		0x0124
+#define AWIN_TVE_CHROMA_COMPGAIN	0x0128
+#define AWIN_TVE_TVENC			0x012C
+#define AWIN_TVE_RESYNC			0x0130
+#define AWIN_TVE_SLAVE_PARAM		0x0134
+#define AWIN_TVE_CONFIG_2		0x0138
+#define AWIN_TVE_CONFIG_3		0x013C
+
+
+
+/*
  * A31 registers
  */
 #define AWIN_A31_USB0_OFFSET		0x00019000	/* OTG */

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

2015-12-26 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Sat Dec 26 16:56:41 UTC 2015

Modified Files:
src/sys/arch/arm/allwinner: awin_io.c files.awin
Added Files:
src/sys/arch/arm/allwinner: awin_tve.c

Log Message:
driver for cubietruck's VGA port. Not quite finished but enough to be useful


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/allwinner/awin_io.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/allwinner/awin_tve.c
cvs rdiff -u -r1.33 -r1.34 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.

Modified files:

Index: src/sys/arch/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.43 src/sys/arch/arm/allwinner/awin_io.c:1.44
--- src/sys/arch/arm/allwinner/awin_io.c:1.43	Mon Apr 20 01:33:22 2015
+++ src/sys/arch/arm/allwinner/awin_io.c	Sat Dec 26 16:56:41 2015
@@ -31,7 +31,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.43 2015/04/20 01:33:22 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_io.c,v 1.44 2015/12/26 16:56:41 macallan Exp $");
 
 #include 
 #include 
@@ -168,6 +168,7 @@ static const struct awin_locators awin_l
 	{ "awiniic", OFFANDSIZE(A80_TWI2), 2, AWIN_A80_IRQ_TWI2, A80 },
 	{ "awiniic", OFFANDSIZE(A80_TWI3), 3, AWIN_A80_IRQ_TWI3, A80 },
 	{ "awiniic", OFFANDSIZE(A80_TWI4), 4, AWIN_A80_IRQ_TWI4, A80 },
+	{ "awintve", OFFANDSIZE(TVE0), 0, AWIN_IRQ_TVE, A20 },
 	{ "awinp2wi", OFFANDSIZE(A31_P2WI), NOPORT, AWIN_A31_IRQ_P2WI, A31 },
 	{ "awinp2wi", OFFANDSIZE(A80_RSB), NOPORT, AWIN_A80_IRQ_R_RSB, A80 },
 	{ "spi", OFFANDSIZE(SPI0), 0, AWIN_IRQ_SPI0, AANY },

Index: src/sys/arch/arm/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.33 src/sys/arch/arm/allwinner/files.awin:1.34
--- src/sys/arch/arm/allwinner/files.awin:1.33	Sun Nov 22 17:50:48 2015
+++ src/sys/arch/arm/allwinner/files.awin	Sat Dec 26 16:56:41 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.awin,v 1.33 2015/11/22 17:50:48 aymeric Exp $
+#	$NetBSD: files.awin,v 1.34 2015/12/26 16:56:41 macallan Exp $
 #
 # Configuration info for Allwinner ARM Peripherals
 #
@@ -144,6 +144,11 @@ device	awinhdmi: edid, videomode
 attach	awinhdmi at awinio with awin_hdmi
 file	arch/arm/allwinner/awin_hdmi.c		awin_hdmi
 
+# A20 TV Encoder / VGA output
+device	awintve: edid, videomode
+attach	awintve at awinio with awin_tve
+file	arch/arm/allwinner/awin_tve.c		awin_tve
+
 # A20/A31 HDMI audio (HDMIAUDIO)
 device	awinhdmiaudio: audiobus, auconv, mulaw, aurateconv, auvolconv
 attach	awinhdmiaudio at awinio with awin_hdmiaudio

Added files:

Index: src/sys/arch/arm/allwinner/awin_tve.c
diff -u /dev/null src/sys/arch/arm/allwinner/awin_tve.c:1.1
--- /dev/null	Sat Dec 26 16:56:41 2015
+++ src/sys/arch/arm/allwinner/awin_tve.c	Sat Dec 26 16:56:41 2015
@@ -0,0 +1,297 @@
+/* $NetBSD: awin_tve.c,v 1.1 2015/12/26 16:56:41 macallan Exp $ */
+
+/*-
+ * Copyright (c) 2015 Michael Lorenz
+ *   2014 Jared D. McNeill 
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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.
+ */
+
+/* based on jmcneill's awin_hdmi.c */
+
+#include "opt_ddb.h"
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: awin_tve.c,v 1.1 2015/12/26 16:56:41 macallan Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include "opt_allwinner.h"
+
+#define AWIN_TVE_DEBUG
+
+struct awin_tve_softc {
+	device_t sc_dev;
+	bus_space_tag_t sc_bst;
+	bus_space_handle_t sc_bsh;
+	void *sc_ih;
+
+	struct i2c_controller *sc_i2c;
+
+	bool sc_connected;
+	char sc_display_vendor[16];
+	char sc_display_product[16];
+	
+	int

CVS commit: src/lib/libexecinfo

2015-12-26 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Sat Dec 26 10:34:36 UTC 2015

Modified Files:
src/lib/libexecinfo: backtrace.3

Log Message:
Fix typo, from FreeBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libexecinfo/backtrace.3

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

Modified files:

Index: src/lib/libexecinfo/backtrace.3
diff -u src/lib/libexecinfo/backtrace.3:1.6 src/lib/libexecinfo/backtrace.3:1.7
--- src/lib/libexecinfo/backtrace.3:1.6	Thu Nov  5 08:29:42 2015
+++ src/lib/libexecinfo/backtrace.3	Sat Dec 26 10:34:36 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: backtrace.3,v 1.6 2015/11/05 08:29:42 wiz Exp $
+.\"	$NetBSD: backtrace.3,v 1.7 2015/12/26 10:34:36 wiz Exp $
 .\"
 .\" Copyright (c) 2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -84,7 +84,7 @@ the /proc filesystem is available to det
 The difference of the symbol address and the address element printed
 using 0x%tx.
 .It Dv D
-The difference of the symbol addresss and the address element printed using
+The difference of the symbol address and the address element printed using
 +0x%tx if non-zero, or nothing if zero.
 .It Dv f
 The filename of the symbol as determined by

CVS commit: src/sys/dev/raidframe

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sat Dec 26 12:59:01 UTC 2015

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
If the "finalizer" should fail to register for any reason, just report
the situation (as a WARNING) and continue.  Don't return the error code
to the caller.  Failure to register should not really happen - if it
does, all we really lose is auto-configuration of raid-sets.


To generate a diff of this commit:
cvs rdiff -u -r1.328 -r1.329 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.328 src/sys/dev/raidframe/rf_netbsdkintf.c:1.329
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.328	Sat Dec 26 12:25:26 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sat Dec 26 12:59:00 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.328 2015/12/26 12:25:26 pgoyette Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.329 2015/12/26 12:59:00 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.328 2015/12/26 12:25:26 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.329 2015/12/26 12:59:00 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -4106,6 +4106,7 @@ raid_modcmd_init(void)
 	if (error != 0) {
 		aprint_error("WARNING: unable to register RAIDframe "
 		"finalizer\n");
+		error = 0;
 	}
 
 	return error;

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

2015-12-26 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Sat Dec 26 16:54:41 UTC 2015

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

Log Message:
add access function to get the i2c_controller, awiniic2 is the VGA output's
DDC2 port on cubietruck


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/allwinner/awin_twi.c
cvs rdiff -u -r1.39 -r1.40 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_twi.c
diff -u src/sys/arch/arm/allwinner/awin_twi.c:1.6 src/sys/arch/arm/allwinner/awin_twi.c:1.7
--- src/sys/arch/arm/allwinner/awin_twi.c:1.6	Fri Dec  5 15:25:27 2014
+++ src/sys/arch/arm/allwinner/awin_twi.c	Sat Dec 26 16:54:41 2015
@@ -31,7 +31,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: awin_twi.c,v 1.6 2014/12/05 15:25:27 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_twi.c,v 1.7 2015/12/26 16:54:41 macallan Exp $");
 
 #include 
 #include 
@@ -208,3 +208,14 @@ awin_twi_attach(device_t parent, device_
 	 */
 	gttwsi_config_children(self);
 }
+
+struct i2c_controller *
+awin_twi_get_controller(device_t dev)
+{
+	if (!device_is_a(dev, "awiniic"))
+		return NULL;
+
+	struct awin_twi_softc * const sc = device_private(dev);
+
+	return >asc_sc.sc_i2c;
+}

Index: src/sys/arch/arm/allwinner/awin_var.h
diff -u src/sys/arch/arm/allwinner/awin_var.h:1.39 src/sys/arch/arm/allwinner/awin_var.h:1.40
--- src/sys/arch/arm/allwinner/awin_var.h:1.39	Thu Nov 19 18:48:22 2015
+++ src/sys/arch/arm/allwinner/awin_var.h	Sat Dec 26 16:54:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_var.h,v 1.39 2015/11/19 18:48:22 bouyer Exp $ */
+/* $NetBSD: awin_var.h,v 1.40 2015/12/26 16:54:41 macallan Exp $ */
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -189,4 +189,6 @@ awin_reg_set_clear(bus_space_tag_t bst, 
 	}
 }
 
+struct i2c_controller *awin_twi_get_controller(device_t);
+
 #endif /* _ARM_ALLWINNER_AWIN_VAR_H_ */

CVS commit: src/sys/dev/raidframe

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sat Dec 26 12:25:26 UTC 2015

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Resolve a use-after-free reference to the softc.  From mlelstv@


To generate a diff of this commit:
cvs rdiff -u -r1.327 -r1.328 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.327 src/sys/dev/raidframe/rf_netbsdkintf.c:1.328
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.327	Sat Dec 26 00:58:45 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sat Dec 26 12:25:26 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.327 2015/12/26 00:58:45 pgoyette Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.328 2015/12/26 12:25:26 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.327 2015/12/26 00:58:45 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.328 2015/12/26 12:25:26 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1038,9 +1038,8 @@ raid_detach_unlocked(struct raid_softc *
 	disk_destroy(>sc_dkdev);
 
 	/* Free the softc */
-	raidput(rs);
-
 	aprint_normal_dev(rs->sc_dev, "detached\n");
+	raidput(rs);
 
 	return 0;
 }

CVS commit: src/sbin/gpt

2015-12-26 Thread John Nemeth

Module Name:src
Committed By:   jnemeth
Date:   Sat Dec 26 13:12:17 UTC 2015

Modified Files:
src/sbin/gpt: gpt.c

Log Message:
pretty up attribute display a bit


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sbin/gpt/gpt.c

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

Modified files:

Index: src/sbin/gpt/gpt.c
diff -u src/sbin/gpt/gpt.c:1.64 src/sbin/gpt/gpt.c:1.65
--- src/sbin/gpt/gpt.c:1.64	Sun Dec  6 00:39:26 2015
+++ src/sbin/gpt/gpt.c	Sat Dec 26 13:12:16 2015
@@ -35,7 +35,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16 2006/07/07 02:44:23 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: gpt.c,v 1.64 2015/12/06 00:39:26 christos Exp $");
+__RCSID("$NetBSD: gpt.c,v 1.65 2015/12/26 13:12:16 jnemeth Exp $");
 #endif
 
 #include 
@@ -1154,7 +1154,7 @@ gpt_attr_list(char *buf, size_t len, uin
 
 	for (i = 0; i < __arraycount(gpt_attr); i++)
 		if (attributes & gpt_attr[i].mask) {
-			strlcat(buf, buf[0] ? "," : "", len); 
+			strlcat(buf, buf[0] ? ", " : "", len); 
 			strlcat(buf, gpt_attr[i].name, len);
 		}
 	return buf;

CVS commit: src/sys/rump/dev/lib/libraidframe

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sat Dec 26 10:22:09 UTC 2015

Modified Files:
src/sys/rump/dev/lib/libraidframe: raidframe_component.c

Log Message:
Detach the {b,c}devsw after obtaining the device major numbers.  We'll
re-attach during module initialization.

This enables the atf tests to once again succeed.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/rump/dev/lib/libraidframe/raidframe_component.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/rump/dev/lib/libraidframe/raidframe_component.c
diff -u src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.3 src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.4
--- src/sys/rump/dev/lib/libraidframe/raidframe_component.c:1.3	Sat Dec 26 01:01:30 2015
+++ src/sys/rump/dev/lib/libraidframe/raidframe_component.c	Sat Dec 26 10:22:09 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: raidframe_component.c,v 1.3 2015/12/26 01:01:30 pgoyette Exp $	*/
+/*	$NetBSD: raidframe_component.c,v 1.4 2015/12/26 10:22:09 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.3 2015/12/26 01:01:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raidframe_component.c,v 1.4 2015/12/26 10:22:09 pgoyette Exp $");
 
 #include 
 #include 
@@ -46,13 +46,17 @@ RUMP_COMPONENT(RUMP_COMPONENT_DEV)
 	devmajor_t bmaj, cmaj;
 	int error;
 
-	config_cfdriver_attach(_cd);
-
 	bmaj = cmaj = -1;
 	if ((error = devsw_attach("raid", _bdevsw, ,
 	_cdevsw, )) != 0)
 		panic("raid devsw attach failed: %d", error);
 
+	/*
+	 * Now that we have the major numbers, detach.  It will get
+	 * re-attached later during raid's module initialization.
+	 */
+	devsw_detach(_bdevsw, _cdevsw);
+
 	if ((error = rump_vfs_makedevnodes(S_IFBLK, "/dev/raid0", 'a',
 	bmaj, 0, 7)) != 0)
 		panic("cannot create cooked raid dev nodes: %d", error);

CVS commit: src/tests/ipf

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sat Dec 26 08:01:58 UTC 2015

Modified Files:
src/tests/ipf: t_nat_exec.sh

Log Message:
Remove the "expected failure" from test n12, and change it not to use
the "-v" command line option to ipf_test.  The -v option causes it to
display additional information, some of which is not fixed (looks like
an internal data structure address).

One fewer on the expected-failures list.  :)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tests/ipf/t_nat_exec.sh

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

Modified files:

Index: src/tests/ipf/t_nat_exec.sh
diff -u src/tests/ipf/t_nat_exec.sh:1.21 src/tests/ipf/t_nat_exec.sh:1.22
--- src/tests/ipf/t_nat_exec.sh:1.21	Mon Dec  1 19:46:29 2014
+++ src/tests/ipf/t_nat_exec.sh	Sat Dec 26 08:01:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_nat_exec.sh,v 1.21 2014/12/01 19:46:29 martin Exp $
+# $NetBSD: t_nat_exec.sh,v 1.22 2015/12/26 08:01:58 pgoyette Exp $
 #
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -71,7 +71,7 @@ test_case n8 nattest hex hex -T update_i
 test_case n9 nattest hex hex -T update_ipid=0
 test_case n10 nattest hex hex -T update_ipid=0
 test_case n11 nattest text text
-failing_test_case n12 nattest "Known to be broken" hex hex -T update_ipid=0 -v
+test_case n12 nattest hex hex -T update_ipid=0
 test_case n13 nattest text text
 test_case n14 nattest text text
 test_case n15 nattest text text -T update_ipid=0

CVS commit: src/sbin/gpt

2015-12-26 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Sat Dec 26 13:08:45 UTC 2015

Modified Files:
src/sbin/gpt: show.c

Log Message:
Improve "show -a" display: split human readable Type: field from the Type-GUID
to avoid wrapping in the common case; add a human readable Size: display.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sbin/gpt/show.c

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

Modified files:

Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.33 src/sbin/gpt/show.c:1.34
--- src/sbin/gpt/show.c:1.33	Fri Dec 25 12:16:03 2015
+++ src/sbin/gpt/show.c	Sat Dec 26 13:08:45 2015
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.33 2015/12/25 12:16:03 wiz Exp $");
+__RCSID("$NetBSD: show.c,v 1.34 2015/12/26 13:08:45 martin Exp $");
 #endif
 
 #include 
@@ -222,6 +222,9 @@ show_all(gpt_t gpt)
 	map_t m;
 	struct gpt_ent *ent;
 	char s1[128], s2[128];
+#ifdef HN_AUTOSCALE
+	char human_num[8];
+#endif
 	uint8_t utfbuf[__arraycount(ent->ent_name) * 3 + 1];
 #define PFX " "
 
@@ -247,11 +250,27 @@ show_all(gpt_t gpt)
 			gpt_uuid_snprintf(s2, sizeof(s2), "%d", ent->ent_type);
 			if (strcmp(s1, s2) == 0)
 strlcpy(s1, "unknown", sizeof(s1));
-			printf(PFX "Type: %s (%s)\n", s1, s2);
+			printf(PFX "Type: %s\n", s1);
+			printf(PFX "TypeID: %s\n", s2);
 
 			gpt_uuid_snprintf(s2, sizeof(s1), "%d", ent->ent_guid);
 			printf(PFX "GUID: %s\n", s2);
 
+			printf(PFX "Size: ");
+#ifdef HN_AUTOSCALE
+			if (humanize_number(human_num, sizeof(human_num),
+			(int64_t)(m->map_size * gpt->secsz),
+			"", HN_AUTOSCALE, HN_B) < 0) {
+#endif
+printf("%ju",
+(int64_t)(m->map_size * gpt->secsz));
+#ifdef HN_AUTOSCALE
+			} else {
+printf("%s", human_num);
+			}
+#endif
+			putchar('\n');
+
 			utf16_to_utf8(ent->ent_name, utfbuf, sizeof(utfbuf));
 			printf(PFX "Label: %s\n", (char *)utfbuf);

CVS commit: src/sys/dev/raidframe

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sat Dec 26 21:50:43 UTC 2015

Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c

Log Message:
Another use-after-free()


To generate a diff of this commit:
cvs rdiff -u -r1.329 -r1.330 src/sys/dev/raidframe/rf_netbsdkintf.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/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.329 src/sys/dev/raidframe/rf_netbsdkintf.c:1.330
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.329	Sat Dec 26 12:59:00 2015
+++ src/sys/dev/raidframe/rf_netbsdkintf.c	Sat Dec 26 21:50:43 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_netbsdkintf.c,v 1.329 2015/12/26 12:59:00 pgoyette Exp $	*/
+/*	$NetBSD: rf_netbsdkintf.c,v 1.330 2015/12/26 21:50:43 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  ***/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.329 2015/12/26 12:59:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.330 2015/12/26 21:50:43 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1039,6 +1039,7 @@ raid_detach_unlocked(struct raid_softc *
 
 	/* Free the softc */
 	aprint_normal_dev(rs->sc_dev, "detached\n");
+	raidunlock(rs);
 	raidput(rs);
 
 	return 0;
@@ -3938,9 +3939,6 @@ raid_detach(device_t self, int flags)
 
 	error = raid_detach_unlocked(rs);
 
-	if (error != 0)
-		raidunlock(rs);
-
 	return error;
 }

CVS commit: [netbsd-7-0] src/distrib/sets/lists/xdebug

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 21:54:24 UTC 2015

Modified Files:
src/distrib/sets/lists/xdebug [netbsd-7-0]: shl.mi

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1044):
distrib/sets/lists/xdebug/shl.mi: revision 1.22
Fix libxcb-xkb version number


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.4 -r1.14.4.4.2.1 src/distrib/sets/lists/xdebug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.14.4.4 src/distrib/sets/lists/xdebug/shl.mi:1.14.4.4.2.1
--- src/distrib/sets/lists/xdebug/shl.mi:1.14.4.4	Thu Mar 26 10:01:02 2015
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Dec 26 21:54:23 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.14.4.4 2015/03/26 10:01:02 martin Exp $
+# $NetBSD: shl.mi,v 1.14.4.4.2.1 2015/12/26 21:54:23 snj Exp $
 ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug			-unknown-		x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug			-unknown-		x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug			-unknown-		x11,debug
@@ -137,7 +137,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xf86dri.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xfixes.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xinerama.so.0.1.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.0.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.1.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xtest.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug	-unknown-		xorg,debug

CVS commit: [netbsd-7] src/sys/arch/sparc64/dev

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:11:38 UTC 2015

Modified Files:
src/sys/arch/sparc64/dev [netbsd-7]: zs.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1050):
sys/arch/sparc64/dev/zs.c: revision 1.75
Add a missing newline in zs at sbus attach message.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.74.12.1 src/sys/arch/sparc64/dev/zs.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/dev/zs.c
diff -u src/sys/arch/sparc64/dev/zs.c:1.74 src/sys/arch/sparc64/dev/zs.c:1.74.12.1
--- src/sys/arch/sparc64/dev/zs.c:1.74	Sat Oct 27 17:18:12 2012
+++ src/sys/arch/sparc64/dev/zs.c	Sat Dec 26 22:11:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.74 2012/10/27 17:18:12 chs Exp $	*/
+/*	$NetBSD: zs.c,v 1.74.12.1 2015/12/26 22:11:38 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.74 2012/10/27 17:18:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.74.12.1 2015/12/26 22:11:38 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -259,6 +259,7 @@ zs_attach_sbus(device_t parent, device_t
 	zsc->zsc_dmatag = sa->sa_dmatag;
 	zsc->zsc_promunit = prom_getpropint(sa->sa_node, "slave", -2);
 	zsc->zsc_node = sa->sa_node;
+	aprint_normal("\n");
 	zs_attach(zsc, zsaddr[zs_unit], sa->sa_pri);
 }

CVS commit: [netbsd-7-0] src/sys/dev/ic

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:23:43 UTC 2015

Modified Files:
src/sys/dev/ic [netbsd-7-0]: dwc_gmac_reg.h

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1053):
sys/dev/ic/dwc_gmac_reg.h: revision 1.15
Fix an off by one in the bit definition for RX store and forward mode.
Pointed out by ganbold.
While there add a few other bits of the same register.


To generate a diff of this commit:
cvs rdiff -u -r1.12.2.3 -r1.12.2.3.2.1 src/sys/dev/ic/dwc_gmac_reg.h

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

Modified files:

Index: src/sys/dev/ic/dwc_gmac_reg.h
diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.12.2.3 src/sys/dev/ic/dwc_gmac_reg.h:1.12.2.3.2.1
--- src/sys/dev/ic/dwc_gmac_reg.h:1.12.2.3	Tue Feb  3 08:11:21 2015
+++ src/sys/dev/ic/dwc_gmac_reg.h	Sat Dec 26 22:23:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac_reg.h,v 1.12.2.3 2015/02/03 08:11:21 bouyer Exp $ */
+/* $NetBSD: dwc_gmac_reg.h,v 1.12.2.3.2.1 2015/12/26 22:23:43 snj Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -131,8 +131,13 @@
 #define	AWIN_GMAC_MII_IRQ		__BIT(0)
 
 
-#define	GMAC_DMA_OP_RXSTOREFORWARD	__BIT(24) /* start RX when a
+#define	GMAC_DMA_OP_DISABLECSDROP	__BIT(26) /* disable dropping of
+		 frames with TCP/IP
+		 checksum errors */
+#define	GMAC_DMA_OP_RXSTOREFORWARD	__BIT(25) /* start RX when a
 		full frame is available */
+#define	GMAC_DMA_OP_DISABLERXFLUSH	__BIT(24) /* Do not drop frames
+		 when out of RX descr. */
 #define	GMAC_DMA_OP_TXSTOREFORWARD	__BIT(21) /* start TX when a
  		full frame is available */
 #define	GMAC_DMA_OP_FLUSHTX		__BIT(20) /* flush TX fifo */

CVS commit: [netbsd-7] src/sys/dev/ic

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:23:20 UTC 2015

Modified Files:
src/sys/dev/ic [netbsd-7]: dwc_gmac_reg.h

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1053):
sys/dev/ic/dwc_gmac_reg.h: revision 1.15
Fix an off by one in the bit definition for RX store and forward mode.
Pointed out by ganbold.
While there add a few other bits of the same register.


To generate a diff of this commit:
cvs rdiff -u -r1.12.2.3 -r1.12.2.4 src/sys/dev/ic/dwc_gmac_reg.h

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

Modified files:

Index: src/sys/dev/ic/dwc_gmac_reg.h
diff -u src/sys/dev/ic/dwc_gmac_reg.h:1.12.2.3 src/sys/dev/ic/dwc_gmac_reg.h:1.12.2.4
--- src/sys/dev/ic/dwc_gmac_reg.h:1.12.2.3	Tue Feb  3 08:11:21 2015
+++ src/sys/dev/ic/dwc_gmac_reg.h	Sat Dec 26 22:23:20 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac_reg.h,v 1.12.2.3 2015/02/03 08:11:21 bouyer Exp $ */
+/* $NetBSD: dwc_gmac_reg.h,v 1.12.2.4 2015/12/26 22:23:20 snj Exp $ */
 
 /*-
  * Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -131,8 +131,13 @@
 #define	AWIN_GMAC_MII_IRQ		__BIT(0)
 
 
-#define	GMAC_DMA_OP_RXSTOREFORWARD	__BIT(24) /* start RX when a
+#define	GMAC_DMA_OP_DISABLECSDROP	__BIT(26) /* disable dropping of
+		 frames with TCP/IP
+		 checksum errors */
+#define	GMAC_DMA_OP_RXSTOREFORWARD	__BIT(25) /* start RX when a
 		full frame is available */
+#define	GMAC_DMA_OP_DISABLERXFLUSH	__BIT(24) /* Do not drop frames
+		 when out of RX descr. */
 #define	GMAC_DMA_OP_TXSTOREFORWARD	__BIT(21) /* start TX when a
  		full frame is available */
 #define	GMAC_DMA_OP_FLUSHTX		__BIT(20) /* flush TX fifo */

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

2015-12-26 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Dec 26 23:13:50 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: files.exynos
Added Files:
src/sys/arch/arm/samsung: exynos_dwcmmc.c

Log Message:
Add dwcmmc glue


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/samsung/exynos_dwcmmc.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/samsung/files.exynos

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/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.18 src/sys/arch/arm/samsung/files.exynos:1.19
--- src/sys/arch/arm/samsung/files.exynos:1.18	Thu Dec 24 01:10:51 2015
+++ src/sys/arch/arm/samsung/files.exynos	Sat Dec 26 23:13:50 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.exynos,v 1.18 2015/12/24 01:10:51 marty Exp $
+#	$NetBSD: files.exynos,v 1.19 2015/12/26 23:13:50 jmcneill Exp $
 #
 # Configuration info for Samsung Exynos SoC ARM Peripherals
 #
@@ -94,6 +94,10 @@ attach	ohci at exyousb with ohci_exyousb
 attach	ehci at exyousb with ehci_exyousb
 file	arch/arm/samsung/exynos_usb.c		exyo_usb
 
+# SD/MMC Host Controller
+attach	dwcmmc at fdt with exynos_dwcmmc
+file	arch/arm/samsung/exynos_dwcmmc.c	exynos_dwcmmc
+
 # I2C support, bitbanging through GPIO
 device	exyoi2c: i2cbus, i2c_bitbang
 attach	exyoi2c at fdt with exynos_i2c

Added files:

Index: src/sys/arch/arm/samsung/exynos_dwcmmc.c
diff -u /dev/null src/sys/arch/arm/samsung/exynos_dwcmmc.c:1.1
--- /dev/null	Sat Dec 26 23:13:50 2015
+++ src/sys/arch/arm/samsung/exynos_dwcmmc.c	Sat Dec 26 23:13:50 2015
@@ -0,0 +1,198 @@
+/* $NetBSD: exynos_dwcmmc.c,v 1.1 2015/12/26 23:13:50 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill 
+ * All rights reserved.
+ *
+ * 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 AUTHOR ``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 AUTHOR 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 
+__KERNEL_RCSID(0, "$NetBSD: exynos_dwcmmc.c,v 1.1 2015/12/26 23:13:50 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+
+static int	exynos_dwcmmc_match(device_t, cfdata_t, void *);
+static void	exynos_dwcmmc_attach(device_t, device_t, void *);
+
+static void	exynos_dwcmmc_attach_i(device_t);
+
+static int	exynos_dwcmmc_card_detect(struct dwc_mmc_softc *);
+
+struct exynos_dwcmmc_softc {
+	struct dwc_mmc_softc	sc;
+	struct clk		*sc_clk_biu;
+	struct clk		*sc_clk_ciu;
+	struct fdtbus_gpio_pin	*sc_pin_cd;
+};
+
+CFATTACH_DECL_NEW(exynos_dwcmmc, sizeof(struct dwc_mmc_softc),
+	exynos_dwcmmc_match, exynos_dwcmmc_attach, NULL, NULL);
+
+static const char * const exynos_dwcmmc_compat[] = {
+	"samsung,exynos5420-dw-mshc-smu",
+	"samsung,exynos5420-dw-mshc",
+	NULL
+};
+
+static int
+exynos_dwcmmc_match(device_t parent, cfdata_t cf, void *aux)
+{
+	struct fdt_attach_args * const faa = aux;
+
+	return of_match_compatible(faa->faa_phandle, exynos_dwcmmc_compat);
+}
+
+static void
+exynos_dwcmmc_attach(device_t parent, device_t self, void *aux)
+{
+	struct exynos_dwcmmc_softc *esc = device_private(self);
+	struct dwc_mmc_softc *sc = >sc;
+	struct fdt_attach_args * const faa = aux;
+	const int phandle = faa->faa_phandle;
+	struct clk *clk_cpll;
+	char intrstr[128];
+	bus_addr_t addr;
+	bus_size_t size;
+	u_int bus_width, ciu_div;
+	int error;
+
+	if (fdtbus_get_reg(phandle, 0, , ) != 0) {
+		aprint_error(": couldn't get registers\n");
+		return;
+	}
+
+	if (of_getprop_uint32(phandle, "bus-width", _width)) {
+		bus_width = 4;
+	}
+	if (of_getprop_uint32(phandle, "samsung,dw-mshc-ciu-div", _div)) {
+		aprint_error(": missing samsung,dw-mshc-ciu-div property\n");
+		return;
+	}
+
+	clk_cpll = clk_get("sclk_cpll");
+	if (clk_cpll == NULL) {
+

CVS commit: src/sys/dev/ic

2015-12-26 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Dec 26 23:13:10 UTC 2015

Modified Files:
src/sys/dev/ic: dwc_mmc.c dwc_mmc_var.h

Log Message:
Dump registers on timeout and allow bus glue to override card detect func


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/dwc_mmc.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/dwc_mmc_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/dev/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.7 src/sys/dev/ic/dwc_mmc.c:1.8
--- src/sys/dev/ic/dwc_mmc.c:1.7	Sun Aug  9 13:01:21 2015
+++ src/sys/dev/ic/dwc_mmc.c	Sat Dec 26 23:13:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.7 2015/08/09 13:01:21 jmcneill Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.8 2015/12/26 23:13:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "opt_dwc_mmc.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.7 2015/08/09 13:01:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.8 2015/12/26 23:13:10 jmcneill Exp $");
 
 #include 
 #include 
@@ -72,7 +72,7 @@ static void	dwc_mmc_print_rint(struct dw
    uint32_t);
 #endif
 
-void		dwc_mmc_dump_regs(void);
+void		dwc_mmc_dump_regs(int);
 
 static struct sdmmc_chip_functions dwc_mmc_chip_functions = {
 	.host_reset = dwc_mmc_host_reset,
@@ -102,6 +102,11 @@ dwc_mmc_init(struct dwc_mmc_softc *sc)
 	mutex_init(>sc_intr_lock, MUTEX_DEFAULT, IPL_BIO);
 	cv_init(>sc_intr_cv, "dwcmmcirq");
 
+#ifdef DWC_MMC_DEBUG
+	const uint32_t verid = MMC_READ(sc, DWC_MMC_VERID_REG);
+	aprint_normal_dev(sc->sc_dev, "version 0x%04x\n", verid & 0x);
+#endif
+
 	dwc_mmc_host_reset(sc);
 	dwc_mmc_bus_width(sc, 1);
 
@@ -177,6 +182,11 @@ dwc_mmc_set_clock(struct dwc_mmc_softc *
 	if (pll_freq % freq)
 		clk_div++;
 
+#ifdef DWC_MMC_DEBUG
+	printf("%s: using clk_div %d for freq %d (act %u)\n",
+	__func__, clk_div, freq, pll_freq / (clk_div * 2));
+#endif
+
 	MMC_WRITE(sc, DWC_MMC_CLKDIV_REG,
 	__SHIFTIN(clk_div, DWC_MMC_CLKDIV_CLK_DIVIDER0));
 	return dwc_mmc_update_clock(sc);
@@ -341,8 +351,14 @@ dwc_mmc_card_detect(sdmmc_chipset_handle
 	struct dwc_mmc_softc *sc = sch;
 	uint32_t cdetect;
 
-	cdetect = MMC_READ(sc, DWC_MMC_CDETECT_REG);
-	return !(cdetect & DWC_MMC_CDETECT_CARD_DETECT_N);
+	if (sc->sc_flags & DWC_MMC_F_BROKEN_CD) {
+		return 1;
+	} else if (sc->sc_card_detect) {
+		return sc->sc_card_detect(sc);
+	} else {
+		cdetect = MMC_READ(sc, DWC_MMC_CDETECT_REG);
+		return !(cdetect & DWC_MMC_CDETECT_CARD_DETECT_N);
+	}
 }
 
 static int
@@ -544,6 +560,11 @@ done:
 	cmd->c_flags |= SCF_ITSDONE;
 	mutex_exit(>sc_intr_lock);
 
+	if (cmd->c_error == ETIMEDOUT && !ISSET(cmd->c_flags, SCF_TOUT_OK)) {
+		device_printf(sc->sc_dev, "Device timeout!\n");
+		dwc_mmc_dump_regs(device_unit(sc->sc_dev));
+	}
+
 	ctrl = MMC_READ(sc, DWC_MMC_CTRL_REG);
 	ctrl |= DWC_MMC_CTRL_FIFO_RESET;
 	MMC_WRITE(sc, DWC_MMC_CTRL_REG, ctrl);
@@ -570,7 +591,7 @@ dwc_mmc_print_rint(struct dwc_mmc_softc 
 #endif
 
 void
-dwc_mmc_dump_regs(void)
+dwc_mmc_dump_regs(int unit)
 {
 	static const struct {
 		const char *name;
@@ -595,14 +616,15 @@ dwc_mmc_dump_regs(void)
 		{ "RST", DWC_MMC_RST_REG },
 		{ "BACK_END_POWER", DWC_MMC_BACK_END_POWER_REG },
 	};
-	device_t self = device_find_by_driver_unit("dwcmmc", 0);
+	device_t self = device_find_by_driver_unit("dwcmmc", unit);
 	if (self == NULL)
 		return;
 	struct dwc_mmc_softc *sc = device_private(self);
 	int i;
 
-	for (i = 0; i < __arraycount(regs); i++) {
-		device_printf(sc->sc_dev, "%s: %#x\n", regs[i].name,
-		MMC_READ(sc, regs[i].reg));
+	for (i = 0; i < __arraycount(regs); i += 2) {
+		device_printf(sc->sc_dev, "  %s: 0x%08x\t%s: 0x%08x\n",
+		regs[i+0].name, MMC_READ(sc, regs[i+0].reg),
+		regs[i+1].name, MMC_READ(sc, regs[i+1].reg));
 	}
 }

Index: src/sys/dev/ic/dwc_mmc_var.h
diff -u src/sys/dev/ic/dwc_mmc_var.h:1.4 src/sys/dev/ic/dwc_mmc_var.h:1.5
--- src/sys/dev/ic/dwc_mmc_var.h:1.4	Tue Dec 30 00:19:50 2014
+++ src/sys/dev/ic/dwc_mmc_var.h	Sat Dec 26 23:13:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc_var.h,v 1.4 2014/12/30 00:19:50 jmcneill Exp $ */
+/* $NetBSD: dwc_mmc_var.h,v 1.5 2015/12/26 23:13:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill 
@@ -42,7 +42,9 @@ struct dwc_mmc_softc {
 #define DWC_MMC_F_USE_HOLD_REG	0x0001	/* set USE_HOLD_REG with every cmd */
 #define DWC_MMC_F_PWREN_CLEAR	0x0002	/* clear POWER_ENABLE bit to enable */
 #define DWC_MMC_F_FORCE_CLK	0x0004	/* update clk div with every cmd */
+#define DWC_MMC_F_BROKEN_CD	0x0008	/* card detect doesn't work */
 	int			(*sc_set_clkdiv)(struct dwc_mmc_softc *, int);
+	int			(*sc_card_detect)(struct dwc_mmc_softc *);
 
 	device_t		sc_sdmmc_dev;
 	kmutex_t		sc_intr_lock;

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

2015-12-26 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Dec 26 23:14:08 UTC 2015

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

Log Message:
add dwcmmc


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/EXYNOS

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/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.6 src/sys/arch/evbarm/conf/EXYNOS:1.7
--- src/sys/arch/evbarm/conf/EXYNOS:1.6	Mon Dec 21 04:58:50 2015
+++ src/sys/arch/evbarm/conf/EXYNOS	Sat Dec 26 23:14:08 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: EXYNOS,v 1.6 2015/12/21 04:58:50 marty Exp $
+#	$NetBSD: EXYNOS,v 1.7 2015/12/26 23:14:08 jmcneill Exp $
 #
 #	ODROID-XU -- ODROID-XU4 Exynos5422 based kernel
 #
@@ -214,7 +214,7 @@ exyointr0	at fdt?
 gic*		at fdt?
 
 # Clock controller
-exy5422clk0	at fdt?# Exynos5422 clock controller
+exy5422clk*	at fdt?# Exynos5422 clock controller
 
 # Integrated Samsung UARTs
 sscom*		at fdt?# UART ?
@@ -254,6 +254,14 @@ exyoi2c2	at fdt?
 exyoi2c3	at fdt?
 #i2c*		at exyoi2c?
 
+# SD/MMC
+dwcmmc*		at fdt?
+sdmmc*		at dwcmmc?
+ld0		at sdmmc0
+ld1		at sdmmc1
+ld2		at sdmmc2
+ld*		at sdmmc?
+
 # MISSING SUPPORT
 # eMMC
 # uSD

CVS commit: src/sys/dev/dkwedge

2015-12-26 Thread Michael van Elst

Module Name:src
Committed By:   mlelstv
Date:   Sun Dec 27 00:47:47 UTC 2015

Modified Files:
src/sys/dev/dkwedge: dk.c

Log Message:
Return error in dkopen when dk_open_parent fails. Also change dk_open_parent
to pass error code to caller.
XXX: Pullups


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.86 src/sys/dev/dkwedge/dk.c:1.87
--- src/sys/dev/dkwedge/dk.c:1.86	Sat Nov 28 13:41:31 2015
+++ src/sys/dev/dkwedge/dk.c	Sun Dec 27 00:47:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: dk.c,v 1.86 2015/11/28 13:41:31 mlelstv Exp $	*/
+/*	$NetBSD: dk.c,v 1.87 2015/12/27 00:47:47 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.86 2015/11/28 13:41:31 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.87 2015/12/27 00:47:47 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -102,7 +102,7 @@ static int	dkwedge_cleanup_parent(struct
 static int	dkwedge_detach(device_t, int);
 static void	dkwedge_delall1(struct disk *, bool);
 static int	dkwedge_del1(struct dkwedge_info *, int);
-static struct vnode *dk_open_parent(dev_t, int);
+static int	dk_open_parent(dev_t, int, struct vnode **);
 static int	dk_close_parent(struct vnode *, int);
 
 static dev_type_open(dkopen);
@@ -969,14 +969,15 @@ dkwedge_read(struct disk *pdk, struct vn
 		isopen = true;
 		++pdk->dk_rawopens;
 		bdvp = pdk->dk_rawvp;
+		error = 0;
 	} else {
 		isopen = false;
-		bdvp = dk_open_parent(bdev, FREAD);
+		error = dk_open_parent(bdev, FREAD, );
 	}
 	mutex_exit(>dk_rawlock);
 
-	if (bdvp == NULL)
-		return EBUSY;
+	if (error)
+		return error;
 
 	bp = getiobuf(bdvp, true);
 	bp->b_flags = B_READ;
@@ -1021,25 +1022,25 @@ dkwedge_lookup(dev_t dev)
 	return (dkwedges[unit]);
 }
 
-static struct vnode *
-dk_open_parent(dev_t dev, int mode)
+static int
+dk_open_parent(dev_t dev, int mode, struct vnode **vpp)
 {
 	struct vnode *vp;
 	int error;
 
 	error = bdevvp(dev, );
 	if (error)
-		return NULL;
+		return error;
 
 	error = vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
 	if (error) {
 		vrele(vp);
-		return NULL;
+		return error;
 	}
 	error = VOP_OPEN(vp, mode, NOCRED);
 	if (error) {
 		vput(vp);
-		return NULL;
+		return error;
 	}
 
 	/* VOP_OPEN() doesn't do this for us. */
@@ -1051,7 +1052,9 @@ dk_open_parent(dev_t dev, int mode)
 
 	VOP_UNLOCK(vp);
 
-	return vp;
+	*vpp = vp;
+
+	return 0;
 }
 
 static int
@@ -1091,8 +1094,8 @@ dkopen(dev_t dev, int flags, int fmt, st
 	if (sc->sc_dk.dk_openmask == 0) {
 		if (sc->sc_parent->dk_rawopens == 0) {
 			KASSERT(sc->sc_parent->dk_rawvp == NULL);
-			vp = dk_open_parent(sc->sc_pdev, FREAD | FWRITE);
-			if (vp == NULL)
+			error = dk_open_parent(sc->sc_pdev, FREAD | FWRITE, );
+			if (error)
 goto popen_fail;
 			sc->sc_parent->dk_rawvp = vp;
 		}

CVS commit: src/tests/sbin/gpt

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sun Dec 27 01:46:24 UTC 2015

Modified Files:
src/tests/sbin/gpt: t_gpt.sh

Log Message:
Update test - the attributes listed by the show command now have a space
in the comma-separated list.

This allows the test to once again pass.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/sbin/gpt/t_gpt.sh

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

Modified files:

Index: src/tests/sbin/gpt/t_gpt.sh
diff -u src/tests/sbin/gpt/t_gpt.sh:1.11 src/tests/sbin/gpt/t_gpt.sh:1.12
--- src/tests/sbin/gpt/t_gpt.sh:1.11	Sun Dec  6 00:38:30 2015
+++ src/tests/sbin/gpt/t_gpt.sh	Sun Dec 27 01:46:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_gpt.sh,v 1.11 2015/12/06 00:38:30 christos Exp $
+# $NetBSD: t_gpt.sh,v 1.12 2015/12/27 01:46:24 pgoyette Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -160,7 +160,7 @@ change_attr_2part_body() {
 	prepare_2part
 	match "$(attrmsg 1)" gpt set -i 1 -a biosboot,bootme "$disk"
 	save attr gpt show -i 1 "$disk"
-	match "^Attributes: biosboot,bootme\$" tail -1 attr
+	match "^Attributes: biosboot, bootme\$" tail -1 attr
 	match "$(attrmsg 1)" gpt unset -i 1 -a biosboot,bootme "$disk"
 	save attr gpt show -i 1 "$disk"
 	match "^Attributes: None\$" tail -1 attr

CVS commit: src/tests/sbin/gpt

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sun Dec 27 01:50:39 UTC 2015

Modified Files:
src/tests/sbin/gpt: t_gpt.sh

Log Message:
Revert - tested using wrong test case.  :(


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/sbin/gpt/t_gpt.sh

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

Modified files:

Index: src/tests/sbin/gpt/t_gpt.sh
diff -u src/tests/sbin/gpt/t_gpt.sh:1.12 src/tests/sbin/gpt/t_gpt.sh:1.13
--- src/tests/sbin/gpt/t_gpt.sh:1.12	Sun Dec 27 01:46:24 2015
+++ src/tests/sbin/gpt/t_gpt.sh	Sun Dec 27 01:50:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_gpt.sh,v 1.12 2015/12/27 01:46:24 pgoyette Exp $
+# $NetBSD: t_gpt.sh,v 1.13 2015/12/27 01:50:39 pgoyette Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -160,7 +160,7 @@ change_attr_2part_body() {
 	prepare_2part
 	match "$(attrmsg 1)" gpt set -i 1 -a biosboot,bootme "$disk"
 	save attr gpt show -i 1 "$disk"
-	match "^Attributes: biosboot, bootme\$" tail -1 attr
+	match "^Attributes: biosboot,bootme\$" tail -1 attr
 	match "$(attrmsg 1)" gpt unset -i 1 -a biosboot,bootme "$disk"
 	save attr gpt show -i 1 "$disk"
 	match "^Attributes: None\$" tail -1 attr

CVS commit: src/etc/defaults

2015-12-26 Thread Iain Hibbert

Module Name:src
Committed By:   plunky
Date:   Sat Dec 26 21:05:11 UTC 2015

Modified Files:
src/etc/defaults: rc.conf

Log Message:
"ip6addrctl_enable" is now "ip6addrctl", set the default appropriately


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/etc/defaults/rc.conf

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

Modified files:

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.134 src/etc/defaults/rc.conf:1.135
--- src/etc/defaults/rc.conf:1.134	Sun Dec 13 02:27:06 2015
+++ src/etc/defaults/rc.conf	Sat Dec 26 21:05:11 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.134 2015/12/13 02:27:06 christos Exp $
+#	$NetBSD: rc.conf,v 1.135 2015/12/26 21:05:11 plunky Exp $
 #
 # /etc/defaults/rc.conf --
 #	default configuration of /etc/rc.conf
@@ -376,7 +376,7 @@ makemandb=YES
 blacklistd=NO
 
 # IPv6 address selection policy
-ip6addrctl_enable=NO
+ip6addrctl=NO
 # ipv6_prefer, ipv4_prefer, auto
 ip6addrctl_policy=auto
 ip6addrctl_verbose=NO

CVS commit: [netbsd-7] src/distrib/sets/lists/xdebug

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 21:53:58 UTC 2015

Modified Files:
src/distrib/sets/lists/xdebug [netbsd-7]: shl.mi

Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1044):
distrib/sets/lists/xdebug/shl.mi: revision 1.22
Fix libxcb-xkb version number


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.4 -r1.14.4.5 src/distrib/sets/lists/xdebug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.14.4.4 src/distrib/sets/lists/xdebug/shl.mi:1.14.4.5
--- src/distrib/sets/lists/xdebug/shl.mi:1.14.4.4	Thu Mar 26 10:01:02 2015
+++ src/distrib/sets/lists/xdebug/shl.mi	Sat Dec 26 21:53:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.14.4.4 2015/03/26 10:01:02 martin Exp $
+# $NetBSD: shl.mi,v 1.14.4.5 2015/12/26 21:53:58 snj Exp $
 ./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug			-unknown-		x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug			-unknown-		x11,debug
 ./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug			-unknown-		x11,debug
@@ -137,7 +137,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xf86dri.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xfixes.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xinerama.so.0.1.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.0.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libxcb-xkb.so.1.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xtest.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xv.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-xvmc.so.0.1.debug	-unknown-		xorg,debug

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

2015-12-26 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Dec 26 22:57:09 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: exynos5422_clock.c

Log Message:
hook exynos5422 clock support into fdtbus


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/samsung/exynos5422_clock.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/samsung/exynos5422_clock.c
diff -u src/sys/arch/arm/samsung/exynos5422_clock.c:1.3 src/sys/arch/arm/samsung/exynos5422_clock.c:1.4
--- src/sys/arch/arm/samsung/exynos5422_clock.c:1.3	Mon Dec 21 03:34:34 2015
+++ src/sys/arch/arm/samsung/exynos5422_clock.c	Sat Dec 26 22:57:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos5422_clock.c,v 1.3 2015/12/21 03:34:34 marty Exp $ */
+/* $NetBSD: exynos5422_clock.c,v 1.4 2015/12/26 22:57:09 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.3 2015/12/21 03:34:34 marty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.4 2015/12/26 22:57:09 jmcneill Exp $");
 
 #include 
 #include 
@@ -47,6 +47,211 @@ __KERNEL_RCSID(0, "$NetBSD: exynos5422_c
 
 #include 
 
+static struct clk *exynos5422_clock_decode(device_t, const void *, size_t);
+
+static const struct fdtbus_clock_controller_func exynos5422_car_fdtclock_funcs = {
+	.decode = exynos5422_clock_decode
+};
+
+/* DT clock ID to clock name mappings */
+static struct exynos5422_clock_id {
+	u_int		id;
+	const char	*name;
+} exynos5422_clock_ids[] = {
+{ 1, "fin_pll" },
+{ 2, "fout_apll" },
+{ 3, "fout_cpll" },
+{ 4, "fout_dpll" },
+{ 5, "fout_epll" },
+{ 6, "fout_rpll" },
+{ 7, "fout_ipll" },
+{ 8, "fout_spll" },
+{ 9, "fout_vpll" },
+{ 10, "fout_mpll" },
+{ 11, "fout_bpll" },
+{ 12, "fout_kpll" },
+{ 128, "sclk_uart0" },
+{ 129, "sclk_uart1" },
+{ 130, "sclk_uart2" },
+{ 131, "sclk_uart3" },
+{ 132, "sclk_mmc0" },
+{ 133, "sclk_mmc1" },
+{ 134, "sclk_mmc2" },
+{ 135, "sclk_spi0" },
+{ 136, "sclk_spi1" },
+{ 137, "sclk_spi2" },
+{ 138, "sclk_i2s1" },
+{ 139, "sclk_i2s2" },
+{ 140, "sclk_pcm1" },
+{ 141, "sclk_pcm2" },
+{ 142, "sclk_spdif" },
+{ 143, "sclk_hdmi" },
+{ 144, "sclk_pixel" },
+{ 145, "sclk_dp1" },
+{ 146, "sclk_mipi1" },
+{ 147, "sclk_fimd1" },
+{ 148, "sclk_maudio0" },
+{ 149, "sclk_maupcm0" },
+{ 150, "sclk_usbd300" },
+{ 151, "sclk_usbd301" },
+{ 152, "sclk_usbphy300" },
+{ 153, "sclk_usbphy301" },
+{ 154, "sclk_unipro" },
+{ 155, "sclk_pwm" },
+{ 156, "sclk_gscl_wa" },
+{ 157, "sclk_gscl_wb" },
+{ 158, "sclk_hdmiphy" },
+{ 159, "mau_epll" },
+{ 160, "sclk_hsic_12m" },
+{ 161, "sclk_mphy_ixtal24" },
+{ 257, "uart0" },
+{ 258, "uart1" },
+{ 259, "uart2" },
+{ 260, "uart3" },
+{ 261, "i2c0" },
+{ 262, "i2c1" },
+{ 263, "i2c2" },
+{ 264, "i2c3" },
+{ 265, "usi0" },
+{ 266, "usi1" },
+{ 267, "usi2" },
+{ 268, "usi3" },
+{ 269, "i2c_hdmi" },
+{ 270, "tsadc" },
+{ 271, "spi0" },
+{ 272, "spi1" },
+{ 273, "spi2" },
+{ 274, "keyif" },
+{ 275, "i2s1" },
+{ 276, "i2s2" },
+{ 277, "pcm1" },
+{ 278, "pcm2" },
+{ 279, "pwm" },
+{ 280, "spdif" },
+{ 281, "usi4" },
+{ 282, "usi5" },
+{ 283, "usi6" },
+{ 300, "aclk66_psgen" },
+{ 301, "chipid" },
+{ 302, "sysreg" },
+{ 303, "tzpc0" },
+{ 304, "tzpc1" },
+{ 305, "tzpc2" },
+{ 306, "tzpc3" },
+{ 307, "tzpc4" },
+{ 308, "tzpc5" },
+{ 309, "tzpc6" },
+{ 310, "tzpc7" },
+{ 311, "tzpc8" },
+{ 312, "tzpc9" },
+{ 313, "hdmi_cec" },
+{ 314, "seckey" },
+{ 315, "mct" },
+{ 316, "wdt" },
+{ 317, "rtc" },
+{ 318, "tmu" },
+{ 319, "tmu_gpu" },
+{ 330, "pclk66_gpio" },
+{ 350, "aclk200_fsys2" },
+{ 351, "mout_mmc0" },
+{ 352, "mout_mmc1" },
+{ 353, "mout_mmc2" },
+{ 354, "sromc" },
+{ 355, "ufs" },
+{ 360, "aclk200_fsys" },
+{ 361, "tsi" },
+{ 362, "pdma0" },
+{ 363, "pdma1" },
+{ 364, "rtic" },
+{ 365, "usbh20" },
+{ 366, "usbd300" },
+{ 367, "usbd301" },
+{ 380, "aclk400_mscl" },
+{ 381, "mscl0" },
+{ 382, "mscl1" },
+{ 383, "mscl2" },
+{ 384, "smmu_mscl0" },
+{ 385, "smmu_mscl1" },
+{ 386, "smmu_mscl2" },
+{ 400, "aclk333" },
+{ 401, "mfc" },
+{ 402, "smmu_mfcl" },
+{ 403, "smmu_mfcr" },
+{ 410, "aclk200_disp1" },
+{ 411, "dsim1" },
+{ 412, "dp1" },
+{ 413, "hdmi" },
+{ 420, "aclk300_disp1" },
+{ 421, "fimd1" },
+{ 422, "smmu_fimd1m0" },
+{ 423, "smmu_fimd1m1" },
+{ 430, "aclk166" },
+{ 431, "mixer" },
+{ 440, "aclk266" },
+{ 441, "rotator" },
+{ 442,

CVS commit: [netbsd-7-0] src/sys/arch/sparc64/dev

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:13:06 UTC 2015

Modified Files:
src/sys/arch/sparc64/dev [netbsd-7-0]: zs.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1050):
sys/arch/sparc64/dev/zs.c: revision 1.75
Add a missing newline in zs at sbus attach message.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.74.16.1 src/sys/arch/sparc64/dev/zs.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/dev/zs.c
diff -u src/sys/arch/sparc64/dev/zs.c:1.74 src/sys/arch/sparc64/dev/zs.c:1.74.16.1
--- src/sys/arch/sparc64/dev/zs.c:1.74	Sat Oct 27 17:18:12 2012
+++ src/sys/arch/sparc64/dev/zs.c	Sat Dec 26 22:13:06 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: zs.c,v 1.74 2012/10/27 17:18:12 chs Exp $	*/
+/*	$NetBSD: zs.c,v 1.74.16.1 2015/12/26 22:13:06 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.74 2012/10/27 17:18:12 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.74.16.1 2015/12/26 22:13:06 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -259,6 +259,7 @@ zs_attach_sbus(device_t parent, device_t
 	zsc->zsc_dmatag = sa->sa_dmatag;
 	zsc->zsc_promunit = prom_getpropint(sa->sa_node, "slave", -2);
 	zsc->zsc_node = sa->sa_node;
+	aprint_normal("\n");
 	zs_attach(zsc, zsaddr[zs_unit], sa->sa_pri);
 }

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

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:14:41 UTC 2015

Modified Files:
src/sys/arch/landisk/landisk [netbsd-7]: machdep.c
src/sys/arch/sh3/sh3 [netbsd-7]: sh3_machdep.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1051):
sys/arch/landisk/landisk/machdep.c: revision 1.18
sys/arch/sh3/sh3/sh3_machdep.c: revision 1.103
Remove \n from set_cpumodel(), and explicitly print \n during boot instead.
Fixes dmesg on NetBSD/dreamcast 7.0 (and probably NetBSD/hpcsh 7.0):
---
NetBSD 7.0 (GENERIC.201509250726Z)
SEGA Dreamcasttotal memory = 16384 KB
avail memory = 13668 KB
---
which was mangled when cpu_getmode() and cpu_setmodel() were introduced:
 http://mail-index.netbsd.org/source-changes/2014/03/24/msg053273.html


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 src/sys/arch/landisk/landisk/machdep.c
cvs rdiff -u -r1.102 -r1.102.4.1 src/sys/arch/sh3/sh3/sh3_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/landisk/landisk/machdep.c
diff -u src/sys/arch/landisk/landisk/machdep.c:1.17 src/sys/arch/landisk/landisk/machdep.c:1.17.4.1
--- src/sys/arch/landisk/landisk/machdep.c:1.17	Mon Mar 24 20:06:32 2014
+++ src/sys/arch/landisk/landisk/machdep.c	Sat Dec 26 22:14:41 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.17 2014/03/24 20:06:32 christos Exp $	*/
+/*	$NetBSD: machdep.c,v 1.17.4.1 2015/12/26 22:14:41 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17.4.1 2015/12/26 22:14:41 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -147,7 +147,7 @@ cpu_startup(void)
 {
 
 	/* XXX: show model (LANDISK/USL-5P) */
-	cpu_setmodel("Model: I-O DATA LANDISK\n");
+	cpu_setmodel("Model: I-O DATA LANDISK");
 
 sh_startup();
 }

Index: src/sys/arch/sh3/sh3/sh3_machdep.c
diff -u src/sys/arch/sh3/sh3/sh3_machdep.c:1.102 src/sys/arch/sh3/sh3/sh3_machdep.c:1.102.4.1
--- src/sys/arch/sh3/sh3/sh3_machdep.c:1.102	Mon Mar 24 20:06:32 2014
+++ src/sys/arch/sh3/sh3/sh3_machdep.c	Sat Dec 26 22:14:41 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sh3_machdep.c,v 1.102 2014/03/24 20:06:32 christos Exp $	*/
+/*	$NetBSD: sh3_machdep.c,v 1.102.4.1 2015/12/26 22:14:41 snj Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.102 2014/03/24 20:06:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.102.4.1 2015/12/26 22:14:41 snj Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -277,7 +277,7 @@ sh_startup(void)
 
 	printf("%s%s", copyright, version);
 	if (*model != '\0')
-		printf("%s", model);
+		printf("%s\n", model);
 #ifdef DEBUG
 	printf("general exception handler:\t%d byte\n",
 	sh_vector_generic_end - sh_vector_generic);

CVS commit: [netbsd-7] src/doc

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:26:28 UTC 2015

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

Log Message:
tickets 1044, 1049-1053


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.39 -r1.1.2.40 src/doc/CHANGES-7.1

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.1
diff -u src/doc/CHANGES-7.1:1.1.2.39 src/doc/CHANGES-7.1:1.1.2.40
--- src/doc/CHANGES-7.1:1.1.2.39	Thu Dec 10 23:50:06 2015
+++ src/doc/CHANGES-7.1	Sat Dec 26 22:26:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.39 2015/12/10 23:50:06 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.40 2015/12/26 22:26:28 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1671,3 +1671,39 @@ external/gpl3/gcc/dist/gcc/config/i386/c
 	cpuid.
 	[christos, ticket #1048]
 
+distrib/sets/lists/xdebug/shl.mi		1.22
+
+	Fix libxcb-xkb version number.
+	[mlelstv, ticket #1044]
+
+distrib/sets/Makefile1.99
+share/mk/bsd.own.mk1.881
+
+	checkflist requires an egrep that honours multiple pattern
+	options, so use ours. Fixes build on Solaris distributions.
+	[joerg, ticket #1049]
+
+sys/arch/sparc64/dev/zs.c			1.75
+
+	Add a missing newline in zs at sbus attach message.
+	[tsutsui, ticket #1050]
+
+sys/arch/landisk/landisk/machdep.c		1.18
+sys/arch/sh3/sh3/sh3_machdep.c			1.103
+
+	Remove \n from set_cpumodel(), and explicitly print \n
+	during boot instead.
+	[tsutsui, ticket #1051]
+
+external/mit/xorg/lib/libX11/Makefile.libx11	1.17
+
+	Disable UIThrStubs.c, which is unnecessary on NetBSD.  Fixes
+	xterm startup failure on m68k.  PR/50386.
+	[tsutsui, ticket #1052]
+
+sys/dev/ic/dwc_gmac_reg.h			1.15
+
+	Fix a problem on ODROID-C1 when trying to use the network if 
+	the cable wasn't plugged in at boot.
+	[jmcneill, ticket #1053]
+

CVS commit: src/share/man/man5

2015-12-26 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Dec 27 02:42:33 UTC 2015

Modified Files:
src/share/man/man5: rc.conf.5

Log Message:
describe the ip6addrctl variables.


To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/share/man/man5/rc.conf.5

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

Modified files:

Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.163 src/share/man/man5/rc.conf.5:1.164
--- src/share/man/man5/rc.conf.5:1.163	Mon Oct 12 08:07:24 2015
+++ src/share/man/man5/rc.conf.5	Sat Dec 26 21:42:33 2015
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rc.conf.5,v 1.163 2015/10/12 12:07:24 wiz Exp $
+.\"	$NetBSD: rc.conf.5,v 1.164 2015/12/27 02:42:33 christos Exp $
 .\"
 .\" Copyright (c) 1996 Matthew R. Green
 .\" All rights reserved.
@@ -55,7 +55,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 9, 2015
+.Dd December 26, 2015
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -750,6 +750,25 @@ Boolean value.
 Monitor dynamic interfaces and perform actions upon address changes.
 Passes
 .Sy ifwatchd_flags .
+.It Sy ip6addrctl
+Boolean value.
+Fine grain control of address and routing priorities. 
+.It Sy ip6addrctl_policy
+A string.
+Can be:
+.Bl -tag -width auto -compact
+.It Li auto
+automatically determine from system settings; will read priorities from
+.Pa /etc/ip6addrcl.conf
+or if that file does not exist it will default to IPv6 first, then IPv4.
+.It Li ipv4_prefer
+try IPv4 before IPv6.
+.It Li ipv6_prefer
+try IPv6 before IPv4.
+.El
+.It Sy ip6addrctl_verbose
+Boolean value.
+If set, print the resulting prefixes and priorities map.
 .It Sy ip6mode
 A string.
 An IPv6 node can be a router

CVS commit: [netbsd-7-0] src/external/mit/xorg/lib/libX11

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:20:03 UTC 2015

Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-7-0]: Makefile.libx11

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1052):
external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.17
Disable UIThrStubs.c, which is unnecessary on NetBSD.
This fixes xterm startup failure on NetBSD/m68k 7.0.
See PR/50386 for details.
Should be pulled up to netbsd-7 and netbsd-7-0.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.4.1 \
src/external/mit/xorg/lib/libX11/Makefile.libx11

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

Modified files:

Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13.4.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13	Sat Jun 14 20:49:37 2014
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11	Sat Dec 26 22:20:03 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.13 2014/06/14 20:49:37 mrg Exp $
+#	$NetBSD: Makefile.libx11,v 1.13.4.1 2015/12/26 22:20:03 snj Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.${LIB}}/src
@@ -265,8 +265,9 @@ SRCS=	\
 	XlibInt.c \
 	Xrm.c \
 
-SRCS+=	\
-	UIThrStubs.c 
+# We have own pthread stubs in src/lib/libc/thread-stub. See PR/50386.
+#SRCS+=	\
+#	UIThrStubs.c 
 
 SRCS+=	\
 	AddDIC.c \

CVS commit: [netbsd-7] src/external/mit/xorg/lib/libX11

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:18:57 UTC 2015

Modified Files:
src/external/mit/xorg/lib/libX11 [netbsd-7]: Makefile.libx11

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1052):
external/mit/xorg/lib/libX11/Makefile.libx11: revision 1.17
Disable UIThrStubs.c, which is unnecessary on NetBSD.
This fixes xterm startup failure on NetBSD/m68k 7.0.
See PR/50386 for details.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.2.1 \
src/external/mit/xorg/lib/libX11/Makefile.libx11

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

Modified files:

Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13.2.1
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.13	Sat Jun 14 20:49:37 2014
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11	Sat Dec 26 22:18:57 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.13 2014/06/14 20:49:37 mrg Exp $
+#	$NetBSD: Makefile.libx11,v 1.13.2.1 2015/12/26 22:18:57 snj Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.${LIB}}/src
@@ -265,8 +265,9 @@ SRCS=	\
 	XlibInt.c \
 	Xrm.c \
 
-SRCS+=	\
-	UIThrStubs.c 
+# We have own pthread stubs in src/lib/libc/thread-stub. See PR/50386.
+#SRCS+=	\
+#	UIThrStubs.c 
 
 SRCS+=	\
 	AddDIC.c \

CVS commit: [netbsd-7-0] src/doc

2015-12-26 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sat Dec 26 22:26:58 UTC 2015

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

Log Message:
tickets 1044, 1050-1053


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-7.0.1

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.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.20 src/doc/CHANGES-7.0.1:1.1.2.21
--- src/doc/CHANGES-7.0.1:1.1.2.20	Thu Dec 10 23:48:32 2015
+++ src/doc/CHANGES-7.0.1	Sat Dec 26 22:26:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.20 2015/12/10 23:48:32 snj Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.21 2015/12/26 22:26:58 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -802,3 +802,32 @@ external/gpl3/gcc/dist/gcc/config/i386/c
 	cpuid.
 	[christos, ticket #1048]
 
+distrib/sets/lists/xdebug/shl.mi		1.22
+
+	Fix libxcb-xkb version number
+	[mlelstv, ticket #1044]
+
+sys/arch/sparc64/dev/zs.c			1.75
+
+	Add a missing newline in zs at sbus attach message.
+	[tsutsui, ticket #1050]
+
+sys/arch/landisk/landisk/machdep.c		1.18
+sys/arch/sh3/sh3/sh3_machdep.c			1.103
+
+	Remove \n from set_cpumodel(), and explicitly print \n
+	during boot instead.
+	[tsutsui, ticket #1051]
+
+external/mit/xorg/lib/libX11/Makefile.libx11	1.17
+
+	Disable UIThrStubs.c, which is unnecessary on NetBSD.  Fixes
+	xterm startup failure on m68k.  PR/50386.
+	[tsutsui, ticket #1052]
+
+sys/dev/ic/dwc_gmac_reg.h			1.15
+
+	Fix a problem on ODROID-C1 when trying to use the network if  
+	the cable wasn't plugged in at boot.
+	[jmcneill, ticket #1053]
+

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

2015-12-26 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sat Dec 26 22:53:52 UTC 2015

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

Log Message:
tag kernel as type linux so we get the fdt address in r2


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

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.exynos
diff -u src/sys/arch/evbarm/conf/mk.exynos:1.1 src/sys/arch/evbarm/conf/mk.exynos:1.2
--- src/sys/arch/evbarm/conf/mk.exynos:1.1	Sun Dec  6 00:31:24 2015
+++ src/sys/arch/evbarm/conf/mk.exynos	Sat Dec 26 22:53:52 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.exynos,v 1.1 2015/12/06 00:31:24 marty Exp $
+#	$NetBSD: mk.exynos,v 1.2 2015/12/26 22:53:52 jmcneill Exp $
 
 .if !empty(MACHINE_ARCH:M*eb)
 EXTRA_LINKFLAGS+=	--be8
@@ -15,7 +15,7 @@ _OSRELEASE!=		${HOST_SH} $S/conf/osrelea
 KERNEL_BASE_PHYS?=$(LOADADDRESS)
 KERNEL_BASE_VIRT?=$(LOADADDRESS)
 
-MKUBOOTIMAGEARGS=	-A arm -T kernel
+MKUBOOTIMAGEARGS=	-A arm -T kernel -O linux
 MKUBOOTIMAGEARGS+=	-a $(KERNEL_BASE_PHYS) -e $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=	-n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
 MKUBOOTIMAGEARGS_NONE=	${MKUBOOTIMAGEARGS} -C none

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

2015-12-26 Thread Marty Fouts

Module Name:src
Committed By:   marty
Date:   Sun Dec 27 02:43:42 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: exynos_gpio.c

Log Message:
XU4 gpio clean up acquire code

properly locate the bank in the acquire code.  This may even work.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/samsung/exynos_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/samsung/exynos_gpio.c
diff -u src/sys/arch/arm/samsung/exynos_gpio.c:1.18 src/sys/arch/arm/samsung/exynos_gpio.c:1.19
--- src/sys/arch/arm/samsung/exynos_gpio.c:1.18	Thu Dec 24 01:10:51 2015
+++ src/sys/arch/arm/samsung/exynos_gpio.c	Sun Dec 27 02:43:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: exynos_gpio.c,v 1.18 2015/12/24 01:10:51 marty Exp $ */
+/*	$NetBSD: exynos_gpio.c,v 1.19 2015/12/27 02:43:42 marty Exp $ */
 
 /*-
 * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include "gpio.h"
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.18 2015/12/24 01:10:51 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.19 2015/12/27 02:43:42 marty Exp $");
 
 #include 
 #include 
@@ -365,17 +365,22 @@ exynos_gpio_pin_lookup(const char *pinna
 static void *
 exynos_gpio_fdt_acquire(device_t dev, const void *data, size_t len, int flags)
 {
-	/* MJF:  This is wrong.  data is a u_int but I need a name */
-//	const u_int *gpio = data;
-	const char *pinname = data;
-	const struct exynos_gpio_bank *bank;
+	const u_int *cells = data;
+	const struct exynos_gpio_bank *bank = NULL;
 	struct exynos_gpio_pin *gpin;
-	int pin;
+	int pin = be32toh(cells[0]) & 0x0f;
+	int n;
 
-	bank = exynos_gpio_pin_lookup(pinname, );
+	for (n = 0; n < __arraycount(exynos5_banks); n++) {
+		if (exynos_gpio_banks[n].bank_sc->sc_dev == dev) {
+			bank = _gpio_banks[n];
+			break;
+		}
+	}
 	if (bank == NULL)
 		return NULL;
 
+	printf("gpio pin %s-%d being acquired\n", bank->bank_name, pin);
 	gpin = kmem_alloc(sizeof(*gpin), KM_SLEEP);
 	gpin->pin_sc = bank->bank_sc;
 	gpin->pin_bank = bank;

CVS commit: src/tests/rump/modautoload

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sun Dec 27 06:36:36 UTC 2015

Modified Files:
src/tests/rump/modautoload: Makefile t_modautoload.c

Log Message:
When MODULAR kernels grew a MODULAR_DEFAULT_AUTOLOAD option, (in rev 1.98
of src/sys/kern/kern_module.c), the default was "off" for all kernels
including rump kernels.  While many (most?) kernel config files were
updated to include the new option, rump kernels weren't so lucky.  Thus,
rump kernels still had autoload disabled.

This commit uses rump_sysctl to change the module_autoload_on value to
true (ie, enabled) before trying to test if autoloading actually works.

For now, I am _not_ changing the default for all rump kernels.  I'll
leave that for another day, after all appropriate discussion has occurred.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/rump/modautoload/Makefile \
src/tests/rump/modautoload/t_modautoload.c

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

Modified files:

Index: src/tests/rump/modautoload/Makefile
diff -u src/tests/rump/modautoload/Makefile:1.2 src/tests/rump/modautoload/Makefile:1.3
--- src/tests/rump/modautoload/Makefile:1.2	Mon Mar 10 22:38:53 2014
+++ src/tests/rump/modautoload/Makefile	Sun Dec 27 06:36:36 2015
@@ -1,10 +1,12 @@
-#	$NetBSD: Makefile,v 1.2 2014/03/10 22:38:53 pooka Exp $
+#	$NetBSD: Makefile,v 1.3 2015/12/27 06:36:36 pgoyette Exp $
 #
 
 TESTSDIR=	${TESTSBASE}/rump/modautoload
 
 TESTS_C=	t_modautoload
 
+SRCS.t_modautoload+=	t_modautoload.c
+
 # Note: we link the rump kernel into the application to make this work
 # on amd64.  This is the reason we keep this test in its own
 # subdirectory -- otherwise the LDADD lines would get a little hairy.
@@ -16,4 +18,11 @@ LDADD+=		-lrumpuser -lpthread
 
 WARNS=	4
 
+# To include a rump version of sysctlbyname()
+
+.PATH:		${NETBSDSRCDIR}/lib/libc/gen
+SRCS.t_modautoload+=		sysctlbyname.c
+SRCS.t_modautoload+=		sysctlgetmibinfo.c
+CPPFLAGS+=	-DRUMP_ACTION
+
 .include 
Index: src/tests/rump/modautoload/t_modautoload.c
diff -u src/tests/rump/modautoload/t_modautoload.c:1.2 src/tests/rump/modautoload/t_modautoload.c:1.3
--- src/tests/rump/modautoload/t_modautoload.c:1.2	Mon Mar 10 22:38:53 2014
+++ src/tests/rump/modautoload/t_modautoload.c	Sun Dec 27 06:36:36 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_modautoload.c,v 1.2 2014/03/10 22:38:53 pooka Exp $	*/
+/*	$NetBSD: t_modautoload.c,v 1.3 2015/12/27 06:36:36 pgoyette Exp $	*/
 
 #include 
 #include 
@@ -33,6 +33,9 @@ ATF_TC_HEAD(modautoload, tc)
 static void
 mountkernfs(void)
 {
+	bool old_autoload, new_autoload;
+	size_t old_len, new_len;
+	int error;
 
 	if (!rump_nativeabi_p())
 		atf_tc_skip("host kernel modules not supported");
@@ -41,6 +44,15 @@ mountkernfs(void)
 
 	if (rump_sys_mkdir("/kern", 0777) == -1)
 		atf_tc_fail_errno("mkdir /kern");
+
+	new_autoload = new_verbose = true;
+	new_len = sizeof(new_autoload);
+	error = sysctlbyname("kern.module.autoload",
+  _autoload, _len,
+  _autoload, new_len);
+	if (error != 0)
+		atf_tc_fail_errno("could not enable module autoload");
+
 	if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1)
 		atf_tc_fail_errno("could not mount kernfs");
 }

CVS commit: src/tests/sbin/gpt

2015-12-26 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Sun Dec 27 06:53:48 UTC 2015

Modified Files:
src/tests/sbin/gpt: t_gpt.sh

Log Message:
I was right - the output from gpt(8) did grow an extra space character!

Fix the test to expect it.  Test now passes on my local test bed.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tests/sbin/gpt/t_gpt.sh

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

Modified files:

Index: src/tests/sbin/gpt/t_gpt.sh
diff -u src/tests/sbin/gpt/t_gpt.sh:1.13 src/tests/sbin/gpt/t_gpt.sh:1.14
--- src/tests/sbin/gpt/t_gpt.sh:1.13	Sun Dec 27 01:50:39 2015
+++ src/tests/sbin/gpt/t_gpt.sh	Sun Dec 27 06:53:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_gpt.sh,v 1.13 2015/12/27 01:50:39 pgoyette Exp $
+# $NetBSD: t_gpt.sh,v 1.14 2015/12/27 06:53:48 pgoyette Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -160,7 +160,7 @@ change_attr_2part_body() {
 	prepare_2part
 	match "$(attrmsg 1)" gpt set -i 1 -a biosboot,bootme "$disk"
 	save attr gpt show -i 1 "$disk"
-	match "^Attributes: biosboot,bootme\$" tail -1 attr
+	match "^Attributes: biosboot, bootme\$" tail -1 attr
 	match "$(attrmsg 1)" gpt unset -i 1 -a biosboot,bootme "$disk"
 	save attr gpt show -i 1 "$disk"
 	match "^Attributes: None\$" tail -1 attr

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

2015-12-26 Thread Michael Lorenz

Module Name:src
Committed By:   macallan
Date:   Sun Dec 27 06:24:25 UTC 2015

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

Log Message:
add awiniic* and tve


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/CUBIETRUCK

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/CUBIETRUCK
diff -u src/sys/arch/evbarm/conf/CUBIETRUCK:1.8 src/sys/arch/evbarm/conf/CUBIETRUCK:1.9
--- src/sys/arch/evbarm/conf/CUBIETRUCK:1.8	Mon Jun  1 23:17:47 2015
+++ src/sys/arch/evbarm/conf/CUBIETRUCK	Sun Dec 27 06:24:25 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: CUBIETRUCK,v 1.8 2015/06/01 23:17:47 matt Exp $
+#	$NetBSD: CUBIETRUCK,v 1.9 2015/12/27 06:24:25 macallan Exp $
 #
 #	CUBIETRUCK - Cubieboard3 (mostly cubieboard2 with 2GB)
 #
@@ -27,6 +27,13 @@ makeoptions	CPUFLAGS="-mcpu=cortex-a7 -m
 #
 options 	PMAP_NEED_ALLOC_POOLPAGE
 
+# we need awinii2c to talk to VGA monitors
+awiniic*	at awinio? port ?
+
+# TV encoder / VGA output
+awintve0 	at awinio0
+
+
 cinclude	"arch/evbarm/conf/CUBIETRUCK.local"
 
 #options 	VERBOSE_INIT_ARM # verbose bootstraping messages

CVS commit: src/libexec/httpd/testsuite

2015-12-26 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Sun Dec 27 07:43:39 UTC 2015

Modified Files:
src/libexec/httpd/testsuite: Makefile test-bigfile

Log Message:
fix running the testsuite from the build tree


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/libexec/httpd/testsuite/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/libexec/httpd/testsuite/test-bigfile

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

Modified files:

Index: src/libexec/httpd/testsuite/Makefile
diff -u src/libexec/httpd/testsuite/Makefile:1.4 src/libexec/httpd/testsuite/Makefile:1.5
--- src/libexec/httpd/testsuite/Makefile:1.4	Sat May 23 02:26:03 2009
+++ src/libexec/httpd/testsuite/Makefile	Sun Dec 27 07:43:39 2015
@@ -6,7 +6,7 @@ BIGFILETESTS=	partial4000 partial8000
 BOZOHTTPD?=	../bozohttpd
 BOZOHTTPD?=	../debug/bozohttpd-debug
 WGET?=		wget
-
+DATA?=		$(.CURDIR)/data 
 all:
 
 clean:
@@ -19,14 +19,14 @@ check: check-simple check-bigfile
 check-simple:
 .for a in $(SIMPLETESTS)
 	echo "Running test $a"
-	$(BOZOHTTPD) ./data < $(.CURDIR)/$a.in > tmp.$a.out || true
+	$(BOZOHTTPD) "$(DATA)" < $(.CURDIR)/$a.in > tmp.$a.out || true
 	$(.CURDIR)/html_cmp $(.CURDIR)/$a.out tmp.$a.out
 .endfor
 
 check-bigfile:
 .for a in $(BIGFILETESTS)
 	echo "Running test $a"
-	$(.CURDIR)/test-bigfile "$a" "${BOZOHTTPD}" "${WGET}" "./data"
+	$(.CURDIR)/test-bigfile "$a" "${BOZOHTTPD}" "${WGET}" "$(DATA)"
 .endfor
 
 .include 

Index: src/libexec/httpd/testsuite/test-bigfile
diff -u src/libexec/httpd/testsuite/test-bigfile:1.1.1.1 src/libexec/httpd/testsuite/test-bigfile:1.2
--- src/libexec/httpd/testsuite/test-bigfile:1.1.1.1	Sat May 23 02:21:19 2009
+++ src/libexec/httpd/testsuite/test-bigfile	Sun Dec 27 07:43:39 2015
@@ -8,7 +8,7 @@ datadir="$4"
 bozotestport=1
 
 # copy beginning file
-cp ./data/bigfile.${test} ./bigfile
+cp ${datadir}/bigfile.${test} ./bigfile
 
 # fire up bozohttpd
 ${bozohttpd} -b -b -I ${bozotestport} -n -s -f ${datadir} &
@@ -18,7 +18,7 @@ ${wget} -c http://localhost:${bozotestpo
 
 kill -9 $bozopid
 
-if cmp ./bigfile ./data/bigfile; then
+if cmp ./bigfile ${datadir}/bigfile; then
 	rm -f ./bigfile
 	exit 0
 else

CVS commit: src/sys/arch

2015-12-26 Thread Marty Fouts

Module Name:src
Committed By:   marty
Date:   Sun Dec 27 02:54:13 UTC 2015

Modified Files:
src/sys/arch/arm/samsung: files.exynos
src/sys/arch/evbarm/conf: EXYNOS
Added Files:
src/sys/arch/arm/samsung: exynos_ehci.c exynos_ohci.c exynos_usb3.c
exynos_usbphy.c
Removed Files:
src/sys/arch/arm/samsung: exynos_usb.c

Log Message:
XU4 USB snapshot: Reorganize source files

This is just a skeleton,  not a set of drivers, but the pieces are now
more or less in the right places.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/samsung/exynos_ehci.c \
src/sys/arch/arm/samsung/exynos_ohci.c \
src/sys/arch/arm/samsung/exynos_usb3.c \
src/sys/arch/arm/samsung/exynos_usbphy.c
cvs rdiff -u -r1.15 -r0 src/sys/arch/arm/samsung/exynos_usb.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/EXYNOS

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/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.19 src/sys/arch/arm/samsung/files.exynos:1.20
--- src/sys/arch/arm/samsung/files.exynos:1.19	Sat Dec 26 23:13:50 2015
+++ src/sys/arch/arm/samsung/files.exynos	Sun Dec 27 02:54:12 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: files.exynos,v 1.19 2015/12/26 23:13:50 jmcneill Exp $
+#	$NetBSD: files.exynos,v 1.20 2015/12/27 02:54:12 marty Exp $
 #
 # Configuration info for Samsung Exynos SoC ARM Peripherals
 #
@@ -87,12 +87,24 @@ attach  exyopctl at fdt with exynos_pinc
 file	arch/arm/samsung/exynos_pinctrl.c	exynos_pinctrl needs-flag
 file	arch/arm/samsung/exynos_gpio.c		exynos_pinctrl needs-flag
 
-# USB2 Host Controller (EHCI/OHCI)
-device	exyousb { } : fdtbus
-attach	exyousb at fdt with exyo_usb
-attach	ohci at exyousb with ohci_exyousb
-attach	ehci at exyousb with ehci_exyousb
-file	arch/arm/samsung/exynos_usb.c		exyo_usb
+# USB2 phy
+device  exyousbphy
+attach  exyousbphy at fdt with exynos_usbphy
+filearch/arm/samsung/exynos_usbphy.c	exynos_usbphy
+
+# USB2 Host Controller (OHCI)
+attach	ohci at fdt with exynos_ohci
+file	arch/arm/samsung/exynos_ohci.c		exynos_ohci
+
+#USB 2 Host Controller (EHCI)
+attach	ehci at fdt with exynos_ehci
+file	arch/arm/samsung/exynos_ehci.c		exynos_ehci
+
+# USB3 Host Controller (xHCI)
+device	exyousb : fdtbus
+attach	exyousb at fdt with exynos_usb
+attach  xhci at fdt
+file	arch/arm/samsung/exynos_usb3.c		exynos_usb
 
 # SD/MMC Host Controller
 attach	dwcmmc at fdt with exynos_dwcmmc

Index: src/sys/arch/evbarm/conf/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.7 src/sys/arch/evbarm/conf/EXYNOS:1.8
--- src/sys/arch/evbarm/conf/EXYNOS:1.7	Sat Dec 26 23:14:08 2015
+++ src/sys/arch/evbarm/conf/EXYNOS	Sun Dec 27 02:54:13 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: EXYNOS,v 1.7 2015/12/26 23:14:08 jmcneill Exp $
+#	$NetBSD: EXYNOS,v 1.8 2015/12/27 02:54:13 marty Exp $
 #
 #	ODROID-XU -- ODROID-XU4 Exynos5422 based kernel
 #
@@ -238,15 +238,20 @@ exyopctl1	at fdt?
 exyopctl2	at fdt?
 exyopctl3	at fdt?
 exyopctl4	at fdt?
-#gpio*		at exyogpio?
+gpio*		at gpiobus?
 
-# On-board USB
-exyousb*	at fdt?
-ohci*		at exyousb?
-ehci*		at exyousb?
+# On-board USB 2.0
+exyousbphy*	at fdt?
+ohci*		at fdt?
+ehci*		at fdt?
 usb*		at ohci?
 usb*		at ehci?
 
+# On-board USB 3.0
+exyousb*   at fdt?
+#xhci*	   at fdt?
+#usb*	   at xhci?
+
 # I2C devices
 exyoi2c0	at fdt?
 exyoi2c1	at fdt?

Added files:

Index: src/sys/arch/arm/samsung/exynos_ehci.c
diff -u /dev/null src/sys/arch/arm/samsung/exynos_ehci.c:1.1
--- /dev/null	Sun Dec 27 02:54:13 2015
+++ src/sys/arch/arm/samsung/exynos_ehci.c	Sun Dec 27 02:54:12 2015
@@ -0,0 +1,124 @@
+/*	$NetBSD: exynos_ehci.c,v 1.1 2015/12/27 02:54:12 marty Exp $	*/
+
+/*-
+ * Copyright (c) 2014 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Reinoud Zandijk.
+ *
+ * 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,

38 matches

Mail list logo