date:20160727

CVS commit: src/sys/dev/pci

2016-07-27 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Thu Jul 28 03:08:39 UTC 2016

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
Add Super Micro Computer Inc


To generate a diff of this commit:
cvs rdiff -u -r1.1254 -r1.1255 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1254 src/sys/dev/pci/pcidevs:1.1255
--- src/sys/dev/pci/pcidevs:1.1254	Thu Jul 28 03:05:31 2016
+++ src/sys/dev/pci/pcidevs	Thu Jul 28 03:08:39 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1254 2016/07/28 03:05:31 nonaka Exp $
+$NetBSD: pcidevs,v 1.1255 2016/07/28 03:08:39 nonaka Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -597,6 +597,7 @@ vendor BLUESTEEL	0x15ab	Bluesteel Networ
 vendor VMWARE		0x15ad	VMware
 vendor MELLANOX		0x15b3	Mellanox Technologies
 vendor AGILENT		0x15bc	Agilent Technologies
+vendor SUPERMICRO	0x15d9	Super Micro Computer Inc
 vendor NDC		0x15e8	National Datacomm
 vendor EUMITCOM		0x1638	Eumitcom
 vendor NETSEC		0x1660	NetSec

CVS commit: src/sys/dev/pci

2016-07-27 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Thu Jul 28 03:05:31 UTC 2016

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
sort by vendor id.


To generate a diff of this commit:
cvs rdiff -u -r1.1253 -r1.1254 src/sys/dev/pci/pcidevs

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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1253 src/sys/dev/pci/pcidevs:1.1254
--- src/sys/dev/pci/pcidevs:1.1253	Wed Jul  6 14:26:31 2016
+++ src/sys/dev/pci/pcidevs	Thu Jul 28 03:05:31 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1253 2016/07/06 14:26:31 christos Exp $
+$NetBSD: pcidevs,v 1.1254 2016/07/28 03:05:31 nonaka Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -529,10 +529,9 @@ vendor ITE		0x1283	Integrated Technology
 vendor ESSTECH2		0x1285	ESS Technology
 vendor TRITECH		0x1292	TriTech Microelectronics
 vendor KOFAX		0x1296	Kofax Image Products
-vendor ALTEON		0x12ae	Alteon
 vendor RISCOM		0x12aa	RISCom
+vendor ALTEON		0x12ae	Alteon
 vendor USR		0x12b9	US Robotics (3Com)
-vendor USR2		0x16ec	US Robotics
 vendor PICTUREEL	0x12c5	Picture Elements
 vendor NVIDIA_SGS	0x12d2	Nvidia & SGS-Thomson Microelectronics
 vendor PERICOM		0x12d8	Pericom Semiconductors
@@ -575,7 +574,6 @@ vendor ASKEY		0x144f	Askey Computer
 vendor AVERMEDIA	0x1461	Avermedia Technologies
 vendor MSI		0x1462 	Micro-star International Co Ltd
 vendor SYSTEMBASE	0x14a1	System Base
-vendor MARVELL2		0x1b4b	Marvell
 vendor AIRONET		0x14b9	Aironet Wireless Communications
 vendor COMPAL		0x14c0	COMPAL Electronics
 vendor MYRICOM		0x14c1	Myricom
@@ -586,6 +584,7 @@ vendor BROADCOM		0x14e4	Broadcom
 vendor PLANEX		0x14ea	Planex Communications
 vendor CONEXANT		0x14f1	Conexant Systems
 vendor DELTA		0x1500	Delta Electronics
+vendor MYSON		0x1516	Myson-Century Technology
 vendor ENE		0x1524	ENE Technology
 vendor TERRATEC		0x153b	TerraTec Electronic
 vendor PERLE		0x155f	Perle Systems
@@ -596,18 +595,18 @@ vendor FARADAY		0x159b	Faraday Technolog
 vendor GEOCAST		0x15a1	Geocast Network Systems
 vendor BLUESTEEL	0x15ab	Bluesteel Networks
 vendor VMWARE		0x15ad	VMware
+vendor MELLANOX		0x15b3	Mellanox Technologies
 vendor AGILENT		0x15bc	Agilent Technologies
+vendor NDC		0x15e8	National Datacomm
 vendor EUMITCOM		0x1638	Eumitcom
 vendor NETSEC		0x1660	NetSec
-vendor SIBYTE		0x166d	Broadcom (SiByte)
-vendor MYSON		0x1516	Myson-Century Technology
-vendor MELLANOX		0x15b3	Mellanox Technologies
-vendor NDC		0x15e8	National Datacomm
 vendor ACTIONTEC	0x1668	Action Tec Electronics
+vendor SIBYTE		0x166d	Broadcom (SiByte)
 vendor ATHEROS		0x168c	Atheros Communications
 vendor GLOBALSUN	0x16ab	Global Sun Tech
 vendor SAFENET		0x16ae	SafeNet
 vendor MICREL		0x16c6	Micrel
+vendor USR2		0x16ec	US Robotics
 vendor NETOCTAVE	0x170b	Netoctave
 vendor LINKSYS		0x1737	Linksys
 vendor ALTIMA		0x173b	Altima
