CVS commit: src/sys/dtb
Module Name:src
Committed By: rin
Date: Sat May 23 02:11:24 UTC 2020
Modified Files:
src/sys/dtb: Makefile
Log Message:
Simplify. No need to use sed...
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dtb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dtb/Makefile
diff -u src/sys/dtb/Makefile:1.3 src/sys/dtb/Makefile:1.4
--- src/sys/dtb/Makefile:1.3 Sat May 23 00:07:27 2020
+++ src/sys/dtb/Makefile Sat May 23 02:11:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/05/23 00:07:27 rin Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/23 02:11:24 rin Exp $
TARGETS+= dtblist
@@ -23,7 +23,7 @@ TARGET_ARCH_LIST+= aarch64 aarch64eb
update-sets:
.for _arch in ${TARGET_ARCH_LIST}
- (echo '# $$_NetBSD_$$' | sed 's/_//g' ; \
+ (echo '# $$''NetBSD''$$'; \
echo '#'; \
echo '# DO NOT EDIT THIS FILE MANUALLY'; \
echo '# Generated by "make update-sets" in sys/dtb'; \
CVS commit: src/lib/libpam
Module Name:src
Committed By: rin
Date: Sat May 23 00:43:33 UTC 2020
Modified Files:
src/lib/libpam: Makefile.inc
src/lib/libpam/libpam: Makefile
src/lib/libpam/modules: mod.mk
Log Message:
Fix fallout from NO_STATIC_MODULES -> OPENPAM_STATIC_MODULES changes;
libpam.a fails to load any modules and does not work at all.
At the moment, openpam_load.c at least must be compiled with and without
OPENPAM_STATIC_MODULES for static and shared libraries, respectively.
Therefore, use CSHLIBFLAGS again, in order to build objects for static and
shared libraries separately.
This may be ugly, but seems better for me than adding further hacks in
libpam/libpam/Makefile, which is already complicated enough...
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/lib/libpam/Makefile.inc
cvs rdiff -u -r1.25 -r1.26 src/lib/libpam/libpam/Makefile
cvs rdiff -u -r1.16 -r1.17 src/lib/libpam/modules/mod.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/Makefile.inc
diff -u src/lib/libpam/Makefile.inc:1.19 src/lib/libpam/Makefile.inc:1.20
--- src/lib/libpam/Makefile.inc:1.19 Wed Apr 29 02:16:56 2020
+++ src/lib/libpam/Makefile.inc Sat May 23 00:43:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2020/04/29 02:16:56 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.20 2020/05/23 00:43:33 rin Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -42,6 +42,12 @@ CPPFLAGS+= -DOPENPAM_MODULES_DIRECTORY=\
# No debugging
#CPPFLAGS+= -DDEBUG
+# XXX
+# At the moment, openpam_load.c at least must be compiled with and without
+# OPENPAM_STATIC_MODULES for static and shared libraries, respectively.
+CPPFLAGS+= -DOPENPAM_STATIC_MODULES
+CSHLIBFLAGS+= -UOPENPAM_STATIC_MODULES
+
# Define the shared library version here. libpam and the modules share a
# version, and we need these variables early for module install rules.
SHLIB_MAJOR= 4
Index: src/lib/libpam/libpam/Makefile
diff -u src/lib/libpam/libpam/Makefile:1.25 src/lib/libpam/libpam/Makefile:1.26
--- src/lib/libpam/libpam/Makefile:1.25 Fri May 1 21:58:16 2020
+++ src/lib/libpam/libpam/Makefile Sat May 23 00:43:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2020/05/01 21:58:16 christos Exp $
+# $NetBSD: Makefile,v 1.26 2020/05/23 00:43:33 rin Exp $
#-
# Copyright (c) 1998 Juniper Networks, Inc.
# All rights reserved.
@@ -214,8 +214,6 @@ openpam_static_modules.o: openpam_static
${CC} ${LDFLAGS} -nostdlib -o ${.TARGET} -r -Wl,--whole-archive \
openpam_static.o ${STATIC_MODULE_LIBS}
-CPPFLAGS.openpam_static.c+= -DOPENPAM_STATIC_MODULES
-
CWARNFLAGS.clang+= -Wno-error=tautological-pointer-compare
COPTS.openpam_dynamic.c+= ${GCC_NO_CAST_FUNCTION_TYPE}
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.16 src/lib/libpam/modules/mod.mk:1.17
--- src/lib/libpam/modules/mod.mk:1.16 Wed Apr 29 02:16:57 2020
+++ src/lib/libpam/modules/mod.mk Sat May 23 00:43:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.16 2020/04/29 02:16:57 riastradh Exp $
+# $NetBSD: mod.mk,v 1.17 2020/05/23 00:43:33 rin Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -21,7 +21,6 @@ LIBDPLIBS+= pam ${NETBSDSRCDIR}/li
libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.so.${SHLIB_MAJOR}
.else
libinstall::
-CPPFLAGS+= -DOPENPAM_STATIC_MODULES
.endif
.include
CVS commit: src/external/mpl/dhcp/bin/server
Module Name:src
Committed By: rin
Date: Sat May 23 00:32:42 UTC 2020
Modified Files:
src/external/mpl/dhcp/bin/server: Makefile
Log Message:
GCC8 needs -Wno-stringop-overflow also for m68000 (sun2).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mpl/dhcp/bin/server/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mpl/dhcp/bin/server/Makefile
diff -u src/external/mpl/dhcp/bin/server/Makefile:1.4 src/external/mpl/dhcp/bin/server/Makefile:1.5
--- src/external/mpl/dhcp/bin/server/Makefile:1.4 Wed Feb 12 00:41:50 2020
+++ src/external/mpl/dhcp/bin/server/Makefile Sat May 23 00:32:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/02/12 00:41:50 fox Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/23 00:32:42 rin Exp $
.include
@@ -15,7 +15,7 @@ FILESDIR= /usr/share/examples/dhcp
FILES= dhcpd.conf
.endif
-.if !empty(MACHINE_ARCH:Msh3*)
+.if !empty(MACHINE_ARCH:Msh3*) || ${MACHINE_ARCH} == "m68000"
COPTS.ddns.c +=-Wno-stringop-overflow
.endif
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: rin Date: Sat May 23 00:30:40 UTC 2020 Modified Files: src/external/gpl3/gdb/dist/gdb: alpha-tdep.c Log Message: Revive entrypoint heuristics, accidentally removed in the previous. Now, e.g., "b main" works again for "gdb /bin/echo" as expected. See more details: http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gdb/dist/gdb/alpha-tdep.c#rev1.2 XXX Single-stepping into shared libraries still fails sometimes; tracee does not stop at a function in shared library. We need further analysis... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/alpha-tdep.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/gdb/dist/gdb/alpha-tdep.c diff -u src/external/gpl3/gdb/dist/gdb/alpha-tdep.c:1.4 src/external/gpl3/gdb/dist/gdb/alpha-tdep.c:1.5 --- src/external/gpl3/gdb/dist/gdb/alpha-tdep.c:1.4 Sun May 26 21:40:01 2019 +++ src/external/gpl3/gdb/dist/gdb/alpha-tdep.c Sat May 23 00:30:40 2020 @@ -1825,6 +1825,9 @@ alpha_gdbarch_init (struct gdbarch_info /* Prologue heuristics. */ set_gdbarch_skip_prologue (gdbarch, alpha_skip_prologue); + /* Entrypoint heuristics. */ + set_gdbarch_skip_entrypoint (gdbarch, alpha_skip_entrypoint); + /* Call info. */ set_gdbarch_return_value (gdbarch, alpha_return_value);
CVS commit: src/sys/dtb
Module Name:src
Committed By: rin
Date: Sat May 23 00:07:27 UTC 2020
Modified Files:
src/sys/dtb: Makefile
Log Message:
Fix previous; add hack to prevent NetBSD RCSID from being expanded...
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dtb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dtb/Makefile
diff -u src/sys/dtb/Makefile:1.2 src/sys/dtb/Makefile:1.3
--- src/sys/dtb/Makefile:1.2 Fri May 22 23:57:13 2020
+++ src/sys/dtb/Makefile Sat May 23 00:07:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/22 23:57:13 rin Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/23 00:07:27 rin Exp $
TARGETS+= dtblist
@@ -23,7 +23,7 @@ TARGET_ARCH_LIST+= aarch64 aarch64eb
update-sets:
.for _arch in ${TARGET_ARCH_LIST}
- (echo '# $$NetBSD: Makefile,v 1.2 2020/05/22 23:57:13 rin Exp $$'; \
+ (echo '# $$_NetBSD_$$' | sed 's/_//g' ; \
echo '#'; \
echo '# DO NOT EDIT THIS FILE MANUALLY'; \
echo '# Generated by "make update-sets" in sys/dtb'; \
CVS commit: src/distrib/notes/hp300
Module Name:src Committed By: tsutsui Date: Sat May 23 00:02:10 UTC 2020 Modified Files: src/distrib/notes/hp300: hardware Log Message: Now Xserver works on hp425e built-in EVRX framebuffer. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.22 src/distrib/notes/hp300/hardware:1.23 --- src/distrib/notes/hp300/hardware:1.22 Fri May 1 03:02:28 2020 +++ src/distrib/notes/hp300/hardware Sat May 23 00:02:10 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.22 2020/05/01 03:02:28 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.23 2020/05/23 00:02:10 tsutsui Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -186,8 +186,6 @@ internal video on models 362/382 (A1474- .Em "No X server support" .It 425e built-in EVRX framebuffer -.br -.Em "No X server support" .bullet) .It HP-HIL devices
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: rin Date: Fri May 22 23:59:01 UTC 2020 Added Files: src/distrib/sets/lists/dtb: ad.aarch64eb Log Message: Add one more auto-generated file. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/dtb/ad.aarch64eb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/distrib/sets/lists/dtb/ad.aarch64eb diff -u /dev/null src/distrib/sets/lists/dtb/ad.aarch64eb:1.1 --- /dev/null Fri May 22 23:59:01 2020 +++ src/distrib/sets/lists/dtb/ad.aarch64eb Fri May 22 23:59:01 2020 @@ -0,0 +1,141 @@ +# $NetBSD: ad.aarch64eb,v 1.1 2020/05/22 23:59:01 rin Exp $ +# +# DO NOT EDIT THIS FILE MANUALLY +# Generated by "make update-sets" in sys/dtb +# +./boot/dtb/allwinner dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-amarula-relic.dtbdtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-bananapi-m64.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-nanopi-a64.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-oceanic-5205-5inmfd.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-olinuxino-emmc.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-olinuxino.dtbdtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-orangepi-win.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-pine64-lts.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-pine64-plus.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-pine64.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-pinebook.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-sopine-baseboard.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-teres-i.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-bananapi-m2-plus.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-libretech-all-h3-cc.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-nanopi-neo-plus2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-nanopi-neo2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-orangepi-pc2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-orangepi-prime.dtbdtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-orangepi-zero-plus.dtbdtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-orangepi-zero-plus2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h6-beelink-gs1.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h6-orangepi-3.dtbdtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h6-orangepi-lite2.dtbdtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h6-orangepi-one-plus.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h6-pine-h64.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h6-tanix-tx6.dtb dtb-base-boot dtb +./boot/dtb/amlogic dtb-base-boot dtb +./boot/dtb/amlogic/meson-a1-ad401.dtbdtb-base-boot dtb +./boot/dtb/amlogic/meson-axg-s400.dtbdtb-base-boot dtb +./boot/dtb/amlogic/meson-g12a-sei510.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-g12a-u200.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-g12a-x96-max.dtbdtb-base-boot dtb +./boot/dtb/amlogic/meson-g12b-a311d-khadas-vim3.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-g12b-odroid-n2.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-g12b-s922x-khadas-vim3.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-g12b-ugoos-am6.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-nanopi-k2.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-nexbox-a95x.dtbdtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-odroidc2.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-p200.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-p201.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-vega-s95-meta.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-vega-s95-pro.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-vega-s95-telos.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-wetek-hub.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxbb-wetek-play2.dtbdtb-base-boot dtb +./boot/dtb/amlogic/meson-gxl-s805x-libretech-ac.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-gxl-s805x-p241.dtb
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: rin Date: Fri May 22 23:58:22 UTC 2020 Modified Files: src/distrib/sets/lists/dtb: ad.aarch64 ad.earmv6 ad.earmv6eb ad.earmv6hf ad.earmv6hfeb ad.earmv7 ad.earmv7hf ad.earmv7hfeb Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/dtb/ad.aarch64 cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/dtb/ad.earmv6 \ src/distrib/sets/lists/dtb/ad.earmv6eb \ src/distrib/sets/lists/dtb/ad.earmv6hf \ src/distrib/sets/lists/dtb/ad.earmv6hfeb \ src/distrib/sets/lists/dtb/ad.earmv7 \ src/distrib/sets/lists/dtb/ad.earmv7hf \ src/distrib/sets/lists/dtb/ad.earmv7hfeb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/dtb/ad.aarch64 diff -u src/distrib/sets/lists/dtb/ad.aarch64:1.1 src/distrib/sets/lists/dtb/ad.aarch64:1.2 --- src/distrib/sets/lists/dtb/ad.aarch64:1.1 Mon May 18 21:19:34 2020 +++ src/distrib/sets/lists/dtb/ad.aarch64 Fri May 22 23:58:22 2020 @@ -1,10 +1,15 @@ +# $NetBSD: ad.aarch64,v 1.2 2020/05/22 23:58:22 rin Exp $ +# +# DO NOT EDIT THIS FILE MANUALLY +# Generated by "make update-sets" in sys/dtb +# ./boot/dtb/allwinner dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-amarula-relic.dtbdtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-bananapi-m64.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-nanopi-a64.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-oceanic-5205-5inmfd.dtb dtb-base-boot dtb -./boot/dtb/allwinner/sun50i-a64-olinuxino.dtbdtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-olinuxino-emmc.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-a64-olinuxino.dtbdtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-orangepi-win.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-pine64-lts.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-pine64-plus.dtb dtb-base-boot dtb @@ -12,12 +17,12 @@ ./boot/dtb/allwinner/sun50i-a64-pinebook.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-sopine-baseboard.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-a64-teres-i.dtb dtb-base-boot dtb -./boot/dtb/allwinner/sun50i-h5-bananapi-m2-plus.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-bananapi-m2-plus-v1.2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-bananapi-m2-plus.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-libretech-all-h3-cc.dtb dtb-base-boot dtb -./boot/dtb/allwinner/sun50i-h5-nanopi-neo2.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-nanopi-neo-plus2.dtb dtb-base-boot dtb +./boot/dtb/allwinner/sun50i-h5-nanopi-neo2.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-orangepi-pc2.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-orangepi-prime.dtbdtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h5-orangepi-zero-plus.dtbdtb-base-boot dtb @@ -29,55 +34,55 @@ ./boot/dtb/allwinner/sun50i-h6-pine-h64.dtb dtb-base-boot dtb ./boot/dtb/allwinner/sun50i-h6-tanix-tx6.dtb dtb-base-boot dtb ./boot/dtb/amlogic dtb-base-boot dtb +./boot/dtb/amlogic/meson-a1-ad401.dtbdtb-base-boot dtb ./boot/dtb/amlogic/meson-axg-s400.dtbdtb-base-boot dtb ./boot/dtb/amlogic/meson-g12a-sei510.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-g12a-u200.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-g12a-x96-max.dtbdtb-base-boot dtb ./boot/dtb/amlogic/meson-g12b-a311d-khadas-vim3.dtb dtb-base-boot dtb -./boot/dtb/amlogic/meson-g12b-s922x-khadas-vim3.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-g12b-odroid-n2.dtb dtb-base-boot dtb +./boot/dtb/amlogic/meson-g12b-s922x-khadas-vim3.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-g12b-ugoos-am6.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-gxbb-nanopi-k2.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-gxbb-nexbox-a95x.dtbdtb-base-boot dtb ./boot/dtb/amlogic/meson-gxbb-odroidc2.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-gxbb-p200.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-gxbb-p201.dtb dtb-base-boot dtb -./boot/dtb/amlogic/meson-gxbb-vega-s95-pro.dtb dtb-base-boot dtb ./boot/dtb/amlogic/meson-gxbb-vega-s95-meta.dtb dtb-base-boot dtb
CVS commit: src/sys/dtb
Module Name:src
Committed By: rin
Date: Fri May 22 23:57:13 UTC 2020
Modified Files:
src/sys/dtb: Makefile
Log Message:
update-sets:
- sort entries
- add NetBSD RCSID
- add "DO NOT EDIT" comment
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dtb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dtb/Makefile
diff -u src/sys/dtb/Makefile:1.1 src/sys/dtb/Makefile:1.2
--- src/sys/dtb/Makefile:1.1 Mon May 18 21:19:35 2020
+++ src/sys/dtb/Makefile Fri May 22 23:57:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/05/18 21:19:35 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/22 23:57:13 rin Exp $
TARGETS+= dtblist
@@ -23,6 +23,11 @@ TARGET_ARCH_LIST+= aarch64 aarch64eb
update-sets:
.for _arch in ${TARGET_ARCH_LIST}
- ${MAKE} MACHINE_ARCH=${_arch} dtblist | grep '^[\.#]' | \
- column -t >${.CURDIR}/../../distrib/sets/lists/dtb/ad.${_arch}
+ (echo '# $$NetBSD: Makefile,v 1.2 2020/05/22 23:57:13 rin Exp $$'; \
+ echo '#'; \
+ echo '# DO NOT EDIT THIS FILE MANUALLY'; \
+ echo '# Generated by "make update-sets" in sys/dtb'; \
+ echo '#'; \
+ ${MAKE} MACHINE_ARCH=${_arch} dtblist | grep '^[\.#]' | column -t | \
+ sort) > ${.CURDIR}/../../distrib/sets/lists/dtb/ad.${_arch}
.endfor
CVS commit: src/external/gpl2/dtc/dist
Module Name:src Committed By: jmcneill Date: Fri May 22 23:19:53 UTC 2020 Modified Files: src/external/gpl2/dtc/dist: dtc-lexer.l Log Message: Satisfy -fno-common To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/dtc/dist/dtc-lexer.l Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/dtc/dist/dtc-lexer.l diff -u src/external/gpl2/dtc/dist/dtc-lexer.l:1.4 src/external/gpl2/dtc/dist/dtc-lexer.l:1.5 --- src/external/gpl2/dtc/dist/dtc-lexer.l:1.4 Sun Dec 22 12:38:24 2019 +++ src/external/gpl2/dtc/dist/dtc-lexer.l Fri May 22 23:19:53 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: dtc-lexer.l,v 1.4 2019/12/22 12:38:24 skrll Exp $ */ +/* $NetBSD: dtc-lexer.l,v 1.5 2020/05/22 23:19:53 jmcneill Exp $ */ /* SPDX-License-Identifier: GPL-2.0-or-later */ /* @@ -25,7 +25,7 @@ LINECOMMENT "//".*\n #include "srcpos.h" #include "dtc-parser.h" -YYLTYPE yylloc; +extern YYLTYPE yylloc; extern bool treesource_error; /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
CVS commit: src/external/bsd/byacc/dist
Module Name:src
Committed By: jmcneill
Date: Fri May 22 22:59:14 UTC 2020
Modified Files:
src/external/bsd/byacc/dist: defs.h output.c reader.c
Log Message:
Avoid duplicate "code_lines" symbols, which fails to link when building
tools with gcc 10.1.1 / ld 2.34-2.fc32.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/byacc/dist/defs.h \
src/external/bsd/byacc/dist/reader.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/byacc/dist/output.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/bsd/byacc/dist/defs.h
diff -u src/external/bsd/byacc/dist/defs.h:1.17 src/external/bsd/byacc/dist/defs.h:1.18
--- src/external/bsd/byacc/dist/defs.h:1.17 Tue Oct 15 15:58:46 2019
+++ src/external/bsd/byacc/dist/defs.h Fri May 22 22:59:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.17 2019/10/15 15:58:46 christos Exp $ */
+/* $NetBSD: defs.h,v 1.18 2020/05/22 22:59:14 jmcneill Exp $ */
/* Id: defs.h,v 1.61 2019/06/16 15:07:51 tom Exp */
@@ -590,7 +590,7 @@ extern void reader(void);
struct code_lines {
char *lines;
size_t num;
-} code_lines[CODE_MAX];
+};
/* skeleton.c (generated by skel2c) */
extern void write_section(FILE * fp, const char *const section[]);
Index: src/external/bsd/byacc/dist/reader.c
diff -u src/external/bsd/byacc/dist/reader.c:1.17 src/external/bsd/byacc/dist/reader.c:1.18
--- src/external/bsd/byacc/dist/reader.c:1.17 Tue Oct 15 15:58:46 2019
+++ src/external/bsd/byacc/dist/reader.c Fri May 22 22:59:14 2020
@@ -1,11 +1,11 @@
-/* $NetBSD: reader.c,v 1.17 2019/10/15 15:58:46 christos Exp $ */
+/* $NetBSD: reader.c,v 1.18 2020/05/22 22:59:14 jmcneill Exp $ */
/* Id: reader.c,v 1.74 2017/12/04 17:50:02 tom Exp */
#include "defs.h"
#include
-__RCSID("$NetBSD: reader.c,v 1.17 2019/10/15 15:58:46 christos Exp $");
+__RCSID("$NetBSD: reader.c,v 1.18 2020/05/22 22:59:14 jmcneill Exp $");
/* The line size must be a positive integer. One hundred was chosen */
/* because few lines in Yacc input grammars exceed 100 characters. */
@@ -71,7 +71,7 @@ static const char *code_keys[] = {
"", "requires", "provides", "top", "imports",
};
-struct code_lines code_lines[CODE_MAX];
+extern struct code_lines code_lines[CODE_MAX];
#if defined(YYBTYACC)
int destructor = 0; /* =1 if at least one %destructor */
Index: src/external/bsd/byacc/dist/output.c
diff -u src/external/bsd/byacc/dist/output.c:1.21 src/external/bsd/byacc/dist/output.c:1.22
--- src/external/bsd/byacc/dist/output.c:1.21 Tue Oct 15 15:58:46 2019
+++ src/external/bsd/byacc/dist/output.c Fri May 22 22:59:14 2020
@@ -1,11 +1,11 @@
-/* $NetBSD: output.c,v 1.21 2019/10/15 15:58:46 christos Exp $ */
+/* $NetBSD: output.c,v 1.22 2020/05/22 22:59:14 jmcneill Exp $ */
/* Id: output.c,v 1.87 2018/05/10 09:08:46 tom Exp */
#include "defs.h"
#include
-__RCSID("$NetBSD: output.c,v 1.21 2019/10/15 15:58:46 christos Exp $");
+__RCSID("$NetBSD: output.c,v 1.22 2020/05/22 22:59:14 jmcneill Exp $");
#define StaticOrR (rflag ? "" : "static ")
#define CountLine(fp) (!rflag || ((fp) == code_file))
@@ -36,6 +36,8 @@ static Value_t *check;
static int lowzero;
static long high;
+struct code_lines code_lines[CODE_MAX];
+
static void
output_code_lines(FILE *fp, int cl)
{
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: thorpej
Date: Fri May 22 20:27:16 UTC 2020
Modified Files:
src/sys/dev/pci: if_iwm.c if_iwmvar.h
Log Message:
This driver sleeps during iwm_media_change(), and thus requires an
adaptive mutex for the media lock.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pci/if_iwm.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/if_iwmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.84 src/sys/dev/pci/if_iwm.c:1.85
--- src/sys/dev/pci/if_iwm.c:1.84 Thu Jan 30 06:03:34 2020
+++ src/sys/dev/pci/if_iwm.c Fri May 22 20:27:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.84 2020/01/30 06:03:34 thorpej Exp $ */
+/* $NetBSD: if_iwm.c,v 1.85 2020/05/22 20:27:16 thorpej Exp $ */
/* OpenBSD: if_iwm.c,v 1.148 2016/11/19 21:07:08 stsp Exp */
#define IEEE80211_NO_HT
/*
@@ -106,7 +106,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.84 2020/01/30 06:03:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.85 2020/05/22 20:27:16 thorpej Exp $");
#include
#include
@@ -7774,7 +7774,12 @@ iwm_preinit(struct iwm_softc *sc)
/* Override 802.11 state transition machine. */
sc->sc_newstate = ic->ic_newstate;
ic->ic_newstate = iwm_newstate;
- ieee80211_media_init(ic, iwm_media_change, ieee80211_media_status);
+
+ /* XXX media locking needs revisiting */
+ mutex_init(>sc_media_mtx, MUTEX_DEFAULT, IPL_SOFTNET);
+ ieee80211_media_init_with_lock(ic,
+ iwm_media_change, ieee80211_media_status, >sc_media_mtx);
+
ieee80211_announce(ic);
iwm_radiotap_attach(sc);
Index: src/sys/dev/pci/if_iwmvar.h
diff -u src/sys/dev/pci/if_iwmvar.h:1.19 src/sys/dev/pci/if_iwmvar.h:1.20
--- src/sys/dev/pci/if_iwmvar.h:1.19 Sat Oct 5 23:27:20 2019
+++ src/sys/dev/pci/if_iwmvar.h Fri May 22 20:27:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwmvar.h,v 1.19 2019/10/05 23:27:20 mrg Exp $ */
+/* $NetBSD: if_iwmvar.h,v 1.20 2020/05/22 20:27:16 thorpej Exp $ */
/* OpenBSD: if_iwmvar.h,v 1.24 2016/09/21 13:53:18 stsp Exp */
/*
@@ -499,6 +499,8 @@ struct iwm_softc {
struct bpf_if *sc_drvbpf;
+ kmutex_t sc_media_mtx; /* XXX */
+
union {
struct iwm_rx_radiotap_header th;
uint8_t pad[IEEE80211_RADIOTAP_HDRLEN];
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Fri May 22 19:46:29 UTC 2020
Modified Files:
src/sys/uvm: uvm_glue.c
Log Message:
Remove the ubc_direct hack.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/sys/uvm/uvm_glue.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/uvm/uvm_glue.c
diff -u src/sys/uvm/uvm_glue.c:1.178 src/sys/uvm/uvm_glue.c:1.179
--- src/sys/uvm/uvm_glue.c:1.178 Thu Apr 23 21:53:01 2020
+++ src/sys/uvm/uvm_glue.c Fri May 22 19:46:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_glue.c,v 1.178 2020/04/23 21:53:01 ad Exp $ */
+/* $NetBSD: uvm_glue.c,v 1.179 2020/05/22 19:46:29 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.178 2020/04/23 21:53:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.179 2020/05/22 19:46:29 ad Exp $");
#include "opt_kgdb.h"
#include "opt_kstack.h"
@@ -504,18 +504,6 @@ uvm_scheduler(void)
/* Start the freelist cache. */
uvm_pgflcache_start();
-#ifdef PMAP_DIRECT
- /*
- * XXX Temporary ugly hack. Just before boot, disable ubc_direct if
- * there's more than a couple of CPUs, since it has concurrency
- * problems.
- */
- if (ncpu > 2) {
- extern bool ubc_direct;
- ubc_direct = false;
- }
-#endif
-
for (;;) {
/* Update legacy stats for post-mortem debugging. */
uvm_update_uvmexp();
CVS commit: src/sys/arch/aarch64
Module Name:src
Committed By: ryo
Date: Fri May 22 19:29:26 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: cpuswitch.S db_machdep.c db_trace.c
vm_machdep.c
src/sys/arch/aarch64/include: db_machdep.h
Log Message:
fix to do backtrace properly for running LWPs and cpu_lwp_fork().
when dump of pcb_tf, only the switchframe part is now displayed instead of the
whole trapframe.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/aarch64/aarch64/cpuswitch.S
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/db_machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/aarch64/db_trace.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/vm_machdep.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/include/db_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/aarch64/aarch64/cpuswitch.S
diff -u src/sys/arch/aarch64/aarch64/cpuswitch.S:1.19 src/sys/arch/aarch64/aarch64/cpuswitch.S:1.20
--- src/sys/arch/aarch64/aarch64/cpuswitch.S:1.19 Fri May 15 09:08:10 2020
+++ src/sys/arch/aarch64/aarch64/cpuswitch.S Fri May 22 19:29:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.19 2020/05/15 09:08:10 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.20 2020/05/22 19:29:26 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include "opt_ddb.h"
#include "opt_kasan.h"
-RCSID("$NetBSD: cpuswitch.S,v 1.19 2020/05/15 09:08:10 ryo Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.20 2020/05/22 19:29:26 ryo Exp $")
ARMV8_DEFINE_OPTIONS
@@ -60,6 +60,10 @@ ENTRY_NP(cpu_switchto)
stp x25, x26, [sp, #TF_X25]
stp x27, x28, [sp, #TF_X27]
stp x29, x30, [sp, #TF_X29]
+#ifdef DDB
+ str lr, [sp, #TF_PC] /* for backtrace */
+ str xzr, [sp, #TF_SP] /* mark as switchframe */
+#endif
/*
* Save the current stack pointer and the CPACR and save them in
@@ -76,6 +80,9 @@ ENTRY_NP(cpu_switchto)
DISABLE_INTERRUPT
ldr x6, [x1, #L_PCB] /* x6 = lwp_getpcb(newlwp) */
ldr x4, [x6, #PCB_TF] /* get trapframe ptr (aka SP) */
+#ifdef DDB
+ str xzr, [x6, #PCB_TF] /* clear l->l_addr->pcb_tf */
+#endif
ldr x5, [x1, #L_MD_CPACR] /* get cpacr_el1 */
mov sp, x4 /* restore stack pointer */
msr cpacr_el1, x5 /* restore cpacr_el1 */
@@ -190,6 +197,9 @@ ENTRY_NP(cpu_switchto_softint)
str x19, [x3, #CI_CURLWP] /* curcpu()->ci_curlwp := x19 */
ldr x6, [x19, #L_PCB] /* x6 = lwp_getpcb(curlwp) */
ldr x4, [x6, #PCB_TF] /* x4 := pinned_lwp->l_addr->pcb_tf */
+#ifdef DDB
+ str xzr, [x6, #PCB_TF] /* clear l->l_addr->pcb_tf */
+#endif
ldr x5, [x19, #L_MD_CPACR] /* x5 := pinned_lwp->l_md_cpacr */
mov sp, x4 /* restore pinned_lwp sp */
msr cpacr_el1, x5 /* restore pinned_lwp cpacr */
Index: src/sys/arch/aarch64/aarch64/db_machdep.c
diff -u src/sys/arch/aarch64/aarch64/db_machdep.c:1.23 src/sys/arch/aarch64/aarch64/db_machdep.c:1.24
--- src/sys/arch/aarch64/aarch64/db_machdep.c:1.23 Fri May 22 04:46:26 2020
+++ src/sys/arch/aarch64/aarch64/db_machdep.c Fri May 22 19:29:26 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.23 2020/05/22 04:46:26 ryo Exp $ */
+/* $NetBSD: db_machdep.c,v 1.24 2020/05/22 19:29:26 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.23 2020/05/22 04:46:26 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.24 2020/05/22 19:29:26 ryo Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd32.h"
@@ -264,6 +264,29 @@ dump_trapframe(struct trapframe *tf, voi
tf->tf_reg[30], tf->tf_sp);
}
+void
+dump_switchframe(struct trapframe *tf, void (*pr)(const char *, ...))
+{
+ struct trapframe tf_buf;
+
+ db_read_bytes((db_addr_t)tf, sizeof(tf_buf), (char *)_buf);
+ tf = _buf;
+
+ (*pr)(" x19=%016"PRIxREGISTER",x20=%016"PRIxREGISTER"\n",
+ tf->tf_reg[19], tf->tf_reg[20]);
+ (*pr)(" x21=%016"PRIxREGISTER",x22=%016"PRIxREGISTER"\n",
+ tf->tf_reg[21], tf->tf_reg[22]);
+ (*pr)(" x23=%016"PRIxREGISTER",x24=%016"PRIxREGISTER"\n",
+ tf->tf_reg[23], tf->tf_reg[24]);
+ (*pr)(" x25=%016"PRIxREGISTER",x26=%016"PRIxREGISTER"\n",
+ tf->tf_reg[25], tf->tf_reg[26]);
+ (*pr)(" x27=%016"PRIxREGISTER",x28=%016"PRIxREGISTER"\n",
+ tf->tf_reg[27], tf->tf_reg[28]);
+ (*pr)("fp=x29=%016"PRIxREGISTER", lr=x30=%016"PRIxREGISTER"\n",
+ tf->tf_reg[29], tf->tf_reg[30]);
+}
+
+
#if defined(_KERNEL)
static void
show_cpuinfo(struct cpu_info *ci)
@@ -373,7 +396,7 @@ db_md_lwp_cmd(db_expr_t addr, bool have_
db_printf("\tl->l_addr.pcb_tf=%p\n", pcb->pcb_tf);
if (pcb->pcb_tf != l->l_md.md_utf)
- dump_trapframe(pcb->pcb_tf, db_printf);
+ dump_switchframe(pcb->pcb_tf, db_printf);
db_printf("\tl->l_md.md_cpacr =%016" PRIx64 "\n", l->l_md.md_cpacr);
db_printf("\tl->l_md.md_flags =%08x\n", l->l_md.md_flags);
@@ -881,7 +904,7 @@
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Fri May 22 19:02:59 UTC 2020
Modified Files:
src/sys/uvm: uvm_aobj.c
Log Message:
uao_get(): handle PGO_OVERWRITE.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/uvm/uvm_aobj.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/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.143 src/sys/uvm/uvm_aobj.c:1.144
--- src/sys/uvm/uvm_aobj.c:1.143 Wed May 20 12:47:36 2020
+++ src/sys/uvm/uvm_aobj.c Fri May 22 19:02:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_aobj.c,v 1.143 2020/05/20 12:47:36 hannken Exp $ */
+/* $NetBSD: uvm_aobj.c,v 1.144 2020/05/22 19:02:59 ad Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.143 2020/05/20 12:47:36 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.144 2020/05/22 19:02:59 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_uvmhist.h"
@@ -804,6 +804,7 @@ uao_get(struct uvm_object *uobj, voff_t
struct vm_page *ptmp = NULL; /* Quell compiler warning */
int lcv, gotpages, maxpages, swslot = -1, pageidx = -1; /* XXX: gcc */
UVMHIST_FUNC("uao_get"); UVMHIST_CALLED(pdhist);
+ bool overwrite = ((flags & PGO_OVERWRITE) != 0);
UVMHIST_LOG(pdhist, "aobj=%#jx offset=%jd, flags=%jd",
(uintptr_t)uobj, offset, flags,0);
@@ -921,7 +922,8 @@ uao_get(struct uvm_object *uobj, voff_t
pageidx = current_offset >> PAGE_SHIFT;
swslot = uao_find_swslot(uobj, pageidx);
ptmp = uao_pagealloc(uobj, current_offset,
-swslot == 0 ? UVM_PGA_ZERO : 0);
+swslot != 0 || overwrite ? 0 :
+UVM_PGA_ZERO);
/* out of RAM? */
if (ptmp == NULL) {
@@ -1036,9 +1038,15 @@ uao_get(struct uvm_object *uobj, voff_t
/*
* note that we will allow the page being writably-mapped
- * (!PG_RDONLY) regardless of access_type.
+ * (!PG_RDONLY) regardless of access_type. if overwrite,
+ * the page can be modified through an unmanaged mapping
+ * so mark it dirty up front.
*/
- uvm_pagemarkdirty(ptmp, UVM_PAGE_STATUS_UNKNOWN);
+ if (overwrite) {
+ uvm_pagemarkdirty(ptmp, UVM_PAGE_STATUS_DIRTY);
+ } else {
+ uvm_pagemarkdirty(ptmp, UVM_PAGE_STATUS_UNKNOWN);
+ }
/*
* we got the page! clear the fake flag (indicates valid
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: riastradh Date: Fri May 22 17:44:05 UTC 2020 Modified Files: src/sys/arch/xen/xen: xen_clock.c Log Message: Set frame = NULL in XENPV whether DIAGNOSTIC or not. For Xen PV, the interrupt logic stores the relevant information in the CPU's struct cpu_info, and CLKF_USERMODE and CLKF_PC don't use the frame argument at all. (For Xen PVH, we behave like normal x86 and use the frame as passed.) DIAGNOSTIC shouldn't change the data flows that affect non-DIAGNOSTIC logic, so let's just unconditionally set frame = NULL for XENPV. If this makes a difference, that's a bug -- and it's a bug that should not be concealed by enabling DIAGNOSTIC. ok bouyer To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/xen/xen_clock.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/xen/xen/xen_clock.c diff -u src/sys/arch/xen/xen/xen_clock.c:1.6 src/sys/arch/xen/xen/xen_clock.c:1.7 --- src/sys/arch/xen/xen/xen_clock.c:1.6 Thu May 21 21:12:31 2020 +++ src/sys/arch/xen/xen/xen_clock.c Fri May 22 17:44:05 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: xen_clock.c,v 1.6 2020/05/21 21:12:31 ad Exp $ */ +/* $NetBSD: xen_clock.c,v 1.7 2020/05/22 17:44:05 riastradh Exp $ */ /*- * Copyright (c) 2017, 2018 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: xen_clock.c,v 1.6 2020/05/21 21:12:31 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xen_clock.c,v 1.7 2020/05/22 17:44:05 riastradh Exp $"); #include #include @@ -681,7 +681,7 @@ xen_timer_handler(void *cookie, struct c KASSERT(cpu_intr_p()); KASSERT(cookie == ci); -#if defined(DIAGNOSTIC) && defined(XENPV) +#if defined(XENPV) frame = NULL; /* We use values cached in curcpu() */ #endif again:
CVS commit: src/sys/arch
Module Name:src Committed By: jdolecek Date: Fri May 22 16:17:42 UTC 2020 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 src/sys/arch/i386/conf: XEN3PAE_DOM0 Log Message: remove NO_PCI_MSI_MSIX option, MSI is supported for XenPV Dom0 To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/conf/XEN3PAE_DOM0 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/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.179 src/sys/arch/amd64/conf/XEN3_DOM0:1.180 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.179 Sat May 16 13:46:10 2020 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Fri May 22 16:17:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.179 2020/05/16 13:46:10 maya Exp $ +# $NetBSD: XEN3_DOM0,v 1.180 2020/05/22 16:17:42 jdolecek Exp $ include "arch/amd64/conf/std.xen" @@ -12,7 +12,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.179 $" +#ident "XEN3_DOM0-$Revision: 1.180 $" maxusers 32 # estimated number of users @@ -224,7 +224,6 @@ pci* at hypervisor? bus ? pci* at pchb? bus ? ppb* at pci? dev ? function ? # PCI-PCI bridges pci* at ppb? bus ? -options NO_PCI_MSI_MSIX # pci backend devices, used for PCI pass-through. To export a PCI device # to a domU, the device has to be attached to the pciback driver in the dom0. Index: src/sys/arch/i386/conf/XEN3PAE_DOM0 diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.27 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.28 --- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.27 Sat May 16 13:46:11 2020 +++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Fri May 22 16:17:42 2020 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.27 2020/05/16 13:46:11 maya Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.28 2020/05/22 16:17:42 jdolecek Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -212,7 +212,6 @@ balloon* at xenbus? # Xen balloon devic # PCI bus support pci* at hypervisor? bus ? pci* at pchb? bus ? -options NO_PCI_MSI_MSIX # PCI bridges ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter,
CVS commit: src/distrib/sets/lists/dtb
Module Name:src Committed By: skrll Date: Fri May 22 15:55:51 UTC 2020 Modified Files: src/distrib/sets/lists/dtb: ad.earmv6 ad.earmv6eb ad.earmv6hf ad.earmv6hfeb ad.earmv7 ad.earmv7hf ad.earmv7hfeb Log Message: Sort To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/dtb/ad.earmv6 \ src/distrib/sets/lists/dtb/ad.earmv6eb \ src/distrib/sets/lists/dtb/ad.earmv6hf \ src/distrib/sets/lists/dtb/ad.earmv6hfeb \ src/distrib/sets/lists/dtb/ad.earmv7 \ src/distrib/sets/lists/dtb/ad.earmv7hf \ src/distrib/sets/lists/dtb/ad.earmv7hfeb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/dtb/ad.earmv6 diff -u src/distrib/sets/lists/dtb/ad.earmv6:1.1 src/distrib/sets/lists/dtb/ad.earmv6:1.2 --- src/distrib/sets/lists/dtb/ad.earmv6:1.1 Mon May 18 21:19:34 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6 Fri May 22 15:55:51 2020 @@ -1,14 +1,14 @@ -./boot/dtb/bcm2835-rpi-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-b-rev2.dtbdtb-base-boot dtb -./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a-plus.dtbdtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b-rev2.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-cm1-io1.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-zero.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-zero-w.dtbdtb-base-boot dtb ./boot/dtb/bcm2836-rpi-2-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-a-plus.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-b-plus.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-cm3-io3.dtb dtb-base-boot dtb -./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-zero.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-zero-w.dtbdtb-base-boot dtb Index: src/distrib/sets/lists/dtb/ad.earmv6eb diff -u src/distrib/sets/lists/dtb/ad.earmv6eb:1.1 src/distrib/sets/lists/dtb/ad.earmv6eb:1.2 --- src/distrib/sets/lists/dtb/ad.earmv6eb:1.1 Mon May 18 21:19:34 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6eb Fri May 22 15:55:51 2020 @@ -1,14 +1,14 @@ -./boot/dtb/bcm2835-rpi-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-b-rev2.dtbdtb-base-boot dtb -./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a-plus.dtbdtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b-rev2.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-cm1-io1.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-zero.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-zero-w.dtbdtb-base-boot dtb ./boot/dtb/bcm2836-rpi-2-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-a-plus.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-b-plus.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-cm3-io3.dtb dtb-base-boot dtb -./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-zero.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-zero-w.dtbdtb-base-boot dtb Index: src/distrib/sets/lists/dtb/ad.earmv6hf diff -u src/distrib/sets/lists/dtb/ad.earmv6hf:1.1 src/distrib/sets/lists/dtb/ad.earmv6hf:1.2 --- src/distrib/sets/lists/dtb/ad.earmv6hf:1.1 Mon May 18 21:19:34 2020 +++ src/distrib/sets/lists/dtb/ad.earmv6hf Fri May 22 15:55:51 2020 @@ -1,14 +1,14 @@ -./boot/dtb/bcm2835-rpi-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-b-rev2.dtbdtb-base-boot dtb -./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-a-plus.dtbdtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b-plus.dtbdtb-base-boot dtb +./boot/dtb/bcm2835-rpi-b-rev2.dtbdtb-base-boot dtb ./boot/dtb/bcm2835-rpi-cm1-io1.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-zero.dtb dtb-base-boot dtb +./boot/dtb/bcm2835-rpi-zero-w.dtbdtb-base-boot dtb ./boot/dtb/bcm2836-rpi-2-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-a-plus.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-b.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-3-b-plus.dtb dtb-base-boot dtb ./boot/dtb/bcm2837-rpi-cm3-io3.dtb dtb-base-boot dtb -./boot/dtb/bcm2711-rpi-4-b.dtb dtb-base-boot dtb -./boot/dtb/bcm2835-rpi-zero.dtb dtb-base-boot
CVS commit: src/bin/cp
Module Name:src
Committed By: christos
Date: Fri May 22 14:54:30 UTC 2020
Modified Files:
src/bin/cp: cp.c
Log Message:
fix reversed test.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/bin/cp/cp.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/cp/cp.c
diff -u src/bin/cp/cp.c:1.61 src/bin/cp/cp.c:1.62
--- src/bin/cp/cp.c:1.61 Sun May 17 19:34:11 2020
+++ src/bin/cp/cp.c Fri May 22 10:54:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cp.c,v 1.61 2020/05/17 23:34:11 christos Exp $ */
+/* $NetBSD: cp.c,v 1.62 2020/05/22 14:54:30 christos Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -43,7 +43,7 @@ __COPYRIGHT(
#if 0
static char sccsid[] = "@(#)cp.c 8.5 (Berkeley) 4/29/95";
#else
-__RCSID("$NetBSD: cp.c,v 1.61 2020/05/17 23:34:11 christos Exp $");
+__RCSID("$NetBSD: cp.c,v 1.62 2020/05/22 14:54:30 christos Exp $");
#endif
#endif /* not lint */
@@ -517,7 +517,7 @@ copy(char *argv[], enum op type, int fts
this_failed = any_failed = 1;
#endif
}
-if (this_failed && (dne = popdne()))
+if (!this_failed && (dne = popdne()))
(void)chmod(to.p_path,
curr->fts_statp->st_mode);
}
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: jmcneill
Date: Fri May 22 14:09:54 UTC 2020
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Only build GENERIC kernel for armv7 releases.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/etc/etc.evbarm/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/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.115 src/etc/etc.evbarm/Makefile.inc:1.116
--- src/etc/etc.evbarm/Makefile.inc:1.115 Mon May 18 21:19:34 2020
+++ src/etc/etc.evbarm/Makefile.inc Fri May 22 14:09:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.115 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.116 2020/05/22 14:09:54 jmcneill Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -20,10 +20,8 @@ KERNEL_SETS.armv4+= IXM1200
EVBARM_BOARDS.xscale+= ADI_BRH
KERNEL_SETS.xscale+= NSLU2
-EVBARM_BOARDS.armv7+= BCM5301X
-EVBARM_BOARDS.armv7hf+= BCM5301X
-#EVBARM_BOARDS.armv7+= BCM56340
-#EVBARM_BOARDS.armv7hf+= BCM56340
+KERNEL_SETS.armv7+= GENERIC
+KERNEL_SETS.armv7hf+= GENERIC
.else
IMAGEENDIAN= le
# little endian boards
@@ -74,31 +72,8 @@ EVBARM_BOARDS.armv6+= TISDP2420
EVBARM_BOARDS.armv6hf+= TISDP2420
#EVBARM_BOARDS.armv6+= TISDP2430
-EVBARM_BOARDS.armv7+= ARMADAXP
-EVBARM_BOARDS.armv7hf+= ARMADAXP
-EVBARM_BOARDS.armv7+= ARMADILLO-IOT-G3
-EVBARM_BOARDS.armv7hf+= ARMADILLO-IOT-G3
-EVBARM_BOARDS.armv7+= BCM5301X
-EVBARM_BOARDS.armv7hf+= BCM5301X
-#EVBARM_BOARDS.armv7+= BCM56340
-#EVBARM_BOARDS.armv7hf+= BCM56340
-EVBARM_BOARDS.armv7+= CUBOX
-EVBARM_BOARDS.armv7hf+= CUBOX
-EVBARM_BOARDS.armv7+= CUBOX-I
-EVBARM_BOARDS.armv7hf+= CUBOX-I
-EVBARM_BOARDS.armv7+= IMX6UL-STARTER
-EVBARM_BOARDS.armv7hf+= IMX6UL-STARTER
-EVBARM_BOARDS.armv7+= KOBO
-EVBARM_BOARDS.armv7hf+= KOBO
-EVBARM_BOARDS.armv7+= MIRABOX
-EVBARM_BOARDS.armv7hf+= MIRABOX
-EVBARM_BOARDS.armv7+= NETWALKER
-EVBARM_BOARDS.armv7hf+= NETWALKER
-EVBARM_BOARDS.armv7+= OMAP5EVM
-EVBARM_BOARDS.armv7hf+= OMAP5EVM
-EVBARM_BOARDS.armv7+= PANDABOARD
-EVBARM_BOARDS.armv7hf+= PANDABOARD
-
+KERNEL_SETS.armv7+= GENERIC
+KERNEL_SETS.armv7hf+= GENERIC
KERNEL_SETS.arm64+= GENERIC64
.endif
@@ -152,10 +127,6 @@ BUILD_KERNELS+= ${board}_INSTALL
KERNEL_SETS+= ${KERNEL_SETS.${arch}}
.endfor
-.if !empty(MACHINE_ARCH:Mearmv7*)
-KERNEL_SETS+= GENERIC
-.endif
-
.if !empty(MACHINE_ARCH:Maarch64)
smp_efibootaa64:
cd ${KERNSRCDIR}/stand/efiboot/bootaa64 && ${MAKE} release
CVS commit: src/sys/uvm
Module Name:src
Committed By: jdolecek
Date: Fri May 22 11:54:05 UTC 2020
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
DRY code in uvm_swap_io() for the write loop
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.191 src/sys/uvm/uvm_swap.c:1.192
--- src/sys/uvm/uvm_swap.c:1.191 Thu May 21 16:50:25 2020
+++ src/sys/uvm/uvm_swap.c Fri May 22 11:54:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.191 2020/05/21 16:50:25 riastradh Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.192 2020/05/22 11:54:05 jdolecek Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.191 2020/05/21 16:50:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.192 2020/05/22 11:54:05 jdolecek Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -1914,25 +1914,19 @@ uvm_swap_io(struct vm_page **pps, int st
KASSERT(sdp->swd_encinit);
mutex_exit(_swap_data_lock);
- if (swap_encrypt) {
- for (i = 0; i < npages; i++) {
-int s = startslot + i;
-KDASSERT(swapdrum_sdp_is(s, sdp));
-KASSERT(s >= sdp->swd_drumoffset);
-s -= sdp->swd_drumoffset;
-KASSERT(s < sdp->swd_drumsize);
+ for (i = 0; i < npages; i++) {
+ int s = startslot + i;
+ KDASSERT(swapdrum_sdp_is(s, sdp));
+ KASSERT(s >= sdp->swd_drumoffset);
+ s -= sdp->swd_drumoffset;
+ KASSERT(s < sdp->swd_drumsize);
+
+ if (swap_encrypt) {
uvm_swap_encryptpage(sdp,
(void *)(kva + (vsize_t)i*PAGE_SIZE), s);
atomic_or_32(>swd_encmap[s/32],
__BIT(s%32));
- }
- } else {
- for (i = 0; i < npages; i++) {
-int s = startslot + i;
-KDASSERT(swapdrum_sdp_is(s, sdp));
-KASSERT(s >= sdp->swd_drumoffset);
-s -= sdp->swd_drumoffset;
-KASSERT(s < sdp->swd_drumsize);
+ } else {
atomic_and_32(>swd_encmap[s/32],
~__BIT(s%32));
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Fri May 22 11:25:06 UTC 2020
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
Support get_framerate and provide a stub for set_framerate
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/uvideo.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/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.56 src/sys/dev/usb/uvideo.c:1.57
--- src/sys/dev/usb/uvideo.c:1.56 Sat Mar 14 02:35:34 2020
+++ src/sys/dev/usb/uvideo.c Fri May 22 11:25:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.56 2020/03/14 02:35:34 christos Exp $ */
+/* $NetBSD: uvideo.c,v 1.57 2020/05/22 11:25:06 jmcneill Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.56 2020/03/14 02:35:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.57 2020/05/22 11:25:06 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -275,6 +275,8 @@ static int uvideo_enum_format(void *, ui
static int uvideo_get_format(void *, struct video_format *);
static int uvideo_set_format(void *, struct video_format *);
static int uvideo_try_format(void *, struct video_format *);
+static int uvideo_get_framerate(void *, struct video_fract *);
+static int uvideo_set_framerate(void *, struct video_fract *);
static int uvideo_start_transfer(void *);
static int uvideo_stop_transfer(void *);
@@ -380,6 +382,8 @@ static const struct video_hw_if uvideo_h
.get_format = uvideo_get_format,
.set_format = uvideo_set_format,
.try_format = uvideo_try_format,
+ .get_framerate = uvideo_get_framerate,
+ .set_framerate = uvideo_set_framerate,
.start_transfer = uvideo_start_transfer,
.stop_transfer = uvideo_stop_transfer,
.control_iter_init = NULL,
@@ -1877,6 +1881,8 @@ uvideo_close(void *addr)
sc = addr;
+ uvideo_stop_transfer(addr);
+
if (sc->sc_state != UVIDEO_STATE_CLOSED) {
sc->sc_state = UVIDEO_STATE_CLOSED;
}
@@ -2072,6 +2078,49 @@ uvideo_try_format(void *addr, struct vid
}
static int
+uvideo_get_framerate(void *addr, struct video_fract *fract)
+{
+ struct uvideo_softc *sc = addr;
+ struct uvideo_stream *vs = sc->sc_stream_in;
+
+ switch (vs->vs_frame_interval) {
+ case 41666: /* 240 */
+ case 8: /* 120 */
+ case 16: /* 60 */
+ case 20: /* 50 */
+ case 33: /* 30 */
+ case 40: /* 25 */
+ case 50: /* 20 */
+ case 66: /* 15 */
+ case 100: /* 10 */
+ fract->numerator = 1;
+ fract->denominator = 1000 / vs->vs_frame_interval;
+ break;
+ case 166833: /* 59.94 */
+ fract->numerator = 60;
+ fract->denominator = 1001;
+ break;
+ case 333667: /* 29.97 */
+ fract->numerator = 30;
+ fract->denominator = 1001;
+ break;
+ default:
+ fract->numerator = vs->vs_frame_interval;
+ fract->denominator = 1000;
+ break;
+ }
+
+ return 0;
+}
+
+static int
+uvideo_set_framerate(void *addr, struct video_fract *fract)
+{
+ /* XXX setting framerate is not supported yet, return actual rate */
+ return uvideo_get_framerate(addr, fract);
+}
+
+static int
uvideo_start_transfer(void *addr)
{
struct uvideo_softc *sc = addr;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Fri May 22 11:24:31 UTC 2020
Modified Files:
src/sys/dev/usb: pseye.c
Log Message:
Support set/get_framerate
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/pseye.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/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.27 src/sys/dev/usb/pseye.c:1.28
--- src/sys/dev/usb/pseye.c:1.27 Sat Mar 14 02:35:33 2020
+++ src/sys/dev/usb/pseye.c Fri May 22 11:24:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.27 2020/03/14 02:35:33 christos Exp $ */
+/* $NetBSD: pseye.c,v 1.28 2020/05/22 11:24:31 jmcneill Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.27 2020/03/14 02:35:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pseye.c,v 1.28 2020/05/22 11:24:31 jmcneill Exp $");
#include
#include
@@ -134,6 +134,8 @@ static int pseye_enum_format(void *, ui
static int pseye_get_format(void *, struct video_format *);
static int pseye_set_format(void *, struct video_format *);
static int pseye_try_format(void *, struct video_format *);
+static int pseye_get_framerate(void *, struct video_fract *);
+static int pseye_set_framerate(void *, struct video_fract *);
static int pseye_start_transfer(void *);
static int pseye_stop_transfer(void *);
@@ -150,6 +152,8 @@ static const struct video_hw_if pseye_hw
.get_format = pseye_get_format,
.set_format = pseye_set_format,
.try_format = pseye_try_format,
+ .get_framerate = pseye_get_framerate,
+ .set_framerate = pseye_set_framerate,
.start_transfer = pseye_start_transfer,
.stop_transfer = pseye_stop_transfer,
.control_iter_init = NULL,
@@ -803,6 +807,23 @@ pseye_try_format(void *opaque, struct vi
}
static int
+pseye_get_framerate(void *opaque, struct video_fract *fract)
+{
+ /* Driver only supports 60fps */
+ fract->numerator = 1;
+ fract->denominator = 60;
+
+ return 0;
+}
+
+static int
+pseye_set_framerate(void *opaque, struct video_fract *fract)
+{
+ /* Driver only supports one framerate. Return actual rate. */
+ return pseye_get_framerate(opaque, fract);
+}
+
+static int
pseye_start_transfer(void *opaque)
{
struct pseye_softc *sc = opaque;
CVS commit: src/sys/dev
Module Name:src
Committed By: jmcneill
Date: Fri May 22 11:23:52 UTC 2020
Modified Files:
src/sys/dev: video.c video_if.h
Log Message:
Support VIDIOC_G_PARM/VIDIOC_S_PARM
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/video.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/video_if.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/video.c
diff -u src/sys/dev/video.c:1.36 src/sys/dev/video.c:1.37
--- src/sys/dev/video.c:1.36 Fri Dec 27 09:41:50 2019
+++ src/sys/dev/video.c Fri May 22 11:23:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: video.c,v 1.36 2019/12/27 09:41:50 msaitoh Exp $ */
+/* $NetBSD: video.c,v 1.37 2020/05/22 11:23:51 jmcneill Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.36 2019/12/27 09:41:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: video.c,v 1.37 2020/05/22 11:23:51 jmcneill Exp $");
#include "video.h"
#if NVIDEO > 0
@@ -262,6 +262,10 @@ static int video_set_format(struct video
struct v4l2_format *);
static int video_try_format(struct video_softc *,
struct v4l2_format *);
+static int video_get_parm(struct video_softc *,
+ struct v4l2_streamparm *);
+static int video_set_parm(struct video_softc *,
+ struct v4l2_streamparm *);
static int video_enum_standard(struct video_softc *,
struct v4l2_standard *);
static int video_get_standard(struct video_softc *, v4l2_std_id *);
@@ -871,6 +875,57 @@ video_try_format(struct video_softc *sc,
return 0;
}
+static int
+video_get_parm(struct video_softc *sc, struct v4l2_streamparm *parm)
+{
+ struct video_fract fract;
+ const struct video_hw_if *hw;
+ int error;
+
+ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ return EINVAL;
+
+ hw = sc->hw_if;
+ if (hw == NULL)
+ return ENXIO;
+
+ memset(>parm, 0, sizeof(parm->parm));
+ if (hw->get_framerate != NULL) {
+ error = hw->get_framerate(sc->hw_softc, );
+ if (error != 0)
+ return error;
+ parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME;
+ parm->parm.capture.timeperframe.numerator = fract.numerator;
+ parm->parm.capture.timeperframe.denominator = fract.denominator;
+ }
+
+ return 0;
+}
+
+static int
+video_set_parm(struct video_softc *sc, struct v4l2_streamparm *parm)
+{
+ struct video_fract fract;
+ const struct video_hw_if *hw;
+ int error;
+
+ if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
+ return EINVAL;
+
+ hw = sc->hw_if;
+ if (hw == NULL || hw->set_framerate == NULL)
+ return ENXIO;
+
+ error = hw->set_framerate(sc->hw_softc, );
+ if (error != 0)
+ return error;
+
+ parm->parm.capture.timeperframe.numerator = fract.numerator;
+ parm->parm.capture.timeperframe.denominator = fract.denominator;
+
+ return 0;
+}
+
static void
v4l2_standard_to_video_standard(v4l2_std_id stdid,
enum video_standard *vstd)
@@ -1858,6 +1913,7 @@ videoioctl(dev_t dev, u_long cmd, void *
struct v4l2_queryctrl *query;
struct v4l2_requestbuffers *reqbufs;
struct v4l2_buffer *buf;
+ struct v4l2_streamparm *parm;
v4l2_std_id *stdid;
enum v4l2_buf_type *typep;
int *ip;
@@ -1914,6 +1970,14 @@ videoioctl(dev_t dev, u_long cmd, void *
case VIDIOC_TRY_FMT:
fmt = data;
return video_try_format(sc, fmt);
+ case VIDIOC_G_PARM:
+ parm = data;
+ return video_get_parm(sc, parm);
+ case VIDIOC_S_PARM:
+ parm = data;
+ if ((flag & FWRITE) == 0)
+ return EPERM;
+ return video_set_parm(sc, parm);
case VIDIOC_ENUMSTD:
std = data;
return video_enum_standard(sc, std);
Index: src/sys/dev/video_if.h
diff -u src/sys/dev/video_if.h:1.8 src/sys/dev/video_if.h:1.9
--- src/sys/dev/video_if.h:1.8 Fri Dec 27 09:41:50 2019
+++ src/sys/dev/video_if.h Fri May 22 11:23:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: video_if.h,v 1.8 2019/12/27 09:41:50 msaitoh Exp $ */
+/* $NetBSD: video_if.h,v 1.9 2020/05/22 11:23:51 jmcneill Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -378,6 +378,12 @@ struct video_format {
* Must be set to zero if not used. */
};
+/* Represents the amount of time a single frame is displayed. */
+struct video_fract {
+ uint32_t numerator;
+ uint32_t denominator;
+};
+
/* A payload is the smallest unit transferred from the hardware driver
* to the video layer. Multiple video payloads make up one video
* sample. */
@@ -488,6 +494,9 @@ struct video_hw_if {
int (*get_frequency)(void *, struct video_frequency *);
int (*set_frequency)(void *, struct video_frequency *);
+
+ int (*get_framerate)(void *, struct video_fract *);
+ int (*set_framerate)(void *, struct video_fract *);
};
struct video_attach_args {
