CVS commit: src/sys/arch/ofppc/ofppc

2023-11-03 Thread Andrius Varanavicius 
Module Name:src
Committed By:   andvar
Date:   Fri Nov  3 20:25:13 UTC 2023

Modified Files:
src/sys/arch/ofppc/ofppc: cpu.c

Log Message:
Remove unused msr definition.

Fixes ofppc GENERIC.MP build.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ofppc/ofppc/cpu.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/ofppc/ofppc/cpu.c
diff -u src/sys/arch/ofppc/ofppc/cpu.c:1.16 src/sys/arch/ofppc/ofppc/cpu.c:1.17
--- src/sys/arch/ofppc/ofppc/cpu.c:1.16	Wed Jun 29 06:13:09 2011
+++ src/sys/arch/ofppc/ofppc/cpu.c	Fri Nov  3 20:25:13 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.16 2011/06/29 06:13:09 matt Exp $	*/
+/*	$NetBSD: cpu.c,v 1.17 2023/11/03 20:25:13 andvar Exp $	*/
 
 /*-
  * Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.16 2011/06/29 06:13:09 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.17 2023/11/03 20:25:13 andvar Exp $");
 
 #include "opt_ppcparam.h"
 #include "opt_multiprocessor.h"
@@ -238,9 +238,7 @@ int
 md_setup_trampoline(volatile struct cpu_hatch_data *h, struct cpu_info *ci)
 {
 	int i;
-	u_int msr;
 
-	msr = mfmsr();
 	h->hatch_running = -1;
 	cpu_spinstart_cpunum = ci->ci_cpuid;
 	__asm volatile("dcbf 0,%0"::"r"(_spinstart_cpunum):"memory");

CVS commit: src/sys/arch/ofppc/ofppc

2023-11-03 Thread Andrius Varanavicius 
Module Name:src
Committed By:   andvar
Date:   Fri Nov  3 20:25:13 UTC 2023

Modified Files:
src/sys/arch/ofppc/ofppc: cpu.c

Log Message:
Remove unused msr definition.

Fixes ofppc GENERIC.MP build.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ofppc/ofppc/cpu.c

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

CVS commit: src/share/man/man4

2023-11-03 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri Nov  3 18:24:41 UTC 2023

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

Log Message:
cdce(4): add Club 3D Adapter LAN-Adapter to recognized adapters

Bump date


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/cdce.4

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

CVS commit: src/share/man/man4

2023-11-03 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Fri Nov  3 18:24:41 UTC 2023

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

Log Message:
cdce(4): add Club 3D Adapter LAN-Adapter to recognized adapters

Bump date


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/cdce.4

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

Modified files:

Index: src/share/man/man4/cdce.4
diff -u src/share/man/man4/cdce.4:1.17 src/share/man/man4/cdce.4:1.18
--- src/share/man/man4/cdce.4:1.17	Fri Aug 30 09:22:17 2019
+++ src/share/man/man4/cdce.4	Fri Nov  3 18:24:41 2023
@@ -1,3 +1,5 @@
+.\" $NetBSD: cdce.4,v 1.18 2023/11/03 18:24:41 wiz Exp $
+.\"
 .\" Copyright (c) 2004 Daniel Hartmeier
 .\" All rights reserved.
 .\"
@@ -25,9 +27,7 @@
 .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $NetBSD: cdce.4,v 1.17 2019/08/30 09:22:17 wiz Exp $
-.\"
-.Dd August 24, 2019
+.Dd November 3, 2023
 .Dt CDCE 4
 .Os
 .Sh NAME
@@ -49,6 +49,8 @@ Acer Labs USB 2.0 Data Link
 .It
 Anker A7611
 .It
+Club 3D Adapter LAN-Adapter (CAC-1420)
+.It
 DIEWU USB-DW8152
 .It
 G.Mate YP3X00

CVS commit: xsrc/external/mit/libdrm/dist

2023-11-03 Thread Patrick Welche 
Module Name:xsrc
Committed By:   prlw1
Date:   Fri Nov  3 17:05:42 UTC 2023

Modified Files:
xsrc/external/mit/libdrm/dist: configure

Log Message:
We already have libdrm 2.4.114 :-)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/configure

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

CVS commit: xsrc/external/mit/libdrm/dist

2023-11-03 Thread Patrick Welche 
Module Name:xsrc
Committed By:   prlw1
Date:   Fri Nov  3 17:05:42 UTC 2023

Modified Files:
xsrc/external/mit/libdrm/dist: configure

Log Message:
We already have libdrm 2.4.114 :-)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libdrm/dist/configure

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

Modified files:

Index: xsrc/external/mit/libdrm/dist/configure
diff -u xsrc/external/mit/libdrm/dist/configure:1.4 xsrc/external/mit/libdrm/dist/configure:1.5
--- xsrc/external/mit/libdrm/dist/configure:1.4	Thu Mar 17 09:10:42 2022
+++ xsrc/external/mit/libdrm/dist/configure	Fri Nov  3 17:05:41 2023
@@ -3,6 +3,6 @@
 # Identity of this package.
 PACKAGE_NAME='libdrm'
 PACKAGE_TARNAME='libdrm'
-PACKAGE_VERSION='2.4.109'
-PACKAGE_STRING='libdrm 2.4.109'
+PACKAGE_VERSION='2.4.114'
+PACKAGE_STRING='libdrm 2.4.114'
 PACKAGE_URL=''

CVS commit: [netbsd-10] src/doc

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:27:30 UTC 2023

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

Log Message:
Tickets #446 - #455


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.155 -r1.1.2.156 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.155 src/doc/CHANGES-10.0:1.1.2.156
--- src/doc/CHANGES-10.0:1.1.2.155	Thu Nov  2 22:17:48 2023
+++ src/doc/CHANGES-10.0	Fri Nov  3 10:27:30 2023
@@ -1,4 +1,5 @@
-# $NetBSD: CHANGES-10.0,v 1.1.2.155 2023/11/02 22:17:48 sborrill Exp $
+
+# $NetBSD: CHANGES-10.0,v 1.1.2.156 2023/11/03 10:27:30 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -13965,3 +13966,86 @@ doc/3RDPARTY	1.1962 via patch
 	ssh(1): update to OpenSSH 9.5
 	[martin, ticket #445]
 
+share/man/man4/eqos.41.2
+sys/arch/amd64/conf/GENERIC			1.607,1.608
+sys/arch/i386/conf/GENERIC			1.1251,1.1252
+sys/dev/ic/dwc_eqos.c1.18-1.29
+sys/dev/ic/dwc_eqos_reg.h			1.7,1.8
+sys/dev/ic/dwc_eqos_var.h			1.5,1.6
+sys/dev/pci/files.pci1.448
+sys/dev/pci/if_eqos_pci.c			1.1-1.3
+
+	Update eqos(4):
+	- Fix definition of GMAC_MAC_HW_FEATURE1_RXFIFOSIZE.
+	- Fix a bug that the MAC address is swapped.
+	- Add missing clock range.	
+	- Add support for Intel Elkhart Lake internal Ethernet devices.
+	- Add sysctls for debugging.
+	- Use EQOS_TXLOCK() more to be stable.
+	- Set TX/RX DMA burst length to improve performance.
+	- Set flow control correctly.
+	- KNF.
+	[msaitoh, ticket #446]
+
+share/man/man4/mcx.41.3
+sys/dev/pci/if_mcx.c1.26
+sys/dev/pci/pcidevs1.1498
+sys/dev/pci/pcidevs.h(regen)
+sys/dev/pci/pcidevs_data.h			(regen)
+
+	mcx(4): add Mellanox ConnectX-6 Lx.
+	[msaitoh, ticket #447]
+
+tools/host-mkdep/host-mkdep.in			1.33
+
+	host-mkdep(1): Add support for -iquote.
+	[rin, ticket #448]
+
+external/bsd/libevent/dist/openssl-compat.h	1.2
+
+	libevent: Fix support for LibreSSL >= 3.5.
+	[rin, ticket #449]
+
+usr.sbin/envstat/envstat.c			1.104
+
+	Silence wrong maybe-uninitialized warning from gcc.
+	[rin, ticket #450]
+
+sys/stand/efiboot/Makefile.efiboot		1.29
+sys/stand/efiboot/boot.c			1.45
+sys/stand/efiboot/efiblock.c			1.20
+sys/stand/efiboot/exec.c			1.24
+
+	Various non-critical fixes for MI efiboot.
+	[rin, ticket #451]
+
+sys/arch/i386/stand/efiboot/boot.c		1.23
+sys/arch/i386/stand/efiboot/bootia32/efibootia32.c 1.7,1.8
+sys/arch/i386/stand/efiboot/devopen.c		1.14
+sys/arch/i386/stand/efiboot/efidisk.c		1.10
+sys/arch/i386/stand/efiboot/efimemory.c		1.10
+
+	Various non-critical fixes for x86 efiboot.
+	[rin, ticket #452]
+
+sys/dev/ic/dwc_eqos.c1.30-1.33
+sys/dev/ic/dwc_eqos_var.h			1.7-1.9
+
+	eqos(4): fix races and multicast filter updates.
+	[riastradh, ticket #453]
+
+bin/sh/miscbltin.c1.54
+
+	sh(1): fix the "read" builtin.
+	[kre, ticket #454]
+
+sys/dev/pci/ixgbe/ixgbe.c			1.347
+sys/dev/pci/ixgbe/ixv.c1.194
+sys/net/if_ethersubr.c1.326
+sys/net/if_l2tp.c1.49
+sys/net/if_vlan.c1.171
+tests/net/if_vlan/t_vlan.sh			1.25
+
+	Support vlan(4) over l2tp(4).
+	[yamaguchi, ticket #455]
+

CVS commit: [netbsd-10] src/doc

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:27:30 UTC 2023

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

Log Message:
Tickets #446 - #455


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

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:10:49 UTC 2023

Modified Files:
src/sys/dev/pci/ixgbe [netbsd-10]: ixgbe.c ixv.c
src/sys/net [netbsd-10]: if_ethersubr.c if_l2tp.c if_vlan.c
src/tests/net/if_vlan [netbsd-10]: t_vlan.sh

Log Message:
Pull up following revision(s) (requested by yamaguchi in ticket #455):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.347
sys/net/if_l2tp.c: revision 1.49
tests/net/if_vlan/t_vlan.sh: revision 1.25
sys/net/if_vlan.c: revision 1.171
sys/net/if_ethersubr.c: revision 1.326
sys/dev/pci/ixgbe/ixv.c: revision 1.194
Use ether_bpf_mtap only when the device supports vlan harware tagging
The function is bpf_mtap() for ethernet devices and *currently*
it is just handling VLAN tag stripped by the hardware.
l2tp(4): use ether_ifattach() to initialize ethercom
Support vlan(4) over l2tp(4)
Added the test for vlan over l2tp


To generate a diff of this commit:
cvs rdiff -u -r1.324.2.5 -r1.324.2.6 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.183.4.4 -r1.183.4.5 src/sys/dev/pci/ixgbe/ixv.c
cvs rdiff -u -r1.323 -r1.323.2.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.48 -r1.48.4.1 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.170 -r1.170.4.1 src/sys/net/if_vlan.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/tests/net/if_vlan/t_vlan.sh

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/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.324.2.5 src/sys/dev/pci/ixgbe/ixgbe.c:1.324.2.6
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.324.2.5	Wed Oct 18 11:53:21 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Fri Nov  3 10:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.324.2.5 2023/10/18 11:53:21 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.324.2.6 2023/11/03 10:10:49 martin Exp $ */
 
 /**
 
@@ -64,7 +64,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.324.2.5 2023/10/18 11:53:21 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.324.2.6 2023/11/03 10:10:49 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1411,14 +1411,10 @@ ixgbe_setup_interface(device_t dev, stru
 
 	if_initialize(ifp);
 	sc->ipq = if_percpuq_create(>osdep.ec.ec_if);
-	ether_ifattach(ifp, sc->hw.mac.addr);
-	aprint_normal_dev(dev, "Ethernet address %s\n",
-	ether_sprintf(sc->hw.mac.addr));
 	/*
 	 * We use per TX queue softint, so if_deferred_start_init() isn't
 	 * used.
 	 */
