CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Fri Oct 20 22:08:52 UTC 2023
Modified Files:
src/bin/sh: parser.c
Log Message:
Work around a probably gcc12 bug in detecting "potentially clobbered"
variables after longjmp() for some architectures (sh3 at least).
This should allow the workaround to disable those warnings for this
file to be removed.
In the affected function the extra var & assignment added should simply
be deleted by any good optimiser, but if not, it doesn't matter, as
performance of this function (expandonstack()) is almost irrelevant.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/bin/sh/parser.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.180 src/bin/sh/parser.c:1.181
--- src/bin/sh/parser.c:1.180 Fri Apr 7 10:34:13 2023
+++ src/bin/sh/parser.c Fri Oct 20 22:08:52 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.180 2023/04/07 10:34:13 kre Exp $ */
+/* $NetBSD: parser.c,v 1.181 2023/10/20 22:08:52 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.180 2023/04/07 10:34:13 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.181 2023/10/20 22:08:52 kre Exp $");
#endif
#endif /* not lint */
@@ -2689,6 +2689,7 @@ expandonstack(char *ps, int cmdsub, int
struct jmploc jmploc;
struct jmploc *const savehandler = handler;
struct parsefile *const savetopfile = getcurrentfile();
+ char * const save_ps = ps;
const int save_x = xflag;
const int save_e_s = errors_suppressed;
struct parse_state new_state = init_parse_state;
@@ -2740,7 +2741,7 @@ expandonstack(char *ps, int cmdsub, int
errors_suppressed = save_e_s;
if (result == NULL)
- result = ps;
+ result = save_ps;
return result;
}
CVS commit: src/bin/sh
Module Name:src Committed By: kre Date: Fri Oct 20 22:08:52 UTC 2023 Modified Files: src/bin/sh: parser.c Log Message: Work around a probably gcc12 bug in detecting "potentially clobbered" variables after longjmp() for some architectures (sh3 at least). This should allow the workaround to disable those warnings for this file to be removed. In the affected function the extra var & assignment added should simply be deleted by any good optimiser, but if not, it doesn't matter, as performance of this function (expandonstack()) is almost irrelevant. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 src/bin/sh/parser.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Fri Oct 20 18:37:28 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #432 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 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.143 src/doc/CHANGES-10.0:1.1.2.144 --- src/doc/CHANGES-10.0:1.1.2.143 Fri Oct 20 16:14:36 2023 +++ src/doc/CHANGES-10.0 Fri Oct 20 18:37:28 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.143 2023/10/20 16:14:36 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.144 2023/10/20 18:37:28 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12633,3 +12633,9 @@ sys/arch/evbarm/include/types.h 1.16 evbarm: fix root detection when raid(4) is involved. [mrg, ticket #431] +sys/arch/x86/acpi/acpi_wakeup.c 1.57 (patch) +sys/arch/x86/x86/genfb_machdep.c 1.23 (patch) + + Allow building kernels with acpi(4) but no framebuffer devices. + [bouyer, ticket #432] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Fri Oct 20 18:37:28 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #432 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 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/arch/x86
Module Name:src
Committed By: martin
Date: Fri Oct 20 18:35:54 UTC 2023
Modified Files:
src/sys/arch/x86/acpi [netbsd-10]: acpi_wakeup.c
src/sys/arch/x86/x86 [netbsd-10]: genfb_machdep.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #432):
sys/arch/x86/x86/genfb_machdep.c: revision 1.23 (patch)
sys/arch/x86/acpi/acpi_wakeup.c: revision 1.57 (patch)
Move definition of acpi_md_vesa_modenum to acpi_wakeup.c; allows building
kernels without framebuffer devices.
Problem reported by John D. Baker on current-users@
To generate a diff of this commit:
cvs rdiff -u -r1.54.12.1 -r1.54.12.2 src/sys/arch/x86/acpi/acpi_wakeup.c
cvs rdiff -u -r1.19.4.2 -r1.19.4.3 src/sys/arch/x86/x86/genfb_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/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.54.12.1 src/sys/arch/x86/acpi/acpi_wakeup.c:1.54.12.2
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.54.12.1 Wed Oct 18 15:14:24 2023
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Fri Oct 20 18:35:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.54.12.1 2023/10/18 15:14:24 martin Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.54.12.2 2023/10/20 18:35:54 martin Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.54.12.1 2023/10/18 15:14:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.54.12.2 2023/10/20 18:35:54 martin Exp $");
#include
#include
@@ -104,6 +104,12 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
#include "acpi_wakecode.h"
+#ifdef XENPV
+#error acpi_wakeup.c (acpi_md_vesa_modenum) users must be adapted for Xen
+#else
+int acpi_md_vesa_modenum = 0;
+#endif
+
/* Address is also hard-coded in acpi_wakecode.S */
static paddr_t acpi_wakeup_paddr = 3 * PAGE_SIZE;
static vaddr_t acpi_wakeup_vaddr;
Index: src/sys/arch/x86/x86/genfb_machdep.c
diff -u src/sys/arch/x86/x86/genfb_machdep.c:1.19.4.2 src/sys/arch/x86/x86/genfb_machdep.c:1.19.4.3
--- src/sys/arch/x86/x86/genfb_machdep.c:1.19.4.2 Wed Oct 18 16:53:03 2023
+++ src/sys/arch/x86/x86/genfb_machdep.c Fri Oct 20 18:35:54 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_machdep.c,v 1.19.4.2 2023/10/18 16:53:03 martin Exp $ */
+/* $NetBSD: genfb_machdep.c,v 1.19.4.3 2023/10/20 18:35:54 martin Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.19.4.2 2023/10/18 16:53:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_machdep.c,v 1.19.4.3 2023/10/20 18:35:54 martin Exp $");
#include
#include
@@ -64,10 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: genfb_machde
struct vcons_screen x86_genfb_console_screen;
bool x86_genfb_use_shadowfb = true;
-#if NACPICA > 0
-int acpi_md_vesa_modenum = 0;
-#endif
-
static device_t x86_genfb_console_dev = NULL;
static struct wsscreen_descr x86_genfb_stdscreen = {
CVS commit: [netbsd-10] src/sys/arch/x86
Module Name:src Committed By: martin Date: Fri Oct 20 18:35:54 UTC 2023 Modified Files: src/sys/arch/x86/acpi [netbsd-10]: acpi_wakeup.c src/sys/arch/x86/x86 [netbsd-10]: genfb_machdep.c Log Message: Pull up following revision(s) (requested by bouyer in ticket #432): sys/arch/x86/x86/genfb_machdep.c: revision 1.23 (patch) sys/arch/x86/acpi/acpi_wakeup.c: revision 1.57 (patch) Move definition of acpi_md_vesa_modenum to acpi_wakeup.c; allows building kernels without framebuffer devices. Problem reported by John D. Baker on current-users@ To generate a diff of this commit: cvs rdiff -u -r1.54.12.1 -r1.54.12.2 src/sys/arch/x86/acpi/acpi_wakeup.c cvs rdiff -u -r1.19.4.2 -r1.19.4.3 src/sys/arch/x86/x86/genfb_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Fri Oct 20 16:14:36 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #431 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 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/doc
Module Name:src Committed By: martin Date: Fri Oct 20 16:14:36 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #431 To generate a diff of this commit: cvs rdiff -u -r1.1.2.142 -r1.1.2.143 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.142 src/doc/CHANGES-10.0:1.1.2.143 --- src/doc/CHANGES-10.0:1.1.2.142 Fri Oct 20 16:06:56 2023 +++ src/doc/CHANGES-10.0 Fri Oct 20 16:14:36 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.142 2023/10/20 16:06:56 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.143 2023/10/20 16:14:36 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12626,3 +12626,10 @@ share/mk/bsd.own.mk1.1345 bsd.own.mk: do not strip local symbols with MKDEBUG=yes. [mrg, ticket #430] +sys/arch/evbarm/evbarm/autoconf.c 1.24 +sys/arch/evbarm/fdt/fdt_machdep.c 1.100,1.101 +sys/arch/evbarm/include/types.h 1.16 + + evbarm: fix root detection when raid(4) is involved. + [mrg, ticket #431] +
CVS commit: [netbsd-10] src/sys/arch/evbarm
Module Name:src
Committed By: martin
Date: Fri Oct 20 16:13:04 UTC 2023
Modified Files:
src/sys/arch/evbarm/evbarm [netbsd-10]: autoconf.c
src/sys/arch/evbarm/fdt [netbsd-10]: fdt_machdep.c
src/sys/arch/evbarm/include [netbsd-10]: types.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #431):
sys/arch/evbarm/evbarm/autoconf.c: revision 1.24
sys/arch/evbarm/include/types.h: revision 1.16
sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.100
sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.101
fix root detection on evbarm when raid is involved
there are several problems solved in this change:
- - lots of work was re-done when we already have determined the
device booted from, so several new early returns introduced
if booted_device has been set
- - due to the lack of cpu_bootconf(), raidframe softroot would
override "root=xxx" on the boot command line (note that
platforms that use eg, device_register() to detect the boot
device are not affected by this issue as they find the
boot device much earlier.)
- - in the new cpu_bootconf(), switch the order of the platform
boot-config with the set_root_device() call. this avoids a
problem where "root=xxx" is checked after automated methods,
and is thus ignored.
- - in fdt_detect_root_device(), remove the code to add "root=xxx""
string to the boot_args[] that would be later parsed by the
set_root_device() call, and simply set booted_device and, for
mbr installs, booted_partition directly. also, for any
successful call, perform an early return.
- - define __HAVE_CPU_BOOTCONF so early boot calls cpu_bootconf().
tested on:
- - rockpro64 booting from emmc, sata (big, and little endian)
- - rockpro64 loading kernel from msdos partition
- - rockpro64 booting from network (fails to auto-detect, with or
without this change)
- - quartz64 booting from nvme
- - lx2k booting from nvme
Locate wedges as boot device and also match a partition GUID.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.23.18.1 src/sys/arch/evbarm/evbarm/autoconf.c
cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.15 -r1.15.16.1 src/sys/arch/evbarm/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.23 src/sys/arch/evbarm/evbarm/autoconf.c:1.23.18.1
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.23 Sat Dec 19 21:54:00 2020
+++ src/sys/arch/evbarm/evbarm/autoconf.c Fri Oct 20 16:13:03 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $ */
+/* $NetBSD: autoconf.c,v 1.23.18.1 2023/10/20 16:13:03 martin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23 2020/12/19 21:54:00 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.23.18.1 2023/10/20 16:13:03 martin Exp $");
#include "opt_md.h"
#include "opt_ddb.h"
@@ -108,6 +108,9 @@ set_root_device(void)
char *ptr, *end, *buf;
size_t len;
+ if (booted_device)
+ return;
+
if (boot_args == NULL)
return;
@@ -118,7 +121,7 @@ set_root_device(void)
return;
/* NUL-terminate string, get_bootconf_option doesn't */
- for (end=ptr; *end != '\0'; ++end) {
+ for (end = ptr; *end != '\0'; ++end) {
if (*end == ' ' || *end == '\t') {
break;
}
@@ -144,16 +147,25 @@ set_root_device(void)
#endif
/*
- * Set up the root device from the boot args
+ * Set up the root device from the boot args.
+ *
+ * cpu_bootconf() is called before RAIDframe root detection,
+ * and cpu_rootconf() is called after.
*/
void
-cpu_rootconf(void)
+cpu_bootconf(void)
{
#ifndef MEMORY_DISK_IS_ROOT
+ set_root_device();
if (evbarm_cpu_rootconf)
(*evbarm_cpu_rootconf)();
- set_root_device();
#endif
+}
+
+void
+cpu_rootconf(void)
+{
+ cpu_bootconf();
aprint_normal("boot device: %s\n",
booted_device != NULL ? device_xname(booted_device) : "");
rootconf();
Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99.2.1
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.99 Fri Nov 4 10:51:17 2022
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c Fri Oct 20 16:13:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.99 2022/11/04 10:51:17 jmcneill Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.99.2.1 2023/10/20 16:13:04 martin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.99 2022/11/04 10:51:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.99.2.1 2023/10/20 16:13:04 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_bootconfig.h"
@@ -741,16 +741,7 @@ delay(u_int us)
static void
CVS commit: [netbsd-10] src/sys/arch/evbarm
Module Name:src Committed By: martin Date: Fri Oct 20 16:13:04 UTC 2023 Modified Files: src/sys/arch/evbarm/evbarm [netbsd-10]: autoconf.c src/sys/arch/evbarm/fdt [netbsd-10]: fdt_machdep.c src/sys/arch/evbarm/include [netbsd-10]: types.h Log Message: Pull up following revision(s) (requested by mrg in ticket #431): sys/arch/evbarm/evbarm/autoconf.c: revision 1.24 sys/arch/evbarm/include/types.h: revision 1.16 sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.100 sys/arch/evbarm/fdt/fdt_machdep.c: revision 1.101 fix root detection on evbarm when raid is involved there are several problems solved in this change: - - lots of work was re-done when we already have determined the device booted from, so several new early returns introduced if booted_device has been set - - due to the lack of cpu_bootconf(), raidframe softroot would override "root=xxx" on the boot command line (note that platforms that use eg, device_register() to detect the boot device are not affected by this issue as they find the boot device much earlier.) - - in the new cpu_bootconf(), switch the order of the platform boot-config with the set_root_device() call. this avoids a problem where "root=xxx" is checked after automated methods, and is thus ignored. - - in fdt_detect_root_device(), remove the code to add "root=xxx"" string to the boot_args[] that would be later parsed by the set_root_device() call, and simply set booted_device and, for mbr installs, booted_partition directly. also, for any successful call, perform an early return. - - define __HAVE_CPU_BOOTCONF so early boot calls cpu_bootconf(). tested on: - - rockpro64 booting from emmc, sata (big, and little endian) - - rockpro64 loading kernel from msdos partition - - rockpro64 booting from network (fails to auto-detect, with or without this change) - - quartz64 booting from nvme - - lx2k booting from nvme Locate wedges as boot device and also match a partition GUID. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.18.1 src/sys/arch/evbarm/evbarm/autoconf.c cvs rdiff -u -r1.99 -r1.99.2.1 src/sys/arch/evbarm/fdt/fdt_machdep.c cvs rdiff -u -r1.15 -r1.15.16.1 src/sys/arch/evbarm/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: martin Date: Fri Oct 20 16:07:16 UTC 2023 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: Move MKDEBUG=yes no symbol stripping entry to CHANGES.prev after pullup To generate a diff of this commit: cvs rdiff -u -r1.3008 -r1.3009 src/doc/CHANGES cvs rdiff -u -r1.173 -r1.174 src/doc/CHANGES.prev 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 diff -u src/doc/CHANGES:1.3008 src/doc/CHANGES:1.3009 --- src/doc/CHANGES:1.3008 Fri Oct 20 15:41:18 2023 +++ src/doc/CHANGES Fri Oct 20 16:07:16 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3008 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3009 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -180,7 +180,6 @@ Changes from NetBSD 10.0 to NetBSD 11.0: dhcpcd: Import version 10.0.2. [roy 20230719] bta2dpd(8): Add throttle when playing from file. [nat 20230720] xen: Enable MKCTF=yes by default. [riastradh 20230721] - build: Force MKSTRIPSYM=no if MKDEBUG=yes. [lukem 20230723] x86: Add serial console support to efiboot via raw I/O port access. [rin 20230724] x86: Turn off Zenbleed chicken bit on Zen2 CPUs. [mrg 20230725] Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.173 src/doc/CHANGES.prev:1.174 --- src/doc/CHANGES.prev:1.173 Wed Sep 13 09:27:53 2023 +++ src/doc/CHANGES.prev Fri Oct 20 16:07:16 2023 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.173 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.174 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -13429,3 +13429,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: [nia 20230211] u3g(4): Add support for ZTE MF112 and D-Link DWM222 3G USB modems [manu 20230213] + build: Force MKSTRIPSYM=no if MKDEBUG=yes. [lukem 20230723]
CVS commit: src/doc
Module Name:src Committed By: martin Date: Fri Oct 20 16:07:16 UTC 2023 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: Move MKDEBUG=yes no symbol stripping entry to CHANGES.prev after pullup To generate a diff of this commit: cvs rdiff -u -r1.3008 -r1.3009 src/doc/CHANGES cvs rdiff -u -r1.173 -r1.174 src/doc/CHANGES.prev 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: Fri Oct 20 16:06:56 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Move MKDEBUG=yes no symbol stripping entry to CHANGES.prev after pullup To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 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.141 src/doc/CHANGES-10.0:1.1.2.142 --- src/doc/CHANGES-10.0:1.1.2.141 Thu Oct 19 07:24:45 2023 +++ src/doc/CHANGES-10.0 Fri Oct 20 16:06:56 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.141 2023/10/19 07:24:45 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.142 2023/10/20 16:06:56 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -12619,3 +12619,10 @@ tests/net/if_lagg/t_lagg.sh 1.9,1.10 lagg(4): PR 57650: locking fixes and documentation updates. [yamaguchi, ticket #429] +doc/CHANGES 1.2984 (adjusted) +share/man/man5/mk.conf.5 1.108 +share/mk/bsd.own.mk1.1345 + + bsd.own.mk: do not strip local symbols with MKDEBUG=yes. + [mrg, ticket #430] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Fri Oct 20 16:06:56 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Move MKDEBUG=yes no symbol stripping entry to CHANGES.prev after pullup To generate a diff of this commit: cvs rdiff -u -r1.1.2.141 -r1.1.2.142 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: Fri Oct 20 16:04:59 UTC 2023
Modified Files:
src/doc [netbsd-10]: CHANGES
src/share/man/man5 [netbsd-10]: mk.conf.5
src/share/mk [netbsd-10]: bsd.own.mk
Log Message:
Pull up following revision(s) (requested by mrg in ticket #430):
doc/CHANGES: revision 1.2984
share/mk/bsd.own.mk: revision 1.1345
share/man/man5/mk.conf.5: revision 1.108
bsd.own.mk: force MKSTRIPSYM=no if MKDEBUG=yes
Local symbols are desirable with MKDEBUG=yes, so don't strip them.
Per request from mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.2940.2.6 -r1.2940.2.7 src/doc/CHANGES
cvs rdiff -u -r1.97 -r1.97.2.1 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.1289.2.1 -r1.1289.2.2 src/share/mk/bsd.own.mk
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
diff -u src/doc/CHANGES:1.2940.2.6 src/doc/CHANGES:1.2940.2.7
--- src/doc/CHANGES:1.2940.2.6 Sun Oct 8 14:35:24 2023
+++ src/doc/CHANGES Fri Oct 20 16:04:59 2023
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2940.2.6 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2940.2.7 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -800,4 +800,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
[rin 20231007]
igc(4): Add initial support to Intel I225/I226 series Ethernet devices.
[knakahara, rin, msaitoh 20231006]
+ build: Force MKSTRIPSYM=no if MKDEBUG=yes. [lukem 20231020]
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.97 src/share/man/man5/mk.conf.5:1.97.2.1
--- src/share/man/man5/mk.conf.5:1.97 Sat Jul 9 08:27:35 2022
+++ src/share/man/man5/mk.conf.5 Fri Oct 20 16:04:59 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.97 2022/07/09 08:27:35 nia Exp $
+.\" $NetBSD: mk.conf.5,v 1.97.2.1 2023/10/20 16:04:59 martin Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd July 9, 2022
+.Dd October 20, 2023
.Dt MK.CONF 5
.Os
.\" turn off hyphenation
@@ -374,6 +374,12 @@ is built.
.YorN
Indicates whether separate debugging symbols should be installed into
.Sy DESTDIR Ns Pa /usr/libdata/debug .
+.Pp
+If
+.Dq yes ,
+acts as
+.Sy MKSTRIPSYM=no .
+.
.DFLTn
.
.It Sy MKDEBUGKERNEL
@@ -861,6 +867,7 @@ Keeping non-temporary local symbols
such as static function names is useful on using DTrace for
userland libraries and getting a backtrace from a rump kernel
loading shared libraries.
+.NOVAR MKDEBUG=yes
.DFLTy
.
.It Sy MKUNPRIVED
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1289.2.1 src/share/mk/bsd.own.mk:1.1289.2.2
--- src/share/mk/bsd.own.mk:1.1289.2.1 Fri Aug 11 13:43:42 2023
+++ src/share/mk/bsd.own.mk Fri Oct 20 16:04:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1289.2.1 2023/08/11 13:43:42 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.1289.2.2 2023/10/20 16:04:59 martin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1428,6 +1428,13 @@ MKLIBCXX:= yes
.endif
#
+# Disable MKSTRIPSYM if MKDEBUG is enabled.
+#
+.if ${MKDEBUG} != "no"
+MKSTRIPSYM:= no
+.endif
+
+#
# install(1) parameters.
#
COPY?= -c
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Fri Oct 20 16:04:59 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES src/share/man/man5 [netbsd-10]: mk.conf.5 src/share/mk [netbsd-10]: bsd.own.mk Log Message: Pull up following revision(s) (requested by mrg in ticket #430): doc/CHANGES: revision 1.2984 share/mk/bsd.own.mk: revision 1.1345 share/man/man5/mk.conf.5: revision 1.108 bsd.own.mk: force MKSTRIPSYM=no if MKDEBUG=yes Local symbols are desirable with MKDEBUG=yes, so don't strip them. Per request from mrg@ To generate a diff of this commit: cvs rdiff -u -r1.2940.2.6 -r1.2940.2.7 src/doc/CHANGES cvs rdiff -u -r1.97 -r1.97.2.1 src/share/man/man5/mk.conf.5 cvs rdiff -u -r1.1289.2.1 -r1.1289.2.2 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Fri Oct 20 15:41:18 UTC 2023 Modified Files: src/doc: CHANGES Log Message: doc: Add note about eqos(4)'s Elkhart Lake support. To generate a diff of this commit: cvs rdiff -u -r1.3007 -r1.3008 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: msaitoh Date: Fri Oct 20 15:41:18 UTC 2023 Modified Files: src/doc: CHANGES Log Message: doc: Add note about eqos(4)'s Elkhart Lake support. To generate a diff of this commit: cvs rdiff -u -r1.3007 -r1.3008 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.3007 src/doc/CHANGES:1.3008 --- src/doc/CHANGES:1.3007 Thu Oct 19 11:27:57 2023 +++ src/doc/CHANGES Fri Oct 20 15:41:18 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3007 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.3008 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -229,4 +229,5 @@ Changes from NetBSD 10.0 to NetBSD 11.0: gcc.old: Initial import of major vax toolchain fix by Kalvis Duckmanton. [rin 20231007] dhcpcd: Import version 10.0.4. [roy 20231019] - + eqos(4): Add support for Intel Elkhart Lake internal Ethernet devices. + [msaitoh 20231019]
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Fri Oct 20 13:29:51 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
eqos(4): Fix compile error for arch that sizeof(bus_size_t) == 4 (i386).
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/dwc_eqos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.20 src/sys/dev/ic/dwc_eqos.c:1.21
--- src/sys/dev/ic/dwc_eqos.c:1.20 Fri Oct 20 09:58:11 2023
+++ src/sys/dev/ic/dwc_eqos.c Fri Oct 20 13:29:51 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.20 2023/10/20 09:58:11 msaitoh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.21 2023/10/20 13:29:51 msaitoh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -38,7 +38,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.20 2023/10/20 09:58:11 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.21 2023/10/20 13:29:51 msaitoh Exp $");
#include
#include
@@ -90,7 +90,7 @@ unsigned int eqos_debug;
#define CALLOUT_FLAGS 0
#endif
-#define DESC_BOUNDARY (1ULL << 32)
+#define DESC_BOUNDARY ((sizeof(bus_size_t) > 4) ? (1ULL << 32) : 0)
#define DESC_ALIGN sizeof(struct eqos_dma_desc)
#define TX_DESC_COUNT EQOS_DMA_DESC_COUNT
#define TX_DESC_SIZE (TX_DESC_COUNT * DESC_ALIGN)
@@ -272,10 +272,12 @@ eqos_setup_txdesc(struct eqos_softc *sc,
++sc->sc_tx.queued;
}
- KASSERT(!EQOS_HW_FEATURE_ADDR64_32BIT(sc) || (paddr >> 32) == 0);
+ KASSERT(!EQOS_HW_FEATURE_ADDR64_32BIT(sc) ||
+ ((uint64_t)paddr >> 32) == 0);
sc->sc_tx.desc_ring[index].tdes0 = htole32((uint32_t)paddr);
- sc->sc_tx.desc_ring[index].tdes1 = htole32((uint32_t)(paddr >> 32));
+ sc->sc_tx.desc_ring[index].tdes1
+ = htole32((uint32_t)((uint64_t)paddr >> 32));
sc->sc_tx.desc_ring[index].tdes2 = htole32(tdes2 | len);
sc->sc_tx.desc_ring[index].tdes3 = htole32(tdes3 | total_len);
DPRINTF(EDEB_TXRING, "preparing desc %u\n", index);
@@ -359,7 +361,8 @@ eqos_setup_rxdesc(struct eqos_softc *sc,
{
sc->sc_rx.desc_ring[index].tdes0 = htole32((uint32_t)paddr);
- sc->sc_rx.desc_ring[index].tdes1 = htole32((uint32_t)(paddr >> 32));
+ sc->sc_rx.desc_ring[index].tdes1 =
+ htole32((uint32_t)((uint64_t)paddr >> 32));
sc->sc_rx.desc_ring[index].tdes2 = htole32(0);
bus_dmamap_sync(sc->sc_dmat, sc->sc_rx.desc_map,
DESC_OFF(index), offsetof(struct eqos_dma_desc, tdes3),
@@ -541,7 +544,7 @@ eqos_init_rings(struct eqos_softc *sc, i
sc->sc_rx_receiving_m_last = NULL;
WR4(sc, GMAC_DMA_CHAN0_TX_BASE_ADDR_HI,
- (uint32_t)(sc->sc_tx.desc_ring_paddr >> 32));
+ (uint32_t)((uint64_t)sc->sc_tx.desc_ring_paddr >> 32));
WR4(sc, GMAC_DMA_CHAN0_TX_BASE_ADDR,
(uint32_t)sc->sc_tx.desc_ring_paddr);
WR4(sc, GMAC_DMA_CHAN0_TX_RING_LEN, TX_DESC_COUNT - 1);
@@ -550,7 +553,7 @@ eqos_init_rings(struct eqos_softc *sc, i
sc->sc_rx.cur = sc->sc_rx.next = sc->sc_rx.queued = 0;
WR4(sc, GMAC_DMA_CHAN0_RX_BASE_ADDR_HI,
- (uint32_t)(sc->sc_rx.desc_ring_paddr >> 32));
+ (uint32_t)((uint64_t)sc->sc_rx.desc_ring_paddr >> 32));
WR4(sc, GMAC_DMA_CHAN0_RX_BASE_ADDR,
(uint32_t)sc->sc_rx.desc_ring_paddr);
WR4(sc, GMAC_DMA_CHAN0_RX_RING_LEN, RX_DESC_COUNT - 1);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Fri Oct 20 13:29:51 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Fix compile error for arch that sizeof(bus_size_t) == 4 (i386). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: wiz Date: Fri Oct 20 13:04:21 UTC 2023 Modified Files: src/usr.sbin/vnconfig: vnconfig.8 Log Message: New sentence, new line. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: wiz Date: Fri Oct 20 13:04:21 UTC 2023 Modified Files: src/usr.sbin/vnconfig: vnconfig.8 Log Message: New sentence, new line. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/vnconfig/vnconfig.8 diff -u src/usr.sbin/vnconfig/vnconfig.8:1.47 src/usr.sbin/vnconfig/vnconfig.8:1.48 --- src/usr.sbin/vnconfig/vnconfig.8:1.47 Fri Oct 20 12:45:17 2023 +++ src/usr.sbin/vnconfig/vnconfig.8 Fri Oct 20 13:04:21 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnconfig.8,v 1.47 2023/10/20 12:45:17 gdt Exp $ +.\" $NetBSD: vnconfig.8,v 1.48 2023/10/20 13:04:21 wiz Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -61,7 +61,7 @@ .\" .\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93 .\" -.Dd January 10, 2021 +.Dd October 20, 2023 .Dt VNDCONFIG 8 .Os .Sh NAME @@ -100,9 +100,10 @@ The is a special file of raw partition or name of vnode disk like .Pa vnd0 . .Pp -By default, accesses to the file bypass normal mechanisms. This -behavior results in not updating the modification timestamp of the -file. Also, file contents read through the filesystem may not be the +By default, accesses to the file bypass normal mechanisms. +This behavior results in not updating the modification timestamp +of the file. +Also, file contents read through the filesystem may not be the correct values of ciphertext, which can lead to corrupted backups of the backing file. .Pp
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: gdt Date: Fri Oct 20 12:45:17 UTC 2023 Modified Files: src/usr.sbin/vnconfig: vnconfig.8 Log Message: vnconfig: Add caution to man page about cache bypassing behavior To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/vnconfig/vnconfig.8 diff -u src/usr.sbin/vnconfig/vnconfig.8:1.46 src/usr.sbin/vnconfig/vnconfig.8:1.47 --- src/usr.sbin/vnconfig/vnconfig.8:1.46 Sat Jan 9 23:54:26 2021 +++ src/usr.sbin/vnconfig/vnconfig.8 Fri Oct 20 12:45:17 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnconfig.8,v 1.46 2021/01/09 23:54:26 wiz Exp $ +.\" $NetBSD: vnconfig.8,v 1.47 2023/10/20 12:45:17 gdt Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -100,6 +100,12 @@ The is a special file of raw partition or name of vnode disk like .Pa vnd0 . .Pp +By default, accesses to the file bypass normal mechanisms. This +behavior results in not updating the modification timestamp of the +file. Also, file contents read through the filesystem may not be the +correct values of ciphertext, which can lead to corrupted backups of +the backing file. +.Pp Options indicate an action to be performed: .Bl -tag -width indent .It Fl c
CVS commit: src/usr.sbin/vnconfig
Module Name:src Committed By: gdt Date: Fri Oct 20 12:45:17 UTC 2023 Modified Files: src/usr.sbin/vnconfig: vnconfig.8 Log Message: vnconfig: Add caution to man page about cache bypassing behavior To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/vnconfig/vnconfig.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/next68k/dev
Module Name:src Committed By: andvar Date: Fri Oct 20 11:38:25 UTC 2023 Modified Files: src/sys/arch/next68k/dev: zs_kgdb.c Log Message: make zs_kgdb.c build for next68k. kgdb_dev expects llx/d format specifier. change serial number print message to the same as sgimips. remove rr0 definition in zs_kgdb_txint, it is unused. Fixes also KGDB enabled build for next68k. Similar or partial changes likely required for few other ports. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/next68k/dev/zs_kgdb.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/next68k/dev
Module Name:src
Committed By: andvar
Date: Fri Oct 20 11:38:25 UTC 2023
Modified Files:
src/sys/arch/next68k/dev: zs_kgdb.c
Log Message:
make zs_kgdb.c build for next68k.
kgdb_dev expects llx/d format specifier.
change serial number print message to the same as sgimips.
remove rr0 definition in zs_kgdb_txint, it is unused.
Fixes also KGDB enabled build for next68k.
Similar or partial changes likely required for few other ports.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/next68k/dev/zs_kgdb.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/next68k/dev/zs_kgdb.c
diff -u src/sys/arch/next68k/dev/zs_kgdb.c:1.12 src/sys/arch/next68k/dev/zs_kgdb.c:1.13
--- src/sys/arch/next68k/dev/zs_kgdb.c:1.12 Mon Apr 28 20:23:30 2008
+++ src/sys/arch/next68k/dev/zs_kgdb.c Fri Oct 20 11:38:25 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zs_kgdb.c,v 1.12 2008/04/28 20:23:30 martin Exp $ */
+/* $NetBSD: zs_kgdb.c,v 1.13 2023/10/20 11:38:25 andvar Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.12 2008/04/28 20:23:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs_kgdb.c,v 1.13 2023/10/20 11:38:25 andvar Exp $");
#include "opt_kgdb.h"
@@ -134,14 +134,14 @@ zs_kgdb_init(void)
int channel;
extern const struct cdevsw zstty_cdevsw;
- printf("zs_kgdb_init: kgdb_dev=0x%x\n", kgdb_dev);
+ printf("zs_kgdb_init: kgdb_dev=0x%llx\n", kgdb_dev);
if (cdevsw_lookup(kgdb_dev) != _cdevsw)
return;
/* Note: (ttya,ttyb) on zs0, and (ttyc,ttyd) on zs2 */
channel = kgdb_dev & 1;
- printf("zs_kgdb_init: attaching tty%c at %d baud\n",
- 'a' + (kgdb_dev & 3), kgdb_rate);
+ printf("zs_kgdb_init: attaching to Serial(%lld) at %d baud\n",
+ (kgdb_dev & 3), kgdb_rate);
/* Setup temporary chanstate. */
memset(, 0, sizeof(cs));
@@ -244,9 +244,6 @@ zs_kgdb_rxint(struct zs_chanstate *cs)
static void
zs_kgdb_txint(struct zs_chanstate *cs)
{
- int rr0;
-
- rr0 = zs_read_csr(cs);
zs_write_csr(cs, ZSWR0_RESET_TXINT);
}
CVS commit: xsrc/external/mit/ctwm/dist
Module Name:xsrc
Committed By: mlelstv
Date: Fri Oct 20 10:18:56 UTC 2023
Modified Files:
xsrc/external/mit/ctwm/dist: signals.c
Log Message:
Use a SIGCHLD handler instead of ignoring the signal.
This avoids lockups when child processes were inherited (e.g. from .xsession)
but new children are waited for in system().
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/ctwm/dist/signals.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/ctwm/dist/signals.c
diff -u xsrc/external/mit/ctwm/dist/signals.c:1.1.1.1 xsrc/external/mit/ctwm/dist/signals.c:1.2
--- xsrc/external/mit/ctwm/dist/signals.c:1.1.1.1 Wed Jul 5 07:36:07 2023
+++ xsrc/external/mit/ctwm/dist/signals.c Fri Oct 20 10:18:55 2023
@@ -8,6 +8,8 @@
#include
#include
#include
+#include
+#include
#include "ctwm_shutdown.h"
#include "signals.h"
@@ -26,6 +28,15 @@ static bool sig_shutdown = false;
// needs to trigger an action.
bool SignalFlag = false;
+void ChildExit(int signum)
+{
+ int Errno = errno;
+ /* reap dead children, ignore status */
+ while (waitpid(-1, NULL, WNOHANG) > 0)
+ continue;
+ /* restore errno for interrupted sys calls */
+ errno = Errno;
+}
/**
* Setup signal handlers (run during startup)
@@ -46,9 +57,12 @@ setup_signal_handlers(void)
// die...
signal(SIGALRM, SIG_IGN);
- // This should be set by default, but just in case; explicitly don't
- // leave zombies.
- signal(SIGCHLD, SIG_IGN);
+ /* Setting SIGCHLD to SIG_IGN detaches children from the parent
+ * immediately, so it need not be waited for.
+ * In fact, you cannot wait for it, so a function like system()
+ * breaks.
+ */
+ signal(SIGCHLD, ChildExit);
return;
}
CVS commit: xsrc/external/mit/ctwm/dist
Module Name:xsrc Committed By: mlelstv Date: Fri Oct 20 10:18:56 UTC 2023 Modified Files: xsrc/external/mit/ctwm/dist: signals.c Log Message: Use a SIGCHLD handler instead of ignoring the signal. This avoids lockups when child processes were inherited (e.g. from .xsession) but new children are waited for in system(). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/ctwm/dist/signals.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: msaitoh Date: Fri Oct 20 10:09:44 UTC 2023 Modified Files: src/share/man/man4: eqos.4 src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/dev/pci: files.pci Added Files: src/sys/dev/pci: if_eqos_pci.c Log Message: eqos(4): Add initial support for Intel Elkhart Lake internal Ethernet devices. - Only tested on PSE SGMII 1G Ethernet MAC with MaxLinear GPY115. - I don't know why dmat64 doesn't work. eqos_attach() have a special code if EQOS_HW_FEATURE_ADDR64_32BIT(sc) is true, but it seems it doesn't work. - TODO: Multiqueue support. Detach support. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/eqos.4 cvs rdiff -u -r1.606 -r1.607 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1250 -r1.1251 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.447 -r1.448 src/sys/dev/pci/files.pci cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/if_eqos_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/eqos.4 diff -u src/share/man/man4/eqos.4:1.1 src/share/man/man4/eqos.4:1.2 --- src/share/man/man4/eqos.4:1.1 Thu Jan 6 21:55:23 2022 +++ src/share/man/man4/eqos.4 Fri Oct 20 10:09:43 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: eqos.4,v 1.1 2022/01/06 21:55:23 nia Exp $ +.\" $NetBSD: eqos.4,v 1.2 2023/10/20 10:09:43 msaitoh Exp $ .\" .\" Copyright (c) 2022 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd January 6, 2022 +.Dd October 20, 2023 .Dt EQOS 4 .Os .Sh NAME @@ -35,6 +35,7 @@ .Nd DesignWare Ethernet Quality-of-Service controller .Sh SYNOPSIS .Cd "eqos* at acpi?" +.Cd "eqos* at pci?" .Sh DESCRIPTION The .Nm Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.606 src/sys/arch/amd64/conf/GENERIC:1.607 --- src/sys/arch/amd64/conf/GENERIC:1.606 Wed Oct 4 07:48:55 2023 +++ src/sys/arch/amd64/conf/GENERIC Fri Oct 20 10:09:43 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.606 2023/10/04 07:48:55 rin Exp $ +# $NetBSD: GENERIC,v 1.607 2023/10/20 10:09:43 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.606 $" +#ident "GENERIC-$Revision: 1.607 $" maxusers 64 # estimated number of users @@ -827,6 +827,7 @@ dge* at pci? dev ? function ? # Intel 82 ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet +eqos* at pci? dev ? function ? # DesignWare Ethernet QoS et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit ex* at pci? dev ? function ? # 3Com 90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1250 src/sys/arch/i386/conf/GENERIC:1.1251 --- src/sys/arch/i386/conf/GENERIC:1.1250 Sun Jul 16 10:20:07 2023 +++ src/sys/arch/i386/conf/GENERIC Fri Oct 20 10:09:44 2023 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1250 2023/07/16 10:20:07 riastradh Exp $ +# $NetBSD: GENERIC,v 1.1251 2023/10/20 10:09:44 msaitoh Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1250 $" +#ident "GENERIC-$Revision: 1.1251 $" maxusers 64 # estimated number of users @@ -982,6 +982,7 @@ bwfm* at pci? dev ? function ? # Broadco dge* at pci? dev ? function ? # Intel 82597 10GbE LR ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet +eqos* at pci? dev ? function ? # DesignWare Ethernet QoS et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit ex* at pci? dev ? function ? # 3Com 3c90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.447 src/sys/dev/pci/files.pci:1.448 --- src/sys/dev/pci/files.pci:1.447 Wed Oct 4 07:35:27 2023 +++ src/sys/dev/pci/files.pci Fri Oct 20 10:09:43 2023 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.447 2023/10/04 07:35:27 rin Exp $ +# $NetBSD: files.pci,v 1.448 2023/10/20 10:09:43 msaitoh Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -1172,6 +1172,10 @@ file dev/pci/if_ena.c ena file external/bsd/ena-com/ena_com.c ena file external/bsd/ena-com/ena_eth_com.c ena +# PCI based DesignWare Ethernet QoS +attach eqos at pci with eqos_pci +file dev/pci/if_eqos_pci.c eqos_pci + # Intel QuickAssist device qat:
CVS commit: src
Module Name:src Committed By: msaitoh Date: Fri Oct 20 10:09:44 UTC 2023 Modified Files: src/share/man/man4: eqos.4 src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC src/sys/dev/pci: files.pci Added Files: src/sys/dev/pci: if_eqos_pci.c Log Message: eqos(4): Add initial support for Intel Elkhart Lake internal Ethernet devices. - Only tested on PSE SGMII 1G Ethernet MAC with MaxLinear GPY115. - I don't know why dmat64 doesn't work. eqos_attach() have a special code if EQOS_HW_FEATURE_ADDR64_32BIT(sc) is true, but it seems it doesn't work. - TODO: Multiqueue support. Detach support. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/eqos.4 cvs rdiff -u -r1.606 -r1.607 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1250 -r1.1251 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.447 -r1.448 src/sys/dev/pci/files.pci cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/if_eqos_pci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Fri Oct 20 09:58:11 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Accept if snpsver == 0x52. Tested with Intel Elkhart Lake. TODO: Multiqueue support. Add watchdog timer. Add detach function. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Fri Oct 20 09:58:11 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
eqos(4): Accept if snpsver == 0x52. Tested with Intel Elkhart Lake.
TODO:
Multiqueue support.
Add watchdog timer.
Add detach function.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/dwc_eqos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.19 src/sys/dev/ic/dwc_eqos.c:1.20
--- src/sys/dev/ic/dwc_eqos.c:1.19 Fri Oct 20 09:53:27 2023
+++ src/sys/dev/ic/dwc_eqos.c Fri Oct 20 09:58:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.19 2023/10/20 09:53:27 msaitoh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.20 2023/10/20 09:58:11 msaitoh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -28,12 +28,17 @@
/*
* DesignWare Ethernet Quality-of-Service controller
+ *
+ * TODO:
+ * Multiqueue support.
+ * Add watchdog timer.
+ * Add detach function.
*/
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.19 2023/10/20 09:53:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.20 2023/10/20 09:58:11 msaitoh Exp $");
#include
#include
@@ -1378,11 +1383,11 @@ eqos_attach(struct eqos_softc *sc)
GMAC_MAC_VERSION_USERVER_SHIFT;
snpsver = ver & GMAC_MAC_VERSION_SNPSVER_MASK;
- if (snpsver != 0x51) {
- aprint_error(": EQOS version 0x%02xx not supported\n",
- snpsver);
- return ENXIO;
- }
+ if ((snpsver < 0x51) || (snpsver > 0x52)) {
+ aprint_error(": EQOS version 0x%02xx not supported\n",
+ snpsver);
+ return ENXIO;
+ }
if (sc->sc_csr_clock < 2000) {
aprint_error(": CSR clock too low\n");
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Fri Oct 20 09:53:27 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Add missing clock range. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Fri Oct 20 09:53:27 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
eqos(4): Add missing clock range.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/dwc_eqos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.18 src/sys/dev/ic/dwc_eqos.c:1.19
--- src/sys/dev/ic/dwc_eqos.c:1.18 Fri Oct 20 09:51:49 2023
+++ src/sys/dev/ic/dwc_eqos.c Fri Oct 20 09:53:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.18 2023/10/20 09:51:49 msaitoh Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.19 2023/10/20 09:53:27 msaitoh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.18 2023/10/20 09:51:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.19 2023/10/20 09:53:27 msaitoh Exp $");
#include
#include
@@ -1398,6 +1398,8 @@ eqos_attach(struct eqos_softc *sc)
} else if (sc->sc_csr_clock < 25000) {
sc->sc_clock_range = GMAC_MAC_MDIO_ADDRESS_CR_150_250;
} else if (sc->sc_csr_clock < 3) {
+ sc->sc_clock_range = GMAC_MAC_MDIO_ADDRESS_CR_250_300;
+ } else if (sc->sc_csr_clock < 5) {
sc->sc_clock_range = GMAC_MAC_MDIO_ADDRESS_CR_300_500;
} else if (sc->sc_csr_clock < 8) {
sc->sc_clock_range = GMAC_MAC_MDIO_ADDRESS_CR_500_800;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: msaitoh
Date: Fri Oct 20 09:51:49 UTC 2023
Modified Files:
src/sys/dev/ic: dwc_eqos.c
Log Message:
eqos(4): Fix a bug that the MAC address is swapped.
Don't swap the MAC address in eqos_get_eaddr(). Other OSes except FreeBSD
(which was based on NetBSD's) don't swap it. With this change, my own
OnLogic Helix 330's MAC address becomes correct. The OUI is 84:8b:cd:4d.
It's owned by Logic Supply and they were acquired by OnLogic.
On Quartz64 with UEIF, the MAC address is wrongly set and the multicast
bit might be set. To do workaround, clear the bit if it's set.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/dwc_eqos.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_eqos.c
diff -u src/sys/dev/ic/dwc_eqos.c:1.17 src/sys/dev/ic/dwc_eqos.c:1.18
--- src/sys/dev/ic/dwc_eqos.c:1.17 Sat Jun 3 20:41:45 2023
+++ src/sys/dev/ic/dwc_eqos.c Fri Oct 20 09:51:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_eqos.c,v 1.17 2023/06/03 20:41:45 andvar Exp $ */
+/* $NetBSD: dwc_eqos.c,v 1.18 2023/10/20 09:51:49 msaitoh Exp $ */
/*-
* Copyright (c) 2022 Jared McNeill
@@ -33,7 +33,7 @@
#include "opt_net_mpsafe.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.17 2023/06/03 20:41:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_eqos.c,v 1.18 2023/10/20 09:51:49 msaitoh Exp $");
#include
#include
@@ -1202,8 +1202,13 @@ eqos_get_eaddr(struct eqos_softc *sc, ui
return;
}
- maclo = htobe32(RD4(sc, GMAC_MAC_ADDRESS0_LOW));
- machi = htobe16(RD4(sc, GMAC_MAC_ADDRESS0_HIGH) & 0x);
+ maclo = RD4(sc, GMAC_MAC_ADDRESS0_LOW);
+ machi = RD4(sc, GMAC_MAC_ADDRESS0_HIGH) & 0x;
+ if ((maclo & 0x0001) != 0) {
+ aprint_error_dev(sc->sc_dev,
+ "Wrong MAC address. Clear the multicast bit.\n");
+ maclo &= ~0x0001;
+ }
if (maclo == 0x && machi == 0x) {
/* Create one */
CVS commit: src/sys/dev/ic
Module Name:src Committed By: msaitoh Date: Fri Oct 20 09:51:49 UTC 2023 Modified Files: src/sys/dev/ic: dwc_eqos.c Log Message: eqos(4): Fix a bug that the MAC address is swapped. Don't swap the MAC address in eqos_get_eaddr(). Other OSes except FreeBSD (which was based on NetBSD's) don't swap it. With this change, my own OnLogic Helix 330's MAC address becomes correct. The OUI is 84:8b:cd:4d. It's owned by Logic Supply and they were acquired by OnLogic. On Quartz64 with UEIF, the MAC address is wrongly set and the multicast bit might be set. To do workaround, clear the bit if it's set. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/dev/ic/dwc_eqos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: msaitoh
Date: Fri Oct 20 08:35:10 UTC 2023
Modified Files:
src/sys/net: if_ethersubr.c
Log Message:
Print error message when the multicast bit is set in the MAC address.
To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/sys/net/if_ethersubr.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/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.323 src/sys/net/if_ethersubr.c:1.324
--- src/sys/net/if_ethersubr.c:1.323 Tue Nov 15 10:47:39 2022
+++ src/sys/net/if_ethersubr.c Fri Oct 20 08:35:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.323 2022/11/15 10:47:39 roy Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.324 2023/10/20 08:35:09 msaitoh Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.323 2022/11/15 10:47:39 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.324 2023/10/20 08:35:09 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1041,6 +1041,10 @@ ether_ifattach(struct ifnet *ifp, const
struct ethercom *ec = (struct ethercom *)ifp;
char xnamebuf[HOOKNAMSIZ];
+ if (ETHER_IS_MULTICAST(lla))
+ aprint_error("The multicast bit is set in the MAC address. "
+ "It's wrong.\n");
+
ifp->if_type = IFT_ETHER;
ifp->if_hdrlen = ETHER_HDR_LEN;
ifp->if_dlt = DLT_EN10MB;
CVS commit: src/sys/net
Module Name:src Committed By: msaitoh Date: Fri Oct 20 08:35:10 UTC 2023 Modified Files: src/sys/net: if_ethersubr.c Log Message: Print error message when the multicast bit is set in the MAC address. To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/sys/net/if_ethersubr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
