CVS commit: src/tools

2023-11-29 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Nov 30 06:29:33 UTC 2023

Modified Files:
src/tools: Makefile

Log Message:
tools/Makefile: Correct inverted comment. NFC


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/tools/Makefile

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

Modified files:

Index: src/tools/Makefile
diff -u src/tools/Makefile:1.214 src/tools/Makefile:1.215
--- src/tools/Makefile:1.214	Mon Apr 18 19:46:35 2022
+++ src/tools/Makefile	Thu Nov 30 06:29:33 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.214 2022/04/18 19:46:35 jkoshy Exp $
+#	$NetBSD: Makefile,v 1.215 2023/11/30 06:29:33 rin Exp $
 
 .include 
 .include 
@@ -239,7 +239,7 @@ SUBDIR+=	makekeys
 
 SUBDIR+= cvslatest
 
-.endif # TOOLS_BUILDRUMP != no
+.endif # TOOLS_BUILDRUMP == no
 
 check_MKTOOLS: .PHONY .NOTMAIN
 .if ${MKTOOLS:Uyes} == "no"



CVS commit: src/tools

2023-11-29 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Thu Nov 30 06:29:33 UTC 2023

Modified Files:
src/tools: Makefile

Log Message:
tools/Makefile: Correct inverted comment. NFC