-	ether_set_ifflags_cb(ec, ixgbe_ifflags_cb);
 
 	sc->max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
 
@@ -1442,6 +1438,11 @@ ixgbe_setup_interface(device_t dev, stru
 	/* Enable the above capabilities by default */
 	ec->ec_capenable = ec->ec_capabilities;
 
+	ether_ifattach(ifp, sc->hw.mac.addr);
+	aprint_normal_dev(dev, "Ethernet address %s\n",
+	ether_sprintf(sc->hw.mac.addr));
+	ether_set_ifflags_cb(ec, ixgbe_ifflags_cb);
+
 	/*
 	 * Don't turn this on by default, if vlans are
 	 * created on another pseudo device (eg. lagg)

Index: src/sys/dev/pci/ixgbe/ixv.c
diff -u src/sys/dev/pci/ixgbe/ixv.c:1.183.4.4 src/sys/dev/pci/ixgbe/ixv.c:1.183.4.5
--- src/sys/dev/pci/ixgbe/ixv.c:1.183.4.4	Wed Oct 18 11:53:22 2023
+++ src/sys/dev/pci/ixgbe/ixv.c	Fri Nov  3 10:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixv.c,v 1.183.4.4 2023/10/18 11:53:22 martin Exp $ */
+/* $NetBSD: ixv.c,v 1.183.4.5 2023/11/03 10:10:49 martin Exp $ */
 
 /**
 
@@ -35,7 +35,7 @@
 /*$FreeBSD: head/sys/dev/ixgbe/if_ixv.c 331224 2018-03-19 20:55:05Z erj $*/
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.183.4.4 2023/10/18 11:53:22 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixv.c,v 1.183.4.5 2023/11/03 10:10:49 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1678,14 +1678,10 @@ ixv_setup_interface(device_t dev, struct
 
 	if_initialize(ifp);
 	sc->ipq = if_percpuq_create(>osdep.ec.ec_if);
-	ether_ifattach(ifp, sc->hw.mac.addr);
-	aprint_normal_dev(dev, "Ethernet address %s\n",
-	ether_sprintf(sc->hw.mac.addr));
 	/*
 	 * We use per TX queue softint, so if_deferred_start_init() isn't
 	 * used.
 	 */
-	ether_set_ifflags_cb(ec, ixv_ifflags_cb);
 
 	sc->max_frame_size = ifp->if_mtu + IXGBE_MTU_HDR;
 
@@ -1709,6 +1705,11 @@ ixv_setup_interface(device_t dev, struct
 	/* Enable the above capabilities by default */
 	ec->ec_capenable = ec->ec_capabilities;
 
+	ether_ifattach(ifp, sc->hw.mac.addr);
+	aprint_normal_dev(dev, "Ethernet address %s\n",
+	ether_sprintf(sc->hw.mac.addr));
+	ether_set_ifflags_cb(ec, ixv_ifflags_cb);
+
 	/* Don't enable LRO by default */
 #if 0
 	/* NetBSD doesn't support LRO yet */

Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.323 src/sys/net/if_ethersubr.c:1.323.2.1
--- src/sys/net/if_ethersubr.c:1.323	Tue Nov 15 10:47:39 2022
+++

CVS commit: [netbsd-10] src

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:10:49 UTC 2023

Modified Files:
src/sys/dev/pci/ixgbe [netbsd-10]: ixgbe.c ixv.c
src/sys/net [netbsd-10]: if_ethersubr.c if_l2tp.c if_vlan.c
src/tests/net/if_vlan [netbsd-10]: t_vlan.sh

Log Message:
Pull up following revision(s) (requested by yamaguchi in ticket #455):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.347
sys/net/if_l2tp.c: revision 1.49
tests/net/if_vlan/t_vlan.sh: revision 1.25
sys/net/if_vlan.c: revision 1.171
sys/net/if_ethersubr.c: revision 1.326
sys/dev/pci/ixgbe/ixv.c: revision 1.194
Use ether_bpf_mtap only when the device supports vlan harware tagging
The function is bpf_mtap() for ethernet devices and *currently*
it is just handling VLAN tag stripped by the hardware.
l2tp(4): use ether_ifattach() to initialize ethercom
Support vlan(4) over l2tp(4)
Added the test for vlan over l2tp


To generate a diff of this commit:
cvs rdiff -u -r1.324.2.5 -r1.324.2.6 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.183.4.4 -r1.183.4.5 src/sys/dev/pci/ixgbe/ixv.c
cvs rdiff -u -r1.323 -r1.323.2.1 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.48 -r1.48.4.1 src/sys/net/if_l2tp.c
cvs rdiff -u -r1.170 -r1.170.4.1 src/sys/net/if_vlan.c
cvs rdiff -u -r1.24 -r1.24.2.1 src/tests/net/if_vlan/t_vlan.sh

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

CVS commit: [netbsd-10] src/bin/sh

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:07:09 UTC 2023

Modified Files:
src/bin/sh [netbsd-10]: miscbltin.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #454):

bin/sh/miscbltin.c: revision 1.54

If the read builtin is told to read into IFS, we must avoid doing
that until all current uses of IFS are complete (as we have IFS's
value cached in ifs - if IFS alters, ifs might point anywhere).
Handle this by deferring assignments to IFS until everything is done.

This makes us appear to comply with the (currently) proposed requirement
for read by POSIX that field splitting complete before vars are
assigned.   (Other shells, like dash, ksh93, yash, bosh behave like this)

That might end up being unspecified though, as other shells (bosh,
mksh) assign each field to its var as it is delimited (though bosh
appears to have bugs).   If we wanted to go that route, the issue here
could have been handled by re-doing the init of ifs after every
setvar() that is performed here (except the last, after which it is
no longer needed).


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.2.1 src/bin/sh/miscbltin.c

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

Modified files:

Index: src/bin/sh/miscbltin.c
diff -u src/bin/sh/miscbltin.c:1.53 src/bin/sh/miscbltin.c:1.53.2.1
--- src/bin/sh/miscbltin.c:1.53	Sun Dec 11 08:23:10 2022
+++ src/bin/sh/miscbltin.c	Fri Nov  3 10:07:09 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: miscbltin.c,v 1.53 2022/12/11 08:23:10 kre Exp $	*/
+/*	$NetBSD: miscbltin.c,v 1.53.2.1 2023/11/03 10:07:09 martin Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)miscbltin.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: miscbltin.c,v 1.53 2022/12/11 08:23:10 kre Exp $");
+__RCSID("$NetBSD: miscbltin.c,v 1.53.2.1 2023/11/03 10:07:09 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -102,6 +102,8 @@ readcmd(int argc, char **argv)
 	int is_ifs;
 	int saveall = 0;
 	ptrdiff_t wordlen = 0;
+	char *newifs = NULL;
+	struct stackmark mk;
 
 	end = '\n';/* record delimiter */
 	rflag = 0;
@@ -132,6 +134,7 @@ readcmd(int argc, char **argv)
 	if ((ifs = bltinlookup("IFS", 1)) == NULL)
 		ifs = " \t\n";
 
+	setstackmark();
 	status = 0;
 	startword = 2;
 	STARTSTACKSTR(p);
@@ -198,8 +201,22 @@ readcmd(int argc, char **argv)
 			continue;
 		}
 
-		STACKSTRNUL(p);
-		setvar(*ap, stackblock(), 0);
+		if (equal(*ap, "IFS")) {
+			/*
+			 * we must not alter the value of IFS, as our
+			 * local "ifs" var is (perhaps) pointing at it,
+			 * at best we would be using data after free()
+			 * the next time we reference ifs - but that mem
+			 * may have been reused for something different.
+			 *
+			 * note that this might occur several times
+			 */
+			STPUTC('\0', p);
+			newifs = grabstackstr(p);
+		} else {
+			STACKSTRNUL(p);
+			setvar(*ap, stackblock(), 0);
+		}
 		ap++;
 		STARTSTACKSTR(p);
 		wordlen = 0;
@@ -217,11 +234,25 @@ readcmd(int argc, char **argv)
 			/* Don't remove non-whitespace unless it was naked */
 			break;
 	}
+
+	/*
+	 * If IFS was one of the variables named, we can finally set it now
+	 * (no further references to ifs will be made)
+	 */
+	if (newifs != NULL)
+		setvar("IFS", newifs, 0);
+
+	/*
+	 * Now we can assign to the final variable (which might
+	 * also be IFS, hence the ordering here)
+	 */
 	setvar(*ap, stackblock(), 0);
 
 	/* Set any remaining args to "" */
 	while (*++ap != NULL)
 		setvar(*ap, nullstr, 0);
+
+	popstackmark();
 	return status;
 }

CVS commit: [netbsd-10] src/bin/sh

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:07:09 UTC 2023

Modified Files:
src/bin/sh [netbsd-10]: miscbltin.c

Log Message:
Pull up following revision(s) (requested by kre in ticket #454):

bin/sh/miscbltin.c: revision 1.54

If the read builtin is told to read into IFS, we must avoid doing
that until all current uses of IFS are complete (as we have IFS's
value cached in ifs - if IFS alters, ifs might point anywhere).
Handle this by deferring assignments to IFS until everything is done.

This makes us appear to comply with the (currently) proposed requirement
for read by POSIX that field splitting complete before vars are
assigned.   (Other shells, like dash, ksh93, yash, bosh behave like this)

That might end up being unspecified though, as other shells (bosh,
mksh) assign each field to its var as it is delimited (though bosh
appears to have bugs).   If we wanted to go that route, the issue here
could have been handled by re-doing the init of ifs after every
setvar() that is performed here (except the last, after which it is
no longer needed).


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.53.2.1 src/bin/sh/miscbltin.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/dev/ic

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:04:56 UTC 2023

Modified Files:
src/sys/dev/ic [netbsd-10]: dwc_eqos.c dwc_eqos_var.h

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #453):

sys/dev/ic/dwc_eqos_var.h: revision 1.7
sys/dev/ic/dwc_eqos_var.h: revision 1.8
sys/dev/ic/dwc_eqos_var.h: revision 1.9
sys/dev/ic/dwc_eqos.c: revision 1.30
sys/dev/ic/dwc_eqos.c: revision 1.31
sys/dev/ic/dwc_eqos.c: revision 1.32
sys/dev/ic/dwc_eqos.c: revision 1.33

eqos(4): Wait for callout to halt and make sure it stays halted.

eqos(4): Don't touch if_flags in tx path.

Can't touch this without IFNET_LOCK.

eqos(4): Fix locking around multicast filter updates.
- Can't touch if_flags without IFNET_LOCK.
- Can't take IFNET_LOCK in SIOCADDMULTI/SIOCDELMULTI path.

Instead, cache IFF_PROMISC and IFF_ALLMULTI on if_init under a lock we
can take in this path.

XXX Is IFF_ALLMULTI relevant any more?  Hasn't it been moved to
ethercom flags?

XXX Should not take sc_lock around if_init/stop -- IFNET_LOCK is
enough.  Should narrow scope of sc_lock to be just tick/mii/multi
stuff.

eqos(4): Fix multicast filter updates.

1. Don't touch the obsolete IFF_ALLMULTI.
2. Set ETHER_F_ALLMULTI if we're accepting all multicast addresses.
3. If any multicast entry range is not a single address, accept all
   multicast addresses.


To generate a diff of this commit:
cvs rdiff -u -r1.16.4.1 -r1.16.4.2 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/dev/ic/dwc_eqos_var.h

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

Modified files:

Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.16.4.1 src/sys/dev/ic/dwc_eqos.c:1.16.4.2
--- src/sys/dev/ic/dwc_eqos.c:1.16.4.1	Fri Nov  3 08:56:36 2023
+++ src/sys/dev/ic/dwc_eqos.c	Fri Nov  3 10:04:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.16.4.1 2023/11/03 08:56:36 martin Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.16.4.2 2023/11/03 10:04:55 martin Exp $ */
 
 /*-
  * Copyright (c) 2022 Jared McNeill 
@@ -38,7 +38,7 @@
 #include "opt_net_mpsafe.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.16.4.1 2023/11/03 08:56:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.16.4.2 2023/11/03 10:04:55 martin Exp $");
 
 #include 
 #include 
@@ -468,7 +468,8 @@ eqos_tick(void *softc)
 
 	EQOS_LOCK(sc);
 	mii_tick(mii);
-	callout_schedule(>sc_stat_ch, hz);
+	if (sc->sc_running)
+		callout_schedule(>sc_stat_ch, hz);
 	EQOS_UNLOCK(sc);
 
 #ifndef EQOS_MPSAFE
@@ -508,17 +509,29 @@ eqos_setup_rxfilter(struct eqos_softc *s
 		  GMAC_MAC_PACKET_FILTER_PCF_MASK);
 	hash[0] = hash[1] = ~0U;
 
-	if ((ifp->if_flags & IFF_PROMISC) != 0) {
+	ETHER_LOCK(ec);
+	if (sc->sc_promisc) {
+		ec->ec_flags |= ETHER_F_ALLMULTI;
 		pfil |= GMAC_MAC_PACKET_FILTER_PR |
 			GMAC_MAC_PACKET_FILTER_PCF_ALL;
-	} else if ((ifp->if_flags & IFF_ALLMULTI) != 0) {
-		pfil |= GMAC_MAC_PACKET_FILTER_PM;
 	} else {
-		hash[0] = hash[1] = 0;
 		pfil |= GMAC_MAC_PACKET_FILTER_HMC;
-		ETHER_LOCK(ec);
+		hash[0] = hash[1] = 0;
+		ec->ec_flags &= ~ETHER_F_ALLMULTI;
 		ETHER_FIRST_MULTI(step, ec, enm);
 		while (enm != NULL) {
+			if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
+ETHER_ADDR_LEN) != 0) {
+ec->ec_flags |= ETHER_F_ALLMULTI;
+pfil &= ~GMAC_MAC_PACKET_FILTER_HMC;
+pfil |= GMAC_MAC_PACKET_FILTER_PM;
+/*
+ * Shouldn't matter if we clear HMC but
+ * let's avoid using different values.
+ */
+hash[0] = hash[1] = 0x;
+break;
+			}
 			crc = ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN);
 			crc &= 0x7f;
 			crc = eqos_bitrev32(~crc) >> 26;
