CVS commit: src/sys/conf
Module Name:src Committed By: wiz Date: Mon Jan 1 00:18:40 UTC 2024 Modified Files: src/sys/conf: copyright Log Message: Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.21 src/sys/conf/copyright:1.22 --- src/sys/conf/copyright:1.21 Sun Jan 1 00:09:52 2023 +++ src/sys/conf/copyright Mon Jan 1 00:18:40 2024 @@ -1,6 +1,7 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, -2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 +2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, +2024 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: src/sys/conf
Module Name:src Committed By: wiz Date: Mon Jan 1 00:18:40 UTC 2024 Modified Files: src/sys/conf: copyright Log Message: Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/syslogd
Module Name:src Committed By: uwe Date: Sun Dec 31 23:39:27 UTC 2023 Modified Files: src/usr.sbin/syslogd: syslog.conf.5 Log Message: syslog.conf(5): add back .Pp lost in previous To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/syslogd/syslog.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/syslogd/syslog.conf.5 diff -u src/usr.sbin/syslogd/syslog.conf.5:1.27 src/usr.sbin/syslogd/syslog.conf.5:1.28 --- src/usr.sbin/syslogd/syslog.conf.5:1.27 Sun Dec 31 19:41:22 2023 +++ src/usr.sbin/syslogd/syslog.conf.5 Sun Dec 31 23:39:27 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: syslog.conf.5,v 1.27 2023/12/31 19:41:22 uwe Exp $ +.\" $NetBSD: syslog.conf.5,v 1.28 2023/12/31 23:39:27 uwe Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -477,10 +477,11 @@ List of fingerprints of trusted client c .It Ic tls_allow_clientcerts List of filenames with trusted client certificates. .El +.Pp One function of TLS is mutual authentication of client and server. Unless authentication is disabled by setting .Ql tls_verify=off -the following rules are used: +the following rules are used. .Ss "Client Authentication" A client can be configured not to check a server's certificate by setting the
CVS commit: src/usr.sbin/syslogd
Module Name:src Committed By: uwe Date: Sun Dec 31 23:39:27 UTC 2023 Modified Files: src/usr.sbin/syslogd: syslog.conf.5 Log Message: syslog.conf(5): add back .Pp lost in previous To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/syslogd/syslog.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3
Module Name:src
Committed By: mrg
Date: Sun Dec 31 22:52:49 UTC 2023
Modified Files:
src/external/gpl3/gcc.old/lib/liblto_plugin: Makefile
src/external/gpl3/gcc/lib/liblto_plugin: Makefile
Log Message:
also link in libiberty's unlink-if-ordinary.c.
should fix undef issues reported on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/lib/liblto_plugin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile:1.14 src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile:1.15
--- src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile:1.14 Mon Feb 20 02:12:16 2023
+++ src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile Sun Dec 31 22:52:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/02/20 02:12:16 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2023/12/31 22:52:49 mrg Exp $
.include
.include
@@ -15,7 +15,7 @@ SRCS= lto-plugin.c hashtab.c simple-obj
# libiberty
SRCS+= xstrerror.c xasprintf.c xvasprintf.c safe-ctype.c \
- vprintf-support.c
+ vprintf-support.c unlink-if-ordinary.c
CPPFLAGS+= -I${DIST}/include -I.
CPPFLAGS+= -DHAVE_CONFIG_H
Index: src/external/gpl3/gcc/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.10 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.11
--- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.10 Sat Sep 18 01:47:07 2021
+++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Sun Dec 31 22:52:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/09/18 01:47:07 christos Exp $
+# $NetBSD: Makefile,v 1.11 2023/12/31 22:52:49 mrg Exp $
.include
.include
@@ -15,7 +15,7 @@ SRCS= lto-plugin.c hashtab.c simple-obj
# libiberty
SRCS+= xstrerror.c xasprintf.c xvasprintf.c safe-ctype.c \
- vprintf-support.c
+ vprintf-support.c unlink-if-ordinary.c
CPPFLAGS+= -I${DIST}/include -I.
CPPFLAGS+= -DHAVE_CONFIG_H
CVS commit: src/external/gpl3
Module Name:src Committed By: mrg Date: Sun Dec 31 22:52:49 UTC 2023 Modified Files: src/external/gpl3/gcc.old/lib/liblto_plugin: Makefile src/external/gpl3/gcc/lib/liblto_plugin: Makefile Log Message: also link in libiberty's unlink-if-ordinary.c. should fix undef issues reported on current-users. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 \ src/external/gpl3/gcc.old/lib/liblto_plugin/Makefile cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/lib/liblto_plugin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Sun Dec 31 22:06:41 UTC 2023 Modified Files: src/sys/dev/goldfish: gfrtc.c Log Message: gfrtc_settime(): Write the low half of the time valueinto the RTC_TIME_LOW register, not the RTC_TIME_HIGH register. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gfrtc.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/goldfish/gfrtc.c diff -u src/sys/dev/goldfish/gfrtc.c:1.1 src/sys/dev/goldfish/gfrtc.c:1.2 --- src/sys/dev/goldfish/gfrtc.c:1.1 Fri Dec 29 23:31:44 2023 +++ src/sys/dev/goldfish/gfrtc.c Sun Dec 31 22:06:41 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: gfrtc.c,v 1.1 2023/12/29 23:31:44 thorpej Exp $ */ +/* $NetBSD: gfrtc.c,v 1.2 2023/12/31 22:06:41 thorpej Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gfrtc.c,v 1.1 2023/12/29 23:31:44 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gfrtc.c,v 1.2 2023/12/31 22:06:41 thorpej Exp $"); #include @@ -78,7 +78,7 @@ gfrtc_settime(struct todr_chip_handle *c uint32_t lo = nsec; GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_HIGH, hi); - GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_HIGH, lo); + GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_LOW, lo); return 0; }
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Sun Dec 31 22:06:41 UTC 2023 Modified Files: src/sys/dev/goldfish: gfrtc.c Log Message: gfrtc_settime(): Write the low half of the time valueinto the RTC_TIME_LOW register, not the RTC_TIME_HIGH register. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gfrtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k
Module Name:src Committed By: thorpej Date: Sun Dec 31 21:59:24 UTC 2023 Modified Files: src/sys/arch/m68k/include: pmap_motorola.h src/sys/arch/m68k/m68k: pmap_motorola.c vm_machdep.c Log Message: Provide a vtophys() function like other platforms do, and implement kvtop() (which will be g/c'd shortly) in terms of it. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/m68k/include/pmap_motorola.h cvs rdiff -u -r1.84 -r1.85 src/sys/arch/m68k/m68k/pmap_motorola.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/m68k/m68k/vm_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k
Module Name:src
Committed By: thorpej
Date: Sun Dec 31 21:59:24 UTC 2023
Modified Files:
src/sys/arch/m68k/include: pmap_motorola.h
src/sys/arch/m68k/m68k: pmap_motorola.c vm_machdep.c
Log Message:
Provide a vtophys() function like other platforms do, and implement
kvtop() (which will be g/c'd shortly) in terms of it.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/m68k/m68k/vm_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/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.42 src/sys/arch/m68k/include/pmap_motorola.h:1.43
--- src/sys/arch/m68k/include/pmap_motorola.h:1.42 Wed Dec 27 03:03:41 2023
+++ src/sys/arch/m68k/include/pmap_motorola.h Sun Dec 31 21:59:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.h,v 1.42 2023/12/27 03:03:41 thorpej Exp $ */
+/* $NetBSD: pmap_motorola.h,v 1.43 2023/12/31 21:59:24 thorpej Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -254,4 +254,6 @@ void _pmap_set_page_cacheable(struct pma
void _pmap_set_page_cacheinhibit(struct pmap *, vaddr_t);
int _pmap_page_is_cacheable(struct pmap *, vaddr_t);
+paddr_t vtophys(vaddr_t va);
+
#endif /* !_M68K_PMAP_MOTOROLA_H_ */
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.84 src/sys/arch/m68k/m68k/pmap_motorola.c:1.85
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.84 Thu Dec 28 15:33:12 2023
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Sun Dec 31 21:59:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.84 2023/12/28 15:33:12 thorpej Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.85 2023/12/31 21:59:24 thorpej Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.84 2023/12/28 15:33:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.85 2023/12/31 21:59:24 thorpej Exp $");
#include
#include
@@ -1593,6 +1593,22 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
}
/*
+ * vtophys: [ INTERFACE-ish ]
+ *
+ * Kernel virtual to physical. Use with caution.
+ */
+paddr_t
+vtophys(vaddr_t va)
+{
+ paddr_t pa;
+
+ if (pmap_extract(pmap_kernel(), va, ))
+ return pa;
+ KASSERT(0);
+ return (paddr_t) -1;
+}
+
+/*
* pmap_copy: [ INTERFACE ]
*
* Copy the mapping range specified by src_addr/len
Index: src/sys/arch/m68k/m68k/vm_machdep.c
diff -u src/sys/arch/m68k/m68k/vm_machdep.c:1.41 src/sys/arch/m68k/m68k/vm_machdep.c:1.42
--- src/sys/arch/m68k/m68k/vm_machdep.c:1.41 Wed Dec 20 00:40:43 2023
+++ src/sys/arch/m68k/m68k/vm_machdep.c Sun Dec 31 21:59:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.41 2023/12/20 00:40:43 thorpej Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.42 2023/12/31 21:59:24 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.41 2023/12/20 00:40:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.42 2023/12/31 21:59:24 thorpej Exp $");
#include
#include
@@ -252,11 +252,7 @@ physunaccess(void *vaddr, int size)
int
kvtop(void *addr)
{
- paddr_t pa;
-
- if (pmap_extract(pmap_kernel(), (vaddr_t)addr, ) == false)
- panic("kvtop: zero page frame");
- return (int)pa;
+ return (int)vtophys((vaddr_t)addr);
}
#endif
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: gutteridge
Date: Sun Dec 31 21:32:43 UTC 2023
Modified Files:
src/sys/dev/ic: bwfm.c
Log Message:
bwfm.c: KNF a comment (spaces->tabs)
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/bwfm.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/bwfm.c
diff -u src/sys/dev/ic/bwfm.c:1.35 src/sys/dev/ic/bwfm.c:1.36
--- src/sys/dev/ic/bwfm.c:1.35 Tue Aug 1 07:04:15 2023
+++ src/sys/dev/ic/bwfm.c Sun Dec 31 21:32:43 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bwfm.c,v 1.35 2023/08/01 07:04:15 mrg Exp $ */
+/* $NetBSD: bwfm.c,v 1.36 2023/12/31 21:32:43 gutteridge Exp $ */
/* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -632,11 +632,10 @@ bwfm_init(struct ifnet *ifp)
return EIO;
}
-/*
- * Use CAM (constantly awake) when we are running as AP
- * otherwise use fast power saving.
- */
-
+ /*
+ * Use CAM (constantly awake) when we are running as AP
+ * otherwise use fast power saving.
+ */
if (ic->ic_flags & IEEE80211_F_PMGTON) {
sc->sc_pm = BWFM_PM_FAST_PS;
#ifndef IEEE80211_STA_ONLY
CVS commit: src/sys/dev/ic
Module Name:src Committed By: gutteridge Date: Sun Dec 31 21:32:43 UTC 2023 Modified Files: src/sys/dev/ic: bwfm.c Log Message: bwfm.c: KNF a comment (spaces->tabs) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/bwfm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/syslogd
Module Name:src Committed By: uwe Date: Sun Dec 31 19:41:22 UTC 2023 Modified Files: src/usr.sbin/syslogd: syslog.conf.5 Log Message: syslog.conf(5): improve markup Use tagged lists, mark up literals, be consistent about options (global): vs parameters (of a TLS action), fold TLS authentication description into the TLS options section. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/syslogd/syslog.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/syslogd/syslog.conf.5 diff -u src/usr.sbin/syslogd/syslog.conf.5:1.26 src/usr.sbin/syslogd/syslog.conf.5:1.27 --- src/usr.sbin/syslogd/syslog.conf.5:1.26 Wed Sep 1 13:44:02 2021 +++ src/usr.sbin/syslogd/syslog.conf.5 Sun Dec 31 19:41:22 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: syslog.conf.5,v 1.26 2021/09/01 13:44:02 andvar Exp $ +.\" $NetBSD: syslog.conf.5,v 1.27 2023/12/31 19:41:22 uwe Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -43,7 +43,12 @@ The file is the configuration file for the .Xr syslogd 8 program. -It consists of extended options (lines with one key="value" assignment) +It consists of extended options +.Po +lines with one +.Ar key\^ Ns Li = Ns Ar value +assignment +.Pc and blocks of lines separated by .Em program and @@ -62,15 +67,22 @@ field is separated from the .Em action field by one or more tab characters. .Pp +Blank lines and lines whose first non-blank character is a hash +.Pq Ql # +character are ignored. +.\" +.Ss Selectors +.Pp The -.Em Selectors +.Em selector Ns s function are encoded as a .Em facility , a period -.Pq Sq \&. , -an optional set of comparison flags -.Pq Bo ! Bc Bq <=> , +.Pq Ql \&. , +an optional set of +.Em comparison flags +.Pq Oo Li \&! Oc Ns Op Li <=> , and a .Em level , with no intervening white-space. @@ -83,11 +95,31 @@ are case insensitive. The .Em facility describes the part of the system generating the message, and is one of -the following keywords: auth, authpriv, cron, ftp, daemon, kern, lpr, -mail, mark, news, syslog, user, uucp and local0 through local7. -These keywords (with the exception of mark) correspond to the -similar -.Dq Dv LOG_ +the following keywords: +.Ic auth , +.Ic authpriv , +.Ic cron , +.Ic daemon , +.Ic ftp , +.Ic kern , +.Ic lpr , +.Ic mail , +.Ic mark , +.Ic news , +.Ic syslog , +.Ic user , +.Ic uucp , +and +.Ic local0 +through +.Ic local7 . +These keywords +.Po +with the exception of +.Ic mark +.Pc +correspond to the similar +.Ql LOG_ values specified to the .Xr openlog 3 and @@ -98,32 +130,40 @@ The .Em comparison flags may be used to specify exactly what levels are logged. If unspecified, the default comparison is -.Sq >= +.Ql >= .Pq greater than or equal to , or, if the .Fl U option is passed to .Xr syslogd 8 , -.Sq = +.Ql = .Pq equal to . Comparison flags beginning with -.So ! Sc +.Ql \&! will have their logical sense inverted. Thus, -.Sq !=info +.Ql !=info means all levels except info and -.Sq !notice +.Ql !notice has the same meaning as -.Sq
CVS commit: src/usr.sbin/syslogd
Module Name:src Committed By: uwe Date: Sun Dec 31 19:41:22 UTC 2023 Modified Files: src/usr.sbin/syslogd: syslog.conf.5 Log Message: syslog.conf(5): improve markup Use tagged lists, mark up literals, be consistent about options (global): vs parameters (of a TLS action), fold TLS authentication description into the TLS options section. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/syslogd/syslog.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Dec 31 12:51:12 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1784 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Dec 31 12:51:12 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1784 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-9.4 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-9.4 diff -u src/doc/CHANGES-9.4:1.1.2.123 src/doc/CHANGES-9.4:1.1.2.124 --- src/doc/CHANGES-9.4:1.1.2.123 Sat Dec 30 19:18:25 2023 +++ src/doc/CHANGES-9.4 Sun Dec 31 12:51:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.123 2023/12/30 19:18:25 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.124 2023/12/31 12:51:12 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -4033,3 +4033,8 @@ usr.sbin/makefs/msdos.c1.22 on creating msdosfs. [tsutsui, ticket #1783] +etc/newsyslog.conf1.25 + + newsyslog.conf: collate npflog0.pcap properly + [uwe, ticket #1784] +
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Sun Dec 31 12:50:23 UTC 2023 Modified Files: src/etc [netbsd-9]: newsyslog.conf Log Message: Pull up following revision(s) (requested by uwe in ticket #1784): etc/newsyslog.conf: revision 1.25 newsyslog.conf: collate npflog0.pcap properly To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.2.1 src/etc/newsyslog.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/newsyslog.conf diff -u src/etc/newsyslog.conf:1.24 src/etc/newsyslog.conf:1.24.2.1 --- src/etc/newsyslog.conf:1.24 Thu May 16 20:12:35 2019 +++ src/etc/newsyslog.conf Sun Dec 31 12:50:23 2023 @@ -1,4 +1,4 @@ -# $NetBSD: newsyslog.conf,v 1.24 2019/05/16 20:12:35 nakayama Exp $ +# $NetBSD: newsyslog.conf,v 1.24.2.1 2023/12/31 12:50:23 martin Exp $ # # Configuration file for newsyslog(8). # @@ -8,9 +8,9 @@ /var/log/cron root:wheel 600 3100 *Z /var/log/kerberos.log 640 7*24 ZN /var/log/lpd-errs 640 7100 *Z -/var/log/npflog0.pcap 600 7100 *ZB /var/run/npfd.pid /var/log/maillog 600 7*24 Z /var/log/messages 644 10 250 *Z +/var/log/npflog0.pcap 600 7100 *ZB /var/run/npfd.pid /var/log/wtmp root:utmp 664 7*168 ZBN /var/log/wtmpx root:utmp 664 7*168 ZBN /var/log/xferlog 640 7250 *Z
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Sun Dec 31 12:50:23 UTC 2023 Modified Files: src/etc [netbsd-9]: newsyslog.conf Log Message: Pull up following revision(s) (requested by uwe in ticket #1784): etc/newsyslog.conf: revision 1.25 newsyslog.conf: collate npflog0.pcap properly To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.2.1 src/etc/newsyslog.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Dec 31 12:48:55 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #525 - #531 To generate a diff of this commit: cvs rdiff -u -r1.1.2.181 -r1.1.2.182 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.181 src/doc/CHANGES-10.0:1.1.2.182 --- src/doc/CHANGES-10.0:1.1.2.181 Sat Dec 30 19:35:09 2023 +++ src/doc/CHANGES-10.0 Sun Dec 31 12:48:55 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.181 2023/12/30 19:35:09 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.182 2023/12/31 12:48:55 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15028,3 +15028,48 @@ sys/stand/efiboot/efinet.c 1.7,1.8 efiboot: fix PXE boot on some UEFI implementations. [rin, ticket #524] +external/broadcom/rpi-firmware/dist/LICENCE.broadcom up to 1.3 +external/broadcom/rpi-firmware/dist/bootcode.bin up to 1.13 +external/broadcom/rpi-firmware/dist/fixup.dat up to 1.13 +external/broadcom/rpi-firmware/dist/fixup4.dat up to 1.2 +external/broadcom/rpi-firmware/dist/fixup4cd.dat up to 1.2 +external/broadcom/rpi-firmware/dist/fixup_cd.dat up to 1.13 +external/broadcom/rpi-firmware/dist/start.elf up to 1.13 +external/broadcom/rpi-firmware/dist/start4.elf up to 1.2 +external/broadcom/rpi-firmware/dist/start4cd.elf up to 1.2 +external/broadcom/rpi-firmware/dist/start_cd.elf up to 1.13 + + Update RaspberryPI firmware. + [skrll, ticket #525] + +share/mk/sys.mk 1.149 + + PR 57565: remove 'l' from (default) ARFLAGS. + [wiz, ticket #526] + +sys/arch/macppc/macppc/rbus_machdep.c 1.19 + + macppc/cardbus: belatedly catch up with battable resolution change. + [rin, ticket #527] + +lib/libc/time/zic.8 up to 1.49 +lib/libc/time/zdump.8 up to 1.25 + + zic(8),zdump(8): PR 57757: fix markup errors. + [kre, ticket #528] + +lib/libm/Makefile1.223 + + libm: fix building with M68040 and M68060 options. + [jklos, ticket #529] + +sys/arch/alpha/alpha/pmap.c 1.308 + + alpha: fix kernel pmap setup for machines with 8G RAM or more. + [thorpej, ticket #530] + +etc/newsyslog.conf1.25 + + newsyslog.conf: collate npflog0.pcap properly + [uwe, ticket #531] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Dec 31 12:48:55 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #525 - #531 To generate a diff of this commit: cvs rdiff -u -r1.1.2.181 -r1.1.2.182 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sun Dec 31 12:46:43 UTC 2023 Modified Files: src/etc [netbsd-10]: newsyslog.conf Log Message: Pull up following revision(s) (requested by uwe in ticket #531): etc/newsyslog.conf: revision 1.25 newsyslog.conf: collate npflog0.pcap properly To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.10.1 src/etc/newsyslog.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/newsyslog.conf diff -u src/etc/newsyslog.conf:1.24 src/etc/newsyslog.conf:1.24.10.1 --- src/etc/newsyslog.conf:1.24 Thu May 16 20:12:35 2019 +++ src/etc/newsyslog.conf Sun Dec 31 12:46:42 2023 @@ -1,4 +1,4 @@ -# $NetBSD: newsyslog.conf,v 1.24 2019/05/16 20:12:35 nakayama Exp $ +# $NetBSD: newsyslog.conf,v 1.24.10.1 2023/12/31 12:46:42 martin Exp $ # # Configuration file for newsyslog(8). # @@ -8,9 +8,9 @@ /var/log/cron root:wheel 600 3100 *Z /var/log/kerberos.log 640 7*24 ZN /var/log/lpd-errs 640 7100 *Z -/var/log/npflog0.pcap 600 7100 *ZB /var/run/npfd.pid /var/log/maillog 600 7*24 Z /var/log/messages 644 10 250 *Z +/var/log/npflog0.pcap 600 7100 *ZB /var/run/npfd.pid /var/log/wtmp root:utmp 664 7*168 ZBN /var/log/wtmpx root:utmp 664 7*168 ZBN /var/log/xferlog 640 7250 *Z
CVS commit: [netbsd-10] src/etc
Module Name:src Committed By: martin Date: Sun Dec 31 12:46:43 UTC 2023 Modified Files: src/etc [netbsd-10]: newsyslog.conf Log Message: Pull up following revision(s) (requested by uwe in ticket #531): etc/newsyslog.conf: revision 1.25 newsyslog.conf: collate npflog0.pcap properly To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.24.10.1 src/etc/newsyslog.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/alpha/alpha
Module Name:src
Committed By: martin
Date: Sun Dec 31 12:45:18 UTC 2023
Modified Files:
src/sys/arch/alpha/alpha [netbsd-10]: pmap.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #530):
sys/arch/alpha/alpha/pmap.c: revision 1.308
pmap_bootstrap(): When initializing the L2 PTEs, don't use l2pte_index(),
as it is designed to wrap from 1023->0 during the normal course of use.
However, when setting up the initial kernel page tables, if we have a
large enough config that we end up with more than L2 PT page, we rely
on being able to index > 1023 into the adjacent PT pages to initialize
those entries.
Fixes a MM fault panic during early boot on larger memory configs
(reported by Dave McGuire with an 8GB ES40 and John Klos with a 12GB
DS25). I've successfully booted at 16GB config in Qemu with this fix.
To generate a diff of this commit:
cvs rdiff -u -r1.307 -r1.307.4.1 src/sys/arch/alpha/alpha/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/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.307 src/sys/arch/alpha/alpha/pmap.c:1.307.4.1
--- src/sys/arch/alpha/alpha/pmap.c:1.307 Sat Apr 9 23:38:31 2022
+++ src/sys/arch/alpha/alpha/pmap.c Sun Dec 31 12:45:18 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.307 2022/04/09 23:38:31 riastradh Exp $ */
+/* $NetBSD: pmap.c,v 1.307.4.1 2023/12/31 12:45:18 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020
@@ -135,7 +135,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.307 2022/04/09 23:38:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.307.4.1 2023/12/31 12:45:18 martin Exp $");
#include
#include
@@ -1204,13 +1204,15 @@ static bool vtophys_internal(vaddr_t, pa
l1pte_ = pmap_l1pte(kernel_lev1map, va); \
if (pmap_pte_v(l1pte_) == 0) { \
printf("kernel level 1 PTE not valid, va 0x%lx " \
- "(line %d)\n", (va), __LINE__); \
+ "(line %d) pte=%p *pte=0x%016lx\n", (va), __LINE__, \
+ l1pte_, *l1pte_); \
panic("PMAP_KERNEL_PTE");\
}\
l2pte_ = pmap_l2pte(kernel_lev1map, va, l1pte_); \
if (pmap_pte_v(l2pte_) == 0) { \
printf("kernel level 2 PTE not valid, va 0x%lx " \
- "(line %d)\n", (va), __LINE__); \
+ "(line %d) pte=%p *pte=0x%016lx\n", (va), __LINE__, \
+ l2pte_, *l2pte_); \
panic("PMAP_KERNEL_PTE");\
}\
pmap_l3pte(kernel_lev1map, va, l2pte_);\
@@ -1358,8 +1360,19 @@ pmap_bootstrap(paddr_t ptaddr, u_int max
pte = (ALPHA_K0SEG_TO_PHYS(((vaddr_t)lev3map) +
(i*PAGE_SIZE)) >> PGSHIFT) << PG_SHIFT;
pte |= PG_V | PG_ASM | PG_KRE | PG_KWE | PG_WIRED;
- lev2map[l2pte_index(VM_MIN_KERNEL_ADDRESS+
- (i*PAGE_SIZE*NPTEPG))] = pte;
+ /*
+ * No need to use l2pte_index() here; it's equivalent
+ * to just indexing with our loop variable i, but will
+ * fall over if we end up with more than 1 L2 PT page.
+ *
+ * In other words:
+ *
+ * l2pte_index(VM_MIN_KERNEL_ADDRESS +
+ * (i*PAGE_SIZE*NPTEPG))
+ *
+ * ...is the same as 'i' so long as i stays below 1024.
+ */
+ lev2map[i] = pte;
}
/* Initialize the pmap_growkernel_lock. */
CVS commit: [netbsd-10] src/sys/arch/alpha/alpha
Module Name:src Committed By: martin Date: Sun Dec 31 12:45:18 UTC 2023 Modified Files: src/sys/arch/alpha/alpha [netbsd-10]: pmap.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #530): sys/arch/alpha/alpha/pmap.c: revision 1.308 pmap_bootstrap(): When initializing the L2 PTEs, don't use l2pte_index(), as it is designed to wrap from 1023->0 during the normal course of use. However, when setting up the initial kernel page tables, if we have a large enough config that we end up with more than L2 PT page, we rely on being able to index > 1023 into the adjacent PT pages to initialize those entries. Fixes a MM fault panic during early boot on larger memory configs (reported by Dave McGuire with an 8GB ES40 and John Klos with a 12GB DS25). I've successfully booted at 16GB config in Qemu with this fix. To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.307.4.1 src/sys/arch/alpha/alpha/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libm
Module Name:src Committed By: martin Date: Sun Dec 31 12:41:02 UTC 2023 Modified Files: src/lib/libm [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by jklos in ticket #529): lib/libm/Makefile: revision 1.223 Fix building with M68040 and M68060 options. To generate a diff of this commit: cvs rdiff -u -r1.218.2.2 -r1.218.2.3 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libm
Module Name:src
Committed By: martin
Date: Sun Dec 31 12:41:02 UTC 2023
Modified Files:
src/lib/libm [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by jklos in ticket #529):
lib/libm/Makefile: revision 1.223
Fix building with M68040 and M68060 options.
To generate a diff of this commit:
cvs rdiff -u -r1.218.2.2 -r1.218.2.3 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.218.2.2 src/lib/libm/Makefile:1.218.2.3
--- src/lib/libm/Makefile:1.218.2.2 Sun Oct 8 18:48:20 2023
+++ src/lib/libm/Makefile Sun Dec 31 12:41:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218.2.2 2023/10/08 18:48:20 martin Exp $
+# $NetBSD: Makefile,v 1.218.2.3 2023/12/31 12:41:02 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -144,14 +144,14 @@ SUBDIR=arch/i387
.if defined(M68060)
.PATH: ${.CURDIR}/arch/m68060
.include "${.CURDIR}/arch/m68060/Makefile.list"
-COPTS+=-m68060
+COPTS+= -m68060
.PATH: ${.CURDIR}/arch/m68k
ARCH_SRCS += s_ceil.S s_copysign.S s_finite.S s_floor.S s_rint.S
.elif defined(M68040)
.PATH: ${.CURDIR}/arch/m68k
-COPTS+=-m68040
+COPTS+= -m68040
ARCH_SRCS = s_copysign.S s_finite.S
-.else
+.endif
.if (${MKSOFTFLOAT} == "no")
.PATH: ${.CURDIR}/arch/mc68881 ${.CURDIR}/arch/m68k
ARCH_SRCS = e_acos.S e_asin.S e_atanh.S e_cosh.S e_exp.S e_fmod.S e_log.S \
@@ -160,7 +160,6 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
COMMON_SRCS += fenv.c s_nexttoward.c s_rintl.c
.endif
-.endif
# end of m68k
.elif (${LIBC_MACHINE_ARCH} == "vax")
CVS commit: [netbsd-10] src/lib/libc/time
Module Name:src Committed By: martin Date: Sun Dec 31 12:34:49 UTC 2023 Modified Files: src/lib/libc/time [netbsd-10]: zdump.8 zic.8 Log Message: Pull up the following, requested by kre in ticket #528: lib/libc/time/zic.8 up to 1.49 lib/libc/time/zdump.8 up to 1.25 PR/57757: Izumi Tsutsui: Fix markup errors To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 src/lib/libc/time/zdump.8 cvs rdiff -u -r1.41 -r1.41.2.1 src/lib/libc/time/zic.8 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/time/zdump.8 diff -u src/lib/libc/time/zdump.8:1.22 src/lib/libc/time/zdump.8:1.22.2.1 --- src/lib/libc/time/zdump.8:1.22 Sun Dec 11 17:57:23 2022 +++ src/lib/libc/time/zdump.8 Sun Dec 31 12:34:48 2023 @@ -1,9 +1,9 @@ -.\" $NetBSD: zdump.8,v 1.22 2022/12/11 17:57:23 christos Exp $ +.\" $NetBSD: zdump.8,v 1.22.2.1 2023/12/31 12:34:48 martin Exp $ .\" @(#)zdump.8 8.2 .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. -.TH zdump 8 -.Dd October 22, 2021 +.\" .TH zdump 8 +.Dd December 6, 2023 .Dt ZDUMP 8 .Os .Sh NAME @@ -26,7 +26,7 @@ The program prints the current time in each .Ar timezone named on the command line. -.SH OPTIONS +.Sh OPTIONS .Bl -tag -width X -compact .It Fl \-version Output version information and exit. @@ -48,9 +48,9 @@ For each on the command line, print the times at the two extreme time values, the times (if present) at and just beyond the boundaries of years that -.BR localtime (3) +.Xr localtime 3 and -.BR gmtime (3) +.Xr gmtime 3 can represent, and the times both one second before and exactly at each detected time discontinuity. Index: src/lib/libc/time/zic.8 diff -u src/lib/libc/time/zic.8:1.41 src/lib/libc/time/zic.8:1.41.2.1 --- src/lib/libc/time/zic.8:1.41 Sun Dec 11 17:57:23 2022 +++ src/lib/libc/time/zic.8 Sun Dec 31 12:34:48 2023 @@ -1,9 +1,9 @@ -.\" $NetBSD: zic.8,v 1.41 2022/12/11 17:57:23 christos Exp $ +.\" $NetBSD: zic.8,v 1.41.2.1 2023/12/31 12:34:48 martin Exp $ .\" @(#)zic.8 8.6 .\" This file is in the public domain, so clarified as of .\" 2009-05-17 by Arthur David Olson. -.TH zic 8 -.Dd August 24, 2022 +.\" .TH zic 8 +.Dd December 6, 2023 .Dt ZIC 8 .Os .Sh NAME @@ -11,8 +11,8 @@ .Nd timezone compiler .Sh SYNOPSIS .Nm -.Op Fl \-version -.Op Fl \-help +.Op Fl Fl version +.Op Fl Fl help .Op Fl b .Op Fl d Ar directory .Op Fl L Ar leapsecondfilename @@ -22,7 +22,7 @@ .Op Fl t Ar file .Op Fl v .Op Fl y Ar command -.Op Ar Filename ... +.Op Ar .Sh DESCRIPTION The .Nm @@ -30,16 +30,15 @@ program reads text from the file(s) name and creates the timezone information format (TZif) files specified in this input. If a -.Ar filename +.Ar file is -.Ar \&- , +.Ql \&\- , standard input is read. -.Pp -.Sh OPTIONS -.Bl -tag -width XX -compact -.It Fl \-version +.Ss Options +.Bl -tag -width Fl +.It Fl Fl version Output version information and exit. -.It Fl \-help +.It Fl Fl help Output short usage message and exit. .It Fl b Ar bloat Output backward-compatibility data as specified by @@ -47,37 +46,40 @@ Output backward-compatibility data as sp If .Ar bloat is -.Dv fat , +.Ql fat , generate additional data entries that work around potential bugs or incompatibilities in older software, such as software that mishandles the 64-bit generated data. If .Ar bloat is -.Dv slim , +.Ql slim , keep the output files small; this can help check for the bugs and incompatibilities. The default is -.Dv slim , +.Ql slim , as software that mishandles 64-bit data typically mishandles timestamps after the year 2038 anyway. Also see the .Fl r option for another way to alter output size. .It Fl d Ar directory -Create time conversion information files in the named directory rather than -in the standard directory named below. +Create time conversion information files in the named +.Ar directory +rather than in the standard directory named below. .It Fl l Ar timezone -Use the +Use the .Ar timezone as local time. .Nm will act as if the input contained a link line of the form -.Dl Link timezone localtime +.Pp +.D1 Li Link Ar timezone Li localtime +.Pp If .Ar timezone is -.Dv \&- , +.Ql \&\- , any already-existing link is removed. .It Fl L Ar leapsecondfilename Read leap second information from the file with the given name. @@ -85,28 +87,32 @@ If this option is not used, no leap second information appears in output files. .It Fl p Ar timezone Use -.Ar timezone's -rules when handling POSIX-format -TZ strings like -.Qq EET\&-2EEST +.Ar timezone Ap s +rules when handling POSIX-format TZ strings like +.Ql EET\-2EEST that lack transition rules. .Nm will act as if the input contained a link line of the form -.Dl Link timezone posixrules .Pp -This feature is obsolete and poorly supported.
CVS commit: [netbsd-10] src/lib/libc/time
Module Name:src Committed By: martin Date: Sun Dec 31 12:34:49 UTC 2023 Modified Files: src/lib/libc/time [netbsd-10]: zdump.8 zic.8 Log Message: Pull up the following, requested by kre in ticket #528: lib/libc/time/zic.8 up to 1.49 lib/libc/time/zdump.8 up to 1.25 PR/57757: Izumi Tsutsui: Fix markup errors To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 src/lib/libc/time/zdump.8 cvs rdiff -u -r1.41 -r1.41.2.1 src/lib/libc/time/zic.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/macppc/macppc
Module Name:src
Committed By: martin
Date: Sun Dec 31 12:19:23 UTC 2023
Modified Files:
src/sys/arch/macppc/macppc [netbsd-10]: rbus_machdep.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #527):
sys/arch/macppc/macppc/rbus_machdep.c: revision 1.19
macppc/cardbus: Belatedly catch up with battable resolution change
Fix pmap_extract() failures on models with cardslot, for direct-mapped
buffers allocated by PMAP_ALLOC_POOLPAGE().
This driver had corrupted battable[] over 11 years, since resolution of
battable was changed from 256MB to 8MB:
https://github.com/NetBSD/src/commit/413fb4c3c505a13900a9dff86f563fc58ff04005
Now, indexes for battable[] should be calculated by (va >> 23), but
rather, use oea_iobat_add() instead of directly modifying battable[].
TODO:
- Add some consistency checks to oea_iobat_add().
- Map reasonable VA space for cardbus(4), if OFW does not. Note that
hardcoded value of 0x9000-0x9fff should be safe for now, not
that elegant although. For macppc models, IIUC, RAM is *not* mapped to
0x8000-0x, and VA reserved for kernel and copy{in,out} is
0xc000-0xefff.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.84.1 src/sys/arch/macppc/macppc/rbus_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/rbus_machdep.c
diff -u src/sys/arch/macppc/macppc/rbus_machdep.c:1.18 src/sys/arch/macppc/macppc/rbus_machdep.c:1.18.84.1
--- src/sys/arch/macppc/macppc/rbus_machdep.c:1.18 Fri Jul 1 18:43:05 2011
+++ src/sys/arch/macppc/macppc/rbus_machdep.c Sun Dec 31 12:19:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_machdep.c,v 1.18 2011/07/01 18:43:05 dyoung Exp $ */
+/* $NetBSD: rbus_machdep.c,v 1.18.84.1 2023/12/31 12:19:23 martin Exp $ */
/*
* Copyright (c) 1999
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.18 2011/07/01 18:43:05 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.18.84.1 2023/12/31 12:19:23 martin Exp $");
#include
#include
@@ -92,8 +92,7 @@ rbus_pccbb_parent_mem(struct pci_attach_
size = 0x1000;
}
- battable[start >> 28].batl = BATL(start, BAT_I, BAT_PP_RW);
- battable[start >> 28].batu = BATU(start, BAT_BL_256M, BAT_Vs);
+ oea_iobat_add(start, size);
return rbus_new_root_delegate(pa->pa_memt, start, size, 0);
}
CVS commit: [netbsd-10] src/sys/arch/macppc/macppc
Module Name:src
Committed By: martin
Date: Sun Dec 31 12:19:23 UTC 2023
Modified Files:
src/sys/arch/macppc/macppc [netbsd-10]: rbus_machdep.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #527):
sys/arch/macppc/macppc/rbus_machdep.c: revision 1.19
macppc/cardbus: Belatedly catch up with battable resolution change
Fix pmap_extract() failures on models with cardslot, for direct-mapped
buffers allocated by PMAP_ALLOC_POOLPAGE().
This driver had corrupted battable[] over 11 years, since resolution of
battable was changed from 256MB to 8MB:
https://github.com/NetBSD/src/commit/413fb4c3c505a13900a9dff86f563fc58ff04005
Now, indexes for battable[] should be calculated by (va >> 23), but
rather, use oea_iobat_add() instead of directly modifying battable[].
TODO:
- Add some consistency checks to oea_iobat_add().
- Map reasonable VA space for cardbus(4), if OFW does not. Note that
hardcoded value of 0x9000-0x9fff should be safe for now, not
that elegant although. For macppc models, IIUC, RAM is *not* mapped to
0x8000-0x, and VA reserved for kernel and copy{in,out} is
0xc000-0xefff.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.84.1 src/sys/arch/macppc/macppc/rbus_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-10] src/share/mk
Module Name:src Committed By: martin Date: Sun Dec 31 12:16:17 UTC 2023 Modified Files: src/share/mk [netbsd-10]: sys.mk Log Message: Pull up following revision(s) (requested by wiz in ticket #526): share/mk/sys.mk: revision 1.149 Update ARFLAGS for new binutils. In binutils 2.34, 'l' was a no-op. In binutils 2.39, it is used to specify library dependencies. Remove 'l' from ARFLAGS. >From Takahiro Kambe in PR 57565. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.148.2.1 src/share/mk/sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/sys.mk diff -u src/share/mk/sys.mk:1.148 src/share/mk/sys.mk:1.148.2.1 --- src/share/mk/sys.mk:1.148 Tue Dec 14 16:22:07 2021 +++ src/share/mk/sys.mk Sun Dec 31 12:16:17 2023 @@ -1,4 +1,4 @@ -# $NetBSD: sys.mk,v 1.148 2021/12/14 16:22:07 christos Exp $ +# $NetBSD: sys.mk,v 1.148.2.1 2023/12/31 12:16:17 martin Exp $ # @(#)sys.mk 8.2 (Berkeley) 3/21/94 # # This file contains the basic rules for make(1) and is read first @@ -12,7 +12,7 @@ unix?= We run NetBSD. .LIBS: .a AR?= ar -ARFLAGS?= rl +ARFLAGS?= r RANLIB?= ranlib MV?= mv -f
CVS commit: [netbsd-10] src/share/mk
Module Name:src Committed By: martin Date: Sun Dec 31 12:16:17 UTC 2023 Modified Files: src/share/mk [netbsd-10]: sys.mk Log Message: Pull up following revision(s) (requested by wiz in ticket #526): share/mk/sys.mk: revision 1.149 Update ARFLAGS for new binutils. In binutils 2.34, 'l' was a no-op. In binutils 2.39, it is used to specify library dependencies. Remove 'l' from ARFLAGS. >From Takahiro Kambe in PR 57565. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.148.2.1 src/share/mk/sys.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/broadcom/rpi-firmware/dist
Module Name:src Committed By: martin Date: Sun Dec 31 12:10:00 UTC 2023 Modified Files: src/external/broadcom/rpi-firmware/dist [netbsd-10]: LICENCE.broadcom bootcode.bin fixup.dat fixup4.dat fixup4cd.dat fixup_cd.dat start.elf start4.elf start4cd.elf start_cd.elf Log Message: Pull up the following, requested by skrll in ticket #525: external/broadcom/rpi-firmware/dist/LICENCE.broadcom up to 1.3 external/broadcom/rpi-firmware/dist/bootcode.bin up to 1.13 external/broadcom/rpi-firmware/dist/fixup.dat up to 1.13 external/broadcom/rpi-firmware/dist/fixup4.dat up to 1.2 external/broadcom/rpi-firmware/dist/fixup4cd.dat up to 1.2 external/broadcom/rpi-firmware/dist/fixup_cd.dat up to 1.13 external/broadcom/rpi-firmware/dist/start.elf up to 1.13 external/broadcom/rpi-firmware/dist/start4.elf up to 1.2 external/broadcom/rpi-firmware/dist/start4cd.elf up to 1.2 external/broadcom/rpi-firmware/dist/start_cd.elf up to 1.13 Update RaspberryPI firmware Update the RaspberryPI firmware to the version from https://github.com/raspberrypi/rpi-firmware commit fdb9eafae4b83e553593937eae8e77b0193903c3 Author: Dom Cobley Date: Tue Oct 17 15:59:45 2023 +0100 kernel: Bump to 6.1.58 ... firmware: config: Add [pi5] to config.txt on 2711 and earlier platforms To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.26.1 \ src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom cvs rdiff -u -r1.12 -r1.12.8.1 \ src/external/broadcom/rpi-firmware/dist/bootcode.bin \ src/external/broadcom/rpi-firmware/dist/fixup.dat \ src/external/broadcom/rpi-firmware/dist/fixup_cd.dat \ src/external/broadcom/rpi-firmware/dist/start.elf \ src/external/broadcom/rpi-firmware/dist/start_cd.elf cvs rdiff -u -r1.1 -r1.1.10.1 \ src/external/broadcom/rpi-firmware/dist/fixup4.dat \ src/external/broadcom/rpi-firmware/dist/fixup4cd.dat \ src/external/broadcom/rpi-firmware/dist/start4.elf \ src/external/broadcom/rpi-firmware/dist/start4cd.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/broadcom/rpi-firmware/dist
Module Name:src Committed By: martin Date: Sun Dec 31 12:10:00 UTC 2023 Modified Files: src/external/broadcom/rpi-firmware/dist [netbsd-10]: LICENCE.broadcom bootcode.bin fixup.dat fixup4.dat fixup4cd.dat fixup_cd.dat start.elf start4.elf start4cd.elf start_cd.elf Log Message: Pull up the following, requested by skrll in ticket #525: external/broadcom/rpi-firmware/dist/LICENCE.broadcom up to 1.3 external/broadcom/rpi-firmware/dist/bootcode.bin up to 1.13 external/broadcom/rpi-firmware/dist/fixup.dat up to 1.13 external/broadcom/rpi-firmware/dist/fixup4.dat up to 1.2 external/broadcom/rpi-firmware/dist/fixup4cd.dat up to 1.2 external/broadcom/rpi-firmware/dist/fixup_cd.dat up to 1.13 external/broadcom/rpi-firmware/dist/start.elf up to 1.13 external/broadcom/rpi-firmware/dist/start4.elf up to 1.2 external/broadcom/rpi-firmware/dist/start4cd.elf up to 1.2 external/broadcom/rpi-firmware/dist/start_cd.elf up to 1.13 Update RaspberryPI firmware Update the RaspberryPI firmware to the version from https://github.com/raspberrypi/rpi-firmware commit fdb9eafae4b83e553593937eae8e77b0193903c3 Author: Dom Cobley Date: Tue Oct 17 15:59:45 2023 +0100 kernel: Bump to 6.1.58 ... firmware: config: Add [pi5] to config.txt on 2711 and earlier platforms To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.26.1 \ src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom cvs rdiff -u -r1.12 -r1.12.8.1 \ src/external/broadcom/rpi-firmware/dist/bootcode.bin \ src/external/broadcom/rpi-firmware/dist/fixup.dat \ src/external/broadcom/rpi-firmware/dist/fixup_cd.dat \ src/external/broadcom/rpi-firmware/dist/start.elf \ src/external/broadcom/rpi-firmware/dist/start_cd.elf cvs rdiff -u -r1.1 -r1.1.10.1 \ src/external/broadcom/rpi-firmware/dist/fixup4.dat \ src/external/broadcom/rpi-firmware/dist/fixup4cd.dat \ src/external/broadcom/rpi-firmware/dist/start4.elf \ src/external/broadcom/rpi-firmware/dist/start4cd.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom diff -u src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom:1.2 src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom:1.2.26.1 --- src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom:1.2 Sat Dec 19 12:34:06 2015 +++ src/external/broadcom/rpi-firmware/dist/LICENCE.broadcom Sun Dec 31 12:09:57 2023 @@ -7,7 +7,8 @@ modification, are permitted provided tha met: * This software may only be used for the purposes of developing for, - running or using a Raspberry Pi device. + running or using a Raspberry Pi device, or authorised derivative + device manufactured via the element14 Raspberry Pi Customization Service * Redistributions must reproduce the above copyright notice and the following disclaimer in the documentation and/or other materials provided with the distribution. Index: src/external/broadcom/rpi-firmware/dist/bootcode.bin Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup_cd.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start_cd.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup4.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/fixup4cd.dat Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start4.elf Binary files are different Index: src/external/broadcom/rpi-firmware/dist/start4cd.elf Binary files are different
CVS commit: src/usr.bin/make/unit-tests
Module Name:src
Committed By: rillig
Date: Sun Dec 31 10:09:01 UTC 2023
Modified Files:
src/usr.bin/make/unit-tests: varmod-assign.mk
Log Message:
tests/make: finish incomplete sentence in test for assignment modifiers
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/varmod-assign.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/unit-tests/varmod-assign.mk
diff -u src/usr.bin/make/unit-tests/varmod-assign.mk:1.17 src/usr.bin/make/unit-tests/varmod-assign.mk:1.18
--- src/usr.bin/make/unit-tests/varmod-assign.mk:1.17 Fri Dec 29 15:47:03 2023
+++ src/usr.bin/make/unit-tests/varmod-assign.mk Sun Dec 31 10:09:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: varmod-assign.mk,v 1.17 2023/12/29 15:47:03 rillig Exp $
+# $NetBSD: varmod-assign.mk,v 1.18 2023/12/31 10:09:01 rillig Exp $
#
# Tests for the obscure ::= variable modifiers, which perform variable
# assignments during evaluation, just like the = operator in C.
@@ -155,8 +155,10 @@ ${VARNAME}= initial-value # Sets 'VAR.${
.MAKEFLAGS: -d0
-# Conditional directives are evaluated in command line scope. Any assignment
-# modifiers in these conditions create or
+# Conditional directives are evaluated in command line scope. An assignment
+# modifier that creates a new variable creates it in the command line scope.
+# Existing variables are updated in their previous scope, and environment
+# variables are created in the global scope, as in other situations.
.MAKEFLAGS: CMD_CMD_VAR=cmd-value
CMD_GLOBAL_VAR=global-value
export CMD_ENV_VAR=env-value
@@ -181,8 +183,7 @@ export CMD_ENV_VAR=env-value
# debug log for this test, the debug log would have to be enabled for the
# other targets as well, thus producing lots of irrelevant output.
#
-# Running './make -r -f varmod-assign.mk target' results in:
-# target: TARGET_TARGET_VAR = target-value
+# Running './make -r -f varmod-assign.mk target | grep ": TARGET"' results in:
# target: TARGET_TARGET_VAR = new-value
# Global: TARGET_GLOBAL_VAR = new-value
# Global: TARGET_ENV_VAR = new-value
@@ -191,7 +192,7 @@ export CMD_ENV_VAR=env-value
TARGET_GLOBAL_VAR=global-value
export TARGET_ENV_VAR=env-value
.MAKEFLAGS: ${make(target):?-dv:}
-target: TARGET_TARGET_VAR=target-value
+target: .PHONY TARGET_TARGET_VAR=target-value
: ${TARGET_TARGET_VAR::=new-value}
: ${TARGET_CMD_VAR::=new-value}
: ${TARGET_GLOBAL_VAR::=new-value}
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Sun Dec 31 10:09:01 UTC 2023 Modified Files: src/usr.bin/make/unit-tests: varmod-assign.mk Log Message: tests/make: finish incomplete sentence in test for assignment modifiers To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/make/unit-tests/varmod-assign.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: skrll
Date: Sun Dec 31 09:45:58 UTC 2023
Modified Files:
src/sys/arch/arm/rockchip: rk_gmac.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/rockchip/rk_gmac.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/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.21 src/sys/arch/arm/rockchip/rk_gmac.c:1.22
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.21 Fri Nov 12 22:02:08 2021
+++ src/sys/arch/arm/rockchip/rk_gmac.c Sun Dec 31 09:45:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.21 2021/11/12 22:02:08 jmcneill Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.22 2023/12/31 09:45:58 skrll Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.21 2021/11/12 22:02:08 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.22 2023/12/31 09:45:58 skrll Exp $");
#include
#include
@@ -370,7 +370,7 @@ rk_gmac_setup_clocks(int phandle)
static const char * const clknames[] = {
#if 0
"stmmaceth",
- "mac_clk_rx",
+ "mac_clk_rx",
"mac_clk_tx",
"clk_mac_ref",
"clk_mac_refout",
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: skrll Date: Sun Dec 31 09:45:58 UTC 2023 Modified Files: src/sys/arch/arm/rockchip: rk_gmac.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/rockchip/rk_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