To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/tools/Makefile

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

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 19:02:37 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Tickets #1771 and #1772


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.117 -r1.1.2.118 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.117 src/doc/CHANGES-9.4:1.1.2.118
--- src/doc/CHANGES-9.4:1.1.2.117	Wed Nov 29 12:27:49 2023
+++ src/doc/CHANGES-9.4	Wed Nov 29 19:02:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.117 2023/11/29 12:27:49 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.118 2023/11/29 19:02:37 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -2448,3 +2448,14 @@ sys/ufs/ffs/ffs_vfsops.c			1.382
 	PR 57606: ffs: fix minor locking error.
 	[riastradh, ticket #1770]
 
+etc/namedb/root.cache1.26
+
+	Update root name servers to 2023112702 (November 27, 2023).
+	[taca, ticket #1771]
+
+sys/dev/wscons/wsemul_vt100.c			1.47,1.48
+
+	wscons: PR 56223: accept bell (^G) as an end of sequence in
+	"string" state.
+	[gutteridge, ticket #1772]
+



CVS commit: [netbsd-9] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 19:02:37 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Tickets #1771 and #1772


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.117 -r1.1.2.118 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/sys/dev/wscons

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:59:00 UTC 2023

Modified Files:
src/sys/dev/wscons [netbsd-9]: wsemul_vt100.c

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1772):

sys/dev/wscons/wsemul_vt100.c: revision 1.47
sys/dev/wscons/wsemul_vt100.c: revision 1.48

PR/56223: David Shao ^[]8;;^G make console unresponsive. From OpenBSD:

In `string' state, accept bell (^G) as an end of sequence in addition to
`ESC \', as supported by xterm; some third-party software such as
ncmpcpp rely upon this.

fix the NetBSD tag.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/dev/wscons/wsemul_vt100.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/wscons/wsemul_vt100.c
diff -u src/sys/dev/wscons/wsemul_vt100.c:1.45 src/sys/dev/wscons/wsemul_vt100.c:1.45.4.1
--- src/sys/dev/wscons/wsemul_vt100.c:1.45	Mon Sep  3 16:29:34 2018
+++ src/sys/dev/wscons/wsemul_vt100.c	Wed Nov 29 18:59:00 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: wsemul_vt100.c,v 1.45 2018/09/03 16:29:34 riastradh Exp $ */
+/*	$NetBSD: wsemul_vt100.c,v 1.45.4.1 2023/11/29 18:59:00 martin Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.45 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100.c,v 1.45.4.1 2023/11/29 18:59:00 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_wsmsgattrs.h"
@@ -429,7 +429,13 @@ wsemul_vt100_output_c0c1(struct wsemul_v
 		/* ignore */
 		break;
 	case ASCII_BEL:
-		wsdisplay_emulbell(vd->cbcookie);
+		if (edp->state == VT100_EMUL_STATE_STRING) {
+			/* acts as an equivalent to the ``ESC \'' string end */
+			wsemul_vt100_handle_dcs(vd);
+			edp->state = VT100_EMUL_STATE_NORMAL;
+		} else {
+			wsdisplay_emulbell(vd->cbcookie);
+		}
 		break;
 	case ASCII_BS:
 		if (vd->ccol > 0) {
@@ -489,7 +495,7 @@ wsemul_vt100_output_c0c1(struct wsemul_v
 		break;
 	case ST: /* string end 8-bit */
 		/* XXX only in VT100_EMUL_STATE_STRING */
-		wsemul_vt100_handle_dcs(edp);
+		wsemul_vt100_handle_dcs(vd);
 		edp->state = VT100_EMUL_STATE_NORMAL;
 		break;
 #endif



CVS commit: [netbsd-9] src/sys/dev/wscons

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:59:00 UTC 2023

Modified Files:
src/sys/dev/wscons [netbsd-9]: wsemul_vt100.c

Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1772):

sys/dev/wscons/wsemul_vt100.c: revision 1.47
sys/dev/wscons/wsemul_vt100.c: revision 1.48

PR/56223: David Shao ^[]8;;^G make console unresponsive. From OpenBSD:

In `string' state, accept bell (^G) as an end of sequence in addition to
`ESC \', as supported by xterm; some third-party software such as
ncmpcpp rely upon this.

fix the NetBSD tag.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/dev/wscons/wsemul_vt100.c

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



CVS commit: [netbsd-8] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:54:37 UTC 2023

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1922


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-8.3

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-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.209 src/doc/CHANGES-8.3:1.1.2.210
--- src/doc/CHANGES-8.3:1.1.2.209	Wed Nov 29 12:29:45 2023
+++ src/doc/CHANGES-8.3	Wed Nov 29 18:54:37 2023
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-8.3,v 1.1.2.209 2023/11/29 12:29:45 martin Exp $
+$NetBSD: CHANGES-8.3,v 1.1.2.210 2023/11/29 18:54:37 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -4109,3 +4109,8 @@ sys/ufs/ffs/ffs_vfsops.c			1.382
 	PR 57606: ffs: fix minor locking error.
 	[riastradh, ticket #1921]
 
+etc/namedb/root.cache1.24-1.26
+
+	Update root name servers to 2023112702 (November 27, 2023).
+	[taca, ticket #1922]
+



CVS commit: [netbsd-8] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:54:37 UTC 2023

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ticket #1922


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.209 -r1.1.2.210 src/doc/CHANGES-8.3

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



CVS commit: [netbsd-8] src/etc/namedb

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:53:44 UTC 2023

Modified Files:
src/etc/namedb [netbsd-8]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1922):

etc/namedb/root.cache: revision 1.24
etc/namedb/root.cache: revision 1.25
etc/namedb/root.cache: revision 1.26

sync with most recent (no changes)

Update to 2019093001

Update to 2023112702 (November 27, 2023).


To generate a diff of this commit:
cvs rdiff -u -r1.22.6.1 -r1.22.6.2 src/etc/namedb/root.cache

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.22.6.1 src/etc/namedb/root.cache:1.22.6.2
--- src/etc/namedb/root.cache:1.22.6.1	Thu Nov  2 21:03:34 2017
+++ src/etc/namedb/root.cache	Wed Nov 29 18:53:44 2023
@@ -1,90 +1,90 @@
-;	$NetBSD: root.cache,v 1.22.6.1 2017/11/02 21:03:34 snj Exp $
-;   This file holds the information on root name servers needed to
+;	$NetBSD: root.cache,v 1.22.6.2 2023/11/29 18:53:44 martin Exp $
+;   This file holds the information on root name servers needed to 
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
-;   configuration file of BIND domain name servers).
-;
+;   configuration file of BIND domain name servers). 
+; 
 ;   This file is made available by InterNIC 
 ;   under anonymous FTP as
-;   file/domain/named.cache
+;   file/domain/named.cache 
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
 ;
-;   last update:October 24, 2017
-;   related version of root zone:   2017102400
-;
-; FORMERLY NS.INTERNIC.NET
+;   last update: November 27, 2023
+;   related version of root zone: 2023112702
+; 
+; FORMERLY NS.INTERNIC.NET 
 ;
 .360  NSA.ROOT-SERVERS.NET.
 A.ROOT-SERVERS.NET.  360  A 198.41.0.4
 A.ROOT-SERVERS.NET.  360    2001:503:ba3e::2:30
-;
-; FORMERLY NS1.ISI.EDU
+; 
+; FORMERLY NS1.ISI.EDU 
 ;
 .360  NSB.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.  360  A 199.9.14.201
-B.ROOT-SERVERS.NET.  360    2001:500:200::b
-;
-; FORMERLY C.PSI.NET
+B.ROOT-SERVERS.NET.  360  A 170.247.170.2
+B.ROOT-SERVERS.NET.  360    2801:1b8:10::b
+; 
+; FORMERLY C.PSI.NET 
 ;
 .360  NSC.ROOT-SERVERS.NET.
 C.ROOT-SERVERS.NET.  360  A 192.33.4.12
 C.ROOT-SERVERS.NET.  360    2001:500:2::c
-;
-; FORMERLY TERP.UMD.EDU
+; 
+; FORMERLY TERP.UMD.EDU 
 ;
 .360  NSD.ROOT-SERVERS.NET.
 D.ROOT-SERVERS.NET.  360  A 199.7.91.13
 D.ROOT-SERVERS.NET.  360    2001:500:2d::d
-;
+; 
 ; FORMERLY NS.NASA.GOV
 ;
 .360  NSE.ROOT-SERVERS.NET.
 E.ROOT-SERVERS.NET.  360  A 192.203.230.10
 E.ROOT-SERVERS.NET.  360    2001:500:a8::e
-;
+; 
 ; FORMERLY NS.ISC.ORG
 ;
 .360  NSF.ROOT-SERVERS.NET.
 F.ROOT-SERVERS.NET.  360  A 192.5.5.241
 F.ROOT-SERVERS.NET.  360    2001:500:2f::f
-;
+; 
 ; FORMERLY NS.NIC.DDN.MIL
 ;
 .360  NSG.ROOT-SERVERS.NET.
 G.ROOT-SERVERS.NET.  360  A 192.112.36.4
 G.ROOT-SERVERS.NET.  360    2001:500:12::d0d
-;
+; 
 ; FORMERLY AOS.ARL.ARMY.MIL
 ;
 .360  NSH.ROOT-SERVERS.NET.
 H.ROOT-SERVERS.NET.  360  A 198.97.190.53
 H.ROOT-SERVERS.NET.  360    2001:500:1::53
-;
+; 
 ; FORMERLY NIC.NORDU.NET
 ;
 .360  NSI.ROOT-SERVERS.NET.
 I.ROOT-SERVERS.NET.  360  A 192.36.148.17
 I.ROOT-SERVERS.NET.  360    2001:7fe::53
-;
+; 
 ; OPERATED BY VERISIGN, INC.
 ;
 .360  NSJ.ROOT-SERVERS.NET.
 J.ROOT-SERVERS.NET.  360  A 192.58.128.30
 J.ROOT-SERVERS.NET.  360    2001:503:c27::2:30
-;
+; 
 ; OPERATED BY RIPE NCC
 ;
 .360  NSK.ROOT-SERVERS.NET.
 K.ROOT-SERVERS.NET.  360  A 193.0.14.129
 K.ROOT-SERVERS.NET.  360    2001:7fd::1
-;
+; 
 ; OPERATED BY ICANN
 ;
 .360  NSL.ROOT-SERVERS.NET.
 L.ROOT-SERVERS.NET.  360  A 199.7.83.42
 L.ROOT-SERVERS.NET.  360    2001:500:9f::42
-;
+; 
 ; OPERATED BY WIDE
 ;
 .360  NSM.ROOT-SERVERS.NET.



CVS commit: [netbsd-8] src/etc/namedb

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:53:44 UTC 2023

Modified Files:
src/etc/namedb [netbsd-8]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1922):

etc/namedb/root.cache: revision 1.24
etc/namedb/root.cache: revision 1.25
etc/namedb/root.cache: revision 1.26

sync with most recent (no changes)

Update to 2019093001

Update to 2023112702 (November 27, 2023).


To generate a diff of this commit:
cvs rdiff -u -r1.22.6.1 -r1.22.6.2 src/etc/namedb/root.cache

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



CVS commit: [netbsd-9] src/etc/namedb

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:04:09 UTC 2023

Modified Files:
src/etc/namedb [netbsd-9]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1771):

