CVS commit: src/share/locale/time
Module Name:src Committed By: wiz Date: Wed Feb 1 20:24:22 UTC 2023 Modified Files: src/share/locale/time: de_AT.UTF-8.src Log Message: Add missing dot in abbreviation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/locale/time/de_AT.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/locale/time/de_AT.UTF-8.src diff -u src/share/locale/time/de_AT.UTF-8.src:1.2 src/share/locale/time/de_AT.UTF-8.src:1.3 --- src/share/locale/time/de_AT.UTF-8.src:1.2 Sun Aug 11 22:09:42 2013 +++ src/share/locale/time/de_AT.UTF-8.src Wed Feb 1 20:24:22 2023 @@ -1,4 +1,4 @@ -# $NetBSD: de_AT.UTF-8.src,v 1.2 2013/08/11 22:09:42 joerg Exp $ +# $NetBSD: de_AT.UTF-8.src,v 1.3 2023/02/01 20:24:22 wiz Exp $ # # Locale: de_AT # Character set: UTF-8 @@ -48,7 +48,7 @@ Samstag # # Short month names (abmon) # -Jän +Jän. Feb. Mär. Apr.
CVS commit: src/share/locale/time
Module Name:src Committed By: wiz Date: Wed Feb 1 20:24:22 UTC 2023 Modified Files: src/share/locale/time: de_AT.UTF-8.src Log Message: Add missing dot in abbreviation. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/locale/time/de_AT.UTF-8.src Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Wed Feb 1 19:38:21 UTC 2023
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
Log Message:
for MKDEBUG builds, set CXXFLAGS += -g1 for all GCC binaries.
reduces the size of a non-x11 i386 build by 38% - 992MiB -> 612MiB,
and likely similar reductions elsewhere. it also reduced the build
time by about 3%, perhaps from less IO to write and less data to
compress. for amd64, the size was reduced 1137MiB -> 741MiB, about
35%, though i don't have timing guesses here.
note that these are sizes of .gz not .xz (i enable pigz for my
builds), and this probably has a much greater benefit for xz builds
as the sets creation phase is much slower there.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/gpl3/gcc/usr.bin/Makefile.inc
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/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.34 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.35
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.34 Wed Dec 15 13:28:29 2021
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Wed Feb 1 19:38:20 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.34 2021/12/15 13:28:29 christos Exp $
+# $NetBSD: Makefile.inc,v 1.35 2023/02/01 19:38:20 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -43,6 +43,11 @@ NBCOMPATLIB= -L${TOOLDIR}/lib -lnbcomp
CXXFLAGS+= -std=gnu++98
+# Reduce debugging for these extremely large objects.
+.if ${MKDEBUG:Uno} != "no"
+CXXFLAGS+= -g1
+.endif
+
GNUHOSTDIST= ${DIST}
BUILD_PREFIX= ${C_BUILD_PREFIX}
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src Committed By: mrg Date: Wed Feb 1 19:38:21 UTC 2023 Modified Files: src/external/gpl3/gcc/usr.bin: Makefile.inc Log Message: for MKDEBUG builds, set CXXFLAGS += -g1 for all GCC binaries. reduces the size of a non-x11 i386 build by 38% - 992MiB -> 612MiB, and likely similar reductions elsewhere. it also reduced the build time by about 3%, perhaps from less IO to write and less data to compress. for amd64, the size was reduced 1137MiB -> 741MiB, about 35%, though i don't have timing guesses here. note that these are sizes of .gz not .xz (i enable pigz for my builds), and this probably has a much greater benefit for xz builds as the sets creation phase is much slower there. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/external/gpl3/gcc/usr.bin/Makefile.inc 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: Wed Feb 1 19:01:48 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1581 and #1582 To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 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.43 src/doc/CHANGES-9.4:1.1.2.44 --- src/doc/CHANGES-9.4:1.1.2.43 Mon Jan 30 11:42:11 2023 +++ src/doc/CHANGES-9.4 Wed Feb 1 19:01:48 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.43 2023/01/30 11:42:11 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.44 2023/02/01 19:01:48 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -714,3 +714,19 @@ sys/dev/pci/pcidevs_data.h (regen) PR 57202: add support for the EXAR XR17V354 PCIe UART. [thorpej, ticket #1580] +sys/arch/next68k/dev/esp.c 1.65 +sys/arch/next68k/include/bus_space.h 1.20 +sys/arch/next68k/include/cpu.h 1.51 +sys/arch/next68k/next68k/clock.c 1.13 +sys/arch/next68k/next68k/machdep.c 1.117 + + next68k: fix delay_divisor value for proper delay(9) on 68040. + Specify proper constraints for bus_space_read region and multi ops. + Fix silent stall of next68k esp(4) SCSI. + [tsutsui, ticket #1581] + +sys/arch/vax/boot/Makefile.inc 1.19 + + vax: make bootloader work on 8MB VAXen. + [tsutsui, ticket #1582] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Feb 1 19:01:48 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1581 and #1582 To generate a diff of this commit: cvs rdiff -u -r1.1.2.43 -r1.1.2.44 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/arch/vax/boot
Module Name:src
Committed By: martin
Date: Wed Feb 1 19:00:53 UTC 2023
Modified Files:
src/sys/arch/vax/boot [netbsd-9]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1582):
sys/arch/vax/boot/Makefile.inc: revision 1.19
Make a vax bootloader work on 8MB VAXen.
64KB (0x80 - 0x7f) is not enough for the bootloader itself
and more spaces are required for heap on loading a kernel.
https://mail-index.netbsd.org/port-vax/2023/01/24/msg004149.html
"Go ahead" from ragge@. Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/arch/vax/boot/Makefile.inc
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/vax/boot/Makefile.inc
diff -u src/sys/arch/vax/boot/Makefile.inc:1.18 src/sys/arch/vax/boot/Makefile.inc:1.18.6.1
--- src/sys/arch/vax/boot/Makefile.inc:1.18 Thu Mar 22 08:58:56 2018
+++ src/sys/arch/vax/boot/Makefile.inc Wed Feb 1 19:00:53 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2018/03/22 08:58:56 ragge Exp $
+# $NetBSD: Makefile.inc,v 1.18.6.1 2023/02/01 19:00:53 martin Exp $
NOSSP=
NOFORTIFY=
@@ -7,7 +7,7 @@ NODEBUG=
.include
-RELOC=0x7f
+RELOC=0x7d
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
CPPFLAGS+=-I.
CVS commit: [netbsd-9] src/sys/arch/vax/boot
Module Name:src Committed By: martin Date: Wed Feb 1 19:00:53 UTC 2023 Modified Files: src/sys/arch/vax/boot [netbsd-9]: Makefile.inc Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1582): sys/arch/vax/boot/Makefile.inc: revision 1.19 Make a vax bootloader work on 8MB VAXen. 64KB (0x80 - 0x7f) is not enough for the bootloader itself and more spaces are required for heap on loading a kernel. https://mail-index.netbsd.org/port-vax/2023/01/24/msg004149.html "Go ahead" from ragge@. Should be pulled up to netbsd-10 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.6.1 src/sys/arch/vax/boot/Makefile.inc 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: Wed Feb 1 19:00:10 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #63 and #64 To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 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.26 src/doc/CHANGES-10.0:1.1.2.27 --- src/doc/CHANGES-10.0:1.1.2.26 Mon Jan 30 11:56:02 2023 +++ src/doc/CHANGES-10.0 Wed Feb 1 19:00:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.26 2023/01/30 11:56:02 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.27 2023/02/01 19:00:10 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -743,3 +743,19 @@ distrib/common/bootimage/fstab.in 1.4 Mount /var/shm as tmpfs in install- and live-images. [maya, ticket #62] +sys/arch/next68k/dev/esp.c 1.65 +sys/arch/next68k/include/bus_space.h 1.20 +sys/arch/next68k/include/cpu.h 1.51 +sys/arch/next68k/next68k/clock.c 1.13 +sys/arch/next68k/next68k/machdep.c 1.117 + + next68k: fix delay_divisor value for proper delay(9) on 68040. + Specify proper constraints for bus_space_read region and multi ops. + Fix silent stall of next68k esp(4) SCSI. + [tsutsui, ticket #63] + +sys/arch/vax/boot/Makefile.inc 1.19 + + vax: make bootloader work on 8MB VAXen. + [tsutsui, ticket #64] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Feb 1 19:00:10 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #63 and #64 To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 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/vax/boot
Module Name:src Committed By: martin Date: Wed Feb 1 18:59:02 UTC 2023 Modified Files: src/sys/arch/vax/boot [netbsd-10]: Makefile.inc Log Message: Pull up following revision(s) (requested by tsutsui in ticket #64): sys/arch/vax/boot/Makefile.inc: revision 1.19 Make a vax bootloader work on 8MB VAXen. 64KB (0x80 - 0x7f) is not enough for the bootloader itself and more spaces are required for heap on loading a kernel. https://mail-index.netbsd.org/port-vax/2023/01/24/msg004149.html "Go ahead" from ragge@. Should be pulled up to netbsd-10 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.32.1 src/sys/arch/vax/boot/Makefile.inc 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/vax/boot
Module Name:src
Committed By: martin
Date: Wed Feb 1 18:59:02 UTC 2023
Modified Files:
src/sys/arch/vax/boot [netbsd-10]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #64):
sys/arch/vax/boot/Makefile.inc: revision 1.19
Make a vax bootloader work on 8MB VAXen.
64KB (0x80 - 0x7f) is not enough for the bootloader itself
and more spaces are required for heap on loading a kernel.
https://mail-index.netbsd.org/port-vax/2023/01/24/msg004149.html
"Go ahead" from ragge@. Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.32.1 src/sys/arch/vax/boot/Makefile.inc
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/vax/boot/Makefile.inc
diff -u src/sys/arch/vax/boot/Makefile.inc:1.18 src/sys/arch/vax/boot/Makefile.inc:1.18.32.1
--- src/sys/arch/vax/boot/Makefile.inc:1.18 Thu Mar 22 08:58:56 2018
+++ src/sys/arch/vax/boot/Makefile.inc Wed Feb 1 18:59:02 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2018/03/22 08:58:56 ragge Exp $
+# $NetBSD: Makefile.inc,v 1.18.32.1 2023/02/01 18:59:02 martin Exp $
NOSSP=
NOFORTIFY=
@@ -7,7 +7,7 @@ NODEBUG=
.include
-RELOC=0x7f
+RELOC=0x7d
.PATH: ${.CURDIR}/../../vax ${.CURDIR}/../common
CPPFLAGS+=-I.
CVS commit: [netbsd-9] src/sys/arch/next68k
Module Name:src
Committed By: martin
Date: Wed Feb 1 18:56:44 UTC 2023
Modified Files:
src/sys/arch/next68k/dev [netbsd-9]: esp.c
src/sys/arch/next68k/include [netbsd-9]: bus_space.h cpu.h
src/sys/arch/next68k/next68k [netbsd-9]: clock.c machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1581):
sys/arch/next68k/next68k/machdep.c: revision 1.117
sys/arch/next68k/dev/esp.c: revision 1.65
sys/arch/next68k/include/cpu.h: revision 1.51
sys/arch/next68k/include/bus_space.h: revision 1.20
sys/arch/next68k/next68k/clock.c: revision 1.13
next68k: Fix delay_divisor value for proper delay(9) on 68040.
next68k: Specify proper constraints for bus_space_read region and multi ops.
These functions write the read data into memory at a specified pointer,
but without the "memory" constraint gcc could optimize out these ops
if the memory is allocated on local stack.
With this fix nextkbd(4) works again.
Should be pulled up to netbsd-10 and netbsd-9.
next68k: Fix silent stall of next68k esp(4) SCSI.
next68k esp(4) driver requires nextdma(4) interrupts at ipl 6
during ncr53c9x_intr() for esp(4) at ipl 3. It worked on netbsd-5
and prior, but on netbsd-5 splbio() was changed from ipl 3 to 6
for SMP support and on netbsd-6 ncr53c9x driver was changed to
use mutex(9) instead of simple_lock(9), so nextdma interrupts
were no longer raised during ncr53c9x interrupt handler.
For now, just call mutex_exit(9) and mutex_enter(9) during
waiting nextdma(4) interrupts in MD esp_dma_intr() handler.
This could be wrong and the interrupt handler for nextdma should
be reorganized, but it just works.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.18.1 src/sys/arch/next68k/dev/esp.c
cvs rdiff -u -r1.16 -r1.16.52.1 src/sys/arch/next68k/include/bus_space.h
cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.12 -r1.12.64.1 src/sys/arch/next68k/next68k/clock.c
cvs rdiff -u -r1.112 -r1.112.4.1 src/sys/arch/next68k/next68k/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/next68k/dev/esp.c
diff -u src/sys/arch/next68k/dev/esp.c:1.64 src/sys/arch/next68k/dev/esp.c:1.64.18.1
--- src/sys/arch/next68k/dev/esp.c:1.64 Fri Mar 31 08:38:13 2017
+++ src/sys/arch/next68k/dev/esp.c Wed Feb 1 18:56:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.64 2017/03/31 08:38:13 msaitoh Exp $ */
+/* $NetBSD: esp.c,v 1.64.18.1 2023/02/01 18:56:44 martin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.64 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.64.18.1 2023/02/01 18:56:44 martin Exp $");
#include
#include
@@ -509,6 +509,7 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
}
#endif
+ mutex_exit(>sc_lock); /* for nextdma intr */
while (!nextdma_finished(nsc)) {
/* esp_dma_isactive(sc)) { */
NDTRACEIF (ndtrace_addc('w'));
@@ -602,7 +603,7 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
}
out:
- ;
+ mutex_enter(>sc_lock); /* for nextdma intr */
#ifdef ESP_DEBUG
/* esp_dma_nest--; */
Index: src/sys/arch/next68k/include/bus_space.h
diff -u src/sys/arch/next68k/include/bus_space.h:1.16 src/sys/arch/next68k/include/bus_space.h:1.16.52.1
--- src/sys/arch/next68k/include/bus_space.h:1.16 Sun Feb 12 16:34:10 2012
+++ src/sys/arch/next68k/include/bus_space.h Wed Feb 1 18:56:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.h,v 1.16 2012/02/12 16:34:10 matt Exp $ */
+/* $NetBSD: bus_space.h,v 1.16.52.1 2023/02/01 18:56:44 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -165,7 +165,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#define bus_space_read_multi_2(t, h, o, a, c) do { \
@@ -179,7 +179,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#define bus_space_read_multi_4(t, h, o, a, c) do { \
@@ -193,7 +193,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#if 0 /* Cause a link error for bus_space_read_multi_8 */
@@ -221,7 +221,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#define bus_space_read_region_2(t, h, o, a, c) do { \
@@ -235,7
CVS commit: [netbsd-9] src/sys/arch/next68k
Module Name:src Committed By: martin Date: Wed Feb 1 18:56:44 UTC 2023 Modified Files: src/sys/arch/next68k/dev [netbsd-9]: esp.c src/sys/arch/next68k/include [netbsd-9]: bus_space.h cpu.h src/sys/arch/next68k/next68k [netbsd-9]: clock.c machdep.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1581): sys/arch/next68k/next68k/machdep.c: revision 1.117 sys/arch/next68k/dev/esp.c: revision 1.65 sys/arch/next68k/include/cpu.h: revision 1.51 sys/arch/next68k/include/bus_space.h: revision 1.20 sys/arch/next68k/next68k/clock.c: revision 1.13 next68k: Fix delay_divisor value for proper delay(9) on 68040. next68k: Specify proper constraints for bus_space_read region and multi ops. These functions write the read data into memory at a specified pointer, but without the "memory" constraint gcc could optimize out these ops if the memory is allocated on local stack. With this fix nextkbd(4) works again. Should be pulled up to netbsd-10 and netbsd-9. next68k: Fix silent stall of next68k esp(4) SCSI. next68k esp(4) driver requires nextdma(4) interrupts at ipl 6 during ncr53c9x_intr() for esp(4) at ipl 3. It worked on netbsd-5 and prior, but on netbsd-5 splbio() was changed from ipl 3 to 6 for SMP support and on netbsd-6 ncr53c9x driver was changed to use mutex(9) instead of simple_lock(9), so nextdma interrupts were no longer raised during ncr53c9x interrupt handler. For now, just call mutex_exit(9) and mutex_enter(9) during waiting nextdma(4) interrupts in MD esp_dma_intr() handler. This could be wrong and the interrupt handler for nextdma should be reorganized, but it just works. Should be pulled up to netbsd-10 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.64.18.1 src/sys/arch/next68k/dev/esp.c cvs rdiff -u -r1.16 -r1.16.52.1 src/sys/arch/next68k/include/bus_space.h cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/next68k/include/cpu.h cvs rdiff -u -r1.12 -r1.12.64.1 src/sys/arch/next68k/next68k/clock.c cvs rdiff -u -r1.112 -r1.112.4.1 src/sys/arch/next68k/next68k/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/sys/arch/next68k
Module Name:src Committed By: martin Date: Wed Feb 1 18:55:11 UTC 2023 Modified Files: src/sys/arch/next68k/dev [netbsd-10]: esp.c src/sys/arch/next68k/include [netbsd-10]: bus_space.h cpu.h src/sys/arch/next68k/next68k [netbsd-10]: clock.c machdep.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #63): sys/arch/next68k/next68k/machdep.c: revision 1.117 sys/arch/next68k/dev/esp.c: revision 1.65 sys/arch/next68k/include/cpu.h: revision 1.51 sys/arch/next68k/include/bus_space.h: revision 1.20 sys/arch/next68k/next68k/clock.c: revision 1.13 next68k: Fix delay_divisor value for proper delay(9) on 68040. next68k: Specify proper constraints for bus_space_read region and multi ops. These functions write the read data into memory at a specified pointer, but without the "memory" constraint gcc could optimize out these ops if the memory is allocated on local stack. With this fix nextkbd(4) works again. Should be pulled up to netbsd-10 and netbsd-9. next68k: Fix silent stall of next68k esp(4) SCSI. next68k esp(4) driver requires nextdma(4) interrupts at ipl 6 during ncr53c9x_intr() for esp(4) at ipl 3. It worked on netbsd-5 and prior, but on netbsd-5 splbio() was changed from ipl 3 to 6 for SMP support and on netbsd-6 ncr53c9x driver was changed to use mutex(9) instead of simple_lock(9), so nextdma interrupts were no longer raised during ncr53c9x interrupt handler. For now, just call mutex_exit(9) and mutex_enter(9) during waiting nextdma(4) interrupts in MD esp_dma_intr() handler. This could be wrong and the interrupt handler for nextdma should be reorganized, but it just works. Should be pulled up to netbsd-10 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.64.44.1 src/sys/arch/next68k/dev/esp.c cvs rdiff -u -r1.19 -r1.19.18.1 src/sys/arch/next68k/include/bus_space.h cvs rdiff -u -r1.50 -r1.50.26.1 src/sys/arch/next68k/include/cpu.h cvs rdiff -u -r1.12 -r1.12.90.1 src/sys/arch/next68k/next68k/clock.c cvs rdiff -u -r1.116 -r1.116.4.1 src/sys/arch/next68k/next68k/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/sys/arch/next68k
Module Name:src
Committed By: martin
Date: Wed Feb 1 18:55:11 UTC 2023
Modified Files:
src/sys/arch/next68k/dev [netbsd-10]: esp.c
src/sys/arch/next68k/include [netbsd-10]: bus_space.h cpu.h
src/sys/arch/next68k/next68k [netbsd-10]: clock.c machdep.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #63):
sys/arch/next68k/next68k/machdep.c: revision 1.117
sys/arch/next68k/dev/esp.c: revision 1.65
sys/arch/next68k/include/cpu.h: revision 1.51
sys/arch/next68k/include/bus_space.h: revision 1.20
sys/arch/next68k/next68k/clock.c: revision 1.13
next68k: Fix delay_divisor value for proper delay(9) on 68040.
next68k: Specify proper constraints for bus_space_read region and multi ops.
These functions write the read data into memory at a specified pointer,
but without the "memory" constraint gcc could optimize out these ops
if the memory is allocated on local stack.
With this fix nextkbd(4) works again.
Should be pulled up to netbsd-10 and netbsd-9.
next68k: Fix silent stall of next68k esp(4) SCSI.
next68k esp(4) driver requires nextdma(4) interrupts at ipl 6
during ncr53c9x_intr() for esp(4) at ipl 3. It worked on netbsd-5
and prior, but on netbsd-5 splbio() was changed from ipl 3 to 6
for SMP support and on netbsd-6 ncr53c9x driver was changed to
use mutex(9) instead of simple_lock(9), so nextdma interrupts
were no longer raised during ncr53c9x interrupt handler.
For now, just call mutex_exit(9) and mutex_enter(9) during
waiting nextdma(4) interrupts in MD esp_dma_intr() handler.
This could be wrong and the interrupt handler for nextdma should
be reorganized, but it just works.
Should be pulled up to netbsd-10 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.44.1 src/sys/arch/next68k/dev/esp.c
cvs rdiff -u -r1.19 -r1.19.18.1 src/sys/arch/next68k/include/bus_space.h
cvs rdiff -u -r1.50 -r1.50.26.1 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.12 -r1.12.90.1 src/sys/arch/next68k/next68k/clock.c
cvs rdiff -u -r1.116 -r1.116.4.1 src/sys/arch/next68k/next68k/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/next68k/dev/esp.c
diff -u src/sys/arch/next68k/dev/esp.c:1.64 src/sys/arch/next68k/dev/esp.c:1.64.44.1
--- src/sys/arch/next68k/dev/esp.c:1.64 Fri Mar 31 08:38:13 2017
+++ src/sys/arch/next68k/dev/esp.c Wed Feb 1 18:55:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.64 2017/03/31 08:38:13 msaitoh Exp $ */
+/* $NetBSD: esp.c,v 1.64.44.1 2023/02/01 18:55:11 martin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.64 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.64.44.1 2023/02/01 18:55:11 martin Exp $");
#include
#include
@@ -509,6 +509,7 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
}
#endif
+ mutex_exit(>sc_lock); /* for nextdma intr */
while (!nextdma_finished(nsc)) {
/* esp_dma_isactive(sc)) { */
NDTRACEIF (ndtrace_addc('w'));
@@ -602,7 +603,7 @@ esp_dma_intr(struct ncr53c9x_softc *sc)
}
out:
- ;
+ mutex_enter(>sc_lock); /* for nextdma intr */
#ifdef ESP_DEBUG
/* esp_dma_nest--; */
Index: src/sys/arch/next68k/include/bus_space.h
diff -u src/sys/arch/next68k/include/bus_space.h:1.19 src/sys/arch/next68k/include/bus_space.h:1.19.18.1
--- src/sys/arch/next68k/include/bus_space.h:1.19 Sat Jan 23 19:38:08 2021
+++ src/sys/arch/next68k/include/bus_space.h Wed Feb 1 18:55:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_space.h,v 1.19 2021/01/23 19:38:08 christos Exp $ */
+/* $NetBSD: bus_space.h,v 1.19.18.1 2023/02/01 18:55:11 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -167,7 +167,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#define bus_space_read_multi_2(t, h, o, a, c) do { \
@@ -181,7 +181,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#define bus_space_read_multi_4(t, h, o, a, c) do { \
@@ -195,7 +195,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
/*
@@ -219,7 +219,7 @@ typedef u_long bus_space_handle_t;
jne 1b" : \
: \
"r" ((h) + (o)), "g" (a), "g" (c) : \
- "a0","a1","d0"); \
+ "a0","a1","d0","memory");\
} while (0);
#define bus_space_read_region_2(t, h, o, a, c) do { \
@@ -233,7 +233,7 @@ typedef u_long bus_space_handle_t;
jne
CVS commit: src/sys/modules/examples/ddbping
Module Name:src
Committed By: uwe
Date: Wed Feb 1 10:22:20 UTC 2023
Modified Files:
src/sys/modules/examples/ddbping: ddbping.c
Log Message:
ddbping - restore the original narration of the example, NFCI
Adjust previous change so that it only replaces my home-grown define
for the end marker with the new official DDB_END_CMD marker that it
introduced. Undo the rest of that last change.
As the author of this example I'm pretty sure what example I wanted to
set and this narration order is an important part of it.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/ddbping/ddbping.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/modules/examples/ddbping/ddbping.c
diff -u src/sys/modules/examples/ddbping/ddbping.c:1.2 src/sys/modules/examples/ddbping/ddbping.c:1.3
--- src/sys/modules/examples/ddbping/ddbping.c:1.2 Tue Feb 23 07:13:53 2021
+++ src/sys/modules/examples/ddbping/ddbping.c Wed Feb 1 10:22:20 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ddbping.c,v 1.2 2021/02/23 07:13:53 mrg Exp $ */
+/* $NetBSD: ddbping.c,v 1.3 2023/02/01 10:22:20 uwe Exp $ */
/*
* Copyright (c) 2020 Valery Ushakov
* All rights reserved.
@@ -28,19 +28,42 @@
* Example of a kernel module that registers DDB commands.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ddbping.c,v 1.2 2021/02/23 07:13:53 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ddbping.c,v 1.3 2023/02/01 10:22:20 uwe Exp $");
#include
#include
#include
+/* XXX: db_command.h should provide something like this */
+typedef void db_cmdfn_t(db_expr_t, bool, db_expr_t, const char *);
+
+
+static db_cmdfn_t db_ping;
+static db_cmdfn_t db_show_ping;
+
+
+static const struct db_command db_ping_base_tbl[] = {
+ { DDB_ADD_CMD("ping", db_ping, 0,
+ "Example command",
+ NULL, NULL) },
+ { DDB_END_CMD },
+};
+
+static const struct db_command db_ping_show_tbl[] = {
+ { DDB_ADD_CMD("ping", db_show_ping, 0,
+ "Example command stats",
+ NULL, NULL) },
+ { DDB_END_CMD },
+};
+
static unsigned int ping_count;
static unsigned int ping_count_modif;
static unsigned int ping_count_addr;
static unsigned int ping_count_count;
+
static void
db_ping(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
@@ -75,20 +98,6 @@ db_show_ping(db_expr_t addr, bool have_a
db_printf("with count\t%u\n", ping_count_count);
}
-static const struct db_command db_ping_base_tbl[] = {
- { DDB_ADD_CMD("ping", db_ping, 0,
- "Example command",
- NULL, NULL) },
- { DDB_END_CMD },
-};
-
-static const struct db_command db_ping_show_tbl[] = {
- { DDB_ADD_CMD("ping", db_show_ping, 0,
- "Example command stats",
- NULL, NULL) },
- { DDB_END_CMD },
-};
-
MODULE(MODULE_CLASS_MISC, ddbping, NULL);
CVS commit: src/sys/modules/examples/ddbping
Module Name:src Committed By: uwe Date: Wed Feb 1 10:22:20 UTC 2023 Modified Files: src/sys/modules/examples/ddbping: ddbping.c Log Message: ddbping - restore the original narration of the example, NFCI Adjust previous change so that it only replaces my home-grown define for the end marker with the new official DDB_END_CMD marker that it introduced. Undo the rest of that last change. As the author of this example I'm pretty sure what example I wanted to set and this narration order is an important part of it. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/modules/examples/ddbping/ddbping.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
