CVS commit: src/sys/arch/mipsco/include
Module Name:src
Committed By: andvar
Date: Mon Oct 9 05:56:24 UTC 2023
Modified Files:
src/sys/arch/mipsco/include: isa_machdep.h
Log Message:
replace trailing whitespace with tab before struct evcnt for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mipsco/include/isa_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mipsco/include/isa_machdep.h
diff -u src/sys/arch/mipsco/include/isa_machdep.h:1.11 src/sys/arch/mipsco/include/isa_machdep.h:1.12
--- src/sys/arch/mipsco/include/isa_machdep.h:1.11 Sun Oct 8 22:10:49 2023
+++ src/sys/arch/mipsco/include/isa_machdep.h Mon Oct 9 05:56:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.11 2023/10/08 22:10:49 andvar Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.12 2023/10/09 05:56:24 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
* Types provided to machine-independent ISA code.
*/
struct mipsco_isa_chipset {
-struct evcnt ic_intrcnt; /* Interrupt counter */
+ struct evcnt ic_intrcnt; /* Interrupt counter */
bus_space_tag_t ic_bst; /* bus_space tag */
bus_space_handle_t ic_bsh; /* interrupt control register */
LIST_HEAD(,mipsco_intrhand)
CVS commit: src/sys/arch/mipsco/include
Module Name:src Committed By: andvar Date: Mon Oct 9 05:56:24 UTC 2023 Modified Files: src/sys/arch/mipsco/include: isa_machdep.h Log Message: replace trailing whitespace with tab before struct evcnt for consistency. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mipsco/include/isa_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mipsco
Module Name:src
Committed By: andvar
Date: Sun Oct 8 22:10:49 UTC 2023
Modified Files:
src/sys/arch/mipsco/include: bus.h isa_machdep.h
src/sys/arch/mipsco/isa: isa_machdep.c
Log Message:
Update __BS_TYPENAME(BITS) macro to combine uint type instead of u_int.
Constify bus_space_write_multi one of params.
Remove unused ic_intr property from mipsco_isa_chipset struct.
Add __INTR_PRIVATE definition to mipsco isa_machdep.c.
Fixes RC3230 mipsco kernel config (w/o KGDB option, will be addressed later).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/include/bus.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mipsco/include/isa_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mipsco/isa/isa_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mipsco/include/bus.h
diff -u src/sys/arch/mipsco/include/bus.h:1.23 src/sys/arch/mipsco/include/bus.h:1.24
--- src/sys/arch/mipsco/include/bus.h:1.23 Fri Apr 23 06:15:16 2021
+++ src/sys/arch/mipsco/include/bus.h Sun Oct 8 22:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.23 2021/04/23 06:15:16 skrll Exp $ */
+/* $NetBSD: bus.h,v 1.24 2023/10/08 22:10:49 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -342,7 +342,7 @@ int mipsco_bus_space_alloc(bus_space_tag
/*
* Utility macros; do not use outside this file.
*/
-#define __BS_TYPENAME(BITS) __CONCAT3(u_int,BITS,_t)
+#define __BS_TYPENAME(BITS) __CONCAT3(uint,BITS,_t)
#define __BS_OFFSET(t, o, BYTES) ((o) << (t)->bs_stride)
#define __BS_FUNCTION(func,BYTES) __CONCAT3(func,_,BYTES)
@@ -480,14 +480,14 @@ __bus_space_write(8,64)
#define __bus_space_write_multi(BYTES,BITS)\
static __inline void __BS_FUNCTION(bus_space_write_multi,BYTES) \
(bus_space_tag_t, bus_space_handle_t, bus_size_t, \
- __BS_TYPENAME(BITS) *, size_t); \
+ const __BS_TYPENAME(BITS) *, size_t);\
\
static __inline void \
__BS_FUNCTION(bus_space_write_multi,BYTES)(\
bus_space_tag_t t, \
bus_space_handle_t h, \
bus_size_t o, \
- __BS_TYPENAME(BITS) *a, \
+ const __BS_TYPENAME(BITS) *a, \
size_t c) \
{ \
\
Index: src/sys/arch/mipsco/include/isa_machdep.h
diff -u src/sys/arch/mipsco/include/isa_machdep.h:1.10 src/sys/arch/mipsco/include/isa_machdep.h:1.11
--- src/sys/arch/mipsco/include/isa_machdep.h:1.10 Tue Oct 18 22:04:34 2016
+++ src/sys/arch/mipsco/include/isa_machdep.h Sun Oct 8 22:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.h,v 1.10 2016/10/18 22:04:34 jdolecek Exp $ */
+/* $NetBSD: isa_machdep.h,v 1.11 2023/10/08 22:10:49 andvar Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -86,7 +86,6 @@
* Types provided to machine-independent ISA code.
*/
struct mipsco_isa_chipset {
- struct mipsco_intrhand ic_intr; /* XXX */
struct evcnt ic_intrcnt; /* Interrupt counter */
bus_space_tag_t ic_bst; /* bus_space tag */
bus_space_handle_t ic_bsh; /* interrupt control register */
Index: src/sys/arch/mipsco/isa/isa_machdep.c
diff -u src/sys/arch/mipsco/isa/isa_machdep.c:1.19 src/sys/arch/mipsco/isa/isa_machdep.c:1.20
--- src/sys/arch/mipsco/isa/isa_machdep.c:1.19 Sat Aug 7 16:19:00 2021
+++ src/sys/arch/mipsco/isa/isa_machdep.c Sun Oct 8 22:10:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.19 2021/08/07 16:19:00 thorpej Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.20 2023/10/08 22:10:49 andvar Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,9 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.19 2021/08/07 16:19:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.20 2023/10/08 22:10:49 andvar Exp $");
+
+#define __INTR_PRIVATE
#include
#include
CVS commit: src/sys/arch/mipsco
Module Name:src Committed By: andvar Date: Sun Oct 8 22:10:49 UTC 2023 Modified Files: src/sys/arch/mipsco/include: bus.h isa_machdep.h src/sys/arch/mipsco/isa: isa_machdep.c Log Message: Update __BS_TYPENAME(BITS) macro to combine uint type instead of u_int. Constify bus_space_write_multi one of params. Remove unused ic_intr property from mipsco_isa_chipset struct. Add __INTR_PRIVATE definition to mipsco isa_machdep.c. Fixes RC3230 mipsco kernel config (w/o KGDB option, will be addressed later). To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mipsco/include/bus.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mipsco/include/isa_machdep.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mipsco/isa/isa_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Oct 8 21:52:34 UTC 2023 Modified Files: src/tools/gcc: gcc-version.mk Log Message: bump the netbsd gcc 10 version to "nb3 20231008" for all the vax updates. XXX: check if mknative needed? XXX: pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Oct 8 21:52:34 UTC 2023
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
bump the netbsd gcc 10 version to "nb3 20231008" for all the vax updates.
XXX: check if mknative needed?
XXX: pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.24 src/tools/gcc/gcc-version.mk:1.25
--- src/tools/gcc/gcc-version.mk:1.24 Sun Jul 30 06:36:21 2023
+++ src/tools/gcc/gcc-version.mk Sun Oct 8 21:52:34 2023
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.24 2023/07/30 06:36:21 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.25 2023/10/08 21:52:34 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 10
-NETBSD_GCC_VERSION=nb2 20230710
+NETBSD_GCC_VERSION=nb3 20231008
.endif
.if ${HAVE_GCC} == 12
NETBSD_GCC_VERSION=nb1 20230729
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Sun Oct 8 21:08:06 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: 3RDPARTY: mDNSResponder now at 2200.0.8 To generate a diff of this commit: cvs rdiff -u -r1.1956 -r1.1957 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1956 src/doc/3RDPARTY:1.1957 --- src/doc/3RDPARTY:1.1956 Fri Oct 6 08:53:14 2023 +++ src/doc/3RDPARTY Sun Oct 8 21:08:05 2023 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1956 2023/10/06 08:53:14 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1957 2023/10/08 21:08:05 gutteridge Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -881,11 +881,11 @@ Uses libc's ohash Package: mDNSResponder Version: 878.30.4 -Current Vers: 1790.80.10 +Current Vers: 2200.0.8 Maintainer: Apple Archive Site: https://www.opensource.apple.com/tarballs/mDNSResponder/ Home Page: https://developer.apple.com/bonjour/ -Date: 2023-06-29 +Date: 2023-10-08 Mailing List: bonjour-...@lists.apple.com License: Apache2 (mdnsd), BSD 3-clause (libdns_sd), BSD 3-clause like (dns-sd)
CVS commit: src/doc
Module Name:src Committed By: gutteridge Date: Sun Oct 8 21:08:06 UTC 2023 Modified Files: src/doc: 3RDPARTY Log Message: 3RDPARTY: mDNSResponder now at 2200.0.8 To generate a diff of this commit: cvs rdiff -u -r1.1956 -r1.1957 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 18:50:47 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1747 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 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.106 src/doc/CHANGES-9.4:1.1.2.107 --- src/doc/CHANGES-9.4:1.1.2.106 Sun Oct 8 15:30:06 2023 +++ src/doc/CHANGES-9.4 Sun Oct 8 18:50:46 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.106 2023/10/08 15:30:06 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.107 2023/10/08 18:50:46 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2242,3 +2242,10 @@ sys/dev/pci/if_wm.c1.785-1.789 - Modify some event counters' descriptions to clarify meaning. [msaitoh, ticket #1746] +distrib/evbmips/instkernel/ramdisk/Makefile 1.19 +lib/libm/Makefile1.222 + + libm: add fma() functions for mips. + Bump ramdisk size slightly. + [he, ticket #1747] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 18:50:47 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1747 To generate a diff of this commit: cvs rdiff -u -r1.1.2.106 -r1.1.2.107 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
Module Name:src
Committed By: martin
Date: Sun Oct 8 18:49:55 UTC 2023
Modified Files:
src/distrib/evbmips/instkernel/ramdisk [netbsd-9]: Makefile
src/lib/libm [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by he in ticket #1747):
lib/libm/Makefile: revision 1.222
distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.19
libm Makefile: add fma() functions for mips.
This pushed the ramdisk size, so that needed to be bumped as well.
Otherwise, there were no build issues for either 32 or 64 bit mips.
Sort-of OK'ed by simonb@.
To generate a diff of this commit:
cvs rdiff -u -r1.13.14.1 -r1.13.14.2 \
src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.210 -r1.210.2.1 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.13.14.1 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.13.14.2
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.13.14.1 Tue Jan 28 09:08:10 2020
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Oct 8 18:49:55 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13.14.1 2020/01/28 09:08:10 msaitoh Exp $
+# $NetBSD: Makefile,v 1.13.14.2 2023/10/08 18:49:55 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 4096k
+IMAGESIZE= 4160k
MAKEFS_FLAGS+= -f 15
WARNS= 1
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.210 src/lib/libm/Makefile:1.210.2.1
--- src/lib/libm/Makefile:1.210 Sat Apr 27 23:04:32 2019
+++ src/lib/libm/Makefile Sun Oct 8 18:49:54 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.210 2019/04/27 23:04:32 kamil Exp $
+# $NetBSD: Makefile,v 1.210.2.1 2023/10/08 18:49:54 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -204,6 +204,7 @@ COMMON_SRCS+= s_rintl.c
&& (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
COMMON_SRCS+= s_nexttoward.c
.endif
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Oct 8 18:49:55 UTC 2023 Modified Files: src/distrib/evbmips/instkernel/ramdisk [netbsd-9]: Makefile src/lib/libm [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by he in ticket #1747): lib/libm/Makefile: revision 1.222 distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.19 libm Makefile: add fma() functions for mips. This pushed the ramdisk size, so that needed to be bumped as well. Otherwise, there were no build issues for either 32 or 64 bit mips. Sort-of OK'ed by simonb@. To generate a diff of this commit: cvs rdiff -u -r1.13.14.1 -r1.13.14.2 \ src/distrib/evbmips/instkernel/ramdisk/Makefile cvs rdiff -u -r1.210 -r1.210.2.1 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 18:49:13 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #397 To generate a diff of this commit: cvs rdiff -u -r1.1.2.129 -r1.1.2.130 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.129 src/doc/CHANGES-10.0:1.1.2.130 --- src/doc/CHANGES-10.0:1.1.2.129 Sun Oct 8 15:24:41 2023 +++ src/doc/CHANGES-10.0 Sun Oct 8 18:49:12 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.129 2023/10/08 15:24:41 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.130 2023/10/08 18:49:12 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12268,3 +12268,10 @@ sys/dev/pci/if_wm.c1.785-1.789 - Modify some event counters' descriptions to clarify meaning. [msaitoh, ticket #396] +distrib/evbmips/instkernel/ramdisk/Makefile 1.19 +lib/libm/Makefile1.222 + + libm: add fma() functions for mips. + Bump ramdisk size slightly. + [he, ticket #397] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 18:49:13 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #397 To generate a diff of this commit: cvs rdiff -u -r1.1.2.129 -r1.1.2.130 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
Module Name:src
Committed By: martin
Date: Sun Oct 8 18:48:21 UTC 2023
Modified Files:
src/distrib/evbmips/instkernel/ramdisk [netbsd-10]: Makefile
src/lib/libm [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by he in ticket #397):
lib/libm/Makefile: revision 1.222
distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.19
libm Makefile: add fma() functions for mips.
This pushed the ramdisk size, so that needed to be bumped as well.
Otherwise, there were no build issues for either 32 or 64 bit mips.
Sort-of OK'ed by simonb@.
To generate a diff of this commit:
cvs rdiff -u -r1.15.6.1 -r1.15.6.2 \
src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.218.2.1 -r1.218.2.2 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.15.6.1 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.15.6.2
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.15.6.1 Thu Jul 27 18:01:37 2023
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Oct 8 18:48:20 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15.6.1 2023/07/27 18:01:37 martin Exp $
+# $NetBSD: Makefile,v 1.15.6.2 2023/10/08 18:48:20 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 4096k
+IMAGESIZE= 4160k
MAKEFS_FLAGS+= -f 15
WARNS= 1
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.218.2.1 src/lib/libm/Makefile:1.218.2.2
--- src/lib/libm/Makefile:1.218.2.1 Fri Aug 11 14:44:19 2023
+++ src/lib/libm/Makefile Sun Oct 8 18:48:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218.2.1 2023/08/11 14:44:19 martin Exp $
+# $NetBSD: Makefile,v 1.218.2.2 2023/10/08 18:48:20 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -206,6 +206,7 @@ COMMON_SRCS+= s_rintl.c
.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
COMMON_SRCS+= s_nexttoward.c
.endif
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Oct 8 18:48:21 UTC 2023 Modified Files: src/distrib/evbmips/instkernel/ramdisk [netbsd-10]: Makefile src/lib/libm [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by he in ticket #397): lib/libm/Makefile: revision 1.222 distrib/evbmips/instkernel/ramdisk/Makefile: revision 1.19 libm Makefile: add fma() functions for mips. This pushed the ramdisk size, so that needed to be bumped as well. Otherwise, there were no build issues for either 32 or 64 bit mips. Sort-of OK'ed by simonb@. To generate a diff of this commit: cvs rdiff -u -r1.15.6.1 -r1.15.6.2 \ src/distrib/evbmips/instkernel/ramdisk/Makefile cvs rdiff -u -r1.218.2.1 -r1.218.2.2 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/gpl3/gcc/dist/gcc
Module Name:src
Committed By: martin
Date: Sun Oct 8 18:44:48 UTC 2023
Modified Files:
src/external/gpl3/gcc/dist/gcc [netbsd-10]: dse.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #394):
[accidentaly skiped during initial pullup handling]
external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.15
external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.16
(applied to external/gpl3/gcc/dist/gcc/dse.c)
gcc.old: Fix my regression for PR port-vax/57646 patch [5/21]
Add a part of the original diff provided by Kalvis Duckmanton,
which I carelessly dropped during NB_FIX_VAX_BACKEND addition.
Fix ICE in DSE phase for native GCC. Now, pkgsrc/lang/perl5
successfully builds again.
gcc.old: Clarify PR port-vax/57646 patch [5/21]. NFC
Restore ``else'' in the original patch. NFC but better to fit into
upstream code here.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/external/gpl3/gcc/dist/gcc/dse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/dse.c
diff -u src/external/gpl3/gcc/dist/gcc/dse.c:1.15.2.1 src/external/gpl3/gcc/dist/gcc/dse.c:1.15.2.2
--- src/external/gpl3/gcc/dist/gcc/dse.c:1.15.2.1 Sun Oct 8 14:35:18 2023
+++ src/external/gpl3/gcc/dist/gcc/dse.c Sun Oct 8 18:44:48 2023
@@ -298,7 +298,11 @@ public:
/* Return a bitmask with the first N low bits set. */
static unsigned HOST_WIDE_INT
+#ifdef NB_FIX_VAX_BACKEND
+lowpart_bitmask (unsigned int n)
+#else
lowpart_bitmask (int n)
+#endif
{
unsigned HOST_WIDE_INT mask = HOST_WIDE_INT_M1U;
#ifdef NB_FIX_VAX_BACKEND
@@ -1346,7 +1350,7 @@ all_positions_needed_p (store_info *s_in
return true;
}
#ifdef NB_FIX_VAX_BACKEND
- if (const_start >= HOST_BITS_PER_WIDE_INT || const_start < 0)
+ else if (const_start >= HOST_BITS_PER_WIDE_INT || const_start < 0)
return true;
#endif
else
CVS commit: [netbsd-10] src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: martin Date: Sun Oct 8 18:44:48 UTC 2023 Modified Files: src/external/gpl3/gcc/dist/gcc [netbsd-10]: dse.c Log Message: Pull up following revision(s) (requested by rin in ticket #394): [accidentaly skiped during initial pullup handling] external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.15 external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.16 (applied to external/gpl3/gcc/dist/gcc/dse.c) gcc.old: Fix my regression for PR port-vax/57646 patch [5/21] Add a part of the original diff provided by Kalvis Duckmanton, which I carelessly dropped during NB_FIX_VAX_BACKEND addition. Fix ICE in DSE phase for native GCC. Now, pkgsrc/lang/perl5 successfully builds again. gcc.old: Clarify PR port-vax/57646 patch [5/21]. NFC Restore ``else'' in the original patch. NFC but better to fit into upstream code here. To generate a diff of this commit: cvs rdiff -u -r1.15.2.1 -r1.15.2.2 src/external/gpl3/gcc/dist/gcc/dse.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/news68k/news68k
Module Name:src Committed By: andvar Date: Sun Oct 8 17:42:58 UTC 2023 Modified Files: src/sys/arch/news68k/news68k: locore.s vectors.s Log Message: Revert my changes regarding removal of FPSP related blocks. After additional discussion it is preferred to keep code consistency, to make it easier refactor common code between m68k ports. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.8 -r1.9 src/sys/arch/news68k/news68k/vectors.s 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/news68k/news68k/locore.s diff -u src/sys/arch/news68k/news68k/locore.s:1.69 src/sys/arch/news68k/news68k/locore.s:1.70 --- src/sys/arch/news68k/news68k/locore.s:1.69 Fri Oct 6 21:10:12 2023 +++ src/sys/arch/news68k/news68k/locore.s Sun Oct 8 17:42:58 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.69 2023/10/06 21:10:12 andvar Exp $ */ +/* $NetBSD: locore.s,v 1.70 2023/10/08 17:42:58 andvar Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,6 +44,7 @@ #include "opt_compat_netbsd.h" #include "opt_compat_sunos.h" +#include "opt_fpsp.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_lockdebug.h" Index: src/sys/arch/news68k/news68k/vectors.s diff -u src/sys/arch/news68k/news68k/vectors.s:1.8 src/sys/arch/news68k/news68k/vectors.s:1.9 --- src/sys/arch/news68k/news68k/vectors.s:1.8 Fri Oct 6 21:10:12 2023 +++ src/sys/arch/news68k/news68k/vectors.s Sun Oct 8 17:42:58 2023 @@ -1,4 +1,4 @@ -| $NetBSD: vectors.s,v 1.8 2023/10/06 21:10:12 andvar Exp $ +| $NetBSD: vectors.s,v 1.9 2023/10/08 17:42:58 andvar Exp $ | Copyright (c) 1997 Jason R. Thorpe. All rights reserved. | Copyright (c) 1988 University of Utah @@ -109,6 +109,15 @@ GLOBAL(vectab) VECTOR(illinst) /* 45: TRAP instruction vector */ VECTOR(illinst) /* 46: TRAP instruction vector */ VECTOR(trap15) /* 47: TRAP instruction vector */ +#ifdef FPSP + ASVECTOR(bsun) /* 48: FPCP branch/set on unordered cond */ + ASVECTOR(inex) /* 49: FPCP inexact result */ + ASVECTOR(dz) /* 50: FPCP divide by zero */ + ASVECTOR(unfl) /* 51: FPCP underflow */ + ASVECTOR(operr) /* 52: FPCP operand error */ + ASVECTOR(ovfl) /* 53: FPCP overflow */ + ASVECTOR(snan) /* 54: FPCP signalling NAN */ +#else VECTOR(fpfault) /* 48: FPCP branch/set on unordered cond */ VECTOR(fpfault) /* 49: FPCP inexact result */ VECTOR(fpfault) /* 50: FPCP divide by zero */ @@ -116,6 +125,8 @@ GLOBAL(vectab) VECTOR(fpfault) /* 52: FPCP operand error */ VECTOR(fpfault) /* 53: FPCP overflow */ VECTOR(fpfault) /* 54: FPCP signalling NAN */ +#endif + VECTOR(fpunsupp) /* 55: FPCP unimplemented data type */ VECTOR(badtrap) /* 56: unassigned, reserved */ VECTOR(badtrap) /* 57: unassigned, reserved */
CVS commit: src/sys/arch/news68k/news68k
Module Name:src Committed By: andvar Date: Sun Oct 8 17:42:58 UTC 2023 Modified Files: src/sys/arch/news68k/news68k: locore.s vectors.s Log Message: Revert my changes regarding removal of FPSP related blocks. After additional discussion it is preferred to keep code consistency, to make it easier refactor common code between m68k ports. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/news68k/news68k/locore.s cvs rdiff -u -r1.8 -r1.9 src/sys/arch/news68k/news68k/vectors.s 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
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:33:07 UTC 2023
Modified Files:
src/doc [netbsd-8]: CHANGES-8.3
Log Message:
Tickets #1909 and #1910
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.201 -r1.1.2.202 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.201 src/doc/CHANGES-8.3:1.1.2.202
--- src/doc/CHANGES-8.3:1.1.2.201 Wed Oct 4 15:18:13 2023
+++ src/doc/CHANGES-8.3 Sun Oct 8 15:33:07 2023
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-8.3,v 1.1.2.201 2023/10/04 15:18:13 martin Exp $
+$NetBSD: CHANGES-8.3,v 1.1.2.202 2023/10/08 15:33:07 martin Exp $
A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3
release:
@@ -3955,3 +3955,32 @@ xsrc/external/mit/libX11/dist/src/xkb/XK
fixing: CVE-2023-43785, CVE-2023-43786, CVE-2023-43787, CVE-2023-43788,
CVE-2023-43789
[mrg, ticket #1908]
+
+sys/dev/pci/ixgbe/ixgbe.c 1.327-1.332 via patch
+sys/dev/pci/ixgbe/ixgbe.h 1.87-1.88
+sys/dev/pci/ixgbe/ixv.c 1.184-1.185
+sys/dev/pci/ixgbe/ix_txrx.c 1.101
+sys/dev/pci/ixgbe/ixgbe_82599.c 1.30
+sys/dev/pci/ixgbe/ixgbe_vf.c 1.32-1.33
+sys/dev/pci/ixgbe/ixgbe_vf.h 1.18
+sys/dev/pci/ixgbe/ixgbe_mbx.h 1.20
+sys/dev/pci/ixgbe/ixgbe_type.h 1.57
+
+ ixg(4):
+ - Reorder some event counters for readability.
+ - Rename some descriptions of event counters.
+ - Count Queue Bytes {Transmit, Receive} counter.
+ - Improve error check in ixgbe_check_mac_link_vf().
+ - Add new IXGBE_VF_GET_LINK_STATE message support.
+ The VF's link state can be forced to down by PF.
+ - Update FCTRL after writing multicast filter.
+ - Update comments.
+ [msaitoh, ticket #1909]
+
+sys/dev/pci/if_wm.c1.785-1.789
+
+ wm(4):
+ - Count SCVPC, HRMPC and IAC correctly.
+ - Modify some event counters' descriptions to clarify meaning.
+ [msaitoh, ticket #1910]
+
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 15:33:07 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1909 and #1910 To generate a diff of this commit: cvs rdiff -u -r1.1.2.201 -r1.1.2.202 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/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Oct 8 15:31:18 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1910): sys/dev/pci/if_wm.c: revision 1.785 sys/dev/pci/if_wm.c: revision 1.786 sys/dev/pci/if_wm.c: revision 1.787 sys/dev/pci/if_wm.c: revision 1.788 sys/dev/pci/if_wm.c: revision 1.789 wm(4): Use SCVPC and HRMPC for 82575 and newer. The SCVPC(SerDes/SGMII Code Violation Packet Count) register and the HRMPC (Header Redirection Missed Packet Count) register were added in if_wm.c rev. 1.776 but the location in the code were incorrect. Fix them. wm(4): Add some info to some event counters. - The difference between the RUC(Rx Undersize) and RFC(Rx Fragment) is whether the CRC is valid or not. - The difference between the ROC(Rx Oversize) and RJC(Rx Jabber) is whether the CRC is valid or not. - LENERRS(Length Errors) is for the length/type field <= 1500. wm(4): the IAC(Interrupt Assertion Count) register is for 82571 and newer. wm(4): Modify descriptions of flow control related event counters. wm(4): Replace /* nothing */ to __nothing for evcnt macros Prevent empty if bodies for !WM_EVENT_COUNTERS. To generate a diff of this commit: cvs rdiff -u -r1.508.4.51 -r1.508.4.52 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:31:18 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-8]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1910):
sys/dev/pci/if_wm.c: revision 1.785
sys/dev/pci/if_wm.c: revision 1.786
sys/dev/pci/if_wm.c: revision 1.787
sys/dev/pci/if_wm.c: revision 1.788
sys/dev/pci/if_wm.c: revision 1.789
wm(4): Use SCVPC and HRMPC for 82575 and newer.
The SCVPC(SerDes/SGMII Code Violation Packet Count) register and the HRMPC
(Header Redirection Missed Packet Count) register were added in if_wm.c
rev. 1.776 but the location in the code were incorrect. Fix them.
wm(4): Add some info to some event counters.
- The difference between the RUC(Rx Undersize) and RFC(Rx Fragment) is whether
the CRC is valid or not.
- The difference between the ROC(Rx Oversize) and RJC(Rx Jabber) is whether
the CRC is valid or not.
- LENERRS(Length Errors) is for the length/type field <= 1500.
wm(4): the IAC(Interrupt Assertion Count) register is for 82571 and newer.
wm(4): Modify descriptions of flow control related event counters.
wm(4): Replace /* nothing */ to __nothing for evcnt macros
Prevent empty if bodies for !WM_EVENT_COUNTERS.
To generate a diff of this commit:
cvs rdiff -u -r1.508.4.51 -r1.508.4.52 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.508.4.51 src/sys/dev/pci/if_wm.c:1.508.4.52
--- src/sys/dev/pci/if_wm.c:1.508.4.51 Mon Sep 4 17:57:49 2023
+++ src/sys/dev/pci/if_wm.c Sun Oct 8 15:31:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.508.4.51 2023/09/04 17:57:49 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.508.4.52 2023/10/08 15:31:17 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.51 2023/09/04 17:57:49 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.52 2023/10/08 15:31:17 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -770,13 +770,13 @@ do { \
#define WM_Q_EVCNT_ADD(qname, evname, val) \
WM_EVCNT_ADD(&(qname)->qname##_ev_##evname, (val))
#else /* !WM_EVENT_COUNTERS */
-#define WM_EVCNT_INCR(ev) /* nothing */
-#define WM_EVCNT_STORE(ev, val) /* nothing */
-#define WM_EVCNT_ADD(ev, val) /* nothing */
-
-#define WM_Q_EVCNT_INCR(qname, evname) /* nothing */
-#define WM_Q_EVCNT_STORE(qname, evname, val) /* nothing */
-#define WM_Q_EVCNT_ADD(qname, evname, val) /* nothing */
+#define WM_EVCNT_INCR(ev) __nothing
+#define WM_EVCNT_STORE(ev, val) __nothing
+#define WM_EVCNT_ADD(ev, val) __nothing
+
+#define WM_Q_EVCNT_INCR(qname, evname) __nothing
+#define WM_Q_EVCNT_STORE(qname, evname, val) __nothing
+#define WM_Q_EVCNT_ADD(qname, evname, val) __nothing
#endif /* !WM_EVENT_COUNTERS */
#define CSR_READ(sc, reg) \
@@ -3274,15 +3274,15 @@ alloc_retry:
if (sc->sc_type >= WM_T_82542_2_1) {
evcnt_attach_dynamic(>sc_ev_tx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xoff");
+ NULL, xname, "XOFF Transmitted");
evcnt_attach_dynamic(>sc_ev_tx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xon");
+ NULL, xname, "XON Transmitted");
evcnt_attach_dynamic(>sc_ev_rx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xoff");
+ NULL, xname, "XOFF Received");
evcnt_attach_dynamic(>sc_ev_rx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xon");
+ NULL, xname, "XON Received");
evcnt_attach_dynamic(>sc_ev_rx_macctl, EVCNT_TYPE_MISC,
- NULL, xname, "rx_macctl");
+ NULL, xname, "FC Received Unsupported");
}
evcnt_attach_dynamic(>sc_ev_scc, EVCNT_TYPE_MISC,
@@ -3327,13 +3327,13 @@ alloc_retry:
evcnt_attach_dynamic(>sc_ev_rnbc, EVCNT_TYPE_MISC,
NULL, xname, "Rx No Buffers");
evcnt_attach_dynamic(>sc_ev_ruc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Undersize");
+ NULL, xname, "Rx Undersize (valid CRC)");
evcnt_attach_dynamic(>sc_ev_rfc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Fragment");
+ NULL, xname, "Rx Fragment (bad CRC)");
evcnt_attach_dynamic(>sc_ev_roc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Oversize");
+ NULL, xname, "Rx Oversize (valid CRC)");
evcnt_attach_dynamic(>sc_ev_rjc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Jabber");
+ NULL, xname, "Rx Jabber (bad CRC)");
if (sc->sc_type >= WM_T_82540) {
evcnt_attach_dynamic(>sc_ev_mgtprc, EVCNT_TYPE_MISC,
NULL, xname, "Management Packets RX");
@@ -3366,8 +3366,9 @@ alloc_retry:
NULL, xname, "Multicast Packets Tx");
evcnt_attach_dynamic(>sc_ev_bptc, EVCNT_TYPE_MISC,
NULL, xname, "Broadcast Packets Tx");
- evcnt_attach_dynamic(>sc_ev_iac, EVCNT_TYPE_MISC,
- NULL, xname, "Interrupt Assertion");
+ if (sc->sc_type >= WM_T_82571) /* PCIe, 80003 and ICH/PCHs */
+
CVS commit: [netbsd-9] src/doc
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:30:06 UTC 2023
Modified Files:
src/doc [netbsd-9]: CHANGES-9.4
Log Message:
Tickets #1745 and #1746
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.105 -r1.1.2.106 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.105 src/doc/CHANGES-9.4:1.1.2.106
--- src/doc/CHANGES-9.4:1.1.2.105 Wed Oct 4 15:14:00 2023
+++ src/doc/CHANGES-9.4 Sun Oct 8 15:30:06 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.4,v 1.1.2.105 2023/10/04 15:14:00 martin Exp $
+# $NetBSD: CHANGES-9.4,v 1.1.2.106 2023/10/08 15:30:06 martin Exp $
A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4
release:
@@ -2213,3 +2213,32 @@ xsrc/external/mit/libX11/dist/src/xkb/XK
fixing: CVE-2023-43785, CVE-2023-43786, CVE-2023-43787, CVE-2023-43788,
CVE-2023-43789
[mrg, ticket #1744]
+
+sys/dev/pci/ixgbe/ix_txrx.c 1.101
+sys/dev/pci/ixgbe/ixgbe.c 1.327-1.332
+sys/dev/pci/ixgbe/ixgbe.h 1.87,1.88
+sys/dev/pci/ixgbe/ixgbe_82599.c 1.30
+sys/dev/pci/ixgbe/ixgbe_mbx.h 1.20
+sys/dev/pci/ixgbe/ixgbe_type.h 1.57
+sys/dev/pci/ixgbe/ixgbe_vf.c 1.32,1.33
+sys/dev/pci/ixgbe/ixgbe_vf.h 1.18
+sys/dev/pci/ixgbe/ixv.c 1.184,1.185
+
+ ixg(4):
+ - Reorder some event counters for readability.
+ - Rename some descriptions of event counters.
+ - Count Queue Bytes {Transmit, Receive} counter.
+ - Improve error check in ixgbe_check_mac_link_vf().
+ - Add new IXGBE_VF_GET_LINK_STATE message support.
+ The VF's link state can be forced to down by PF.
+ - Update FCTRL after writing multicast filter.
+ - Update comments.
+ [msaitoh, ticket #1745]
+
+sys/dev/pci/if_wm.c1.785-1.789
+
+ wm(4):
+ - Count SCVPC, HRMPC and IAC correctly.
+ - Modify some event counters' descriptions to clarify meaning.
+ [msaitoh, ticket #1746]
+
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 15:30:06 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1745 and #1746 To generate a diff of this commit: cvs rdiff -u -r1.1.2.105 -r1.1.2.106 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/pci
Module Name:src Committed By: martin Date: Sun Oct 8 15:28:49 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1746): sys/dev/pci/if_wm.c: revision 1.785 sys/dev/pci/if_wm.c: revision 1.786 sys/dev/pci/if_wm.c: revision 1.787 sys/dev/pci/if_wm.c: revision 1.788 sys/dev/pci/if_wm.c: revision 1.789 wm(4): Use SCVPC and HRMPC for 82575 and newer. The SCVPC(SerDes/SGMII Code Violation Packet Count) register and the HRMPC (Header Redirection Missed Packet Count) register were added in if_wm.c rev. 1.776 but the location in the code were incorrect. Fix them. wm(4): Add some info to some event counters. - The difference between the RUC(Rx Undersize) and RFC(Rx Fragment) is whether the CRC is valid or not. - The difference between the ROC(Rx Oversize) and RJC(Rx Jabber) is whether the CRC is valid or not. - LENERRS(Length Errors) is for the length/type field <= 1500. wm(4): the IAC(Interrupt Assertion Count) register is for 82571 and newer. wm(4): Modify descriptions of flow control related event counters. wm(4): Replace /* nothing */ to __nothing for evcnt macros Prevent empty if bodies for !WM_EVENT_COUNTERS. To generate a diff of this commit: cvs rdiff -u -r1.645.2.17 -r1.645.2.18 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:28:49 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1746):
sys/dev/pci/if_wm.c: revision 1.785
sys/dev/pci/if_wm.c: revision 1.786
sys/dev/pci/if_wm.c: revision 1.787
sys/dev/pci/if_wm.c: revision 1.788
sys/dev/pci/if_wm.c: revision 1.789
wm(4): Use SCVPC and HRMPC for 82575 and newer.
The SCVPC(SerDes/SGMII Code Violation Packet Count) register and the HRMPC
(Header Redirection Missed Packet Count) register were added in if_wm.c
rev. 1.776 but the location in the code were incorrect. Fix them.
wm(4): Add some info to some event counters.
- The difference between the RUC(Rx Undersize) and RFC(Rx Fragment) is whether
the CRC is valid or not.
- The difference between the ROC(Rx Oversize) and RJC(Rx Jabber) is whether
the CRC is valid or not.
- LENERRS(Length Errors) is for the length/type field <= 1500.
wm(4): the IAC(Interrupt Assertion Count) register is for 82571 and newer.
wm(4): Modify descriptions of flow control related event counters.
wm(4): Replace /* nothing */ to __nothing for evcnt macros
Prevent empty if bodies for !WM_EVENT_COUNTERS.
To generate a diff of this commit:
cvs rdiff -u -r1.645.2.17 -r1.645.2.18 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.17 src/sys/dev/pci/if_wm.c:1.645.2.18
--- src/sys/dev/pci/if_wm.c:1.645.2.17 Mon Sep 4 17:55:24 2023
+++ src/sys/dev/pci/if_wm.c Sun Oct 8 15:28:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645.2.17 2023/09/04 17:55:24 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.18 2023/10/08 15:28:49 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.17 2023/09/04 17:55:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.18 2023/10/08 15:28:49 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -789,13 +789,13 @@ do { \
#define WM_Q_EVCNT_ADD(qname, evname, val) \
WM_EVCNT_ADD(&(qname)->qname##_ev_##evname, (val))
#else /* !WM_EVENT_COUNTERS */
-#define WM_EVCNT_INCR(ev) /* nothing */
-#define WM_EVCNT_STORE(ev, val) /* nothing */
-#define WM_EVCNT_ADD(ev, val) /* nothing */
-
-#define WM_Q_EVCNT_INCR(qname, evname) /* nothing */
-#define WM_Q_EVCNT_STORE(qname, evname, val) /* nothing */
-#define WM_Q_EVCNT_ADD(qname, evname, val) /* nothing */
+#define WM_EVCNT_INCR(ev) __nothing
+#define WM_EVCNT_STORE(ev, val) __nothing
+#define WM_EVCNT_ADD(ev, val) __nothing
+
+#define WM_Q_EVCNT_INCR(qname, evname) __nothing
+#define WM_Q_EVCNT_STORE(qname, evname, val) __nothing
+#define WM_Q_EVCNT_ADD(qname, evname, val) __nothing
#endif /* !WM_EVENT_COUNTERS */
#define CSR_READ(sc, reg) \
@@ -3317,15 +3317,15 @@ alloc_retry:
if (sc->sc_type >= WM_T_82542_2_1) {
evcnt_attach_dynamic(>sc_ev_tx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xoff");
+ NULL, xname, "XOFF Transmitted");
evcnt_attach_dynamic(>sc_ev_tx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xon");
+ NULL, xname, "XON Transmitted");
evcnt_attach_dynamic(>sc_ev_rx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xoff");
+ NULL, xname, "XOFF Received");
evcnt_attach_dynamic(>sc_ev_rx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xon");
+ NULL, xname, "XON Received");
evcnt_attach_dynamic(>sc_ev_rx_macctl, EVCNT_TYPE_MISC,
- NULL, xname, "rx_macctl");
+ NULL, xname, "FC Received Unsupported");
}
evcnt_attach_dynamic(>sc_ev_scc, EVCNT_TYPE_MISC,
@@ -3370,13 +3370,13 @@ alloc_retry:
evcnt_attach_dynamic(>sc_ev_rnbc, EVCNT_TYPE_MISC,
NULL, xname, "Rx No Buffers");
evcnt_attach_dynamic(>sc_ev_ruc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Undersize");
+ NULL, xname, "Rx Undersize (valid CRC)");
evcnt_attach_dynamic(>sc_ev_rfc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Fragment");
+ NULL, xname, "Rx Fragment (bad CRC)");
evcnt_attach_dynamic(>sc_ev_roc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Oversize");
+ NULL, xname, "Rx Oversize (valid CRC)");
evcnt_attach_dynamic(>sc_ev_rjc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Jabber");
+ NULL, xname, "Rx Jabber (bad CRC)");
if (sc->sc_type >= WM_T_82540) {
evcnt_attach_dynamic(>sc_ev_mgtprc, EVCNT_TYPE_MISC,
NULL, xname, "Management Packets RX");
@@ -3409,8 +3409,9 @@ alloc_retry:
NULL, xname, "Multicast Packets Tx");
evcnt_attach_dynamic(>sc_ev_bptc, EVCNT_TYPE_MISC,
NULL, xname, "Broadcast Packets Tx");
- evcnt_attach_dynamic(>sc_ev_iac, EVCNT_TYPE_MISC,
- NULL, xname, "Interrupt Assertion");
+ if (sc->sc_type >= WM_T_82571) /* PCIe, 80003 and ICH/PCHs */
+
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 15:24:41 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #393 - #396 To generate a diff of this commit: cvs rdiff -u -r1.1.2.128 -r1.1.2.129 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.128 src/doc/CHANGES-10.0:1.1.2.129 --- src/doc/CHANGES-10.0:1.1.2.128 Wed Oct 4 12:31:48 2023 +++ src/doc/CHANGES-10.0 Sun Oct 8 15:24:41 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.128 2023/10/04 12:31:48 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.129 2023/10/08 15:24:41 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12138,3 +12138,133 @@ xsrc/external/mit/libXpm/dist/test/XpmWr CVE-2023-43785, CVE-2023-43786, CVE-2023-43787, CVE-2023-43788, CVE-2023-43789 [mrg, ticket #392] + +sys/dev/pci/pcidevs 1.1494 (patch) +sys/dev/pci/pcidevs.h (regen) +sys/dev/pci/pcidevs_data.h(regen) +sys/dev/pci/igc/if_igc.cup to 1.3 +sys/dev/pci/igc/if_igc.hup to 1.2 +sys/dev/pci/igc/igc_api.c up to 1.2 +sys/dev/pci/igc/igc_api.h up to 1.2 +sys/dev/pci/igc/igc_base.c up to 1.2 +sys/dev/pci/igc/igc_base.h up to 1.2 +sys/dev/pci/igc/igc_defines.h up to 1.2 +sys/dev/pci/igc/igc_evcnt.h up to 1.1 +sys/dev/pci/igc/igc_hw.hup to 1.2 +sys/dev/pci/igc/igc_i225.c up to 1.2 +sys/dev/pci/igc/igc_i225.h up to 1.2 +sys/dev/pci/igc/igc_mac.c up to 1.2 +sys/dev/pci/igc/igc_mac.h up to 1.2 +sys/dev/pci/igc/igc_nvm.c up to 1.2 +sys/dev/pci/igc/igc_nvm.h up to 1.2 +sys/dev/pci/igc/igc_phy.c up to 1.2 +sys/dev/pci/igc/igc_phy.h up to 1.2 +sys/dev/pci/igc/igc_regs.h up to 1.2 +distrib/sets/lists/man/mi 1.1766 +share/man/man4/Makefile1.733 +share/man/man4/igc.41.1 +sys/arch/amd64/conf/ALL1.181 +sys/arch/amd64/conf/GENERIC 1.606 +sys/arch/amd64/conf/XEN3_DOM0 1.200 +sys/arch/evbarm/conf/GENERIC64 1.213 +sys/arch/evbppc/conf/DHT 1.5 +sys/dev/pci/files.pci1.447 +doc/CHANGES (apply patch) + + Add igc(4) for Intel I225/I226 series ethernet devices. + [rin, ticket #393] + +external/gpl3/binutils/dist/gas/config/tc-vax.c 1.16-1.18 +external/gpl3/binutils/dist/gas/config/tc-vax.h 1.10 +tools/gcc/Makefile1.109 +external/gpl3/gcc.old/dist/gcc/config/vax/builtins.md 1.12,1.13 +external/gpl3/gcc.old/dist/gcc/config/vax/elf.h 1.12,1.13 +external/gpl3/gcc.old/dist/gcc/config/vax/vax.c 1.13-1.19 +external/gpl3/gcc.old/dist/gcc/config/vax/vax.md 1.12-1.18 +external/gpl3/gcc.old/dist/gcc/doc/tm.texi 1.12 +external/gpl3/gcc.old/dist/gcc/doc/tm.texi.in 1.10 +external/gpl3/gcc.old/dist/gcc/dse.c 1.14-1.16 +external/gpl3/gcc.old/dist/gcc/function.c 1.16 +external/gpl3/gcc.old/dist/gcc/recog.c 1.12 +external/gpl3/gcc.old/dist/gcc/reload.c 1.12 +external/gpl3/gcc.old/dist/gcc/rtlanal.c 1.14 +external/gpl3/gcc.old/dist/gcc/target.def 1.10 +external/gpl3/gcc.old/dist/gcc/targhooks.c 1.12 +external/gpl3/gcc.old/dist/gcc/targhooks.h 1.12 +external/gpl3/gcc.old/usr.bin/backend/Makefile 1.20 +crypto/external/bsd/openssh/lib/Makefile 1.38 (patch) +distrib/utils/x_ping/Makefile 1.9 (patch) +external/apache2/argon2/lib/libargon2/Makefile.inc 1.2 (patch) +external/bsd/jemalloc/lib/Makefile.inc 1.16 (patch) +external/bsd/mdocml/lib/libmandoc/Makefile 1.13 (patch) +external/gpl3/binutils.old/lib/libbfd/Makefile 1.10 (patch) +external/gpl3/binutils/lib/libbfd/Makefile 1.27 (patch) +external/gpl3/gcc.old/lib/Makefile.sanitizer 1.7 (patch) +external/gpl3/gcc.old/lib/libasan/Makefile 1.11 (patch) +external/gpl3/gcc.old/lib/liblsan/Makefile 1.7 (patch) +external/gpl3/gcc.old/lib/libubsan/Makefile 1.8 (patch) +external/gpl3/gcc.old/usr.bin/backend/Makefile 1.21 (patch) +external/gpl3/gcc.old/usr.bin/cc1/Makefile 1.12 (patch) +external/gpl3/gcc.old/usr.bin/cc1obj/Makefile 1.12,1.13 (patch) +external/gpl3/gcc.old/usr.bin/cc1objplus/Makefile 1.3 (patch) +external/gpl3/gcc.old/usr.bin/cc1plus/Makefile 1.13 (patch) +external/gpl3/gcc.old/usr.bin/gcc/Makefile 1.11 (patch) +external/gpl3/gcc.old/usr.bin/libdecnumber/Makefile 1.14 (patch) +external/gpl3/gcc.old/usr.bin/lto-dump/Makefile 1.3 (patch) +external/gpl3/gcc.old/usr.bin/lto1/Makefile 1.9 (patch) +external/gpl3/gdb.old/lib/libdecnumber/Makefile 1.10 (patch) +external/gpl3/gdb/lib/libdecnumber/Makefile 1.5 (patch) +external/gpl3/gdb/lib/libgdb/Makefile 1.36 (patch) +external/mit/xorg/lib/gallium.old/Makefile 1.8 (patch)
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Oct 8 15:24:41 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #393 - #396 To generate a diff of this commit: cvs rdiff -u -r1.1.2.128 -r1.1.2.129 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
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:23:26 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: if_wm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #396):
sys/dev/pci/if_wm.c: revision 1.785
sys/dev/pci/if_wm.c: revision 1.786
sys/dev/pci/if_wm.c: revision 1.787
sys/dev/pci/if_wm.c: revision 1.788
sys/dev/pci/if_wm.c: revision 1.789
wm(4): Use SCVPC and HRMPC for 82575 and newer.
The SCVPC(SerDes/SGMII Code Violation Packet Count) register and the HRMPC
(Header Redirection Missed Packet Count) register were added in if_wm.c
rev. 1.776 but the location in the code were incorrect. Fix them.
wm(4): Add some info to some event counters.
- The difference between the RUC(Rx Undersize) and RFC(Rx Fragment) is whether
the CRC is valid or not.
- The difference between the ROC(Rx Oversize) and RJC(Rx Jabber) is whether
the CRC is valid or not.
- LENERRS(Length Errors) is for the length/type field <= 1500.
wm(4): the IAC(Interrupt Assertion Count) register is for 82571 and newer.
wm(4): Modify descriptions of flow control related event counters.
wm(4): Replace /* nothing */ to __nothing for evcnt macros
Prevent empty if bodies for !WM_EVENT_COUNTERS.
To generate a diff of this commit:
cvs rdiff -u -r1.767.2.3 -r1.767.2.4 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.767.2.3 src/sys/dev/pci/if_wm.c:1.767.2.4
--- src/sys/dev/pci/if_wm.c:1.767.2.3 Mon Sep 4 17:45:24 2023
+++ src/sys/dev/pci/if_wm.c Sun Oct 8 15:23:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.767.2.3 2023/09/04 17:45:24 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.767.2.4 2023/10/08 15:23:26 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.767.2.3 2023/09/04 17:45:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.767.2.4 2023/10/08 15:23:26 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_wm.h"
@@ -779,13 +779,13 @@ do { \
#define WM_Q_EVCNT_ADD(qname, evname, val) \
WM_EVCNT_ADD(&(qname)->qname##_ev_##evname, (val))
#else /* !WM_EVENT_COUNTERS */
-#define WM_EVCNT_INCR(ev) /* nothing */
-#define WM_EVCNT_STORE(ev, val) /* nothing */
-#define WM_EVCNT_ADD(ev, val) /* nothing */
-
-#define WM_Q_EVCNT_INCR(qname, evname) /* nothing */
-#define WM_Q_EVCNT_STORE(qname, evname, val) /* nothing */
-#define WM_Q_EVCNT_ADD(qname, evname, val) /* nothing */
+#define WM_EVCNT_INCR(ev) __nothing
+#define WM_EVCNT_STORE(ev, val) __nothing
+#define WM_EVCNT_ADD(ev, val) __nothing
+
+#define WM_Q_EVCNT_INCR(qname, evname) __nothing
+#define WM_Q_EVCNT_STORE(qname, evname, val) __nothing
+#define WM_Q_EVCNT_ADD(qname, evname, val) __nothing
#endif /* !WM_EVENT_COUNTERS */
#define CSR_READ(sc, reg) \
@@ -3308,15 +3308,15 @@ alloc_retry:
if (sc->sc_type >= WM_T_82542_2_1) {
evcnt_attach_dynamic(>sc_ev_tx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xoff");
+ NULL, xname, "XOFF Transmitted");
evcnt_attach_dynamic(>sc_ev_tx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "tx_xon");
+ NULL, xname, "XON Transmitted");
evcnt_attach_dynamic(>sc_ev_rx_xoff, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xoff");
+ NULL, xname, "XOFF Received");
evcnt_attach_dynamic(>sc_ev_rx_xon, EVCNT_TYPE_MISC,
- NULL, xname, "rx_xon");
+ NULL, xname, "XON Received");
evcnt_attach_dynamic(>sc_ev_rx_macctl, EVCNT_TYPE_MISC,
- NULL, xname, "rx_macctl");
+ NULL, xname, "FC Received Unsupported");
}
evcnt_attach_dynamic(>sc_ev_scc, EVCNT_TYPE_MISC,
@@ -3361,13 +3361,13 @@ alloc_retry:
evcnt_attach_dynamic(>sc_ev_rnbc, EVCNT_TYPE_MISC,
NULL, xname, "Rx No Buffers");
evcnt_attach_dynamic(>sc_ev_ruc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Undersize");
+ NULL, xname, "Rx Undersize (valid CRC)");
evcnt_attach_dynamic(>sc_ev_rfc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Fragment");
+ NULL, xname, "Rx Fragment (bad CRC)");
evcnt_attach_dynamic(>sc_ev_roc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Oversize");
+ NULL, xname, "Rx Oversize (valid CRC)");
evcnt_attach_dynamic(>sc_ev_rjc, EVCNT_TYPE_MISC,
- NULL, xname, "Rx Jabber");
+ NULL, xname, "Rx Jabber (bad CRC)");
if (sc->sc_type >= WM_T_82540) {
evcnt_attach_dynamic(>sc_ev_mgtprc, EVCNT_TYPE_MISC,
NULL, xname, "Management Packets RX");
@@ -3400,8 +3400,9 @@ alloc_retry:
NULL, xname, "Multicast Packets Tx");
evcnt_attach_dynamic(>sc_ev_bptc, EVCNT_TYPE_MISC,
NULL, xname, "Broadcast Packets Tx");
- evcnt_attach_dynamic(>sc_ev_iac, EVCNT_TYPE_MISC,
- NULL, xname, "Interrupt Assertion");
+ if (sc->sc_type >= WM_T_82571) /* PCIe, 80003 and ICH/PCHs */
+
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Oct 8 15:23:26 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: if_wm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #396): sys/dev/pci/if_wm.c: revision 1.785 sys/dev/pci/if_wm.c: revision 1.786 sys/dev/pci/if_wm.c: revision 1.787 sys/dev/pci/if_wm.c: revision 1.788 sys/dev/pci/if_wm.c: revision 1.789 wm(4): Use SCVPC and HRMPC for 82575 and newer. The SCVPC(SerDes/SGMII Code Violation Packet Count) register and the HRMPC (Header Redirection Missed Packet Count) register were added in if_wm.c rev. 1.776 but the location in the code were incorrect. Fix them. wm(4): Add some info to some event counters. - The difference between the RUC(Rx Undersize) and RFC(Rx Fragment) is whether the CRC is valid or not. - The difference between the ROC(Rx Oversize) and RJC(Rx Jabber) is whether the CRC is valid or not. - LENERRS(Length Errors) is for the length/type field <= 1500. wm(4): the IAC(Interrupt Assertion Count) register is for 82571 and newer. wm(4): Modify descriptions of flow control related event counters. wm(4): Replace /* nothing */ to __nothing for evcnt macros Prevent empty if bodies for !WM_EVENT_COUNTERS. To generate a diff of this commit: cvs rdiff -u -r1.767.2.3 -r1.767.2.4 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:19:32 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82599.c ixgbe_mbx.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1745):
sys/dev/pci/ixgbe/ixgbe.c 1.327-1.332 via patch
sys/dev/pci/ixgbe/ixgbe.h 1.87-1.88
sys/dev/pci/ixgbe/ixv.c 1.184-1.185
sys/dev/pci/ixgbe/ix_txrx.c 1.101
sys/dev/pci/ixgbe/ixgbe_82599.c 1.30
sys/dev/pci/ixgbe/ixgbe_vf.c1.32-1.33
sys/dev/pci/ixgbe/ixgbe_vf.h1.18
sys/dev/pci/ixgbe/ixgbe_mbx.h 1.20
sys/dev/pci/ixgbe/ixgbe_type.h 1.57
- Reorder some event counters for readability.
- Rename some descriptions of event counters.
- Count Queue Bytes {Transmit, Receive} counter.
- Improve error check in ixgbe_check_mac_link_vf().
- Add new IXGBE_VF_GET_LINK_STATE message support.
The VF's link state can be forced to down by PF.
- Update FCTRL after writing multicast filter.
- Update comments.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.27 -r1.24.2.28 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.55 -r1.88.2.56 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.26 -r1.24.6.27 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.14.8.9 -r1.14.8.10 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.10.8.5 -r1.10.8.6 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.22.2.18 -r1.22.2.19 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.12.8.9 -r1.12.8.10 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.8.6.6 -r1.8.6.7 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.56.2.40 -r1.56.2.41 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:19:32 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82599.c ixgbe_mbx.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1745):
sys/dev/pci/ixgbe/ixgbe.c 1.327-1.332 via patch
sys/dev/pci/ixgbe/ixgbe.h 1.87-1.88
sys/dev/pci/ixgbe/ixv.c 1.184-1.185
sys/dev/pci/ixgbe/ix_txrx.c 1.101
sys/dev/pci/ixgbe/ixgbe_82599.c 1.30
sys/dev/pci/ixgbe/ixgbe_vf.c1.32-1.33
sys/dev/pci/ixgbe/ixgbe_vf.h1.18
sys/dev/pci/ixgbe/ixgbe_mbx.h 1.20
sys/dev/pci/ixgbe/ixgbe_type.h 1.57
- Reorder some event counters for readability.
- Rename some descriptions of event counters.
- Count Queue Bytes {Transmit, Receive} counter.
- Improve error check in ixgbe_check_mac_link_vf().
- Add new IXGBE_VF_GET_LINK_STATE message support.
The VF's link state can be forced to down by PF.
- Update FCTRL after writing multicast filter.
- Update comments.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.27 -r1.24.2.28 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.55 -r1.88.2.56 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.26 -r1.24.6.27 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.14.8.9 -r1.14.8.10 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.10.8.5 -r1.10.8.6 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.22.2.18 -r1.22.2.19 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.12.8.9 -r1.12.8.10 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.8.6.6 -r1.8.6.7 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.56.2.40 -r1.56.2.41 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.27 src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.28
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.27 Mon Jan 23 14:07:24 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Sun Oct 8 15:19:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.24.2.27 2023/01/23 14:07:24 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.24.2.28 2023/10/08 15:19:31 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.24.2.27 2023/01/23 14:07:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.24.2.28 2023/10/08 15:19:31 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1341,11 +1341,6 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr)
* exhaustion are unnecessary, if an mbuf cannot be obtained
* it just returns, keeping its placeholder, thus it can simply
* be recalled to try again.
- *
- * XXX NetBSD TODO:
- *- The ixgbe_rxeof() function always preallocates mbuf cluster,
- * so the ixgbe_refresh_mbufs() function can be simplified.
- *
/
static void
ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit)
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.55 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.56
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.55 Wed Jun 21 19:28:12 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sun Oct 8 15:19:31 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.88.2.55 2023/06/21 19:28:12 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.88.2.56 2023/10/08 15:19:31 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.88.2.55 2023/06/21 19:28:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixgbe.c,v 1.88.2.56 2023/10/08 15:19:31 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1601,8 +1601,19 @@ ixgbe_update_stats_counters(struct adapt
for (i = 0; i < queue_counters; i++) {
IXGBE_EVC_REGADD(hw, stats, IXGBE_QPRC(i), qprc[i]);
IXGBE_EVC_REGADD(hw, stats, IXGBE_QPTC(i), qptc[i]);
- if (hw->mac.type >= ixgbe_mac_82599EB)
+ if (hw->mac.type >= ixgbe_mac_82599EB) {
+ IXGBE_EVC_ADD(>qbrc[i],
+ IXGBE_READ_REG(hw, IXGBE_QBRC_L(i)) +
+ ((u64)IXGBE_READ_REG(hw, IXGBE_QBRC_H(i)) << 32));
+ IXGBE_EVC_ADD(>qbtc[i],
+ IXGBE_READ_REG(hw, IXGBE_QBTC_L(i)) +
+ ((u64)IXGBE_READ_REG(hw, IXGBE_QBTC_H(i)) << 32));
IXGBE_EVC_REGADD(hw, stats, IXGBE_QPRDC(i), qprdc[i]);
+ } else {
+ /* 82598 */
+ IXGBE_EVC_REGADD(hw, stats, IXGBE_QBRC(i), qbrc[i]);
+ IXGBE_EVC_REGADD(hw, stats, IXGBE_QBTC(i), qbtc[i]);
+ }
}
/* 8 registers exist */
@@ -1813,28 +1824,28 @@ ixgbe_add_hw_stats(struct adapter *adapt
if (i < __arraycount(stats->pxontxc)) {
CVS commit: [netbsd-9] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:13:10 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82599.c ixgbe_mbx.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1745):
sys/dev/pci/ixgbe/ixgbe_82599.c: revision 1.30
sys/dev/pci/ixgbe/ixv.c: revision 1.184
sys/dev/pci/ixgbe/ixv.c: revision 1.185
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.32
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.33
sys/dev/pci/ixgbe/ixgbe.h: revision 1.87
sys/dev/pci/ixgbe/ixgbe.h: revision 1.88
sys/dev/pci/ixgbe/ixgbe.c: revision 1.330
sys/dev/pci/ixgbe/ixgbe.c: revision 1.331
sys/dev/pci/ixgbe/ixgbe.c: revision 1.332
sys/dev/pci/ixgbe/ixgbe_vf.h: revision 1.18
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.101
sys/dev/pci/ixgbe/ixgbe_type.h: revision 1.57
sys/dev/pci/ixgbe/ixgbe_mbx.h: revision 1.20
sys/dev/pci/ixgbe/ixgbe.c: revision 1.327
sys/dev/pci/ixgbe/ixgbe.c: revision 1.328
sys/dev/pci/ixgbe/ixgbe.c: revision 1.329
ixgbe: Reorder some event counters for readability.
ixg(4): Rename some descriptions of event counters.
- Rename some descriptions from register name to the meaning.
- For the same meaning's counters, add "(soft)" or "(reg)".
The former is for a software level counter and the latter is for a
statistics counter register based.
ixg(4): Count Queue Bytes {Transmit, Receive} counter.
ixg(4): Reorder some flow control related event counters for readability.
ixg(4): Rename some descriptions of flow control related event conters.
Remove obsolete comment.
ixgbe: Fix typo in comment. No functional change.
ixv(4): Improve error check.
ixgbe_vf.c rev. 1.31 changed the behavior of the ixgbe_check_mac_link_vf()
function. It was from FreeBSD's ixv-1.5.25 to resolve mailbox collision
problem. The change had a problem that error checks have not done at all if
the API version >= 1.5. Fix it. From FreeBSD ixv-1.5.27.
ixv(4): Add new IXGBE_VF_GET_LINK_STATE message support.
PF can control vf's link state by this change. Note that Linux's PF driver
can't control the link to force up (i.e. ip link set XXX vf Y state enable).
>From FreeBSD ixv-1.5.30.
ixg(4): Update FCTRL after writing multicast filter. Same as other OSes.
From FreeBSD 395cc55d896654b8f75071e71e856b22aed87da5.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.11 -r1.54.2.12 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.26 -r1.199.2.27 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.56.2.9 -r1.56.2.10 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.21.4.4 -r1.21.4.5 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.41.2.8 -r1.41.2.9 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.18.2.6 -r1.18.2.7 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.13.8.3 -r1.13.8.4 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.125.2.21 -r1.125.2.22 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.11 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.12
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.11 Mon Jan 23 14:04:42 2023
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Sun Oct 8 15:13:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.54.2.11 2023/01/23 14:04:42 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.12 2023/10/08 15:13:09 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.11 2023/01/23 14:04:42 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.54.2.12 2023/10/08 15:13:09 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1341,11 +1341,6 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr)
* exhaustion are unnecessary, if an mbuf cannot be obtained
* it just returns, keeping its placeholder, thus it can simply
* be recalled to try again.
- *
- * XXX NetBSD TODO:
- *- The ixgbe_rxeof() function always preallocates mbuf cluster,
- * so the ixgbe_refresh_mbufs() function can be simplified.
- *
/
static void
ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit)
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.26 src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.27
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.26 Wed Jun 21 19:20:50 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sun Oct 8 15:13:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.199.2.26 2023/06/21 19:20:50 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.199.2.27 2023/10/08 15:13:09 martin Exp
CVS commit: [netbsd-9] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:13:10 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82599.c ixgbe_mbx.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1745):
sys/dev/pci/ixgbe/ixgbe_82599.c: revision 1.30
sys/dev/pci/ixgbe/ixv.c: revision 1.184
sys/dev/pci/ixgbe/ixv.c: revision 1.185
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.32
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.33
sys/dev/pci/ixgbe/ixgbe.h: revision 1.87
sys/dev/pci/ixgbe/ixgbe.h: revision 1.88
sys/dev/pci/ixgbe/ixgbe.c: revision 1.330
sys/dev/pci/ixgbe/ixgbe.c: revision 1.331
sys/dev/pci/ixgbe/ixgbe.c: revision 1.332
sys/dev/pci/ixgbe/ixgbe_vf.h: revision 1.18
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.101
sys/dev/pci/ixgbe/ixgbe_type.h: revision 1.57
sys/dev/pci/ixgbe/ixgbe_mbx.h: revision 1.20
sys/dev/pci/ixgbe/ixgbe.c: revision 1.327
sys/dev/pci/ixgbe/ixgbe.c: revision 1.328
sys/dev/pci/ixgbe/ixgbe.c: revision 1.329
ixgbe: Reorder some event counters for readability.
ixg(4): Rename some descriptions of event counters.
- Rename some descriptions from register name to the meaning.
- For the same meaning's counters, add "(soft)" or "(reg)".
The former is for a software level counter and the latter is for a
statistics counter register based.
ixg(4): Count Queue Bytes {Transmit, Receive} counter.
ixg(4): Reorder some flow control related event counters for readability.
ixg(4): Rename some descriptions of flow control related event conters.
Remove obsolete comment.
ixgbe: Fix typo in comment. No functional change.
ixv(4): Improve error check.
ixgbe_vf.c rev. 1.31 changed the behavior of the ixgbe_check_mac_link_vf()
function. It was from FreeBSD's ixv-1.5.25 to resolve mailbox collision
problem. The change had a problem that error checks have not done at all if
the API version >= 1.5. Fix it. From FreeBSD ixv-1.5.27.
ixv(4): Add new IXGBE_VF_GET_LINK_STATE message support.
PF can control vf's link state by this change. Note that Linux's PF driver
can't control the link to force up (i.e. ip link set XXX vf Y state enable).
>From FreeBSD ixv-1.5.30.
ixg(4): Update FCTRL after writing multicast filter. Same as other OSes.
From FreeBSD 395cc55d896654b8f75071e71e856b22aed87da5.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.11 -r1.54.2.12 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.26 -r1.199.2.27 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.56.2.9 -r1.56.2.10 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.21.4.4 -r1.21.4.5 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.14.2.2 -r1.14.2.3 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.41.2.8 -r1.41.2.9 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.18.2.6 -r1.18.2.7 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.13.8.3 -r1.13.8.4 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.125.2.21 -r1.125.2.22 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/ddb
Module Name:src
Committed By: martin
Date: Sun Oct 8 15:03:16 UTC 2023
Modified Files:
src/sys/ddb: db_xxx.c
Log Message:
For architectures (mips64) where sizeof(db_expr_t) != sizeof(kcondvar_t *)
cast through uintptr_t.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/ddb/db_xxx.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/ddb/db_xxx.c
diff -u src/sys/ddb/db_xxx.c:1.76 src/sys/ddb/db_xxx.c:1.77
--- src/sys/ddb/db_xxx.c:1.76 Sat Oct 7 20:27:20 2023
+++ src/sys/ddb/db_xxx.c Sun Oct 8 15:03:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: db_xxx.c,v 1.76 2023/10/07 20:27:20 ad Exp $ */
+/* $NetBSD: db_xxx.c,v 1.77 2023/10/08 15:03:16 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1.76 2023/10/07 20:27:20 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_xxx.c,v 1.77 2023/10/08 15:03:16 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_kgdb.h"
@@ -332,7 +332,7 @@ db_show_panic(db_expr_t addr, bool haddr
void
db_show_condvar(db_expr_t addr, bool haddr, db_expr_t count, const char *modif)
{
- kcondvar_t *cv = (kcondvar_t *)addr;
+ kcondvar_t *cv = (kcondvar_t *)(uintptr_t)addr;
char buf[9], *wmesg;
/* XXX messing with kcondvar_t guts without defs */
CVS commit: src/sys/ddb
Module Name:src Committed By: martin Date: Sun Oct 8 15:03:16 UTC 2023 Modified Files: src/sys/ddb: db_xxx.c Log Message: For architectures (mips64) where sizeof(db_expr_t) != sizeof(kcondvar_t *) cast through uintptr_t. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/ddb/db_xxx.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/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Oct 8 14:57:54 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-10]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82599.c ixgbe_mbx.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #395):
sys/dev/pci/ixgbe/ixgbe_82599.c: revision 1.30
sys/dev/pci/ixgbe/ixv.c: revision 1.184
sys/dev/pci/ixgbe/ixv.c: revision 1.185
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.32
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.33
sys/dev/pci/ixgbe/ixgbe.h: revision 1.87
sys/dev/pci/ixgbe/ixgbe.h: revision 1.88
sys/dev/pci/ixgbe/ixgbe.c: revision 1.330
sys/dev/pci/ixgbe/ixgbe.c: revision 1.331
sys/dev/pci/ixgbe/ixgbe.c: revision 1.332
sys/dev/pci/ixgbe/ixgbe_vf.h: revision 1.18
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.101
sys/dev/pci/ixgbe/ixgbe_type.h: revision 1.57
sys/dev/pci/ixgbe/ixgbe_mbx.h: revision 1.20
sys/dev/pci/ixgbe/ixgbe.c: revision 1.327
sys/dev/pci/ixgbe/ixgbe.c: revision 1.328
sys/dev/pci/ixgbe/ixgbe.c: revision 1.329
ixgbe: Reorder some event counters for readability.
ixg(4): Rename some descriptions of event counters.
- Rename some descriptions from register name to the meaning.
- For the same meaning's counters, add "(soft)" or "(reg)".
The former is for a software level counter and the latter is for a
statistics counter register based.
ixg(4): Count Queue Bytes {Transmit, Receive} counter.
ixg(4): Reorder some flow control related event counters for readability.
ixg(4): Rename some descriptions of flow control related event conters.
Remove obsolete comment.
ixgbe: Fix typo in comment. No functional change.
ixv(4): Improve error check.
ixgbe_vf.c rev. 1.31 changed the behavior of the ixgbe_check_mac_link_vf()
function. It was from FreeBSD's ixv-1.5.25 to resolve mailbox collision
problem. The change had a problem that error checks have not done at all if
the API version >= 1.5. Fix it. From FreeBSD ixv-1.5.27.
ixv(4): Add new IXGBE_VF_GET_LINK_STATE message support.
PF can control vf's link state by this change. Note that Linux's PF driver
can't control the link to force up (i.e. ip link set XXX vf Y state enable).
>From FreeBSD ixv-1.5.30.
ixg(4): Update FCTRL after writing multicast filter. Same as other OSes.
From FreeBSD 395cc55d896654b8f75071e71e856b22aed87da5.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.100.4.1 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.324.2.1 -r1.324.2.2 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.86 -r1.86.4.1 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.55.4.1 -r1.55.4.2 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.17 -r1.17.4.1 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.183 -r1.183.4.1 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.100 src/sys/dev/pci/ixgbe/ix_txrx.c:1.100.4.1
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.100 Fri Sep 16 03:05:51 2022
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Sun Oct 8 14:57:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.100 2022/09/16 03:05:51 knakahara Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.100.4.1 2023/10/08 14:57:53 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.100 2022/09/16 03:05:51 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.100.4.1 2023/10/08 14:57:53 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1334,11 +1334,6 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr)
* exhaustion are unnecessary, if an mbuf cannot be obtained
* it just returns, keeping its placeholder, thus it can simply
* be recalled to try again.
- *
- * XXX NetBSD TODO:
- *- The ixgbe_rxeof() function always preallocates mbuf cluster,
- * so the ixgbe_refresh_mbufs() function can be simplified.
- *
/
static void
ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit)
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.324.2.1 src/sys/dev/pci/ixgbe/ixgbe.c:1.324.2.2
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.324.2.1 Wed Jun 21 19:16:12 2023
+++ src/sys/dev/pci/ixgbe/ixgbe.c Sun Oct 8 14:57:53 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.324.2.1 2023/06/21 19:16:12 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.324.2.2 2023/10/08 14:57:53 martin Exp $ */
CVS commit: [netbsd-10] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Sun Oct 8 14:57:54 UTC 2023
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-10]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82599.c ixgbe_mbx.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h ixv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #395):
sys/dev/pci/ixgbe/ixgbe_82599.c: revision 1.30
sys/dev/pci/ixgbe/ixv.c: revision 1.184
sys/dev/pci/ixgbe/ixv.c: revision 1.185
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.32
sys/dev/pci/ixgbe/ixgbe_vf.c: revision 1.33
sys/dev/pci/ixgbe/ixgbe.h: revision 1.87
sys/dev/pci/ixgbe/ixgbe.h: revision 1.88
sys/dev/pci/ixgbe/ixgbe.c: revision 1.330
sys/dev/pci/ixgbe/ixgbe.c: revision 1.331
sys/dev/pci/ixgbe/ixgbe.c: revision 1.332
sys/dev/pci/ixgbe/ixgbe_vf.h: revision 1.18
sys/dev/pci/ixgbe/ix_txrx.c: revision 1.101
sys/dev/pci/ixgbe/ixgbe_type.h: revision 1.57
sys/dev/pci/ixgbe/ixgbe_mbx.h: revision 1.20
sys/dev/pci/ixgbe/ixgbe.c: revision 1.327
sys/dev/pci/ixgbe/ixgbe.c: revision 1.328
sys/dev/pci/ixgbe/ixgbe.c: revision 1.329
ixgbe: Reorder some event counters for readability.
ixg(4): Rename some descriptions of event counters.
- Rename some descriptions from register name to the meaning.
- For the same meaning's counters, add "(soft)" or "(reg)".
The former is for a software level counter and the latter is for a
statistics counter register based.
ixg(4): Count Queue Bytes {Transmit, Receive} counter.
ixg(4): Reorder some flow control related event counters for readability.
ixg(4): Rename some descriptions of flow control related event conters.
Remove obsolete comment.
ixgbe: Fix typo in comment. No functional change.
ixv(4): Improve error check.
ixgbe_vf.c rev. 1.31 changed the behavior of the ixgbe_check_mac_link_vf()
function. It was from FreeBSD's ixv-1.5.25 to resolve mailbox collision
problem. The change had a problem that error checks have not done at all if
the API version >= 1.5. Fix it. From FreeBSD ixv-1.5.27.
ixv(4): Add new IXGBE_VF_GET_LINK_STATE message support.
PF can control vf's link state by this change. Note that Linux's PF driver
can't control the link to force up (i.e. ip link set XXX vf Y state enable).
>From FreeBSD ixv-1.5.30.
ixg(4): Update FCTRL after writing multicast filter. Same as other OSes.
From FreeBSD 395cc55d896654b8f75071e71e856b22aed87da5.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.100.4.1 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.324.2.1 -r1.324.2.2 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.86 -r1.86.4.1 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.29 -r1.29.4.1 src/sys/dev/pci/ixgbe/ixgbe_82599.c
cvs rdiff -u -r1.19 -r1.19.4.1 src/sys/dev/pci/ixgbe/ixgbe_mbx.h
cvs rdiff -u -r1.55.4.1 -r1.55.4.2 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.31 -r1.31.4.1 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.17 -r1.17.4.1 src/sys/dev/pci/ixgbe/ixgbe_vf.h
cvs rdiff -u -r1.183 -r1.183.4.1 src/sys/dev/pci/ixgbe/ixv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Oct 8 14:35:24 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/lib [netbsd-10]: Makefile src/distrib/utils/x_ping [netbsd-10]: Makefile src/doc [netbsd-10]: CHANGES src/external/apache2/argon2/lib/libargon2 [netbsd-10]: Makefile.inc src/external/bsd/jemalloc/lib [netbsd-10]: Makefile.inc src/external/bsd/mdocml/lib/libmandoc [netbsd-10]: Makefile src/external/gpl3/binutils.old/lib/libbfd [netbsd-10]: Makefile src/external/gpl3/binutils/dist/gas/config [netbsd-10]: tc-vax.c tc-vax.h src/external/gpl3/binutils/lib/libbfd [netbsd-10]: Makefile src/external/gpl3/gcc/dist/gcc [netbsd-10]: dse.c function.c recog.c reload.c rtlanal.c target.def targhooks.c targhooks.h src/external/gpl3/gcc/dist/gcc/config/vax [netbsd-10]: builtins.md elf.h vax.c vax.md src/external/gpl3/gcc/dist/gcc/doc [netbsd-10]: tm.texi tm.texi.in src/external/gpl3/gcc/lib [netbsd-10]: Makefile.sanitizer src/external/gpl3/gcc/lib/libasan [netbsd-10]: Makefile src/external/gpl3/gcc/lib/liblsan [netbsd-10]: Makefile src/external/gpl3/gcc/lib/libubsan [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/backend [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1 [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1obj [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1objplus [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1plus [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/gcc [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/libdecnumber [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/lto-dump [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/lto1 [netbsd-10]: Makefile src/external/gpl3/gdb.old/lib/libdecnumber [netbsd-10]: Makefile src/external/gpl3/gdb/lib/libdecnumber [netbsd-10]: Makefile src/external/gpl3/gdb/lib/libgdb [netbsd-10]: Makefile src/external/mit/xorg/lib/gallium [netbsd-10]: Makefile src/external/mit/xorg/lib/gallium.old [netbsd-10]: Makefile src/external/mit/xorg/lib/libX11 [netbsd-10]: Makefile.libx11 src/games/gomoku [netbsd-10]: Makefile src/games/phantasia [netbsd-10]: Makefile src/lib/i18n_module/UTF7 [netbsd-10]: Makefile src/lib/libbz2 [netbsd-10]: Makefile src/lib/libc/gdtoa [netbsd-10]: Makefile.inc src/lib/libcrypt [netbsd-10]: Makefile src/libexec/ld.elf_so [netbsd-10]: Makefile src/sbin/fsck_ffs [netbsd-10]: Makefile.common src/sbin/fsdb [netbsd-10]: Makefile src/sbin/newfs_ext2fs [netbsd-10]: Makefile src/sbin/ping [netbsd-10]: Makefile src/sys/arch/vax/conf [netbsd-10]: Makefile.vax src/sys/lib/libsa [netbsd-10]: Makefile src/sys/lib/libz [netbsd-10]: Makefile src/sys/modules/lfs [netbsd-10]: Makefile src/sys/rump/fs/lib/liblfs [netbsd-10]: Makefile src/tools/gcc [netbsd-10]: Makefile src/usr.sbin/mtrace [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by rin in ticket #394): external/gpl3/binutils/dist/gas/config/tc-vax.h: revision 1.10 tools/gcc/Makefile: revision 1.109 external/gpl3/binutils/dist/gas/config/tc-vax.c: revision 1.16 external/gpl3/binutils/dist/gas/config/tc-vax.c: revision 1.17 external/gpl3/binutils/dist/gas/config/tc-vax.c: revision 1.18 external/gpl3/gcc.old/dist/gcc/recog.c: revision 1.12 external/gpl3/gcc.old/dist/gcc/function.c: revision 1.16 external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.14 - 1.16 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.13 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.14 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.15 external/gpl3/gcc.old/dist/gcc/doc/tm.texi.in: revision 1.10 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.16 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.17 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.18 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.19 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.12 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.13 external/gpl3/gcc.old/usr.bin/backend/Makefile: revision 1.20 external/gpl3/gcc.old/dist/gcc/targhooks.c: revision 1.12 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.14 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.15 external/gpl3/gcc.old/dist/gcc/config/vax/builtins.md: revision 1.12 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.16
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Oct 8 14:35:24 UTC 2023 Modified Files: src/crypto/external/bsd/openssh/lib [netbsd-10]: Makefile src/distrib/utils/x_ping [netbsd-10]: Makefile src/doc [netbsd-10]: CHANGES src/external/apache2/argon2/lib/libargon2 [netbsd-10]: Makefile.inc src/external/bsd/jemalloc/lib [netbsd-10]: Makefile.inc src/external/bsd/mdocml/lib/libmandoc [netbsd-10]: Makefile src/external/gpl3/binutils.old/lib/libbfd [netbsd-10]: Makefile src/external/gpl3/binutils/dist/gas/config [netbsd-10]: tc-vax.c tc-vax.h src/external/gpl3/binutils/lib/libbfd [netbsd-10]: Makefile src/external/gpl3/gcc/dist/gcc [netbsd-10]: dse.c function.c recog.c reload.c rtlanal.c target.def targhooks.c targhooks.h src/external/gpl3/gcc/dist/gcc/config/vax [netbsd-10]: builtins.md elf.h vax.c vax.md src/external/gpl3/gcc/dist/gcc/doc [netbsd-10]: tm.texi tm.texi.in src/external/gpl3/gcc/lib [netbsd-10]: Makefile.sanitizer src/external/gpl3/gcc/lib/libasan [netbsd-10]: Makefile src/external/gpl3/gcc/lib/liblsan [netbsd-10]: Makefile src/external/gpl3/gcc/lib/libubsan [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/backend [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1 [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1obj [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1objplus [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/cc1plus [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/gcc [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/libdecnumber [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/lto-dump [netbsd-10]: Makefile src/external/gpl3/gcc/usr.bin/lto1 [netbsd-10]: Makefile src/external/gpl3/gdb.old/lib/libdecnumber [netbsd-10]: Makefile src/external/gpl3/gdb/lib/libdecnumber [netbsd-10]: Makefile src/external/gpl3/gdb/lib/libgdb [netbsd-10]: Makefile src/external/mit/xorg/lib/gallium [netbsd-10]: Makefile src/external/mit/xorg/lib/gallium.old [netbsd-10]: Makefile src/external/mit/xorg/lib/libX11 [netbsd-10]: Makefile.libx11 src/games/gomoku [netbsd-10]: Makefile src/games/phantasia [netbsd-10]: Makefile src/lib/i18n_module/UTF7 [netbsd-10]: Makefile src/lib/libbz2 [netbsd-10]: Makefile src/lib/libc/gdtoa [netbsd-10]: Makefile.inc src/lib/libcrypt [netbsd-10]: Makefile src/libexec/ld.elf_so [netbsd-10]: Makefile src/sbin/fsck_ffs [netbsd-10]: Makefile.common src/sbin/fsdb [netbsd-10]: Makefile src/sbin/newfs_ext2fs [netbsd-10]: Makefile src/sbin/ping [netbsd-10]: Makefile src/sys/arch/vax/conf [netbsd-10]: Makefile.vax src/sys/lib/libsa [netbsd-10]: Makefile src/sys/lib/libz [netbsd-10]: Makefile src/sys/modules/lfs [netbsd-10]: Makefile src/sys/rump/fs/lib/liblfs [netbsd-10]: Makefile src/tools/gcc [netbsd-10]: Makefile src/usr.sbin/mtrace [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by rin in ticket #394): external/gpl3/binutils/dist/gas/config/tc-vax.h: revision 1.10 tools/gcc/Makefile: revision 1.109 external/gpl3/binutils/dist/gas/config/tc-vax.c: revision 1.16 external/gpl3/binutils/dist/gas/config/tc-vax.c: revision 1.17 external/gpl3/binutils/dist/gas/config/tc-vax.c: revision 1.18 external/gpl3/gcc.old/dist/gcc/recog.c: revision 1.12 external/gpl3/gcc.old/dist/gcc/function.c: revision 1.16 external/gpl3/gcc.old/dist/gcc/dse.c: revision 1.14 - 1.16 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.13 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.14 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.15 external/gpl3/gcc.old/dist/gcc/doc/tm.texi.in: revision 1.10 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.16 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.17 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.18 external/gpl3/gcc.old/dist/gcc/config/vax/vax.c: revision 1.19 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.12 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.13 external/gpl3/gcc.old/usr.bin/backend/Makefile: revision 1.20 external/gpl3/gcc.old/dist/gcc/targhooks.c: revision 1.12 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.14 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.15 external/gpl3/gcc.old/dist/gcc/config/vax/builtins.md: revision 1.12 external/gpl3/gcc.old/dist/gcc/config/vax/vax.md: revision 1.16
CVS commit: src
Module Name:src
Committed By: he
Date: Sun Oct 8 13:47:51 UTC 2023
Modified Files:
src/distrib/evbmips/instkernel/ramdisk: Makefile
src/lib/libm: Makefile
Log Message:
libm Makefile: add fma() functions for mips.
This pushed the ramdisk size, so that needed to be bumped as well.
Otherwise, there were no build issues for either 32 or 64 bit mips.
Sort-of OK'ed by simonb@.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/evbmips/instkernel/ramdisk/Makefile
cvs rdiff -u -r1.221 -r1.222 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbmips/instkernel/ramdisk/Makefile
diff -u src/distrib/evbmips/instkernel/ramdisk/Makefile:1.18 src/distrib/evbmips/instkernel/ramdisk/Makefile:1.19
--- src/distrib/evbmips/instkernel/ramdisk/Makefile:1.18 Tue Jul 25 02:38:31 2023
+++ src/distrib/evbmips/instkernel/ramdisk/Makefile Sun Oct 8 13:47:51 2023
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2023/07/25 02:38:31 gutteridge Exp $
+# $NetBSD: Makefile,v 1.19 2023/10/08 13:47:51 he Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 4096k
+IMAGESIZE= 4160k
MAKEFS_FLAGS+= -f 15
WARNS= 1
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.221 src/lib/libm/Makefile:1.222
--- src/lib/libm/Makefile:1.221 Tue Aug 8 02:09:42 2023
+++ src/lib/libm/Makefile Sun Oct 8 13:47:51 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.221 2023/08/08 02:09:42 rin Exp $
+# $NetBSD: Makefile,v 1.222 2023/10/08 13:47:51 he Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -207,6 +207,7 @@ COMMON_SRCS+= s_rintl.c
.if ${MACHINE_MIPS64} && (!defined(CPUFLAGS) || empty(CPUFLAGS:M-mabi=32))
COMMON_SRCS+= s_nexttoward.c
.endif
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${LIBC_MACHINE_CPU} == "sh3")
.PATH: ${.CURDIR}/arch/sh3
CVS commit: src
Module Name:src Committed By: he Date: Sun Oct 8 13:47:51 UTC 2023 Modified Files: src/distrib/evbmips/instkernel/ramdisk: Makefile src/lib/libm: Makefile Log Message: libm Makefile: add fma() functions for mips. This pushed the ramdisk size, so that needed to be bumped as well. Otherwise, there were no build issues for either 32 or 64 bit mips. Sort-of OK'ed by simonb@. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/evbmips/instkernel/ramdisk/Makefile cvs rdiff -u -r1.221 -r1.222 src/lib/libm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Sun Oct 8 13:37:26 UTC 2023
Modified Files:
src/sys/kern: kern_sleepq.c
Log Message:
Oops, fix inverted test.
To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/sys/kern/kern_sleepq.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/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.82 src/sys/kern/kern_sleepq.c:1.83
--- src/sys/kern/kern_sleepq.c:1.82 Sun Oct 8 13:23:05 2023
+++ src/sys/kern/kern_sleepq.c Sun Oct 8 13:37:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.82 2023/10/08 13:23:05 ad Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.83 2023/10/08 13:37:26 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009, 2019, 2020, 2023
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.82 2023/10/08 13:23:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.83 2023/10/08 13:37:26 ad Exp $");
#include
#include
@@ -416,7 +416,7 @@ sleepq_block(int timo, bool catch_p, syn
*/
flag = atomic_load_relaxed(>l_flag);
if (__predict_false((flag & mask) != 0)) {
- if ((flag & LW_CATCHINTR) == 0 && error != 0)
+ if ((flag & LW_CATCHINTR) == 0 || error != 0)
/* nothing */;
else if ((flag & (LW_CANCELLED | LW_WEXIT | LW_WCORE)) != 0)
error = EINTR;
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Sun Oct 8 13:37:26 UTC 2023 Modified Files: src/sys/kern: kern_sleepq.c Log Message: Oops, fix inverted test. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/kern/kern_sleepq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: ad
Date: Sun Oct 8 13:23:05 UTC 2023
Modified Files:
src/sys/kern: kern_condvar.c kern_sleepq.c kern_timeout.c
kern_turnstile.c sys_lwp.c sys_select.c
src/sys/rump/librump/rumpkern: sleepq.c
src/sys/sys: sleepq.h syncobj.h
Log Message:
Ensure that an LWP that has taken a legitimate wakeup never produces an
error code from sleepq_block(). Then, it's possible to make cv_signal()
work as expected and only ever wake a singular LWP.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/kern_condvar.c
cvs rdiff -u -r1.81 -r1.82 src/sys/kern/kern_sleepq.c
cvs rdiff -u -r1.78 -r1.79 src/sys/kern/kern_timeout.c
cvs rdiff -u -r1.52 -r1.53 src/sys/kern/kern_turnstile.c
cvs rdiff -u -r1.86 -r1.87 src/sys/kern/sys_lwp.c
cvs rdiff -u -r1.63 -r1.64 src/sys/kern/sys_select.c
cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpkern/sleepq.c
cvs rdiff -u -r1.39 -r1.40 src/sys/sys/sleepq.h
cvs rdiff -u -r1.16 -r1.17 src/sys/sys/syncobj.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/kern/kern_condvar.c
diff -u src/sys/kern/kern_condvar.c:1.57 src/sys/kern/kern_condvar.c:1.58
--- src/sys/kern/kern_condvar.c:1.57 Wed Oct 4 20:29:18 2023
+++ src/sys/kern/kern_condvar.c Sun Oct 8 13:23:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_condvar.c,v 1.57 2023/10/04 20:29:18 ad Exp $ */
+/* $NetBSD: kern_condvar.c,v 1.58 2023/10/08 13:23:05 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2019, 2020, 2023
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.57 2023/10/04 20:29:18 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.58 2023/10/08 13:23:05 ad Exp $");
#include
#include
@@ -478,27 +478,13 @@ cv_wakeup_one(kcondvar_t *cv)
kmutex_t *mp;
lwp_t *l;
- /*
- * Keep waking LWPs until a non-interruptable waiter is found. An
- * interruptable waiter could fail to do something useful with the
- * wakeup due to an error return from cv_[timed]wait_sig(), and the
- * caller of cv_signal() may not expect such a scenario.
- *
- * This isn't a problem for non-interruptable waits (untimed and
- * timed), because if such a waiter is woken here it will not return
- * an error.
- */
mp = sleepq_hashlock(cv);
sq = CV_SLEEPQ(cv);
- while ((l = LIST_FIRST(sq)) != NULL) {
+ if (__predict_true((l = LIST_FIRST(sq)) != NULL)) {
KASSERT(l->l_sleepq == sq);
KASSERT(l->l_mutex == mp);
KASSERT(l->l_wchan == cv);
- if ((l->l_flag & LW_SINTR) == 0) {
- sleepq_remove(sq, l);
- break;
- } else
- sleepq_remove(sq, l);
+ sleepq_remove(sq, l, true);
}
mutex_spin_exit(mp);
}
@@ -539,7 +525,7 @@ cv_wakeup_all(kcondvar_t *cv)
KASSERT(l->l_sleepq == sq);
KASSERT(l->l_mutex == mp);
KASSERT(l->l_wchan == cv);
- sleepq_remove(sq, l);
+ sleepq_remove(sq, l, true);
}
mutex_spin_exit(mp);
}
Index: src/sys/kern/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.81 src/sys/kern/kern_sleepq.c:1.82
--- src/sys/kern/kern_sleepq.c:1.81 Sun Oct 8 11:12:47 2023
+++ src/sys/kern/kern_sleepq.c Sun Oct 8 13:23:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.81 2023/10/08 11:12:47 ad Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.82 2023/10/08 13:23:05 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009, 2019, 2020, 2023
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.81 2023/10/08 11:12:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.82 2023/10/08 13:23:05 ad Exp $");
#include
#include
@@ -105,10 +105,17 @@ sleepq_init(sleepq_t *sq)
/*
* sleepq_remove:
*
- * Remove an LWP from a sleep queue and wake it up.
+ * Remove an LWP from a sleep queue and wake it up. Distinguish
+ * between deliberate wakeups (which are a valuable information) and
+ * "unsleep" (an out-of-band action must be taken).
+ *
+ * For wakeup, convert any interruptable wait into non-interruptable
+ * one before waking the LWP. Otherwise, if only one LWP is awoken it
+ * could fail to do something useful with the wakeup due to an error
+ * return and the caller of e.g. cv_signal() may not expect this.
*/
void
-sleepq_remove(sleepq_t *sq, lwp_t *l)
+sleepq_remove(sleepq_t *sq, lwp_t *l, bool wakeup)
{
struct schedstate_percpu *spc;
struct cpu_info *ci;
@@ -125,7 +132,7 @@ sleepq_remove(sleepq_t *sq, lwp_t *l)
l->l_syncobj = _syncobj;
l->l_wchan = NULL;
l->l_sleepq = NULL;
- l->l_flag &= ~LW_SINTR;
+ l->l_flag &= wakeup ? ~(LW_SINTR|LW_CATCHINTR|LW_STIMO) : ~LW_SINTR;
ci = l->l_cpu;
spc = >ci_schedstate;
@@ -409,7 +416,6 @@ sleepq_block(int timo, bool catch_p, syn
*/
flag = atomic_load_relaxed(>l_flag);
if (__predict_false((flag & mask) != 0)) {
- p = l->l_proc;
if ((flag & LW_CATCHINTR) == 0 && error != 0)
/* nothing */;
else if ((flag & (LW_CANCELLED | LW_WEXIT | LW_WCORE)) != 0)
@@ -422,6 +428,7
CVS commit: src/sys
Module Name:src Committed By: ad Date: Sun Oct 8 13:23:05 UTC 2023 Modified Files: src/sys/kern: kern_condvar.c kern_sleepq.c kern_timeout.c kern_turnstile.c sys_lwp.c sys_select.c src/sys/rump/librump/rumpkern: sleepq.c src/sys/sys: sleepq.h syncobj.h Log Message: Ensure that an LWP that has taken a legitimate wakeup never produces an error code from sleepq_block(). Then, it's possible to make cv_signal() work as expected and only ever wake a singular LWP. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/kern/kern_condvar.c cvs rdiff -u -r1.81 -r1.82 src/sys/kern/kern_sleepq.c cvs rdiff -u -r1.78 -r1.79 src/sys/kern/kern_timeout.c cvs rdiff -u -r1.52 -r1.53 src/sys/kern/kern_turnstile.c cvs rdiff -u -r1.86 -r1.87 src/sys/kern/sys_lwp.c cvs rdiff -u -r1.63 -r1.64 src/sys/kern/sys_select.c cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpkern/sleepq.c cvs rdiff -u -r1.39 -r1.40 src/sys/sys/sleepq.h cvs rdiff -u -r1.16 -r1.17 src/sys/sys/syncobj.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/news68k/conf
OK, it makes sense. I will revert the changes. Thanks for your explanations. On Sun, Oct 8, 2023 at 12:49 PM matthew green wrote: > > > I was changing news68k specific code, thus wasn't treating them as > > common. But I understand the point. > > there's a *LOT* of m68k code that is copied into all the ports > that is almost identical, and should really be shared, but it > not, and changes like can make this harder to share. > > ie, while it might appear news68k specific, ideally most of it > would end up in arch/m68k instead. > > it would really be far better for that merge, than to worry > about obscure compile options -- there's a real cost when we > have platform changes to make, and 10 m68k copies are needed > instead of 1. we've done some of this over time (for not > just m68k) but there's quite a lot of left here.. > > thanks. > > > .mrg.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Oct 8 13:19:34 UTC 2023 Modified Files: src/distrib/sets/lists/man [netbsd-10]: mi src/doc [netbsd-10]: CHANGES src/share/man/man4 [netbsd-10]: Makefile src/sys/arch/amd64/conf [netbsd-10]: ALL GENERIC XEN3_DOM0 src/sys/arch/evbarm/conf [netbsd-10]: GENERIC64 src/sys/arch/evbppc/conf [netbsd-10]: DHT src/sys/dev/pci [netbsd-10]: files.pci Added Files: src/share/man/man4 [netbsd-10]: igc.4 src/sys/dev/pci/igc [netbsd-10]: if_igc.c if_igc.h igc_api.c igc_api.h igc_base.c igc_base.h igc_defines.h igc_evcnt.h igc_hw.h igc_i225.c igc_i225.h igc_mac.c igc_mac.h igc_nvm.c igc_nvm.h igc_phy.c igc_phy.h igc_regs.h Log Message: Pull up following revision(s) (requested by rin in ticket #393): sys/dev/pci/igc/if_igc.cup to 1.3 sys/dev/pci/igc/if_igc.hup to 1.2 sys/dev/pci/igc/igc_api.c up to 1.2 sys/dev/pci/igc/igc_api.h up to 1.2 sys/dev/pci/igc/igc_base.c up to 1.2 sys/dev/pci/igc/igc_base.h up to 1.2 sys/dev/pci/igc/igc_defines.h up to 1.2 sys/dev/pci/igc/igc_evcnt.h up to 1.1 sys/dev/pci/igc/igc_hw.hup to 1.2 sys/dev/pci/igc/igc_i225.c up to 1.2 sys/dev/pci/igc/igc_i225.h up to 1.2 sys/dev/pci/igc/igc_mac.c up to 1.2 sys/dev/pci/igc/igc_mac.h up to 1.2 sys/dev/pci/igc/igc_nvm.c up to 1.2 sys/dev/pci/igc/igc_nvm.h up to 1.2 sys/dev/pci/igc/igc_phy.c up to 1.2 sys/dev/pci/igc/igc_phy.h up to 1.2 sys/dev/pci/igc/igc_regs.h up to 1.2 distrib/sets/lists/man/mi: revision 1.1766 sys/arch/amd64/conf/GENERIC: revision 1.606 sys/arch/evbppc/conf/DHT: revision 1.5 sys/arch/evbarm/conf/GENERIC64: revision 1.213 share/man/man4/Makefile: revision 1.733 sys/arch/amd64/conf/ALL: revision 1.181 share/man/man4/igc.4: revision 1.1 sys/dev/pci/files.pci: revision 1.447 sys/arch/amd64/conf/XEN3_DOM0: revision 1.200 doc/CHANGES (apply patch) Add igc(4) for Intel I225/I226 series ethernet devices To generate a diff of this commit: cvs rdiff -u -r1.1757.2.4 -r1.1757.2.5 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.2940.2.4 -r1.2940.2.5 src/doc/CHANGES cvs rdiff -u -r1.730.2.1 -r1.730.2.2 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1.2.2 src/share/man/man4/igc.4 cvs rdiff -u -r1.174.4.1 -r1.174.4.2 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.599.4.2 -r1.599.4.3 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.197 -r1.197.4.1 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.206.2.1 -r1.206.2.2 src/sys/arch/evbarm/conf/GENERIC64 cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/evbppc/conf/DHT cvs rdiff -u -r1.445.2.1 -r1.445.2.2 src/sys/dev/pci/files.pci cvs rdiff -u -r0 -r1.3.2.2 src/sys/dev/pci/igc/if_igc.c cvs rdiff -u -r0 -r1.2.2.2 src/sys/dev/pci/igc/if_igc.h \ src/sys/dev/pci/igc/igc_api.c src/sys/dev/pci/igc/igc_api.h \ src/sys/dev/pci/igc/igc_base.c src/sys/dev/pci/igc/igc_base.h \ src/sys/dev/pci/igc/igc_defines.h src/sys/dev/pci/igc/igc_hw.h \ src/sys/dev/pci/igc/igc_i225.c src/sys/dev/pci/igc/igc_i225.h \ src/sys/dev/pci/igc/igc_mac.c src/sys/dev/pci/igc/igc_mac.h \ src/sys/dev/pci/igc/igc_nvm.c src/sys/dev/pci/igc/igc_nvm.h \ src/sys/dev/pci/igc/igc_phy.c src/sys/dev/pci/igc/igc_phy.h \ src/sys/dev/pci/igc/igc_regs.h cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/pci/igc/igc_evcnt.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/dev/pci
Module Name:src Committed By: martin Date: Sun Oct 8 13:03:40 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #393 (Add missing I225/I226 series devices) To generate a diff of this commit: cvs rdiff -u -r1.1452.2.6 -r1.1452.2.7 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.6 -r1.1451.2.7 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/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Oct 8 13:02:08 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up the following, requested by rin in ticket #393: sys/dev/pci/pcidevs 1.1494 (via patch) Add missing I225/I226 series devices To generate a diff of this commit: cvs rdiff -u -r1.1471.2.5 -r1.1471.2.6 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/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1471.2.5 src/sys/dev/pci/pcidevs:1.1471.2.6 --- src/sys/dev/pci/pcidevs:1.1471.2.5 Mon Aug 21 12:26:12 2023 +++ src/sys/dev/pci/pcidevs Sun Oct 8 13:02:08 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1471.2.5 2023/08/21 12:26:12 martin Exp $ +$NetBSD: pcidevs,v 1.1471.2.6 2023/10/08 13:02:08 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3933,6 +3933,7 @@ product INTEL I219_LM11 0x0d4c I219-LM product INTEL I219_V11 0x0d4d I219-V (11) Ethernet Connection product INTEL I219_LM10 0x0d4e I219-LM (10) Ethernet Connection product INTEL I219_V10 0x0d4f I219-V (10) Ethernet Connection +product INTEL I225_IT 0x0d9f I225-IT Ethernet Connection product INTEL I219_LM12 0x0d53 I219-LM (12) Ethernet Connection product INTEL I219_V12 0x0d55 I219-V (12) Ethernet Connection product INTEL E5V2_DMI2 0x0e00 E5 v2 DMI2 @@ -4249,6 +4250,8 @@ product INTEL 82439HX 0x1250 82439HX (T product INTEL I226_LM 0x125b I226-LM Ethernet product INTEL I226_V 0x125c I226-V Ethernet product INTEL I226_IT 0x125d I226-IT Ethernet +product INTEL I221_V 0x125e I221-V Ethernet Connection +product INTEL I226_BLANK_NVM 0x125f I226 Ethernet Connection (blankNVM) product INTEL C3K_X553_10G 0x1306 C3000 X553 10G Ethernet product INTEL C3K_X553_1G 0x1307 C3000 X553 1G Ethernet product INTEL 82870P2_PPB 0x1460 82870P2 P64H2 PCI-PCI Bridge @@ -4374,9 +4377,12 @@ product INTEL C3K_X553_SGMII 0x15e4 C300 product INTEL C3K_X553_SGMII_L 0x15e5 C3000 X553 1GbE SGMII (non-10G SKU) product INTEL I225_LM 0x15f2 I225 LM Ethernet product INTEL I225_V 0x15f3 I225 V Ethernet +product INTEL I220_V 0x15f7 I220-V Ethernet Connection +product INTEL I225_BLANK_NVM 0x15fd I225 Ethernet Connection (blankNVM) product INTEL I219_LM15 0x15f4 I219-LM (15) Ethernet Connection product INTEL I219_V15 0x15f5 I219-V (15) Ethernet Connection product INTEL I210_SGMII_WOF 0x15f6 I210 Ethernet (SGMII) +product INTEL I225_I 0x15f8 I225-I Ethernet Connection product INTEL I219_LM14 0x15f9 I219-LM (14) Ethernet Connection product INTEL I219_V14 0x15fa I219-V (14) Ethernet Connection product INTEL I219_LM13 0x15fb I219-LM (13) Ethernet Connection @@ -5409,6 +5415,9 @@ product INTEL XE5_V3_BRA4 0x2ffb Xeon E product INTEL XE5_V3_SADBR1 0x2ffc Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers product INTEL XE5_V3_SADBR2 0x2ffd Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers product INTEL XE5_V3_SADBR3 0x2ffe Xeon E7 v3/Xeon E5 v3/Core i7 System Address Decoder & Broadcast Registers +product INTEL I225_K 0x3100 I225-K Ethernet Connection +product INTEL I225_K2 0x3101 I225-K2 Ethernet Connection +product INTEL I226_K 0x3102 I226-K Ethernet Connection product INTEL WIFI_LINK_3165_1 0x3165 Dual Band Wireless AC 3165 product INTEL WIFI_LINK_3165_2 0x3166 Dual Band Wireless AC 3165 product INTEL GLK_IGD_1 0x3184 UHD Graphics 605 @@ -6281,6 +6290,8 @@ product INTEL ADL_N_CNVI_4 0x54f3 Alder product INTEL ADL_N_GSPI_2 0x54fb Alder Lake-N GSPI 2 product INTEL ADL_N_ISH 0x54fc Alder Lake-N Integrated Sensor Hub product INTEL ADL_N_SCS_UFS 0x54ff Alder Lake-N UFS +product INTEL I225_LMVP 0x5502 I225-LMvP Ethernet Connection +product INTEL I226_LMVP 0x5503 I226-LMvP Ethernet Connection product INTEL I219_LM18 0x550a I219-LM (18) Ethernet Connection product INTEL I219_V18 0x550b I219-V (18) Ethernet Connection product INTEL I219_LM19 0x550c I219-LM (19) Ethernet Connection
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Oct 8 13:02:08 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up the following, requested by rin in ticket #393: sys/dev/pci/pcidevs 1.1494 (via patch) Add missing I225/I226 series devices To generate a diff of this commit: cvs rdiff -u -r1.1471.2.5 -r1.1471.2.6 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: src/sys/kern
Module Name:src Committed By: ad Date: Sun Oct 8 12:38:58 UTC 2023 Modified Files: src/sys/kern: kern_exec.c kern_exit.c Log Message: Defer some wakeups till lock release. To generate a diff of this commit: cvs rdiff -u -r1.520 -r1.521 src/sys/kern/kern_exec.c cvs rdiff -u -r1.297 -r1.298 src/sys/kern/kern_exit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Sun Oct 8 12:38:58 UTC 2023
Modified Files:
src/sys/kern: kern_exec.c kern_exit.c
Log Message:
Defer some wakeups till lock release.
To generate a diff of this commit:
cvs rdiff -u -r1.520 -r1.521 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.297 -r1.298 src/sys/kern/kern_exit.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/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.520 src/sys/kern/kern_exec.c:1.521
--- src/sys/kern/kern_exec.c:1.520 Wed Oct 4 22:17:09 2023
+++ src/sys/kern/kern_exec.c Sun Oct 8 12:38:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.520 2023/10/04 22:17:09 ad Exp $ */
+/* $NetBSD: kern_exec.c,v 1.521 2023/10/08 12:38:58 ad Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.520 2023/10/04 22:17:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.521 2023/10/08 12:38:58 ad Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -1314,7 +1314,6 @@ execve_runproc(struct lwp *l, struct exe
lp = p->p_vforklwp;
p->p_vforklwp = NULL;
l->l_lwpctl = NULL; /* was on loan from blocked parent */
- cv_broadcast(>l_waitcv);
/* Clear flags after cv_broadcast() (scheduler needs them). */
p->p_lflag &= ~PL_PPWAIT;
@@ -1322,6 +1321,7 @@ execve_runproc(struct lwp *l, struct exe
/* If parent is still on same CPU, teleport curlwp elsewhere. */
samecpu = (lp->l_cpu == curlwp->l_cpu);
+ cv_broadcast(>l_waitcv);
mutex_exit(_lock);
/* Give the parent its CPU back - find a new home. */
Index: src/sys/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.297 src/sys/kern/kern_exit.c:1.298
--- src/sys/kern/kern_exit.c:1.297 Wed Oct 4 20:48:13 2023
+++ src/sys/kern/kern_exit.c Sun Oct 8 12:38:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exit.c,v 1.297 2023/10/04 20:48:13 ad Exp $ */
+/* $NetBSD: kern_exit.c,v 1.298 2023/10/08 12:38:58 ad Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007, 2008, 2020, 2023
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.297 2023/10/04 20:48:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.298 2023/10/08 12:38:58 ad Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -548,9 +548,6 @@ exit1(struct lwp *l, int exitcode, int s
calcru(p, >p_stats->p_ru.ru_utime, >p_stats->p_ru.ru_stime,
NULL, NULL);
- if (wakeinit)
- cv_broadcast(>p_waitcv);
-
callout_destroy(>l_timeout_ch);
/*
@@ -558,7 +555,6 @@ exit1(struct lwp *l, int exitcode, int s
*/
pcu_discard_all(l);
- mutex_enter(p->p_lock);
/*
* Notify other processes tracking us with a knote that
* we're exiting.
@@ -568,6 +564,7 @@ exit1(struct lwp *l, int exitcode, int s
* knote_proc_exit() expects that p->p_lock is already
* held (and will assert so).
*/
+ mutex_enter(p->p_lock);
if (!SLIST_EMPTY(>p_klist)) {
knote_proc_exit(p);
}
@@ -592,9 +589,11 @@ exit1(struct lwp *l, int exitcode, int s
* Signal the parent to collect us, and drop the proclist lock.
* Drop debugger/procfs lock; no new references can be gained.
*/
- cv_broadcast(>p_pptr->p_waitcv);
rw_exit(>p_reflock);
+ cv_broadcast(>p_pptr->p_waitcv);
mutex_exit(_lock);
+ if (wakeinit)
+ cv_broadcast(>p_waitcv);
/*
* NOTE: WE ARE NO LONGER ALLOWED TO SLEEP!
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Sun Oct 8 11:12:47 UTC 2023
Modified Files:
src/sys/kern: kern_sleepq.c
Log Message:
sleepq_block(): slightly reduce number of test+branch in the common case.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/kern/kern_sleepq.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/kern_sleepq.c
diff -u src/sys/kern/kern_sleepq.c:1.80 src/sys/kern/kern_sleepq.c:1.81
--- src/sys/kern/kern_sleepq.c:1.80 Sat Oct 7 20:48:50 2023
+++ src/sys/kern/kern_sleepq.c Sun Oct 8 11:12:47 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sleepq.c,v 1.80 2023/10/07 20:48:50 ad Exp $ */
+/* $NetBSD: kern_sleepq.c,v 1.81 2023/10/08 11:12:47 ad Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008, 2009, 2019, 2020, 2023
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.80 2023/10/07 20:48:50 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.81 2023/10/08 11:12:47 ad Exp $");
#include
#include
@@ -334,7 +334,8 @@ sleepq_uncatch(lwp_t *l)
int
sleepq_block(int timo, bool catch_p, syncobj_t *syncobj, int nlocks)
{
- int error = 0, sig;
+ const int mask = LW_CANCELLED|LW_WEXIT|LW_WCORE|LW_PENDSIG;
+ int error = 0, sig, flag;
struct proc *p;
lwp_t *l = curlwp;
bool early = false;
@@ -406,11 +407,14 @@ sleepq_block(int timo, bool catch_p, syn
* considering it is only meaningful here inside this function,
* and is set to reflect intent upon entry.
*/
- if ((l->l_flag & LW_CATCHINTR) != 0 && error == 0) {
+ flag = atomic_load_relaxed(>l_flag);
+ if (__predict_false((flag & mask) != 0)) {
p = l->l_proc;
- if ((l->l_flag & (LW_CANCELLED | LW_WEXIT | LW_WCORE)) != 0)
+ if ((flag & LW_CATCHINTR) == 0 && error != 0)
+ /* nothing */;
+ else if ((flag & (LW_CANCELLED | LW_WEXIT | LW_WCORE)) != 0)
error = EINTR;
- else if ((l->l_flag & LW_PENDSIG) != 0) {
+ else if ((flag & LW_PENDSIG) != 0) {
/*
* Acquiring p_lock may cause us to recurse
* through the sleep path and back into this
CVS commit: src/sys/kern
Module Name:src Committed By: ad Date: Sun Oct 8 11:12:47 UTC 2023 Modified Files: src/sys/kern: kern_sleepq.c Log Message: sleepq_block(): slightly reduce number of test+branch in the common case. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/kern/kern_sleepq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/sys/arch/news68k/conf
> I was changing news68k specific code, thus wasn't treating them as > common. But I understand the point. there's a *LOT* of m68k code that is copied into all the ports that is almost identical, and should really be shared, but it not, and changes like can make this harder to share. ie, while it might appear news68k specific, ideally most of it would end up in arch/m68k instead. it would really be far better for that merge, than to worry about obscure compile options -- there's a real cost when we have platform changes to make, and 10 m68k copies are needed instead of 1. we've done some of this over time (for not just m68k) but there's quite a lot of left here.. thanks. .mrg.
Re: CVS commit: src/sys/arch/news68k/conf
On Sun, Oct 8, 2023 at 6:56 AM Izumi Tsutsui wrote:
>
> > In this case maybe I should remove all FPSP references (vectors.S,
> > locore.S, Makefile.news68k (MD_LIBS={FPSP})?
>
> IMO we don't have to keep strict consistencies or buildabilities of
> options but rather should consider readabilities and maintainabilities.
>
> - options FPSP in a config file is not necessary for users on news68k
> (unless some users build own 040/060 upgrade mod like x68k)
Yes, that's understandable and true. However, if someone would have a
mod, he would need to understand why FPSP build fails in the first
place.
I just wanted to avoid confusion, that code has ifdef blocks, but
there's no way to build it.
> - #ifdef FPSP (and other m68k specific options) blocks in common
> sources might help to check diffs from other m68k ports
I was changing news68k specific code, thus wasn't treating them as
common. But I understand the point.
I can return FPSP block in vectors.s, if that helps with readability
and maintainability.
However, those copy pasted common files usually diverge between ports
(from what I've seen),
makes it difficult to understand what is still common and what is the
"latest" code at times (likely not in this case).
> - In the perfect world, we should have a common m68k/locore.s etc.
>and move port specific blocks into locore_machdep.s like mips,
>but m68k CPUs are too flexible and all m68k ports have too many
>historical difficulties to refactor them
I admit I went a bit impatient this time without waiting for the
proper answer. I am OK to settle with the best option in the context,
either revert everything to original state, keep partial changes or
leave current state. Sorry for this.
>
> I don't mind your changes in this case, but it's appreciated
> to ask design considerations before changes, as you did for mmeye.
>
> Thanks,
> ---
> Izumi Tsutsui
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Oct 8 08:05:09 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1475 -r1.1476 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1474 -r1.1475 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: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Oct 8 08:04:41 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Pericom(Diodes) PCIe switches. To generate a diff of this commit: cvs rdiff -u -r1.1494 -r1.1495 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/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1494 src/sys/dev/pci/pcidevs:1.1495 --- src/sys/dev/pci/pcidevs:1.1494 Wed Oct 4 07:17:59 2023 +++ src/sys/dev/pci/pcidevs Sun Oct 8 08:04:41 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1494 2023/10/04 07:17:59 rin Exp $ +$NetBSD: pcidevs,v 1.1495 2023/10/08 08:04:41 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -8818,7 +8818,21 @@ product PERICOM PI7C21P100 0x01a7 PI7C21 product PERICOM PI7C9X20303UL 0x0303 PI7C9X20303UL 3port 3lane PCIe switch product PERICOM PI7C9X20505GP 0x0505 PI7C9X20505GP 5port 5lane PCIe switch product PERICOM PI7C9X20508GP 0x0508 PI7C9X20508GP 5port 8lane PCIe switch +product PERICOM PI7C9X2G303EL 0x2303 PI7C9X2G303EL 3port 3lane PCIe Gen2 switch +product PERICOM PI7C9X2G304EL 0x2304 PI7C9X2G304EL 3port 4lane PCIe Gen2 switch +product PERICOM PI7C9X2G308GP 0x2308 PI7C9X2G308GP 3port 8lane PCIe Gen2 switch +product PERICOM PI7C9X2G312GP 0x2312 PI7C9X2G312GP 3port 12lane PCIe Gen2 switch product PERICOM PI7C9X2G404SL 0x2404 PI7C9X2G404SL 4port 4lane PCIe Gen2 switch +product PERICOM PI7C9X2G608GP 0x2608 PI7C9X2G608GP 6port 8lane PCIe Gen2 switch +product PERICOM PI7C9X2G612GP 0x2612 PI7C9X2G612GP 6port 12lane PCIe Gen2 switch +product PERICOM PI7C9X2G912GP 0x2912 PI7C9X2G912GP 9port 12lane PCIe Gen2 switch +product PERICOM PI7C9X2G808PR 0x8608 PI7C9X2G808PR 8port 8lane PCIe Gen2 switch +product PERICOM PI7C9X2G304EV 0xb304 PI7C9X2G304EV 3port 4lane PCIe Gen2 switch +product PERICOM PI7C9X2G404EV 0xb404 PI7C9X2G404EV 4port 4lane PCIe Gen2 switch +product PERICOM PI7C9X3G808GP 0xc008 PI7C9X3G808GP 8port 8lane PCIe Gen3 switch +product PERICOM PI7C9X3G816GP 0xc016 PI7C9X3G816GP 8port 16lane PCIe Gen3 switch +product PERICOM PI7C9X3G1224GP 0xc124 PI7C9X3G1224GP 12port 24lane PCIe Gen3 switch +product PERICOM PI7C9X3G1632GP 0xc232 PI7C9X3G1632GP 16port 32lane PCIe Gen3 switch product PERICOM PI7C8140A 0x8140 PI7C8140A 2 port PCI-PCI Bridge product PERICOM PI7C8148 0x8148 PI7C8148 Asynchronous 2 port PCI-PCI Bridge product PERICOM PI7C8152 0x8152 PI7C8152 2 port PCI-PCI Bridge
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Sun Oct 8 08:04:41 UTC 2023 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Pericom(Diodes) PCIe switches. To generate a diff of this commit: cvs rdiff -u -r1.1494 -r1.1495 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
