CVS commit: src/sys/arch/powerpc/oea

2021-03-10 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Thu Mar 11 04:43:47 UTC 2021

Modified Files:
src/sys/arch/powerpc/oea: pmap.c

Log Message:
Tidy up initialization of the kernel SRs just a bit.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/powerpc/oea/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/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.102 src/sys/arch/powerpc/oea/pmap.c:1.103
--- src/sys/arch/powerpc/oea/pmap.c:1.102	Wed Mar 10 18:29:07 2021
+++ src/sys/arch/powerpc/oea/pmap.c	Thu Mar 11 04:43:47 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.102 2021/03/10 18:29:07 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.103 2021/03/11 04:43:47 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 2021/03/10 18:29:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.103 2021/03/11 04:43:47 thorpej Exp $");
 
 #define	PMAP_NOOPNAMES
 
@@ -3378,17 +3378,10 @@ pmap_bootstrap1(paddr_t kernelstart, pad
 	pmap_vsid_bitmap[0] |= 1;
 
 	/*
-	 * Initialize kernel pmap and hardware.
+	 * Initialize kernel pmap.
 	 */
-
-/* PMAP_OEA64_BRIDGE does support these instructions */
-#if defined (PMAP_OEA) || defined (PMAP_OEA64_BRIDGE)
+#if defined(PMAP_OEA) || defined(PMAP_OEA64_BRIDGE)
 	for (i = 0; i < 16; i++) {
-#if defined(PPC_OEA601)
-	/* XXX wedges for segment register 0xf , so set later */
-	if ((iosrtable[i] & SR601_T) && ((MFPVR() >> 16) == MPC601))
-		continue;
-#endif
  		pmap_kernel()->pm_sr[i] = KERNELN_SEGMENT(i)|SR_PRKEY;
 	}
 	pmap_kernel()->pm_vsid = KERNEL_VSIDBITS;
@@ -3398,13 +3391,16 @@ pmap_bootstrap1(paddr_t kernelstart, pad
 	pmap_kernel()->pm_sr[KERNEL2_SR] = KERNEL2_SEGMENT|SR_SUKEY|SR_PRKEY;
 #endif
 #endif /* PMAP_OEA || PMAP_OEA64_BRIDGE */
-#if defined (PMAP_OEA)
-	for (i = 0; i < 16; i++) {
-		if (iosrtable[i] & SR601_T) {
-			pmap_kernel()->pm_sr[i] = iosrtable[i];
+
+#if defined(PMAP_OEA) && defined(PPC_OEA601)
+	if ((MFPVR() >> 16) == MPC601)) {
+		for (i = 0; i < 16; i++) {
+			if (iosrtable[i] & SR601_T) {
+pmap_kernel()->pm_sr[i] = iosrtable[i];
+			}
 		}
 	}
-#endif
+#endif /* PMAP_OEA && PPC_OEA601 */
 
 #ifdef ALTIVEC
 	pmap_use_altivec = cpu_altivec;
@@ -3500,9 +3496,9 @@ pmap_bootstrap1(paddr_t kernelstart, pad
 			pmap_pte_create(&pt, pm, va, pa | PTE_M|PTE_BW);
 			pmap_pte_insert(ptegidx, &pt);
 		}
-#endif
+#endif /* PMAP_NEED_FULL_MAPKERNEL */
 	}
-#endif
+#endif /* PMAP_NEED_MAPKERNEL */
 }
 
 /*
@@ -3512,23 +3508,18 @@ pmap_bootstrap1(paddr_t kernelstart, pad
 void
 pmap_bootstrap2(void)
 {
-/* PMAP_OEA64_BRIDGE does support these instructions */
-#if defined (PMAP_OEA) || defined (PMAP_OEA64_BRIDGE)
+#if defined(PMAP_OEA) || defined(PMAP_OEA64_BRIDGE)
 	for (int i = 0; i < 16; i++) {
-#if defined(PPC_OEA601)
-		/* XXX wedges for segment register 0xf , so set later */
-		if ((iosrtable[i] & SR601_T) && ((MFPVR() >> 16) == MPC601))
-			continue;
-#endif /* PPC_OEA601 */
 		__asm volatile("mtsrin %0,%1"
 			:: "r"(pmap_kernel()->pm_sr[i]),
 			   "r"(i << ADDR_SR_SHFT));
 	}
 #endif /* PMAP_OEA || PMAP_OEA64_BRIDGE */
-#if defined (PMAP_OEA)
+
+#if defined(PMAP_OEA)
 	 __asm volatile("sync; mtsdr1 %0; isync"
 		:: "r"((uintptr_t)pmap_pteg_table | (pmap_pteg_mask >> 10)));
-#elif defined (PMAP_OEA64) || defined (PMAP_OEA64_BRIDGE)
+#elif defined(PMAP_OEA64) || defined(PMAP_OEA64_BRIDGE)
 	__asm __volatile("sync; mtsdr1 %0; isync"
 		:: "r"((uintptr_t)pmap_pteg_table |
 		   (32 - __builtin_clz(pmap_pteg_mask >> 11;
@@ -3536,7 +3527,7 @@ pmap_bootstrap2(void)
 	tlbia();
 
 #if defined(PMAPDEBUG)
-	if ( pmapdebug )
+	if (pmapdebug)
 	pmap_print_mmuregs();
 #endif
 }



CVS commit: src/sys/dev/pci/ixgbe

2021-03-10 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Mar 11 02:30:47 UTC 2021

Modified Files:
src/sys/dev/pci/ixgbe: ixv.c

Log Message:
Add "TX " to "Queue No Descriptor Available" to make it more understandable.
Same as ixgbe.c rev. 1.278.


To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.155 src/sys/dev/pci/ixgbe/ixv.c:1.156
--- src/sys/dev/pci/ixgbe/ixv.c:1.155	Tue Mar  9 10:03:18 2021
+++ src/sys/dev/pci/ixgbe/ixv.c	Thu Mar 11 02:30:47 2021
@@ -1,4 +1,4 @@
-/*$NetBSD: ixv.c,v 1.155 2021/03/09 10:03:18 msaitoh Exp $*/
+/*$NetBSD: ixv.c,v 1.156 2021/03/11 02:30:47 msaitoh Exp $*/
 
 /**
 
@@ -2669,7 +2669,7 @@ ixv_add_stats_sysctls(struct adapter *ad
 		NULL, adapter->queues[i].evnamebuf, "TSO");
 		evcnt_attach_dynamic(&txr->no_desc_avail, EVCNT_TYPE_MISC,
 		NULL, adapter->queues[i].evnamebuf,
-		"Queue No Descriptor Available");
+		"TX Queue No Descriptor Available");
 		evcnt_attach_dynamic(&txr->total_packets, EVCNT_TYPE_MISC,
 		NULL, adapter->queues[i].evnamebuf,
 		"Queue Packets Transmitted");



CVS commit: src/sys/dev/pci

2021-03-10 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Mar 11 01:23:34 UTC 2021

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

Log Message:
Whitespace fixes. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.701 -r1.702 src/sys/dev/pci/if_wm.c

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.701 src/sys/dev/pci/if_wm.c:1.702
--- src/sys/dev/pci/if_wm.c:1.701	Mon Mar  1 04:50:17 2021
+++ src/sys/dev/pci/if_wm.c	Thu Mar 11 01:23:33 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.701 2021/03/01 04:50:17 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.702 2021/03/11 01:23:33 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.701 2021/03/01 04:50:17 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.702 2021/03/11 01:23:33 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -270,7 +270,7 @@ typedef union txdescs {
 
 typedef union rxdescs {
 	wiseman_rxdesc_t sctxu_rxdescs[WM_NRXDESC];
-	ext_rxdesc_t	  sctxu_ext_rxdescs[WM_NRXDESC]; /* 82574 only */
+	ext_rxdesc_t	 sctxu_ext_rxdescs[WM_NRXDESC]; /* 82574 only */
 	nq_rxdesc_t	 sctxu_nq_rxdescs[WM_NRXDESC]; /* 82575 and newer */
 } rxdescs_t;
 
@@ -399,8 +399,8 @@ struct wm_txqueue {
 	time_t txq_lastsent;
 
 	/* Checksum flags used for previous packet */
-	uint32_t 	txq_last_hw_cmd;
-	uint8_t 	txq_last_hw_fields;
+	uint32_t	txq_last_hw_cmd;
+	uint8_t		txq_last_hw_fields;
 	uint16_t	txq_last_hw_ipcs;
 	uint16_t	txq_last_hw_tucs;
 
@@ -3505,7 +3505,7 @@ static bool
 wm_phy_need_linkdown_discard(struct wm_softc *sc)
 {
 
-	switch(sc->sc_phytype) {
+	switch (sc->sc_phytype) {
 	case WMPHY_82577: /* ihphy */
 	case WMPHY_82578: /* atphy */
 	case WMPHY_82579: /* ihphy */
@@ -7570,9 +7570,9 @@ wm_tx_offload(struct wm_softc *sc, struc
 
 	default:
 		/* Don't support this protocol or encapsulation. */
- 		txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0;
- 		txq->txq_last_hw_ipcs = 0;
- 		txq->txq_last_hw_tucs = 0;
+		txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0;
+		txq->txq_last_hw_ipcs = 0;
+		txq->txq_last_hw_tucs = 0;
 		*fieldsp = 0;
 		*cmdp = 0;
 		return;
@@ -7728,8 +7728,7 @@ wm_tx_offload(struct wm_softc *sc, struc
 	 */
 	if (sc->sc_nqueues < 2) {
 		/*
-	 	 *
-	  	 * Setting up new checksum offload context for every
+		 * Setting up new checksum offload context for every
 		 * frames takes a lot of processing time for hardware.
 		 * This also reduces performance a lot for small sized
 		 * frames so avoid it if driver can use previously
@@ -7739,7 +7738,7 @@ wm_tx_offload(struct wm_softc *sc, struc
 		 * checking whether a frame has the same IP/TCP structure is
 		 * hard thing so just ignore that and always restablish a
 		 * new TSO context.
-	  	 */
+		 */
 		if ((m0->m_pkthdr.csum_flags & (M_CSUM_TSOv4 | M_CSUM_TSOv6))
 		== 0) {
 			if (txq->txq_last_hw_cmd == cmd &&
@@ -7751,9 +7750,9 @@ wm_tx_offload(struct wm_softc *sc, struc
 			}
 		}
 
-	 	txq->txq_last_hw_cmd = cmd;
- 		txq->txq_last_hw_fields = fields;
- 		txq->txq_last_hw_ipcs = (ipcs & 0x);
+		txq->txq_last_hw_cmd = cmd;
+		txq->txq_last_hw_fields = fields;
+		txq->txq_last_hw_ipcs = (ipcs & 0x);
 		txq->txq_last_hw_tucs = (tucs & 0x);
 	}
 
@@ -8073,8 +8072,8 @@ retry:
 		M_CSUM_TCPv6 | M_CSUM_UDPv6)) {
 			wm_tx_offload(sc, txq, txs, &cksumcmd, &cksumfields);
 		} else {
- 			txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0;
- 			txq->txq_last_hw_ipcs = txq->txq_last_hw_tucs = 0;
+			txq->txq_last_hw_cmd = txq->txq_last_hw_fields = 0;
+			txq->txq_last_hw_ipcs = txq->txq_last_hw_tucs = 0;
 			cksumcmd = 0;
 			cksumfields = 0;
 		}



CVS commit: src

2021-03-10 Thread SAITOH Masanobu
Module Name:src
Committed By:   msaitoh
Date:   Thu Mar 11 01:13:11 UTC 2021

Modified Files:
src/lib/libc/gen: extattr_copy_file.3
src/sbin/restore: tape.c

Log Message:
s/skiping/skipping/


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/gen/extattr_copy_file.3
cvs rdiff -u -r1.69 -r1.70 src/sbin/restore/tape.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/gen/extattr_copy_file.3
diff -u src/lib/libc/gen/extattr_copy_file.3:1.2 src/lib/libc/gen/extattr_copy_file.3:1.3
--- src/lib/libc/gen/extattr_copy_file.3:1.2	Fri Dec 16 15:21:13 2011
+++ src/lib/libc/gen/extattr_copy_file.3	Thu Mar 11 01:13:11 2021
@@ -1,4 +1,4 @@
-.\"	$NetBSD: extattr_copy_file.3,v 1.2 2011/12/16 15:21:13 manu Exp $
+.\"	$NetBSD: extattr_copy_file.3,v 1.3 2021/03/11 01:13:11 msaitoh Exp $
 .\"
 .\" Copyright (c) 2001 Dima Dorfman 
 .\" Copyright (c) 2011 Emmanuel Dreyfus 
@@ -76,7 +76,7 @@ respectively work the same was as
 and
 .Fn extattr_copy_link ,
 but will copy extended attributes from all namespaces accessible to the user,
-silently skiping unaccessible namespaces.
+silently skipping unaccessible namespaces.
 .Pp
 Please note that none of the extended attribute copying functions are atomic.
 .Sh RETURN VALUES

Index: src/sbin/restore/tape.c
diff -u src/sbin/restore/tape.c:1.69 src/sbin/restore/tape.c:1.70
--- src/sbin/restore/tape.c:1.69	Thu Sep  3 19:31:34 2020
+++ src/sbin/restore/tape.c	Thu Mar 11 01:13:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: tape.c,v 1.69 2020/09/03 19:31:34 bouyer Exp $	*/
+/*	$NetBSD: tape.c,v 1.70 2021/03/11 01:13:11 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: tape.c,v 1.69 2020/09/03 19:31:34 bouyer Exp $");
+__RCSID("$NetBSD: tape.c,v 1.70 2021/03/11 01:13:11 msaitoh Exp $");
 #endif
 #endif /* not lint */
 
@@ -1439,7 +1439,7 @@ skip:
 
 		default:
 			panic("unknown tape header type %d\n", spcl.c_type);
-			fprintf(stderr, "skiping to next header\n");
+			fprintf(stderr, "skipping to next header\n");
 			goto skip;
 
 		}



CVS commit: src/sys/netinet6

2021-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar 10 22:28:27 UTC 2021

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

Log Message:
byte-flipping a random number is not very useful.


To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/netinet6/ip6_output.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/ip6_output.c
diff -u src/sys/netinet6/ip6_output.c:1.226 src/sys/netinet6/ip6_output.c:1.227
--- src/sys/netinet6/ip6_output.c:1.226	Tue Sep  8 10:12:57 2020
+++ src/sys/netinet6/ip6_output.c	Wed Mar 10 17:28:26 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip6_output.c,v 1.226 2020/09/08 14:12:57 christos Exp $	*/
+/*	$NetBSD: ip6_output.c,v 1.227 2021/03/10 22:28:26 christos Exp $	*/
 /*	$KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $	*/
 
 /*
@@ -62,7 +62,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.226 2020/09/08 14:12:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.227 2021/03/10 22:28:26 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -889,7 +889,7 @@ ip6_output(
 		in6_ifstat_inc(ifp, ifs6_out_fragfail);
 		goto bad;
 	} else {
-		const u_int32_t id = htonl(ip6_randomid());
+		const uint32_t id = ip6_randomid();
 		struct mbuf **mnext, *m_frgpart;
 		const int hlen = unfragpartlen;
 		struct ip6_frag *ip6f;



CVS commit: src/sys/dist/pf/net

2021-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar 10 22:18:17 UTC 2021

Modified Files:
src/sys/dist/pf/net: if_pfsync.c

Log Message:
remove htons, it is pointless (thanks joerg@)


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dist/pf/net/if_pfsync.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/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.21 src/sys/dist/pf/net/if_pfsync.c:1.22
--- src/sys/dist/pf/net/if_pfsync.c:1.21	Wed Mar 10 10:21:11 2021
+++ src/sys/dist/pf/net/if_pfsync.c	Wed Mar 10 17:18:17 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pfsync.c,v 1.21 2021/03/10 15:21:11 christos Exp $	*/
+/*	$NetBSD: if_pfsync.c,v 1.22 2021/03/10 22:18:17 christos Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.21 2021/03/10 15:21:11 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.22 2021/03/10 22:18:17 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1587,7 +1587,7 @@ pfsync_sendout_mbuf(struct pfsync_softc 
 		ip->ip_hl = sizeof(*ip) >> 2;
 		ip->ip_tos = IPTOS_LOWDELAY;
 		ip->ip_len = htons(m->m_pkthdr.len);
-		ip->ip_id = htons(ip_randomid());
+		ip->ip_id = ip_randomid();
 		ip->ip_off = htons(IP_DF);
 		ip->ip_ttl = PFSYNC_DFLTTL;
 		ip->ip_p = IPPROTO_PFSYNC;



CVS commit: src/external/bsd/elftoolchain/dist/common

2021-03-10 Thread Joseph Koshy
Module Name:src
Committed By:   jkoshy
Date:   Wed Mar 10 21:36:29 UTC 2021

Modified Files:
src/external/bsd/elftoolchain/dist/common: _elftc.h

Log Message:
Update to upstream elftoolchain revision r3933.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/elftoolchain/dist/common/_elftc.h

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/elftoolchain/dist/common/_elftc.h
diff -u src/external/bsd/elftoolchain/dist/common/_elftc.h:1.7 src/external/bsd/elftoolchain/dist/common/_elftc.h:1.8
--- src/external/bsd/elftoolchain/dist/common/_elftc.h:1.7	Thu Nov 26 21:01:47 2020
+++ src/external/bsd/elftoolchain/dist/common/_elftc.h	Wed Mar 10 21:36:29 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: _elftc.h,v 1.7 2020/11/26 21:01:47 jkoshy Exp $	*/
+/*	$NetBSD: _elftc.h,v 1.8 2021/03/10 21:36:29 jkoshy Exp $	*/
 
 /*-
  * Copyright (c) 2009 Joseph Koshy
@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Id: _elftc.h 3894 2020-11-20 18:02:53Z jkoshy
+ * Id: _elftc.h 3933 2021-03-10 21:09:49Z jkoshy
  */
 
 /**
@@ -384,6 +384,10 @@ extern const char *__progname;
 #include 
 #include 
 
+#ifndef	roundup2
+#define	roundup2	roundup
+#endif
+
 #define	ELFTC_BYTE_ORDER			_BYTE_ORDER
 #define	ELFTC_BYTE_ORDER_LITTLE_ENDIAN		_LITTLE_ENDIAN
 #define	ELFTC_BYTE_ORDER_BIG_ENDIAN		_BIG_ENDIAN



CVS commit: src/sys/arch/macppc/macppc

2021-03-10 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Wed Mar 10 19:45:41 UTC 2021

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

Log Message:
switch G5 iMacs to full speed


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/macppc/macppc/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/macppc/macppc/machdep.c
diff -u src/sys/arch/macppc/macppc/machdep.c:1.173 src/sys/arch/macppc/macppc/machdep.c:1.174
--- src/sys/arch/macppc/macppc/machdep.c:1.173	Sat Feb 27 02:52:48 2021
+++ src/sys/arch/macppc/macppc/machdep.c	Wed Mar 10 19:45:41 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.173 2021/02/27 02:52:48 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.174 2021/03/10 19:45:41 macallan Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.173 2021/02/27 02:52:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.174 2021/03/10 19:45:41 macallan Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
@@ -145,6 +145,14 @@ initppc(u_int startkernel, u_int endkern
 		int clock_ih = OF_open("/u3/i2c/i2c-hwclock");
 		if (clock_ih != 0) {
 			OF_call_method_1("slew-high", clock_ih, 0);
+			OF_close(clock_ih);
+		}
+	}
+	if  (strncmp(model_name, "PowerMac8,", 10) == 0) {
+		int smu_ih = OF_open("/smu");
+		if (smu_ih != 0) {
+			OF_call_method_1("smu-powertune-hi", smu_ih, 0);
+			OF_close(smu_ih);
 		}
 	}
 
@@ -360,7 +368,7 @@ copy_disp_props(device_t dev, int node, 
 	}
 	if (!of_to_uint32_prop(dict, node, "address", "address")) {
 		uint32_t fbaddr = 0;
-			OF_interpret("frame-buffer-adr", 0, 1, &fbaddr);
+		OF_interpret("frame-buffer-adr", 0, 1, &fbaddr);
 		if (fbaddr != 0)
 			prop_dictionary_set_uint32(dict, "address", fbaddr);
 	}



CVS commit: src/sys/arch/powerpc/oea

2021-03-10 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Mar 10 18:29:07 UTC 2021

Modified Files:
src/sys/arch/powerpc/oea: pmap.c

Log Message:
- In pmap_bootstrap1(), make sure to initialize pmap_kernel()->pm_vsid
  with the kernel's base VSID.
- In va_to_vsid(), always compute the VSID from the base VSID in the
  pmap and the effective segment ID (ESID), rather than extracting it
  from the pmap's segment register value for that ESID.  Not only does
  this make the code the same between OEA and OEA64, but is also lets
  us compute the correct VSID for that pmap/ESID even if the cached SR
  for that ESID currently contains something else, such as an I/O segment
  mapping (as might be the case on a 601).

With this change, we can temporarily toggle between an I/O segment and
and HTAB-mapped segment if needed (e.g. when calling OpenFirmware on
a 601-based system).


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/powerpc/oea/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/powerpc/oea/pmap.c
diff -u src/sys/arch/powerpc/oea/pmap.c:1.101 src/sys/arch/powerpc/oea/pmap.c:1.102
--- src/sys/arch/powerpc/oea/pmap.c:1.101	Tue Mar  2 01:47:44 2021
+++ src/sys/arch/powerpc/oea/pmap.c	Wed Mar 10 18:29:07 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.101 2021/03/02 01:47:44 thorpej Exp $	*/
+/*	$NetBSD: pmap.c,v 1.102 2021/03/10 18:29:07 thorpej Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -63,7 +63,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.101 2021/03/02 01:47:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 2021/03/10 18:29:07 thorpej Exp $");
 
 #define	PMAP_NOOPNAMES
 
@@ -595,45 +595,17 @@ tlbia(void)
 static inline register_t
 va_to_vsid(const struct pmap *pm, vaddr_t addr)
 {
-#if defined (PMAP_OEA) || defined (PMAP_OEA64_BRIDGE)
-	return (pm->pm_sr[addr >> ADDR_SR_SHFT] & SR_VSID) >> SR_VSID_SHFT;
-#else /* PMAP_OEA64 */
-#if 0
-	const struct ste *ste;
-	register_t hash;
-	int i;
-
-	hash = (addr >> ADDR_ESID_SHFT) & ADDR_ESID_HASH;
-
-	/*
-	 * Try the primary group first
-	 */
-	ste = pm->pm_stes[hash].stes;
-	for (i = 0; i < 8; i++, ste++) {
-		if (ste->ste_hi & STE_V) &&
-		   (addr & ~(ADDR_POFF|ADDR_PIDX)) == (ste->ste_hi & STE_ESID))
-			return ste;
-	}
-
 	/*
-	 * Then the secondary group.
-	 */
-	ste = pm->pm_stes[hash ^ ADDR_ESID_HASH].stes;
-	for (i = 0; i < 8; i++, ste++) {
-		if (ste->ste_hi & STE_V) &&
-		   (addr & ~(ADDR_POFF|ADDR_PIDX)) == (ste->ste_hi & STE_ESID))
-			return addr;
-	}
-		
-	return NULL;
-#else
-	/*
-	 * Rather than searching the STE groups for the VSID, we know
-	 * how we generate that from the ESID and so do that.
+	 * Rather than searching the STE groups for the VSID or extracting
+	 * it from the SR, we know how we generate that from the ESID and
+	 * so do that.
+	 *
+	 * This makes the code the same for OEA and OEA64, and also allows
+	 * us to generate a correct-for-that-address-space VSID even if the
+	 * pmap contains a different SR value at any given moment (e.g.
+	 * kernel pmap on a 601 that is using I/O segments).
 	 */
 	return VSID_MAKE(addr >> ADDR_SR_SHFT, pm->pm_vsid) >> SR_VSID_SHFT;
-#endif
-#endif /* PMAP_OEA */
 }
 
 static inline register_t
@@ -3419,6 +3391,7 @@ pmap_bootstrap1(paddr_t kernelstart, pad
 #endif
  		pmap_kernel()->pm_sr[i] = KERNELN_SEGMENT(i)|SR_PRKEY;
 	}
+	pmap_kernel()->pm_vsid = KERNEL_VSIDBITS;
 
 	pmap_kernel()->pm_sr[KERNEL_SR] = KERNEL_SEGMENT|SR_SUKEY|SR_PRKEY;
 #ifdef KERNEL2_SR



CVS commit: src/sys/dev/ic

2021-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar 10 18:26:16 UTC 2021

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

Log Message:
remove extra arguments


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/sys/dev/ic/gem.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/gem.c
diff -u src/sys/dev/ic/gem.c:1.133 src/sys/dev/ic/gem.c:1.134
--- src/sys/dev/ic/gem.c:1.133	Sat Jan 30 02:53:01 2021
+++ src/sys/dev/ic/gem.c	Wed Mar 10 13:26:16 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: gem.c,v 1.133 2021/01/30 07:53:01 jdc Exp $ */
+/*	$NetBSD: gem.c,v 1.134 2021/03/10 18:26:16 christos Exp $ */
 
 /*
  *
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.133 2021/01/30 07:53:01 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.134 2021/03/10 18:26:16 christos Exp $");
 
 #include "opt_inet.h"
 
@@ -2297,17 +2297,17 @@ gem_rx_watchdog(void *arg)
 		if (rx_fifo_wr_ptr != rx_fifo_rd_ptr) {
 			DPRINTF(sc,
 			("%s: rx_watchdog: wr & rd ptr different\n",
-			device_xname(sc->sc_dev), state));
+			device_xname(sc->sc_dev)));
 			needreset = 0;
 		}
 		if (sc->sc_rx_fifo_wr_ptr != rx_fifo_wr_ptr) {
 			DPRINTF(sc, ("%s: rx_watchdog: wr pointer != saved\n",
-			device_xname(sc->sc_dev), state));
+			device_xname(sc->sc_dev)));
 			needreset = 0;
 		}
 		if (sc->sc_rx_fifo_rd_ptr != rx_fifo_rd_ptr) {
 			DPRINTF(sc, ("%s: rx_watchdog: rd pointer != saved\n",
-			device_xname(sc->sc_dev), state));
+			device_xname(sc->sc_dev)));
 			needreset = 0;
 		}
 		if (needreset) {



CVS commit: src/sys/dist/pf/net

2021-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar 10 15:21:11 UTC 2021

Modified Files:
src/sys/dist/pf/net: if_pfsync.c

Log Message:
remove args from ip_randomid() (John D. Baker). When does this file get built?


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dist/pf/net/if_pfsync.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/dist/pf/net/if_pfsync.c
diff -u src/sys/dist/pf/net/if_pfsync.c:1.20 src/sys/dist/pf/net/if_pfsync.c:1.21
--- src/sys/dist/pf/net/if_pfsync.c:1.20	Wed Jan 29 00:52:27 2020
+++ src/sys/dist/pf/net/if_pfsync.c	Wed Mar 10 10:21:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_pfsync.c,v 1.20 2020/01/29 05:52:27 thorpej Exp $	*/
+/*	$NetBSD: if_pfsync.c,v 1.21 2021/03/10 15:21:11 christos Exp $	*/
 /*	$OpenBSD: if_pfsync.c,v 1.83 2007/06/26 14:44:12 mcbride Exp $	*/
 
 /*
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.20 2020/01/29 05:52:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pfsync.c,v 1.21 2021/03/10 15:21:11 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1587,7 +1587,7 @@ pfsync_sendout_mbuf(struct pfsync_softc 
 		ip->ip_hl = sizeof(*ip) >> 2;
 		ip->ip_tos = IPTOS_LOWDELAY;
 		ip->ip_len = htons(m->m_pkthdr.len);
-		ip->ip_id = htons(ip_randomid(ip_ids, 0));
+		ip->ip_id = htons(ip_randomid());
 		ip->ip_off = htons(IP_DF);
 		ip->ip_ttl = PFSYNC_DFLTTL;
 		ip->ip_p = IPPROTO_PFSYNC;



CVS commit: src/lib/libpthread

2021-03-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Mar 10 15:05:11 UTC 2021

Modified Files:
src/lib/libpthread: pthread_types.h

Log Message:
Use __pthread_volatile for ptc_waiters (Greg A. Woods)


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/libpthread/pthread_types.h

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

Modified files:

Index: src/lib/libpthread/pthread_types.h
diff -u src/lib/libpthread/pthread_types.h:1.25 src/lib/libpthread/pthread_types.h:1.26
--- src/lib/libpthread/pthread_types.h:1.25	Wed Jun 10 18:45:15 2020
+++ src/lib/libpthread/pthread_types.h	Wed Mar 10 10:05:11 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: pthread_types.h,v 1.25 2020/06/10 22:45:15 ad Exp $	*/
+/*	$NetBSD: pthread_types.h,v 1.26 2021/03/10 15:05:11 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2008, 2020 The NetBSD Foundation, Inc.
@@ -172,7 +172,7 @@ struct	__pthread_cond_st {
 
 	/* Protects the queue of waiters */
 	__pthread_spin_t ptc_lock;
-	void *volatile ptc_waiters;
+	void *__pthread_volatile ptc_waiters;
 	void *ptc_spare;
 
 	pthread_mutex_t	*ptc_mutex;	/* Current mutex */



CVS commit: src

2021-03-10 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Wed Mar 10 13:30:34 UTC 2021

Modified Files:
src/distrib/sets/lists/comp: mi
src/lib/libc/gen: Makefile.inc

Log Message:
Add manpage links for asysctl(3) and asysctlbyname(3), already described
in sysctl(3).


To generate a diff of this commit:
cvs rdiff -u -r1.2376 -r1.2377 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.209 -r1.210 src/lib/libc/gen/Makefile.inc

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2376 src/distrib/sets/lists/comp/mi:1.2377
--- src/distrib/sets/lists/comp/mi:1.2376	Wed Mar 10 13:27:51 2021
+++ src/distrib/sets/lists/comp/mi	Wed Mar 10 13:30:34 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2376 2021/03/10 13:27:51 simonb Exp $
+#	$NetBSD: mi,v 1.2377 2021/03/10 13:30:34 simonb Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -6020,6 +6020,8 @@
 ./usr/share/man/cat3/asprintf_l.0		comp-c-catman		.cat
 ./usr/share/man/cat3/assert.0			comp-c-catman		.cat
 ./usr/share/man/cat3/assume_default_colors.0	comp-c-catman		.cat
+./usr/share/man/cat3/asysctl.0			comp-c-catman		.cat
+./usr/share/man/cat3/asysctlbyname.0		comp-c-catman		.cat
 ./usr/share/man/cat3/at_quick_exit.0		comp-c-catman		.cat
 ./usr/share/man/cat3/atan.0			comp-c-catman		.cat
 ./usr/share/man/cat3/atan2.0			comp-c-catman		.cat
@@ -14339,6 +14341,8 @@
 ./usr/share/man/html3/asprintf_l.html		comp-c-htmlman		html
 ./usr/share/man/html3/assert.html		comp-c-htmlman		html
 ./usr/share/man/html3/assume_default_colors.html	comp-c-htmlman		html
+./usr/share/man/html3/asysctl.html		comp-c-htmlman		html
+./usr/share/man/html3/asysctlbyname.html	comp-c-htmlman		html
 ./usr/share/man/html3/at_quick_exit.html		comp-c-htmlman		html
 ./usr/share/man/html3/atan.html			comp-c-htmlman		html
 ./usr/share/man/html3/atan2.html		comp-c-htmlman		html
@@ -22494,6 +22498,8 @@
 ./usr/share/man/man3/asprintf_l.3		comp-c-man		.man
 ./usr/share/man/man3/assert.3			comp-c-man		.man
 ./usr/share/man/man3/assume_default_colors.3	comp-c-man		.man
+./usr/share/man/man3/asysctl.3			comp-c-man		.man
+./usr/share/man/man3/asysctlbyname.3		comp-c-man		.man
 ./usr/share/man/man3/at_quick_exit.3		comp-c-man		.man
 ./usr/share/man/man3/atan.3			comp-c-man		.man
 ./usr/share/man/man3/atan2.3			comp-c-man		.man

Index: src/lib/libc/gen/Makefile.inc
diff -u src/lib/libc/gen/Makefile.inc:1.209 src/lib/libc/gen/Makefile.inc:1.210
--- src/lib/libc/gen/Makefile.inc:1.209	Fri Feb 26 04:28:14 2021
+++ src/lib/libc/gen/Makefile.inc	Wed Mar 10 13:30:34 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.209 2021/02/26 04:28:14 rin Exp $
+#	$NetBSD: Makefile.inc,v 1.210 2021/03/10 13:30:34 simonb Exp $
 #	from: @(#)Makefile.inc	8.6 (Berkeley) 5/4/95
 
 # gen sources
@@ -181,8 +181,9 @@ MLINKS+=sigsetops.3 sigemptyset.3 sigset
 	sigsetops.3 sigismember.3
 MLINKS+=stringlist.3 sl_init.3 stringlist.3 sl_free.3 stringlist.3 sl_add.3 \
 	stringlist.3 sl_find.3
-MLINKS+=sysctl.3 sysctlbyname.3 sysctl.3 sysctlgetmibinfo.3 \
-	sysctl.3 sysctlnametomib.3
+MLINKS+=sysctl.3 sysctlbyname.3 \
+	sysctl.3 sysctlgetmibinfo.3 sysctl.3 sysctlnametomib.3 \
+	sysctl.3 asysctl.3 sysctl.3 asysctlbyname.3
 MLINKS+=syslog.3 closelog.3 syslog.3 openlog.3 syslog.3 setlogmask.3 \
 	syslog.3 vsyslog.3
 MLINKS+=syslog.3 closelog_r.3 syslog.3 openlog_r.3 syslog.3 setlogmask_r.3 \



CVS commit: src

2021-03-10 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Wed Mar 10 13:27:51 UTC 2021

Modified Files:
src/distrib/sets/lists/comp: mi
src/share/man/man9: Makefile kprintf.9
src/sys/kern: subr_prf.c
src/sys/sys: systm.h

Log Message:
Add printf_nostamp(9), kernel printf() without prepending a timestamp.


To generate a diff of this commit:
cvs rdiff -u -r1.2375 -r1.2376 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.455 -r1.456 src/share/man/man9/Makefile
cvs rdiff -u -r1.39 -r1.40 src/share/man/man9/kprintf.9
cvs rdiff -u -r1.185 -r1.186 src/sys/kern/subr_prf.c
cvs rdiff -u -r1.298 -r1.299 src/sys/sys/systm.h

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

Modified files:

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2375 src/distrib/sets/lists/comp/mi:1.2376
--- src/distrib/sets/lists/comp/mi:1.2375	Fri Feb 26 03:08:25 2021
+++ src/distrib/sets/lists/comp/mi	Wed Mar 10 13:27:51 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.2375 2021/02/26 03:08:25 christos Exp $
+#	$NetBSD: mi,v 1.2376 2021/03/10 13:27:51 simonb Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.compcomp-sys-root
@@ -12043,6 +12043,7 @@
 ./usr/share/man/cat9/preempt.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/printf.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/printf_nolog.0		comp-sys-catman		.cat
+./usr/share/man/cat9/printf_nostamp.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/proc_find.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/proc_trampoline.0		comp-obsolete		obsolete
 ./usr/share/man/cat9/profhz.0			comp-sys-catman		.cat
@@ -20213,6 +20214,7 @@
 ./usr/share/man/html9/preempt.html		comp-sys-htmlman	html
 ./usr/share/man/html9/printf.html		comp-sys-htmlman	html
 ./usr/share/man/html9/printf_nolog.html		comp-sys-htmlman	html
+./usr/share/man/html9/printf_nostamp.html	comp-sys-htmlman	html
 ./usr/share/man/html9/proc_find.html		comp-sys-htmlman	html
 ./usr/share/man/html9/proc_trampoline.html	comp-obsolete		obsolete
 ./usr/share/man/html9/profhz.html		comp-sys-htmlman	html
@@ -28545,6 +28547,7 @@
 ./usr/share/man/man9/preempt.9			comp-sys-man		.man
 ./usr/share/man/man9/printf.9			comp-sys-man		.man
 ./usr/share/man/man9/printf_nolog.9		comp-sys-man		.man
+./usr/share/man/man9/printf_nostamp.9		comp-sys-man		.man
 ./usr/share/man/man9/proc_find.9		comp-sys-man		.man
 ./usr/share/man/man9/proc_trampoline.9		comp-obsolete		obsolete
 ./usr/share/man/man9/profhz.9			comp-sys-man		.man

Index: src/share/man/man9/Makefile
diff -u src/share/man/man9/Makefile:1.455 src/share/man/man9/Makefile:1.456
--- src/share/man/man9/Makefile:1.455	Sun Jan 24 17:29:11 2021
+++ src/share/man/man9/Makefile	Wed Mar 10 13:27:51 2021
@@ -1,4 +1,4 @@
-#   $NetBSD: Makefile,v 1.455 2021/01/24 17:29:11 thorpej Exp $
+#   $NetBSD: Makefile,v 1.456 2021/03/10 13:27:51 simonb Exp $
 
 #	Makefile for section 9 (kernel function and variable) manual pages.
 
@@ -464,7 +464,7 @@ MLINKS+=kpreempt.9 kpreempt_disable.9 \
 	kpreempt.9 kpreempt_disabled.9 \
 	kpreempt.9 kpreempt_enable.9
 MLINKS+=proc_find.9 pgrp_find.9
-MLINKS+=kprintf.9 printf.9 kprintf.9 printf_nolog.9 \
+MLINKS+=kprintf.9 printf.9 kprintf.9 printf_nolog.9 kprintf.9 printf_nostamp.9 \
 	kprintf.9 snprintf.9 kprintf.9 vprintf.9 \
 	kprintf.9 vsnprintf.9 kprintf.9 uprintf.9 kprintf.9 ttyprintf.9 \
 	kprintf.9 tprintf.9 kprintf.9 tprintf_open.9 kprintf.9 tprintf_close.9 \

Index: src/share/man/man9/kprintf.9
diff -u src/share/man/man9/kprintf.9:1.39 src/share/man/man9/kprintf.9:1.40
--- src/share/man/man9/kprintf.9:1.39	Tue May 21 09:24:21 2019
+++ src/share/man/man9/kprintf.9	Wed Mar 10 13:27:51 2021
@@ -1,4 +1,4 @@
-.\" $NetBSD: kprintf.9,v 1.39 2019/05/21 09:24:21 wiz Exp $
+.\" $NetBSD: kprintf.9,v 1.40 2021/03/10 13:27:51 simonb Exp $
 .\"
 .\" Copyright (c) 1998, 2002, 2007, 2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,13 +27,14 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd May 20, 2019
+.Dd March 10, 2021
 .Dt KPRINTF 9
 .Os
 .Sh NAME
 .Nm device_printf ,
 .Nm printf ,
 .Nm printf_nolog ,
+.Nm printf_nostamp ,
 .Nm snprintf ,
 .Nm vasprintf ,
 .Nm vprintf ,
@@ -68,6 +69,8 @@
 .Fn printf "const char *format" "..."
 .Ft void
 .Fn printf_nolog "const char *format" "..."
+.Ft void
+.Fn printf_nostamp "const char *format" "..."
 .Ft int
 .Fn snprintf "char *buf" "size_t size" "const char *format" "..."
 .Ft int
@@ -140,6 +143,11 @@ The
 function is identical to
 .Fn printf ,
 except it does not send the data to the system log.
+The
+.Fn printf_nostamp
+function is identical to
+.Fn printf ,
+except it does not prefix the output with a timestamp.
 The functions
 .Fn snprintf ,
 .Fn vasprintf ,

Index: src/sys/kern/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.185 src/sys/kern/subr_prf.c:1.186
--- src/sys

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

2021-03-10 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Wed Mar 10 11:03:49 UTC 2021

Modified Files:
src/sys/arch/arm/broadcom: files.bcm2835

Log Message:
Add PCIe driver to build.

You still need:

bcm2838pcie* at fdt?# STB PCIe host controller

in kernel config, and DTB entries like:

pci@7d50 {
compatible = "brcm,bcm2711-pcie\0brcm,pci-plat-dev";
device_type = "pci";
#address-cells = <0x03>;
#size-cells = <0x02>;
bus-range = <0x00 0x01>;
reg = <0x00 0x7d50 0x8>;
ranges = <0x200 0x00 0xf800 0x06 0x00 0x00 0x400>;
#interrupt-cells = <0x01>;
interrupt-map = <0x00 0x00 0x00 0x01 0x01 0x00 0x8f 0x04>;
interrupt-map-mask = <0x00 0x00 0x00 0x07>;
linux,pci-domain = <0x00>;
phandle = <0x90>;
};

and
pcie0 = "/scb/pci@7d50";

in __symbols__


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/broadcom/files.bcm2835

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

Modified files:

Index: src/sys/arch/arm/broadcom/files.bcm2835
diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.39 src/sys/arch/arm/broadcom/files.bcm2835:1.40
--- src/sys/arch/arm/broadcom/files.bcm2835:1.39	Tue Mar 31 12:23:17 2020
+++ src/sys/arch/arm/broadcom/files.bcm2835	Wed Mar 10 11:03:48 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: files.bcm2835,v 1.39 2020/03/31 12:23:17 jmcneill Exp $
+#	$NetBSD: files.bcm2835,v 1.40 2021/03/10 11:03:48 mlelstv Exp $
 #
 # Configuration info for Broadcom BCM2835 ARM Peripherals
 #
@@ -46,6 +46,11 @@ attach bcm2838rng at fdt with bcm2838rng
 file	arch/arm/broadcom/bcm2838_rng.c		bcm2838rng
 file	dev/ic/rng200.cbcm2838rng
 
+# Broadcom STB PCIE host
+device	bcm2838pcie: pcibus
+attach bcm2838pcie at fdt with bcm2838pcie_fdt
+file	arch/arm/broadcom/bcm2838_pcie.c	bcm2838pcie
+
 # AUX
 device	bcmaux
 attach	bcmaux at fdt with bcmaux_fdt