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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Oct  6 06:59:20 UTC 2014

Modified Files:
src/sys/arch/arm/broadcom: bcm2835_vcaudio.c

Log Message:
Some improvements that make playback mostly reliable for me - the final
piece of the jigaw is probably in vchiq:

- prefill vchiq with a number (currently 2) blocks of audio before
  starting

- use a kthread as workqueue isn't suited to our usage.

- don't drain on stopping as for some reason it leaves data behind.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/broadcom/bcm2835_vcaudio.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/broadcom/bcm2835_vcaudio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.6 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.7
--- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.6	Tue Sep  2 21:46:35 2014
+++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c	Mon Oct  6 06:59:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.6 2014/09/02 21:46:35 jmcneill Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.7 2014/10/06 06:59:20 skrll Exp $ */
 
 /*-
  * Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.6 2014/09/02 21:46:35 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.7 2014/10/06 06:59:20 skrll Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -40,7 +40,6 @@ __KERNEL_RCSID(0, $NetBSD: bcm2835_vcau
 #include sys/conf.h
 #include sys/bus.h
 #include sys/kmem.h
-#include sys/workqueue.h
 
 #include sys/audioio.h
 #include dev/audio_if.h
@@ -68,16 +67,33 @@ enum vcaudio_dest {
 	VCAUDIO_DEST_HDMI = 2,
 };
 
-struct vcaudio_work {
-	struct work			vw_wk;
-};
+
+/*
+ * Standard message size is 4000 bytes and VCHIQ can accept 16 messages.
+ *
+ * 4000 bytes of 16bit 48kHz stereo is approximately 21ms.
+ *
+ * We get complete messages at ~10ms intervals.
+ *
+ * Setting blocksize to 2 x 4000 means that we send approx 42ms of audio. We
+ * prefill by two blocks before starting audio meaning we have 83ms of latency.
+ */
+
+#define VCAUDIO_MSGSIZE		4000
+#define VCAUDIO_NUMMSGS		2
+#define VCAUDIO_BLOCKSIZE	(VCAUDIO_MSGSIZE * VCAUDIO_NUMMSGS)
+#define VCAUDIO_BUFFERSIZE	128000
+#define VCAUDIO_PREFILLCOUNT	2
 
 struct vcaudio_softc {
 	device_t			sc_dev;
 	device_t			sc_audiodev;
 
+	lwp_t*sc_lwp;
+
 	kmutex_t			sc_lock;
 	kmutex_t			sc_intr_lock;
+	kcondvar_t			sc_datacv;
 
 	kmutex_t			sc_msglock;
 	kcondvar_t			sc_msgcv;
@@ -89,7 +105,9 @@ struct vcaudio_softc {
 	void*sc_pintarg;
 	audio_params_t			sc_pparam;
 	boolsc_started;
-	intsc_pbytes;
+	intsc_pblkcnt;	// prefill block count
+	intsc_abytes;	// available bytes
+	intsc_pbytes;	// played bytes
 	off_tsc_ppos;
 	void*sc_pstart;
 	void*sc_pend;
@@ -104,9 +122,6 @@ struct vcaudio_softc {
 
 	shortsc_peer_version;
 
-	struct workqueue		*sc_wq;
-	struct vcaudio_work		sc_work;
-
 	intsc_volume;
 	enum vcaudio_dest		sc_dest;
 };
@@ -118,18 +133,17 @@ static void	vcaudio_childdet(device_t, d
 
 static int	vcaudio_init(struct vcaudio_softc *);
 static void	vcaudio_service_callback(void *,
-	 const VCHI_CALLBACK_REASON_T,
-	 void *);
-static int	vcaudio_msg_sync(struct vcaudio_softc *, VC_AUDIO_MSG_T *, size_t);
-static void	vcaudio_worker(struct work *, void *);
+const VCHI_CALLBACK_REASON_T, void *);
+static int	vcaudio_msg_sync(struct vcaudio_softc *, VC_AUDIO_MSG_T *,
+size_t);
+static void	vcaudio_worker(void *);
 
 static int	vcaudio_open(void *, int);
 static void	vcaudio_close(void *);
 static int	vcaudio_query_encoding(void *, struct audio_encoding *);
 static int	vcaudio_set_params(void *, int, int,
-  audio_params_t *, audio_params_t *,
-  stream_filter_list_t *,
-  stream_filter_list_t *);
+audio_params_t *, audio_params_t *,
+stream_filter_list_t *, stream_filter_list_t *);
 static int	vcaudio_halt_output(void *);
 static int	vcaudio_halt_input(void *);
 static int	vcaudio_set_port(void *, mixer_ctrl_t *);
@@ -137,14 +151,16 @@ static int	vcaudio_get_port(void *, mixe
 static int	vcaudio_query_devinfo(void *, mixer_devinfo_t *);
 static int	vcaudio_getdev(void *, struct audio_device *);
 static int	vcaudio_get_props(void *);
-static int	vcaudio_round_blocksize(void *, int, int, const audio_params_t *);
+
+static int	vcaudio_round_blocksize(void *, int, int,
+const audio_params_t *);
 static size_t	vcaudio_round_buffersize(void *, int, size_t);
+
 static int	vcaudio_trigger_output(void *, void *, void *, int,
- void (*)(void *), void *,
- const audio_params_t *);
+void (*)(void *), void *, const audio_params_t *);
 static int	vcaudio_trigger_input(void *, void *, void *, int,
-void (*)(void *), void *,
-const audio_params_t *);
+void (*)(void *), void *, const 

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Oct  6 07:09:30 UTC 2014

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

Log Message:
 Add some devices. Not tested because I have no any of these devices/cards.


To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.298 src/sys/dev/pci/if_wm.c:1.299
--- src/sys/dev/pci/if_wm.c:1.298	Tue Sep 16 07:06:42 2014
+++ src/sys/dev/pci/if_wm.c	Mon Oct  6 07:09:30 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.298 2014/09/16 07:06:42 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.299 2014/10/06 07:09:30 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.298 2014/09/16 07:06:42 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.299 2014/10/06 07:09:30 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -888,14 +888,30 @@ static const struct wm_product {
 	  Intel PRO/1000 QT (82571EB),
 	  WM_T_82571,		WMP_F_COPPER },
 
-	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82572EI_COPPER,
-	  Intel i82572EI 1000baseT Ethernet,
-	  WM_T_82572,		WMP_F_COPPER },
-
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82571GB_QUAD_COPPER,
 	  Intel PRO/1000 PT Quad Port Server Adapter,
 	  WM_T_82571,		WMP_F_COPPER, },
 
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82571PT_QUAD_COPPER,
+	  Intel Gigabit PT Quad Port Server ExpressModule,
+	  WM_T_82571,		WMP_F_COPPER, },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82571EB_DUAL_SERDES,
+	  Intel 82571EB Dual Gigabit Ethernet (SERDES),
+	  WM_T_82571,		WMP_F_SERDES, },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82571EB_QUAD_SERDES,
+	  Intel 82571EB Quad Gigabit Ethernet (SERDES),
+	  WM_T_82571,		WMP_F_SERDES, },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82571EB_QUAD_FIBER,
+	  Intel 82571EB Quad 1000baseX Ethernet,
+	  WM_T_82571,		WMP_F_FIBER, },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82572EI_COPPER,
+	  Intel i82572EI 1000baseT Ethernet,
+	  WM_T_82572,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82572EI_FIBER,
 	  Intel i82572EI 1000baseX Ethernet,
 	  WM_T_82572,		WMP_F_FIBER },
@@ -924,6 +940,10 @@ static const struct wm_product {
 	  Intel i82574L,
 	  WM_T_82574,		WMP_F_COPPER },
 
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82574LA,
+	  Intel i82574L,
+	  WM_T_82574,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82583V,
 	  Intel i82583V,
 	  WM_T_82583,		WMP_F_COPPER },
@@ -1064,6 +1084,11 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82576_QUAD_COPPER,
 	  82576 quad-1000BaseT Ethernet,
 	  WM_T_82576,		WMP_F_COPPER },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82576_QUAD_COPPER_ET2,
+	  82576 Gigabit ET2 Quad Port Server Adapter,
+	  WM_T_82576,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82576_NS,
 	  82576 gigabit Ethernet,
 	  WM_T_82576,		WMP_F_COPPER },
@@ -1112,6 +1137,10 @@ static const struct wm_product {
 	  I350 Gigabit Backplane Connection,
 	  WM_T_I350,		WMP_F_SERDES },
 
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_DA4,
+	  I350 Quad Port Gigabit Ethernet,
+	  WM_T_I350,		WMP_F_SERDES },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_SGMII,
 	  I350 Gigabit Connection,
 	  WM_T_I350,		WMP_F_COPPER },