@@ -639,6 +638,7 @@ vendor FUSIONIO		0x1aed	Fusion-io
 vendor QUMRANET		0x1af4	Qumranet
 vendor ASMEDIA		0x1b21  ASMedia
 vendor REDHAT		0x1b36	Red Hat
+vendor MARVELL2		0x1b4b	Marvell
 vendor FRESCO		0x1b73	Fresco Logic
 vendor QINHENG2		0x1c00	Nanjing QinHeng Electronics (PCIe)
 vendor SYMPHONY2	0x1c1c	Symphony Labs (2nd PCI Vendor ID)

CVS commit: [pgoyette-localcount] src/sys/dev

2016-07-27 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 28 01:44:56 UTC 2016

Modified Files:
src/sys/dev [pgoyette-localcount]: vnd.c

Log Message:
Don't try to call device_release() if we succesfully called vnd_destroy()


To generate a diff of this commit:
cvs rdiff -u -r1.256.2.11 -r1.256.2.12 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.256.2.11 src/sys/dev/vnd.c:1.256.2.12
--- src/sys/dev/vnd.c:1.256.2.11	Thu Jul 28 01:07:20 2016
+++ src/sys/dev/vnd.c	Thu Jul 28 01:44:55 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.256.2.11 2016/07/28 01:07:20 pgoyette Exp $	*/
+/*	$NetBSD: vnd.c,v 1.256.2.12 2016/07/28 01:44:55 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.11 2016/07/28 01:07:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.12 2016/07/28 01:44:55 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -500,8 +500,8 @@ vndclose(dev_t dev, int flags, int mode,
 			aprint_error_dev(sc->sc_dev,
 			"unable to detach instance\n");
 			device_release(self);
-			return error;
 		}
+		return error;
 	}
 
 	device_release(self);

CVS commit: [pgoyette-localcount] src/sys/dev

2016-07-27 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Thu Jul 28 01:07:20 UTC 2016

Modified Files:
src/sys/dev [pgoyette-localcount]: vnd.c

Log Message:
Clean up the vnd_spawn() routine so it actually works.  In particular,
it needs to return the new unit's sc _after_ acquiring a reference to
the unit.


To generate a diff of this commit:
cvs rdiff -u -r1.256.2.10 -r1.256.2.11 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.256.2.10 src/sys/dev/vnd.c:1.256.2.11
--- src/sys/dev/vnd.c:1.256.2.10	Wed Jul 27 23:17:31 2016
+++ src/sys/dev/vnd.c	Thu Jul 28 01:07:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.256.2.10 2016/07/27 23:17:31 pgoyette Exp $	*/
+/*	$NetBSD: vnd.c,v 1.256.2.11 2016/07/28 01:07:20 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.10 2016/07/27 23:17:31 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.11 2016/07/28 01:07:20 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -311,12 +311,10 @@ vnd_spawn(int unit)
 	cf->cf_unit = unit;
 	cf->cf_fstate = FSTATE_STAR;
 
+	/* Attach a new unit */
 	self = config_attach_pseudo(cf);
-	return device_private(config_attach_pseudo(cf));
-
-	if (config_attach_pseudo(cf) == NULL)
-		return NULL;
 
+	/* And acquire a reference to it */
 	self = device_lookup_acquire(_cd, unit);
 	if (self == NULL)
 		return NULL;

CVS commit: [pgoyette-localcount] src/sys/dev

2016-07-27 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 23:17:31 UTC 2016

Modified Files:
src/sys/dev [pgoyette-localcount]: vnd.c

Log Message:
Return ENXIO if the device is NOT found, not when the device IS found!


To generate a diff of this commit:
cvs rdiff -u -r1.256.2.9 -r1.256.2.10 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.256.2.9 src/sys/dev/vnd.c:1.256.2.10
--- src/sys/dev/vnd.c:1.256.2.9	Wed Jul 27 11:51:57 2016
+++ src/sys/dev/vnd.c	Wed Jul 27 23:17:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.256.2.9 2016/07/27 11:51:57 pgoyette Exp $	*/
+/*	$NetBSD: vnd.c,v 1.256.2.10 2016/07/27 23:17:31 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.9 2016/07/27 11:51:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.10 2016/07/27 23:17:31 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -1241,7 +1241,7 @@ vndioctl(dev_t dev, u_long cmd, void *da
 	}
 
 	self = device_lookup_acquire(_cd, unit);
-	if (self != NULL)
+	if (self == NULL)
 		return ENXIO;
 	vnd = device_private(self);

CVS commit: src/sys/uvm

2016-07-27 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Jul 27 16:45:00 UTC 2016

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

Log Message:
Use UVM_PROT_ALL only if UVM_KMF_EXEC is given as argument. Otherwise, if
UVM_KMF_PAGEABLE is also given as argument, only the VA is allocated and
UVM waits for the page to fault before kentering it. When kentering it, it
will use the UVM_PROT_ flag that was passed to uvm_map; which means that it
will kenter it as RWX.

With this change, the number of RWX pages in the amd64 kernel reaches
strictly zero.


To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/uvm/uvm_km.c

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

Modified files:

Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.140 src/sys/uvm/uvm_km.c:1.141
--- src/sys/uvm/uvm_km.c:1.140	Wed Jul 20 12:38:43 2016
+++ src/sys/uvm/uvm_km.c	Wed Jul 27 16:45:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_km.c,v 1.140 2016/07/20 12:38:43 maxv Exp $	*/
+/*	$NetBSD: uvm_km.c,v 1.141 2016/07/27 16:45:00 maxv Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.140 2016/07/20 12:38:43 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.141 2016/07/27 16:45:00 maxv Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -593,7 +593,7 @@ uvm_km_alloc(struct vm_map *map, vsize_t
 	struct vm_page *pg;
 	struct uvm_object *obj;
 	int pgaflags;
-	vm_prot_t prot;
+	vm_prot_t prot, vaprot;
 	UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
 
 	KASSERT(vm_map_pmap(map) == pmap_kernel());
@@ -617,8 +617,9 @@ uvm_km_alloc(struct vm_map *map, vsize_t
 	 * allocate some virtual space
 	 */
 