@@ -527,8 +540,8 @@ eqos_setup_rxfilter(struct eqos_softc *s
 			hash[hashreg] |= (1 << hashbit);
 			ETHER_NEXT_MULTI(step, enm);
 		}
-		ETHER_UNLOCK(ec);
 	}
+	ETHER_UNLOCK(ec);
 
 	/* Write our unicast address */
 	eaddr = CLLADDR(ifp->if_sadl);
@@ -616,6 +629,7 @@ eqos_init_locked(struct eqos_softc *sc)
 	eqos_init_rings(sc, 0);
 
 	/* Setup RX filter */
+	sc->sc_promisc = ifp->if_flags & IFF_PROMISC;
 	eqos_setup_rxfilter(sc);
 
 	WR4(sc, GMAC_MAC_1US_TIC_COUNTER, (sc->sc_csr_clock / 100) - 1);
@@ -697,6 +711,10 @@ eqos_init_locked(struct eqos_softc *sc)
 	/* Enable interrupts */
 	eqos_enable_intr(sc);
 
+	EQOS_ASSERT_TXLOCKED(sc);
+	sc->sc_txrunning = true;
+
+	sc->sc_running = true;
 	ifp->if_flags |= IFF_RUNNING;
 
 	mii_mediachg(mii);
@@ -729,7 +747,12 @@ eqos_stop_locked(struct eqos_softc *sc, 
 
 	EQOS_ASSERT_LOCKED(sc);
 
-	callout_stop(>sc_stat_ch);
+	EQOS_TXLOCK(sc);
+	sc->sc_txrunning = false;
+	EQOS_TXUNLOCK(sc);
+
+	sc->sc_running = false;
+	callout_halt(>sc_stat_ch, >sc_lock);
 
 	mii_down(>sc_mii);
 
@@ -1007,7 +1030,7 @@ eqos_start_locked(struct eqos_softc *sc)
 
 	EQOS_ASSERT_TXLOCKED(sc);
 
-	if ((ifp->if_flags & IFF_RUNNING) == 0)
+	if (!sc->sc_txrunning)
 		return;
 
 	for (cnt = 0, start =

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

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:04:56 UTC 2023

Modified Files:
src/sys/dev/ic [netbsd-10]: dwc_eqos.c dwc_eqos_var.h

Log Message:
Pull up following revision(s) (requested by riastradh in ticket #453):

sys/dev/ic/dwc_eqos_var.h: revision 1.7
sys/dev/ic/dwc_eqos_var.h: revision 1.8
sys/dev/ic/dwc_eqos_var.h: revision 1.9
sys/dev/ic/dwc_eqos.c: revision 1.30
sys/dev/ic/dwc_eqos.c: revision 1.31
sys/dev/ic/dwc_eqos.c: revision 1.32
sys/dev/ic/dwc_eqos.c: revision 1.33

eqos(4): Wait for callout to halt and make sure it stays halted.

eqos(4): Don't touch if_flags in tx path.

Can't touch this without IFNET_LOCK.

eqos(4): Fix locking around multicast filter updates.
- Can't touch if_flags without IFNET_LOCK.
- Can't take IFNET_LOCK in SIOCADDMULTI/SIOCDELMULTI path.

Instead, cache IFF_PROMISC and IFF_ALLMULTI on if_init under a lock we
can take in this path.

XXX Is IFF_ALLMULTI relevant any more?  Hasn't it been moved to
ethercom flags?

XXX Should not take sc_lock around if_init/stop -- IFNET_LOCK is
enough.  Should narrow scope of sc_lock to be just tick/mii/multi
stuff.

eqos(4): Fix multicast filter updates.

1. Don't touch the obsolete IFF_ALLMULTI.
2. Set ETHER_F_ALLMULTI if we're accepting all multicast addresses.
3. If any multicast entry range is not a single address, accept all
   multicast addresses.


To generate a diff of this commit:
cvs rdiff -u -r1.16.4.1 -r1.16.4.2 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/sys/dev/ic/dwc_eqos_var.h

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/i386/stand/efiboot

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:01:13 UTC 2023

Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-10]: boot.c devopen.c efidisk.c
efimemory.c
src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-10]: efibootia32.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #452):

sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.7
sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.8
sys/arch/i386/stand/efiboot/boot.c: revision 1.23
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.10
sys/arch/i386/stand/efiboot/devopen.c: revision 1.14
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.10

x86/efiboot: Nix trailing whitespace.

whitespace -> tab, blank line, no binary changes.

``int i'' is used only for SUPPORT_NFS || SUPPORT_TFTP.


To generate a diff of this commit:
cvs rdiff -u -r1.21.4.1 -r1.21.4.2 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/i386/stand/efiboot/devopen.c
cvs rdiff -u -r1.9 -r1.9.26.1 src/sys/arch/i386/stand/efiboot/efidisk.c \
src/sys/arch/i386/stand/efiboot/efimemory.c
cvs rdiff -u -r1.5.26.1 -r1.5.26.2 \
src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.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/i386/stand/efiboot/boot.c
diff -u src/sys/arch/i386/stand/efiboot/boot.c:1.21.4.1 src/sys/arch/i386/stand/efiboot/boot.c:1.21.4.2
--- src/sys/arch/i386/stand/efiboot/boot.c:1.21.4.1	Sat May 13 13:26:56 2023
+++ src/sys/arch/i386/stand/efiboot/boot.c	Fri Nov  3 10:01:13 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.21.4.1 2023/05/13 13:26:56 martin Exp $	*/
+/*	$NetBSD: boot.c,v 1.21.4.2 2023/11/03 10:01:13 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -483,7 +483,7 @@ command_dev(char *arg)
 	if (*arg == '\0') {
 		efi_disk_show();
 		efi_net_show();
-	
+
 		if (default_part_name != NULL)
 			printf("default NAME=%s\n", default_part_name);
 		else
@@ -647,7 +647,7 @@ void
 command_reloc(char *arg)
 {
 	char *ep;
-	
+
 	if (*arg == '\0') {
 		switch (efi_reloc_type) {
 		case RELOC_NONE:

Index: src/sys/arch/i386/stand/efiboot/devopen.c
diff -u src/sys/arch/i386/stand/efiboot/devopen.c:1.13 src/sys/arch/i386/stand/efiboot/devopen.c:1.13.4.1
--- src/sys/arch/i386/stand/efiboot/devopen.c:1.13	Mon Dec 27 12:19:27 2021
+++ src/sys/arch/i386/stand/efiboot/devopen.c	Fri Nov  3 10:01:13 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: devopen.c,v 1.13 2021/12/27 12:19:27 simonb Exp $	 */
+/*	$NetBSD: devopen.c,v 1.13.4.1 2023/11/03 10:01:13 martin Exp $	 */
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -154,13 +154,13 @@ devopen(struct open_file *f, const char 
 	const char *xname = NULL;
 	int unit, partition;
 	int biosdev;
-	int i, error;
+	int error;
 #if defined(SUPPORT_NFS) || defined(SUPPORT_TFTP)
 	struct devdesc desc;
 	const struct netboot_fstab *nf;
 	char *filename;
 	size_t fsnamelen;
-	int n;
+	int i, n;
 #endif
 
 	error = parsebootfile(fname, , , , ,

Index: src/sys/arch/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.9 src/sys/arch/i386/stand/efiboot/efidisk.c:1.9.26.1
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.9	Tue Dec 17 01:37:52 2019
+++ src/sys/arch/i386/stand/efiboot/efidisk.c	Fri Nov  3 10:01:13 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: efidisk.c,v 1.9 2019/12/17 01:37:52 manu Exp $	*/
+/*	$NetBSD: efidisk.c,v 1.9.26.1 2023/11/03 10:01:13 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -70,9 +70,9 @@ dealloc_biosdisk_part(struct biosdisk_pa
 			part[i].part_name = NULL;
 		}
 	}
-	
+
 	dealloc(part, sizeof(*part) * nparts);
-	
+
 	return;
 }
 
@@ -194,7 +194,6 @@ efi_raidframe_probe(struct efi_raidframe
 	return;
 }
 
-
 void
 efi_disk_show(void)
 {
@@ -293,7 +292,7 @@ efi_disk_show(void)
 		raidframe[i].size,
 		, ))
 			continue;
-			
+
 		first = 1;
 		for (j = 0; j < nparts; j++) {
 			bool bootme = part[j].attr & GPT_ENT_ATTR_BOOTME;
Index: src/sys/arch/i386/stand/efiboot/efimemory.c
diff -u src/sys/arch/i386/stand/efiboot/efimemory.c:1.9 src/sys/arch/i386/stand/efiboot/efimemory.c:1.9.26.1
--- src/sys/arch/i386/stand/efiboot/efimemory.c:1.9	Fri Sep 13 02:19:45 2019
+++ src/sys/arch/i386/stand/efiboot/efimemory.c	Fri Nov  3 10:01:13 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: efimemory.c,v 1.9 2019/09/13 02:19:45 manu Exp $	*/
+/*	$NetBSD: efimemory.c,v 1.9.26.1 2023/11/03 10:01:13 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -221,7 +221,7 @@ efi_memory_get_memmap(struct bi_memmap_e
 
 		next = NextMemoryDescriptor(md, DescriptorSize);
 	}
-	
+
 	*memmapp = memmap;
 	*num = NoEntries;
 	return 0;

Index: src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c
diff -u src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.c:1.5.26.1

CVS commit: [netbsd-10] src/sys/arch/i386/stand/efiboot

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 10:01:13 UTC 2023

Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-10]: boot.c devopen.c efidisk.c
efimemory.c
src/sys/arch/i386/stand/efiboot/bootia32 [netbsd-10]: efibootia32.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #452):

sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.7
sys/arch/i386/stand/efiboot/bootia32/efibootia32.c: revision 1.8
sys/arch/i386/stand/efiboot/boot.c: revision 1.23
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.10
sys/arch/i386/stand/efiboot/devopen.c: revision 1.14
sys/arch/i386/stand/efiboot/efimemory.c: revision 1.10

x86/efiboot: Nix trailing whitespace.

whitespace -> tab, blank line, no binary changes.

``int i'' is used only for SUPPORT_NFS || SUPPORT_TFTP.


To generate a diff of this commit:
cvs rdiff -u -r1.21.4.1 -r1.21.4.2 src/sys/arch/i386/stand/efiboot/boot.c
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/i386/stand/efiboot/devopen.c
cvs rdiff -u -r1.9 -r1.9.26.1 src/sys/arch/i386/stand/efiboot/efidisk.c \
src/sys/arch/i386/stand/efiboot/efimemory.c
cvs rdiff -u -r1.5.26.1 -r1.5.26.2 \
src/sys/arch/i386/stand/efiboot/bootia32/efibootia32.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/stand/efiboot

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:59:04 UTC 2023

Modified Files:
src/sys/stand/efiboot [netbsd-10]: Makefile.efiboot boot.c efiblock.c
exec.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #451):

sys/stand/efiboot/efiblock.c: revision 1.20
sys/stand/efiboot/exec.c: revision 1.24
sys/stand/efiboot/Makefile.efiboot: revision 1.29
sys/stand/efiboot/boot.c: revision 1.45

Add missing member for terminating sentinel.

Avoid void * pointer arithmetic; cast to UINT8 * explicitly.
No binary changes for aarch64 at least.

Use %zd instead of %ld for ssize_t.

Add missing include paths for libz. Not used at the moment although.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/stand/efiboot/boot.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/stand/efiboot/efiblock.c
cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/stand/efiboot/exec.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/stand/efiboot/Makefile.efiboot
diff -u src/sys/stand/efiboot/Makefile.efiboot:1.26 src/sys/stand/efiboot/Makefile.efiboot:1.26.4.1
--- src/sys/stand/efiboot/Makefile.efiboot:1.26	Fri Mar 25 21:23:00 2022
+++ src/sys/stand/efiboot/Makefile.efiboot	Fri Nov  3 09:59:04 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.26 2022/03/25 21:23:00 jmcneill Exp $
+# $NetBSD: Makefile.efiboot,v 1.26.4.1 2023/11/03 09:59:04 martin Exp $
 
 S=		${.CURDIR}/../../..
 
@@ -133,6 +133,7 @@ LIBKERN= ${KERNLIB}
 ### find out what to use for libz
 Z_AS= library
 .include "${S}/lib/libz/Makefile.inc"
+CPPFLAGS+=	-I${S}/lib/libz -I${S}/../common/dist/zlib
 LIBZ= ${ZLIB}
 
 ### find out what to use for libgnuefi

Index: src/sys/stand/efiboot/boot.c
diff -u src/sys/stand/efiboot/boot.c:1.44 src/sys/stand/efiboot/boot.c:1.44.4.1
--- src/sys/stand/efiboot/boot.c:1.44	Sun Aug 14 11:26:41 2022
+++ src/sys/stand/efiboot/boot.c	Fri Nov  3 09:59:04 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.44 2022/08/14 11:26:41 jmcneill Exp $	*/
+/*	$NetBSD: boot.c,v 1.44.4.1 2023/11/03 09:59:04 martin Exp $	*/
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -148,7 +148,7 @@ const struct boot_command commands[] = {
 	{ "help",	command_help,		"help|?" },
 	{ "?",		command_help,		NULL },
 	{ "quit",	command_quit,		"quit" },
-	{ NULL,		NULL },
+	{ NULL,		NULL,			NULL },
 };
 
 static int

Index: src/sys/stand/efiboot/efiblock.c
diff -u src/sys/stand/efiboot/efiblock.c:1.19 src/sys/stand/efiboot/efiblock.c:1.19.4.1
--- src/sys/stand/efiboot/efiblock.c:1.19	Sun Apr 24 06:49:38 2022
+++ src/sys/stand/efiboot/efiblock.c	Fri Nov  3 09:59:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efiblock.c,v 1.19 2022/04/24 06:49:38 mlelstv Exp $ */
+/* $NetBSD: efiblock.c,v 1.19.4.1 2023/11/03 09:59:04 martin Exp $ */
 
 /*-
  * Copyright (c) 2016 Kimihiro Nonaka 
@@ -442,7 +442,7 @@ efi_block_find_partitions_gpt(struct efi
 	}
 
 	for (entry = 0; entry < le32toh(hdr.hdr_entries); entry++) {
-		memcpy(, buf + (entry * le32toh(hdr.hdr_entsz)),
+		memcpy(, (UINT8 *)buf + (entry * le32toh(hdr.hdr_entsz)),
 			sizeof(ent));
 		efi_block_find_partitions_gpt_entry(bdev, , , entry);
 	}

Index: src/sys/stand/efiboot/exec.c
diff -u src/sys/stand/efiboot/exec.c:1.23 src/sys/stand/efiboot/exec.c:1.23.4.1
--- src/sys/stand/efiboot/exec.c:1.23	Wed Oct  6 10:13:19 2021
+++ src/sys/stand/efiboot/exec.c	Fri Nov  3 09:59:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.23 2021/10/06 10:13:19 jmcneill Exp $ */
+/* $NetBSD: exec.c,v 1.23.4.1 2023/11/03 09:59:04 martin Exp $ */
 
 /*-
  * Copyright (c) 2019 Jason R. Thorpe
@@ -109,7 +109,7 @@ load_file(const char *path, u_long extra
 		if (len < 0) {
 			printf(": %s\n", strerror(errno));
 		} else {
-			printf(": returned %ld (expected %ld)\n", len,
+			printf(": returned %zd (expected %zd)\n", len,
 			expectedlen);
 		}
 		return EIO;

CVS commit: [netbsd-10] src/sys/stand/efiboot

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:59:04 UTC 2023

Modified Files:
src/sys/stand/efiboot [netbsd-10]: Makefile.efiboot boot.c efiblock.c
exec.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #451):

sys/stand/efiboot/efiblock.c: revision 1.20
sys/stand/efiboot/exec.c: revision 1.24
sys/stand/efiboot/Makefile.efiboot: revision 1.29
sys/stand/efiboot/boot.c: revision 1.45

Add missing member for terminating sentinel.

Avoid void * pointer arithmetic; cast to UINT8 * explicitly.
No binary changes for aarch64 at least.

Use %zd instead of %ld for ssize_t.

Add missing include paths for libz. Not used at the moment although.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/stand/efiboot/Makefile.efiboot
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/stand/efiboot/boot.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/stand/efiboot/efiblock.c
cvs rdiff -u -r1.23 -r1.23.4.1 src/sys/stand/efiboot/exec.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/usr.sbin/envstat

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:56:40 UTC 2023

Modified Files:
src/usr.sbin/envstat [netbsd-10]: envstat.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #450):

usr.sbin/envstat/envstat.c: revision 1.104

Silence wrong maybe-uninitialized raised by GCC/x86_64 10.4.0 -Os.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.103.2.1 src/usr.sbin/envstat/envstat.c

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/envstat/envstat.c
diff -u src/usr.sbin/envstat/envstat.c:1.103 src/usr.sbin/envstat/envstat.c:1.103.2.1
--- src/usr.sbin/envstat/envstat.c:1.103	Mon Nov 21 21:24:02 2022
+++ src/usr.sbin/envstat/envstat.c	Fri Nov  3 09:56:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: envstat.c,v 1.103 2022/11/21 21:24:02 brad Exp $ */
+/* $NetBSD: envstat.c,v 1.103.2.1 2023/11/03 09:56:39 martin Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008 Juan Romero Pardines.
@@ -27,7 +27,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: envstat.c,v 1.103 2022/11/21 21:24:02 brad Exp $");
+__RCSID("$NetBSD: envstat.c,v 1.103.2.1 2023/11/03 09:56:39 martin Exp $");
 #endif /* not lint */
 
 #include 
@@ -236,7 +236,8 @@ int main(int argc, char **argv)
 	err(EXIT_FAILURE, "add_sensors");
 			}
 			if (sensors) {
-char *dvstring, *sstring, *p, *last, *s;
+char *sstring, *p, *last, *s;
+char *dvstring = NULL; /* XXXGCC */
 unsigned count = 0;
 
 s = strdup(sensors);

CVS commit: [netbsd-10] src/usr.sbin/envstat

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:56:40 UTC 2023

Modified Files:
src/usr.sbin/envstat [netbsd-10]: envstat.c

Log Message:
Pull up following revision(s) (requested by rin in ticket #450):

usr.sbin/envstat/envstat.c: revision 1.104

Silence wrong maybe-uninitialized raised by GCC/x86_64 10.4.0 -Os.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.103.2.1 src/usr.sbin/envstat/envstat.c

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

CVS commit: src/distrib/sets/lists/debug

2023-11-03 Thread Simon Burge 
Module Name:src
Committed By:   simonb
Date:   Fri Nov  3 09:56:14 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: ad.arm

Log Message:
Add some earmv4 kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/debug/ad.arm

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/debug/ad.arm
diff -u src/distrib/sets/lists/debug/ad.arm:1.81 src/distrib/sets/lists/debug/ad.arm:1.82
--- src/distrib/sets/lists/debug/ad.arm:1.81	Mon Sep  4 21:36:31 2023
+++ src/distrib/sets/lists/debug/ad.arm	Fri Nov  3 09:56:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.81 2023/09/04 21:36:31 riastradh Exp $
+# $NetBSD: ad.arm,v 1.82 2023/11/03 09:56:14 simonb Exp $
 ./usr/lib/libarm_g.acomp-c-debuglib		debuglib,compatfile
 ./usr/lib/libc_vfp_g.acomp-c-debuglib		debuglib,softfloat
 ./usr/lib/libpmc_g.acomp-obsolete		obsolete
@@ -23,6 +23,12 @@
 ./usr/libdata/debug/usr/sbin/sbkeygen.debug	comp-util-debug		debug,endian=1234
 ./usr/libdata/debug/usr/sbin/sbtool.debug	comp-util-debug		debug,endian=1234
 ./usr/libdata/debug/usr/sbin/tpctl.debug	comp-sysutil-debug	debug
+./usr/libdata/debug/netbsd-epe0-TS7200.debug	comp-sysutil-debug	debug,machine_arch=earmv4
+./usr/libdata/debug/netbsd-fxp0-INTEGRATOR.debug	comp-sysutil-debug	debug,machine_arch=earmv4
+./usr/libdata/debug/netbsd-ld0-INTEGRATOR_CP.debug	comp-sysutil-debug	debug,machine_arch=earmv4
+./usr/libdata/debug/netbsd-sd0-INTEGRATOR.debug	comp-sysutil-debug	debug,machine_arch=earmv4
+./usr/libdata/debug/netbsd-sm0-INTEGRATOR_CP.debug	comp-sysutil-debug	debug,machine_arch=earmv4
+./usr/libdata/debug/netbsd-wd0-TS7200.debug	comp-sysutil-debug	debug,machine_arch=earmv4
 ./usr/libdata/debug/netbsd-fxp0-ADI_BRH.debug	comp-sysutil-debug	debug,machine_arch=earmv5
 ./usr/libdata/debug/netbsd-fxp0-IQ80310.debug	comp-sysutil-debug	debug,machine_arch=earmv5
 ./usr/libdata/debug/netbsd-mvgbe0-MV2120.debug	comp-sysutil-debug	debug,machine_arch=earmv5

CVS commit: src/distrib/sets/lists/debug

2023-11-03 Thread Simon Burge 
Module Name:src
Committed By:   simonb
Date:   Fri Nov  3 09:56:14 UTC 2023

Modified Files:
src/distrib/sets/lists/debug: ad.arm

Log Message:
Add some earmv4 kernels.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/distrib/sets/lists/debug/ad.arm

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/bsd/libevent/dist

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:53:05 UTC 2023

Modified Files:
src/external/bsd/libevent/dist [netbsd-10]: openssl-compat.h

Log Message:
Pull up following revision(s) (requested by rin in ticket #449):

external/bsd/libevent/dist/openssl-compat.h: revision 1.2

Cherry-pick upstream fix for LibreSSL. NFC for us at the moment.

https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9

 Don't define BIO_get_init() for LibreSSL 3.5+
 BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type
 will become opaque, so the existing macro will break the build.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
src/external/bsd/libevent/dist/openssl-compat.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/libevent/dist/openssl-compat.h
diff -u src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2 src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2.6.1
--- src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2	Wed Apr  7 02:43:14 2021
+++ src/external/bsd/libevent/dist/openssl-compat.h	Fri Nov  3 09:53:05 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: openssl-compat.h,v 1.1.1.2 2021/04/07 02:43:14 christos Exp $	*/
+/*	$NetBSD: openssl-compat.h,v 1.1.1.2.6.1 2023/11/03 09:53:05 martin Exp $	*/
 #ifndef OPENSSL_COMPAT_H
 #define OPENSSL_COMPAT_H
 
@@ -41,7 +41,8 @@ static inline BIO_METHOD *BIO_meth_new(i
 #endif /* (OPENSSL_VERSION_NUMBER < 0x1010L) || \
 	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L) */
 
-#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070L
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070L && \
+	LIBRESSL_VERSION_NUMBER < 0x3050L
 #define BIO_get_init(b) (b)->init
 #endif

CVS commit: [netbsd-10] src/external/bsd/libevent/dist

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:53:05 UTC 2023

Modified Files:
src/external/bsd/libevent/dist [netbsd-10]: openssl-compat.h

Log Message:
Pull up following revision(s) (requested by rin in ticket #449):

external/bsd/libevent/dist/openssl-compat.h: revision 1.2

Cherry-pick upstream fix for LibreSSL. NFC for us at the moment.

https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9

 Don't define BIO_get_init() for LibreSSL 3.5+
 BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type
 will become opaque, so the existing macro will break the build.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
src/external/bsd/libevent/dist/openssl-compat.h

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

CVS commit: [netbsd-10] src/tools/host-mkdep

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:49:09 UTC 2023

Modified Files:
src/tools/host-mkdep [netbsd-10]: host-mkdep.in

Log Message:
Pull up following revision(s) (requested by rin in ticket #448):

tools/host-mkdep/host-mkdep.in: revision 1.33

host-mkdep(1): Add support for -iquote.

Not used yet, but may eventually replace deprecated -I-, both for
GCC and clang.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.8.1 src/tools/host-mkdep/host-mkdep.in

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

CVS commit: [netbsd-10] src/tools/host-mkdep

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:49:09 UTC 2023

Modified Files:
src/tools/host-mkdep [netbsd-10]: host-mkdep.in

Log Message:
Pull up following revision(s) (requested by rin in ticket #448):

tools/host-mkdep/host-mkdep.in: revision 1.33

host-mkdep(1): Add support for -iquote.

Not used yet, but may eventually replace deprecated -I-, both for
GCC and clang.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.8.1 src/tools/host-mkdep/host-mkdep.in

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

Modified files:

Index: src/tools/host-mkdep/host-mkdep.in
diff -u src/tools/host-mkdep/host-mkdep.in:1.32 src/tools/host-mkdep/host-mkdep.in:1.32.8.1
--- src/tools/host-mkdep/host-mkdep.in:1.32	Tue Oct 29 23:33:06 2019
+++ src/tools/host-mkdep/host-mkdep.in	Fri Nov  3 09:49:09 2023
@@ -1,6 +1,6 @@
 #!@BSHELL@ -
 #
-#	$NetBSD: host-mkdep.in,v 1.32 2019/10/29 23:33:06 joerg Exp $
+#	$NetBSD: host-mkdep.in,v 1.32.8.1 2023/11/03 09:49:09 martin Exp $
 #
 # Copyright (c) 1991, 1993
 #	The Regents of the University of California.  All rights reserved.
@@ -151,7 +151,7 @@ else
 cppargs=${cppargs%x}
 ;;
 
-		-[IDU]|-include|-isystem|-isysroot)
+		-[IDU]|-include|-iquote|-isystem|-isysroot)
 set -- "$@" "$1" "$2"
 shift 2
 cppargs=${cppargs%xx}

CVS commit: src

2023-11-03 Thread Chuck Silvers 
Module Name:src
Committed By:   chs
Date:   Fri Nov  3 09:07:57 UTC 2023

Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_asm.S
src/external/cddl/osnet/dev/dtrace/i386: dtrace_asm.S
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S

Log Message:
dtrace: add support for SMAP

Add support in dtrace for SMAP, so that actions like copyinstr() work.
It would be better if dtrace could use the SMAP_* hotpatch macros directly,
but the hotpatching code does not currently operate on kernel modules,
so we'll use some tiny functions in the base kernel for now.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/i386/cpufunc.S

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

CVS commit: src

2023-11-03 Thread Chuck Silvers 
Module Name:src
Committed By:   chs
Date:   Fri Nov  3 09:07:57 UTC 2023

Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_asm.S
src/external/cddl/osnet/dev/dtrace/i386: dtrace_asm.S
src/sys/arch/amd64/amd64: cpufunc.S
src/sys/arch/i386/i386: cpufunc.S

Log Message:
dtrace: add support for SMAP

Add support in dtrace for SMAP, so that actions like copyinstr() work.
It would be better if dtrace could use the SMAP_* hotpatch macros directly,
but the hotpatching code does not currently operate on kernel modules,
so we'll use some tiny functions in the base kernel for now.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/amd64/amd64/cpufunc.S
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/i386/i386/cpufunc.S

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

Modified files:

Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.8 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.9
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S:1.8	Mon May 28 21:05:03 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_asm.S	Fri Nov  3 09:07:56 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtrace_asm.S,v 1.8 2018/05/28 21:05:03 chs Exp $	*/
+/*	$NetBSD: dtrace_asm.S,v 1.9 2023/11/03 09:07:56 chs Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -39,6 +39,11 @@
 
 #include "assym.h"
 
+#define DTRACE_SMAP_DISABLE			\
+	call	dtrace_smap_disable
+#define DTRACE_SMAP_ENABLE			\
+	call	dtrace_smap_enable
+
 #define INTR_POP\
 	MEXITCOUNT;\
 	movq	TF_RDI(%rsp),%rdi;		\
@@ -217,8 +222,10 @@ dtrace_copy(uintptr_t src, uintptr_t des
 
 	xchgq	%rdi, %rsi		/* make %rsi source, %rdi dest */
 	movq	%rdx, %rcx		/* load count */
+	DTRACE_SMAP_DISABLE
 	repz/* repeat for count ... */
 	smovb/*   move from %ds:rsi to %ed:rdi */
+	DTRACE_SMAP_ENABLE
 	leave
 	ret
 	END(dtrace_copy)
@@ -231,6 +238,7 @@ dtrace_copystr(uintptr_t uaddr, uintptr_
 	ENTRY(dtrace_copystr)
 	pushq	%rbp
 	movq	%rsp, %rbp
+	DTRACE_SMAP_DISABLE
 
 0:
 	movb	(%rdi), %al		/* load from source */
@@ -248,6 +256,7 @@ dtrace_copystr(uintptr_t uaddr, uintptr_
 	cmpq	$0, %rdx
 	jne	0b
 2:
+	DTRACE_SMAP_ENABLE
 	leave
 	ret
 
@@ -258,7 +267,9 @@ uintptr_t
 dtrace_fulword(void *addr)
 */
 	ENTRY(dtrace_fulword)
+	DTRACE_SMAP_DISABLE
 	movq	(%rdi), %rax
+	DTRACE_SMAP_ENABLE
 	ret
 	END(dtrace_fulword)
 
@@ -268,7 +279,9 @@ dtrace_fuword8_nocheck(void *addr)
 */
 	ENTRY(dtrace_fuword8_nocheck)
 	xorq	%rax, %rax
+	DTRACE_SMAP_DISABLE
 	movb	(%rdi), %al
+	DTRACE_SMAP_ENABLE
 	ret
 	END(dtrace_fuword8_nocheck)
 
@@ -278,7 +291,9 @@ dtrace_fuword16_nocheck(void *addr)
 */
 	ENTRY(dtrace_fuword16_nocheck)
 	xorq	%rax, %rax
+	DTRACE_SMAP_DISABLE
 	movw	(%rdi), %ax
+	DTRACE_SMAP_ENABLE
 	ret
 	END(dtrace_fuword16_nocheck)
 
@@ -288,7 +303,9 @@ dtrace_fuword32_nocheck(void *addr)
 */
 	ENTRY(dtrace_fuword32_nocheck)
 	xorq	%rax, %rax
+	DTRACE_SMAP_DISABLE
 	movl	(%rdi), %eax
+	DTRACE_SMAP_ENABLE
 	ret
 	END(dtrace_fuword32_nocheck)
 
@@ -297,7 +314,9 @@ uint64_t
 dtrace_fuword64_nocheck(void *addr)
 */
 	ENTRY(dtrace_fuword64_nocheck)
+	DTRACE_SMAP_DISABLE
 	movq	(%rdi), %rax
+	DTRACE_SMAP_ENABLE
 	ret
 	END(dtrace_fuword64_nocheck)
 

Index: src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S
diff -u src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S:1.7 src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S:1.8
--- src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S:1.7	Mon May 28 21:05:03 2018
+++ src/external/cddl/osnet/dev/dtrace/i386/dtrace_asm.S	Fri Nov  3 09:07:57 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: dtrace_asm.S,v 1.7 2018/05/28 21:05:03 chs Exp $	*/
+/*	$NetBSD: dtrace_asm.S,v 1.8 2023/11/03 09:07:57 chs Exp $	*/
 
 /*
  * CDDL HEADER START
@@ -38,6 +38,11 @@
 #include 
 #include 
 
+#define DTRACE_SMAP_DISABLE			\
+	call	dtrace_smap_disable
+#define DTRACE_SMAP_ENABLE			\
+	call	dtrace_smap_enable
+
 #define INTR_POP		\
 	addl	$16, %esp;	\
 	popl	%edi;		\
@@ -225,8 +230,10 @@ void dtrace_copy(uintptr_t src, uintptr_
 	movl	8(%ebp), %esi		/* Load source address */
 	movl	12(%ebp), %edi		/* Load destination address */
 	movl	16(%ebp), %ecx		/* Load count */
+	DTRACE_SMAP_DISABLE
 	repz/* Repeat for count... */
 	smovb/*   move from %ds:si to %es:di */
+	DTRACE_SMAP_ENABLE
 
 	popl	%edi
 	popl	%esi
@@ -248,6 +255,7 @@ void dtrace_copystr(uintptr_t uaddr, uin
 	movl	8(%ebp), %ebx		/* Load source address */
 	movl	12(%ebp), %edx		/* Load destination address */
 	movl	16(%ebp), %ecx		/* Load count */
+	DTRACE_SMAP_DISABLE
 
 0:
 	movb	(%ebx), %al		/* Load from source */
@@ -261,6 +269,7 @@ void dtrace_copystr(uintptr_t uaddr, uin
 	jne	0b
 
 1:
+	DTRACE_SMAP_ENABLE
 	popl	%ebx
 	movl	%ebp, %esp

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

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:00:33 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h

Log Message:
Regen for ticket #447 (Add Mellanox ConnectX-6 Lx)


To generate a diff of this commit:
cvs rdiff -u -r1.1452.2.10 -r1.1452.2.11 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1451.2.10 -r1.1451.2.11 src/sys/dev/pci/pcidevs_data.h

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

Modified files:

Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1452.2.10 src/sys/dev/pci/pcidevs.h:1.1452.2.11
--- src/sys/dev/pci/pcidevs.h:1.1452.2.10	Wed Oct 18 14:33:15 2023
+++ src/sys/dev/pci/pcidevs.h	Fri Nov  3 09:00:14 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs.h,v 1.1452.2.10 2023/10/18 14:33:15 martin Exp $	*/
+/*	$NetBSD: pcidevs.h,v 1.1452.2.11 2023/11/03 09:00:14 martin Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1471.2.9 2023/10/18 14:27:37 martin Exp
+ *	NetBSD: pcidevs,v 1.1471.2.10 2023/11/03 08:59:29 martin Exp
  */
 
 /*
@@ -7674,6 +7674,7 @@
 #define	PCI_PRODUCT_MELLANOX_MT28908	0x101b		/* ConnectX-6 */
 #define	PCI_PRODUCT_MELLANOX_MT28908VF	0x101c		/* ConnectX-6 VF */
 #define	PCI_PRODUCT_MELLANOX_MT2892	0x101d		/* ConnectX-6 Dx */
+#define	PCI_PRODUCT_MELLANOX_MT2894	0x101f		/* ConnectX-6 Lx */
 #define	PCI_PRODUCT_MELLANOX_MT23108	0x5a44		/* InfiniHost (Tavor) */
 #define	PCI_PRODUCT_MELLANOX_MT23108_PCI	0x5a46		/* InfiniHost PCI Bridge (Tavor) */
 #define	PCI_PRODUCT_MELLANOX_MT25204_OLD	0x5e8c		/* InfiniHost III Lx (old Sinai) */

Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1451.2.10 src/sys/dev/pci/pcidevs_data.h:1.1451.2.11
--- src/sys/dev/pci/pcidevs_data.h:1.1451.2.10	Wed Oct 18 14:33:15 2023
+++ src/sys/dev/pci/pcidevs_data.h	Fri Nov  3 09:00:14 2023
@@ -1,10 +1,10 @@
-/*	$NetBSD: pcidevs_data.h,v 1.1451.2.10 2023/10/18 14:33:15 martin Exp $	*/
+/*	$NetBSD: pcidevs_data.h,v 1.1451.2.11 2023/11/03 09:00:14 martin Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	NetBSD: pcidevs,v 1.1471.2.9 2023/10/18 14:27:37 martin Exp
+ *	NetBSD: pcidevs,v 1.1471.2.10 2023/11/03 08:59:29 martin Exp
  */
 
 /*
@@ -13953,6 +13953,8 @@ static const uint32_t pci_products[] = {
 	32374, 15370, 0,
 	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2892, 
 	32374, 32385, 0,
+	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT2894, 
+	32374, 32357, 0,
 	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT23108, 
 	32388, 32399, 0,
 	PCI_VENDOR_MELLANOX, PCI_PRODUCT_MELLANOX_MT23108_PCI, 
@@ -22912,10 +22914,10 @@ static const char pci_words[] = { "." 
 	"G550\0" /* 1 refs @ 32335 */
 	"MQ200\0" /* 1 refs @ 32340 */
 	"ConnectX-4\0" /* 4 refs @ 32346 */
-	"Lx\0" /* 4 refs @ 32357 */
+	"Lx\0" /* 5 refs @ 32357 */
 	"ConnectX-5\0" /* 4 refs @ 32360 */
 	"Ex\0" /* 4 refs @ 32371 */
-	"ConnectX-6\0" /* 3 refs @ 32374 */
+	"ConnectX-6\0" /* 4 refs @ 32374 */
 	"Dx\0" /* 1 refs @ 32385 */
 	"InfiniHost\0" /* 6 refs @ 32388 */
 	"(Tavor)\0" /* 2 refs @ 32399 */

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

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 09:00:33 UTC 2023

Modified Files:
src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h

Log Message:
Regen for ticket #447 (Add Mellanox ConnectX-6 Lx)


To generate a diff of this commit:
cvs rdiff -u -r1.1452.2.10 -r1.1452.2.11 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1451.2.10 -r1.1451.2.11 src/sys/dev/pci/pcidevs_data.h

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

CVS commit: [netbsd-10] src

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 08:59:29 UTC 2023

Modified Files:
src/share/man/man4 [netbsd-10]: mcx.4
src/sys/dev/pci [netbsd-10]: if_mcx.c pcidevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #447):

sys/dev/pci/pcidevs: revision 1.1498
sys/dev/pci/if_mcx.c: revision 1.26
share/man/man4/mcx.4: revision 1.3

pcidevs: Add Mellanox ConnectX-6 Lx.

mcx(4): Add Mellanox ConnectX-6 Lx from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.10.1 src/share/man/man4/mcx.4
cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/dev/pci/if_mcx.c
cvs rdiff -u -r1.1471.2.9 -r1.1471.2.10 src/sys/dev/pci/pcidevs

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

Modified files:

Index: src/share/man/man4/mcx.4
diff -u src/share/man/man4/mcx.4:1.2 src/share/man/man4/mcx.4:1.2.10.1
--- src/share/man/man4/mcx.4:1.2	Mon Sep 23 18:26:52 2019
+++ src/share/man/man4/mcx.4	Fri Nov  3 08:59:29 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: mcx.4,v 1.2 2019/09/23 18:26:52 jmcneill Exp $
+.\" $NetBSD: mcx.4,v 1.2.10.1 2023/11/03 08:59:29 martin Exp $
 .\"
 .\" Copyright (c) 2019 David Gwynne 
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd September 23, 2019
+.Dd October 26, 2023
 .Dt MCX 4
 .Os
 .Sh NAME
@@ -37,6 +37,10 @@ ConnectX-4 EN
 ConnectX-5 EN
 .It
 ConnectX-6 EN
+.It
+ConnectX-6 Dx EN
+.It
+ConnectX-6 Lx EN
 .El
 .Sh SEE ALSO
 .Xr arp 4 ,

Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.25 src/sys/dev/pci/if_mcx.c:1.25.4.1
--- src/sys/dev/pci/if_mcx.c:1.25	Sun Aug 28 07:54:03 2022
+++ src/sys/dev/pci/if_mcx.c	Fri Nov  3 08:59:29 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $ */
+/*	$NetBSD: if_mcx.c,v 1.25.4.1 2023/11/03 08:59:29 martin Exp $ */
 /*	$OpenBSD: if_mcx.c,v 1.101 2021/06/02 19:16:11 patrick Exp $ */
 
 /*
@@ -23,7 +23,7 @@
 #endif
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.25 2022/08/28 07:54:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mcx.c,v 1.25.4.1 2023/11/03 08:59:29 martin Exp $");
 
 #include 
 #include 
@@ -2678,7 +2678,8 @@ static const struct {
 	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT28800 },
 	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT28800VF },
 	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT28908 },
-	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT2892  },
+	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT2892 },
+	{ PCI_VENDOR_MELLANOX,	PCI_PRODUCT_MELLANOX_MT2894 },
 };
 
 struct mcx_eth_proto_capability {

Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1471.2.9 src/sys/dev/pci/pcidevs:1.1471.2.10
--- src/sys/dev/pci/pcidevs:1.1471.2.9	Wed Oct 18 14:27:37 2023
+++ src/sys/dev/pci/pcidevs	Fri Nov  3 08:59:29 2023
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1471.2.9 2023/10/18 14:27:37 martin Exp $
+$NetBSD: pcidevs,v 1.1471.2.10 2023/11/03 08:59:29 martin Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7667,6 +7667,7 @@ product MELLANOX MT28800VF	0x101a	Connec
 product MELLANOX MT28908	0x101b	ConnectX-6
 product MELLANOX MT28908VF	0x101c	ConnectX-6 VF
 product MELLANOX MT2892		0x101d	ConnectX-6 Dx
+product MELLANOX MT2894		0x101f	ConnectX-6 Lx
 product MELLANOX MT23108	0x5a44	InfiniHost (Tavor)
 product MELLANOX MT23108_PCI	0x5a46	InfiniHost PCI Bridge (Tavor)
 product MELLANOX MT25204_OLD	0x5e8c	InfiniHost III Lx (old Sinai)

CVS commit: [netbsd-10] src

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 08:59:29 UTC 2023

Modified Files:
src/share/man/man4 [netbsd-10]: mcx.4
src/sys/dev/pci [netbsd-10]: if_mcx.c pcidevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #447):

sys/dev/pci/pcidevs: revision 1.1498
sys/dev/pci/if_mcx.c: revision 1.26
share/man/man4/mcx.4: revision 1.3

pcidevs: Add Mellanox ConnectX-6 Lx.

mcx(4): Add Mellanox ConnectX-6 Lx from OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.10.1 src/share/man/man4/mcx.4
cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/dev/pci/if_mcx.c
cvs rdiff -u -r1.1471.2.9 -r1.1471.2.10 src/sys/dev/pci/pcidevs

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

CVS commit: [netbsd-10] src

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 08:56:37 UTC 2023

Modified Files:
src/share/man/man4 [netbsd-10]: eqos.4
src/sys/arch/amd64/conf [netbsd-10]: GENERIC
src/sys/arch/i386/conf [netbsd-10]: GENERIC
src/sys/dev/ic [netbsd-10]: dwc_eqos.c dwc_eqos_reg.h dwc_eqos_var.h
src/sys/dev/pci [netbsd-10]: files.pci
Added Files:
src/sys/dev/pci [netbsd-10]: if_eqos_pci.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #446):

sys/dev/pci/if_eqos_pci.c: revision 1.3
sys/arch/i386/conf/GENERIC: revision 1.1251
sys/arch/i386/conf/GENERIC: revision 1.1252
sys/arch/amd64/conf/GENERIC: revision 1.607
sys/arch/amd64/conf/GENERIC: revision 1.608
sys/dev/ic/dwc_eqos.c: revision 1.20
sys/dev/ic/dwc_eqos.c: revision 1.21
share/man/man4/eqos.4: revision 1.2
sys/dev/ic/dwc_eqos.c: revision 1.22
sys/dev/ic/dwc_eqos_reg.h: revision 1.7
sys/dev/ic/dwc_eqos.c: revision 1.23
sys/dev/ic/dwc_eqos_reg.h: revision 1.8
sys/dev/ic/dwc_eqos.c: revision 1.24
sys/dev/ic/dwc_eqos.c: revision 1.25
sys/dev/ic/dwc_eqos.c: revision 1.26
sys/dev/ic/dwc_eqos.c: revision 1.27
sys/dev/ic/dwc_eqos_var.h: revision 1.5
sys/dev/ic/dwc_eqos.c: revision 1.28
sys/dev/ic/dwc_eqos_var.h: revision 1.6
sys/dev/ic/dwc_eqos.c: revision 1.29
sys/dev/ic/dwc_eqos.c: revision 1.18
sys/dev/ic/dwc_eqos.c: revision 1.19
sys/dev/pci/files.pci: revision 1.448
sys/dev/pci/if_eqos_pci.c: revision 1.1
sys/dev/pci/if_eqos_pci.c: revision 1.2

eqos(4): Fix definition of GMAC_MAC_HW_FEATURE1_RXFIFOSIZE.

eqos(4): Fix a bug that the MAC address is swapped.
 Don't swap the MAC address in eqos_get_eaddr(). Other OSes except FreeBSD
(which was based on NetBSD's) don't swap it. With this change, my own
OnLogic Helix 330's MAC address becomes correct. The OUI is 84:8b:cd:4d.
It's owned by Logic Supply and they were acquired by OnLogic.

On Quartz64 with UEFI, the MAC address is wrongly set and the multicast
bit might be set. To do workaround, clear the bit if it's set.

eqos(4): Add missing clock range.

eqos(4): Accept if snpsver == 0x52. Tested with Intel Elkhart Lake.

 TODO:
Multiqueue support.
Add watchdog timer.
Add detach function.

eqos(4): Add initial support for Intel Elkhart Lake internal Ethernet devices.
 - Only tested on PSE SGMII 1G Ethernet MAC with MaxLinear GPY115.
 - I don't know why dmat64 doesn't work. eqos_attach() have a special
   code if EQOS_HW_FEATURE_ADDR64_32BIT(sc) is true, but it seems it doesn't
   work.
 - TODO:
Multiqueue support.
Detach support.

eqos(4): Fix compile error for arch that sizeof(bus_size_t) == 4 (i386).
Trailing whitespace

eqos(4): Disable eqos(4) by default because it's not stable on x86.

eqos(4): KNF. No functional change.

eqos(4): Add and modify some DPRINTF()s.

eqos(4): Add sysctls for debugging.

eqos(4): Use EQOS_TXLOCK() more to be stable.
 Fix a bug that sc_tx.{cur,next,queued} become inconsitent.
Use txlock when accessing TX data.

eqos(4): Set TX/RX DMA burst length to improve performance.

eqos(4): Set flow control correctly.

eqos_pci: Limit to 32bit DMA only for PSE devices.

eqos(4): Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/share/man/man4/eqos.4
cvs rdiff -u -r1.599.4.4 -r1.599.4.5 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1243.2.2 -r1.1243.2.3 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/ic/dwc_eqos_reg.h
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/dev/ic/dwc_eqos_var.h
cvs rdiff -u -r1.445.2.2 -r1.445.2.3 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.3.2.2 src/sys/dev/pci/if_eqos_pci.c

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

Modified files:

Index: src/share/man/man4/eqos.4
diff -u src/share/man/man4/eqos.4:1.1 src/share/man/man4/eqos.4:1.1.2.1
--- src/share/man/man4/eqos.4:1.1	Thu Jan  6 21:55:23 2022
+++ src/share/man/man4/eqos.4	Fri Nov  3 08:56:37 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: eqos.4,v 1.1 2022/01/06 21:55:23 nia Exp $
+.\" $NetBSD: eqos.4,v 1.1.2.1 2023/11/03 08:56:37 martin Exp $
 .\"
 .\" Copyright (c) 2022 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 6, 2022
+.Dd October 20, 2023
 .Dt EQOS 4
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nd DesignWare Ethernet Quality-of-Service controller
 .Sh SYNOPSIS
 .Cd "eqos* at acpi?"
+.Cd "eqos* at pci?"
 .Sh DESCRIPTION
 The
 .Nm

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.599.4.4 src/sys/arch/amd64/conf/GENERIC:1.599.4.5
---

CVS commit: [netbsd-10] src

2023-11-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Fri Nov  3 08:56:37 UTC 2023

Modified Files:
src/share/man/man4 [netbsd-10]: eqos.4
src/sys/arch/amd64/conf [netbsd-10]: GENERIC
src/sys/arch/i386/conf [netbsd-10]: GENERIC
src/sys/dev/ic [netbsd-10]: dwc_eqos.c dwc_eqos_reg.h dwc_eqos_var.h
src/sys/dev/pci [netbsd-10]: files.pci
Added Files:
src/sys/dev/pci [netbsd-10]: if_eqos_pci.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #446):

sys/dev/pci/if_eqos_pci.c: revision 1.3
sys/arch/i386/conf/GENERIC: revision 1.1251
sys/arch/i386/conf/GENERIC: revision 1.1252
sys/arch/amd64/conf/GENERIC: revision 1.607
sys/arch/amd64/conf/GENERIC: revision 1.608
sys/dev/ic/dwc_eqos.c: revision 1.20
sys/dev/ic/dwc_eqos.c: revision 1.21
share/man/man4/eqos.4: revision 1.2
sys/dev/ic/dwc_eqos.c: revision 1.22
sys/dev/ic/dwc_eqos_reg.h: revision 1.7
sys/dev/ic/dwc_eqos.c: revision 1.23
sys/dev/ic/dwc_eqos_reg.h: revision 1.8
sys/dev/ic/dwc_eqos.c: revision 1.24
sys/dev/ic/dwc_eqos.c: revision 1.25
sys/dev/ic/dwc_eqos.c: revision 1.26
sys/dev/ic/dwc_eqos.c: revision 1.27
sys/dev/ic/dwc_eqos_var.h: revision 1.5
sys/dev/ic/dwc_eqos.c: revision 1.28
sys/dev/ic/dwc_eqos_var.h: revision 1.6
sys/dev/ic/dwc_eqos.c: revision 1.29
sys/dev/ic/dwc_eqos.c: revision 1.18
sys/dev/ic/dwc_eqos.c: revision 1.19
sys/dev/pci/files.pci: revision 1.448
sys/dev/pci/if_eqos_pci.c: revision 1.1
sys/dev/pci/if_eqos_pci.c: revision 1.2

eqos(4): Fix definition of GMAC_MAC_HW_FEATURE1_RXFIFOSIZE.

eqos(4): Fix a bug that the MAC address is swapped.
 Don't swap the MAC address in eqos_get_eaddr(). Other OSes except FreeBSD
(which was based on NetBSD's) don't swap it. With this change, my own
OnLogic Helix 330's MAC address becomes correct. The OUI is 84:8b:cd:4d.
It's owned by Logic Supply and they were acquired by OnLogic.

On Quartz64 with UEFI, the MAC address is wrongly set and the multicast
bit might be set. To do workaround, clear the bit if it's set.

eqos(4): Add missing clock range.

eqos(4): Accept if snpsver == 0x52. Tested with Intel Elkhart Lake.

 TODO:
Multiqueue support.
Add watchdog timer.
Add detach function.

eqos(4): Add initial support for Intel Elkhart Lake internal Ethernet devices.
 - Only tested on PSE SGMII 1G Ethernet MAC with MaxLinear GPY115.
 - I don't know why dmat64 doesn't work. eqos_attach() have a special
   code if EQOS_HW_FEATURE_ADDR64_32BIT(sc) is true, but it seems it doesn't
   work.
 - TODO:
Multiqueue support.
Detach support.

eqos(4): Fix compile error for arch that sizeof(bus_size_t) == 4 (i386).
Trailing whitespace

eqos(4): Disable eqos(4) by default because it's not stable on x86.

eqos(4): KNF. No functional change.

eqos(4): Add and modify some DPRINTF()s.

eqos(4): Add sysctls for debugging.

eqos(4): Use EQOS_TXLOCK() more to be stable.
 Fix a bug that sc_tx.{cur,next,queued} become inconsitent.
Use txlock when accessing TX data.

eqos(4): Set TX/RX DMA burst length to improve performance.

eqos(4): Set flow control correctly.

eqos_pci: Limit to 32bit DMA only for PSE devices.

eqos(4): Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.2.1 src/share/man/man4/eqos.4
cvs rdiff -u -r1.599.4.4 -r1.599.4.5 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1243.2.2 -r1.1243.2.3 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/dev/ic/dwc_eqos.c
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/ic/dwc_eqos_reg.h
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/dev/ic/dwc_eqos_var.h
cvs rdiff -u -r1.445.2.2 -r1.445.2.3 src/sys/dev/pci/files.pci
cvs rdiff -u -r0 -r1.3.2.2 src/sys/dev/pci/if_eqos_pci.c

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