@@ -1122,12 +1151,19 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_T1,
 	  I210-T1 Ethernet Server Adapter,
 	  WM_T_I210,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_COPPER_OEM1,
 	  I210 Ethernet (Copper OEM),
 	  WM_T_I210,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_COPPER_IT,
 	  I210 Ethernet (Copper IT),
 	  WM_T_I210,		WMP_F_COPPER },
+
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_COPPER_WOF,
+	  I210 Ethernet (FLASH less),
+	  WM_T_I210,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_FIBER,
 	  I210 Gigabit Ethernet (Fiber),
 	  WM_T_I210,		WMP_F_FIBER },
@@ -1136,6 +1172,10 @@ static const struct wm_product {
 	  I210 Gigabit Ethernet (SERDES),
 	  WM_T_I210,		WMP_F_SERDES },
 
+	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_SERDES_WOF,
+	  I210 Gigabit Ethernet (FLASH less),
+	  WM_T_I210,		WMP_F_SERDES },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I210_SGMII,
 	  I210 Gigabit Ethernet (SGMII),
 	  WM_T_I210,		WMP_F_COPPER },

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Oct  6 07:15:56 UTC 2014

Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h

Log Message:
- Add some PCI subclass and interfaces.
- The interface of PCI_SUBCLASS_BRIDGE_RACEWAY is not decoded yet.
- Fix typo in a message.
- Add comment.
- Modify comment.


To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.96 -r1.97 src/sys/dev/pci/pcireg.h

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

Modified files:

Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.127 src/sys/dev/pci/pci_subr.c:1.128
--- src/sys/dev/pci/pci_subr.c:1.127	Mon Sep 22 13:01:44 2014
+++ src/sys/dev/pci/pci_subr.c	Mon Oct  6 07:15:56 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.127 2014/09/22 13:01:44 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.128 2014/10/06 07:15:56 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.127 2014/09/22 13:01:44 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.128 2014/10/06 07:15:56 msaitoh Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pci.h
@@ -104,7 +104,16 @@ static const struct pci_class pci_interf
 
 /* SATA programming interface */
 static const struct pci_class pci_interface_sata[] = {
+	{ vendor specific,	PCI_INTERFACE_SATA_VND,		NULL,	},
 	{ AHCI 1.0,		PCI_INTERFACE_SATA_AHCI10,	NULL,	},
+	{ Serial Storage Bus Interface, PCI_INTERFACE_SATA_SSBI, NULL, },
+	{ NULL,			0,NULL,	},
+};
+
+/* Flash programming interface */
+static const struct pci_class pci_interface_nvm[] = {
+	{ vendor specific,	PCI_INTERFACE_NVM_VND,		NULL,	},
+	{ NVMHCI 1.0,		PCI_INTERFACE_NVM_NVMHCI10,	NULL,	},
 	{ NULL,			0,NULL,	},
 };
 
@@ -120,7 +129,8 @@ static const struct pci_class pci_subcla
 	{ SATA,		PCI_SUBCLASS_MASS_STORAGE_SATA,
 	  pci_interface_sata, },
 	{ SAS,		PCI_SUBCLASS_MASS_STORAGE_SAS,	NULL,	},
-	{ NVM,		PCI_SUBCLASS_MASS_STORAGE_NVM,	NULL,	},
+	{ Flash,		PCI_SUBCLASS_MASS_STORAGE_NVM,
+	  pci_interface_nvm,	},
 	{ miscellaneous,	PCI_SUBCLASS_MASS_STORAGE_MISC,	NULL,	},
 	{ NULL,			0,NULL,	},
 };
@@ -169,7 +179,7 @@ static const struct pci_class pci_subcla
 	{ video,		PCI_SUBCLASS_MULTIMEDIA_VIDEO,	NULL,	},
 	{ audio,		PCI_SUBCLASS_MULTIMEDIA_AUDIO,	NULL,	},
 	{ telephony,		PCI_SUBCLASS_MULTIMEDIA_TELEPHONY, NULL,},
-	{ HD audio,		PCI_SUBCLASS_MULTIMEDIA_HDAUDIO, NULL,	},
+	{ mixed mode,		PCI_SUBCLASS_MULTIMEDIA_HDAUDIO, NULL, },
 	{ miscellaneous,	PCI_SUBCLASS_MULTIMEDIA_MISC,	NULL,	},
 	{ NULL,			0,NULL,	},
 };
@@ -197,13 +207,20 @@ static const struct pci_class pci_interf
 	{ NULL,			0,NULL,	},
 };
 
-/* Semi-transparent PCI-toPCI bridge programming interface */
+/* Semi-transparent PCI-to-PCI bridge programming interface */
 static const struct pci_class pci_interface_stpci[] = {
 	{ primary side facing host,	PCI_INTERFACE_STPCI_PRIMARY, NULL, },
 	{ secondary side facing host,	PCI_INTERFACE_STPCI_SECONDARY, NULL, },
 	{ NULL,			0,NULL,	},
 };
 
+/* Advanced Switching programming interface */
+static const struct pci_class pci_interface_advsw[] = {
+	{ custom interface,	PCI_INTERFACE_ADVSW_CUSTOM, NULL, },
+	{ ASI-SIG,		PCI_INTERFACE_ADVSW_ASISIG, NULL, },
+	{ NULL,			0,NULL,	},
+};
+
 /* Subclasses */
 static const struct pci_class pci_subclass_bridge[] = {
 	{ host,		PCI_SUBCLASS_BRIDGE_HOST,	NULL,	},
@@ -219,6 +236,8 @@ static const struct pci_class pci_subcla
 	{ Semi-transparent PCI, PCI_SUBCLASS_BRIDGE_STPCI,
 	  pci_interface_stpci,	},
 	{ InfiniBand,		PCI_SUBCLASS_BRIDGE_INFINIBAND,	NULL,	},
+	{ advanced switching,	PCI_SUBCLASS_BRIDGE_ADVSW,
+	  pci_interface_advsw,	},
 	{ miscellaneous,	PCI_SUBCLASS_BRIDGE_MISC,	NULL,	},
 	{ NULL,			0,NULL,	},
 };
@@ -245,8 +264,8 @@ static const struct pci_class pci_interf
 	{ ,			PCI_INTERFACE_PARALLEL,			NULL,},
 	{ bi-directional,	PCI_INTERFACE_PARALLEL_BIDIRECTIONAL,	NULL,},
 	{ ECP 1.X-compat,	PCI_INTERFACE_PARALLEL_ECP1X,		NULL,},
-	{ IEEE1284,		PCI_INTERFACE_PARALLEL_IEEE1284,	NULL,},
-	{ IEE1284 target,	PCI_INTERFACE_PARALLEL_IEEE1284_TGT,	NULL,},
+	{ IEEE1284 controller, PCI_INTERFACE_PARALLEL_IEEE1284_CNTRL,	NULL,},
+	{ IEEE1284 target,	PCI_INTERFACE_PARALLEL_IEEE1284_TGT,	NULL,},
 	{ NULL,			0,	NULL,},
 };
 
@@ -303,6 +322,7 @@ static const struct pci_class pci_interf
 	{ genric 8254,	PCI_INTERFACE_TIMER_8254,	NULL,	},
 	{ ISA,		PCI_INTERFACE_TIMER_ISA,	NULL,	},
 	{ EISA,		PCI_INTERFACE_TIMER_EISA,	NULL,	},
+	{ HPET,		PCI_INTERFACE_TIMER_HPET,	NULL,	},
 	{ NULL,			0,NULL,	},
 };
 
@@ -373,6 +393,7 @@ static const struct pci_class pci_subcla
 	{ PowerPC,		PCI_SUBCLASS_PROCESSOR_POWERPC, NULL,	},
 	{ MIPS,		PCI_SUBCLASS_PROCESSOR_MIPS,	NULL,	},
 	{ Co-processor,	PCI_SUBCLASS_PROCESSOR_COPROC,	NULL,	},
+	{ miscellaneous,	PCI_SUBCLASS_PROCESSOR_MISC,	NULL,	},
 	{ NULL,		

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Oct  6 07:31:24 UTC 2014

Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h

Log Message:
 Delete 82580ER related code. It was from FreeBSD and was removed in r203049.


To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/if_wmvar.h

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.299 src/sys/dev/pci/if_wm.c:1.300
--- src/sys/dev/pci/if_wm.c:1.299	Mon Oct  6 07:09:30 2014
+++ src/sys/dev/pci/if_wm.c	Mon Oct  6 07:31:24 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.299 2014/10/06 07:09:30 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.300 2014/10/06 07:31:24 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.299 2014/10/06 07:09:30 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.300 2014/10/06 07:31:24 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -1117,15 +1117,11 @@ static const struct wm_product {
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82580_COPPER_DUAL,
 	  82580 dual-1000BaseT Ethernet,
 	  WM_T_82580,		WMP_F_COPPER },
-	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82580_ER,
-	  82580 1000BaseT Ethernet,
-	  WM_T_82580ER,		WMP_F_COPPER },
-	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82580_ER_DUAL,
-	  82580 dual-1000BaseT Ethernet,
-	  WM_T_82580ER,		WMP_F_COPPER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_82580_QUAD_FIBER,
 	  82580 quad-1000BaseX Ethernet,
 	  WM_T_82580,		WMP_F_FIBER },