+	vaprot = (flags & UVM_KMF_EXEC) ? UVM_PROT_ALL : UVM_PROT_RW;
 	if (__predict_false(uvm_map(map, , size, obj, UVM_UNKNOWN_OFFSET,
-	align, UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_NONE,
+	align, UVM_MAPFLAG(vaprot, UVM_PROT_ALL, UVM_INH_NONE,
 	UVM_ADV_RANDOM,
 	(flags & (UVM_KMF_TRYLOCK | UVM_KMF_NOWAIT | UVM_KMF_WAITVA
 	 | UVM_KMF_COLORMATCH != 0)) {

CVS commit: src/sys/arch/x86/acpi

2016-07-27 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Jul 27 13:04:29 UTC 2016

Modified Files:
src/sys/arch/x86/acpi: acpi_wakeup.c

Log Message:
Call cpu_init_msrs on i386 when waking up. Currently it does not change
anything, since MSR_EFER is already enabled earlier. But if we add new
MSRs in the future, we will want them when waking up as well.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/acpi/acpi_wakeup.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/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.40 src/sys/arch/x86/acpi/acpi_wakeup.c:1.41
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.40	Sun Jul 24 14:09:22 2016
+++ src/sys/arch/x86/acpi/acpi_wakeup.c	Wed Jul 27 13:04:28 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_wakeup.c,v 1.40 2016/07/24 14:09:22 maxv Exp $	*/
+/*	$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.40 2016/07/24 14:09:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $");
 
 /*-
  * Copyright (c) 2001 Takanori Watanabe 
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.40 2016/07/24 14:09:22 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.41 2016/07/27 13:04:28 maxv Exp $");
 
 #include 
 #include 
@@ -262,10 +262,9 @@ acpi_cpu_sleep(struct cpu_info *ci)
 		return;
 
 	/* Execute Wakeup */
-#ifndef __i386__
 	cpu_init_msrs(ci, false);
-#endif
 	fpuinit(ci);
+
 #if NLAPIC > 0
 	lapic_enable();
 	lapic_set_lvt();

CVS commit: src/sys/arch/x86/x86

2016-07-27 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Jul 27 12:08:46 UTC 2016

Modified Files:
src/sys/arch/x86/x86: pmap.c

Log Message:
Re-enable large pages on the data segment, but don't map the first page,
and add a comment to explain why. We will have to move the LAPIC VA.

The large page support is technically the same as before my last commit,
since in practice, the first page of .data is never mapped with large
pages.


To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/sys/arch/x86/x86/pmap.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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.217 src/sys/arch/x86/x86/pmap.c:1.218
--- src/sys/arch/x86/x86/pmap.c:1.217	Mon Jul 25 12:11:40 2016
+++ src/sys/arch/x86/x86/pmap.c	Wed Jul 27 12:08:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.217 2016/07/25 12:11:40 maxv Exp $	*/
+/*	$NetBSD: pmap.c,v 1.218 2016/07/27 12:08:46 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2010, 2016 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.217 2016/07/25 12:11:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.218 2016/07/27 12:08:46 maxv Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -1573,9 +1573,7 @@ pmap_remap_largepages(void)
 {
 	extern char __rodata_start;
 	extern char __data_start;
-#if 0
 	extern char __kernel_end;
-#endif
 	pd_entry_t *pde;
 	vaddr_t kva, kva_end;
 	paddr_t pa;
@@ -1606,9 +1604,13 @@ pmap_remap_largepages(void)
 		tlbflushg();
 	}
 
-#if 0
 	/* Remap the kernel data+bss using large pages. */
-	kva = roundup((vaddr_t)&__data_start, NBPD_L2);
+	/*
+	 * XXX: we need to make sure the first page (PAGE_SIZE) of .data is not
+	 * mapped with a large page. As bizarre as it might seem, this first
+	 * page is used as the VA for the LAPIC page.
+	 */
+	kva = roundup((vaddr_t)&__data_start+PAGE_SIZE, NBPD_L2);
 	kva_end = rounddown((vaddr_t)&__kernel_end, NBPD_L1);
 	pa = kva - KERNBASE;
 	for (/* */; kva + NBPD_L2 <= kva_end; kva += NBPD_L2, pa += NBPD_L2) {
@@ -1616,7 +1618,6 @@ pmap_remap_largepages(void)
 		*pde = pa | pmap_pg_g | PG_PS | pmap_pg_nx | PG_KW | PG_V;
 		tlbflushg();
 	}
-#endif
 }
 #endif /* !XEN */

CVS commit: [pgoyette-localcount] src/sys/dev

2016-07-27 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 11:51:57 UTC 2016

Modified Files:
src/sys/dev [pgoyette-localcount]: vnd.c

Log Message:
When detaching, call device_release() to allow the detach to complete.


To generate a diff of this commit:
cvs rdiff -u -r1.256.2.8 -r1.256.2.9 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.256.2.8 src/sys/dev/vnd.c:1.256.2.9
--- src/sys/dev/vnd.c:1.256.2.8	Wed Jul 27 11:23:32 2016
+++ src/sys/dev/vnd.c	Wed Jul 27 11:51:57 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.256.2.8 2016/07/27 11:23:32 pgoyette Exp $	*/
+/*	$NetBSD: vnd.c,v 1.256.2.9 2016/07/27 11:51:57 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.8 2016/07/27 11:23:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.9 2016/07/27 11:51:57 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -275,6 +275,10 @@ vnd_attach(device_t parent, device_t sel
 		aprint_error_dev(self, "couldn't establish power handler\n");
 }
 
+/*
+ * The caller must hold a reference to the device's localcount.  the
+ * reference is released if the device is available for detach.
+ */
 static int
 vnd_detach(device_t self, int flags)
 {
@@ -291,6 +295,7 @@ vnd_detach(device_t self, int flags)
 	bufq_free(sc->sc_tab);
 	disk_destroy(>sc_dkdev);
 
+	device_release(self);
 	return 0;
 }

CVS commit: [pgoyette-localcount] src/sys/dev

2016-07-27 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Wed Jul 27 11:23:32 UTC 2016

Modified Files:
src/sys/dev [pgoyette-localcount]: vnd.c

Log Message:
When we spawn a new unit, make sure we get a pointer to its device_t so
we have something to give device_release() when we're finished!

Also, add a call to device_release() in an error path.


To generate a diff of this commit:
cvs rdiff -u -r1.256.2.7 -r1.256.2.8 src/sys/dev/vnd.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/vnd.c
diff -u src/sys/dev/vnd.c:1.256.2.7 src/sys/dev/vnd.c:1.256.2.8
--- src/sys/dev/vnd.c:1.256.2.7	Tue Jul 26 05:54:39 2016
+++ src/sys/dev/vnd.c	Wed Jul 27 11:23:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.256.2.7 2016/07/26 05:54:39 pgoyette Exp $	*/
+/*	$NetBSD: vnd.c,v 1.256.2.8 2016/07/27 11:23:32 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
@@ -91,7 +91,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.7 2016/07/26 05:54:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.256.2.8 2016/07/27 11:23:32 pgoyette Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_vnd.h"
@@ -359,12 +359,21 @@ vndopen(dev_t dev, int flags, int mode, 
 		if (sc == NULL)
 			return ENOMEM;
 
+		/*
+		 * get a pointer to the new device_t;  we don't need
+		 * need to _acquire() it, since vnd_spawn() will
+		 * already have taken a reference.
+		 */
+		self = device_lookup(_cd, unit);
+
 		/* compatibility, keep disklabel after close */
 		sc->sc_flags = VNF_KLABEL;
 	}
 
-	if ((error = vndlock(sc)) != 0)
+	if ((error = vndlock(sc)) != 0) {
+		device_release(self);
 		return error;
+	}
 
 	mutex_enter(>sc_dkdev.dk_openlock);

CVS commit: src/sys/arch/cobalt/cobalt

2016-07-27 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul 27 11:13:14 UTC 2016

Modified Files:
src/sys/arch/cobalt/cobalt: machdep.c

Log Message:
Fix RB_KDB by calling the debugger entry points after pmap_bootstrap, etc


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/arch/cobalt/cobalt/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/cobalt/cobalt/machdep.c
diff -u src/sys/arch/cobalt/cobalt/machdep.c:1.117 src/sys/arch/cobalt/cobalt/machdep.c:1.118
--- src/sys/arch/cobalt/cobalt/machdep.c:1.117	Mon Jun 29 17:52:53 2015
+++ src/sys/arch/cobalt/cobalt/machdep.c	Wed Jul 27 11:13:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.117 2015/06/29 17:52:53 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.118 2016/07/27 11:13:14 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2006 Izumi Tsutsui.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.117 2015/06/29 17:52:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.118 2016/07/27 11:13:14 skrll Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -274,15 +274,6 @@ mach_init(int32_t memsize32, u_int bim, 
 		ksyms_addsyms_elf(esym - ssym, ssym, esym);
 #endif
 	KASSERT( == curlwp);
-#ifdef DDB
-	if (boothowto & RB_KDB)
-		Debugger();
-#endif
-#ifdef KGDB
-	if (boothowto & RB_KDB)
-		kgdb_connect(0);
-#endif
-
 	/*
 	 * Load the rest of the available pages into the VM system.
 	 */
@@ -302,6 +293,16 @@ mach_init(int32_t memsize32, u_int bim, 
 	 * Allocate space for proc0's USPACE.
 	 */
 	mips_init_lwp0_uarea();
+
+#ifdef DDB
+	if (boothowto & RB_KDB)
+		Debugger();
+#endif
+#ifdef KGDB
+	if (boothowto & RB_KDB)
+		kgdb_connect(0);
+#endif
+
 }
 
 /*

CVS commit: src/sys/kern

2016-07-27 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul 27 09:57:26 UTC 2016

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

Log Message:
Bump size of scratchstr - some KASSERTMGS exceed 256 characters


To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/kern/subr_prf.c

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

Modified files:

Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.159 src/sys/kern/subr_prf.c:1.160
--- src/sys/kern/subr_prf.c:1.159	Mon Aug 24 22:50:32 2015
+++ src/sys/kern/subr_prf.c	Wed Jul 27 09:57:26 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_prf.c,v 1.159 2015/08/24 22:50:32 pooka Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.160 2016/07/27 09:57:26 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.159 2015/08/24 22:50:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.160 2016/07/27 09:57:26 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -265,7 +265,7 @@ vpanic(const char *fmt, va_list ap)
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci, *oci;
 	int bootopt;
-	static char scratchstr[256]; /* stores panic message */
+	static char scratchstr[384]; /* stores panic message */
 
 	spldebug_stop();

CVS commit: src/sys/arch/mips/mips

2016-07-27 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Wed Jul 27 09:32:35 UTC 2016

Modified Files:
src/sys/arch/mips/mips: lock_stubs_llsc.S lock_stubs_ras.S locore.S
locore_mips1.S locore_mips3.S locore_octeon.S sigcode.S

Log Message:
Sprinle RCSID


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/mips/lock_stubs_llsc.S
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/mips/lock_stubs_ras.S
cvs rdiff -u -r1.203 -r1.204 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/mips/mips/locore_mips1.S
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/mips/mips/locore_mips3.S
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/mips/mips/locore_octeon.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/mips/sigcode.S

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

Modified files:

Index: src/sys/arch/mips/mips/lock_stubs_llsc.S
diff -u src/sys/arch/mips/mips/lock_stubs_llsc.S:1.5 src/sys/arch/mips/mips/lock_stubs_llsc.S:1.6
--- src/sys/arch/mips/mips/lock_stubs_llsc.S:1.5	Mon Jul 11 16:15:36 2016
+++ src/sys/arch/mips/mips/lock_stubs_llsc.S	Wed Jul 27 09:32:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock_stubs_llsc.S,v 1.5 2016/07/11 16:15:36 matt Exp $	*/
+/*	$NetBSD: lock_stubs_llsc.S,v 1.6 2016/07/27 09:32:35 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,6 +37,8 @@
 
 #include 
 
+RCSID("$NetBSD: lock_stubs_llsc.S,v 1.6 2016/07/27 09:32:35 skrll Exp $")
+
 #include "assym.h"
 
 #if defined(DIAGNOSTIC) || defined(MULTIPROCESSOR)

Index: src/sys/arch/mips/mips/lock_stubs_ras.S
diff -u src/sys/arch/mips/mips/lock_stubs_ras.S:1.6 src/sys/arch/mips/mips/lock_stubs_ras.S:1.7
--- src/sys/arch/mips/mips/lock_stubs_ras.S:1.6	Mon Jul 11 16:15:36 2016
+++ src/sys/arch/mips/mips/lock_stubs_ras.S	Wed Jul 27 09:32:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock_stubs_ras.S,v 1.6 2016/07/11 16:15:36 matt Exp $	*/
+/*	$NetBSD: lock_stubs_ras.S,v 1.7 2016/07/27 09:32:35 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -37,6 +37,8 @@
 
 #include 
 
+RCSID("$NetBSD: lock_stubs_ras.S,v 1.7 2016/07/27 09:32:35 skrll Exp $")
+
 #include "assym.h"
 
 /*

Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.203 src/sys/arch/mips/mips/locore.S:1.204
--- src/sys/arch/mips/mips/locore.S:1.203	Tue Jul 26 05:52:55 2016
+++ src/sys/arch/mips/mips/locore.S	Wed Jul 27 09:32:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.203 2016/07/26 05:52:55 skrll Exp $	*/
+/*	$NetBSD: locore.S,v 1.204 2016/07/27 09:32:35 skrll Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -62,6 +62,8 @@
 #include 
 #include 
 
+RCSID("$NetBSD: locore.S,v 1.204 2016/07/27 09:32:35 skrll Exp $")
+
 #include "assym.h"
 
 #if defined(MIPS1) || defined(MIPS2)

Index: src/sys/arch/mips/mips/locore_mips1.S
diff -u src/sys/arch/mips/mips/locore_mips1.S:1.90 src/sys/arch/mips/mips/locore_mips1.S:1.91
--- src/sys/arch/mips/mips/locore_mips1.S:1.90	Thu Jul 21 12:17:07 2016
+++ src/sys/arch/mips/mips/locore_mips1.S	Wed Jul 27 09:32:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_mips1.S,v 1.90 2016/07/21 12:17:07 skrll Exp $	*/
+/*	$NetBSD: locore_mips1.S,v 1.91 2016/07/27 09:32:35 skrll Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -57,6 +57,8 @@
 #include 
 #include 
 
+RCSID("$NetBSD: locore_mips1.S,v 1.91 2016/07/27 09:32:35 skrll Exp $")
+
 #include "assym.h"
 
 #define	_SLLV		sllv

Index: src/sys/arch/mips/mips/locore_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.112 src/sys/arch/mips/mips/locore_mips3.S:1.113
--- src/sys/arch/mips/mips/locore_mips3.S:1.112	Mon Jul 11 16:15:36 2016
+++ src/sys/arch/mips/mips/locore_mips3.S	Wed Jul 27 09:32:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_mips3.S,v 1.112 2016/07/11 16:15:36 matt Exp $	*/
+/*	$NetBSD: locore_mips3.S,v 1.113 2016/07/27 09:32:35 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -92,6 +92,8 @@
 #include 
 #include 
 
+RCSID("$NetBSD: locore_mips3.S,v 1.113 2016/07/27 09:32:35 skrll Exp $")
+
 #include "assym.h"
 
 /*

Index: src/sys/arch/mips/mips/locore_octeon.S
diff -u src/sys/arch/mips/mips/locore_octeon.S:1.9 src/sys/arch/mips/mips/locore_octeon.S:1.10
--- src/sys/arch/mips/mips/locore_octeon.S:1.9	Mon Jul 11 16:15:36 2016
+++ src/sys/arch/mips/mips/locore_octeon.S	Wed Jul 27 09:32:35 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore_octeon.S,v 1.9 2016/07/11 16:15:36 matt Exp $	*/
+/*	$NetBSD: locore_octeon.S,v 1.10 2016/07/27 09:32:35 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-RCSID("$NetBSD: locore_octeon.S,v 1.9 2016/07/11 16:15:36 matt Exp $")
+RCSID("$NetBSD: locore_octeon.S,v 1.10 2016/07/27 09:32:35 skrll Exp $")
 
 #include "cpunode.h"			/* for NWDOG */
 #include "opt_cputype.h"
@@ -37,6 +37,8 @@ RCSID("$NetBSD: locore_octeon.S,v 1.9 20
 #include 
 #include 
 
+RCSID("$NetBSD: locore_octeon.S,v 1.10

CVS commit: src/sys/dev/i2c

2016-07-27 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 27 09:11:44 UTC 2016

Modified Files:
src/sys/dev/i2c: sdtemp.c

Log Message:
Print device ID with 8bits again (revert part of rev. 1.27) because
the revision field also printed next.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/i2c/sdtemp.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/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.29 src/sys/dev/i2c/sdtemp.c:1.30
--- src/sys/dev/i2c/sdtemp.c:1.29	Tue Jul 26 08:13:57 2016
+++ src/sys/dev/i2c/sdtemp.c	Wed Jul 27 09:11:44 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: sdtemp.c,v 1.29 2016/07/26 08:13:57 msaitoh Exp $*/
+/*  $NetBSD: sdtemp.c,v 1.30 2016/07/27 09:11:44 msaitoh Exp $*/
 
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.29 2016/07/26 08:13:57 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.30 2016/07/27 09:11:44 msaitoh Exp $");
 
 #include 
 #include 
@@ -213,8 +213,8 @@ sdtemp_match(device_t parent, cfdata_t c
 
 	i = sdtemp_lookup(mfgid, devid);
 	if (sdtemp_dev_table[i].sdtemp_mfg_id == 0) {
-		aprint_debug("sdtemp: No match for mfg 0x%04x dev 0x%04x "
-		"rev 0x%02x at address 0x%02x\n", mfgid, devid,
+		aprint_debug("sdtemp: No match for mfg 0x%04x dev 0x%02x "
+		"rev 0x%02x at address 0x%02x\n", mfgid, devid >> 8,
 		devid & 0xff, sc.sc_address);
 		return 0;
 	}
@@ -251,8 +251,8 @@ sdtemp_attach(device_t parent, device_t 
 
 	if (sdtemp_dev_table[i].sdtemp_mfg_id == 0)
 		aprint_debug_dev(self,
-		"mfg 0x%04x dev 0x%04x rev 0x%02x at addr 0x%02x\n",
-		mfgid, devid, devid & 0xff, ia->ia_addr);
+		"mfg 0x%04x dev 0x%02x rev 0x%02x at addr 0x%02x\n",
+		mfgid, devid >> 8, devid & 0xff, ia->ia_addr);
 
 	error = sdtemp_read_16(sc, SDTEMP_REG_CAPABILITY, >sc_capability);
 	aprint_debug_dev(self, "capability reg = %04x\n", sc->sc_capability);

CVS commit: src/share/man/man4

2016-07-27 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Wed Jul 27 08:38:25 UTC 2016

Modified Files:
src/share/man/man4: spdmem.4

Log Message:
New sentence, new line.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/share/man/man4/spdmem.4

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/man4/spdmem.4
diff -u src/share/man/man4/spdmem.4:1.7 src/share/man/man4/spdmem.4:1.8
--- src/share/man/man4/spdmem.4:1.7	Wed Jul 27 07:44:10 2016
+++ src/share/man/man4/spdmem.4	Wed Jul 27 08:38:25 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: spdmem.4,v 1.7 2016/07/27 07:44:10 msaitoh Exp $
+.\"	$NetBSD: spdmem.4,v 1.8 2016/07/27 08:38:25 wiz Exp $
 .\"
 .\"Copyright (c) 2007 Nicolas Joly
 .\"Copyright (c) 2007 Paul Goyette
@@ -60,7 +60,8 @@ device is created under the
 .Dv hw
 top-level MIB.
 .Pp
-Some SPD ROMs also have a temperature sensor. It's supported by
+Some SPD ROMs also have a temperature sensor.
+It's supported by
 .Xr sdtemp 4 .
 .Sh SEE ALSO
 .Xr iic 4 ,

CVS commit: src/share/man/man4

2016-07-27 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 27 07:44:10 UTC 2016

Modified Files:
src/share/man/man4: spdmem.4

Log Message:
- Add 0x54-0x57.
- Add note about sdtemp(4).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/man/man4/spdmem.4

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/man4/spdmem.4
diff -u src/share/man/man4/spdmem.4:1.6 src/share/man/man4/spdmem.4:1.7
--- src/share/man/man4/spdmem.4:1.6	Tue Mar 18 18:20:39 2014
+++ src/share/man/man4/spdmem.4	Wed Jul 27 07:44:10 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: spdmem.4,v 1.6 2014/03/18 18:20:39 riastradh Exp $
+.\"	$NetBSD: spdmem.4,v 1.7 2016/07/27 07:44:10 msaitoh Exp $
 .\"
 .\"Copyright (c) 2007 Nicolas Joly
 .\"Copyright (c) 2007 Paul Goyette
@@ -27,7 +27,7 @@
 .\"ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\"POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd August 10, 2007
+.Dd July 27, 2016
 .Dt SPDMEM 4
 .Os
 .Sh NAME
@@ -38,6 +38,10 @@
 .Cd "spdmem* at iic? addr 0x51"
 .Cd "spdmem* at iic? addr 0x52"
 .Cd "spdmem* at iic? addr 0x53"
+.Cd "spdmem* at iic? addr 0x54"
+.Cd "spdmem* at iic? addr 0x55"
+.Cd "spdmem* at iic? addr 0x56"
+.Cd "spdmem* at iic? addr 0x57"
 .Sh DESCRIPTION
 The
 .Nm
@@ -55,9 +59,13 @@ An entry for each
 device is created under the
 .Dv hw
 top-level MIB.
+.Pp
+Some SPD ROMs also have a temperature sensor. It's supported by
+.Xr sdtemp 4 .
 .Sh SEE ALSO
 .Xr iic 4 ,
-.Xr intro 4
+.Xr intro 4 ,
+.Xr sdtemp 4
 .Sh HISTORY
 The
 .Nm

CVS commit: src/sys/arch

2016-07-27 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 27 07:05:40 UTC 2016

Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0
src/sys/arch/i386/conf: XEN3_DOM0

Log Message:
Add ichsmb(4), spdmem(4) and sdtemp(4).


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/i386/conf/XEN3_DOM0

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

Modified files:

Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.119 src/sys/arch/amd64/conf/XEN3_DOM0:1.120
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.119	Sat May 14 17:11:30 2016
+++ src/sys/arch/amd64/conf/XEN3_DOM0	Wed Jul 27 07:05:40 2016
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.119 2016/05/14 17:11:30 christos Exp $
+# $NetBSD: XEN3_DOM0,v 1.120 2016/07/27 07:05:40 msaitoh Exp $
 
 include 	"arch/amd64/conf/std.xen"
 
@@ -301,11 +301,33 @@ amdtemp* at amdnb_misc?			# AMD CPU Temp
 amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
 #iic*	at amdpm?			# sensors below are on this bus
 
+# Intel ICH SMBus controller
+ichsmb* at pci? dev ? function ?
+iic*	at ichsmb?
+
 # Thermal monitor and fan controller
 #dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
 #dbcool* at iic? addr 0x2D		# Tyan S2881
 #dbcool* at iic? addr 0x2E		# Tyan S2882-D
 
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
+
 # Winbond LPC Super I/O
 #wbsio*	at isa? port 0x2e
 #wbsio*	at isa? port 0x4e

Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.98 src/sys/arch/i386/conf/XEN3_DOM0:1.99
--- src/sys/arch/i386/conf/XEN3_DOM0:1.98	Sat Mar 19 23:21:02 2016
+++ src/sys/arch/i386/conf/XEN3_DOM0	Wed Jul 27 07:05:39 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: XEN3_DOM0,v 1.98 2016/03/19 23:21:02 gdt Exp $
+#	$NetBSD: XEN3_DOM0,v 1.99 2016/07/27 07:05:39 msaitoh Exp $
 #
 #	XEN3_0: Xen 3.0 domain0 kernel
 
@@ -277,12 +277,34 @@ amdtemp* at amdnb_misc?			# AMD CPU Temp
 # AMD 768 and 8111 power/ACPI controllers
 amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
 
+# Intel ICH SMBus controller
+ichsmb* at pci? dev ? function ?
+iic*	at ichsmb?
+
 # dbCool thermal monitor and fan controller
 #iic*	at amdpm?			# sensors below are on this bus
 #dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
 #dbcool* at iic? addr 0x2D		# Tyan S2881
 #dbcool* at iic? addr 0x2E		# Tyan S2882-D
 
+# Serial Presence Detect capable memory modules
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
+
 # Winbond LPC Super I/O
 #wbsio*	at isa? port 0x2e
 #wbsio*	at isa? port 0x4e

CVS commit: src/sys/arch

2016-07-27 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Wed Jul 27 07:04:57 UTC 2016

Modified Files:
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/i386/conf: ALL GENERIC

Log Message:
Add sdtemp(4)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.435 -r1.436 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.399 -r1.400 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1137 -r1.1138 src/sys/arch/i386/conf/GENERIC

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

Modified files:

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.36 src/sys/arch/amd64/conf/ALL:1.37
--- src/sys/arch/amd64/conf/ALL:1.36	Mon Jul 11 11:25:54 2016
+++ src/sys/arch/amd64/conf/ALL	Wed Jul 27 07:04:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.36 2016/07/11 11:25:54 msaitoh Exp $
+# $NetBSD: ALL,v 1.37 2016/07/27 07:04:57 msaitoh Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.36 $"
+#ident 		"ALL-$Revision: 1.37 $"
 
 maxusers	64		# estimated number of users
 
@@ -671,6 +671,13 @@ spdmem* at iic? addr 0x55
 spdmem* at iic? addr 0x56
 spdmem* at iic? addr 0x57
 sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
 
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.435 src/sys/arch/amd64/conf/GENERIC:1.436
--- src/sys/arch/amd64/conf/GENERIC:1.435	Tue Jun 21 11:37:25 2016
+++ src/sys/arch/amd64/conf/GENERIC	Wed Jul 27 07:04:57 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.435 2016/06/21 11:37:25 nonaka Exp $
+# $NetBSD: GENERIC,v 1.436 2016/07/27 07:04:57 msaitoh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.435 $"
+#ident 		"GENERIC-$Revision: 1.436 $"
 
 maxusers	64		# estimated number of users
 
@@ -534,6 +534,14 @@ iic*	at ismt?
 #spdmem* at iic? addr 0x55
 #spdmem* at iic? addr 0x56
 #spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
 
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.399 src/sys/arch/i386/conf/ALL:1.400
--- src/sys/arch/i386/conf/ALL:1.399	Mon Jul 11 11:26:46 2016
+++ src/sys/arch/i386/conf/ALL	Wed Jul 27 07:04:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.399 2016/07/11 11:26:46 msaitoh Exp $
+# $NetBSD: ALL,v 1.400 2016/07/27 07:04:56 msaitoh Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.399 $"
+#ident 		"ALL-$Revision: 1.400 $"
 
 maxusers	64		# estimated number of users
 
@@ -771,6 +771,13 @@ spdmem* at iic? addr 0x55
 spdmem* at iic? addr 0x56
 spdmem* at iic? addr 0x57
 sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
 
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1137 src/sys/arch/i386/conf/GENERIC:1.1138
--- src/sys/arch/i386/conf/GENERIC:1.1137	Tue Jun 21 11:37:25 2016
+++ src/sys/arch/i386/conf/GENERIC	Wed Jul 27 07:04:56 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1137 2016/06/21 11:37:25 nonaka Exp $
+# $NetBSD: GENERIC,v 1.1138 2016/07/27 07:04:56 msaitoh Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1137 $"
+#ident 		"GENERIC-$Revision: 1.1138 $"
 
 maxusers	64		# estimated number of users
 
@@ -719,6 +719,14 @@ nsclpcsio*	at isa?
 #spdmem* at iic? addr 0x55
 #spdmem* at iic? addr 0x56
 #spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
 
 # I2O devices
 iop*	at pci? dev ? function ?	# I/O processor

CVS commit: src/sys/dev/pci

CVS commit: src/sys/dev/pci

CVS commit: [pgoyette-localcount] src/sys/dev

CVS commit: [pgoyette-localcount] src/sys/dev

CVS commit: [pgoyette-localcount] src/sys/dev

CVS commit: src/sys/uvm

CVS commit: src/sys/arch/x86/acpi

CVS commit: src/sys/arch/x86/x86

CVS commit: [pgoyette-localcount] src/sys/dev

CVS commit: [pgoyette-localcount] src/sys/dev

CVS commit: src/sys/arch/cobalt/cobalt

CVS commit: src/sys/kern

CVS commit: src/sys/arch/mips/mips

CVS commit: src/sys/dev/i2c

CVS commit: src/share/man/man4

CVS commit: src/share/man/man4

CVS commit: src/sys/arch

CVS commit: src/sys/arch

18 matches

Site Navigation

Mail list logo

Footer information