CVS commit: src/sys/dev/ic

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Tue Nov 17 16:37:22 UTC 2015

Modified Files:
src/sys/dev/ic: athn.c

Log Message:
Revert changes of athn.c r1.8.

 - aprint_normal is correct for the attach message
 - KNF adjustments in code we sync with upstream are a nuisance
 - aprint_error{,_dev}() is inappropriate for use in runtime code


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/athn.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/ic/athn.c
diff -u src/sys/dev/ic/athn.c:1.11 src/sys/dev/ic/athn.c:1.12
--- src/sys/dev/ic/athn.c:1.11	Tue Sep 22 13:28:02 2015
+++ src/sys/dev/ic/athn.c	Tue Nov 17 16:37:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: athn.c,v 1.11 2015/09/22 13:28:02 joerg Exp $	*/
+/*	$NetBSD: athn.c,v 1.12 2015/11/17 16:37:22 jakllsch Exp $	*/
 /*	$OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.11 2015/09/22 13:28:02 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: athn.c,v 1.12 2015/11/17 16:37:22 jakllsch Exp $");
 
 #ifndef _MODULE
 #include "athn_usb.h"		/* for NATHN_USB */
@@ -234,16 +234,15 @@ athn_attach(struct athn_softc *sc)
 	((sc->sc_rxchainmask >> 0) & 1);
 
 	if (AR_SINGLE_CHIP(sc)) {
-		aprint_normal_dev(sc->sc_dev,
-		"Atheros %s\n", athn_get_mac_name(sc));
+		aprint_normal(": Atheros %s\n", athn_get_mac_name(sc));
 		aprint_verbose_dev(sc->sc_dev,
 		"rev %d (%dT%dR), ROM rev %d, address %s\n",
 		sc->sc_mac_rev,
 		sc->sc_ntxchains, sc->sc_nrxchains, sc->sc_eep_rev,
 		ether_sprintf(ic->ic_myaddr));
-	} else {
-		aprint_normal_dev(sc->sc_dev,
-		"Atheros %s, RF %s\n", athn_get_mac_name(sc),
+	}
+	else {
+		aprint_normal(": Atheros %s, RF %s\n", athn_get_mac_name(sc),
 		athn_get_rf_name(sc));
 		aprint_verbose_dev(sc->sc_dev,
 		"rev %d (%dT%dR), ROM rev %d, address %s\n",
@@ -2825,8 +2824,8 @@ athn_init(struct ifnet *ifp)
 		/* avoid recursion in athn_resume */
 		if (!pmf_device_subtree_resume(sc->sc_dev, >sc_qual) ||
 		!device_is_active(sc->sc_dev)) {
-			aprint_error_dev(sc->sc_dev,
-			"failed to power up device\n");
+			printf("%s: failed to power up device\n",
+			device_xname(sc->sc_dev));
 			return 0;
 		}
 		ifp->if_flags = flags;

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

[Michael Lorenz]

Module Name:src
Committed By:   macallan
Date:   Tue Nov 17 16:53:21 UTC 2015

Modified Files:
src/sys/arch/mips/ingenic: ingenic_rng.c

Log Message:
Long overdue suggestions from Taylor Campbell and a few syntax/style
tweaks from myself.

>From Michael McConville


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ingenic/ingenic_rng.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/mips/ingenic/ingenic_rng.c
diff -u src/sys/arch/mips/ingenic/ingenic_rng.c:1.2 src/sys/arch/mips/ingenic/ingenic_rng.c:1.3
--- src/sys/arch/mips/ingenic/ingenic_rng.c:1.2	Sun Aug 30 05:09:16 2015
+++ src/sys/arch/mips/ingenic/ingenic_rng.c	Tue Nov 17 16:53:21 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ingenic_rng.c,v 1.2 2015/08/30 05:09:16 macallan Exp $ */
+/*	$NetBSD: ingenic_rng.c,v 1.3 2015/11/17 16:53:21 macallan Exp $ */
 
 /*-
  * Copyright (c) 2015 Michael McConville
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ingenic_rng.c,v 1.2 2015/08/30 05:09:16 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ingenic_rng.c,v 1.3 2015/11/17 16:53:21 macallan Exp $");
 
 /*
  * adapted from Jared McNeill's amlogic_rng.c
@@ -79,32 +79,28 @@ CFATTACH_DECL_NEW(ingenic_rng, sizeof(st
 static int
 ingenic_rng_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct apbus_attach_args *aa = aux;
+	const struct apbus_attach_args *aa = aux;
 
-	if (strcmp(aa->aa_name, "jzrng") == 0) {
-		return 1;
-	} else {
-		return 0;
-	}
+	return !(strcmp(aa->aa_name, "jzrng"));
 }
 
 static void
 ingenic_rng_attach(device_t parent, device_t self, void *aux)
 {
 	struct ingenic_rng_softc * const sc = device_private(self);
-	struct apbus_attach_args * const aa = aux;
+	const struct apbus_attach_args * const aa = aux;
+	bus_addr_t addr = aa->aa_addr;
 	int error;
 
 	sc->sc_dev = self;
 	sc->sc_bst = aa->aa_bst;
-	if (aa->aa_addr == 0) {
-		aa->aa_addr = JZ_RNG;
-	}
+	if (addr == 0)
+		addr = JZ_RNG;
 
-	error = bus_space_map(aa->aa_bst, aa->aa_addr, 4, 0, >sc_bsh);
+	error = bus_space_map(aa->aa_bst, addr, 4, 0, >sc_bsh);
 	if (error) {
 		aprint_error_dev(self,
-			"can't map registers for %s: %d\n", aa->aa_name, error);
+		"can't map registers for %s: %d\n", aa->aa_name, error);
 		return;
 	}
 
@@ -135,10 +131,7 @@ ingenic_rng_get(struct ingenic_rng_softc
 
 	mutex_spin_enter(>sc_intr_lock);
 	while (sc->sc_bytes_wanted) {
-		bus_space_read_region_4(sc->sc_bst, sc->sc_bsh, 0, , 1);
-#if 0
-		device_printf(sc->sc_dev, "random output: %x\n", data);
-#endif
+		data = bus_space_read_4(sc->sc_bst, sc->sc_bsh, 0);
 		mutex_spin_exit(>sc_intr_lock);
 		mutex_spin_enter(>sc_rnd_lock);
 		rnd_add_data(>sc_rndsource, , sizeof(data),
@@ -157,14 +150,14 @@ ingenic_rng_get_cb(size_t bytes_wanted, 
 	struct ingenic_rng_softc * const sc = priv;
 
 	mutex_spin_enter(>sc_intr_lock);
-	if (sc->sc_bytes_wanted == 0) {
+	if (sc->sc_bytes_wanted == 0)
 		softint_schedule(sc->sc_sih);
-	}
-	if (bytes_wanted > (UINT_MAX - sc->sc_bytes_wanted)) {
+
+	if (bytes_wanted > (UINT_MAX - sc->sc_bytes_wanted))
 		sc->sc_bytes_wanted = UINT_MAX;
-	} else {
+	else
 		sc->sc_bytes_wanted += bytes_wanted;
-	}
+
 	mutex_spin_exit(>sc_intr_lock);
 }
 

CVS commit: src/sys/dev/pci

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Tue Nov 17 17:15:29 UTC 2015

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

Log Message:
Switch PCI athn(4) attachment from pci_intr_map() to
pci_intr_alloc()/pci_intr_release(), this enables MSI where available.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/if_athn_pci.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_athn_pci.c
diff -u src/sys/dev/pci/if_athn_pci.c:1.10 src/sys/dev/pci/if_athn_pci.c:1.11
--- src/sys/dev/pci/if_athn_pci.c:1.10	Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_athn_pci.c	Tue Nov 17 17:15:29 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_athn_pci.c,v 1.10 2014/03/29 19:28:24 christos Exp $	*/
+/*	$NetBSD: if_athn_pci.c,v 1.11 2015/11/17 17:15:29 jakllsch Exp $	*/
 /*	$OpenBSD: if_athn_pci.c,v 1.11 2011/01/08 10:02:32 damien Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.10 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.11 2015/11/17 17:15:29 jakllsch Exp $");
 
 #include "opt_inet.h"
 
@@ -66,7 +66,7 @@ struct athn_pci_softc {
 	/* PCI specific goo. */
 	pci_chipset_tag_t	psc_pc;
 	pcitag_t		psc_tag;
-	pci_intr_handle_t	psc_pih;
+	pci_intr_handle_t	*psc_pihp;
 	void			*psc_ih;
 	bus_space_tag_t		psc_iot;
 	bus_space_handle_t	psc_ioh;
@@ -200,14 +200,15 @@ athn_pci_attach(device_t parent, device_
 	/*
 	 * Arrange interrupt line.
 	 */
-	if (pci_intr_map(pa, >psc_pih) != 0) {
+	if (pci_intr_alloc(pa, >psc_pihp, NULL, 0) != 0) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		goto fail1;
 	}
 
-	intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih, intrbuf, sizeof(intrbuf));
-	psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET,
-	athn_intr, sc);
+	intrstr = pci_intr_string(psc->psc_pc, psc->psc_pihp[0], intrbuf,
+	sizeof(intrbuf));
+	psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pihp[0],
+	IPL_NET, athn_intr, sc);
 	if (psc->psc_ih == NULL) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		goto fail1;
@@ -250,6 +251,10 @@ athn_pci_detach(device_t self, int flags
 		pci_intr_disestablish(psc->psc_pc, psc->psc_ih);
 		psc->psc_ih = NULL;
 	}
+	if (psc->psc_pihp != NULL) {
+		pci_intr_release(psc->psc_pc, psc->psc_pihp, 1);
+		psc->psc_pihp = NULL;
+	}
 	if (psc->psc_mapsz > 0) {
 		bus_space_unmap(psc->psc_iot, psc->psc_ioh, psc->psc_mapsz);
 		psc->psc_mapsz = 0;
@@ -299,8 +304,8 @@ athn_pci_resume(device_t self, const pmf
 	if (reg & 0xff00)
 		pci_conf_write(psc->psc_pc, psc->psc_tag, 0x40, reg & ~0xff00);
 
-	psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET,
-	athn_intr, sc);
+	psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pihp[0],
+	IPL_NET, athn_intr, sc);
 	if (psc->psc_ih == NULL) {
 		aprint_error_dev(self, "couldn't map interrupt\n");
 		return false;

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Nov 17 18:26:50 UTC 2015

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

Log Message:
- ARI's function group is not bit 32-24 but 22-20.
- Add the Structure Length field in AF capability register.
- Add Enhanced Allocation extended capability ID (ECN: Enhanced Allocation (EA)
  for Memory and I/O Resources).
- Add LN System CLS (ECN: Lightweight Notification (LN) Protocol).
- Add ST Upper and Lower bit definitions (ECN: TLP Processiong Hints).
- Add the Global Invalidate bit in the ATS capability register and the PRG
  Response PASID Required bit in the Page Request status register (ECN: PASID
  Translation)
- Decode ASPM support bit more (ECN: ASPM Optionally)
- Use __BITS()


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.110 -r1.111 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.144 src/sys/dev/pci/pci_subr.c:1.145
--- src/sys/dev/pci/pci_subr.c:1.144	Tue Nov 17 17:51:42 2015
+++ src/sys/dev/pci/pci_subr.c	Tue Nov 17 18:26:50 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.144 2015/11/17 17:51:42 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.145 2015/11/17 18:26:50 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.144 2015/11/17 17:51:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.145 2015/11/17 18:26:50 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -1584,15 +1584,18 @@ pci_conf_print_pcie_cap(const pcireg_t *
 		printf("  Active State PM Support: ");
 		val = (reg & PCIE_LCAP_ASPM) >> 10;
 		switch (val) {
+		case 0x0:
+			printf("No ASPM support\n");
+			break;
 		case 0x1:
-			printf("L0s Entry supported\n");
+			printf("L0s supported\n");
+			break;
+		case 0x2:
+			printf("L1 supported\n");
 			break;
 		case 0x3:
 			printf("L0s and L1 supported\n");
 			break;
-		default:
-			printf("Reserved value\n");
-			break;
 		}
 		printf("  L0 Exit Latency: ");
 		pci_print_pcie_L0s_latency((reg & PCIE_LCAP_L0S_EXIT) >> 12);
@@ -1792,6 +1795,21 @@ pci_conf_print_pcie_cap(const pcireg_t *
 	onoff("LTR Mechanism Supported", reg, PCIE_DCAP2_LTR_MEC);
 	printf("  TPH Completer Supported: %u\n",
 	(unsigned int)(reg & PCIE_DCAP2_TPH_COMP) >> 12);
+	printf("  LN System CLS: ");
+	switch (__SHIFTOUT(reg, PCIE_DCAP2_LNSYSCLS)) {
+	case 0x0:
+		printf("Not supported or not in effect\n");
+		break;
+	case 0x1:
+		printf("64byte cachelines in effect\n");
+		break;
+	case 0x2:
+		printf("128byte cachelines in effect\n");
+		break;
+	case 0x3:
+		printf("Reserved\n");
+		break;
+	}
 	printf("  OBFF Supported: ");
 	switch ((reg & PCIE_DCAP2_OBFF) >> 18) {
 	case 0x0:
@@ -1907,13 +1925,14 @@ pci_conf_print_msix_cap(const pcireg_t *
 	onoff("MSI-X Enable", reg, PCI_MSIX_CTL_ENABLE);
 	reg = regs[o2i(capoff + PCI_MSIX_TBLOFFSET)];
 	printf("Table offset register: 0x%08x\n", reg);
-	printf("  Table offset: %08x\n", reg & PCI_MSIX_TBLOFFSET_MASK);
-	printf("  BIR: 0x%x\n", reg & PCI_MSIX_TBLBIR_MASK);
+	printf("  Table offset: %08x\n",
+	(pcireg_t)(reg & PCI_MSIX_TBLOFFSET_MASK));
+	printf("  BIR: 0x%x\n", (pcireg_t)(reg & PCI_MSIX_TBLBIR_MASK));
 	reg = regs[o2i(capoff + PCI_MSIX_PBAOFFSET)];
 	printf("Pending bit array register: 0x%08x\n", reg);
 	printf("  Pending bit array offset: %08x\n",
-	reg & PCI_MSIX_PBAOFFSET_MASK);
-	printf("  BIR: 0x%x\n", reg & PCI_MSIX_PBABIR_MASK);
+	(pcireg_t)(reg & PCI_MSIX_PBAOFFSET_MASK));
+	printf("  BIR: 0x%x\n", (pcireg_t)(reg & PCI_MSIX_PBABIR_MASK));
 }
 
 static void
@@ -1951,6 +1970,8 @@ pci_conf_print_pciaf_cap(const pcireg_t 
 
 	reg = regs[o2i(capoff + PCI_AFCAPR)];
 	printf("AF Capabilities register: 0x%02x\n", (reg >> 24) & 0xff);
+	printf("AF Structure Length: 0x%02x\n",
+	(pcireg_t)__SHIFTOUT(reg, PCI_AF_LENGTH));
 	onoff("Transaction Pending", reg, PCI_AF_TP_CAP);
 	onoff("Function Level Reset", reg, PCI_AF_FLR_CAP);
 	reg = regs[o2i(capoff + PCI_AFCSR)];
@@ -1989,7 +2010,8 @@ static struct {
 	{ PCI_CAP_PCIEXPRESS,	"PCI Express",	pci_conf_print_pcie_cap },
 	{ PCI_CAP_MSIX,		"MSI-X",	pci_conf_print_msix_cap },
 	{ PCI_CAP_SATA,		"SATA",		pci_conf_print_sata_cap },
-	{ PCI_CAP_PCIAF,	"Advanced Features", pci_conf_print_pciaf_cap }
+	{ PCI_CAP_PCIAF,	"Advanced Features", pci_conf_print_pciaf_cap},
+	{ PCI_CAP_EA,		"Enhanced Allocation", NULL }
 };
 
 static int
@@ -2674,6 +2696,7 @@ pci_conf_print_ats_cap(const pcireg_t *r
 		num = 32;
 	printf("  Invalidate Queue Depth: %u\n", num);
 	onoff("Page Aligned Request", reg, PCI_ATS_CAP_PALIGNREQ);
+	onoff("Global Invalidate", reg, PCI_ATS_CAP_GLOBALINVL);
 
 	printf("Control 

CVS commit: src/sys

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Nov 17 17:51:42 UTC 2015

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

Log Message:
No functional change:
 - Add comments.
 - Remove obsolete comment.
 - Move definitions to better location.
 - Rename bit definition.
 - KNF.
 - Indent.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/pci/msipic.c
cvs rdiff -u -r1.143 -r1.144 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.109 -r1.110 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/arch/x86/pci/msipic.c
diff -u src/sys/arch/x86/pci/msipic.c:1.7 src/sys/arch/x86/pci/msipic.c:1.8
--- src/sys/arch/x86/pci/msipic.c:1.7	Thu Aug 13 04:52:40 2015
+++ src/sys/arch/x86/pci/msipic.c	Tue Nov 17 17:51:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: msipic.c,v 1.7 2015/08/13 04:52:40 msaitoh Exp $	*/
+/*	$NetBSD: msipic.c,v 1.8 2015/11/17 17:51:42 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2015 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.7 2015/08/13 04:52:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msipic.c,v 1.8 2015/11/17 17:51:42 msaitoh Exp $");
 
 #include "opt_intrdebug.h"
 
@@ -493,9 +493,9 @@ msix_set_vecctl_mask(struct pic *pic, in
 	vecctl = bus_space_read_4(bstag, bshandle,
 	entry_base + PCI_MSIX_TABLE_ENTRY_VECTCTL);
 	if (flag == MSIX_VECCTL_HWMASK)
-		vecctl |= PCI_MSIX_VECTCTL_HWMASK_MASK;
+		vecctl |= PCI_MSIX_VECTCTL_MASK;
 	else
-		vecctl &= ~PCI_MSIX_VECTCTL_HWMASK_MASK;
+		vecctl &= ~PCI_MSIX_VECTCTL_MASK;
 
 	bus_space_write_4(bstag, bshandle,
 	entry_base + PCI_MSIX_TABLE_ENTRY_VECTCTL, vecctl);

Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.143 src/sys/dev/pci/pci_subr.c:1.144
--- src/sys/dev/pci/pci_subr.c:1.143	Mon Nov 16 09:10:58 2015
+++ src/sys/dev/pci/pci_subr.c	Tue Nov 17 17:51:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.143 2015/11/16 09:10:58 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.144 2015/11/17 17:51:42 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.143 2015/11/16 09:10:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.144 2015/11/17 17:51:42 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -3191,7 +3191,7 @@ static struct {
 	  pci_conf_print_page_req_cap },
 	{ PCI_EXTCAP_AMD,	"Reserved for AMD",
 	  NULL },
-	{ PCI_EXTCAP_RESIZE_BAR,"Resizable BAR",
+	{ PCI_EXTCAP_RESIZ_BAR,	"Resizable BAR",
 	  NULL },
 	{ PCI_EXTCAP_DPA,	"Dynamic Power Allocation",
 	  NULL },

Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.109 src/sys/dev/pci/pcireg.h:1.110
--- src/sys/dev/pci/pcireg.h:1.109	Mon Nov 16 09:10:58 2015
+++ src/sys/dev/pci/pcireg.h	Tue Nov 17 17:51:42 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcireg.h,v 1.109 2015/11/16 09:10:58 msaitoh Exp $	*/
+/*	$NetBSD: pcireg.h,v 1.110 2015/11/17 17:51:42 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -36,8 +36,6 @@
 
 /*
  * Standardized PCI configuration information
- *
- * XXX This is not complete.
  */
 
 /*
@@ -524,8 +522,6 @@ typedef u_int8_t pci_revision_t;
 #define	PCI_CAP_RESERVED0	0x00
 #define	PCI_CAP_PWRMGMT		0x01
 #define	PCI_CAP_AGP		0x02
-#define PCI_CAP_AGP_MAJOR(cr)	(((cr) >> 20) & 0xf)
-#define PCI_CAP_AGP_MINOR(cr)	(((cr) >> 16) & 0xf)
 #define	PCI_CAP_VPD		0x03
 #define	PCI_CAP_SLOTID		0x04
 #define	PCI_CAP_MSI		0x05
@@ -535,7 +531,7 @@ typedef u_int8_t pci_revision_t;
 #define	PCI_CAP_VENDSPEC	0x09
 #define	PCI_CAP_DEBUGPORT	0x0a
 #define	PCI_CAP_CPCI_RSRCCTL	0x0b
-#define	PCI_CAP_HOTPLUG		0x0c
+#define	PCI_CAP_HOTPLUG		0x0c	/* Standard Hot-Plug Controller(SHPC)*/
 #define	PCI_CAP_SUBVENDOR	0x0d
 #define	PCI_CAP_AGP8		0x0e
 #define	PCI_CAP_SECURE		0x0f
@@ -597,6 +593,8 @@ typedef u_int8_t pci_revision_t;
  * Capability ID: 0x02
  * AGP
  */
+#define PCI_CAP_AGP_MAJOR(cr)	(((cr) >> 20) & 0xf)
+#define PCI_CAP_AGP_MINOR(cr)	(((cr) >> 16) & 0xf)
 
 /*
  * Capability ID: 0x03
@@ -1008,7 +1006,7 @@ typedef u_int8_t pci_revision_t;
 #define PCIE_DCAP2_NO_ROPR_PASS	__BIT(10)  /* No RO-enabled PR-PR Passng */
 #define PCIE_DCAP2_LTR_MEC	__BIT(11)  /* LTR Mechanism Supported */
 #define PCIE_DCAP2_TPH_COMP	__BITS(13, 12) /* TPH Completer Supported */
-#define PCIE_DCAP2_OBFF		__BITS(19, 18) /* OBPF */
+#define PCIE_DCAP2_OBFF		__BITS(19, 18) /* Optimized Buffer Flush/Fill*/
 #define PCIE_DCAP2_EXTFMT_FLD	__BIT(20)  /* Extended Fmt Field Support */
 #define PCIE_DCAP2_EETLP_PREF	__BIT(21)  /* End-End TLP Prefix Support */
 #define PCIE_DCAP2_MAX_EETLP	__BITS(23, 22) /* Max End-End TLP Prefix Sup */
@@ -1081,10 +1079,10 @@ struct pci_msix_table_entry {
 	uint32_t pci_msix_value;
 	uint32_t pci_msix_vector_control;
 };
-#define	

CVS commit: src/lib/libc/db/hash

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Nov 18 00:23:39 UTC 2015

Modified Files:
src/lib/libc/db/hash: hash_page.c

Log Message:
If MAX_BSIZE == hashp->BSIZE (65536) then it does not fit in a short, and
we end up storing 0... This means that every entry needs a page. We store
MAX_BSIZE - 1 here, but it would be better to always store (avail - 1) here
so that we don't waste a byte and be consistent.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/libc/db/hash/hash_page.c

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

Modified files:

Index: src/lib/libc/db/hash/hash_page.c
diff -u src/lib/libc/db/hash/hash_page.c:1.26 src/lib/libc/db/hash/hash_page.c:1.27
--- src/lib/libc/db/hash/hash_page.c:1.26	Sat Nov 30 19:22:48 2013
+++ src/lib/libc/db/hash/hash_page.c	Tue Nov 17 19:23:39 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash_page.c,v 1.26 2013/12/01 00:22:48 christos Exp $	*/
+/*	$NetBSD: hash_page.c,v 1.27 2015/11/18 00:23:39 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: hash_page.c,v 1.26 2013/12/01 00:22:48 christos Exp $");
+__RCSID("$NetBSD: hash_page.c,v 1.27 2015/11/18 00:23:39 christos Exp $");
 
 /*
  * PACKAGE:  hashing
@@ -85,7 +85,9 @@ static int	 ugly_split(HTAB *, uint32_t,
 	temp = 3 * sizeof(uint16_t); \
 	_DIAGASSERT((size_t)hashp->BSIZE >= temp); \
 	((uint16_t *)(void *)(P))[1] = (uint16_t)(hashp->BSIZE - temp); \
-	((uint16_t *)(void *)(P))[2] = hashp->BSIZE; \
+	/* we should be really storing always length - 1 here... */ \
+	((uint16_t *)(void *)(P))[2] = \
+	hashp->BSIZE == MAX_BSIZE ? MAX_BSIZE - 1 : hashp->BSIZE; \
 }
 
 /*

CVS commit: [netbsd-6-0] src/external/bsd/bind

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 19:31:17 UTC 2015

Modified Files:
src/external/bsd/bind/dist [netbsd-6-0]: CHANGES COPYRIGHT FAQ.xml
README config.h.in config.h.win32 configure configure.in srcid
version
src/external/bsd/bind/dist/bin/check [netbsd-6-0]: named-checkconf.c
src/external/bsd/bind/dist/bin/dig [netbsd-6-0]: dig.1 dig.docbook
dig.html dighost.c host.c nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig [netbsd-6-0]: dig.h
src/external/bsd/bind/dist/bin/dnssec [netbsd-6-0]: dnssec-dsfromkey.c
dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.8
dnssec-keygen.c dnssec-keygen.docbook dnssec-keygen.html
dnssec-settime.8 dnssec-settime.c dnssec-settime.docbook
dnssec-settime.html dnssec-signzone.c dnssec-verify.c dnssectool.c
dnssectool.h
src/external/bsd/bind/dist/bin/named [netbsd-6-0]: client.c config.c
interfacemgr.c main.c named.html query.c server.c update.c
zoneconf.c
src/external/bsd/bind/dist/bin/named/include/named [netbsd-6-0]:
globals.h
src/external/bsd/bind/dist/bin/nsupdate [netbsd-6-0]: nsupdate.c
src/external/bsd/bind/dist/bin/rndc [netbsd-6-0]: rndc.c
src/external/bsd/bind/dist/bin/tests/system [netbsd-6-0]: conf.sh.in
genzone.sh start.pl
src/external/bsd/bind/dist/bin/tests/system/checkconf [netbsd-6-0]:
good.conf tests.sh
src/external/bsd/bind/dist/bin/tests/system/checkzone [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns2 [netbsd-6-0]:
example.db.in sign.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns3 [netbsd-6-0]:
named.conf sign.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones [netbsd-6-0]:
clean.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones/ns1 [netbsd-6-0]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/forward [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/forward/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/forward/ns4 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/inline [netbsd-6-0]:
clean.sh setup.sh
src/external/bsd/bind/dist/bin/tests/system/inline/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/notify [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/notify/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/redirect [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver [netbsd-6-0]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver/ns4 [netbsd-6-0]:
root.db tld1.db tld2.db
src/external/bsd/bind/dist/bin/tests/system/resolver/ns7 [netbsd-6-0]:
named1.conf named2.conf
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-6-0]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns1 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns2 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns3 [netbsd-6-0]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/views [netbsd-6-0]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/views/ns2 [netbsd-6-0]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/xfer [netbsd-6-0]:
dig1.good dig2.good
src/external/bsd/bind/dist/contrib/dlz/example [netbsd-6-0]: README
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt [netbsd-6-0]:
README.md
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt/testing 
[netbsd-6-0]:
dns-data.txt
src/external/bsd/bind/dist/contrib/sdb/ldap [netbsd-6-0]: ldapdb.c
src/external/bsd/bind/dist/doc/arm [netbsd-6-0]: Bv9ARM-book.xml
Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html
Bv9ARM.ch05.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html
Bv9ARM.ch09.html Bv9ARM.ch10.html Bv9ARM.html Makefile.in
dnssec.xml latex-fixup.pl man.arpaname.html man.ddns-confgen.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html 

CVS commit: [netbsd-7] src/external/bsd/ntp/scripts

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:09:08 UTC 2015

Modified Files:
src/external/bsd/ntp/scripts [netbsd-7]: mkver

Log Message:
Pull up following revision(s) (requested by christos in ticket #1036):
external/bsd/ntp/scripts/mkver: revision 1.8
PR/50426: Dave Tyson: Fix ntp reported version.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.3 -r1.4.4.4 src/external/bsd/ntp/scripts/mkver

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/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.4.4.3 src/external/bsd/ntp/scripts/mkver:1.4.4.4
--- src/external/bsd/ntp/scripts/mkver:1.4.4.3	Sun Nov  8 01:51:18 2015
+++ src/external/bsd/ntp/scripts/mkver	Tue Nov 17 19:09:08 2015
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
 
-ConfStr="$ConfStr 4.2.8p3"
+ConfStr="$ConfStr 4.2.8p4"
 
 case "$CSET" in
  '') ;;

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

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:21:14 UTC 2015

Modified Files:
src/sys/arch/arm/omap [netbsd-7]: omap3_sdhc.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #1017):
sys/arch/arm/omap/omap3_sdhc.c: revision 1.18
AM335x EDMA3 has an alignment restriction for both SAM and DAM in constant
addressing mode. In these cases, the physical address must be aligned to
256-bits. To handle this, pre-allocate a MAXPHYS sized bounce buffer and
use it for unaligned transfers.
Fixes edma errint! problem mentioned in port-arm/50288.


To generate a diff of this commit:
cvs rdiff -u -r1.14.4.2 -r1.14.4.3 src/sys/arch/arm/omap/omap3_sdhc.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/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.14.4.2 src/sys/arch/arm/omap/omap3_sdhc.c:1.14.4.3
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.14.4.2	Sun Nov  8 01:22:54 2015
+++ src/sys/arch/arm/omap/omap3_sdhc.c	Tue Nov 17 19:21:14 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdhc.c,v 1.14.4.2 2015/11/08 01:22:54 riz Exp $	*/
+/*	$NetBSD: omap3_sdhc.c,v 1.14.4.3 2015/11/17 19:21:14 riz Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.14.4.2 2015/11/08 01:22:54 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.14.4.3 2015/11/17 19:21:14 riz Exp $");
 
 #include "opt_omap.h"
 #include "edma.h"
@@ -109,13 +109,17 @@ struct obiosdhc_softc {
 	kcondvar_t		sc_edma_cv;
 	bus_addr_t		sc_edma_fifo;
 	bool			sc_edma_pending;
+	bus_dmamap_t		sc_edma_dmamap;
+	bus_dma_segment_t	sc_edma_segs[1];
+	void			*sc_edma_bbuf;
 #endif
 };
 
 #if NEDMA > 0
-static void obiosdhc_edma_init(struct obiosdhc_softc *, unsigned int);
+static int obiosdhc_edma_init(struct obiosdhc_softc *, unsigned int);
 static int obiosdhc_edma_xfer_data(struct sdhc_softc *, struct sdmmc_command *);
 static void obiosdhc_edma_done(void *);
+static int obiosdhc_edma_transfer(struct sdhc_softc *, struct sdmmc_command *);
 #endif
 
 #ifdef TI_AM335X
@@ -252,11 +256,13 @@ obiosdhc_attach(device_t parent, device_
 
 #if NEDMA > 0
 	if (oa->obio_edmabase != -1) {
+		if (obiosdhc_edma_init(sc, oa->obio_edmabase) != 0)
+			goto no_dma;
+
 		mutex_init(>sc_edma_lock, MUTEX_DEFAULT, IPL_SCHED);
 		cv_init(>sc_edma_cv, "sdhcedma");
 		sc->sc_edma_fifo = oa->obio_addr +
 		OMAP3_SDMMC_SDHC_OFFSET + SDHC_DATA;
-		obiosdhc_edma_init(sc, oa->obio_edmabase);
 		sc->sc.sc_flags |= SDHC_FLAG_USE_DMA;
 		sc->sc.sc_flags |= SDHC_FLAG_EXTERNAL_DMA;
 		sc->sc.sc_flags |= SDHC_FLAG_EXTDMA_DMAEN;
@@ -264,6 +270,7 @@ obiosdhc_attach(device_t parent, device_
 		sc->sc.sc_vendor_transfer_data_dma = obiosdhc_edma_xfer_data;
 		transfer_mode = "EDMA";
 	}
+no_dma:
 #endif
 
 	aprint_naive("\n");
@@ -494,10 +501,10 @@ obiosdhc_bus_clock(struct sdhc_softc *sc
 }
 
 #if NEDMA > 0
-static void
+static int
 obiosdhc_edma_init(struct obiosdhc_softc *sc, unsigned int edmabase)
 {
-	int i;
+	int i, error, rseg;
 
 	/* Request tx and rx DMA channels */
 	sc->sc_edma_tx = edma_channel_alloc(EDMA_TYPE_DMA, edmabase + 0,
@@ -521,18 +528,98 @@ obiosdhc_edma_init(struct obiosdhc_softc
 		KASSERT(sc->sc_edma_param_rx[i] != 0x);
 	}
 
-	return;
+	/* Setup bounce buffer */
+	error = bus_dmamem_alloc(sc->sc.sc_dmat, MAXPHYS, 32, MAXPHYS,
+	sc->sc_edma_segs, 1, , BUS_DMA_WAITOK);
+	if (error) {
+		aprint_error_dev(sc->sc.sc_dev,
+		"couldn't allocate dmamem: %d\n", error);
+		return error;
+	}
+	KASSERT(rseg == 1);
+	error = bus_dmamem_map(sc->sc.sc_dmat, sc->sc_edma_segs, rseg, MAXPHYS,
+	>sc_edma_bbuf, BUS_DMA_WAITOK);
+	if (error) {
+		aprint_error_dev(sc->sc.sc_dev, "couldn't map dmamem: %d\n",
+		error);
+		return error;
+	}
+	error = bus_dmamap_create(sc->sc.sc_dmat, MAXPHYS, 1, MAXPHYS, 0,
+	BUS_DMA_WAITOK, >sc_edma_dmamap);
+	if (error) {
+		aprint_error_dev(sc->sc.sc_dev, "couldn't create dmamap: %d\n",
+		error);
+		return error;
+	}
+
+	return error;
 }
 
 static int
 obiosdhc_edma_xfer_data(struct sdhc_softc *sdhc_sc, struct sdmmc_command *cmd)
 {
 	struct obiosdhc_softc *sc = device_private(sdhc_sc->sc_dev);
+	const bus_dmamap_t map = cmd->c_dmamap;
+	int seg, error;
+	bool bounce;
+
+	for (bounce = false, seg = 0; seg < cmd->c_dmamap->dm_nsegs; seg++) {
+		if ((cmd->c_dmamap->dm_segs[seg].ds_addr & 0x1f) != 0) {
+			bounce = true;
+			break;
+		}
+	}
+
+	if (bounce) {
+		error = bus_dmamap_load(sc->sc.sc_dmat, sc->sc_edma_dmamap,
+		sc->sc_edma_bbuf, MAXPHYS, NULL, BUS_DMA_WAITOK);
+		if (error) {
+			device_printf(sc->sc.sc_dev,
+			"[bounce] bus_dmamap_load failed: %d\n", error);
+			return error;
+		}
+		if (ISSET(cmd->c_flags, SCF_CMD_READ)) {
+			bus_dmamap_sync(sc->sc.sc_dmat, sc->sc_edma_dmamap, 0,
+			MAXPHYS, BUS_DMASYNC_PREREAD);
+		} else {

CVS commit: [netbsd-7] src/doc

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:22:10 UTC 2015

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

Log Message:
ticket 1017.


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

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.33 src/doc/CHANGES-7.1:1.1.2.34
--- src/doc/CHANGES-7.1:1.1.2.33	Tue Nov 17 19:18:19 2015
+++ src/doc/CHANGES-7.1	Tue Nov 17 19:22:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.33 2015/11/17 19:18:19 riz Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.34 2015/11/17 19:22:10 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1585,3 +1585,9 @@ external/bsd/ntp/scripts/mkver			1.8
 	PR/50426: Dave Tyson: Fix ntp reported version.
 	[christos, ticket #1036]
 
+sys/arch/arm/omap/omap3_sdhc.c			1.18 via patch
+
+	Fix edma_errint problems with resize_ffs on beaglebone.
+	PR#50288.
+	[jmcneill, ticket #1017]
+

CVS commit: [netbsd-6-1] src/external/bsd/bind

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 19:55:12 UTC 2015

Modified Files:
src/external/bsd/bind/dist [netbsd-6-1]: CHANGES COPYRIGHT FAQ.xml
README config.h.in config.h.win32 configure configure.in srcid
version
src/external/bsd/bind/dist/bin/check [netbsd-6-1]: named-checkconf.c
src/external/bsd/bind/dist/bin/dig [netbsd-6-1]: dig.1 dig.docbook
dig.html dighost.c host.c nslookup.c
src/external/bsd/bind/dist/bin/dig/include/dig [netbsd-6-1]: dig.h
src/external/bsd/bind/dist/bin/dnssec [netbsd-6-1]: dnssec-dsfromkey.c
dnssec-importkey.c dnssec-keyfromlabel.c dnssec-keygen.8
dnssec-keygen.c dnssec-keygen.docbook dnssec-keygen.html
dnssec-settime.8 dnssec-settime.c dnssec-settime.docbook
dnssec-settime.html dnssec-signzone.c dnssec-verify.c dnssectool.c
dnssectool.h
src/external/bsd/bind/dist/bin/named [netbsd-6-1]: client.c config.c
interfacemgr.c main.c named.html query.c server.c update.c
zoneconf.c
src/external/bsd/bind/dist/bin/named/include/named [netbsd-6-1]:
globals.h
src/external/bsd/bind/dist/bin/nsupdate [netbsd-6-1]: nsupdate.c
src/external/bsd/bind/dist/bin/rndc [netbsd-6-1]: rndc.c
src/external/bsd/bind/dist/bin/tests/system [netbsd-6-1]: conf.sh.in
genzone.sh start.pl
src/external/bsd/bind/dist/bin/tests/system/checkconf [netbsd-6-1]:
good.conf tests.sh
src/external/bsd/bind/dist/bin/tests/system/checkzone [netbsd-6-1]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec [netbsd-6-1]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns2 [netbsd-6-1]:
example.db.in sign.sh
src/external/bsd/bind/dist/bin/tests/system/dnssec/ns3 [netbsd-6-1]:
named.conf sign.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones [netbsd-6-1]:
clean.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/emptyzones/ns1 [netbsd-6-1]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/forward [netbsd-6-1]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/forward/ns2 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/forward/ns4 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/inline [netbsd-6-1]:
clean.sh setup.sh
src/external/bsd/bind/dist/bin/tests/system/inline/ns2 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/notify [netbsd-6-1]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/notify/ns2 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/redirect [netbsd-6-1]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver [netbsd-6-1]:
tests.sh
src/external/bsd/bind/dist/bin/tests/system/resolver/ns4 [netbsd-6-1]:
root.db tld1.db tld2.db
src/external/bsd/bind/dist/bin/tests/system/resolver/ns7 [netbsd-6-1]:
named1.conf named2.conf
src/external/bsd/bind/dist/bin/tests/system/rpz [netbsd-6-1]: tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd [netbsd-6-1]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns1 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns2 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/upforwd/ns3 [netbsd-6-1]:
named.conf
src/external/bsd/bind/dist/bin/tests/system/views [netbsd-6-1]:
clean.sh setup.sh tests.sh
src/external/bsd/bind/dist/bin/tests/system/views/ns2 [netbsd-6-1]:
named2.conf
src/external/bsd/bind/dist/bin/tests/system/xfer [netbsd-6-1]:
dig1.good dig2.good
src/external/bsd/bind/dist/contrib/dlz/example [netbsd-6-1]: README
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt [netbsd-6-1]:
README.md
src/external/bsd/bind/dist/contrib/dlz/modules/bdbhpt/testing 
[netbsd-6-1]:
dns-data.txt
src/external/bsd/bind/dist/contrib/sdb/ldap [netbsd-6-1]: ldapdb.c
src/external/bsd/bind/dist/doc/arm [netbsd-6-1]: Bv9ARM-book.xml
Bv9ARM.ch01.html Bv9ARM.ch02.html Bv9ARM.ch03.html Bv9ARM.ch04.html
Bv9ARM.ch05.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html
Bv9ARM.ch09.html Bv9ARM.ch10.html Bv9ARM.html Makefile.in
dnssec.xml latex-fixup.pl man.arpaname.html man.ddns-confgen.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html 

CVS commit: [netbsd-7] src

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:18:19 UTC 2015

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1
src/sys/compat/linux/common [netbsd-7]: linux_mod.c
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_mod.c

Log Message:
Revert ticket #1020, per pgoyette in ticket #1041.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-7.1
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/compat/linux/common/linux_mod.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/compat/netbsd32/netbsd32_mod.c

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.32 src/doc/CHANGES-7.1:1.1.2.33
--- src/doc/CHANGES-7.1:1.1.2.32	Mon Nov 16 14:46:54 2015
+++ src/doc/CHANGES-7.1	Tue Nov 17 19:18:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.32 2015/11/16 14:46:54 msaitoh Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.33 2015/11/17 19:18:19 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -1473,12 +1473,6 @@ external/bsd/ntp/scripts/mkver  
 	Update ntp to 4.2.8p4.
 	[christos, ticket #1024]
 
-sys/compat/linux/common/linux_mod.c		1.5
-sys/compat/netbsd32/netbsd32_mod.c		1.6-1.9
-
-	Fixes for compat modules.
-	[pgoyette, ticket #1020]
-
 usr.sbin/vnconfig/vnconfig.8			1.40
 
 	In NetBSD 7, the vnconfig command was renamed.
@@ -1585,3 +1579,9 @@ sys/dev/usb/usb_subr.c1.204
 
 	Attach serial number as property to all USB devices having one.
 	[joerg, ticket #1032]
+
+external/bsd/ntp/scripts/mkver			1.8
+
+	PR/50426: Dave Tyson: Fix ntp reported version.
+	[christos, ticket #1036]
+

Index: src/sys/compat/linux/common/linux_mod.c
diff -u src/sys/compat/linux/common/linux_mod.c:1.4.4.1 src/sys/compat/linux/common/linux_mod.c:1.4.4.2
--- src/sys/compat/linux/common/linux_mod.c:1.4.4.1	Sun Nov  8 02:02:37 2015
+++ src/sys/compat/linux/common/linux_mod.c	Tue Nov 17 19:18:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $	*/
+/*	$NetBSD: linux_mod.c,v 1.4.4.2 2015/11/17 19:18:19 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.1 2015/11/08 02:02:37 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_mod.c,v 1.4.4.2 2015/11/17 19:18:19 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
@@ -65,8 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: linux_mod.c,
 # define	MD3	""
 #endif
 
-MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio,compat_sysv"
-	MD1 MD2 MD3);
+MODULE(MODULE_CLASS_EXEC, compat_linux, "compat,compat_ossaudio" MD1 MD2 MD3);
 
 static struct execsw linux_execsw[] = {
 #if defined(EXEC_ELF32) && ELFSIZE == 32

Index: src/sys/compat/netbsd32/netbsd32_mod.c
diff -u src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.1 src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.2
--- src/sys/compat/netbsd32/netbsd32_mod.c:1.5.2.1	Sun Nov  8 02:02:36 2015
+++ src/sys/compat/netbsd32/netbsd32_mod.c	Tue Nov 17 19:18:19 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $	*/
+/*	$NetBSD: netbsd32_mod.c,v 1.5.2.2 2015/11/17 19:18:19 riz Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -30,13 +30,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.1 2015/11/08 02:02:36 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mod.c,v 1.5.2.2 2015/11/17 19:18:19 riz Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_execfmt.h"
-# define	DEPS1	"compat,compat_sysv,nfsserver,mqueue"
+# define	DEPS1	"compat"
 #else
-# define	DEPS1	"compat,compat_sysv,nfsserver,mqueue,ksem"
+# define	DEPS1	"compat,ksem"
 #endif
 
 #ifndef ELFSIZE

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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 19:36:36 UTC 2015

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
reverted ticket 1329


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-6.0.7

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-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.53 src/doc/CHANGES-6.0.7:1.1.2.54
--- src/doc/CHANGES-6.0.7:1.1.2.53	Mon Nov 16 07:55:50 2015
+++ src/doc/CHANGES-6.0.7	Tue Nov 17 19:36:36 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.53 2015/11/16 07:55:50 msaitoh Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.54 2015/11/17 19:36:36 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -7020,12 +7020,6 @@ sys/dev/mii/atphy.c1.17
 	Fix incorrect argument of mii_anar(). Fixes PR#50206.
 	[msaitoh, ticket #1325]
 
-external/bsd/bind/distpatch
-external/bsd/bind/include			patch
-
-	Update bind to 9.9.7-P3
-	[spz, ticket #1329]
-
 sys/kern/kern_exec.c1.419, 1.420
 sys/kern/kern_exit.c1.246, 1.247
 sys/kern/kern_synch.c1.309

CVS commit: src/lib/libc/db/hash

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Tue Nov 17 20:19:55 UTC 2015

Modified Files:
src/lib/libc/db/hash: hash.c

Log Message:
PR/50441: Manuel Bouyer: hash seq enumeration skips keys on big data.
XXX: pullup-7


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/libc/db/hash/hash.c

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

Modified files:

Index: src/lib/libc/db/hash/hash.c
diff -u src/lib/libc/db/hash/hash.c:1.35 src/lib/libc/db/hash/hash.c:1.36
--- src/lib/libc/db/hash/hash.c:1.35	Mon Jun 22 17:16:02 2015
+++ src/lib/libc/db/hash/hash.c	Tue Nov 17 15:19:55 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.35 2015/06/22 21:16:02 christos Exp $	*/
+/*	$NetBSD: hash.c,v 1.36 2015/11/17 20:19:55 christos Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -37,7 +37,7 @@
 #endif
 
 #include 
-__RCSID("$NetBSD: hash.c,v 1.35 2015/06/22 21:16:02 christos Exp $");
+__RCSID("$NetBSD: hash.c,v 1.36 2015/11/17 20:19:55 christos Exp $");
 
 #include "namespace.h"
 #include 
@@ -770,7 +770,7 @@ next_bucket:
 hashp->cndx = 1;
 			}
 		} else {
-			bp = (uint16_t *)(void *)hashp->cpage->page;
+			bp = (uint16_t *)(void *)bufp->page;
 			if (flag == R_NEXT || flag == 0) {
 if (hashp->cndx > bp[0]) {
 	hashp->cpage = NULL;
@@ -802,6 +802,7 @@ next_bucket:
 	if (bp[ndx + 1] < REAL_KEY) {
 		if (__big_keydata(hashp, bufp, key, data, 1))
 			return (ERROR);
+		hashp->cndx = 1;
 	} else {
 		if (hashp->cpage == NULL)
 			return (ERROR);
@@ -809,8 +810,8 @@ next_bucket:
 		key->size = (ndx > 1 ? bp[ndx - 1] : hashp->BSIZE) - bp[ndx];
 		data->data = (uint8_t *)hashp->cpage->page + bp[ndx + 1];
 		data->size = bp[ndx] - bp[ndx + 1];
+		hashp->cndx += 2;
 	}
-	hashp->cndx += 2;
 	return (SUCCESS);
 }
 

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Nov 18 02:51:11 UTC 2015

Modified Files:
src/sys/netinet6: nd6.c

Log Message:
Unify nd6_ns_output calls in nd6_llinfo_timer

Inspired by FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/sys/netinet6/nd6.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.177 src/sys/netinet6/nd6.c:1.178
--- src/sys/netinet6/nd6.c:1.177	Fri Sep 11 10:33:32 2015
+++ src/sys/netinet6/nd6.c	Wed Nov 18 02:51:11 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.177 2015/09/11 10:33:32 roy Exp $	*/
+/*	$NetBSD: nd6.c,v 1.178 2015/11/18 02:51:11 ozaki-r Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.177 2015/09/11 10:33:32 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.178 2015/11/18 02:51:11 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -438,6 +438,8 @@ nd6_llinfo_timer(void *arg)
 	const struct sockaddr_in6 *dst;
 	struct ifnet *ifp;
 	struct nd_ifinfo *ndi = NULL;
+	bool send_ns = false;
+	const struct in6_addr *daddr6 = NULL;
 
 	mutex_enter(softnet_lock);
 	KERNEL_LOCK(1, NULL);
@@ -470,8 +472,7 @@ nd6_llinfo_timer(void *arg)
 	case ND6_LLINFO_INCOMPLETE:
 		if (ln->ln_asked < nd6_mmaxtries) {
 			ln->ln_asked++;
-			nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
-			nd6_ns_output(ifp, NULL, >sin6_addr, ln, 0);
+			send_ns = true;
 		} else {
 			struct mbuf *m = ln->ln_hold;
 			if (m) {
@@ -514,9 +515,8 @@ nd6_llinfo_timer(void *arg)
 			/* We need NUD */
 			ln->ln_asked = 1;
 			ln->ln_state = ND6_LLINFO_PROBE;
-			nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
-			nd6_ns_output(ifp, >sin6_addr,
-			>sin6_addr, ln, 0);
+			daddr6 = >sin6_addr;
+			send_ns = true;
 		} else {
 			ln->ln_state = ND6_LLINFO_STALE; /* XXX */
 			nd6_llinfo_settimer(ln, (long)nd6_gctimer * hz);
@@ -525,9 +525,8 @@ nd6_llinfo_timer(void *arg)
 	case ND6_LLINFO_PROBE:
 		if (ln->ln_asked < nd6_umaxtries) {
 			ln->ln_asked++;
-			nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
-			nd6_ns_output(ifp, >sin6_addr,
-			>sin6_addr, ln, 0);
+			daddr6 = >sin6_addr;
+			send_ns = true;
 		} else {
 			(void)nd6_free(rt, 0);
 			ln = NULL;
@@ -535,6 +534,11 @@ nd6_llinfo_timer(void *arg)
 		break;
 	}
 
+	if (send_ns) {
+		nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
+		nd6_ns_output(ifp, daddr6, >sin6_addr, ln, 0);
+	}
+
 	KERNEL_UNLOCK_ONE(NULL);
 	mutex_exit(softnet_lock);
 }

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Nov 18 05:16:22 UTC 2015

Modified Files:
src/sys/netinet6: nd6.c nd6.h nd6_nbr.c

Log Message:
Stop passing llinfo_nd6 to nd6_ns_output

This is a restructuring for coming changes to nd6 (replacing
llinfo_nd6 with llentry). Once we have a lock of llinfo_nd6,
we need to pass it to nd6_ns_output with holding the lock.
However, in a function subsequent to nd6_ns_output, the llinfo_nd6
may be looked up, i.e., its lock would be acquired again.
To avoid such a situation, pass only required data (in6_addr) to
nd6_ns_output instead of passing whole llinfo_nd6.

Inspired by FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/netinet6/nd6.c
cvs rdiff -u -r1.66 -r1.67 src/sys/netinet6/nd6.h
cvs rdiff -u -r1.110 -r1.111 src/sys/netinet6/nd6_nbr.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/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.178 src/sys/netinet6/nd6.c:1.179
--- src/sys/netinet6/nd6.c:1.178	Wed Nov 18 02:51:11 2015
+++ src/sys/netinet6/nd6.c	Wed Nov 18 05:16:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.c,v 1.178 2015/11/18 02:51:11 ozaki-r Exp $	*/
+/*	$NetBSD: nd6.c,v 1.179 2015/11/18 05:16:22 ozaki-r Exp $	*/
 /*	$KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.178 2015/11/18 02:51:11 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.179 2015/11/18 05:16:22 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -430,6 +430,32 @@ nd6_llinfo_settimer(struct llinfo_nd6 *l
 	splx(s);
 }
 
+/*
+ * Gets source address of the first packet in hold queue
+ * and stores it in @src.
+ * Returns pointer to @src (if hold queue is not empty) or NULL.
+ */
+static struct in6_addr *
+nd6_llinfo_get_holdsrc(struct llinfo_nd6 *ln, struct in6_addr *src)
+{
+	struct ip6_hdr *hip6;
+
+	if (ln == NULL || ln->ln_hold == NULL)
+		return NULL;
+
+	/*
+	 * assuming every packet in ln_hold has the same IP header
+	 */
+	hip6 = mtod(ln->ln_hold, struct ip6_hdr *);
+	/* XXX pullup? */
+	if (sizeof(*hip6) < ln->ln_hold->m_len)
+		*src = hip6->ip6_src;
+	else
+		src = NULL;
+
+	return src;
+}
+
 static void
 nd6_llinfo_timer(void *arg)
 {
@@ -535,8 +561,11 @@ nd6_llinfo_timer(void *arg)
 	}
 
 	if (send_ns) {
+		struct in6_addr src, *psrc;
+
 		nd6_llinfo_settimer(ln, (long)ndi->retrans * hz / 1000);
-		nd6_ns_output(ifp, daddr6, >sin6_addr, ln, 0);
+		psrc = nd6_llinfo_get_holdsrc(ln, );
+		nd6_ns_output(ifp, daddr6, >sin6_addr, psrc, 0);
 	}
 
 	KERNEL_UNLOCK_ONE(NULL);
@@ -2384,10 +2413,13 @@ nd6_output(struct ifnet *ifp, struct ifn
 	 * INCOMPLETE state, send the first solicitation.
 	 */
 	if (!ND6_LLINFO_PERMANENT(ln) && ln->ln_asked == 0) {
+		struct in6_addr src, *psrc;
+
 		ln->ln_asked++;
 		nd6_llinfo_settimer(ln,
 		(long)ND_IFINFO(ifp)->retrans * hz / 1000);
-		nd6_ns_output(ifp, NULL, >sin6_addr, ln, 0);
+		psrc = nd6_llinfo_get_holdsrc(ln, );
+		nd6_ns_output(ifp, NULL, >sin6_addr, psrc, 0);
 	}
 	error = 0;
 	goto exit;

Index: src/sys/netinet6/nd6.h
diff -u src/sys/netinet6/nd6.h:1.66 src/sys/netinet6/nd6.h:1.67
--- src/sys/netinet6/nd6.h:1.66	Fri Jul 17 02:21:08 2015
+++ src/sys/netinet6/nd6.h	Wed Nov 18 05:16:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6.h,v 1.66 2015/07/17 02:21:08 ozaki-r Exp $	*/
+/*	$NetBSD: nd6.h,v 1.67 2015/11/18 05:16:22 ozaki-r Exp $	*/
 /*	$KAME: nd6.h,v 1.95 2002/06/08 11:31:06 itojun Exp $	*/
 
 /*
@@ -439,7 +439,7 @@ void nd6_na_output(struct ifnet *, const
 	const struct in6_addr *, u_long, int, const struct sockaddr *);
 void nd6_ns_input(struct mbuf *, int, int);
 void nd6_ns_output(struct ifnet *, const struct in6_addr *,
-	const struct in6_addr *, struct llinfo_nd6 *, int);
+	const struct in6_addr *, struct in6_addr *, int);
 const void *nd6_ifptomac(const struct ifnet *);
 void nd6_dad_start(struct ifaddr *, int);
 void nd6_dad_stop(struct ifaddr *);

Index: src/sys/netinet6/nd6_nbr.c
diff -u src/sys/netinet6/nd6_nbr.c:1.110 src/sys/netinet6/nd6_nbr.c:1.111
--- src/sys/netinet6/nd6_nbr.c:1.110	Mon Aug 24 22:21:27 2015
+++ src/sys/netinet6/nd6_nbr.c	Wed Nov 18 05:16:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: nd6_nbr.c,v 1.110 2015/08/24 22:21:27 pooka Exp $	*/
+/*	$NetBSD: nd6_nbr.c,v 1.111 2015/11/18 05:16:22 ozaki-r Exp $	*/
 /*	$KAME: nd6_nbr.c,v 1.61 2001/02/10 16:06:14 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.110 2015/08/24 22:21:27 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6_nbr.c,v 1.111 2015/11/18 05:16:22 ozaki-r Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -350,7 +350,7 @@ nd6_ns_input(struct mbuf *m, int off, in
 void
 nd6_ns_output(struct ifnet *ifp, const struct in6_addr *daddr6,
 const struct in6_addr *taddr6,
-struct llinfo_nd6 *ln,	/* for source address determination */
+struct 

CVS commit: src/sys/dev/pci

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 04:24:02 UTC 2015

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

Log Message:
- Add the Auto Slot Power Limit Disable bit in Slot Control register and
  the Completion Timeout Prefix/Header Log Capable bit in the AER capability
  and control register (ECN: Downstream Port Containment (DPC)).
- Add the Poisoned TLP Egress Block bit (ECN: Enhanced DPC).
- Update Link Capabilities 2 register and Link Control 3 register (ECN:
  Separate Refclk Independent SSC Architecture (SRIS))
- ECN: Readiness Notifications (RN)
- Add the Retimer Presence Detect Supported bit in the Link Capabilities 2
  register and the Retimer Presence Detected bit in the Link Status 2 register
  (ECN: Extension Devices)


To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.111 -r1.112 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.145 src/sys/dev/pci/pci_subr.c:1.146
--- src/sys/dev/pci/pci_subr.c:1.145	Tue Nov 17 18:26:50 2015
+++ src/sys/dev/pci/pci_subr.c	Wed Nov 18 04:24:02 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.145 2015/11/17 18:26:50 msaitoh Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.146 2015/11/18 04:24:02 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.145 2015/11/17 18:26:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.146 2015/11/18 04:24:02 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -729,6 +729,7 @@ pci_conf_print_common(
 	onoff("Interrupt disable", rval, PCI_COMMAND_INTERRUPT_DISABLE);
 
 	printf("Status register: 0x%04x\n", (rval >> 16) & 0x);
+	onoff("Immediate Readness", rval, PCI_STATUS_IMMD_READNESS);
 	onoff2("Interrupt status", rval, PCI_STATUS_INT_STATUS, "active",
 	"inactive");
 	onoff("Capability List support", rval, PCI_STATUS_CAPLIST_SUPPORT);
@@ -1441,6 +1442,34 @@ pci_print_pcie_compl_timeout(uint32_t va
 	}
 }
 
+static const char * const pcie_linkspeeds[] = {"2.5", "5.0", "8.0"};
+
+static void
+pci_print_pcie_linkspeed(pcireg_t val)
+{
+
+	/* Start from 1 */
+	if (val < 1 || val > __arraycount(pcie_linkspeeds))
+		printf("unknown value (%u)\n", val);
+	else
+		printf("%sGT/s\n", pcie_linkspeeds[val - 1]);
+}
+
+static void
+pci_print_pcie_linkspeedvector(pcireg_t val)
+{
+	unsigned int i;
+
+	/* Start from 0 */
+	for (i = 0; i < 16; i++)
+		if (((val >> i) & 0x01) != 0) {
+			if (i >= __arraycount(pcie_linkspeeds))
+printf(" unknown vector (%x)", 1 << i);
+			else
+printf(" %sGT/s", pcie_linkspeeds[i]);
+		}
+}
+
 static void
 pci_conf_print_pcie_cap(const pcireg_t *regs, int capoff)
 {
@@ -1450,8 +1479,6 @@ pci_conf_print_pcie_cap(const pcireg_t *
 	bool check_slot = false;
 	bool check_rootport = false;
 	unsigned int pciever;
-	static const char * const linkspeeds[] = {"2.5", "5.0", "8.0"};
-	int i;
 
 	printf("\n  PCI Express Capabilities Register\n");
 	/* Capability Register */
@@ -1573,12 +1600,7 @@ pci_conf_print_pcie_cap(const pcireg_t *
 		reg = regs[o2i(capoff + PCIE_LCAP)];
 		printf("Link Capabilities Register: 0x%08x\n", reg);
 		printf("  Maximum Link Speed: ");
-		val = reg & PCIE_LCAP_MAX_SPEED;
-		if (val < 1 || val > 3) {
-			printf("unknown %u value\n", val);
-		} else {
-			printf("%sGT/s\n", linkspeeds[val - 1]);
-		}
+		pci_print_pcie_linkspeed(reg & PCIE_LCAP_MAX_SPEED);
 		printf("  Maximum Link Width: x%u lanes\n",
 		(unsigned int)(reg & PCIE_LCAP_MAX_WIDTH) >> 4);
 		printf("  Active State PM Support: ");
@@ -1643,19 +1665,28 @@ pci_conf_print_pcie_cap(const pcireg_t *
 		PCIE_LCSR_LBMIE);
 		onoff("Link Autonomous Bandwidth Interrupt Enable", reg,
 		PCIE_LCSR_LABIE);
+		printf("  DRS Signaling Control: ");
+		val = __SHIFTOUT(reg, PCIE_LCSR_DRSSGNL);
+		switch (val) {
+		case 0:
+			printf("not reported\n");
+			break;
+		case 1:
+			printf("Interrupt Enabled\n");
+			break;
+		case 2:
+			printf("DRS to FRS Signaling Enabled\n");
+			break;
+		default:
+			printf("reserved\n");
+			break;
+		}
 
 		/* Link Status Register */
 		reg = regs[o2i(capoff + PCIE_LCSR)];
 		printf("Link Status Register: 0x%04x\n", reg >> 16);
 		printf("  Negotiated Link Speed: ");
-		if (((reg >> 16) & 0x000f) < 1 ||
-		((reg >> 16) & 0x000f) > 3) {
-			printf("unknown %u value\n",
-			(unsigned int)(reg & PCIE_LCSR_LINKSPEED) >> 16);
-		} else {
-			printf("%sGT/s\n",
-			linkspeeds[((reg & PCIE_LCSR_LINKSPEED) >> 16)-1]);
-		}
+		pci_print_pcie_linkspeed(__SHIFTOUT(reg, PCIE_LCSR_LINKSPEED));
 		printf("  Negotiated Link Width: x%u lanes\n",
 		(reg >> 20) & 0x003f);
 		onoff("Training Error", reg, PCIE_LCSR_LINKTRAIN_ERR);
@@ -1734,6 +1765,8 @@ 

CVS commit: src/tests/net/ndp

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Nov 18 04:13:01 UTC 2015

Modified Files:
src/tests/net/ndp: t_ndp.sh

Log Message:
Don't assign unused IP address

It sometimes creates an unexpected NDP cache.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/ndp/t_ndp.sh

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

Modified files:

Index: src/tests/net/ndp/t_ndp.sh
diff -u src/tests/net/ndp/t_ndp.sh:1.7 src/tests/net/ndp/t_ndp.sh:1.8
--- src/tests/net/ndp/t_ndp.sh:1.7	Tue Nov 17 06:44:13 2015
+++ src/tests/net/ndp/t_ndp.sh	Wed Nov 18 04:13:01 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: t_ndp.sh,v 1.7 2015/11/17 06:44:13 ozaki-r Exp $
+#	$NetBSD: t_ndp.sh,v 1.8 2015/11/18 04:13:01 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -68,10 +68,14 @@ neighborgcthresh_head()
 
 setup_dst_server()
 {
+	local assign_ip=$1
+
 	export RUMP_SERVER=$SOCKDST
 	atf_check -s exit:0 rump.ifconfig shmif0 create
 	atf_check -s exit:0 rump.ifconfig shmif0 linkstr bus1
-	atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6DST
+	if [ "$assign_ip" != no ]; then
+		atf_check -s exit:0 rump.ifconfig shmif0 inet6 $IP6DST
+	fi
 	atf_check -s exit:0 rump.ifconfig shmif0 up
 	atf_check -s exit:0 rump.ifconfig -w 10
 
@@ -249,7 +253,7 @@ neighborgcthresh_body()
 	atf_check -s exit:0 ${inetserver} $SOCKSRC
 	atf_check -s exit:0 ${inetserver} $SOCKDST
 
-	setup_dst_server
+	setup_dst_server no
 	setup_src_server
 
 	export RUMP_SERVER=$SOCKDST

CVS commit: [netbsd-6] src/lib/libc/net

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 09:25:03 UTC 2015

Modified Files:
src/lib/libc/net [netbsd-6]: getnetnamadr.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1340):
lib/libc/net/getnetnamadr.c: revision 1.43 via patch
lib/libc/net/getnetnamadr.c: revision 1.44 via patch
put the state back after it is used.
PR/50367: Stefan Schaeckeler: Apply fix to obey RES_CHECKNAME to getnetbyaddr
and getnetbyname.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.41.22.1 src/lib/libc/net/getnetnamadr.c

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

Modified files:

Index: src/lib/libc/net/getnetnamadr.c
diff -u src/lib/libc/net/getnetnamadr.c:1.41 src/lib/libc/net/getnetnamadr.c:1.41.22.1
--- src/lib/libc/net/getnetnamadr.c:1.41	Sun May 18 22:36:15 2008
+++ src/lib/libc/net/getnetnamadr.c	Tue Nov 17 09:25:03 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: getnetnamadr.c,v 1.41 2008/05/18 22:36:15 lukem Exp $	*/
+/*	$NetBSD: getnetnamadr.c,v 1.41.22.1 2015/11/17 09:25:03 bouyer Exp $	*/
 
 /* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
  *	Dep. Matematica Universidade de Coimbra, Portugal, Europe
@@ -43,7 +43,7 @@ static char sccsid[] = "@(#)getnetbyaddr
 static char sccsid_[] = "from getnetnamadr.c	1.4 (Coimbra) 93/06/03";
 static char rcsid[] = "Id: getnetnamadr.c,v 8.8 1997/06/01 20:34:37 vixie Exp ";
 #else
-__RCSID("$NetBSD: getnetnamadr.c,v 1.41 2008/05/18 22:36:15 lukem Exp $");
+__RCSID("$NetBSD: getnetnamadr.c,v 1.41.22.1 2015/11/17 09:25:03 bouyer Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -77,6 +77,12 @@ __weak_alias(getnetbyaddr,_getnetbyaddr)
 __weak_alias(getnetbyname,_getnetbyname)
 #endif
 
+#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0U || \
+   (ok)(nm) != 0)
+#define maybe_hnok(res, hn) maybe_ok((res), (hn), res_hnok)
+#define maybe_dnok(res, dn) maybe_ok((res), (dn), res_dnok)
+
+
 extern int _net_stayopen;
 
 #define BYADDR 0
@@ -105,7 +111,7 @@ static	struct netent net_entry;
 static	char *net_aliases[MAXALIASES];
 
 static int		parse_reversed_addr(const char *, in_addr_t *);
-static struct netent	*getnetanswer(querybuf *, int, int);
+static struct netent	*getnetanswer(res_state, querybuf *, int, int);
 static int		_files_getnetbyaddr(void *, void *, va_list);
 static int		_files_getnetbyname(void *, void *, va_list);
 static int		_dns_getnetbyaddr(void *, void *, va_list);
@@ -159,7 +165,7 @@ parse_reversed_addr(const char *str, in_
 }
 
 static struct netent *
-getnetanswer(querybuf *answer, int anslen, int net_i)
+getnetanswer(res_state res, querybuf *answer, int anslen, int net_i)
 {
 	static char	n_name[MAXDNAME];
 	static char	netbuf[PACKETSZ];
@@ -172,6 +178,7 @@ getnetanswer(querybuf *answer, int ansle
 	char		*in, *bp, **ap, *ep;
 
 	_DIAGASSERT(answer != NULL);
+	_DIAGASSERT(res != NULL);
 
 	/*
 	 * find first satisfactory answer
@@ -216,7 +223,7 @@ getnetanswer(querybuf *answer, int ansle
 	n_name[0] = '\0';
 	while (--ancount >= 0 && cp < eom) {
 		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !res_dnok(bp))
+		if ((n < 0) || !maybe_dnok(res, bp))
 			break;
 		cp += n;
 		(void)strlcpy(n_name, bp, sizeof(n_name));
@@ -226,7 +233,7 @@ getnetanswer(querybuf *answer, int ansle
 		GETSHORT(n, cp);
 		if (class == C_IN && type == T_PTR) {
 			n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-			if ((n < 0) || !res_hnok(bp)) {
+			if ((n < 0) || !maybe_hnok(res, bp)) {
 cp += n;
 return NULL;
 			}
@@ -357,8 +364,8 @@ _dns_getnetbyaddr(void *cbrv, void *cbda
 		__res_put_state(res);
 		return NS_NOTFOUND;
 	}
+	np = getnetanswer(res, buf, anslen, BYADDR);
 	__res_put_state(res);
-	np = getnetanswer(buf, anslen, BYADDR);
 	free(buf);
 	if (np) {
 		/* maybe net should be unsigned? */
@@ -469,8 +476,8 @@ _dns_getnetbyname(void *cbrv, void *cbda
 		__res_put_state(res);
 		return NS_NOTFOUND;
 	}
+	np = getnetanswer(res, buf, anslen, BYNAME);
 	__res_put_state(res);
-	np = getnetanswer(buf, anslen, BYNAME);
 	free(buf);
 
 	if (np != NULL) {

CVS commit: [netbsd-6] src/lib/libc/net

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 09:28:05 UTC 2015

Modified Files:
src/lib/libc/net [netbsd-6]: getaddrinfo.c

Log Message:
Pull up following revision(s) (requested by christos in ticket #1340):
lib/libc/net/getnetnamadr.c: revision 1.43 via patch
lib/libc/net/getnetnamadr.c: revision 1.44 via patch
put the state back after it is used.
PR/50367: Stefan Schaeckeler: Apply fix to obey RES_CHECKNAME to getnetbyaddr
and getnetbyname.


To generate a diff of this commit:
cvs rdiff -u -r1.96.4.2 -r1.96.4.3 src/lib/libc/net/getaddrinfo.c

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

Modified files:

Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.96.4.2 src/lib/libc/net/getaddrinfo.c:1.96.4.3
--- src/lib/libc/net/getaddrinfo.c:1.96.4.2	Mon Dec 23 22:56:48 2013
+++ src/lib/libc/net/getaddrinfo.c	Tue Nov 17 09:28:05 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: getaddrinfo.c,v 1.96.4.2 2013/12/23 22:56:48 riz Exp $	*/
+/*	$NetBSD: getaddrinfo.c,v 1.96.4.3 2015/11/17 09:28:05 bouyer Exp $	*/
 /*	$KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $	*/
 
 /*
@@ -55,7 +55,7 @@
 
 #include 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.96.4.2 2013/12/23 22:56:48 riz Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.96.4.3 2015/11/17 09:28:05 bouyer Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -214,8 +214,8 @@ static int addrconfig(uint64_t *);
 static int ip6_str2scopeid(char *, struct sockaddr_in6 *, u_int32_t *);
 #endif
 
-static struct addrinfo *getanswer(const querybuf *, int, const char *, int,
-	const struct addrinfo *);
+static struct addrinfo *getanswer(res_state, const querybuf *, int,
+const char *, int, const struct addrinfo *);
 static void aisort(struct addrinfo *s, res_state res);
 static int _dns_getaddrinfo(void *, void *, va_list);
 static void _sethtent(FILE **);
@@ -1102,9 +1102,12 @@ ip6_str2scopeid(char *scope, struct sock
 static const char AskedForGot[] =
 	"gethostby*.getanswer: asked for \"%s\", got \"%s\"";
 
+#define maybe_ok(res, nm, ok) (((res)->options & RES_NOCHECKNAME) != 0U || \
+   (ok)(nm) != 0)
+
 static struct addrinfo *
-getanswer(const querybuf *answer, int anslen, const char *qname, int qtype,
-const struct addrinfo *pai)
+getanswer(res_state res, const querybuf *answer, int anslen, const char *qname,
+int qtype, const struct addrinfo *pai)
 {
 	struct addrinfo sentinel, *cur;
 	struct addrinfo ai;
@@ -1124,6 +1127,7 @@ getanswer(const querybuf *answer, int an
 	_DIAGASSERT(answer != NULL);
 	_DIAGASSERT(qname != NULL);
 	_DIAGASSERT(pai != NULL);
+	_DIAGASSERT(res != NULL);
 
 	memset(, 0, sizeof(sentinel));
 	cur = 
@@ -1153,7 +1157,7 @@ getanswer(const querybuf *answer, int an
 		return (NULL);
 	}
 	n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-	if ((n < 0) || !(*name_ok)(bp)) {
+	if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
 		h_errno = NO_RECOVERY;
 		return (NULL);
 	}
@@ -1177,7 +1181,7 @@ getanswer(const querybuf *answer, int an
 	had_error = 0;
 	while (ancount-- > 0 && cp < eom && !had_error) {
 		n = dn_expand(answer->buf, eom, cp, bp, ep - bp);
-		if ((n < 0) || !(*name_ok)(bp)) {
+		if ((n < 0) || !maybe_ok(res, bp, name_ok)) {
 			had_error++;
 			continue;
 		}
@@ -1196,7 +1200,7 @@ getanswer(const querybuf *answer, int an
 		if ((qtype == T_A || qtype == T_ || qtype == T_ANY) &&
 		type == T_CNAME) {
 			n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-			if ((n < 0) || !(*name_ok)(tbuf)) {
+			if ((n < 0) || !maybe_ok(res, tbuf, name_ok)) {
 had_error++;
 continue;
 			}
@@ -1407,14 +1411,14 @@ _dns_getaddrinfo(void *rv, void	*cb_data
 		free(buf2);
 		return NS_NOTFOUND;
 	}
-	ai = getanswer(buf, q.n, q.name, q.qtype, pai);
+	ai = getanswer(res, buf, q.n, q.name, q.qtype, pai);
 	if (ai) {
 		cur->ai_next = ai;
 		while (cur && cur->ai_next)
 			cur = cur->ai_next;
 	}
 	if (q.next) {
-		ai = getanswer(buf2, q2.n, q2.name, q2.qtype, pai);
+		ai = getanswer(res, buf2, q2.n, q2.name, q2.qtype, pai);
 		if (ai)
 			cur->ai_next = ai;
 	}

CVS commit: [netbsd-6] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 09:28:43 UTC 2015

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
ticket 1340


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.234 -r1.1.2.235 src/doc/CHANGES-6.2

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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.234 src/doc/CHANGES-6.2:1.1.2.235
--- src/doc/CHANGES-6.2:1.1.2.234	Mon Nov 16 09:02:28 2015
+++ src/doc/CHANGES-6.2	Tue Nov 17 09:28:43 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.234 2015/11/16 09:02:28 bouyer Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.235 2015/11/17 09:28:43 bouyer Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -12729,3 +12729,11 @@ sys/arch/xen/xen/xbdback_xenbus.c		1.61
 	when a userland process could use all CPU.
 	Should fix the problem reported by Torbj?rn Granlund on port-xen@
 	[bouyer, ticket #1347]
+
+lib/libc/net/getnetnamadr.c			1.43, 1.44 via patch
+lib/libc/net/getaddrinfo.c			patch
+
+	PR/50367: Stefan Schaeckeler: Apply fix to obey RES_CHECKNAME to
+	getnetbyaddr and getnetbyname.
+	[christos, ticket #1340]
+

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

[Juergen Hannken-Illjes]

Module Name:src
Committed By:   hannken
Date:   Tue Nov 17 10:34:04 UTC 2015

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

Log Message:
Replace SIMPLEQ_FOREACH with SIMPLEQ_FOREACH_SAFE to prevent use-after-free.


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/x86/x86/intr.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/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.90 src/sys/arch/x86/x86/intr.c:1.91
--- src/sys/arch/x86/x86/intr.c:1.90	Fri Oct  9 13:03:55 2015
+++ src/sys/arch/x86/x86/intr.c	Tue Nov 17 10:34:04 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.c,v 1.90 2015/10/09 13:03:55 knakahara Exp $	*/
+/*	$NetBSD: intr.c,v 1.91 2015/11/17 10:34:04 hannken Exp $	*/
 
 /*-
  * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.90 2015/10/09 13:03:55 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.91 2015/11/17 10:34:04 hannken Exp $");
 
 #include "opt_intrdebug.h"
 #include "opt_multiprocessor.h"
@@ -1013,9 +1013,10 @@ intr_establish_xname(int legacy_irq, str
 	 * device's pci_intr_alloc() or this function.
 	 */
 	if (source->is_handlers != NULL) {
-		struct intrsource *isp;
+		struct intrsource *isp, *nisp;
 
-		SIMPLEQ_FOREACH(isp, _interrupt_sources, is_list) {
+		SIMPLEQ_FOREACH_SAFE(isp, _interrupt_sources,
+		is_list, nisp) {
 			if (strncmp(intrstr, isp->is_intrid, INTRIDBUF - 1) == 0
 			&& isp->is_handlers == NULL)
 intr_free_io_intrsource_direct(isp);

CVS commit: [netbsd-6-1] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 07:44:38 UTC 2015

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
Ticket 1344 and 1345.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-6.1.6

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-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.53 src/doc/CHANGES-6.1.6:1.1.2.54
--- src/doc/CHANGES-6.1.6:1.1.2.53	Tue Nov 17 19:58:36 2015
+++ src/doc/CHANGES-6.1.6	Wed Nov 18 07:44:37 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.53 2015/11/17 19:58:36 bouyer Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.54 2015/11/18 07:44:37 msaitoh Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -6806,3 +6806,15 @@ sys/arch/xen/xen/xbdback_xenbus.c		1.61
 	when a userland process could use all CPU.
 	Should fix the problem reported by Torbj?rn Granlund on port-xen@
 	[bouyer, ticket #1347]
+
+sys/net/if_gif.c1.89, 1.90
+
+	Fix "ifconfig gifX tunnel src dst" panic when sockaddr_dup() rerurns
+	null.
+	[knakahara, ticket #1344]
+
+sys/net/if_gif.c1.91, 1.92
+
+	Fix panic after "ifconfig gifX tunnel src dst" failed because of
+	duplicate pair address.
+	[knakahara, ticket #1345]

CVS commit: [netbsd-6-0] src/sys/net

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 07:36:22 UTC 2015

Modified Files:
src/sys/net [netbsd-6-0]: if_gif.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1344):
sys/net/if_gif.c: revision 1.89
sys/net/if_gif.c: revision 1.90
CID 980463: Provide common error path for rollback. Remove extra check for
success.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.80.14.1 src/sys/net/if_gif.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.80 src/sys/net/if_gif.c:1.80.14.1
--- src/sys/net/if_gif.c:1.80	Fri Oct 28 16:42:52 2011
+++ src/sys/net/if_gif.c	Wed Nov 18 07:36:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.80 2011/10/28 16:42:52 dyoung Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.80.14.1 2015/11/18 07:36:22 msaitoh Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80 2011/10/28 16:42:52 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.14.1 2015/11/18 07:36:22 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -746,17 +746,24 @@ gif_set_tunnel(struct ifnet *ifp, struct
 #endif
 		}
 
+	osrc = sc->gif_psrc;
+	odst = sc->gif_pdst;
+	sc->gif_psrc = sc->gif_pdst = NULL;
 	sc->gif_si = softint_establish(SOFTINT_NET, gifintr, sc);
 	if (sc->gif_si == NULL) {
 		error = ENOMEM;
-		goto bad;
+		goto rollback;
 	}
 
-	osrc = sc->gif_psrc;
-	sc->gif_psrc = sockaddr_dup(src, M_WAITOK);
+	if ((sc->gif_psrc = sockaddr_dup(src, M_WAITOK)) == NULL) {
+		error = ENOMEM;
+		goto rollback;
+	}
 
-	odst = sc->gif_pdst;
-	sc->gif_pdst = sockaddr_dup(dst, M_WAITOK);
+	if ((sc->gif_pdst = sockaddr_dup(dst, M_WAITOK)) == NULL) {
+		error = ENOMEM;
+		goto rollback;
+	}
 
 	switch (sc->gif_psrc->sa_family) {
 #ifdef INET
@@ -773,33 +780,32 @@ gif_set_tunnel(struct ifnet *ifp, struct
 		error = EINVAL;
 		break;
 	}
-	if (error) {
-		/* rollback */
-		sockaddr_free(sc->gif_psrc);
-		sockaddr_free(sc->gif_pdst);
-		sc->gif_psrc = osrc;
-		sc->gif_pdst = odst;
-		goto bad;
-	}
+	if (error)
+		goto rollback;
 
 	if (osrc)
 		sockaddr_free(osrc);
 	if (odst)
 		sockaddr_free(odst);
 
-	if (sc->gif_psrc && sc->gif_pdst)
-		ifp->if_flags |= IFF_RUNNING;
-	else
-		ifp->if_flags &= ~IFF_RUNNING;
+	ifp->if_flags |= IFF_RUNNING;
 	splx(s);
 
 	return 0;
 
- bad:
+rollback:
+	if (sc->gif_psrc != NULL)
+		sockaddr_free(sc->gif_psrc);
+	if (sc->gif_pdst != NULL)
+		sockaddr_free(sc->gif_pdst);
+	sc->gif_psrc = osrc;
+	sc->gif_pdst = odst;
+bad:
 	if (sc->gif_si) {
 		softint_disestablish(sc->gif_si);
 		sc->gif_si = NULL;
 	}
+
 	if (sc->gif_psrc && sc->gif_pdst)
 		ifp->if_flags |= IFF_RUNNING;
 	else

CVS commit: [netbsd-6-1] src/sys/net

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 07:41:17 UTC 2015

Modified Files:
src/sys/net [netbsd-6-1]: if_gif.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1345):
sys/net/if_gif.c: revision 1.91
sys/net/if_gif.c: revision 1.92
fix panic after "ifconfig gifX tunnel src dst" failed for the reason of address 
pair duplication.
e.g.

# ifconfig gif0 create
# ifconfig gif0 tunnel 192.168.0.1 192.168.0.2
# ifconfig gif0 inet 172.16.0.1/24 172.16.0.2
# route add 10.1.0.0/24 172.16.0.1
# ifconfig gif1 create
# ifconfig gif1 tunnel 192.168.0.1 192.168.0.3
# ifconfig gif0 tunnel 192.168.0.1 192.168.0.3
ifconfig: SIOCSLIFPHYADDR: Can't assign requested address # expected
# ping 10.1.0.1
(panic)

fix CID 980463


To generate a diff of this commit:
cvs rdiff -u -r1.80.8.1.2.1 -r1.80.8.1.2.2 src/sys/net/if_gif.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.80.8.1.2.1 src/sys/net/if_gif.c:1.80.8.1.2.2
--- src/sys/net/if_gif.c:1.80.8.1.2.1	Wed Nov 18 07:34:41 2015
+++ src/sys/net/if_gif.c	Wed Nov 18 07:41:17 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.80.8.1.2.1 2015/11/18 07:34:41 msaitoh Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.80.8.1.2.2 2015/11/18 07:41:17 msaitoh Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.8.1.2.1 2015/11/18 07:34:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.8.1.2.2 2015/11/18 07:41:17 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -717,7 +717,8 @@ gif_set_tunnel(struct ifnet *ifp, struct
 		if (sockaddr_cmp(sc2->gif_pdst, dst) == 0 &&
 		sockaddr_cmp(sc2->gif_psrc, src) == 0) {
 			error = EADDRNOTAVAIL;
-			goto bad;
+			/* continue to use the old configureation. */
+			goto out;
 		}
 
 		/* XXX both end must be valid? (I mean, not 0.0.0.0) */
@@ -785,10 +786,8 @@ gif_set_tunnel(struct ifnet *ifp, struct
 	if (odst)
 		sockaddr_free(odst);
 
-	ifp->if_flags |= IFF_RUNNING;
-	splx(s);
-
-	return 0;
+	error = 0;
+	goto out;
 
 rollback:
 	if (sc->gif_psrc != NULL)
@@ -797,18 +796,19 @@ rollback:
 		sockaddr_free(sc->gif_pdst);
 	sc->gif_psrc = osrc;
 	sc->gif_pdst = odst;
-bad:
+
 	if (sc->gif_si) {
 		softint_disestablish(sc->gif_si);
 		sc->gif_si = NULL;
 	}
 
+out:
 	if (sc->gif_psrc && sc->gif_pdst)
 		ifp->if_flags |= IFF_RUNNING;
 	else
 		ifp->if_flags &= ~IFF_RUNNING;
-	splx(s);
 
+	splx(s);
 	return error;
 }
 

CVS commit: [netbsd-6-0] src/sys/net

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 07:41:57 UTC 2015

Modified Files:
src/sys/net [netbsd-6-0]: if_gif.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1345):
sys/net/if_gif.c: revision 1.91
sys/net/if_gif.c: revision 1.92
fix panic after "ifconfig gifX tunnel src dst" failed for the reason of address 
pair duplication.
e.g.

# ifconfig gif0 create
# ifconfig gif0 tunnel 192.168.0.1 192.168.0.2
# ifconfig gif0 inet 172.16.0.1/24 172.16.0.2
# route add 10.1.0.0/24 172.16.0.1
# ifconfig gif1 create
# ifconfig gif1 tunnel 192.168.0.1 192.168.0.3
# ifconfig gif0 tunnel 192.168.0.1 192.168.0.3
ifconfig: SIOCSLIFPHYADDR: Can't assign requested address # expected
# ping 10.1.0.1
(panic)

fix CID 980463


To generate a diff of this commit:
cvs rdiff -u -r1.80.14.1 -r1.80.14.2 src/sys/net/if_gif.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.80.14.1 src/sys/net/if_gif.c:1.80.14.2
--- src/sys/net/if_gif.c:1.80.14.1	Wed Nov 18 07:36:22 2015
+++ src/sys/net/if_gif.c	Wed Nov 18 07:41:57 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.80.14.1 2015/11/18 07:36:22 msaitoh Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.80.14.2 2015/11/18 07:41:57 msaitoh Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.14.1 2015/11/18 07:36:22 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.14.2 2015/11/18 07:41:57 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -720,7 +720,8 @@ gif_set_tunnel(struct ifnet *ifp, struct
 		if (sockaddr_cmp(sc2->gif_pdst, dst) == 0 &&
 		sockaddr_cmp(sc2->gif_psrc, src) == 0) {
 			error = EADDRNOTAVAIL;
-			goto bad;
+			/* continue to use the old configureation. */
+			goto out;
 		}
 
 		/* XXX both end must be valid? (I mean, not 0.0.0.0) */
@@ -788,10 +789,8 @@ gif_set_tunnel(struct ifnet *ifp, struct
 	if (odst)
 		sockaddr_free(odst);
 
-	ifp->if_flags |= IFF_RUNNING;
-	splx(s);
-
-	return 0;
+	error = 0;
+	goto out;
 
 rollback:
 	if (sc->gif_psrc != NULL)
@@ -800,18 +799,19 @@ rollback:
 		sockaddr_free(sc->gif_pdst);
 	sc->gif_psrc = osrc;
 	sc->gif_pdst = odst;
-bad:
+
 	if (sc->gif_si) {
 		softint_disestablish(sc->gif_si);
 		sc->gif_si = NULL;
 	}
 
+out:
 	if (sc->gif_psrc && sc->gif_pdst)
 		ifp->if_flags |= IFF_RUNNING;
 	else
 		ifp->if_flags &= ~IFF_RUNNING;
-	splx(s);
 
+	splx(s);
 	return error;
 }
 

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

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 07:45:00 UTC 2015

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
Ticket 1344 and 1345.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-6.0.7

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-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.54 src/doc/CHANGES-6.0.7:1.1.2.55
--- src/doc/CHANGES-6.0.7:1.1.2.54	Tue Nov 17 19:36:36 2015
+++ src/doc/CHANGES-6.0.7	Wed Nov 18 07:45:00 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.54 2015/11/17 19:36:36 bouyer Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.55 2015/11/18 07:45:00 msaitoh Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -7085,3 +7085,16 @@ sys/arch/xen/xen/xbdback_xenbus.c		1.61
 	when a userland process could use all CPU.
 	Should fix the problem reported by Torbj?rn Granlund on port-xen@
 	[bouyer, ticket #1347]
+
+sys/net/if_gif.c1.89, 1.90
+
+	Fix "ifconfig gifX tunnel src dst" panic when sockaddr_dup() rerurns
+	null.
+	[knakahara, ticket #1344]
+
+sys/net/if_gif.c1.91, 1.92
+
+	fix panic after "ifconfig gifX tunnel src dst" failed because of
+	duplicate pair address.
+	fix CID 980463
+	[knakahara, ticket #1345]

CVS commit: [netbsd-6-1] src/sys/net

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 07:34:41 UTC 2015

Modified Files:
src/sys/net [netbsd-6-1]: if_gif.c

Log Message:
Pull up following revision(s) (requested by knakahara in ticket #1344):
sys/net/if_gif.c: revision 1.89
sys/net/if_gif.c: revision 1.90
CID 980463: Provide common error path for rollback. Remove extra check for
success.


To generate a diff of this commit:
cvs rdiff -u -r1.80.8.1 -r1.80.8.1.2.1 src/sys/net/if_gif.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.80.8.1 src/sys/net/if_gif.c:1.80.8.1.2.1
--- src/sys/net/if_gif.c:1.80.8.1	Fri Feb  8 20:42:51 2013
+++ src/sys/net/if_gif.c	Wed Nov 18 07:34:41 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.80.8.1 2013/02/08 20:42:51 riz Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.80.8.1.2.1 2015/11/18 07:34:41 msaitoh Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.8.1 2013/02/08 20:42:51 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.80.8.1.2.1 2015/11/18 07:34:41 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_iso.h"
@@ -743,17 +743,24 @@ gif_set_tunnel(struct ifnet *ifp, struct
 #endif
 		}
 
+	osrc = sc->gif_psrc;
+	odst = sc->gif_pdst;
+	sc->gif_psrc = sc->gif_pdst = NULL;
 	sc->gif_si = softint_establish(SOFTINT_NET, gifintr, sc);
 	if (sc->gif_si == NULL) {
 		error = ENOMEM;
-		goto bad;
+		goto rollback;
 	}
 
-	osrc = sc->gif_psrc;
-	sc->gif_psrc = sockaddr_dup(src, M_WAITOK);
+	if ((sc->gif_psrc = sockaddr_dup(src, M_WAITOK)) == NULL) {
+		error = ENOMEM;
+		goto rollback;
+	}
 
-	odst = sc->gif_pdst;
-	sc->gif_pdst = sockaddr_dup(dst, M_WAITOK);
+	if ((sc->gif_pdst = sockaddr_dup(dst, M_WAITOK)) == NULL) {
+		error = ENOMEM;
+		goto rollback;
+	}
 
 	switch (sc->gif_psrc->sa_family) {
 #ifdef INET
@@ -770,33 +777,32 @@ gif_set_tunnel(struct ifnet *ifp, struct
 		error = EINVAL;
 		break;
 	}
-	if (error) {
-		/* rollback */
-		sockaddr_free(sc->gif_psrc);
-		sockaddr_free(sc->gif_pdst);
-		sc->gif_psrc = osrc;
-		sc->gif_pdst = odst;
-		goto bad;
-	}
+	if (error)
+		goto rollback;
 
 	if (osrc)
 		sockaddr_free(osrc);
 	if (odst)
 		sockaddr_free(odst);
 
-	if (sc->gif_psrc && sc->gif_pdst)
-		ifp->if_flags |= IFF_RUNNING;
-	else
-		ifp->if_flags &= ~IFF_RUNNING;
+	ifp->if_flags |= IFF_RUNNING;
 	splx(s);
 
 	return 0;
 
- bad:
+rollback:
+	if (sc->gif_psrc != NULL)
+		sockaddr_free(sc->gif_psrc);
+	if (sc->gif_pdst != NULL)
+		sockaddr_free(sc->gif_pdst);
+	sc->gif_psrc = osrc;
+	sc->gif_pdst = odst;
+bad:
 	if (sc->gif_si) {
 		softint_disestablish(sc->gif_si);
 		sc->gif_si = NULL;
 	}
+
 	if (sc->gif_psrc && sc->gif_pdst)
 		ifp->if_flags |= IFF_RUNNING;
 	else

CVS commit: [netbsd-7-0] src/external/bsd/ntp/scripts

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:09:22 UTC 2015

Modified Files:
src/external/bsd/ntp/scripts [netbsd-7-0]: mkver

Log Message:
Pull up following revision(s) (requested by christos in ticket #1036):
external/bsd/ntp/scripts/mkver: revision 1.8
PR/50426: Dave Tyson: Fix ntp reported version.


To generate a diff of this commit:
cvs rdiff -u -r1.4.4.2.2.1 -r1.4.4.2.2.2 src/external/bsd/ntp/scripts/mkver

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/ntp/scripts/mkver
diff -u src/external/bsd/ntp/scripts/mkver:1.4.4.2.2.1 src/external/bsd/ntp/scripts/mkver:1.4.4.2.2.2
--- src/external/bsd/ntp/scripts/mkver:1.4.4.2.2.1	Sun Nov  8 01:55:39 2015
+++ src/external/bsd/ntp/scripts/mkver	Tue Nov 17 19:09:22 2015
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
 
-ConfStr="$ConfStr 4.2.8p3"
+ConfStr="$ConfStr 4.2.8p4"
 
 case "$CSET" in
  '') ;;

CVS commit: [netbsd-6-1] src/doc

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Tue Nov 17 19:58:36 UTC 2015

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
reverted ticket 1329


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-6.1.6

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-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.52 src/doc/CHANGES-6.1.6:1.1.2.53
--- src/doc/CHANGES-6.1.6:1.1.2.52	Mon Nov 16 07:55:29 2015
+++ src/doc/CHANGES-6.1.6	Tue Nov 17 19:58:36 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.52 2015/11/16 07:55:29 msaitoh Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.53 2015/11/17 19:58:36 bouyer Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -6741,12 +6741,6 @@ sys/dev/mii/atphy.c1.17
 	Fix incorrect argument of mii_anar(). Fixes PR#50206.
 	[msaitoh, ticket #1325]
 
-external/bsd/bind/distpatch
-external/bsd/bind/include			patch
-
-	Update bind to 9.9.7-P3
-	[spz, ticket #1329]
-
 sys/kern/kern_exec.c1.419, 1.420
 sys/kern/kern_exit.c1.246, 1.247
 sys/kern/kern_synch.c1.309

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

[Jeff Rizzo]

Module Name:src
Committed By:   riz
Date:   Tue Nov 17 19:18:56 UTC 2015

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

Log Message:
Ticket 1036.


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

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

Modified files:

Index: src/doc/CHANGES-7.0.1
diff -u src/doc/CHANGES-7.0.1:1.1.2.15 src/doc/CHANGES-7.0.1:1.1.2.16
--- src/doc/CHANGES-7.0.1:1.1.2.15	Mon Nov 16 14:47:16 2015
+++ src/doc/CHANGES-7.0.1	Tue Nov 17 19:18:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.1,v 1.1.2.15 2015/11/16 14:47:16 msaitoh Exp $
+# $NetBSD: CHANGES-7.0.1,v 1.1.2.16 2015/11/17 19:18:56 riz Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.0.1
 release:
@@ -761,3 +761,9 @@ sys/arch/sparc64/sparc64/vm_machdep.c		1
 
 	Fix various sparc64 compat_netbsd32 issues.
 	[martin, ticket #1028]
+
+external/bsd/ntp/scripts/mkver			1.8
+
+	PR/50426: Dave Tyson: Fix ntp reported version.
+	[christos, ticket #1036]
+

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

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Tue Nov 17 22:01:39 UTC 2015

Modified Files:
src/sys/arch/arm/nvidia: tegra_pcie.c

Log Message:
Add PCI Extended Configuration support for tegrapcie(4).

Similar to the acpimcfg code, this only maps the extended configuration
space into KVA for known busses.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/nvidia/tegra_pcie.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/nvidia/tegra_pcie.c
diff -u src/sys/arch/arm/nvidia/tegra_pcie.c:1.11 src/sys/arch/arm/nvidia/tegra_pcie.c:1.12
--- src/sys/arch/arm/nvidia/tegra_pcie.c:1.11	Tue Nov 17 00:08:33 2015
+++ src/sys/arch/arm/nvidia/tegra_pcie.c	Tue Nov 17 22:01:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pcie.c,v 1.11 2015/11/17 00:08:33 jakllsch Exp $ */
+/* $NetBSD: tegra_pcie.c,v 1.12 2015/11/17 22:01:39 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "locators.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.11 2015/11/17 00:08:33 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c,v 1.12 2015/11/17 22:01:39 jakllsch Exp $");
 
 #include 
 #include 
@@ -55,6 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: tegra_pcie.c
 static int	tegra_pcie_match(device_t, cfdata_t, void *);
 static void	tegra_pcie_attach(device_t, device_t, void *);
 
+#define TEGRA_PCIE_NBUS 256
+#define TEGRA_PCIE_ECFB (1<<(12 - 8))	/* extended conf frags per bus */
+
 struct tegra_pcie_ih {
 	int			(*ih_callback)(void *);
 	void			*ih_arg;
@@ -68,7 +71,6 @@ struct tegra_pcie_softc {
 	bus_space_tag_t		sc_bst;
 	bus_space_handle_t	sc_bsh_afi;
 	bus_space_handle_t	sc_bsh_rpconf;
-	bus_space_handle_t	sc_bsh_conf;
 	int			sc_intr;
 
 	struct arm32_pci_chipset sc_pc;
@@ -79,12 +81,18 @@ struct tegra_pcie_softc {
 
 	TAILQ_HEAD(, tegra_pcie_ih) sc_intrs;
 	u_int			sc_intrgen;
+
+	bus_space_handle_t	sc_bsh_extc[TEGRA_PCIE_NBUS-1][TEGRA_PCIE_ECFB];
 };
 
 static int	tegra_pcie_intr(void *);
 static void	tegra_pcie_init(pci_chipset_tag_t, void *);
 static void	tegra_pcie_enable(struct tegra_pcie_softc *);
 static void	tegra_pcie_setup(struct tegra_pcie_softc * const);
+static void	tegra_pcie_conf_frag_map(struct tegra_pcie_softc * const,
+	 uint, uint);
+static void	tegra_pcie_conf_map_bus(struct tegra_pcie_softc * const, uint);
+static void	tegra_pcie_conf_map_buses(struct tegra_pcie_softc * const);
 
 static void	tegra_pcie_attach_hook(device_t, device_t,
    struct pcibus_attach_args *);
@@ -138,9 +146,7 @@ tegra_pcie_attach(device_t parent, devic
 	if (bus_space_map(sc->sc_bst, TEGRA_PCIE_RPCONF_BASE,
 	TEGRA_PCIE_RPCONF_SIZE, 0, >sc_bsh_rpconf) != 0)
 		panic("couldn't map PCIE root ports");
-	if (bus_space_map(sc->sc_bst, TEGRA_PCIE_CONF_BASE,
-	TEGRA_PCIE_CONF_SIZE, 0, >sc_bsh_conf) != 0)
-		panic("couldn't map PCIE configuration");
+	tegra_pcie_conf_map_buses(sc);
 
 	TAILQ_INIT(>sc_intrs);
 	mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_VM);
@@ -339,6 +345,51 @@ tegra_pcie_enable(struct tegra_pcie_soft
 	AFI_INTR_MASK_REG, AFI_INTR_MASK_INT);
 }
 
+static void
+tegra_pcie_conf_frag_map(struct tegra_pcie_softc * const sc, uint bus,
+uint frg)
+{
+	bus_addr_t a;
+
+	KASSERT(bus >= 1);
+	KASSERT(bus < TEGRA_PCIE_NBUS);
+	KASSERT(frg < TEGRA_PCIE_ECFB);
+
+	if (sc->sc_bsh_extc[bus-1][frg] != 0) {
+		device_printf(sc->sc_dev, "bus %u fragment %#x already "
+		"mapped\n", bus, frg);
+		return;
+	}
+
+	a = TEGRA_PCIE_EXTC_BASE + (bus << 16) + (frg << 24);
+	if (bus_space_map(sc->sc_bst, a, 1 << 16, 0,
+	>sc_bsh_extc[bus-1][frg]) != 0)
+		device_printf(sc->sc_dev, "couldn't map PCIE "
+		"configuration for bus %u fragment %#x", bus, frg);
+}
+
+/* map non-non-extended configuration space for full bus range */
+static void
+tegra_pcie_conf_map_bus(struct tegra_pcie_softc * const sc, uint bus)
+{
+	uint i;
+
+	for (i = 1; i < TEGRA_PCIE_ECFB; i++) {
+		tegra_pcie_conf_frag_map(sc, bus, i);
+	}
+}
+
+/* map non-extended configuration space for full bus range */
+static void
+tegra_pcie_conf_map_buses(struct tegra_pcie_softc * const sc)
+{
+	uint b;
+
+	for (b = 1; b < TEGRA_PCIE_NBUS; b++) {
+		tegra_pcie_conf_frag_map(sc, b, 0);
+	}
+}
+
 void
 tegra_pcie_init(pci_chipset_tag_t pc, void *priv)
 {
@@ -364,6 +415,12 @@ static void
 tegra_pcie_attach_hook(device_t parent, device_t self,
 struct pcibus_attach_args *pba)
 {
+	const pci_chipset_tag_t pc = pba->pba_pc;
+	struct tegra_pcie_softc * const sc = pc->pc_conf_v;
+
+	if (pba->pba_bus >= 1) {
+		tegra_pcie_conf_map_bus(sc, pba->pba_bus);
+	}
 }
 
 static int
@@ -402,16 +459,19 @@ tegra_pcie_conf_read(void *v, pcitag_t t
 
 	tegra_pcie_decompose_tag(v, tag, , , );
 
+	if (b >= TEGRA_PCIE_NBUS)
+		return (pcireg_t) -1;
+
 	if (b == 0) {
 		if (d >= 2 || f != 0)
 			return (pcireg_t) -1;
 		reg = d * 0x1000 + offset;
 		bsh = 

CVS commit: [netbsd-6] src/doc

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Nov 18 06:52:21 UTC 2015

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Update entry of ticket 1344.


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.235 -r1.1.2.236 src/doc/CHANGES-6.2

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-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.235 src/doc/CHANGES-6.2:1.1.2.236
--- src/doc/CHANGES-6.2:1.1.2.235	Tue Nov 17 09:28:43 2015
+++ src/doc/CHANGES-6.2	Wed Nov 18 06:52:21 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.235 2015/11/17 09:28:43 bouyer Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.236 2015/11/18 06:52:21 msaitoh Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -12711,8 +12711,8 @@ sys/arch/sparc64/sparc64/vm_machdep.c		1
 
 sys/net/if_gif.c1.89, 1.90
 
-	CID 980463: Provide common error path for rollback. Remove extra check
-	for success.
+	Fix "ifconfig gifX tunnel src dst" panic when sockaddr_dup() rerurns
+	null.
 	[knakahara, ticket #1344]
 
 sys/net/if_gif.c1.91, 1.92