+
 	{ PCI_VENDOR_INTEL,	PCI_PRODUCT_INTEL_I350_COPPER,
 	  I350 Gigabit Network Connection,
 	  WM_T_I350,		WMP_F_COPPER },
@@ -1369,7 +1365,7 @@ wm_attach(device_t parent, device_t self
 	}
 
 	if ((sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
-	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+	|| (sc-sc_type == WM_T_82580)
 	|| (sc-sc_type == WM_T_I350) || (sc-sc_type == WM_T_I354)
 	|| (sc-sc_type == WM_T_I210) || (sc-sc_type == WM_T_I211))
 		sc-sc_flags |= WM_F_NEWQUEUE;
@@ -1488,7 +1484,7 @@ wm_attach(device_t parent, device_t self
 	if ((sc-sc_type == WM_T_82546) || (sc-sc_type == WM_T_82546_3)
 	|| (sc-sc_type ==  WM_T_82571) || (sc-sc_type == WM_T_80003)
 	|| (sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
-	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+	|| (sc-sc_type == WM_T_82580)
 	|| (sc-sc_type == WM_T_I350) || (sc-sc_type == WM_T_I354))
 		sc-sc_funcid = (CSR_READ(sc, WMREG_STATUS)
 		 STATUS_FUNCID_SHIFT)  STATUS_FUNCID_MASK;
@@ -1766,7 +1762,6 @@ wm_attach(device_t parent, device_t self
 	case WM_T_82575:
 	case WM_T_82576:
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_I350:
 	case WM_T_I354:
 	case WM_T_80003:
@@ -1975,7 +1970,6 @@ wm_attach(device_t parent, device_t self
 	case WM_T_82575:
 	case WM_T_82576:
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_I350:
 	case WM_T_I354: /* XXX ok? */
 	case WM_T_ICH8:
@@ -2104,7 +2098,6 @@ wm_attach(device_t parent, device_t self
 		case WM_T_82575:
 		case WM_T_82576:
 		case WM_T_82580:
-		case WM_T_82580ER:
 		case WM_T_I350:
 		case WM_T_I354:
 		case WM_T_I210:
@@ -2218,7 +2211,6 @@ wm_attach(device_t parent, device_t self
 	case WM_T_82575:
 	case WM_T_82576:
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_I350:
 	case WM_T_I354: /*  ok? */
 	case WM_T_I210:
@@ -2782,7 +2774,6 @@ wm_read_mac_addr(struct wm_softc *sc, ui
 
 	switch (sc-sc_type) {
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_I350:
 	case WM_T_I354:
 		switch (sc-sc_funcid) {
@@ -3103,7 +3094,6 @@ wm_get_auto_rd_done(struct wm_softc *sc)
 	case WM_T_82575:
 	case WM_T_82576:
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_I350:
 	case WM_T_I354:
 	case WM_T_I210:
@@ -3195,7 +3185,6 @@ wm_get_cfg_done(struct wm_softc *sc)
 	case WM_T_82575:
 	case WM_T_82576:
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_I350:
 	case WM_T_I354:
 	case WM_T_I210:
@@ -3275,7 +3264,6 @@ wm_reset(struct wm_softc *sc)
 		sc-sc_pba = PBA_32K;
 		break;
 	case WM_T_82580:
-	case WM_T_82580ER:
 		sc-sc_pba = PBA_35K;
 		break;
 	case WM_T_I210:
@@ -3329,7 +3317,7 @@ wm_reset(struct wm_softc *sc)
 
 	/* Set the completion timeout for interface */
 	if ((sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
-	|| (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+	|| (sc-sc_type == WM_T_82580)
 	|| (sc-sc_type == WM_T_I350) || (sc-sc_type == WM_T_I354)
 	|| (sc-sc_type == WM_T_I210) || (sc-sc_type == WM_T_I211))
 		wm_set_pcie_completion_timeout(sc);
@@ -3444,7 +3432,6 @@ wm_reset(struct wm_softc *sc)
 	case WM_T_82575:
 	case WM_T_82576:
 	case WM_T_82580:
-	case WM_T_82580ER:
 	case WM_T_82583:
 	case WM_T_I350:
 	case WM_T_I354:
@@ 

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Oct  6 07:52:50 UTC 2014

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

Log Message:
Fix debug message.


To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/sys/dev/pci/if_wm.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_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.300 src/sys/dev/pci/if_wm.c:1.301
--- src/sys/dev/pci/if_wm.c:1.300	Mon Oct  6 07:31:24 2014
+++ src/sys/dev/pci/if_wm.c	Mon Oct  6 07:52:50 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.300 2014/10/06 07:31:24 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.301 2014/10/06 07:52:50 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.300 2014/10/06 07:31:24 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.301 2014/10/06 07:52:50 msaitoh Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -8492,9 +8492,9 @@ wm_nvm_validate_checksum(struct wm_softc
 		printf(%s: NVM dump:\n, device_xname(sc-sc_dev));
 		for (i = 0; i  NVM_SIZE; i++) {
 			if (wm_nvm_read(sc, i, 1, eeprom_data))
-printf(XX );
+printf( );
 			else
-printf(%04x , eeprom_data);
+printf(%04hx , eeprom_data);
 			if (i % 8 == 7)
 printf(\n);
 		}

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Mon Oct  6 08:00:58 UTC 2014

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

Log Message:
s/genric/generic/


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/pci/pci_subr.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/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.128 src/sys/dev/pci/pci_subr.c:1.129
--- src/sys/dev/pci/pci_subr.c:1.128	Mon Oct  6 07:15:56 2014
+++ src/sys/dev/pci/pci_subr.c	Mon Oct  6 08:00:57 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.128 2014/10/06 07:15:56 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.129 2014/10/06 08:00:57 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.128 2014/10/06 07:15:56 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.129 2014/10/06 08:00:57 msaitoh Exp $);
 
 #ifdef _KERNEL_OPT
 #include opt_pci.h
@@ -249,7 +249,7 @@ static const struct pci_class pci_subcla
 
 /* Serial controller programming interface */
 static const struct pci_class pci_interface_serial[] = {
-	{ genric XT-compat,	PCI_INTERFACE_SERIAL_XT,	NULL,	},
+	{ generic XT-compat,	PCI_INTERFACE_SERIAL_XT,	NULL,	},
 	{ 16450-compat,	PCI_INTERFACE_SERIAL_16450,	NULL,	},
 	{ 16550-compat,	PCI_INTERFACE_SERIAL_16550,	NULL,	},
 	{ 16650-compat,	PCI_INTERFACE_SERIAL_16650,	NULL,	},
@@ -301,7 +301,7 @@ static const struct pci_class pci_subcla
 
 /* PIC programming interface */
 static const struct pci_class pci_interface_pic[] = {
-	{ genric 8259,	PCI_INTERFACE_PIC_8259,		NULL,	},
+	{ generic 8259,	PCI_INTERFACE_PIC_8259,		NULL,	},
 	{ ISA PIC,		PCI_INTERFACE_PIC_ISA,		NULL,	},
 	{ EISA PIC,		PCI_INTERFACE_PIC_EISA,		NULL,	},
 	{ IO APIC,		PCI_INTERFACE_PIC_IOAPIC,	NULL,	},
@@ -311,7 +311,7 @@ static const struct pci_class pci_interf
 
 /* DMA programming interface */
 static const struct pci_class pci_interface_dma[] = {
-	{ genric 8237,	PCI_INTERFACE_DMA_8237,		NULL,	},
+	{ generic 8237,	PCI_INTERFACE_DMA_8237,		NULL,	},
 	{ ISA,		PCI_INTERFACE_DMA_ISA,		NULL,	},
 	{ EISA,		PCI_INTERFACE_DMA_EISA,		NULL,	},
 	{ NULL,			0,NULL,	},
@@ -319,7 +319,7 @@ static const struct pci_class pci_interf
 
 /* Timer programming interface */
 static const struct pci_class pci_interface_tmr[] = {
-	{ genric 8254,	PCI_INTERFACE_TIMER_8254,	NULL,	},
+	{ generic 8254,	PCI_INTERFACE_TIMER_8254,	NULL,	},
 	{ ISA,		PCI_INTERFACE_TIMER_ISA,	NULL,	},
 	{ EISA,		PCI_INTERFACE_TIMER_EISA,	NULL,	},
 	{ HPET,		PCI_INTERFACE_TIMER_HPET,	NULL,	},

CVS commit: src/sys/fs/puffs

[Emmanuel Dreyfus]

Module Name:src
Committed By:   manu
Date:   Mon Oct  6 09:05:55 UTC 2014

Modified Files:
src/sys/fs/puffs: puffs_vnops.c

Log Message:
Retore LP64 fix that was removed by mistake


To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/fs/puffs/puffs_vnops.c

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

Modified files:

Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.190 src/sys/fs/puffs/puffs_vnops.c:1.191
--- src/sys/fs/puffs/puffs_vnops.c:1.190	Mon Oct  6 04:41:59 2014
+++ src/sys/fs/puffs/puffs_vnops.c	Mon Oct  6 09:05:55 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vnops.c,v 1.190 2014/10/06 04:41:59 manu Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.191 2014/10/06 09:05:55 manu Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.190 2014/10/06 04:41:59 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.191 2014/10/06 09:05:55 manu Exp $);
 
 #include sys/param.h
 #include sys/buf.h
@@ -1160,7 +1160,8 @@ zerofill_lastpage(struct vnode *vp, voff
 	error = ubc_uiomove(vp-v_uobj, uio, len,
 			UVM_ADV_SEQUENTIAL, UBC_WRITE|UBC_UNMAP_FLAG(vp));
 	if (error)
-		DPRINTF((zero-fill 0x%lx@0x%llx = %d\n, len, off, error));
+		DPRINTF((zero-fill 0x%lx@0x% PRIx64  failed: error = %d\n,
+			 len, off, error));
 
 	return;
 }

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

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Mon Oct  6 10:15:40 UTC 2014

Modified Files:
src/sys/arch/arm/imx: files.imx6 imx6_reg.h
Added Files:
src/sys/arch/arm/imx: imx6_snvs.c imx6_snvsreg.h

Log Message:
add support imx6 Secure Non-Volatile Storage (SNVS) real-time clock


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/files.imx6 \
src/sys/arch/arm/imx/imx6_reg.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/imx/imx6_snvs.c \
src/sys/arch/arm/imx/imx6_snvsreg.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/files.imx6
diff -u src/sys/arch/arm/imx/files.imx6:1.2 src/sys/arch/arm/imx/files.imx6:1.3
--- src/sys/arch/arm/imx/files.imx6:1.2	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/files.imx6	Mon Oct  6 10:15:40 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: files.imx6,v 1.2 2014/09/25 05:05:28 ryo Exp $
+#	$NetBSD: files.imx6,v 1.3 2014/10/06 10:15:40 ryo Exp $
 #
 # Configuration info for the Freescale i.MX6
 #
@@ -88,3 +88,9 @@ file	arch/arm/imx/imx6_usdhc.c		sdhc_axi
 # iMX6 SATA Controllers (AHCI)
 attach	ahcisata at axi with imx6_ahcisata
 file	arch/arm/imx/imx6_ahcisata.c		imx6_ahcisata
+
+# iMX6 Secure Non-Volatile Storage (SNVS)
+device	imxsnvs
+attach	imxsnvs at axi
+file	arch/arm/imx/imx6_snvs.c		imxsnvs
+
Index: src/sys/arch/arm/imx/imx6_reg.h
diff -u src/sys/arch/arm/imx/imx6_reg.h:1.2 src/sys/arch/arm/imx/imx6_reg.h:1.3
--- src/sys/arch/arm/imx/imx6_reg.h:1.2	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imx6_reg.h	Mon Oct  6 10:15:40 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_reg.h,v 1.2 2014/09/25 05:05:28 ryo Exp $	*/
+/*	$NetBSD: imx6_reg.h,v 1.3 2014/10/06 10:15:40 ryo Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -139,7 +139,8 @@
 #define	AIPS1_EPIT2_BASE	0x000d4000
 #define	AIPS1_EPIT1_BASE	0x000d
 #define	AIPS1_EPIT_SIZE		0x0020
-#define	AIPS1_SNVS_HP_BASE	0x000cc000
+#define	AIPS1_SNVS_BASE		0x000cc000
+#define	AIPS1_SNVS_SIZE		0x0c00
 #define	AIPS1_USBPHY2_BASE	0x000ca000
 #define	AIPS1_USBPHY1_BASE	0x000c9000
 #define	AIPS1_ANATOP_DIG_BASE	0x000c8000

Added files:

Index: src/sys/arch/arm/imx/imx6_snvs.c
diff -u /dev/null src/sys/arch/arm/imx/imx6_snvs.c:1.1
--- /dev/null	Mon Oct  6 10:15:40 2014
+++ src/sys/arch/arm/imx/imx6_snvs.c	Mon Oct  6 10:15:40 2014
@@ -0,0 +1,217 @@
+/*	$NetBSD: imx6_snvs.c,v 1.1 2014/10/06 10:15:40 ryo Exp $	*/
+
+/*
+ * Copyright (c) 2014 Ryo Shimizu r...@nerv.org
+ * 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.
+ */
+
+/*
+ * i.MX6 Secure Non-Volatile Storage
+ */
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: imx6_snvs.c,v 1.1 2014/10/06 10:15:40 ryo Exp $);
+
+#include locators.h
+#include sys/bus.h
+#include sys/device.h
+#include sys/param.h
+#include dev/clock_subr.h
+
+#include arm/imx/imx6var.h
+#include arm/imx/imx6_reg.h
+#include arm/imx/imx6_snvsreg.h
+
+struct imxsnvs_softc {
+	device_t sc_dev;
+	bus_space_tag_t sc_iot;
+	bus_space_handle_t sc_ioh;
+	struct todr_chip_handle sc_todr;
+};
+
+#define SNVS_READ(sc, reg)	\
+	bus_space_read_4((sc)-sc_iot, (sc)-sc_ioh, reg)
+
+#define SNVS_WRITE(sc, reg, val)\
+	bus_space_write_4((sc)-sc_iot, (sc)-sc_ioh, reg, val)
+
+static int imxsnvs_match(device_t, struct cfdata *, void *);
+static void imxsnvs_attach(device_t, device_t, void *);
+static int imxsnvs_rtc_enable(struct imxsnvs_softc *);
+static int imxsnvs_rtc_disable(struct imxsnvs_softc *);
+static int imxsnvs_gettime(todr_chip_handle_t, struct timeval *);
+static int imxsnvs_settime(todr_chip_handle_t, struct timeval *);
+
+
+CFATTACH_DECL_NEW(imxsnvs, sizeof(struct 

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

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Mon Oct  6 10:27:13 UTC 2014

Modified Files:
src/sys/arch/arm/imx: imx6_ahcisata.c imx6_board.c imx6_ccm.c
imx6_ccmreg.h

Log Message:
* resolve arm root clock from CCM to attach a9tmr
* don't match/attach imx6_ahcisata on iMX6 Solo/SoloLite/DualLite


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imx6_ahcisata.c \
src/sys/arch/arm/imx/imx6_board.c src/sys/arch/arm/imx/imx6_ccm.c \
src/sys/arch/arm/imx/imx6_ccmreg.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/imx6_ahcisata.c
diff -u src/sys/arch/arm/imx/imx6_ahcisata.c:1.1 src/sys/arch/arm/imx/imx6_ahcisata.c:1.2
--- src/sys/arch/arm/imx/imx6_ahcisata.c:1.1	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imx6_ahcisata.c	Mon Oct  6 10:27:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_ahcisata.c,v 1.1 2014/09/25 05:05:28 ryo Exp $	*/
+/*	$NetBSD: imx6_ahcisata.c,v 1.2 2014/10/06 10:27:13 ryo Exp $	*/
 
 /*
  * Copyright (c) 2014 Ryo Shimizu r...@nerv.org
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: imx6_ahcisata.c,v 1.1 2014/09/25 05:05:28 ryo Exp $);
+__KERNEL_RCSID(0, $NetBSD: imx6_ahcisata.c,v 1.2 2014/10/06 10:27:13 ryo Exp $);
 
 #include locators.h
 #include opt_imx.h
@@ -73,10 +73,20 @@ imx6_ahcisata_match(device_t parent, cfd
 {
 	struct axi_attach_args * const aa = aux;
 
-	if (aa-aa_addr == IMX6_SATA_BASE)
-		return 1;
+	if (aa-aa_addr != IMX6_SATA_BASE)
+		return 0;
 
-	return 0;
+	/* i.MX6 Solo/SoloLite/DualLite has no SATA interface */
+	switch (IMX6_CHIPID_MAJOR(imx6_chip_id())) {
+	case CHIPID_MAJOR_IMX6SL:
+	case CHIPID_MAJOR_IMX6DL:
+	case CHIPID_MAJOR_IMX6SOLO:
+		return 0;
+	default:
+		break;
+	}
+
+	return 1;
 }
 
 static void
Index: src/sys/arch/arm/imx/imx6_board.c
diff -u src/sys/arch/arm/imx/imx6_board.c:1.1 src/sys/arch/arm/imx/imx6_board.c:1.2
--- src/sys/arch/arm/imx/imx6_board.c:1.1	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imx6_board.c	Mon Oct  6 10:27:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_board.c,v 1.1 2014/09/25 05:05:28 ryo Exp $	*/
+/*	$NetBSD: imx6_board.c,v 1.2 2014/10/06 10:27:13 ryo Exp $	*/
 
 /*
  * Copyright (c) 2012  Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: imx6_board.c,v 1.1 2014/09/25 05:05:28 ryo Exp $);
+__KERNEL_RCSID(1, $NetBSD: imx6_board.c,v 1.2 2014/10/06 10:27:13 ryo Exp $);
 
 #include opt_imx.h
 #include arml2cc.h
@@ -45,8 +45,20 @@ __KERNEL_RCSID(1, $NetBSD: imx6_board.c
 #include arm/imx/imx6var.h
 #include arm/imx/imx6_reg.h
 #include arm/imx/imx6_mmdcreg.h
+#include arm/imx/imx6_ccmreg.h
+#include arm/imx/imxclockvar.h
 #include arm/imx/imxwdogreg.h
 
+/*
+ * PERIPHCLK_N is an arm root clock divider for MPcore interupt controller.
+ * PERIPHCLK_N is equal to, or greater than two.
+ * see Cortex-A9 MPCore Technical Reference Manual -
+ * Chapter 5: Clocks, Resets, and Power Management, 5.1: Clocks.
+ */
+#ifndef PERIPHCLK_N
+#define PERIPHCLK_N	2
+#endif
+
 bus_space_tag_t imx6_ioreg_bst = imx_bs_tag;
 bus_space_handle_t imx6_ioreg_bsh;
 bus_space_tag_t imx6_armcore_bst = imx_bs_tag;
@@ -77,6 +89,24 @@ imx6_bootstrap(vaddr_t iobase)
 #endif
 }
 
+/* iMX6 SoC type */
+uint32_t
+imx6_chip_id(void)
+{
+	uint32_t v;
+
+	/* read DIGPROG_SOLOLITE (IMX6SL only) */
+	v = bus_space_read_4(imx6_ioreg_bst, imx6_ioreg_bsh,
+	AIPS1_CCM_BASE + USB_ANALOG_DIGPROG_SOLOLITE);
+	if (__SHIFTOUT(v, USB_ANALOG_DIGPROG_MAJOR) == CHIPID_MAJOR_IMX6SL)
+		return v;
+
+	/* not SOLOLITE, read DIGPROG */
+	v = bus_space_read_4(imx6_ioreg_bst, imx6_ioreg_bsh,
+	AIPS1_CCM_BASE + USB_ANALOG_DIGPROG);
+	return v;
+}
+
 /*
  * probe DDR size from DDR Controller register
  */
@@ -150,6 +180,21 @@ imx6_reset(void)
 		__asm(wfi);
 }
 
+uint32_t
+imx6_armrootclk(void)
+{
+	uint32_t clk;
+	uint32_t v;
+
+	v = bus_space_read_4(imx6_ioreg_bst, imx6_ioreg_bsh,
+	AIPS1_CCM_BASE + CCM_ANALOG_PLL_ARM);
+	clk = IMX6_OSC_FREQ * (v  CCM_ANALOG_PLL_ARM_DIV_SELECT) / 2;
+	v = bus_space_read_4(imx6_ioreg_bst, imx6_ioreg_bsh,
+	AIPS1_CCM_BASE + CCM_CACRR);
+	v = __SHIFTOUT(v, CCM_CACRR_ARM_PODF);
+	return clk / (v + 1);
+}
+
 void
 imx6_device_register(device_t self, void *aux)
 {
@@ -174,7 +219,7 @@ imx6_device_register(device_t self, void
 	 */
 	if (device_is_a(self, a9tmr) || device_is_a(self, a9wdt)) {
 		prop_dictionary_set_uint32(dict, frequency,
-		   79200 / 2);	/* XXX? */
+		   imx6_armrootclk() / PERIPHCLK_N);
 		return;
 	}
 }
Index: src/sys/arch/arm/imx/imx6_ccm.c
diff -u src/sys/arch/arm/imx/imx6_ccm.c:1.1 src/sys/arch/arm/imx/imx6_ccm.c:1.2
--- src/sys/arch/arm/imx/imx6_ccm.c:1.1	Thu Sep 25 05:05:28 2014
+++ src/sys/arch/arm/imx/imx6_ccm.c	Mon Oct  6 10:27:13 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_ccm.c,v 1.1 2014/09/25 05:05:28 ryo Exp $	*/
+/*	$NetBSD: imx6_ccm.c,v 

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

[Ryo Shimizu]

Module Name:src
Committed By:   ryo
Date:   Mon Oct  6 10:37:20 UTC 2014

Modified Files:
src/sys/arch/evbarm/conf: NITROGEN6X
Added Files:
src/sys/arch/evbarm/conf: CUBOX-I

Log Message:
* add imxsnvs (rtc)
* add CUBOX-I config


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/NITROGEN6X

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/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.2 src/sys/arch/evbarm/conf/NITROGEN6X:1.3
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.2	Sat Sep 27 04:03:24 2014
+++ src/sys/arch/evbarm/conf/NITROGEN6X	Mon Oct  6 10:37:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.2 2014/09/27 04:03:24 matt Exp $
+# $NetBSD: NITROGEN6X,v 1.3 2014/10/06 10:37:20 ryo Exp $
 #
 # Nitrogen6X
 # - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -55,7 +55,7 @@ options 	IRQSTATS	# manage IRQ statistic
 
 #makeoptions	COPTS=-O2
 options 	DDB			# in-kernel debugger
-options 	DDB_KEYCODE=0x1d	# ^]
+#options 	DDB_KEYCODE=0x1d	# ^]
 #options 	DDB_COMMANDONENTER=bt	# execute command when ddb is entered
 options 	DDB_ONPANIC=1		# see also sysctl(7): `ddb.onpanic'
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
@@ -185,7 +185,7 @@ options 	MIIVERBOSE	# verbose PHY autoco
 options 	USBVERBOSE	# verbose USB device autoconfig messages
 
 # Kernel root file system and dump configuration.
-config		netbsd		root on wd0a type ?
+config		netbsd	root on ? type ?
 
 #
 # Device configuration
@@ -225,6 +225,9 @@ imxccm0		at axi? addr 0x020c4000
 # On-Chip OTP Controller
 imxocotp0	at axi? addr 0x021bc000
 
+# Secure Non-Volatile Storage
+imxsnvs0	at axi? addr 0x020cc000
+
 # IOMUX
 imxiomux0	at axi? addr 0x020e
 

Added files:

Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u /dev/null src/sys/arch/evbarm/conf/CUBOX-I:1.1
--- /dev/null	Mon Oct  6 10:37:20 2014
+++ src/sys/arch/evbarm/conf/CUBOX-I	Mon Oct  6 10:37:20 2014
@@ -0,0 +1,437 @@
+# $NetBSD: CUBOX-I,v 1.1 2014/10/06 10:37:20 ryo Exp $
+#
+# CuBox-i
+# - http://www.solid-run.com/products/cubox-i-mini-computer/
+#
+
+include	arch/evbarm/conf/std.nitrogen6
+
+#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+
+# estimated number of users
+
+maxusers	32
+
+# CPU options
+options 	CPU_CORTEX
+options 	CPU_CORTEXA9
+options 	IMX6
+options 	MULTIPROCESSOR
+options 	PMAPCOUNTERS
+
+# Standard system options
+
+options 	INSECURE	# disable kernel security levels - X needs this
+
+options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options 	NTP		# NTP phase/frequency locked loop
+options 	KTRACE		# system call tracing via ktrace(1)
+
+# Note: SysV IPC parameters can be changed dynamically; see sysctl(8).
+options 	SYSVMSG		# System V-like message queues
+options 	SYSVSEM		# System V-like semaphores
+options 	SYSVSHM		# System V-like memory sharing
+
+#options 	USERCONF	# userconf(4) support
+#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
+options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
+
+# Alternate buffer queue strategies for better responsiveness under high
+# disk I/O load.
+#options 	BUFQ_READPRIO
+options 	BUFQ_PRIOCSCAN
+
+# Diagnostic/debugging support options
+options 	VERBOSE_INIT_ARM # verbose bootstraping messages
+#options 	PERFCTRS	# performance counters
+options 	DIAGNOSTIC	# internally consistency checks
+
+#options 	DEBUG
+#options 	PMAP_DEBUG	# Enable pmap_debug_level code
+options 	LOCKDEBUG	# expensive locking checks/support
+options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
+options 	IRQSTATS	# manage IRQ statistics
+#options 	NO_POWERSAVE	# uncomment this to run under ICE
+
+#makeoptions	COPTS=-O2
+options 	DDB			# in-kernel debugger
+#options 	DDB_KEYCODE=0x1d	# ^]
+#options 	DDB_COMMANDONENTER=bt	# execute command when ddb is entered
+options 	DDB_ONPANIC=1		# see also sysctl(7): `ddb.onpanic'
+options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
+options 	DDB_VERBOSE_HELP
+#options 	IPKDB			# remote kernel debugging
+#options	KGDB
+#options 	KGDB_DEVNAME=\imxuart\
+#options 	KGDB_DEVADDR=0x0202
+#options 	KGDB_DEVRATE=115200
+makeoptions	DEBUG=-g		# compile full symbol table
+makeoptions	COPY_SYMTAB=1
+#options 	SYSCALL_STATS			# per syscall counts
+#options 	SYSCALL_TIMES			# per syscall times
+#options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
+
+
+# Compatibility options
+options 	COMPAT_NETBSD32 # allow running arm (e.g. non-earm) binaries
+#options 	COMPAT_43	# 4.3BSD compatibility.
+#options 	COMPAT_09	# NetBSD 0.9,
+#options 	COMPAT_10	# NetBSD 1.0,
+#options 	COMPAT_11	# NetBSD 1.1,
+#options 	COMPAT_12	# NetBSD 1.2,
+#options 	COMPAT_13	# NetBSD 1.3,
+#options 	COMPAT_14	# NetBSD 1.4,
+#options 	COMPAT_15	# NetBSD 1.5,
+#options 	COMPAT_16	# 

CVS commit: [netbsd-7] src

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Oct  6 13:09:41 UTC 2014

Modified Files:
src/distrib/sets/lists/xbase [netbsd-7]: shl.mi
src/distrib/sets/lists/xdebug [netbsd-7]: shl.mi
src/external/mit/xorg/lib/libxcb [netbsd-7]: xcb.mk
src/external/mit/xorg/lib/libxcb/libxcb [netbsd-7]: Makefile
src/external/mit/xorg/lib/libxcb/randr [netbsd-7]: Makefile
src/external/mit/xorg/lib/libxcb/sync [netbsd-7]: Makefile

Log Message:
Pull up following revision(s) (requested by skrll in ticket #131):
distrib/sets/lists/xdebug/shl.mi: revision 1.15
external/mit/xorg/lib/libxcb/libxcb/Makefile: revision 1.6
external/mit/xorg/lib/libxcb/sync/Makefile: revision 1.3
distrib/sets/lists/xbase/shl.mi: revision 1.56
external/mit/xorg/lib/libxcb/randr/Makefile: revision 1.2
external/mit/xorg/lib/libxcb/xcb.mk: revision 1.3
Fix SHLIB_MAJOR to match xorg and fix linking against libxcb-sync which
broke kwin for me.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.55.4.1 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.14 -r1.14.4.1 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.2 -r1.2.6.1 src/external/mit/xorg/lib/libxcb/xcb.mk
cvs rdiff -u -r1.5 -r1.5.22.1 \
src/external/mit/xorg/lib/libxcb/libxcb/Makefile
cvs rdiff -u -r1.1 -r1.1.24.1 src/external/mit/xorg/lib/libxcb/randr/Makefile
cvs rdiff -u -r1.2 -r1.2.4.1 src/external/mit/xorg/lib/libxcb/sync/Makefile

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/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.55 src/distrib/sets/lists/xbase/shl.mi:1.55.4.1
--- src/distrib/sets/lists/xbase/shl.mi:1.55	Thu Mar 20 09:05:28 2014
+++ src/distrib/sets/lists/xbase/shl.mi	Mon Oct  6 13:09:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.55 2014/03/20 09:05:28 mrg Exp $
+# $NetBSD: shl.mi,v 1.55.4.1 2014/10/06 13:09:41 martin Exp $
 #
 # Note: don't delete entries from here - mark them as obsolete instead.
 #
@@ -376,8 +376,8 @@
 ./usr/X11R7/lib/libxcb-property.so.1		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-property.so.1.0		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-randr.so			-unknown-		xorg
-./usr/X11R7/lib/libxcb-randr.so.0		-unknown-		xorg
-./usr/X11R7/lib/libxcb-randr.so.0.1		-unknown-		xorg
+./usr/X11R7/lib/libxcb-randr.so.1		-unknown-		xorg
+./usr/X11R7/lib/libxcb-randr.so.1.0		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-record.so		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-record.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-record.so.0.1		-unknown-		xorg
@@ -403,8 +403,8 @@
 ./usr/X11R7/lib/libxcb-shm.so.0			-unknown-		xorg
 ./usr/X11R7/lib/libxcb-shm.so.0.1		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-sync.so			-unknown-		xorg
-./usr/X11R7/lib/libxcb-sync.so.0		-unknown-		xorg
-./usr/X11R7/lib/libxcb-sync.so.0.1		-unknown-		xorg
+./usr/X11R7/lib/libxcb-sync.so.1		-unknown-		xorg
+./usr/X11R7/lib/libxcb-sync.so.1.0		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-xevie.so			-unknown-		xorg
 ./usr/X11R7/lib/libxcb-xevie.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-xevie.so.0.1		-unknown-		xorg
@@ -430,8 +430,8 @@
 ./usr/X11R7/lib/libxcb-xvmc.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libxcb-xvmc.so.0.1		-unknown-		xorg
 ./usr/X11R7/lib/libxcb.so			-unknown-		xorg
-./usr/X11R7/lib/libxcb.so.1			-unknown-		xorg
-./usr/X11R7/lib/libxcb.so.1.1			-unknown-		xorg
+./usr/X11R7/lib/libxcb.so.2			-unknown-		xorg
+./usr/X11R7/lib/libxcb.so.2.0			-unknown-		xorg
 ./usr/X11R7/lib/libxkbfile.so			-unknown-		xorg
 ./usr/X11R7/lib/libxkbfile.so.2			-unknown-		xorg
 ./usr/X11R7/lib/libxkbfile.so.2.0		-unknown-		xorg

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.14 src/distrib/sets/lists/xdebug/shl.mi:1.14.4.1
--- src/distrib/sets/lists/xdebug/shl.mi:1.14	Thu Mar 20 15:20:44 2014
+++ src/distrib/sets/lists/xdebug/shl.mi	Mon Oct  6 13:09:41 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.14 2014/03/20 15:20:44 riastradh Exp $
+# $NetBSD: shl.mi,v 1.14.4.1 2014/10/06 13:09:41 martin 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
@@ -122,7 +122,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-keysyms.so.1.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-present.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-property.so.1.0.debug	-unknown-		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.0.1.debug	-unknown-		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/libxcb-randr.so.1.0.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-record.so.0.1.debug	-unknown-		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libxcb-render-util.so.0.0.debug	-unknown-	xorg,debug
 

CVS commit: [netbsd-7] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Oct  6 13:11:04 UTC 2014

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

Log Message:
Ticket #131


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.46 -r1.1.2.47 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.46 src/doc/CHANGES-7.0:1.1.2.47
--- src/doc/CHANGES-7.0:1.1.2.46	Sun Oct  5 20:15:10 2014
+++ src/doc/CHANGES-7.0	Mon Oct  6 13:11:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.46 2014/10/05 20:15:10 martin Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.47 2014/10/06 13:11:04 martin Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -1072,3 +1072,13 @@ sys/arch/luna68k/dev/omrasopsvar.h		1.3
 	OpenBSD/luna88k.
 	[tsutsui, ticket #130]
 
+distrib/sets/lists/xbase/shl.mi			1.56
+distrib/sets/lists/xdebug/shl.mi		1.15
+external/mit/xorg/lib/libxcb/libxcb/Makefile	1.6
+external/mit/xorg/lib/libxcb/randr/Makefile	1.2
+external/mit/xorg/lib/libxcb/sync/Makefile	1.3
+external/mit/xorg/lib/libxcb/xcb.mk		1.3
+
+	Fix SHLIB_MAJOR to match xorg and fix linking against libxcb-sync.
+	[skrll, ticket #131]
+

CVS commit: src/usr.sbin/crash

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Oct  6 13:14:36 UTC 2014

Modified Files:
src/usr.sbin/crash: crash.c

Log Message:
mention the default for core too.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/crash/crash.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/crash/crash.c
diff -u src/usr.sbin/crash/crash.c:1.7 src/usr.sbin/crash/crash.c:1.8
--- src/usr.sbin/crash/crash.c:1.7	Sun Oct  5 19:08:01 2014
+++ src/usr.sbin/crash/crash.c	Mon Oct  6 09:14:36 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: crash.c,v 1.7 2014/10/05 23:08:01 wiz Exp $	*/
+/*	$NetBSD: crash.c,v 1.8 2014/10/06 13:14:36 christos Exp $	*/
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 #ifndef lint
-__RCSID($NetBSD: crash.c,v 1.7 2014/10/05 23:08:01 wiz Exp $);
+__RCSID($NetBSD: crash.c,v 1.8 2014/10/06 13:14:36 christos Exp $);
 #endif /* not lint */
 
 #include ddb/ddb.h
@@ -307,7 +307,7 @@ usage(void)
 
 	fprintf(stderr,
 	usage: %s [-w] [-M core] [-N kernel]\n\n
-	-M core\tspecify memory file\n
+	-M core\tspecify memory file (default /dev/mem)\n
 	-N kernel\tspecify name list file (default /dev/ksyms)\n,
 	getprogname());
 	exit(EXIT_FAILURE);

CVS commit: src/sys/dev/pci

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Mon Oct  6 13:31:54 UTC 2014

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

Log Message:
use correct macro to handle subsys ids. Functional there is no
change, as both macros select the same bits.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/virtio.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/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.6 src/sys/dev/pci/virtio.c:1.7
--- src/sys/dev/pci/virtio.c:1.6	Tue Jul 22 01:55:54 2014
+++ src/sys/dev/pci/virtio.c	Mon Oct  6 13:31:54 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $	*/
+/*	$NetBSD: virtio.c,v 1.7 2014/10/06 13:31:54 mlelstv Exp $	*/
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.6 2014/07/22 01:55:54 ozaki-r Exp $);
+__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.7 2014/10/06 13:31:54 mlelstv Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -128,8 +128,8 @@ virtio_attach(device_t parent, device_t 
 	/* subsystem ID shows what I am */
 	id = pci_conf_read(pc, tag, PCI_SUBSYS_ID_REG);
 	aprint_normal_dev(self, Virtio %s Device (rev. 0x%02x)\n,
-			  (PCI_PRODUCT(id)  NDEVNAMES?
-			   virtio_device_name[PCI_PRODUCT(id)] : Unknown),
+			  (PCI_SUBSYS_ID(id)  NDEVNAMES?
+			   virtio_device_name[PCI_SUBSYS_ID(id)] : Unknown),
 			  revision);
 
 	sc-sc_dev = self;
@@ -150,7 +150,7 @@ virtio_attach(device_t parent, device_t 
 	virtio_set_status(sc, VIRTIO_CONFIG_DEVICE_STATUS_DRIVER);
 
 	/* XXX: use softc as aux... */
-	sc-sc_childdevid = PCI_PRODUCT(id);
+	sc-sc_childdevid = PCI_SUBSYS_ID(id);
 	sc-sc_child = NULL;
 	config_found(self, sc, NULL);
 	if (sc-sc_child == NULL) {

CVS commit: src/sys/fs/puffs

[Havard Eidnes]

Module Name:src
Committed By:   he
Date:   Mon Oct  6 14:26:44 UTC 2014

Modified Files:
src/sys/fs/puffs: puffs_vnops.c

Log Message:
Make this build again without debugging enabled; DPRINTF() can end up
as empty, and in an if conditional, you then need braces if that's the
only potential body.


To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/fs/puffs/puffs_vnops.c

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

Modified files:

Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.191 src/sys/fs/puffs/puffs_vnops.c:1.192
--- src/sys/fs/puffs/puffs_vnops.c:1.191	Mon Oct  6 09:05:55 2014
+++ src/sys/fs/puffs/puffs_vnops.c	Mon Oct  6 14:26:44 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vnops.c,v 1.191 2014/10/06 09:05:55 manu Exp $	*/
+/*	$NetBSD: puffs_vnops.c,v 1.192 2014/10/06 14:26:44 he Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006, 2007  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.191 2014/10/06 09:05:55 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.192 2014/10/06 14:26:44 he Exp $);
 
 #include sys/param.h
 #include sys/buf.h
@@ -1159,9 +1159,10 @@ zerofill_lastpage(struct vnode *vp, voff
 
 	error = ubc_uiomove(vp-v_uobj, uio, len,
 			UVM_ADV_SEQUENTIAL, UBC_WRITE|UBC_UNMAP_FLAG(vp));
-	if (error)
+	if (error) {
 		DPRINTF((zero-fill 0x%lx@0x% PRIx64  failed: error = %d\n,
 			 len, off, error));
+	}
 
 	return;
 }

CVS commit: src/sys/dev/scsipi

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Oct  6 14:42:08 UTC 2014

Modified Files:
src/sys/dev/scsipi: scsipi_base.c

Log Message:
PR/49054: Uwe Toenjes: Some RAID controllers return more bytes in the
scsi 3 inquiry command than expected by the size of the scsi 3 inquiry
packet. This can be detected by looking at the additional_length field
returned by the scsi 2 inquiry. If that's the case, avoid doing the
scsi 3 inquiry because we can't handle the extra bytes later.
XXX: Pullup -7


To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/dev/scsipi/scsipi_base.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/scsipi/scsipi_base.c
diff -u src/sys/dev/scsipi/scsipi_base.c:1.160 src/sys/dev/scsipi/scsipi_base.c:1.161
--- src/sys/dev/scsipi/scsipi_base.c:1.160	Sun Jul 13 13:12:23 2014
+++ src/sys/dev/scsipi/scsipi_base.c	Mon Oct  6 10:42:08 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: scsipi_base.c,v 1.160 2014/07/13 17:12:23 dholland Exp $	*/
+/*	$NetBSD: scsipi_base.c,v 1.161 2014/10/06 14:42:08 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.160 2014/07/13 17:12:23 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.161 2014/10/06 14:42:08 christos Exp $);
 
 #include opt_scsi.h
 
@@ -1064,7 +1064,7 @@ scsipi_inquire(struct scsipi_periph *per
 
 	/*
 	 * If we request more data than the device can provide, it SHOULD just
-	 * return a short reponse.  However, some devices error with an
+	 * return a short response.  However, some devices error with an
 	 * ILLEGAL REQUEST sense code, and yet others have even more special
 	 * failture modes (such as the GL641USB flash adapter, which goes loony
 	 * and sends corrupted CRCs).  To work around this, and to bring our
@@ -1081,6 +1081,7 @@ scsipi_inquire(struct scsipi_periph *per
 	1, NULL, flags | XS_CTL_DATA_IN);
 	if (!error 
 	inqbuf-additional_length  SCSIPI_INQUIRY_LENGTH_SCSI2 - 4) {
+	if (inqbuf-additional_length = SCSIPI_INQUIRY_LENGTH_SCSI3 - 4) {
 #if 0
 printf(inquire: addlen=%d, retrying\n, inqbuf-additional_length);
 #endif
@@ -1091,6 +1092,11 @@ printf(inquire: addlen=%d, retrying\n,
 #if 0
 printf(inquire: error=%d\n, error);
 #endif
+#if 1
+	} else {
+printf(inquire: addlen=%d, not retrying\n, inqbuf-additional_length);
+#endif
+	}
 	}
 
 #ifdef SCSI_OLD_NOINQUIRY

CVS import: src/external/bsd/dhcpcd/dist

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Oct  6 18:20:20 UTC 2014

Update of /cvsroot/src/external/bsd/dhcpcd/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv21736

Log Message:
Import dhcpcd-6.5.0 with the following changes:

  *  Fix an unaligned access error on BeagleBone Black with FreeBSD.
 Thanks to Guy Yur for the patch.
  *  Remove the fast loop trying to up an interface which does not
 report carrier.
  *  Remove vis based encoding - instead validate against option type and
 stop at invalid [1]
 This removes all shell escaped encoding - dhcpcd will assume that IF
 the --script option is a shell, it will quote variables correctly.
 The stock dhcpcd-run-hooks does.
  *  dhcpcd -V now prints how the variables will be decoded.
  *  Changed some options in dhcpcd-definitions.conf to more sensible defaults.
  *  Don't daemonise on delegated address dad.
  *  Don't drop delegated reject route when forking.
  *  Fix IPv6 handling of link-local addresses on KAME stacks.
  *  Work on OpenBSD-5.6 without any special interface setup needed.
  *  Callout to handlecarrier when we don't have real carrier support and
 rely on looking at IFF_UP and IFF_RUNNING.
 This allows our hooks to know that dhcpcd thinks we have a carrier or not.

[1] DHCP option encodings defined in dhcpcd-definitions.conf
  *  domain (RFC3397)/dname (string) is strict domain name allowance
 (ie, [alnum] with _- (but not at the start or end))
  *  string is now printable ascii (1-127) until invalid
  *  ascii is all ascii (1-127) until invalid
  *  raw is all chars (1-255) until NUL
  *  binhex is a hex representation of the option including embedded NULs
  *  ssid is still escpaed octal because it's expected to be human readable
 AND can technically be all NUL
  *  everything else has strict option - value encoding

Status:

Vendor Tag: roy
Release Tags:   dhcpcd-6-5-0

U src/external/bsd/dhcpcd/dist/common.c
U src/external/bsd/dhcpcd/dist/control.c
C src/external/bsd/dhcpcd/dist/dhcpcd.c
U src/external/bsd/dhcpcd/dist/duid.c
U src/external/bsd/dhcpcd/dist/eloop.c
U src/external/bsd/dhcpcd/dist/if.c
C src/external/bsd/dhcpcd/dist/if-options.c
C src/external/bsd/dhcpcd/dist/script.c
U src/external/bsd/dhcpcd/dist/dhcp-common.c
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c
C src/external/bsd/dhcpcd/dist/if-bsd.c
U src/external/bsd/dhcpcd/dist/arp.c
C src/external/bsd/dhcpcd/dist/dhcp.c
U src/external/bsd/dhcpcd/dist/ipv4.c
U src/external/bsd/dhcpcd/dist/ipv4ll.c
U src/external/bsd/dhcpcd/dist/ipv6.c
C src/external/bsd/dhcpcd/dist/ipv6nd.c
U src/external/bsd/dhcpcd/dist/dhcp6.c
U src/external/bsd/dhcpcd/dist/auth.c
U src/external/bsd/dhcpcd/dist/dhcpcd.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in
C src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in
C src/external/bsd/dhcpcd/dist/dhcpcd.8.in
C src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
U src/external/bsd/dhcpcd/dist/arp.h
U src/external/bsd/dhcpcd/dist/auth.h
U src/external/bsd/dhcpcd/dist/bpf-filter.h
U src/external/bsd/dhcpcd/dist/common.h
U src/external/bsd/dhcpcd/dist/config.h
U src/external/bsd/dhcpcd/dist/control.h
U src/external/bsd/dhcpcd/dist/defs.h
U src/external/bsd/dhcpcd/dist/dev.h
U src/external/bsd/dhcpcd/dist/dhcp-common.h
U src/external/bsd/dhcpcd/dist/dhcp.h
U src/external/bsd/dhcpcd/dist/dhcp6.h
U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
U src/external/bsd/dhcpcd/dist/dhcpcd.h
U src/external/bsd/dhcpcd/dist/duid.h
U src/external/bsd/dhcpcd/dist/eloop.h
U src/external/bsd/dhcpcd/dist/if-options.h
U src/external/bsd/dhcpcd/dist/if.h
U src/external/bsd/dhcpcd/dist/ipv4.h
U src/external/bsd/dhcpcd/dist/ipv4ll.h
U src/external/bsd/dhcpcd/dist/ipv6.h
U src/external/bsd/dhcpcd/dist/ipv6nd.h
U src/external/bsd/dhcpcd/dist/script.h
U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
U src/external/bsd/dhcpcd/dist/crypt/crypt.h
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf
U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind

9 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist

CVS commit: src/external/bsd/dhcpcd/dist

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Oct  6 18:22:30 UTC 2014

Modified Files:
src/external/bsd/dhcpcd/dist: arp.c arp.h auth.c auth.h bpf-filter.h
common.c common.h config.h control.c control.h defs.h dev.h
dhcp-common.c dhcp-common.h dhcp.c dhcp.h dhcp6.c dhcp6.h
dhcpcd-definitions.conf dhcpcd-embedded.c dhcpcd-embedded.h
dhcpcd-run-hooks.8.in dhcpcd-run-hooks.in dhcpcd.8.in dhcpcd.c
dhcpcd.conf dhcpcd.conf.5.in dhcpcd.h duid.c duid.h eloop.c eloop.h
if-bsd.c if-options.c if-options.h if.c if.h ipv4.c ipv4.h ipv4ll.c
ipv4ll.h ipv6.c ipv6.h ipv6nd.c ipv6nd.h script.c script.h
src/external/bsd/dhcpcd/dist/crypt: crypt.h hmac_md5.c
src/external/bsd/dhcpcd/dist/dhcpcd-hooks: 01-test 02-dump 10-mtu
10-wpa_supplicant 15-timezone 20-resolv.conf 29-lookup-hostname
30-hostname 50-ntp.conf 50-ypbind

Log Message:
Sync


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.14 -r1.2 src/external/bsd/dhcpcd/dist/arp.c \
src/external/bsd/dhcpcd/dist/ipv6.c
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/dhcpcd/dist/arp.h \
src/external/bsd/dhcpcd/dist/auth.c \
src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/dhcpcd/dist/auth.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/bpf-filter.h
cvs rdiff -u -r1.1.1.15 -r1.2 src/external/bsd/dhcpcd/dist/common.c
cvs rdiff -u -r1.1.1.11 -r1.2 src/external/bsd/dhcpcd/dist/common.h
cvs rdiff -u -r1.1.1.28 -r1.2 src/external/bsd/dhcpcd/dist/config.h
cvs rdiff -u -r1.1.1.9 -r1.2 src/external/bsd/dhcpcd/dist/control.c \
src/external/bsd/dhcpcd/dist/dhcp6.h
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/dhcpcd/dist/control.h \
src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf \
src/external/bsd/dhcpcd/dist/duid.h src/external/bsd/dhcpcd/dist/if.c \
src/external/bsd/dhcpcd/dist/if.h
cvs rdiff -u -r1.1.1.46 -r1.2 src/external/bsd/dhcpcd/dist/defs.h
cvs rdiff -u -r1.1.1.5 -r1.2 src/external/bsd/dhcpcd/dist/dev.h \
src/external/bsd/dhcpcd/dist/ipv4.h src/external/bsd/dhcpcd/dist/ipv6nd.h
cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/dhcpcd/dist/dhcp-common.c \
src/external/bsd/dhcpcd/dist/eloop.c src/external/bsd/dhcpcd/dist/eloop.h \
src/external/bsd/dhcpcd/dist/ipv4ll.c
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/bsd/dhcpcd/dist/dhcp-common.h \
src/external/bsd/dhcpcd/dist/ipv4.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.1.1.21 -r1.2 src/external/bsd/dhcpcd/dist/dhcp.h
cvs rdiff -u -r1.1.1.17 -r1.2 src/external/bsd/dhcpcd/dist/dhcp6.c
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c \
src/external/bsd/dhcpcd/dist/duid.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in
cvs rdiff -u -r1.1.1.20 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in \
src/external/bsd/dhcpcd/dist/dhcpcd.h
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/dhcpcd/dist/dhcpcd.8.in
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/dhcpcd.c \
src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/dhcpcd.conf \
src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/dhcpcd/dist/if-options.c \
src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.1.1.23 -r1.2 src/external/bsd/dhcpcd/dist/if-options.h
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/dhcpcd/dist/ipv4ll.h \
src/external/bsd/dhcpcd/dist/script.h
cvs rdiff -u -r1.1.1.12 -r1.2 src/external/bsd/dhcpcd/dist/ipv6.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/dhcpcd/dist/script.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/dhcpcd/dist/crypt/crypt.h
cvs rdiff -u -r1.1.1.4 -r1.2 src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c
cvs rdiff -u -r1.1.1.7 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump
cvs rdiff -u -r1.1.1.8 -r1.2 src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind
cvs rdiff -u -r1.1.1.5 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone
cvs rdiff -u -r1.1.1.15 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf
cvs rdiff -u -r1.1.1.10 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname
cvs rdiff -u -r1.1.1.14 -r1.2 \
src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf

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

Modified files:

Index: src/external/bsd/dhcpcd/dist/arp.c
diff -u src/external/bsd/dhcpcd/dist/arp.c:1.1.1.14 src/external/bsd/dhcpcd/dist/arp.c:1.2
--- 

CVS commit: src/doc

[Roy Marples]

Module Name:src
Committed By:   roy
Date:   Mon Oct  6 18:30:24 UTC 2014

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
Note import of dhcpcd-6.5.0


To generate a diff of this commit:
cvs rdiff -u -r1.1154 -r1.1155 src/doc/3RDPARTY
cvs rdiff -u -r1.1988 -r1.1989 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1154 src/doc/3RDPARTY:1.1155
--- src/doc/3RDPARTY:1.1154	Sat Oct  4 11:49:02 2014
+++ src/doc/3RDPARTY	Mon Oct  6 18:30:24 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1154 2014/10/04 11:49:02 apb Exp $
+#	$NetBSD: 3RDPARTY,v 1.1155 2014/10/06 18:30:24 roy Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -305,8 +305,8 @@ Notes:
 Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	6.4.7
-Current Vers:	6.4.7
+Version:	6.5.0
+Current Vers:	6.5.0
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1988 src/doc/CHANGES:1.1989
--- src/doc/CHANGES:1.1988	Sat Oct  4 11:49:57 2014
+++ src/doc/CHANGES	Mon Oct  6 18:30:24 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1988 $
+# LIST OF CHANGES FROM LAST RELEASE:			$Revision: 1.1989 $
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -57,3 +57,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 	gpt(8): added type subcommand to modify partition type.
 		[jnemeth 20140927]
 	zoneinfo: Import tzdata2014h. [apb 20141004]
+	dhcpcd(8): Import dhcpcd-6.5.0. [roy 20141006]