etc/namedb/root.cache: revision 1.26

Update to 2023112702 (November 27, 2023).


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/etc/namedb/root.cache

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

Modified files:

Index: src/etc/namedb/root.cache
diff -u src/etc/namedb/root.cache:1.24.2.1 src/etc/namedb/root.cache:1.24.2.2
--- src/etc/namedb/root.cache:1.24.2.1	Thu Oct 10 17:27:23 2019
+++ src/etc/namedb/root.cache	Wed Nov 29 18:04:09 2023
@@ -1,4 +1,4 @@
-;	$NetBSD: root.cache,v 1.24.2.1 2019/10/10 17:27:23 martin Exp $
+;	$NetBSD: root.cache,v 1.24.2.2 2023/11/29 18:04:09 martin Exp $
 ;   This file holds the information on root name servers needed to 
 ;   initialize cache of Internet domain name servers
 ;   (e.g. reference this file in the "cache  .  "
@@ -9,9 +9,9 @@
 ;   file/domain/named.cache 
 ;   on server   FTP.INTERNIC.NET
 ;   -OR-RS.INTERNIC.NET
-; 
-;   last update: September 30, 2019 
-;   related version of root zone: 2019093001
+;
+;   last update: November 27, 2023
+;   related version of root zone: 2023112702
 ; 
 ; FORMERLY NS.INTERNIC.NET 
 ;
@@ -22,8 +22,8 @@ A.ROOT-SERVERS.NET.  360  AA
 ; FORMERLY NS1.ISI.EDU 
 ;
 .360  NSB.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.  360  A 199.9.14.201
-B.ROOT-SERVERS.NET.  360    2001:500:200::b
+B.ROOT-SERVERS.NET.  360  A 170.247.170.2
+B.ROOT-SERVERS.NET.  360    2801:1b8:10::b
 ; 
 ; FORMERLY C.PSI.NET 
 ;



CVS commit: [netbsd-9] src/etc/namedb

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 18:04:09 UTC 2023

Modified Files:
src/etc/namedb [netbsd-9]: root.cache

Log Message:
Pull up following revision(s) (requested by taca in ticket #1771):

etc/namedb/root.cache: revision 1.26

Update to 2023112702 (November 27, 2023).


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/etc/namedb/root.cache

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

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:36:24 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #482  and #483


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.165 -r1.1.2.166 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.165 src/doc/CHANGES-10.0:1.1.2.166
--- src/doc/CHANGES-10.0:1.1.2.165	Wed Nov 29 12:25:55 2023
+++ src/doc/CHANGES-10.0	Wed Nov 29 12:36:24 2023
@@ -1,5 +1,5 @@
 
-# $NetBSD: CHANGES-10.0,v 1.1.2.165 2023/11/29 12:25:55 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.166 2023/11/29 12:36:24 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -14235,3 +14235,13 @@ external/nvidia-firmware/nouveau/dist/tu
 	nvidia: update Tu11x signed firmware to support newer Turing HW.
 	[bouyer, ticket #481]
 
+sys/arch/arm/acpi/gic_acpi.c			1.8
+
+	arm: gicv2: fix truncation of GICC / GICD base addresses above 4GB.
+	[jmcneill, ticket #482]
+
+sys/dev/pci/pci_resource.c			1.4
+
+	pci: Improve resource allocation for non-prefetchable BARs.
+	[jmcneill, ticket #483]
+



CVS commit: [netbsd-10] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:36:24 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #482  and #483


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.165 -r1.1.2.166 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/sys/dev/pci

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:34:46 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: pci_resource.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #483):

sys/dev/pci/pci_resource.c: revision 1.4

pci: Improve resource allocation for non-prefetchable BARs.

When allocating resources for PCI devices, use the following criteria:
  - Prefetchable memory must be allocated from the prefetchable range
of the parent bridge.
  - For 64-bit MMIO, try the prefetchable range first, and fallback to
the non-prefetchable range. The idea here is to preserve 32-bit resources
for 32-bit BARs.
  - For 32-bit MMIO, try the non-prefetchable range first. If that fails,
make one last attempt at allocating from the prefetchable range, in the
event that it has resources below 4GB.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/dev/pci/pci_resource.c

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

Modified files:

Index: src/sys/dev/pci/pci_resource.c
diff -u src/sys/dev/pci/pci_resource.c:1.3 src/sys/dev/pci/pci_resource.c:1.3.2.1
--- src/sys/dev/pci/pci_resource.c:1.3	Sat Oct 15 20:11:44 2022
+++ src/sys/dev/pci/pci_resource.c	Wed Nov 29 12:34:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_resource.c,v 1.3 2022/10/15 20:11:44 riastradh Exp $ */
+/* $NetBSD: pci_resource.c,v 1.3.2.1 2023/11/29 12:34:46 martin Exp $ */
 
 /*-
  * Copyright (c) 2022 Jared McNeill 
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pci_resource.c,v 1.3 2022/10/15 20:11:44 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_resource.c,v 1.3.2.1 2023/11/29 12:34:46 martin Exp $");
 
 #include 
 #include 
@@ -684,13 +684,46 @@ pci_resource_init_device(struct pci_reso
 
 		KASSERT(pi->pi_type == PCI_MAPREG_TYPE_MEM);
 		error = ERANGE;
-		if (pi->pi_mem.prefetch && res_pmem != NULL) {
-			error = pci_resource_claim(res_pmem, pi->pi_base,
-			pi->pi_base + pi->pi_size - 1);
-		}
-		if (error && res_mem != NULL) {
-			error = pci_resource_claim(res_mem, pi->pi_base,
-			pi->pi_base + pi->pi_size - 1);
+		if (pi->pi_mem.prefetch) {
+			/*
+			 * Prefetchable memory must be allocated from the
+			 * bridge's prefetchable region.
+			 */
+			if (res_pmem != NULL) {
+error = pci_resource_claim(res_pmem, pi->pi_base,
+pi->pi_base + pi->pi_size - 1);
+			}
+		} else if (pi->pi_mem.memtype == PCI_MAPREG_MEM_TYPE_64BIT) {
+			/*
+			 * Non-prefetchable 64-bit memory can be allocated from
+			 * any range. Prefer allocations from the prefetchable
+			 * region to save 32-bit only resources for 32-bit BARs.
+			 */
+			if (res_pmem != NULL) {
+error = pci_resource_claim(res_pmem, pi->pi_base,
+pi->pi_base + pi->pi_size - 1);
+			}
+			if (error && res_mem != NULL) {
+error = pci_resource_claim(res_mem, pi->pi_base,
+pi->pi_base + pi->pi_size - 1);
+			}
+		} else {
+			/*
+			 * Non-prefetchable 32-bit memory can be allocated from
+			 * any range, provided that the range is below 4GB. Try
+			 * the non-prefetchable range first, and if that fails,
+			 * make one last attempt at allocating from the
+			 * prefetchable range in case the platform provides
+			 * memory below 4GB.
+			 */
+			if (res_mem != NULL) {
+error = pci_resource_claim(res_mem, pi->pi_base,
+pi->pi_base + pi->pi_size - 1);
+			}
+			if (error && res_pmem != NULL) {
+error = pci_resource_claim(res_pmem, pi->pi_base,
+pi->pi_base + pi->pi_size - 1);
+			}
 		}
 		if (error) {
 			DPRINT("PCI: " PCI_SBDF_FMT " [device] mem"



CVS commit: [netbsd-10] src/sys/dev/pci

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:34:46 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: pci_resource.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #483):

sys/dev/pci/pci_resource.c: revision 1.4

pci: Improve resource allocation for non-prefetchable BARs.

When allocating resources for PCI devices, use the following criteria:
  - Prefetchable memory must be allocated from the prefetchable range
of the parent bridge.
  - For 64-bit MMIO, try the prefetchable range first, and fallback to
the non-prefetchable range. The idea here is to preserve 32-bit resources
for 32-bit BARs.
  - For 32-bit MMIO, try the non-prefetchable range first. If that fails,
make one last attempt at allocating from the prefetchable range, in the
event that it has resources below 4GB.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/dev/pci/pci_resource.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/sys/arch/arm/acpi

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:33:08 UTC 2023

Modified Files:
src/sys/arch/arm/acpi [netbsd-10]: gic_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #482):

sys/arch/arm/acpi/gic_acpi.c: revision 1.8

gicv2: Fix truncation of GICC / GICD base addresses above 4GB.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/arm/acpi/gic_acpi.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/acpi/gic_acpi.c
diff -u src/sys/arch/arm/acpi/gic_acpi.c:1.7 src/sys/arch/arm/acpi/gic_acpi.c:1.7.6.1
--- src/sys/arch/arm/acpi/gic_acpi.c:1.7	Sat Aug  7 16:18:42 2021
+++ src/sys/arch/arm/acpi/gic_acpi.c	Wed Nov 29 12:33:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_acpi.c,v 1.7 2021/08/07 16:18:42 thorpej Exp $ */
+/* $NetBSD: gic_acpi.c,v 1.7.6.1 2023/11/29 12:33:08 martin Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "pci.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.7 2021/08/07 16:18:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_acpi.c,v 1.7.6.1 2023/11/29 12:33:08 martin Exp $");
 
 #include 
 #include 
@@ -102,8 +102,8 @@ gic_acpi_attach(device_t parent, device_
 		return;
 	}
 
-	const bus_addr_t addr = uimin(gicd->BaseAddress, gicc->BaseAddress);
-	const bus_size_t end = uimax(gicd->BaseAddress + GICD_SIZE, gicc->BaseAddress + GICC_SIZE);
+	const bus_addr_t addr = ulmin(gicd->BaseAddress, gicc->BaseAddress);
+	const bus_size_t end = ulmax(gicd->BaseAddress + GICD_SIZE, gicc->BaseAddress + GICC_SIZE);
 	const bus_size_t size = end - addr;
 
 	error = bus_space_map(_generic_bs_tag, addr, size, 0, );



CVS commit: [netbsd-10] src/sys/arch/arm/acpi

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:33:08 UTC 2023

Modified Files:
src/sys/arch/arm/acpi [netbsd-10]: gic_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #482):

sys/arch/arm/acpi/gic_acpi.c: revision 1.8

gicv2: Fix truncation of GICC / GICD base addresses above 4GB.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/arm/acpi/gic_acpi.c

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



CVS commit: [netbsd-8] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:29:45 UTC 2023

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ammend ticket #1920 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.208 -r1.1.2.209 src/doc/CHANGES-8.3

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



CVS commit: [netbsd-8] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:29:45 UTC 2023

Modified Files:
src/doc [netbsd-8]: CHANGES-8.3

Log Message:
Ammend ticket #1920 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.208 -r1.1.2.209 src/doc/CHANGES-8.3

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-8.3
diff -u src/doc/CHANGES-8.3:1.1.2.208 src/doc/CHANGES-8.3:1.1.2.209
--- src/doc/CHANGES-8.3:1.1.2.208	Tue Nov 28 13:14:41 2023
+++ src/doc/CHANGES-8.3	Wed Nov 29 12:29:45 2023
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-8.3,v 1.1.2.208 2023/11/28 13:14:41 martin Exp $
+$NetBSD: CHANGES-8.3,v 1.1.2.209 2023/11/29 12:29:45 martin Exp $
 
 A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
 release:
@@ -4098,7 +4098,7 @@ external/gpl3/binutils/dist/gas/config/t
 	as(1): PR 57680: handle MIPS1 FPR load hazard correctly.
 	[tsutsui, ticket #1919]
 
-sys/kern/exec_subr.c1.86
+sys/kern/exec_subr.c1.86,1.87
 tests/lib/libc/sys/t_setrlimit.c		1.8,1.9
 
 	PR 57711: fix setrlimit(RLIMIT_STACK) in current process.



CVS commit: [netbsd-8] src/sys/kern

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:29:06 UTC 2023

Modified Files:
src/sys/kern [netbsd-8]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #1920:

sys/kern/exec_subr.c1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.78.2.4 -r1.78.2.5 src/sys/kern/exec_subr.c

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

Modified files:

Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.78.2.4 src/sys/kern/exec_subr.c:1.78.2.5
--- src/sys/kern/exec_subr.c:1.78.2.4	Tue Nov 28 13:00:52 2023
+++ src/sys/kern/exec_subr.c	Wed Nov 29 12:29:05 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.78.2.4 2023/11/28 13:00:52 martin Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.78.2.5 2023/11/29 12:29:05 martin Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.78.2.4 2023/11/28 13:00:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.78.2.5 2023/11/29 12:29:05 martin Exp $");
 
 #include "opt_pax.h"
 
@@ -162,7 +162,7 @@ static int
 vmcmd_get_prot(struct lwp *l, const struct exec_vmcmd *cmd, vm_prot_t *prot,
 vm_prot_t *maxprot)
 {
-	vm_prot_t extraprot = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
+	vm_prot_t extraprot __unused = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
 
 	*prot = cmd->ev_prot & UVM_PROT_ALL;
 	*maxprot = PAX_MPROTECT_MAXPROTECT(l, *prot, extraprot, UVM_PROT_ALL);



CVS commit: [netbsd-8] src/sys/kern

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:29:06 UTC 2023

Modified Files:
src/sys/kern [netbsd-8]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #1920:

sys/kern/exec_subr.c1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.78.2.4 -r1.78.2.5 src/sys/kern/exec_subr.c

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

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:27:50 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Ammend ticket #1769 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.116 -r1.1.2.117 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.116 src/doc/CHANGES-9.4:1.1.2.117
--- src/doc/CHANGES-9.4:1.1.2.116	Tue Nov 28 13:12:52 2023
+++ src/doc/CHANGES-9.4	Wed Nov 29 12:27:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.116 2023/11/28 13:12:52 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.117 2023/11/29 12:27:49 martin Exp $
 
 A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
 release:
@@ -2437,7 +2437,7 @@ sys/kern/uipc_mbuf.c1.252
 	mbuf: avoid assertion failure when splitting a mbuf cluster.
 	[ozaki-r, ticket #1768]
 
-sys/kern/exec_subr.c1.86
+sys/kern/exec_subr.c1.86,1.87
 tests/lib/libc/sys/t_setrlimit.c		1.8,1.9
 
 	PR 57711: fix setrlimit(RLIMIT_STACK) in current process.



CVS commit: [netbsd-9] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:27:50 UTC 2023

Modified Files:
src/doc [netbsd-9]: CHANGES-9.4

Log Message:
Ammend ticket #1769 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.116 -r1.1.2.117 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/sys/kern

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:27:05 UTC 2023

Modified Files:
src/sys/kern [netbsd-9]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #1769:

sys/kern/exec_subr.c1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.82.10.1 -r1.82.10.2 src/sys/kern/exec_subr.c

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

Modified files:

Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.82.10.1 src/sys/kern/exec_subr.c:1.82.10.2
--- src/sys/kern/exec_subr.c:1.82.10.1	Tue Nov 28 12:59:21 2023
+++ src/sys/kern/exec_subr.c	Wed Nov 29 12:27:05 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.82.10.1 2023/11/28 12:59:21 martin Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.82.10.2 2023/11/29 12:27:05 martin Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.82.10.1 2023/11/28 12:59:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.82.10.2 2023/11/29 12:27:05 martin Exp $");
 
 #include "opt_pax.h"
 
@@ -162,7 +162,7 @@ static int
 vmcmd_get_prot(struct lwp *l, const struct exec_vmcmd *cmd, vm_prot_t *prot,
 vm_prot_t *maxprot)
 {
-	vm_prot_t extraprot = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
+	vm_prot_t extraprot __unused = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
 
 	*prot = cmd->ev_prot & UVM_PROT_ALL;
 	*maxprot = PAX_MPROTECT_MAXPROTECT(l, *prot, extraprot, UVM_PROT_ALL);



CVS commit: [netbsd-9] src/sys/kern

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:27:05 UTC 2023

Modified Files:
src/sys/kern [netbsd-9]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #1769:

sys/kern/exec_subr.c1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.82.10.1 -r1.82.10.2 src/sys/kern/exec_subr.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/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:25:55 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Ammend ticket #477 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.164 -r1.1.2.165 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.164 src/doc/CHANGES-10.0:1.1.2.165
--- src/doc/CHANGES-10.0:1.1.2.164	Tue Nov 28 17:18:47 2023
+++ src/doc/CHANGES-10.0	Wed Nov 29 12:25:55 2023
@@ -1,5 +1,5 @@
 
-# $NetBSD: CHANGES-10.0,v 1.1.2.164 2023/11/28 17:18:47 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.165 2023/11/29 12:25:55 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -14202,7 +14202,7 @@ sys/net/lagg/if_lagg_lacp.c			1.26,1.27
 	  physical interfaces
 	[yamaguchi, ticket #476]
 
-sys/kern/exec_subr.c1.86
+sys/kern/exec_subr.c1.86,1.87
 tests/lib/libc/sys/t_setrlimit.c		1.8,1.9
 
 	PR 57711: fix setrlimit(RLIMIT_STACK) in current process.



CVS commit: [netbsd-10] src/doc

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:25:55 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Ammend ticket #477 for additional pullups


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.164 -r1.1.2.165 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/sys/kern

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:25:17 UTC 2023

Modified Files:
src/sys/kern [netbsd-10]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #477:

sys/kern/exec_subr.c1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.84.20.1 -r1.84.20.2 src/sys/kern/exec_subr.c

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

Modified files:

Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.84.20.1 src/sys/kern/exec_subr.c:1.84.20.2
--- src/sys/kern/exec_subr.c:1.84.20.1	Tue Nov 28 12:56:28 2023
+++ src/sys/kern/exec_subr.c	Wed Nov 29 12:25:17 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_subr.c,v 1.84.20.1 2023/11/28 12:56:28 martin Exp $	*/
+/*	$NetBSD: exec_subr.c,v 1.84.20.2 2023/11/29 12:25:17 martin Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.84.20.1 2023/11/28 12:56:28 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.84.20.2 2023/11/29 12:25:17 martin Exp $");
 
 #include "opt_pax.h"
 
@@ -162,7 +162,7 @@ static int
 vmcmd_get_prot(struct lwp *l, const struct exec_vmcmd *cmd, vm_prot_t *prot,
 vm_prot_t *maxprot)
 {
-	vm_prot_t extraprot = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
+	vm_prot_t extraprot __unused = PROT_MPROTECT_EXTRACT(cmd->ev_prot);
 
 	*prot = cmd->ev_prot & UVM_PROT_ALL;
 	*maxprot = PAX_MPROTECT_MAXPROTECT(l, *prot, extraprot, UVM_PROT_ALL);



CVS commit: [netbsd-10] src/sys/kern

2023-11-29 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Wed Nov 29 12:25:17 UTC 2023

Modified Files:
src/sys/kern [netbsd-10]: exec_subr.c

Log Message:
Additionally pull up the following for ticket #477:

sys/kern/exec_subr.c1.87

Fix build for kernels w/o PAX_MPROTECT.


To generate a diff of this commit:
cvs rdiff -u -r1.84.20.1 -r1.84.20.2 src/sys/kern/exec_subr.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/x86/x86

2023-11-29 Thread Michael van Elst
Module Name:src
Committed By:   mlelstv
Date:   Wed Nov 29 11:40:37 UTC 2023

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

Log Message:
Fix use-after-free (source->is_type) when detecting unsharable
interrupts. Doesn't solve the interrupt conflict itself, but
avoids a panic.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 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.