CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: christos Date: Tue Oct 29 04:55:36 UTC 2019 Modified Files: src/sys/arch/mips/include: fenv.h Log Message: do the pragma dance to avoid -Wshadow To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/include/fenv.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/mips/include/fenv.h diff -u src/sys/arch/mips/include/fenv.h:1.4 src/sys/arch/mips/include/fenv.h:1.5 --- src/sys/arch/mips/include/fenv.h:1.4 Wed Mar 22 19:11:09 2017 +++ src/sys/arch/mips/include/fenv.h Tue Oct 29 00:55:36 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fenv.h,v 1.4 2017/03/22 23:11:09 chs Exp $ */ +/* $NetBSD: fenv.h,v 1.5 2019/10/29 04:55:36 christos Exp $ */ /*- * Copyright (c) 2004-2005 David Schultz @@ -86,6 +86,11 @@ __wfs(fpu_control_t __fpsr) __asm __volatile("ctc1 %0,$31" : : "r" (__fpsr)); } +#if __GNUC_PREREQ__(8, 0) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#endif + __fenv_static inline int feclearexcept(int __excepts) { @@ -201,6 +206,10 @@ feupdateenv(const fenv_t *__envp) return (0); } +#if __GNUC_PREREQ__(8, 0) +#pragma GCC diagnostic pop +#endif + #if defined(_NETBSD_SOURCE) || defined(_GNU_SOURCE) __fenv_static inline int
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: christos Date: Tue Oct 29 04:55:36 UTC 2019 Modified Files: src/sys/arch/mips/include: fenv.h Log Message: do the pragma dance to avoid -Wshadow To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/include/fenv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/qbus
Module Name:src Committed By: christos Date: Tue Oct 29 03:49:59 UTC 2019 Modified Files: src/sys/dev/qbus: rf.c rfreg.h Log Message: Implement what the documentation in rfreg.h states, and do not apply the wrong mask to the command register (which kind of works, but really?!?!) Found by gcc -Wtautological-compare To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/qbus/rf.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/qbus/rfreg.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/qbus/rf.c diff -u src/sys/dev/qbus/rf.c:1.33 src/sys/dev/qbus/rf.c:1.34 --- src/sys/dev/qbus/rf.c:1.33 Tue Dec 8 15:36:15 2015 +++ src/sys/dev/qbus/rf.c Mon Oct 28 23:49:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rf.c,v 1.33 2015/12/08 20:36:15 christos Exp $ */ +/* $NetBSD: rf.c,v 1.34 2019/10/29 03:49:59 christos Exp $ */ /* * Copyright (c) 2002 Jochen Kunz. * All rights reserved. @@ -36,7 +36,7 @@ TODO: */ #include -__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.33 2015/12/08 20:36:15 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.34 2019/10/29 03:49:59 christos Exp $"); /* autoconfig stuff */ #include @@ -530,7 +530,7 @@ rfc_sendcmd(struct rfc_softc *rfc_sc, in /* Wait 50us, the controller needs this time to setle. */ DELAY(50); /* Write parameter 1 to DBR */ - if ((cmd & RX2CS_FC) != RX2CS_RSTAT) { + if ((cmd & RX2CS_MASK) != RX2CS_RSTAT) { /* Transfer request set? */ if ((bus_space_read_2(rfc_sc->sc_iot, rfc_sc->sc_ioh, RX2CS) & RX2CS_TR) == 0) { @@ -542,7 +542,8 @@ rfc_sendcmd(struct rfc_softc *rfc_sc, in data1); } /* Write parameter 2 to DBR */ - if ((cmd & RX2CS_FC) <= RX2CS_RSEC || (cmd & RX2CS_FC) == RX2CS_WDDS) { + if ((cmd & RX2CS_MASK) <= RX2CS_RSEC || + (cmd & RX2CS_MASK) == RX2CS_WDDS) { /* Wait 50us, the controller needs this time to setle. */ DELAY(50); /* Transfer request set? */ Index: src/sys/dev/qbus/rfreg.h diff -u src/sys/dev/qbus/rfreg.h:1.4 src/sys/dev/qbus/rfreg.h:1.5 --- src/sys/dev/qbus/rfreg.h:1.4 Sun Dec 11 07:23:29 2005 +++ src/sys/dev/qbus/rfreg.h Mon Oct 28 23:49:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: rfreg.h,v 1.4 2005/12/11 12:23:29 christos Exp $ */ +/* $NetBSD: rfreg.h,v 1.5 2019/10/29 03:49:59 christos Exp $ */ /* * Copyright (c) 2002 Jochen Kunz. * All rights reserved. @@ -66,14 +66,15 @@ /* Commands of the controller and parameter cont. */ -#define RX2CS_FBUF 001 /* Fill Buffer, word count and bus address */ -#define RX2CS_EBUF 003 /* Empty Buffer, word count and bus address */ -#define RX2CS_WSEC 005 /* Write Sector, sector and track */ -#define RX2CS_RSEC 007 /* Read Sector, sector and track */ -#define RX2CS_SMD 011 /* Set Media Density, ??? */ -#define RX2CS_RSTAT 013 /* Read Status, no params */ -#define RX2CS_WDDS 015 /* Write Deleted Data Sector, sector and track */ -#define RX2CS_REC 017 /* Read Error Code, bus address */ +#define RX2CS_FBUF 0x1 /* Fill Buffer, word count and bus address */ +#define RX2CS_EBUF 0x3 /* Empty Buffer, word count and bus address */ +#define RX2CS_WSEC 0x5 /* Write Sector, sector and track */ +#define RX2CS_RSEC 0x7 /* Read Sector, sector and track */ +#define RX2CS_SMD 0x9 /* Set Media Density, ??? */ +#define RX2CS_RSTAT 0xb /* Read Status, no params */ +#define RX2CS_WDDS 0xd /* Write Deleted Data Sector, sector and track */ +#define RX2CS_REC 0xf /* Read Error Code, bus address */ +#define RX2CS_MASK 0xf /* Track Address Register */
CVS commit: src/sys/dev/qbus
Module Name:src Committed By: christos Date: Tue Oct 29 03:49:59 UTC 2019 Modified Files: src/sys/dev/qbus: rf.c rfreg.h Log Message: Implement what the documentation in rfreg.h states, and do not apply the wrong mask to the command register (which kind of works, but really?!?!) Found by gcc -Wtautological-compare To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/dev/qbus/rf.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/qbus/rfreg.h 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/backend
Module Name:src Committed By: christos Date: Tue Oct 29 02:49:05 UTC 2019 Modified Files: src/external/gpl3/gcc/usr.bin/backend: Makefile Log Message: Add more -O0 files for vax, sort To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/external/gpl3/gcc/usr.bin/backend/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/gpl3/gcc/usr.bin/backend/Makefile diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.56 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.57 --- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.56 Wed Oct 2 02:52:00 2019 +++ src/external/gpl3/gcc/usr.bin/backend/Makefile Mon Oct 28 22:49:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2019/10/02 06:52:00 mrg Exp $ +# $NetBSD: Makefile,v 1.57 2019/10/29 02:49:05 christos Exp $ LIBISPRIVATE= yes @@ -534,14 +534,17 @@ COPTS.builtins.c+=-O0 COPTS.calls.c+=-O0 COPTS.convert.c+=-O0 COPTS.data-streamer-out.c+=-O0 -COPTS.dwarf2out.c+=-O0 COPTS.dse.c+=-O0 # XXX port-vax/51967 +COPTS.dwarf2out.c+=-O0 COPTS.expmed.c+=-O0 COPTS.expr.c+=-O0 -Wno-error=tautological-compare COPTS.fixed-value.c+=-O0 COPTS.fold-const.c+=-O0 +COPTS.generic-match.c+=-O0 COPTS.gimple-fold.c+=-O0 +COPTS.gimple-match.c+=-O0 COPTS.gimple-ssa-strength-reduction.c+=-O0 +COPTS.gimple-ssa-warn-restrict.c+=-O0 COPTS.gimple.c+=-O0 COPTS.internal-fn.c+=-O0 COPTS.lto-streamer-out.c+=-O0 @@ -554,13 +557,13 @@ COPTS.stor-layout.c+=-O0 COPTS.targhooks.c+=-O0 COPTS.tree-affine.c+=-O0 COPTS.tree-cfg.c+=-O0 +COPTS.tree-data-ref.c+=-O0 COPTS.tree-eh.c+=-O0 COPTS.tree-if-conv.c+=-O0 COPTS.tree-object-size.c+=-O0 COPTS.tree-parloops.c+=-O0 COPTS.tree-predcom.c+=-O0 COPTS.tree-pretty-print.c+=-O0 -COPTS.tree-ssa.c+=-O0 COPTS.tree-ssa-alias.c+=-O0 COPTS.tree-ssa-ccp.c+=-O0 COPTS.tree-ssa-forwprop.c+=-O0 @@ -570,18 +573,21 @@ COPTS.tree-ssa-loop-niter.c+=-O0 COPTS.tree-ssa-math-opts.c+=-O0 COPTS.tree-ssa-pre.c+=-O0 COPTS.tree-ssa-reassoc.c+=-O0 +COPTS.tree-ssa-strlen.c+=-O0 COPTS.tree-ssa-uninit.c+=-O0 +COPTS.tree-ssa.c+=-O0 COPTS.tree-switch-conversion.c+=-O0 COPTS.tree-vect-data-refs.c+=-O0 -COPTS.tree-vect-loop.c+=-O0 COPTS.tree-vect-loop-manip.c+=-O0 +COPTS.tree-vect-loop.c+=-O0 COPTS.tree-vect-patterns.c+=-O0 COPTS.tree-vect-stmts.c+=-O0 COPTS.tree-vrp.c+=-O0 COPTS.tree.c+=-O0 COPTS.ubsan.c+=-O0 -COPTS.web.c+=-O0 COPTS.varasm.c+=-O0 +COPTS.vr-values.c+=-O0 +COPTS.web.c+=-O0 COPTS.wide-int.cc+=-O0 .else COPTS.tree.c= ${${ACTIVE_CC} == "clang" :? -O0 :}
CVS commit: src/external/gpl3/gcc/usr.bin/backend
Module Name:src Committed By: christos Date: Tue Oct 29 02:49:05 UTC 2019 Modified Files: src/external/gpl3/gcc/usr.bin/backend: Makefile Log Message: Add more -O0 files for vax, sort To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/external/gpl3/gcc/usr.bin/backend/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 23:58:18 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add tirng To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 23:58:18 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add tirng To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/evbarm/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.59 src/sys/arch/evbarm/conf/GENERIC:1.60 --- src/sys/arch/evbarm/conf/GENERIC:1.59 Mon Oct 28 22:21:54 2019 +++ src/sys/arch/evbarm/conf/GENERIC Mon Oct 28 23:58:18 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.59 2019/10/28 22:21:54 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.60 2019/10/28 23:58:18 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -532,6 +532,7 @@ spi* at spibus? # Random number generators bcmrng* at fdt? # Broadcom BCM283x RNG mesonrng* at fdt? # Amlogic Meson RNG +tirng* at fdt? # TI RNG # Security ID EFUSE sunxisid* at fdt? pass 4 # SID
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 23:58:00 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c files.ti Added Files: src/sys/arch/arm/ti: ti_rng.c ti_rngreg.h Log Message: Add support for hardware RNG. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/am3_prcm.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/ti/files.ti cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_rng.c \ src/sys/arch/arm/ti/ti_rngreg.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/arm/ti/am3_prcm.c diff -u src/sys/arch/arm/ti/am3_prcm.c:1.6 src/sys/arch/arm/ti/am3_prcm.c:1.7 --- src/sys/arch/arm/ti/am3_prcm.c:1.6 Mon Oct 28 22:21:35 2019 +++ src/sys/arch/arm/ti/am3_prcm.c Mon Oct 28 23:57:59 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: am3_prcm.c,v 1.6 2019/10/28 22:21:35 jmcneill Exp $ */ +/* $NetBSD: am3_prcm.c,v 1.7 2019/10/28 23:57:59 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.6 2019/10/28 22:21:35 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.7 2019/10/28 23:57:59 jmcneill Exp $"); #include #include @@ -124,6 +124,8 @@ static struct ti_prcm_clk am3_prcm_clks[ AM3_PRCM_HWMOD_PER("tptc2", 0x100, "PERIPH_CLK"), AM3_PRCM_HWMOD_PER("usb_otg_hs", 0x1c, "PERIPH_CLK"), + + AM3_PRCM_HWMOD_PER("rng", 0x90, "PERIPH_CLK"), }; static int Index: src/sys/arch/arm/ti/files.ti diff -u src/sys/arch/arm/ti/files.ti:1.13 src/sys/arch/arm/ti/files.ti:1.14 --- src/sys/arch/arm/ti/files.ti:1.13 Mon Oct 28 22:21:35 2019 +++ src/sys/arch/arm/ti/files.ti Mon Oct 28 23:57:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.ti,v 1.13 2019/10/28 22:21:35 jmcneill Exp $ +# $NetBSD: files.ti,v 1.14 2019/10/28 23:57:59 jmcneill Exp $ # file arch/arm/ti/ti_platform.c soc_ti @@ -80,6 +80,11 @@ file arch/arm/ti/ti_otg.c ti_otg attach motg at fdt with ti_motg file arch/arm/ti/ti_motg.c ti_motg +# RNG +device tirng +attach tirng at fdt with ti_rng +file arch/arm/ti/ti_rng.c ti_rng + # SOC parameters defflag opt_soc.h SOC_TI defflag opt_soc.h SOC_TI_AM335X: SOC_TI Added files: Index: src/sys/arch/arm/ti/ti_rng.c diff -u /dev/null src/sys/arch/arm/ti/ti_rng.c:1.1 --- /dev/null Mon Oct 28 23:58:00 2019 +++ src/sys/arch/arm/ti/ti_rng.c Mon Oct 28 23:57:59 2019 @@ -0,0 +1,151 @@ +/* $NetBSD: ti_rng.c,v 1.1 2019/10/28 23:57:59 jmcneill Exp $ */ + +/*- + * Copyright (c) 2015 Jared D. McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. The name of the author may not be used to endorse or promote products + *derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: ti_rng.c,v 1.1 2019/10/28 23:57:59 jmcneill Exp $"); + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +static const char * const compatible[] = { + "ti,omap4-rng", + NULL +}; + +struct ti_rng_softc { + device_t sc_dev; + bus_space_tag_t sc_iot; + bus_space_handle_t sc_ioh; + + kmutex_t sc_lock; + krndsource_t sc_rndsource; +}; + +static int ti_rng_match(device_t, cfdata_t, void *); +static void ti_rng_attach(device_t, device_t, void *); +static void ti_rng_callback(size_t, void *); + +CFATTACH_DECL_NEW(ti_rng, sizeof(struct ti_rng_softc), +ti_rng_match, ti_rng_attach, NULL, NULL); + +#define RD4(sc, reg) \ + bus_space_read_4((sc)->sc_iot, (sc)->sc_ioh, (reg)) +#define WR4(sc, reg, val) \ + bus_space_write_4((sc)->sc_iot, (sc)->sc_ioh, (reg), (val)) + +static int +ti_rng_match(device_t parent, cfdata_t match, void *aux) +{ + struct fdt_attach_args * const faa = aux; + + return of_match_compatible(faa->faa_phandle, compatible); +} + +static void +ti_rng_attach(device_t parent, device_t self, void *aux) +{ + struct ti_rng_softc *sc =
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 23:58:00 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c files.ti Added Files: src/sys/arch/arm/ti: ti_rng.c ti_rngreg.h Log Message: Add support for hardware RNG. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/am3_prcm.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/ti/files.ti cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_rng.c \ src/sys/arch/arm/ti/ti_rngreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Oct 28 23:32:15 UTC 2019 Modified Files: src/sys/compat/common: compat_90_mod.c Log Message: Don't ignore EBUSY from disestablish or we can crash by unloading busy syscalls. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/compat_90_mod.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/common
Module Name:src Committed By: christos Date: Mon Oct 28 23:32:15 UTC 2019 Modified Files: src/sys/compat/common: compat_90_mod.c Log Message: Don't ignore EBUSY from disestablish or we can crash by unloading busy syscalls. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/compat/common/compat_90_mod.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/compat/common/compat_90_mod.c diff -u src/sys/compat/common/compat_90_mod.c:1.1 src/sys/compat/common/compat_90_mod.c:1.2 --- src/sys/compat/common/compat_90_mod.c:1.1 Sun Sep 22 18:59:38 2019 +++ src/sys/compat/common/compat_90_mod.c Mon Oct 28 19:32:15 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_90_mod.c,v 1.1 2019/09/22 22:59:38 christos Exp $ */ +/* $NetBSD: compat_90_mod.c,v 1.2 2019/10/28 23:32:15 christos Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #endif #include -__KERNEL_RCSID(0, "$NetBSD: compat_90_mod.c,v 1.1 2019/09/22 22:59:38 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: compat_90_mod.c,v 1.2 2019/10/28 23:32:15 christos Exp $"); #include #include @@ -50,18 +50,14 @@ int compat_90_init(void) { - vfs_syscalls_90_init(); - - return 0; + return vfs_syscalls_90_init(); } int compat_90_fini(void) { - vfs_syscalls_90_fini(); - - return 0; + return vfs_syscalls_90_fini(); } MODULE(MODULE_CLASS_EXEC, compat_90, NULL);
CVS commit: src/sbin
Module Name:src Committed By: christos Date: Mon Oct 28 22:52:43 UTC 2019 Modified Files: src/sbin/fsck_ffs: Makefile.common src/sbin/fsdb: Makefile Log Message: inode.c needs -O0 for vax To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sbin/fsck_ffs/Makefile.common cvs rdiff -u -r1.38 -r1.39 src/sbin/fsdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin
Module Name:src Committed By: christos Date: Mon Oct 28 22:52:43 UTC 2019 Modified Files: src/sbin/fsck_ffs: Makefile.common src/sbin/fsdb: Makefile Log Message: inode.c needs -O0 for vax To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sbin/fsck_ffs/Makefile.common cvs rdiff -u -r1.38 -r1.39 src/sbin/fsdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/Makefile.common diff -u src/sbin/fsck_ffs/Makefile.common:1.1 src/sbin/fsck_ffs/Makefile.common:1.2 --- src/sbin/fsck_ffs/Makefile.common:1.1 Wed Feb 8 11:11:40 2017 +++ src/sbin/fsck_ffs/Makefile.common Mon Oct 28 18:52:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2017/02/08 16:11:40 rin Exp $ +# $NetBSD: Makefile.common,v 1.2 2019/10/28 22:52:43 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 4/27/95 # shared stuff with src/distrib/utils/x_newfs for install media. @@ -38,4 +38,5 @@ COPTS.pass1.c+= -fno-tree-fre -fno-tree- .endif .if ${MACHINE_ARCH} == "vax" COPTS.pass1.c+= -O0 +COPTS.inode.c+= -O0 .endif Index: src/sbin/fsdb/Makefile diff -u src/sbin/fsdb/Makefile:1.38 src/sbin/fsdb/Makefile:1.39 --- src/sbin/fsdb/Makefile:1.38 Wed Mar 23 17:43:33 2016 +++ src/sbin/fsdb/Makefile Mon Oct 28 18:52:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2016/03/23 21:43:33 christos Exp $ +# $NetBSD: Makefile,v 1.39 2019/10/28 22:52:43 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/5/93 .include @@ -41,6 +41,7 @@ COPTS.pass1.c+= -fno-tree-fre -fno-tree- .if ${MACHINE_ARCH} == "vax" COPTS.pass1.c+= -O0 +COPTS.inode.c+= -O0 .endif .include
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:26:05 UTC 2019 Modified Files: src/doc: CHANGES Log Message: evbarm: Update TI AM335x SoC support to use FDT based configuration. To generate a diff of this commit: cvs rdiff -u -r1.2604 -r1.2605 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: jmcneill Date: Mon Oct 28 22:26:05 UTC 2019 Modified Files: src/doc: CHANGES Log Message: evbarm: Update TI AM335x SoC support to use FDT based configuration. To generate a diff of this commit: cvs rdiff -u -r1.2604 -r1.2605 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.2604 src/doc/CHANGES:1.2605 --- src/doc/CHANGES:1.2604 Mon Oct 28 03:01:55 2019 +++ src/doc/CHANGES Mon Oct 28 22:26:05 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2604 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2605 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -60,3 +60,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: vio9p(4): Add virtio-9p front-end driver. [ozaki-r 20191028] mount_9p(8): Enable to mount a filesystem exported via virtio-9p. [ozaki-r 20191028] + evbarm: Update TI AM335x SoC support to use FDT based configuration. + [jmcneill 20191028]
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:24:56 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: BEAGLEBONE BEAGLEBONE_INSTALL Log Message: Remove BEAGLEBONE kernel config (AM335x SoC is supported by GENERIC now). To generate a diff of this commit: cvs rdiff -u -r1.48 -r0 src/sys/arch/evbarm/conf/BEAGLEBONE cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/BEAGLEBONE_INSTALL cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/README.evbarm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:24:56 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Removed Files: src/sys/arch/evbarm/conf: BEAGLEBONE BEAGLEBONE_INSTALL Log Message: Remove BEAGLEBONE kernel config (AM335x SoC is supported by GENERIC now). To generate a diff of this commit: cvs rdiff -u -r1.48 -r0 src/sys/arch/evbarm/conf/BEAGLEBONE cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/BEAGLEBONE_INSTALL cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/README.evbarm 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/conf/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.21 src/sys/arch/evbarm/conf/README.evbarm:1.22 --- src/sys/arch/evbarm/conf/README.evbarm:1.21 Sun Mar 31 13:04:54 2019 +++ src/sys/arch/evbarm/conf/README.evbarm Mon Oct 28 22:24:56 2019 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.21 2019/03/31 13:04:54 jmcneill Exp $ +$NetBSD: README.evbarm,v 1.22 2019/10/28 22:24:56 jmcneill Exp $ config date boards --- @@ -8,7 +8,6 @@ ARMADILLO9 2005/11/13 Atmark Techno Arma BCM5301X 2012/08/31 Broadcom BCM95301X evaluation/reference board BEAGLEBOARD 2008/10/22 TI OMAP3530 BeagleBoard BEAGLEBOARDXM 2008/08/20 TI DM37xx BeagleBoard-XM -BEAGLEBONE 2012/08/20 TI AM335x BeagleBone CUBOX 2017/01/07 SolidRun Cubox CP3100 2006/11/08 Certance IOP321 CP-3100 DEVKIT8000 2010/09/08 Embest OMAP3530 DevKit8000 eval Kit
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:23:51 UTC 2019 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Unhook BEAGLEBONE kernel from the build To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 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.107 src/etc/etc.evbarm/Makefile.inc:1.108 --- src/etc/etc.evbarm/Makefile.inc:1.107 Sun Jun 2 17:13:15 2019 +++ src/etc/etc.evbarm/Makefile.inc Mon Oct 28 22:23:51 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.107 2019/06/02 17:13:15 thorpej Exp $ +# $NetBSD: Makefile.inc,v 1.108 2019/10/28 22:23:51 jmcneill Exp $ # # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets # @@ -86,8 +86,6 @@ KERNEL_SETS.armv7+= BEAGLEBOARD KERNEL_SETS.armv7hf+= BEAGLEBOARD EVBARM_BOARDS.armv7+= BEAGLEBOARDXM EVBARM_BOARDS.armv7hf+= BEAGLEBOARDXM -KERNEL_SETS.armv7+= BEAGLEBONE -KERNEL_SETS.armv7hf+= BEAGLEBONE EVBARM_BOARDS.armv7+= CUBOX EVBARM_BOARDS.armv7hf+= CUBOX EVBARM_BOARDS.armv7+= CUBOX-I
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:23:51 UTC 2019 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: Unhook BEAGLEBONE kernel from the build To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 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.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:21:54 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add tigpio To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.58 src/sys/arch/evbarm/conf/GENERIC:1.59 --- src/sys/arch/evbarm/conf/GENERIC:1.58 Mon Oct 28 21:17:25 2019 +++ src/sys/arch/evbarm/conf/GENERIC Mon Oct 28 22:21:54 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.58 2019/10/28 21:17:25 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.59 2019/10/28 22:21:54 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -412,6 +412,7 @@ mesonpinctrl* at fdt? pass 2 # Amlogic plgpio* at fdt? # ARM PrimeCell GPIO sunxigpio* at fdt? pass 3 # Allwinner GPIO tegragpio* at fdt? pass 2 # NVIDIA Tegra GPIO +tigpio* at fdt? pass 2 # TI GPIO gpio* at gpiobus? # MPIO / Pinmux
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:21:54 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add tigpio To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:21:35 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c files.ti Added Files: src/sys/arch/arm/ti: ti_gpio.c Log Message: Add support for GPIO controller. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/am3_prcm.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/ti/files.ti cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_gpio.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/arm/ti/am3_prcm.c diff -u src/sys/arch/arm/ti/am3_prcm.c:1.5 src/sys/arch/arm/ti/am3_prcm.c:1.6 --- src/sys/arch/arm/ti/am3_prcm.c:1.5 Mon Oct 28 21:16:10 2019 +++ src/sys/arch/arm/ti/am3_prcm.c Mon Oct 28 22:21:35 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: am3_prcm.c,v 1.5 2019/10/28 21:16:10 jmcneill Exp $ */ +/* $NetBSD: am3_prcm.c,v 1.6 2019/10/28 22:21:35 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.5 2019/10/28 21:16:10 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.6 2019/10/28 22:21:35 jmcneill Exp $"); #include #include @@ -101,6 +101,11 @@ static struct ti_prcm_clk am3_prcm_clks[ AM3_PRCM_HWMOD_PER("i2c2", 0x48, "PERIPH_CLK"), AM3_PRCM_HWMOD_PER("i2c3", 0x44, "PERIPH_CLK"), + AM3_PRCM_HWMOD_WKUP("gpio1", 0x8, "PERIPH_CLK"), + AM3_PRCM_HWMOD_PER("gpio2", 0xac, "PERIPH_CLK"), + AM3_PRCM_HWMOD_PER("gpio3", 0xb0, "PERIPH_CLK"), + AM3_PRCM_HWMOD_PER("gpio4", 0xb4, "PERIPH_CLK"), + AM3_PRCM_HWMOD_WKUP("timer0", 0x10, "FIXED_32K"), AM3_PRCM_HWMOD_PER("timer2", 0x80, "PERIPH_CLK"), AM3_PRCM_HWMOD_PER("timer3", 0x84, "PERIPH_CLK"), Index: src/sys/arch/arm/ti/files.ti diff -u src/sys/arch/arm/ti/files.ti:1.12 src/sys/arch/arm/ti/files.ti:1.13 --- src/sys/arch/arm/ti/files.ti:1.12 Mon Oct 28 21:16:47 2019 +++ src/sys/arch/arm/ti/files.ti Mon Oct 28 22:21:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.ti,v 1.12 2019/10/28 21:16:47 jmcneill Exp $ +# $NetBSD: files.ti,v 1.13 2019/10/28 22:21:35 jmcneill Exp $ # file arch/arm/ti/ti_platform.c soc_ti @@ -45,6 +45,11 @@ device omaptimer attach omaptimer at fdt file arch/arm/ti/ti_omaptimer.c omaptimer +# GPIO +device tigpio: gpiobus +attach tigpio at fdt with ti_gpio +file arch/arm/ti/ti_gpio.c ti_gpio + # I2C device tiiic: i2cbus, i2cexec attach tiiic at fdt with ti_iic Added files: Index: src/sys/arch/arm/ti/ti_gpio.c diff -u /dev/null src/sys/arch/arm/ti/ti_gpio.c:1.1 --- /dev/null Mon Oct 28 22:21:35 2019 +++ src/sys/arch/arm/ti/ti_gpio.c Mon Oct 28 22:21:35 2019 @@ -0,0 +1,302 @@ +/* $NetBSD: ti_gpio.c,v 1.1 2019/10/28 22:21:35 jmcneill Exp $ */ + +/*- + * Copyright (c) 2019 Jared McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.1 2019/10/28 22:21:35 jmcneill Exp $"); + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +#define GPIO_OE0x134 +#define GPIO_DATAIN 0x138 +#define GPIO_CLEARDATAOUT 0x190 +#define GPIO_SETDATAOUT 0x194 + +static const char * const compatible[] = { + "ti,omap4-gpio", + NULL +}; + +struct ti_gpio_softc { + device_t sc_dev; + bus_space_tag_t sc_bst; + bus_space_handle_t sc_bsh; + kmutex_t sc_lock; + + struct gpio_chipset_tag sc_gp; + gpio_pin_t sc_pins[32]; + device_t sc_gpiodev; +}; + +struct ti_gpio_pin { + struct ti_gpio_softc *pin_sc; + u_int pin_nr; + int pin_flags; + bool pin_actlo; +}; + +#define RD4(sc, reg) \ +bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg)) +#define WR4(sc, reg, val) \ +
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 22:21:35 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c files.ti Added Files: src/sys/arch/arm/ti: ti_gpio.c Log Message: Add support for GPIO controller. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/ti/am3_prcm.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/ti/files.ti cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_gpio.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/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:17:25 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Enable TI AM335x DVFS support To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/GENERIC 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/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.57 src/sys/arch/evbarm/conf/GENERIC:1.58 --- src/sys/arch/evbarm/conf/GENERIC:1.57 Sun Oct 27 19:11:24 2019 +++ src/sys/arch/evbarm/conf/GENERIC Mon Oct 28 21:17:25 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.57 2019/10/27 19:11:24 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.58 2019/10/28 21:17:25 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -317,6 +317,9 @@ sun9immcclk* at fdt? pass 2 # Allwinne sun9iusbclk* at fdt? pass 2 # Allwinner A80 USB HCI tegra124car* at fdt? pass 3 # NVIDIA Tegra CAR (T124) tegra210car* at fdt? pass 3 # NVIDIA Tegra CAR (T210) +tidivclk* at fdt? pass 1 # TI divider clock +tidpllclk* at fdt? pass 2 # TI DPLL clock +timuxclk* at fdt? pass 1 # TI mux clock fclock* at fdt? pass 1 ffclock* at fdt? pass 1 @@ -512,6 +515,7 @@ tcakp* at iic? # TI TCA8418 Keypad S tcagpio* at iic? titemp* at iic? tps65217pmic* at iic? # TI TPS65217 Power Management IC +tps65217reg* at tps65217pmic? wskbd* at tcakp? console ? # CAN bus
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:17:25 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Enable TI AM335x DVFS support To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/evbarm/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:16:47 UTC 2019 Modified Files: src/sys/arch/arm/ti: files.ti Added Files: src/sys/arch/arm/ti: ti_cpufreq.c ti_div_clock.c ti_dpll_clock.c ti_mux_clock.c Log Message: Add AM335x DVFS support. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ti/files.ti cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_cpufreq.c \ src/sys/arch/arm/ti/ti_div_clock.c src/sys/arch/arm/ti/ti_dpll_clock.c \ src/sys/arch/arm/ti/ti_mux_clock.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/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:16:47 UTC 2019 Modified Files: src/sys/arch/arm/ti: files.ti Added Files: src/sys/arch/arm/ti: ti_cpufreq.c ti_div_clock.c ti_dpll_clock.c ti_mux_clock.c Log Message: Add AM335x DVFS support. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ti/files.ti cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/ti/ti_cpufreq.c \ src/sys/arch/arm/ti/ti_div_clock.c src/sys/arch/arm/ti/ti_dpll_clock.c \ src/sys/arch/arm/ti/ti_mux_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/arm/ti/files.ti diff -u src/sys/arch/arm/ti/files.ti:1.11 src/sys/arch/arm/ti/files.ti:1.12 --- src/sys/arch/arm/ti/files.ti:1.11 Sun Oct 27 19:11:07 2019 +++ src/sys/arch/arm/ti/files.ti Mon Oct 28 21:16:47 2019 @@ -1,7 +1,8 @@ -# $NetBSD: files.ti,v 1.11 2019/10/27 19:11:07 jmcneill Exp $ +# $NetBSD: files.ti,v 1.12 2019/10/28 21:16:47 jmcneill Exp $ # file arch/arm/ti/ti_platform.c soc_ti +file arch/arm/ti/ti_cpufreq.c soc_ti # Interrupt controller device omapintc: pic, pic_splfuncs @@ -18,10 +19,23 @@ define ti_prcm file arch/arm/ti/ti_prcm.c ti_prcm # PRCM (AM3xxx) -device am3prcm: ti_prcm +device am3prcm { } : fdt, ti_prcm attach am3prcm at fdt with am3_prcm file arch/arm/ti/am3_prcm.c am3_prcm +# Clocks +device timuxclk +attach timuxclk at fdt with ti_mux_clock +file arch/arm/ti/ti_mux_clock.c ti_mux_clock + +device tidivclk +attach tidivclk at fdt with ti_div_clock +file arch/arm/ti/ti_div_clock.c ti_div_clock + +device tidpllclk +attach tidpllclk at fdt with ti_dpll_clock +file arch/arm/ti/ti_dpll_clock.c ti_dpll_clock + # UART attach com at fdt with ti_com: ti_prcm file arch/arm/ti/ti_com.c ti_com needs-flag Added files: Index: src/sys/arch/arm/ti/ti_cpufreq.c diff -u /dev/null src/sys/arch/arm/ti/ti_cpufreq.c:1.1 --- /dev/null Mon Oct 28 21:16:47 2019 +++ src/sys/arch/arm/ti/ti_cpufreq.c Mon Oct 28 21:16:47 2019 @@ -0,0 +1,113 @@ +/* $NetBSD: ti_cpufreq.c,v 1.1 2019/10/28 21:16:47 jmcneill Exp $ */ + +/*- + * Copyright (c) 2019 Jared McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "opt_soc.h" + +#include +__KERNEL_RCSID(0, "$NetBSD: ti_cpufreq.c,v 1.1 2019/10/28 21:16:47 jmcneill Exp $"); + +#include +#include +#include +#include +#include + +#include +#include + +static bool ti_opp_probed = false; +static bool (*ti_opp_supportedfn)(const int, const int); +static struct syscon *ti_opp_syscon; + +#ifdef SOC_TI_AM335X + +#define AM33XX_REV_OFFSET 0x0600 +#define AM33XX_REV_MASK 0xf000 +#define AM33XX_EFUSE_OFFSET 0x07fc +#define AM33XX_EFUSE_MASK 0x1fff +#define AM33XX_EFUSE_DEFAULT 0x1e2f + +static const char * const am33xx_compatible[] = { "ti,am33xx", NULL }; + +static bool +am33xx_opp_supported(const int opp_table, const int opp_node) +{ + const u_int *supported_hw; + uint32_t efuse, rev; + int len; + + syscon_lock(ti_opp_syscon); + rev = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_REV_OFFSET), AM33XX_REV_MASK); + efuse = __SHIFTOUT(syscon_read_4(ti_opp_syscon, AM33XX_EFUSE_OFFSET), AM33XX_EFUSE_MASK); + syscon_unlock(ti_opp_syscon); + + if (efuse == 0) + efuse = AM33XX_EFUSE_DEFAULT; + efuse = ~efuse; + + supported_hw = fdtbus_get_prop(opp_node, "opp-supported-hw", ); + if (len != 8) + return false; + + if ((rev & be32toh(supported_hw[0])) == 0) + return false; + + if ((efuse & be32toh(supported_hw[1])) == 0) + return false; + + return true; +} +#endif + +static void +ti_opp_probe(const int opp_table) +{ + if (ti_opp_probed) + return; + ti_opp_probed = true; + + ti_opp_syscon =
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:16:10 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c Log Message: enumerate devices under child "clocks" node To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/am3_prcm.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/arm/ti/am3_prcm.c diff -u src/sys/arch/arm/ti/am3_prcm.c:1.4 src/sys/arch/arm/ti/am3_prcm.c:1.5 --- src/sys/arch/arm/ti/am3_prcm.c:1.4 Sun Oct 27 19:11:07 2019 +++ src/sys/arch/arm/ti/am3_prcm.c Mon Oct 28 21:16:10 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: am3_prcm.c,v 1.4 2019/10/27 19:11:07 jmcneill Exp $ */ +/* $NetBSD: am3_prcm.c,v 1.5 2019/10/28 21:16:10 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.4 2019/10/27 19:11:07 jmcneill Exp $"); +__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.5 2019/10/28 21:16:10 jmcneill Exp $"); #include #include @@ -134,6 +134,7 @@ am3_prcm_attach(device_t parent, device_ { struct ti_prcm_softc * const sc = device_private(self); struct fdt_attach_args * const faa = aux; + int clocks; sc->sc_dev = self; sc->sc_phandle = faa->faa_phandle; @@ -147,4 +148,8 @@ am3_prcm_attach(device_t parent, device_ aprint_naive("\n"); aprint_normal(": AM3xxx PRCM\n"); + + clocks = of_find_firstchild_byname(sc->sc_phandle, "clocks"); + if (clocks > 0) + fdt_add_bus(self, clocks, faa); }
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:16:10 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c Log Message: enumerate devices under child "clocks" node To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/am3_prcm.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/fdt
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:15:34 UTC 2019 Modified Files: src/sys/dev/fdt: fdt_clock.c fdtvar.h Log Message: Add fdtbus_clock_count to count the number of clock references on a given node To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/fdt/fdt_clock.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/fdt/fdtvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:15:34 UTC 2019 Modified Files: src/sys/dev/fdt: fdt_clock.c fdtvar.h Log Message: Add fdtbus_clock_count to count the number of clock references on a given node To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/fdt/fdt_clock.c cvs rdiff -u -r1.55 -r1.56 src/sys/dev/fdt/fdtvar.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/fdt/fdt_clock.c diff -u src/sys/dev/fdt/fdt_clock.c:1.8 src/sys/dev/fdt/fdt_clock.c:1.9 --- src/sys/dev/fdt/fdt_clock.c:1.8 Wed Feb 27 16:56:00 2019 +++ src/sys/dev/fdt/fdt_clock.c Mon Oct 28 21:15:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fdt_clock.c,v 1.8 2019/02/27 16:56:00 jakllsch Exp $ */ +/* $NetBSD: fdt_clock.c,v 1.9 2019/10/28 21:15:34 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdt_clock.c,v 1.8 2019/02/27 16:56:00 jakllsch Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdt_clock.c,v 1.9 2019/10/28 21:15:34 jmcneill Exp $"); #include #include @@ -133,8 +133,8 @@ fdtbus_clock_get_prop(int phandle, const return fdtbus_clock_get_index(phandle, index); } -static u_int -fdtbus_clock_count_prop(int phandle, const char *prop) +u_int +fdtbus_clock_count(int phandle, const char *prop) { u_int n, clock_cells; int len, resid; @@ -207,8 +207,8 @@ fdtbus_clock_assign(int phandle) if (rates == NULL) rates_len = 0; - const u_int nclocks = fdtbus_clock_count_prop(phandle, "assigned-clocks"); - const u_int nparents = fdtbus_clock_count_prop(phandle, "assigned-clock-parents"); + const u_int nclocks = fdtbus_clock_count(phandle, "assigned-clocks"); + const u_int nparents = fdtbus_clock_count(phandle, "assigned-clock-parents"); const u_int nrates = rates_len / sizeof(*rates); for (index = 0; index < nclocks; index++) { Index: src/sys/dev/fdt/fdtvar.h diff -u src/sys/dev/fdt/fdtvar.h:1.55 src/sys/dev/fdt/fdtvar.h:1.56 --- src/sys/dev/fdt/fdtvar.h:1.55 Mon Oct 28 21:14:58 2019 +++ src/sys/dev/fdt/fdtvar.h Mon Oct 28 21:15:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fdtvar.h,v 1.55 2019/10/28 21:14:58 jmcneill Exp $ */ +/* $NetBSD: fdtvar.h,v 1.56 2019/10/28 21:15:34 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -366,6 +366,7 @@ struct clk * fdtbus_clock_get(int, const struct clk * fdtbus_clock_get_index(int, u_int); struct clk * fdtbus_clock_byname(const char *); void fdtbus_clock_assign(int); +u_int fdtbus_clock_count(int, const char *); struct fdtbus_reset *fdtbus_reset_get(int, const char *); struct fdtbus_reset *fdtbus_reset_get_index(int, u_int);
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:14:58 UTC 2019 Modified Files: src/sys/dev/fdt: cpufreq_dt.c fdtvar.h Log Message: Add support for platform specific opp table filters. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/fdt/cpufreq_dt.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/fdt/fdtvar.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/fdt/cpufreq_dt.c diff -u src/sys/dev/fdt/cpufreq_dt.c:1.11 src/sys/dev/fdt/cpufreq_dt.c:1.12 --- src/sys/dev/fdt/cpufreq_dt.c:1.11 Mon Oct 28 10:43:08 2019 +++ src/sys/dev/fdt/cpufreq_dt.c Mon Oct 28 21:14:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufreq_dt.c,v 1.11 2019/10/28 10:43:08 jmcneill Exp $ */ +/* $NetBSD: cpufreq_dt.c,v 1.12 2019/10/28 21:14:58 jmcneill Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpufreq_dt.c,v 1.11 2019/10/28 10:43:08 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpufreq_dt.c,v 1.12 2019/10/28 21:14:58 jmcneill Exp $"); #include #include @@ -356,11 +356,46 @@ cpufreq_dt_parse_opp(struct cpufreq_dt_s return 0; } +static const struct fdt_opp_info * +cpufreq_dt_lookup_opp_info(const int opp_table) +{ + __link_set_decl(fdt_opps, struct fdt_opp_info); + struct fdt_opp_info * const *opp; + const struct fdt_opp_info *best_opp = NULL; + int match, best_match = 0; + + __link_set_foreach(opp, fdt_opps) { + const char * const compat[] = { (*opp)->opp_compat, NULL }; + match = of_match_compatible(opp_table, compat); + if (match > best_match) { + best_match = match; + best_opp = *opp; + } + } + + return best_opp; +} + +static bool +cpufreq_dt_node_supported(const struct fdt_opp_info *opp_info, const int opp_table, const int opp_node) +{ + if (!fdtbus_status_okay(opp_node)) + return false; + if (of_hasprop(opp_node, "opp-suspend")) + return false; + + if (opp_info != NULL) + return opp_info->opp_supported(opp_table, opp_node); + + return true; +} + static int cpufreq_dt_parse_opp_v2(struct cpufreq_dt_softc *sc) { const int phandle = sc->sc_phandle; struct cpufreq_dt_table *table; + const struct fdt_opp_info *opp_info; const u_int *opp_uv; uint64_t opp_hz; int opp_node, len, i, index; @@ -378,10 +413,10 @@ cpufreq_dt_parse_opp_v2(struct cpufreq_d TAILQ_INSERT_TAIL(_dt_tables, >sc_table, next); } + opp_info = cpufreq_dt_lookup_opp_info(opp_table); + for (opp_node = OF_child(opp_table); opp_node; opp_node = OF_peer(opp_node)) { - if (!fdtbus_status_okay(opp_node)) - continue; - if (of_hasprop(opp_node, "opp-suspend")) + if (!cpufreq_dt_node_supported(opp_info, opp_table, opp_node)) continue; sc->sc_nopp++; } @@ -392,9 +427,7 @@ cpufreq_dt_parse_opp_v2(struct cpufreq_d sc->sc_opp = kmem_zalloc(sizeof(*sc->sc_opp) * sc->sc_nopp, KM_SLEEP); index = sc->sc_nopp - 1; for (opp_node = OF_child(opp_table), i = 0; opp_node; opp_node = OF_peer(opp_node), i++) { - if (!fdtbus_status_okay(opp_node)) - continue; - if (of_hasprop(opp_node, "opp-suspend")) + if (!cpufreq_dt_node_supported(opp_info, opp_table, opp_node)) continue; if (of_getprop_uint64(opp_node, "opp-hz", _hz) != 0) return EINVAL; Index: src/sys/dev/fdt/fdtvar.h diff -u src/sys/dev/fdt/fdtvar.h:1.54 src/sys/dev/fdt/fdtvar.h:1.55 --- src/sys/dev/fdt/fdtvar.h:1.54 Tue Oct 1 23:32:52 2019 +++ src/sys/dev/fdt/fdtvar.h Mon Oct 28 21:14:58 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fdtvar.h,v 1.54 2019/10/01 23:32:52 jmcneill Exp $ */ +/* $NetBSD: fdtvar.h,v 1.55 2019/10/28 21:14:58 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -251,6 +251,21 @@ static const struct fdt_console_info __C }; \ _FDT_CONSOLE_REGISTER(_name) +struct fdt_opp_info { + const char * opp_compat; + bool (*opp_supported)(const int, const int); +}; + +#define _FDT_OPP_REGISTER(name) \ + __link_set_add_rodata(fdt_opps, __CONCAT(name,_oppinfo)); + +#define FDT_OPP(_name, _compat, _suppfn)\ +static const struct fdt_opp_info __CONCAT(_name,_oppinfo) = { \ + .opp_compat = (_compat), \ + .opp_supported = (_suppfn) \ +}; \ +_FDT_OPP_REGISTER(_name) + TAILQ_HEAD(fdt_conslist, fdt_console_info); int fdtbus_register_interrupt_controller(device_t, int,
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:14:58 UTC 2019 Modified Files: src/sys/dev/fdt: cpufreq_dt.c fdtvar.h Log Message: Add support for platform specific opp table filters. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/fdt/cpufreq_dt.c cvs rdiff -u -r1.54 -r1.55 src/sys/dev/fdt/fdtvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:13:48 UTC 2019 Modified Files: src/sys/dev/fdt: syscon.c Log Message: enumerate devices under child "clocks" node To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/syscon.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/fdt/syscon.c diff -u src/sys/dev/fdt/syscon.c:1.3 src/sys/dev/fdt/syscon.c:1.4 --- src/sys/dev/fdt/syscon.c:1.3 Mon Feb 25 19:28:36 2019 +++ src/sys/dev/fdt/syscon.c Mon Oct 28 21:13:48 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: syscon.c,v 1.3 2019/02/25 19:28:36 jmcneill Exp $ */ +/* $NetBSD: syscon.c,v 1.4 2019/10/28 21:13:48 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: syscon.c,v 1.3 2019/02/25 19:28:36 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscon.c,v 1.4 2019/10/28 21:13:48 jmcneill Exp $"); #include #include @@ -113,6 +113,7 @@ syscon_attach(device_t parent, device_t const int phandle = faa->faa_phandle; bus_addr_t addr; bus_size_t size; + int child; if (fdtbus_get_reg(phandle, 0, , ) != 0) { aprint_error(": couldn't get registers\n"); @@ -138,4 +139,8 @@ syscon_attach(device_t parent, device_t fdtbus_register_syscon(self, phandle, >sc_syscon); fdt_add_bus(self, phandle, faa); + + child = of_find_firstchild_byname(phandle, "clocks"); + if (child > 0) + fdt_add_bus(self, child, faa); }
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Mon Oct 28 21:13:48 UTC 2019 Modified Files: src/sys/dev/fdt: syscon.c Log Message: enumerate devices under child "clocks" node To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/syscon.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/vax/boot/boot
Module Name:src Committed By: christos Date: Mon Oct 28 21:11:23 UTC 2019 Modified Files: src/sys/arch/vax/boot/boot: mfm.c Log Message: Rewrite the floppy selection logic, and fix an always false condition. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/boot/boot/mfm.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/vax/boot/boot/mfm.c diff -u src/sys/arch/vax/boot/boot/mfm.c:1.15 src/sys/arch/vax/boot/boot/mfm.c:1.16 --- src/sys/arch/vax/boot/boot/mfm.c:1.15 Mon May 22 12:59:32 2017 +++ src/sys/arch/vax/boot/boot/mfm.c Mon Oct 28 17:11:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: mfm.c,v 1.15 2017/05/22 16:59:32 ragge Exp $ */ +/* $NetBSD: mfm.c,v 1.16 2019/10/28 21:11:23 christos Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -139,6 +139,15 @@ mfm_rxprepare(void) return error; } +static int +mfm_is_ready(int cnt, int error) +{ + if (error == 0 && (sreg.udc_dstat & UDC_DS_READY) == UDC_DS_READY) + return 1; + printf("diskette not ready(%d): %#x/%#x\n", cnt, error, sreg.udc_dstat); + return 0; +} + int mfm_rxselect(int unit) { @@ -165,42 +174,40 @@ mfm_rxselect(int unit) */ error = mfm_command(DKC_CMD_DRSEL_RX33 | unit); - if ((error != 0) || ((sreg.udc_dstat & UDC_DS_READY) == 0)) { - printf("\nfloppy-drive not ready (new floppy inserted?)\n\n"); + if (mfm_is_ready(0, error)) + return 0; - creg.udc_rtcnt &= ~UDC_RC_INVRDY; /* clear INVRDY-flag */ - error = mfm_command(DKC_CMD_DRSEL_RX33 | unit); - if ((error != 0) || ((sreg.udc_dstat & UDC_DS_READY) == 0)) { - printf("diskette not ready(1): %x/%x\n", - error, sreg.udc_dstat); - printf("floppy-drive offline?\n"); - return (-1); - } - if (sreg.udc_dstat & UDC_DS_TRK00) - error = mfm_command(DKC_CMD_STEPIN_FDD); - else - error = mfm_command(DKC_CMD_STEPOUT_FDD); + printf("\nfloppy-drive not ready (new floppy inserted?)\n\n"); - /* - * now ready should be 0, cause INVRDY is not set - * (retrying a command makes this fail...) - */ - if ((error != 0) || ((sreg.udc_dstat & UDC_DS_READY) == 1)) { - printf("diskette not ready(2): %x/%x\n", - error, sreg.udc_dstat); - } - creg.udc_rtcnt |= UDC_RC_INVRDY; - error = mfm_command(DKC_CMD_DRSEL_RX33 | unit); + /* clear INVRDY-flag and try again */ + creg.udc_rtcnt &= ~UDC_RC_INVRDY; + error = mfm_command(DKC_CMD_DRSEL_RX33 | unit); - if ((error != 0) || ((sreg.udc_dstat & UDC_DS_READY) == 0)) { - printf("diskette not ready(3): %x/%x\n", - error, sreg.udc_dstat); - printf("no floppy inserted or floppy-door open\n"); - return (-1); - } - printf("floppy-drive reselected.\n"); + if (!mfm_is_ready(1, error)) { + printf("floppy-drive offline?\n"); + return -1; + } - return (error); + if (sreg.udc_dstat & UDC_DS_TRK00) + error = mfm_command(DKC_CMD_STEPIN_FDD); + else + error = mfm_command(DKC_CMD_STEPOUT_FDD); + + /* + * now ready should be 0, cause INVRDY is not set + * (retrying a command makes this fail...) + */ + mfm_is_ready(2, error); + + creg.udc_rtcnt |= UDC_RC_INVRDY; + error = mfm_command(DKC_CMD_DRSEL_RX33 | unit); + if (!mfm_is_ready(3, error)) { + printf("no floppy inserted or floppy-door open\n"); + return -1; + } + + printf("floppy-drive reselected.\n"); + return error; } int
CVS commit: src/sys/arch/vax/boot/boot
Module Name:src Committed By: christos Date: Mon Oct 28 21:11:23 UTC 2019 Modified Files: src/sys/arch/vax/boot/boot: mfm.c Log Message: Rewrite the floppy selection logic, and fix an always false condition. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/vax/boot/boot/mfm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 19:15:51 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.55 src/doc/CHANGES-8.2:1.1.2.56 --- src/doc/CHANGES-8.2:1.1.2.55 Mon Oct 28 18:40:31 2019 +++ src/doc/CHANGES-8.2 Mon Oct 28 19:15:51 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.55 2019/10/28 18:40:31 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.56 2019/10/28 19:15:51 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1393,3 +1393,8 @@ sys/dev/ic/ld_nvme.c1.23 unsupported/unused. [mlelstv, ticket #1417] +sys/dev/audio.c (apply patch) + + Do not allow mmap(2) on audio devices opened read-only. + [nat, ticket #1419] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 19:15:51 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1419 To generate a diff of this commit: cvs rdiff -u -r1.1.2.55 -r1.1.2.56 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev
Module Name:src Committed By: martin Date: Mon Oct 28 19:12:18 UTC 2019 Modified Files: src/sys/dev [netbsd-8]: audio.c Log Message: Apply patch, requested by nat in ticket #1419: PR kern/54547: do not allow mmap() of audio devices that have not been opened for r/w. To generate a diff of this commit: cvs rdiff -u -r1.357.2.13 -r1.357.2.14 src/sys/dev/audio.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/audio.c diff -u src/sys/dev/audio.c:1.357.2.13 src/sys/dev/audio.c:1.357.2.14 --- src/sys/dev/audio.c:1.357.2.13 Thu Jun 7 18:24:16 2018 +++ src/sys/dev/audio.c Mon Oct 28 19:12:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.357.2.13 2018/06/07 18:24:16 martin Exp $ */ +/* $NetBSD: audio.c,v 1.357.2.14 2019/10/28 19:12:17 martin Exp $ */ /*- * Copyright (c) 2016 Nathanial Sloss @@ -148,7 +148,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.357.2.13 2018/06/07 18:24:16 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.357.2.14 2019/10/28 19:12:17 martin Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -3521,6 +3521,9 @@ audio_mmap(struct audio_softc *sc, off_t if (!(audio_get_props(sc) & AUDIO_PROP_MMAP)) return ENOTSUP; + if (vc->sc_open != AUOPEN_WRITE) + return EINVAL; + if (*offp < 0) return EINVAL;
CVS commit: [netbsd-8] src/sys/dev
Module Name:src Committed By: martin Date: Mon Oct 28 19:12:18 UTC 2019 Modified Files: src/sys/dev [netbsd-8]: audio.c Log Message: Apply patch, requested by nat in ticket #1419: PR kern/54547: do not allow mmap() of audio devices that have not been opened for r/w. To generate a diff of this commit: cvs rdiff -u -r1.357.2.13 -r1.357.2.14 src/sys/dev/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:41:58 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #383 and #384 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-9.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-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.89 src/doc/CHANGES-9.0:1.1.2.90 --- src/doc/CHANGES-9.0:1.1.2.89 Mon Oct 28 16:41:31 2019 +++ src/doc/CHANGES-9.0 Mon Oct 28 18:41:58 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.89 2019/10/28 16:41:31 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.90 2019/10/28 18:41:58 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5314,4 +5314,57 @@ sys/modules/filemon/Makefile 1.4 (manu Do not install the filemon module. [maya, ticket #385] +sys/dev/ic/ld_nvme.c1.23 + + Do not attach an ld device if the format descriptor is + unsupported/unused. + [mlelstv, ticket #383] + +etc/etc.aarch64/ttys1.2 +etc/etc.algor/ttys1.6 +etc/etc.alpha/ttys1.13 +etc/etc.amd64/ttys1.7 +etc/etc.amiga/ttys1.25 +etc/etc.amigappc/ttys1.4 +etc/etc.arc/ttys1.9 +etc/etc.cesfic/ttys1.6 +etc/etc.emips/ttys1.2 +etc/etc.epoc32/ttys1.2 +etc/etc.evbarm/ttys1.8 +etc/etc.evbcf/ttys1.3 +etc/etc.evbmips/ttys1.7 +etc/etc.evbppc/ttys1.7 +etc/etc.evbsh3/ttys1.7 +etc/etc.ews4800mips/ttys 1.3 +etc/etc.hp300/ttys1.17 +etc/etc.hpcmips/ttys1.12 +etc/etc.hppa/ttys1.2 +etc/etc.i386/ttys1.21 +etc/etc.ia64/ttys1.2 +etc/etc.iyonix/ttys1.5 +etc/etc.landisk/ttys1.4 +etc/etc.luna68k/ttys1.9 +etc/etc.mipsco/ttys1.7 +etc/etc.mmeye/ttys1.8 +etc/etc.mvme68k/ttys1.10 +etc/etc.mvmeppc/ttys1.7 +etc/etc.netwinder/ttys1.9 +etc/etc.news68k/ttys1.10 +etc/etc.newsmips/ttys1.10 +etc/etc.next68k/ttys1.11 +etc/etc.or1k/ttys1.2 +etc/etc.playstation2/ttys 1.7 +etc/etc.pmax/ttys1.16 +etc/etc.riscv/ttys1.2 +etc/etc.sandpoint/ttys1.8 +etc/etc.sbmips/ttys1.6 +etc/etc.sgimips/ttys1.11 +etc/etc.shark/ttys1.9 +etc/etc.sparc/ttys1.17 +etc/etc.sparc64/ttys1.12 +etc/etc.vax/ttys1.10 +etc/etc.zaurus/ttys1.4 + + Switch default console tty from /dev/console to /dev/constty. + [abs, ticket #384]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Mon Oct 28 18:41:23 UTC 2019 Modified Files: src/doc: HACKS Log Message: another vax -O1 To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/doc/HACKS 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: Mon Oct 28 18:41:58 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #383 and #384 To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-9.0 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: christos Date: Mon Oct 28 18:41:23 UTC 2019 Modified Files: src/doc: HACKS Log Message: another vax -O1 To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.190 src/doc/HACKS:1.191 --- src/doc/HACKS:1.190 Mon May 13 22:53:16 2019 +++ src/doc/HACKS Mon Oct 28 14:41:23 2019 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.190 2019/05/14 02:53:16 maya Exp $ +# $NetBSD: HACKS,v 1.191 2019/10/28 18:41:23 christos Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -894,6 +894,14 @@ file src/sys/arch/vax/boot/boot/Makefile descr /boot does not work when compiled with -O2 and gcc 4.8 kcah +port vax +hack compile nir.c in gallium with -O1 +cdate Mon Oct 28 14:39:35 EDT 2019 +who christos +file /cvsroot/src/external/mit/xorg/lib/gallium/Makefile 1.36 +descr gallium does not compile. +kcah + port arm hack avoid using labels in a 12-bit constant. who matt
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:40:31 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1417 and #1418 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.54 src/doc/CHANGES-8.2:1.1.2.55 --- src/doc/CHANGES-8.2:1.1.2.54 Thu Oct 24 17:43:43 2019 +++ src/doc/CHANGES-8.2 Mon Oct 28 18:40:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.54 2019/10/24 17:43:43 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.55 2019/10/28 18:40:31 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1380,3 +1380,16 @@ sys/dev/qbus/if_qt.c1.24 Do not double count incoming packets. [msaitoh, ticket #1416] +distrib/sets/lists/modules/mi 1.127 +sys/modules/Makefile1.229,1.230 +sys/modules/filemon/Makefile 1.4 (manually adjusted) + + Do not install the filemon module. + [maya, ticket #1418] + +sys/dev/ic/ld_nvme.c1.23 + + Do not attach an ld device if the format descriptor is + unsupported/unused. + [mlelstv, ticket #1417] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:40:31 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1417 and #1418 To generate a diff of this commit: cvs rdiff -u -r1.1.2.54 -r1.1.2.55 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Mon Oct 28 18:38:54 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: another vax optimizer hack. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: christos Date: Mon Oct 28 18:38:54 UTC 2019 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: another vax optimizer hack. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/mit/xorg/lib/gallium/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/mit/xorg/lib/gallium/Makefile diff -u src/external/mit/xorg/lib/gallium/Makefile:1.35 src/external/mit/xorg/lib/gallium/Makefile:1.36 --- src/external/mit/xorg/lib/gallium/Makefile:1.35 Tue Sep 24 15:29:41 2019 +++ src/external/mit/xorg/lib/gallium/Makefile Mon Oct 28 14:38:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2019/09/24 19:29:41 maya Exp $ +# $NetBSD: Makefile,v 1.36 2019/10/28 18:38:54 christos Exp $ # Link the gallium mega driver. @@ -1186,6 +1186,9 @@ SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR} COPTS+= ${${ACTIVE_CC} == "clang":? -Wa,-Av8plus :} .endif +.if ${MACHINE_ARCH} == "vax" +COPTS.nir.c += -O1 +.endif .include # Don't regenerate c files
CVS commit: src/sys/dev
Module Name:src Committed By: joerg Date: Mon Oct 28 18:38:43 UTC 2019 Modified Files: src/sys/dev/ieee1394: fwohci.c src/sys/dev/pci: eso.c sv.c Log Message: Fix operand priority of bit op vs ternary operator. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ieee1394/fwohci.c cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/eso.c cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/sv.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
Module Name:src Committed By: joerg Date: Mon Oct 28 18:38:43 UTC 2019 Modified Files: src/sys/dev/ieee1394: fwohci.c src/sys/dev/pci: eso.c sv.c Log Message: Fix operand priority of bit op vs ternary operator. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/sys/dev/ieee1394/fwohci.c cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/eso.c cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/sv.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/ieee1394/fwohci.c diff -u src/sys/dev/ieee1394/fwohci.c:1.143 src/sys/dev/ieee1394/fwohci.c:1.144 --- src/sys/dev/ieee1394/fwohci.c:1.143 Tue Oct 15 18:21:47 2019 +++ src/sys/dev/ieee1394/fwohci.c Mon Oct 28 18:38:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fwohci.c,v 1.143 2019/10/15 18:21:47 msaitoh Exp $ */ +/* $NetBSD: fwohci.c,v 1.144 2019/10/28 18:38:43 joerg Exp $ */ /*- * Copyright (c) 2003 Hidetoshi Shimokawa @@ -37,7 +37,7 @@ * */ #include -__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.143 2019/10/15 18:21:47 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.144 2019/10/28 18:38:43 joerg Exp $"); #include #include @@ -1746,8 +1746,8 @@ fwohci_db_init(struct fwohci_softc *sc, dbch->ndb, BUS_DMA_WAITOK); #else /* Ooops, debugging now... */ dbch->ndb, BUS_DMA_WAITOK | - (dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ? - BUS_DMA_COHERENT : 0); + ((dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ? + BUS_DMA_COHERENT : 0)); #endif if (dbch->am == NULL) { aprint_error_dev(fc->dev, "fwdma_malloc_multiseg failed\n"); Index: src/sys/dev/pci/eso.c diff -u src/sys/dev/pci/eso.c:1.71 src/sys/dev/pci/eso.c:1.72 --- src/sys/dev/pci/eso.c:1.71 Sat Jun 8 08:02:38 2019 +++ src/sys/dev/pci/eso.c Mon Oct 28 18:38:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $ */ +/* $NetBSD: eso.c,v 1.72 2019/10/28 18:38:43 joerg Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.72 2019/10/28 18:38:43 joerg Exp $"); #include "mpu.h" @@ -1489,7 +1489,7 @@ eso_allocmem(struct eso_softc *sc, size_ error = bus_dmamap_load(ed->ed_dmat, ed->ed_map, ed->ed_kva, ed->ed_size, NULL, BUS_DMA_WAITOK | - (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE); + ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE)); if (error) goto destroy; Index: src/sys/dev/pci/sv.c diff -u src/sys/dev/pci/sv.c:1.56 src/sys/dev/pci/sv.c:1.57 --- src/sys/dev/pci/sv.c:1.56 Sat Jun 8 08:02:38 2019 +++ src/sys/dev/pci/sv.c Mon Oct 28 18:38:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $ */ +/* $NetBSD: sv.c,v 1.57 2019/10/28 18:38:43 joerg Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.57 2019/10/28 18:38:43 joerg Exp $"); #include #include @@ -530,7 +530,7 @@ sv_allocmem(struct sv_softc *sc, size_t goto unmap; error = bus_dmamap_load(sc->sc_dmatag, p->map, p->addr, p->size, NULL, - BUS_DMA_WAITOK | (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE); + BUS_DMA_WAITOK | ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE)); if (error) goto destroy; DPRINTF(("sv_allocmem: pa=%lx va=%lx pba=%lx\n",
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Mon Oct 28 18:38:37 UTC 2019 Modified Files: src/etc/etc.aarch64 [netbsd-9]: ttys src/etc/etc.algor [netbsd-9]: ttys src/etc/etc.alpha [netbsd-9]: ttys src/etc/etc.amd64 [netbsd-9]: ttys src/etc/etc.amiga [netbsd-9]: ttys src/etc/etc.amigappc [netbsd-9]: ttys src/etc/etc.arc [netbsd-9]: ttys src/etc/etc.cesfic [netbsd-9]: ttys src/etc/etc.emips [netbsd-9]: ttys src/etc/etc.epoc32 [netbsd-9]: ttys src/etc/etc.evbarm [netbsd-9]: ttys src/etc/etc.evbcf [netbsd-9]: ttys src/etc/etc.evbmips [netbsd-9]: ttys src/etc/etc.evbppc [netbsd-9]: ttys src/etc/etc.evbsh3 [netbsd-9]: ttys src/etc/etc.ews4800mips [netbsd-9]: ttys src/etc/etc.hp300 [netbsd-9]: ttys src/etc/etc.hpcmips [netbsd-9]: ttys src/etc/etc.hppa [netbsd-9]: ttys src/etc/etc.i386 [netbsd-9]: ttys src/etc/etc.ia64 [netbsd-9]: ttys src/etc/etc.iyonix [netbsd-9]: ttys src/etc/etc.landisk [netbsd-9]: ttys src/etc/etc.luna68k [netbsd-9]: ttys src/etc/etc.mipsco [netbsd-9]: ttys src/etc/etc.mmeye [netbsd-9]: ttys src/etc/etc.mvme68k [netbsd-9]: ttys src/etc/etc.mvmeppc [netbsd-9]: ttys src/etc/etc.netwinder [netbsd-9]: ttys src/etc/etc.news68k [netbsd-9]: ttys src/etc/etc.newsmips [netbsd-9]: ttys src/etc/etc.next68k [netbsd-9]: ttys src/etc/etc.or1k [netbsd-9]: ttys src/etc/etc.playstation2 [netbsd-9]: ttys src/etc/etc.pmax [netbsd-9]: ttys src/etc/etc.riscv [netbsd-9]: ttys src/etc/etc.sandpoint [netbsd-9]: ttys src/etc/etc.sbmips [netbsd-9]: ttys src/etc/etc.sgimips [netbsd-9]: ttys src/etc/etc.shark [netbsd-9]: ttys src/etc/etc.sparc [netbsd-9]: ttys src/etc/etc.sparc64 [netbsd-9]: ttys src/etc/etc.vax [netbsd-9]: ttys src/etc/etc.zaurus [netbsd-9]: ttys Log Message: Pull up following revision(s) (requested by abs in ticket #384): etc/etc.evbmips/ttys: revision 1.7 etc/etc.sparc64/ttys: revision 1.12 etc/etc.shark/ttys: revision 1.9 etc/etc.amiga/ttys: revision 1.25 etc/etc.arc/ttys: revision 1.9 etc/etc.sbmips/ttys: revision 1.6 etc/etc.landisk/ttys: revision 1.4 etc/etc.alpha/ttys: revision 1.13 etc/etc.amigappc/ttys: revision 1.4 etc/etc.mmeye/ttys: revision 1.8 etc/etc.ia64/ttys: revision 1.2 etc/etc.sandpoint/ttys: revision 1.8 etc/etc.hp300/ttys: revision 1.17 etc/etc.riscv/ttys: revision 1.2 etc/etc.i386/ttys: revision 1.21 etc/etc.aarch64/ttys: revision 1.2 etc/etc.algor/ttys: revision 1.6 etc/etc.sparc/ttys: revision 1.17 etc/etc.mipsco/ttys: revision 1.7 etc/etc.luna68k/ttys: revision 1.9 etc/etc.iyonix/ttys: revision 1.5 etc/etc.evbcf/ttys: revision 1.3 etc/etc.netwinder/ttys: revision 1.9 etc/etc.mvme68k/ttys: revision 1.10 etc/etc.evbarm/ttys: revision 1.8 etc/etc.evbsh3/ttys: revision 1.7 etc/etc.pmax/ttys: revision 1.16 etc/etc.hpcmips/ttys: revision 1.12 etc/etc.vax/ttys: revision 1.10 etc/etc.news68k/ttys: revision 1.10 etc/etc.mvmeppc/ttys: revision 1.7 etc/etc.hppa/ttys: revision 1.2 etc/etc.next68k/ttys: revision 1.11 etc/etc.ews4800mips/ttys: revision 1.3 etc/etc.epoc32/ttys: revision 1.2 etc/etc.emips/ttys: revision 1.2 etc/etc.evbppc/ttys: revision 1.7 etc/etc.sgimips/ttys: revision 1.11 etc/etc.or1k/ttys: revision 1.2 etc/etc.cesfic/ttys: revision 1.6 etc/etc.amd64/ttys: revision 1.7 etc/etc.playstation2/ttys: revision 1.7 etc/etc.zaurus/ttys: revision 1.4 etc/etc.newsmips/ttys: revision 1.10 Switch default console tty from /dev/console to /dev/constty With this switch processes (such as xconsole) can open /dev/console without breaking login on the text or serial console. This can be trivially triggered by enabling xdm in rc.conf and hitting Ctrl+Alt+F1 or equivalent once booted. The changes: - Add entry for /dev/console or /dev/constty if missing - If a port's had /dev/console 'on' switch it off and enable /dev/constty - If a port did not have /dev/console 'on', leave /dev/constty off Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to avoid just this issue. It may make sense to adjust these also (but not in this pass) As discussed on current-users To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.28.1 src/etc/etc.aarch64/ttys cvs rdiff -u -r1.5 -r1.5.64.1 src/etc/etc.algor/ttys cvs rdiff -u -r1.12 -r1.12.36.1 src/etc/etc.alpha/ttys cvs rdiff -u -r1.6 -r1.6.36.1 src/etc/etc.amd64/ttys cvs rdiff -u -r1.24 -r1.24.36.1 src/etc/etc.amiga/ttys cvs
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Mon Oct 28 18:38:37 UTC 2019 Modified Files: src/etc/etc.aarch64 [netbsd-9]: ttys src/etc/etc.algor [netbsd-9]: ttys src/etc/etc.alpha [netbsd-9]: ttys src/etc/etc.amd64 [netbsd-9]: ttys src/etc/etc.amiga [netbsd-9]: ttys src/etc/etc.amigappc [netbsd-9]: ttys src/etc/etc.arc [netbsd-9]: ttys src/etc/etc.cesfic [netbsd-9]: ttys src/etc/etc.emips [netbsd-9]: ttys src/etc/etc.epoc32 [netbsd-9]: ttys src/etc/etc.evbarm [netbsd-9]: ttys src/etc/etc.evbcf [netbsd-9]: ttys src/etc/etc.evbmips [netbsd-9]: ttys src/etc/etc.evbppc [netbsd-9]: ttys src/etc/etc.evbsh3 [netbsd-9]: ttys src/etc/etc.ews4800mips [netbsd-9]: ttys src/etc/etc.hp300 [netbsd-9]: ttys src/etc/etc.hpcmips [netbsd-9]: ttys src/etc/etc.hppa [netbsd-9]: ttys src/etc/etc.i386 [netbsd-9]: ttys src/etc/etc.ia64 [netbsd-9]: ttys src/etc/etc.iyonix [netbsd-9]: ttys src/etc/etc.landisk [netbsd-9]: ttys src/etc/etc.luna68k [netbsd-9]: ttys src/etc/etc.mipsco [netbsd-9]: ttys src/etc/etc.mmeye [netbsd-9]: ttys src/etc/etc.mvme68k [netbsd-9]: ttys src/etc/etc.mvmeppc [netbsd-9]: ttys src/etc/etc.netwinder [netbsd-9]: ttys src/etc/etc.news68k [netbsd-9]: ttys src/etc/etc.newsmips [netbsd-9]: ttys src/etc/etc.next68k [netbsd-9]: ttys src/etc/etc.or1k [netbsd-9]: ttys src/etc/etc.playstation2 [netbsd-9]: ttys src/etc/etc.pmax [netbsd-9]: ttys src/etc/etc.riscv [netbsd-9]: ttys src/etc/etc.sandpoint [netbsd-9]: ttys src/etc/etc.sbmips [netbsd-9]: ttys src/etc/etc.sgimips [netbsd-9]: ttys src/etc/etc.shark [netbsd-9]: ttys src/etc/etc.sparc [netbsd-9]: ttys src/etc/etc.sparc64 [netbsd-9]: ttys src/etc/etc.vax [netbsd-9]: ttys src/etc/etc.zaurus [netbsd-9]: ttys Log Message: Pull up following revision(s) (requested by abs in ticket #384): etc/etc.evbmips/ttys: revision 1.7 etc/etc.sparc64/ttys: revision 1.12 etc/etc.shark/ttys: revision 1.9 etc/etc.amiga/ttys: revision 1.25 etc/etc.arc/ttys: revision 1.9 etc/etc.sbmips/ttys: revision 1.6 etc/etc.landisk/ttys: revision 1.4 etc/etc.alpha/ttys: revision 1.13 etc/etc.amigappc/ttys: revision 1.4 etc/etc.mmeye/ttys: revision 1.8 etc/etc.ia64/ttys: revision 1.2 etc/etc.sandpoint/ttys: revision 1.8 etc/etc.hp300/ttys: revision 1.17 etc/etc.riscv/ttys: revision 1.2 etc/etc.i386/ttys: revision 1.21 etc/etc.aarch64/ttys: revision 1.2 etc/etc.algor/ttys: revision 1.6 etc/etc.sparc/ttys: revision 1.17 etc/etc.mipsco/ttys: revision 1.7 etc/etc.luna68k/ttys: revision 1.9 etc/etc.iyonix/ttys: revision 1.5 etc/etc.evbcf/ttys: revision 1.3 etc/etc.netwinder/ttys: revision 1.9 etc/etc.mvme68k/ttys: revision 1.10 etc/etc.evbarm/ttys: revision 1.8 etc/etc.evbsh3/ttys: revision 1.7 etc/etc.pmax/ttys: revision 1.16 etc/etc.hpcmips/ttys: revision 1.12 etc/etc.vax/ttys: revision 1.10 etc/etc.news68k/ttys: revision 1.10 etc/etc.mvmeppc/ttys: revision 1.7 etc/etc.hppa/ttys: revision 1.2 etc/etc.next68k/ttys: revision 1.11 etc/etc.ews4800mips/ttys: revision 1.3 etc/etc.epoc32/ttys: revision 1.2 etc/etc.emips/ttys: revision 1.2 etc/etc.evbppc/ttys: revision 1.7 etc/etc.sgimips/ttys: revision 1.11 etc/etc.or1k/ttys: revision 1.2 etc/etc.cesfic/ttys: revision 1.6 etc/etc.amd64/ttys: revision 1.7 etc/etc.playstation2/ttys: revision 1.7 etc/etc.zaurus/ttys: revision 1.4 etc/etc.newsmips/ttys: revision 1.10 Switch default console tty from /dev/console to /dev/constty With this switch processes (such as xconsole) can open /dev/console without breaking login on the text or serial console. This can be trivially triggered by enabling xdm in rc.conf and hitting Ctrl+Alt+F1 or equivalent once booted. The changes: - Add entry for /dev/console or /dev/constty if missing - If a port's had /dev/console 'on' switch it off and enable /dev/constty - If a port did not have /dev/console 'on', leave /dev/constty off Some ports had /dev/console off and /dev/ttyE0 enabled, presumably to avoid just this issue. It may make sense to adjust these also (but not in this pass) As discussed on current-users To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.28.1 src/etc/etc.aarch64/ttys cvs rdiff -u -r1.5 -r1.5.64.1 src/etc/etc.algor/ttys cvs rdiff -u -r1.12 -r1.12.36.1 src/etc/etc.alpha/ttys cvs rdiff -u -r1.6 -r1.6.36.1 src/etc/etc.amd64/ttys cvs rdiff -u -r1.24 -r1.24.36.1 src/etc/etc.amiga/ttys cvs
CVS commit: [netbsd-9] src/sys/dev/ic
Module Name:src Committed By: martin Date: Mon Oct 28 18:30:43 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-9]: ld_nvme.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #383): sys/dev/ic/ld_nvme.c: revision 1.23 Don't attach an ld device if the format descriptor is unsupported/unused. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/ic/ld_nvme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/ic
Module Name:src Committed By: martin Date: Mon Oct 28 18:30:43 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-9]: ld_nvme.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #383): sys/dev/ic/ld_nvme.c: revision 1.23 Don't attach an ld device if the format descriptor is unsupported/unused. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.22.2.1 src/sys/dev/ic/ld_nvme.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/ld_nvme.c diff -u src/sys/dev/ic/ld_nvme.c:1.22 src/sys/dev/ic/ld_nvme.c:1.22.2.1 --- src/sys/dev/ic/ld_nvme.c:1.22 Fri Apr 26 14:28:40 2019 +++ src/sys/dev/ic/ld_nvme.c Mon Oct 28 18:30:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_nvme.c,v 1.22 2019/04/26 14:28:40 mlelstv Exp $ */ +/* $NetBSD: ld_nvme.c,v 1.22.2.1 2019/10/28 18:30:43 martin Exp $ */ /*- * Copyright (C) 2016 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.22 2019/04/26 14:28:40 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.22.2.1 2019/10/28 18:30:43 martin Exp $"); #include #include @@ -105,6 +105,19 @@ ld_nvme_attach(device_t parent, device_t KASSERT(ns); f = >ident->lbaf[NVME_ID_NS_FLBAS(ns->ident->flbas)]; + /* + * NVME1.0e 6.11 Identify command + * + * LBADS values smaller than 9 are not supported, a value + * of zero means that the format is not used. + */ + if (f->lbads < 9) { + if (f->lbads > 0) + aprint_error_dev(self, + "unsupported logical data size %u\n", f->lbads); + return; + } + ld->sc_secsize = 1 << f->lbads; ld->sc_secperunit = ns->ident->nsze; ld->sc_maxxfer = naa->naa_maxphys;
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src Committed By: martin Date: Mon Oct 28 18:27:47 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-8]: ld_nvme.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1417): sys/dev/ic/ld_nvme.c: revision 1.23 Don't attach an ld device if the format descriptor is unsupported/unused. To generate a diff of this commit: cvs rdiff -u -r1.16.2.3 -r1.16.2.4 src/sys/dev/ic/ld_nvme.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/ld_nvme.c diff -u src/sys/dev/ic/ld_nvme.c:1.16.2.3 src/sys/dev/ic/ld_nvme.c:1.16.2.4 --- src/sys/dev/ic/ld_nvme.c:1.16.2.3 Thu Apr 19 15:37:56 2018 +++ src/sys/dev/ic/ld_nvme.c Mon Oct 28 18:27:47 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ld_nvme.c,v 1.16.2.3 2018/04/19 15:37:56 martin Exp $ */ +/* $NetBSD: ld_nvme.c,v 1.16.2.4 2019/10/28 18:27:47 martin Exp $ */ /*- * Copyright (C) 2016 NONAKA Kimihiro @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.16.2.3 2018/04/19 15:37:56 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ld_nvme.c,v 1.16.2.4 2019/10/28 18:27:47 martin Exp $"); #include #include @@ -105,6 +105,19 @@ ld_nvme_attach(device_t parent, device_t KASSERT(ns); f = >ident->lbaf[NVME_ID_NS_FLBAS(ns->ident->flbas)]; + /* + * NVME1.0e 6.11 Identify command + * + * LBADS values smaller than 9 are not supported, a value + * of zero means that the format is not used. + */ + if (f->lbads < 9) { + if (f->lbads > 0) + aprint_error_dev(self, + "unsupported logical data size %u\n", f->lbads); + return; + } + ld->sc_secsize = 1 << f->lbads; ld->sc_secperunit = ns->ident->nsze; ld->sc_maxxfer = naa->naa_maxphys;
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src Committed By: martin Date: Mon Oct 28 18:27:47 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-8]: ld_nvme.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #1417): sys/dev/ic/ld_nvme.c: revision 1.23 Don't attach an ld device if the format descriptor is unsupported/unused. To generate a diff of this commit: cvs rdiff -u -r1.16.2.3 -r1.16.2.4 src/sys/dev/ic/ld_nvme.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/aarch64/aarch64
Module Name:src Committed By: joerg Date: Mon Oct 28 18:15:26 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: db_disasm.c Log Message: Format string annotation for strdisasm_printf To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/db_disasm.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/aarch64/aarch64/db_disasm.c diff -u src/sys/arch/aarch64/aarch64/db_disasm.c:1.6 src/sys/arch/aarch64/aarch64/db_disasm.c:1.7 --- src/sys/arch/aarch64/aarch64/db_disasm.c:1.6 Sun Jan 27 02:08:36 2019 +++ src/sys/arch/aarch64/aarch64/db_disasm.c Mon Oct 28 18:15:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.6 2019/01/27 02:08:36 pgoyette Exp $ */ +/* $NetBSD: db_disasm.c,v 1.7 2019/10/28 18:15:25 joerg Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.6 2019/01/27 02:08:36 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.7 2019/10/28 18:15:25 joerg Exp $"); #include #include @@ -75,7 +75,7 @@ strdisasm_readword(uintptr_t address) return *(uint32_t *)address; } -static void +static void __printflike(1, 2) strdisasm_printf(const char *fmt, ...) { va_list ap;
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: joerg Date: Mon Oct 28 18:15:26 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64: db_disasm.c Log Message: Format string annotation for strdisasm_printf To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/db_disasm.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/arm/arm
Module Name:src Committed By: joerg Date: Mon Oct 28 18:14:38 UTC 2019 Modified Files: src/sys/arch/arm/arm: fusu.S Log Message: Add operand that GNU as considers optional, but LLVM doesn't. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/fusu.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: joerg Date: Mon Oct 28 18:14:38 UTC 2019 Modified Files: src/sys/arch/arm/arm: fusu.S Log Message: Add operand that GNU as considers optional, but LLVM doesn't. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/fusu.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/fusu.S diff -u src/sys/arch/arm/arm/fusu.S:1.7 src/sys/arch/arm/arm/fusu.S:1.8 --- src/sys/arch/arm/arm/fusu.S:1.7 Sun Apr 7 14:14:03 2019 +++ src/sys/arch/arm/arm/fusu.S Mon Oct 28 18:14:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fusu.S,v 1.7 2019/04/07 14:14:03 thorpej Exp $ */ +/* $NetBSD: fusu.S,v 1.8 2019/10/28 18:14:38 joerg Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -127,7 +127,7 @@ STRONG_ALIAS(_ufetch_16,_ufetch_16_no_ld ENTRY(_ufetch_16_ldrht) UFETCHSTORE_PROLOGUE - ldrht r3, [r0] + ldrht r3, [r0], #0 strh r3, [r1] UFETCHSTORE_EPILOGUE @@ -186,7 +186,7 @@ STRONG_ALIAS(_ustore_16,_ustore_16_no_st ENTRY(_ustore_16_strht) UFETCHSTORE_PROLOGUE - strht r1, [r0] + strht r1, [r0], #0 UFETCHSTORE_EPILOGUE RETURN_SUCCESS
CVS commit: src/sys/arch/macppc/stand/bootxx
Module Name:src Committed By: joerg Date: Mon Oct 28 18:13:40 UTC 2019 Modified Files: src/sys/arch/macppc/stand/bootxx: bootxx.c Log Message: Mark local-only function as static to save space. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/stand/bootxx/bootxx.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/macppc/stand/bootxx
Module Name:src Committed By: joerg Date: Mon Oct 28 18:13:40 UTC 2019 Modified Files: src/sys/arch/macppc/stand/bootxx: bootxx.c Log Message: Mark local-only function as static to save space. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/stand/bootxx/bootxx.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/macppc/stand/bootxx/bootxx.c diff -u src/sys/arch/macppc/stand/bootxx/bootxx.c:1.19 src/sys/arch/macppc/stand/bootxx/bootxx.c:1.20 --- src/sys/arch/macppc/stand/bootxx/bootxx.c:1.19 Mon Nov 12 20:00:46 2018 +++ src/sys/arch/macppc/stand/bootxx/bootxx.c Mon Oct 28 18:13:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bootxx.c,v 1.19 2018/11/12 20:00:46 scole Exp $ */ +/* $NetBSD: bootxx.c,v 1.20 2019/10/28 18:13:40 joerg Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -299,7 +299,7 @@ OF_write(int handle, const void *addr, i int stdout; -void +static void putstrn(const char *s, size_t n) { OF_write(stdout, s, n);
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/base
Module Name:src Committed By: joerg Date: Mon Oct 28 18:12:54 UTC 2019 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/base: error.c Log Message: Merge 85acd57c8a288ce92f42bcf62737eebe385bce90 from Heimdal on Github: Fix the numeric error value comparison performed by error_cmp(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/base/error.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/heimdal/dist/lib/base
Module Name:src Committed By: joerg Date: Mon Oct 28 18:12:54 UTC 2019 Modified Files: src/crypto/external/bsd/heimdal/dist/lib/base: error.c Log Message: Merge 85acd57c8a288ce92f42bcf62737eebe385bce90 from Heimdal on Github: Fix the numeric error value comparison performed by error_cmp(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/heimdal/dist/lib/base/error.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/heimdal/dist/lib/base/error.c diff -u src/crypto/external/bsd/heimdal/dist/lib/base/error.c:1.2 src/crypto/external/bsd/heimdal/dist/lib/base/error.c:1.3 --- src/crypto/external/bsd/heimdal/dist/lib/base/error.c:1.2 Sat Jan 28 21:31:45 2017 +++ src/crypto/external/bsd/heimdal/dist/lib/base/error.c Mon Oct 28 18:12:54 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: error.c,v 1.2 2017/01/28 21:31:45 christos Exp $ */ +/* $NetBSD: error.c,v 1.3 2019/10/28 18:12:54 joerg Exp $ */ /* * Copyright (c) 2010 Kungliga Tekniska Högskolan @@ -55,8 +55,8 @@ static int error_cmp(void *a, void *b) { struct heim_error *ap = a, *bp = b; -if (ap->error_code == ap->error_code) - return ap->error_code - ap->error_code; +if (ap->error_code == bp->error_code) + return 0; return heim_cmp(ap->msg, bp->msg); }
CVS commit: src/lib/libnvmm
Module Name:src Committed By: joerg Date: Mon Oct 28 18:12:17 UTC 2019 Modified Files: src/lib/libnvmm: libnvmm_x86.c Log Message: Annotate a covering switch as such to avoid warnings about missing returns. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/lib/libnvmm/libnvmm_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libnvmm
Module Name:src Committed By: joerg Date: Mon Oct 28 18:12:17 UTC 2019 Modified Files: src/lib/libnvmm: libnvmm_x86.c Log Message: Annotate a covering switch as such to avoid warnings about missing returns. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/lib/libnvmm/libnvmm_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libnvmm/libnvmm_x86.c diff -u src/lib/libnvmm/libnvmm_x86.c:1.38 src/lib/libnvmm/libnvmm_x86.c:1.39 --- src/lib/libnvmm/libnvmm_x86.c:1.38 Sun Oct 27 08:30:05 2019 +++ src/lib/libnvmm/libnvmm_x86.c Mon Oct 28 18:12:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: libnvmm_x86.c,v 1.38 2019/10/27 08:30:05 maxv Exp $ */ +/* $NetBSD: libnvmm_x86.c,v 1.39 2019/10/28 18:12:17 joerg Exp $ */ /* * Copyright (c) 2018-2019 The NetBSD Foundation, Inc. @@ -2251,6 +2251,7 @@ get_disp_type(struct x86_instr *instr) default: /* llvm */ return DISP_NONE; } + __unreachable(); } static int
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: joerg Date: Mon Oct 28 18:11:16 UTC 2019 Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: Avoid warnings for tautological shifts as sole conditional. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/dev/sdmmc/sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/misc
Module Name:src Committed By: joerg Date: Mon Oct 28 18:10:22 UTC 2019 Modified Files: src/tests/lib/libc/misc: t_ubsan.c Log Message: Avoid warnings about tautological left shifts as conditional. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/misc/t_ubsan.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/misc/t_ubsan.c diff -u src/tests/lib/libc/misc/t_ubsan.c:1.5 src/tests/lib/libc/misc/t_ubsan.c:1.6 --- src/tests/lib/libc/misc/t_ubsan.c:1.5 Wed Feb 20 11:40:41 2019 +++ src/tests/lib/libc/misc/t_ubsan.c Mon Oct 28 18:10:22 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: t_ubsan.c,v 1.5 2019/02/20 11:40:41 kamil Exp $ */ +/* $NetBSD: t_ubsan.c,v 1.6 2019/10/28 18:10:22 joerg Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ #include __COPYRIGHT("@(#) Copyright (c) 2018\ The NetBSD Foundation, inc. All rights reserved."); -__RCSID("$NetBSD: t_ubsan.c,v 1.5 2019/02/20 11:40:41 kamil Exp $"); +__RCSID("$NetBSD: t_ubsan.c,v 1.6 2019/10/28 18:10:22 joerg Exp $"); #include #include @@ -602,7 +602,7 @@ test_shift_out_of_bounds_signednessbit(v { volatile int32_t a = atoi("1"); - raise((a << 31) ? SIGSEGV : SIGBUS); + raise((a << 31) != 0 ? SIGSEGV : SIGBUS); } UBSAN_TC_BODY(shift_out_of_bounds_signednessbit, tc) @@ -626,7 +626,7 @@ test_shift_out_of_bounds_signedoverflow( volatile int32_t b = atoi("30"); a <<= b; - raise((a << 10) ? SIGSEGV : SIGBUS); + raise((a << 10) != 0 ? SIGSEGV : SIGBUS); } UBSAN_TC_BODY(shift_out_of_bounds_signedoverflow, tc) @@ -648,7 +648,7 @@ test_shift_out_of_bounds_negativeexponen volatile int32_t a = atoi("1"); volatile int32_t b = atoi("-10"); - raise((a << b) ? SIGSEGV : SIGBUS); + raise((a << b) != 0 ? SIGSEGV : SIGBUS); } UBSAN_TC_BODY(shift_out_of_bounds_negativeexponent, tc) @@ -670,7 +670,7 @@ test_shift_out_of_bounds_toolargeexponen volatile int32_t a = atoi("1"); volatile int32_t b = atoi("40"); - raise((a << b) ? SIGSEGV : SIGBUS); + raise((a << b) != 0 ? SIGSEGV : SIGBUS); } UBSAN_TC_BODY(shift_out_of_bounds_toolargeexponent, tc)
CVS commit: src/tests/lib/libc/misc
Module Name:src Committed By: joerg Date: Mon Oct 28 18:10:22 UTC 2019 Modified Files: src/tests/lib/libc/misc: t_ubsan.c Log Message: Avoid warnings about tautological left shifts as conditional. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/misc/t_ubsan.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/sdmmc
Module Name:src Committed By: joerg Date: Mon Oct 28 18:11:16 UTC 2019 Modified Files: src/sys/dev/sdmmc: sdhc.c Log Message: Avoid warnings for tautological shifts as sole conditional. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/sys/dev/sdmmc/sdhc.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/sdmmc/sdhc.c diff -u src/sys/dev/sdmmc/sdhc.c:1.105 src/sys/dev/sdmmc/sdhc.c:1.106 --- src/sys/dev/sdmmc/sdhc.c:1.105 Mon Oct 28 06:00:14 2019 +++ src/sys/dev/sdmmc/sdhc.c Mon Oct 28 18:11:15 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sdhc.c,v 1.105 2019/10/28 06:00:14 mlelstv Exp $ */ +/* $NetBSD: sdhc.c,v 1.106 2019/10/28 18:11:15 joerg Exp $ */ /* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */ /* @@ -23,7 +23,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.105 2019/10/28 06:00:14 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.106 2019/10/28 18:11:15 joerg Exp $"); #ifdef _KERNEL_OPT #include "opt_sdmmc.h" @@ -170,17 +170,17 @@ hwrite4(struct sdhc_host *hp, bus_size_t #define HWRITE4(hp, reg, val) hwrite4(hp, reg, val) #define HCLR1(hp, reg, bits) \ - do if (bits) HWRITE1((hp), (reg), HREAD1((hp), (reg)) & ~(bits)); while (0) + do if ((bits) != 0) HWRITE1((hp), (reg), HREAD1((hp), (reg)) & ~(bits)); while (0) #define HCLR2(hp, reg, bits) \ - do if (bits) HWRITE2((hp), (reg), HREAD2((hp), (reg)) & ~(bits)); while (0) + do if ((bits) != 0) HWRITE2((hp), (reg), HREAD2((hp), (reg)) & ~(bits)); while (0) #define HCLR4(hp, reg, bits) \ - do if (bits) HWRITE4((hp), (reg), HREAD4((hp), (reg)) & ~(bits)); while (0) + do if ((bits) != 0) HWRITE4((hp), (reg), HREAD4((hp), (reg)) & ~(bits)); while (0) #define HSET1(hp, reg, bits) \ - do if (bits) HWRITE1((hp), (reg), HREAD1((hp), (reg)) | (bits)); while (0) + do if ((bits) != 0) HWRITE1((hp), (reg), HREAD1((hp), (reg)) | (bits)); while (0) #define HSET2(hp, reg, bits) \ - do if (bits) HWRITE2((hp), (reg), HREAD2((hp), (reg)) | (bits)); while (0) + do if ((bits) != 0) HWRITE2((hp), (reg), HREAD2((hp), (reg)) | (bits)); while (0) #define HSET4(hp, reg, bits) \ - do if (bits) HWRITE4((hp), (reg), HREAD4((hp), (reg)) | (bits)); while (0) + do if ((bits) != 0) HWRITE4((hp), (reg), HREAD4((hp), (reg)) | (bits)); while (0) static int sdhc_host_reset(sdmmc_chipset_handle_t); static int sdhc_host_reset1(sdmmc_chipset_handle_t);
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: joerg Date: Mon Oct 28 18:08:44 UTC 2019 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 Log Message: Fix aarch64 set for !gcc build To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/comp/ad.aarch64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: joerg Date: Mon Oct 28 18:08:44 UTC 2019 Modified Files: src/distrib/sets/lists/comp: ad.aarch64 Log Message: Fix aarch64 set for !gcc build To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/comp/ad.aarch64 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/comp/ad.aarch64 diff -u src/distrib/sets/lists/comp/ad.aarch64:1.33 src/distrib/sets/lists/comp/ad.aarch64:1.34 --- src/distrib/sets/lists/comp/ad.aarch64:1.33 Thu Oct 3 00:59:50 2019 +++ src/distrib/sets/lists/comp/ad.aarch64 Mon Oct 28 18:08:44 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.33 2019/10/03 00:59:50 mrg Exp $ +# $NetBSD: ad.aarch64,v 1.34 2019/10/28 18:08:44 joerg Exp $ ./usr/include/aarch64comp-c-include ./usr/include/aarch64/ansi.h comp-c-include ./usr/include/aarch64/aout_machdep.h comp-c-include @@ -127,10 +127,10 @@ ./usr/include/evbarm64comp-obsolete obsolete ./usr/include/evbarm64/disklabel.h comp-obsolete obsolete ./usr/include/evbarm64/intr.h comp-obsolete obsolete -./usr/include/g++/bits/aarch64 comp-c-include compat -./usr/include/g++/bits/aarch64/c++config.h comp-c-include libstdcxx,compat -./usr/include/g++/bits/arm comp-c-include compat -./usr/include/g++/bits/arm/c++config.h comp-c-include libstdcxx,compat +./usr/include/g++/bits/aarch64 comp-c-include +./usr/include/g++/bits/aarch64/c++config.h comp-c-include gcc,libstdcxx,compat +./usr/include/g++/bits/arm comp-c-include +./usr/include/g++/bits/arm/c++config.h comp-c-include gcc,libstdcxx,compat ./usr/include/gcc-4.8/arm_neon.h comp-c-include gcc=48 ./usr/include/gcc-4.8/mmintrin.h comp-c-include gcc=48 ./usr/include/gcc-4.8/tgmath.h comp-c-include gcc=48
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:06:42 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1710 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:06:13 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-7-0]: mi src/sys/modules/filemon [netbsd-7-0]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1710): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.69.2.1 -r1.69.2.1.2.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1 -r1.1.44.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.69.2.1 src/distrib/sets/lists/modules/mi:1.69.2.1.2.1 --- src/distrib/sets/lists/modules/mi:1.69.2.1 Sat Mar 21 17:11:35 2015 +++ src/distrib/sets/lists/modules/mi Mon Oct 28 18:06:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.69.2.1 2015/03/21 17:11:35 snj Exp $ +# $NetBSD: mi,v 1.69.2.1.2.1 2019/10/28 18:06:13 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -76,8 +76,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod -./@MODULEDIR@/filemonbase-kernel-modules kmod -./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-obsolete obsolete +./@MODULEDIR@/filemon/filemon.kmod base-obsolete obsolete ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/filemon/Makefile diff -u src/sys/modules/filemon/Makefile:1.1 src/sys/modules/filemon/Makefile:1.1.44.1 --- src/sys/modules/filemon/Makefile:1.1 Thu Sep 9 00:10:16 2010 +++ src/sys/modules/filemon/Makefile Mon Oct 28 18:06:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/09/09 00:10:16 sjg Exp $ +# $NetBSD: Makefile,v 1.1.44.1 2019/10/28 18:06:13 martin Exp $ .include "../Makefile.inc" @@ -8,4 +8,10 @@ KMOD = filemon SRCS = filemon.c filemon_wrapper.c NOMAN = no +# Due to security concerns, we don't install the filemon module. We +# do, however, want to keep building it to prevent bit-rot. Define +# an empty install target for this. + +kmodinstall: + .include
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:06:42 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1710 To generate a diff of this commit: cvs rdiff -u -r1.1.2.152 -r1.1.2.153 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.152 src/doc/CHANGES-7.0.3:1.1.2.153 --- src/doc/CHANGES-7.0.3:1.1.2.152 Sat Sep 28 07:52:18 2019 +++ src/doc/CHANGES-7.0.3 Mon Oct 28 18:06:42 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.152 2019/09/28 07:52:18 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.153 2019/10/28 18:06:42 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5905,3 +5905,10 @@ sys/netbt/hci_event.c1.26 CVE-2019-9506. [plunky, ticket #1709] +distrib/sets/lists/modules/mi 1.127 +sys/modules/Makefile1.229,1.230 +sys/modules/filemon/Makefile 1.4 (manually adjusted) + + Do not install the filemon module. + [maya, ticket #1710] +
CVS commit: [netbsd-7-0] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:06:13 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-7-0]: mi src/sys/modules/filemon [netbsd-7-0]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1710): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.69.2.1 -r1.69.2.1.2.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1 -r1.1.44.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:04:15 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1710 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.63 src/doc/CHANGES-7.3:1.1.2.64 --- src/doc/CHANGES-7.3:1.1.2.63 Sat Sep 28 07:50:46 2019 +++ src/doc/CHANGES-7.3 Mon Oct 28 18:04:15 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.63 2019/09/28 07:50:46 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.64 2019/10/28 18:04:15 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -692,3 +692,10 @@ sys/netbt/hci_event.c1.26 CVE-2019-9506. [plunky, ticket #1709] +distrib/sets/lists/modules/mi 1.127 +sys/modules/Makefile1.229,1.230 +sys/modules/filemon/Makefile 1.4 (manually adjusted) + + Do not install the filemon module. + [maya, ticket #1710] +
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:05:34 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1710 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.59 src/doc/CHANGES-7.1.3:1.1.2.60 --- src/doc/CHANGES-7.1.3:1.1.2.59 Sat Sep 28 07:51:31 2019 +++ src/doc/CHANGES-7.1.3 Mon Oct 28 18:05:34 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.59 2019/09/28 07:51:31 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.60 2019/10/28 18:05:34 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -597,3 +597,10 @@ sys/netbt/hci_event.c1.26 CVE-2019-9506. [plunky, ticket #1709] +distrib/sets/lists/modules/mi 1.127 +sys/modules/Makefile1.229,1.230 +sys/modules/filemon/Makefile 1.4 (manually adjusted) + + Do not install the filemon module. + [maya, ticket #1710] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:04:15 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1710 To generate a diff of this commit: cvs rdiff -u -r1.1.2.63 -r1.1.2.64 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:03:46 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-7]: mi src/sys/modules/filemon [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1710): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.69.2.1 -r1.69.2.2 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 18:05:34 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1710 To generate a diff of this commit: cvs rdiff -u -r1.1.2.59 -r1.1.2.60 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:03:46 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-7]: mi src/sys/modules/filemon [netbsd-7]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1710): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.69.2.1 -r1.69.2.2 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.69.2.1 src/distrib/sets/lists/modules/mi:1.69.2.2 --- src/distrib/sets/lists/modules/mi:1.69.2.1 Sat Mar 21 17:11:35 2015 +++ src/distrib/sets/lists/modules/mi Mon Oct 28 18:03:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.69.2.1 2015/03/21 17:11:35 snj Exp $ +# $NetBSD: mi,v 1.69.2.2 2019/10/28 18:03:46 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -76,8 +76,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod -./@MODULEDIR@/filemonbase-kernel-modules kmod -./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-obsolete obsolete +./@MODULEDIR@/filemon/filemon.kmod base-obsolete obsolete ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/filemon/Makefile diff -u src/sys/modules/filemon/Makefile:1.1 src/sys/modules/filemon/Makefile:1.1.40.1 --- src/sys/modules/filemon/Makefile:1.1 Thu Sep 9 00:10:16 2010 +++ src/sys/modules/filemon/Makefile Mon Oct 28 18:03:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/09/09 00:10:16 sjg Exp $ +# $NetBSD: Makefile,v 1.1.40.1 2019/10/28 18:03:46 martin Exp $ .include "../Makefile.inc" @@ -8,4 +8,10 @@ KMOD = filemon SRCS = filemon.c filemon_wrapper.c NOMAN = no +# Due to security concerns, we don't install the filemon module. We +# do, however, want to keep building it to prevent bit-rot. Define +# an empty install target for this. + +kmodinstall: + .include
CVS commit: [netbsd-7-1] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:05:08 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-7-1]: mi src/sys/modules/filemon [netbsd-7-1]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1710): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.69.2.1 -r1.69.2.1.6.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1 -r1.1.48.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.69.2.1 src/distrib/sets/lists/modules/mi:1.69.2.1.6.1 --- src/distrib/sets/lists/modules/mi:1.69.2.1 Sat Mar 21 17:11:35 2015 +++ src/distrib/sets/lists/modules/mi Mon Oct 28 18:05:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.69.2.1 2015/03/21 17:11:35 snj Exp $ +# $NetBSD: mi,v 1.69.2.1.6.1 2019/10/28 18:05:07 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -76,8 +76,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod -./@MODULEDIR@/filemonbase-kernel-modules kmod -./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-obsolete obsolete +./@MODULEDIR@/filemon/filemon.kmod base-obsolete obsolete ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/filemon/Makefile diff -u src/sys/modules/filemon/Makefile:1.1 src/sys/modules/filemon/Makefile:1.1.48.1 --- src/sys/modules/filemon/Makefile:1.1 Thu Sep 9 00:10:16 2010 +++ src/sys/modules/filemon/Makefile Mon Oct 28 18:05:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/09/09 00:10:16 sjg Exp $ +# $NetBSD: Makefile,v 1.1.48.1 2019/10/28 18:05:07 martin Exp $ .include "../Makefile.inc" @@ -8,4 +8,10 @@ KMOD = filemon SRCS = filemon.c filemon_wrapper.c NOMAN = no +# Due to security concerns, we don't install the filemon module. We +# do, however, want to keep building it to prevent bit-rot. Define +# an empty install target for this. + +kmodinstall: + .include
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:01:00 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-8]: mi src/sys/modules/filemon [netbsd-8]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1418): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.110.2.1 -r1.110.2.2 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:05:08 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-7-1]: mi src/sys/modules/filemon [netbsd-7-1]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1710): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.69.2.1 -r1.69.2.1.6.1 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.1 -r1.1.48.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Mon Oct 28 18:01:00 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-8]: mi src/sys/modules/filemon [netbsd-8]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #1418): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.110.2.1 -r1.110.2.2 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.2 -r1.2.10.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.110.2.1 src/distrib/sets/lists/modules/mi:1.110.2.2 --- src/distrib/sets/lists/modules/mi:1.110.2.1 Thu Dec 21 19:14:41 2017 +++ src/distrib/sets/lists/modules/mi Mon Oct 28 18:01:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.110.2.1 2017/12/21 19:14:41 snj Exp $ +# $NetBSD: mi,v 1.110.2.2 2019/10/28 18:01:00 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -118,8 +118,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod -./@MODULEDIR@/filemonbase-kernel-modules kmod -./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-obsolete obsolete +./@MODULEDIR@/filemon/filemon.kmod base-obsolete obsolete ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/filemon/Makefile diff -u src/sys/modules/filemon/Makefile:1.2 src/sys/modules/filemon/Makefile:1.2.10.1 --- src/sys/modules/filemon/Makefile:1.2 Thu Aug 20 11:05:01 2015 +++ src/sys/modules/filemon/Makefile Mon Oct 28 18:01:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/08/20 11:05:01 christos Exp $ +# $NetBSD: Makefile,v 1.2.10.1 2019/10/28 18:01:00 martin Exp $ .include "../Makefile.inc" @@ -9,4 +9,10 @@ IOCONF= filemon.ioconf SRCS = filemon.c filemon_wrapper.c NOMAN = no +# Due to security concerns, we don't install the filemon module. We +# do, however, want to keep building it to prevent bit-rot. Define +# an empty install target for this. + +kmodinstall: + .include
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Oct 28 16:41:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #385 To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-9.0 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: Mon Oct 28 16:41:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #385 To generate a diff of this commit: cvs rdiff -u -r1.1.2.88 -r1.1.2.89 src/doc/CHANGES-9.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-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.88 src/doc/CHANGES-9.0:1.1.2.89 --- src/doc/CHANGES-9.0:1.1.2.88 Mon Oct 28 02:58:09 2019 +++ src/doc/CHANGES-9.0 Mon Oct 28 16:41:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.88 2019/10/28 02:58:09 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.89 2019/10/28 16:41:31 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5306,3 +5306,12 @@ usr.sbin/sysinst/partitions.h 1.7 - In non-MBR specific files, #ifdef all tests for MBR for architectures that do not even compile in MBR support. [martin, ticket #382] + +distrib/sets/lists/modules/mi 1.127 +sys/modules/Makefile1.229,1.230 +sys/modules/filemon/Makefile 1.4 (manually adjusted) + + Do not install the filemon module. + [maya, ticket #385] + +
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Oct 28 16:37:55 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-9]: mi src/sys/modules/filemon [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #385): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.122.2.1 -r1.122.2.2 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.2 -r1.2.22.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Oct 28 16:37:55 UTC 2019 Modified Files: src/distrib/sets/lists/modules [netbsd-9]: mi src/sys/modules/filemon [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by maya in ticket #385): distrib/sets/lists/modules/mi: revision 1.127 sys/modules/Makefile: revision 1.230 sys/modules/filemon/Makefile: revision 1.4 (manually adjusted) sys/modules/Makefile: revision 1.229 Disable filemon. It isn't suited for general use (that is, it poses security risks), but the existence of the module means it is auto-loaded when /dev/filemon is opened, which can be done by any user. Thanks Ilja van Sprundel for the heads up. - Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.122.2.1 -r1.122.2.2 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.2 -r1.2.22.1 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.122.2.1 src/distrib/sets/lists/modules/mi:1.122.2.2 --- src/distrib/sets/lists/modules/mi:1.122.2.1 Sun Sep 1 13:00:37 2019 +++ src/distrib/sets/lists/modules/mi Mon Oct 28 16:37:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.122.2.1 2019/09/01 13:00:37 martin Exp $ +# $NetBSD: mi,v 1.122.2.2 2019/10/28 16:37:55 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -166,8 +166,8 @@ ./@MODULEDIR@/ffs/ffs.kmod base-kernel-modules kmod ./@MODULEDIR@/filecorebase-kernel-modules kmod ./@MODULEDIR@/filecore/filecore.kmod base-kernel-modules kmod -./@MODULEDIR@/filemonbase-kernel-modules kmod -./@MODULEDIR@/filemon/filemon.kmod base-kernel-modules kmod +./@MODULEDIR@/filemonbase-obsolete obsolete +./@MODULEDIR@/filemon/filemon.kmod base-obsolete obsolete ./@MODULEDIR@/flashbase-kernel-modules kmod ./@MODULEDIR@/flash/flash.kmod base-kernel-modules kmod ./@MODULEDIR@/fssbase-kernel-modules kmod Index: src/sys/modules/filemon/Makefile diff -u src/sys/modules/filemon/Makefile:1.2 src/sys/modules/filemon/Makefile:1.2.22.1 --- src/sys/modules/filemon/Makefile:1.2 Thu Aug 20 11:05:01 2015 +++ src/sys/modules/filemon/Makefile Mon Oct 28 16:37:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2015/08/20 11:05:01 christos Exp $ +# $NetBSD: Makefile,v 1.2.22.1 2019/10/28 16:37:55 martin Exp $ .include "../Makefile.inc" @@ -9,4 +9,10 @@ IOCONF= filemon.ioconf SRCS = filemon.c filemon_wrapper.c NOMAN = no +# Due to security concerns, we don't install the filemon module. We +# do, however, want to keep building it to prevent bit-rot. Define +# an empty install target for this. + +kmodinstall: + .include
CVS commit: src/external/gpl3/gcc/lib
Module Name:src Committed By: christos Date: Mon Oct 28 16:25:05 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libasan: Makefile src/external/gpl3/gcc/lib/liblsan: Makefile src/external/gpl3/gcc/lib/libubsan: Makefile Log Message: vaxinate sanitizer_file.cc against the optimizer virus. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/lib/libasan/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/liblsan/Makefile cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libubsan/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/gpl3/gcc/lib/libasan/Makefile diff -u src/external/gpl3/gcc/lib/libasan/Makefile:1.30 src/external/gpl3/gcc/lib/libasan/Makefile:1.31 --- src/external/gpl3/gcc/lib/libasan/Makefile:1.30 Sun Oct 13 17:18:20 2019 +++ src/external/gpl3/gcc/lib/libasan/Makefile Mon Oct 28 12:25:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2019/10/13 21:18:20 mrg Exp $ +# $NetBSD: Makefile,v 1.31 2019/10/28 16:25:05 christos Exp $ UNSUPPORTED_COMPILER.clang= # defined NOSANITIZER= # defined @@ -51,6 +51,7 @@ CPPFLAGS+=-DCAN_SANITIZE_UB=0 .if ${MACHINE_ARCH} == "vax" COPTS.asan_allocator.cc += -O1 COPTS.asan_report.cc += -O1 +COPTS.sanitizer_file.cc += -O1 COPTS.ubsan_diag.cc += -O1 COPTS.ubsan_init.cc += -O1 .endif Index: src/external/gpl3/gcc/lib/liblsan/Makefile diff -u src/external/gpl3/gcc/lib/liblsan/Makefile:1.5 src/external/gpl3/gcc/lib/liblsan/Makefile:1.6 --- src/external/gpl3/gcc/lib/liblsan/Makefile:1.5 Tue Oct 1 22:54:34 2019 +++ src/external/gpl3/gcc/lib/liblsan/Makefile Mon Oct 28 12:25:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2019/10/02 02:54:34 mrg Exp $ +# $NetBSD: Makefile,v 1.6 2019/10/28 16:25:05 christos Exp $ .include @@ -18,6 +18,7 @@ LSAN_SRCS+= \ .if ${MACHINE_ARCH} == "vax" COPTS.lsan_allocator.cc += -O1 +COPTS.sanitizer_file.cc += -O1 .endif LIB= lsan Index: src/external/gpl3/gcc/lib/libubsan/Makefile diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.15 src/external/gpl3/gcc/lib/libubsan/Makefile:1.16 --- src/external/gpl3/gcc/lib/libubsan/Makefile:1.15 Sat Oct 5 20:15:22 2019 +++ src/external/gpl3/gcc/lib/libubsan/Makefile Mon Oct 28 12:25:05 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/10/06 00:15:22 mrg Exp $ +# $NetBSD: Makefile,v 1.16 2019/10/28 16:25:05 christos Exp $ UNSUPPORTED_COMPILER.clang= # defined LIBISCXX = yes @@ -25,6 +25,10 @@ UBSAN_SRCS= \ COPTS.${_s}.cc+=-frtti .endfor +.if ${MACHINE_ARCH} == "vax" +COPTS.sanitizer_file.cc += -O1 +.endif + LIB= ubsan SRCS+= ${UBSAN_SRCS} LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
CVS commit: src/external/gpl3/gcc/lib
Module Name:src Committed By: christos Date: Mon Oct 28 16:25:05 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libasan: Makefile src/external/gpl3/gcc/lib/liblsan: Makefile src/external/gpl3/gcc/lib/libubsan: Makefile Log Message: vaxinate sanitizer_file.cc against the optimizer virus. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/external/gpl3/gcc/lib/libasan/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/liblsan/Makefile cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libubsan/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Mon Oct 28 16:03:55 UTC 2019 Modified Files: src/sys/modules: Makefile src/sys/modules/filemon: Makefile Log Message: Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/modules/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/modules/filemon/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/modules/Makefile diff -u src/sys/modules/Makefile:1.229 src/sys/modules/Makefile:1.230 --- src/sys/modules/Makefile:1.229 Mon Oct 28 13:19:50 2019 +++ src/sys/modules/Makefile Mon Oct 28 16:03:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.229 2019/10/28 13:19:50 maya Exp $ +# $NetBSD: Makefile,v 1.230 2019/10/28 16:03:55 pgoyette Exp $ .include @@ -54,7 +54,7 @@ SUBDIR+= exec_script SUBDIR+= fdesc SUBDIR+= ffs SUBDIR+= filecore -#SUBDIR+= filemon +SUBDIR+= filemon SUBDIR+= flash SUBDIR+= fss SUBDIR+= gpio Index: src/sys/modules/filemon/Makefile diff -u src/sys/modules/filemon/Makefile:1.3 src/sys/modules/filemon/Makefile:1.4 --- src/sys/modules/filemon/Makefile:1.3 Sun Oct 13 07:28:13 2019 +++ src/sys/modules/filemon/Makefile Mon Oct 28 16:03:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2019/10/13 07:28:13 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2019/10/28 16:03:55 pgoyette Exp $ .include "../Makefile.inc" @@ -11,4 +11,10 @@ NOMAN = no COPTS.filemon_wrapper.c+= ${GCC_NO_CAST_FUNCTION_TYPE} +# Due to security concerns, we don't install the filemon module. We +# do, however, want to keep building it to prevent bit-rot. Define +# an empty install target for this. + +kmodinstall: + .include
CVS commit: src/sys/modules
Module Name:src Committed By: pgoyette Date: Mon Oct 28 16:03:55 UTC 2019 Modified Files: src/sys/modules: Makefile src/sys/modules/filemon: Makefile Log Message: Continue to build the filemon module, but don't install it. Hopefully this will help us detect any additional bit-rot that might occur. XXX It might be a good idea to modify the file permissions on /dev/filemon XXX to prevent auto-loading of the driver module by non-privileged users. To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/modules/Makefile cvs rdiff -u -r1.3 -r1.4 src/sys/modules/filemon/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: pgoyette Date: Mon Oct 28 15:42:08 UTC 2019 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: Add debug entry for newly introduced nvmmctl utility. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/debug/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: pgoyette Date: Mon Oct 28 15:42:08 UTC 2019 Modified Files: src/distrib/sets/lists/debug: md.amd64 Log Message: Add debug entry for newly introduced nvmmctl utility. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/distrib/sets/lists/debug/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.105 src/distrib/sets/lists/debug/md.amd64:1.106 --- src/distrib/sets/lists/debug/md.amd64:1.105 Tue Feb 5 13:00:03 2019 +++ src/distrib/sets/lists/debug/md.amd64 Mon Oct 28 15:42:07 2019 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.105 2019/02/05 13:00:03 maxv Exp $ +# $NetBSD: md.amd64,v 1.106 2019/10/28 15:42:07 pgoyette Exp $ ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete @@ -18,6 +18,7 @@ ./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/sbin/acpidump.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/amldb.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/nvmmctl.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait3.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/arch/x86/t_ptrace_wait4.debug tests-obsolete obsolete
CVS commit: src/sys/arch/zaurus/stand/zbsdmod
Module Name:src Committed By: tsutsui Date: Mon Oct 28 15:26:09 UTC 2019 Modified Files: src/sys/arch/zaurus/stand/zbsdmod: compat_linux.h zbsdmod.c Log Message: Make sure to clear bss before jumping to a kernel copied from load buffer. This will fix yet another boot failure issue "screen white-out after loading a kernel" https://mail-index.netbsd.org/port-zaurus/2019/10/26/msg72.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.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/zaurus/stand/zbsdmod
Module Name:src Committed By: tsutsui Date: Mon Oct 28 15:26:09 UTC 2019 Modified Files: src/sys/arch/zaurus/stand/zbsdmod: compat_linux.h zbsdmod.c Log Message: Make sure to clear bss before jumping to a kernel copied from load buffer. This will fix yet another boot failure issue "screen white-out after loading a kernel" https://mail-index.netbsd.org/port-zaurus/2019/10/26/msg72.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h cvs rdiff -u -r1.10 -r1.11 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.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/zaurus/stand/zbsdmod/compat_linux.h diff -u src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h:1.6 src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h:1.7 --- src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h:1.6 Sun Dec 11 14:05:39 2011 +++ src/sys/arch/zaurus/stand/zbsdmod/compat_linux.h Mon Oct 28 15:26:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_linux.h,v 1.6 2011/12/11 14:05:39 nonaka Exp $ */ +/* $NetBSD: compat_linux.h,v 1.7 2019/10/28 15:26:09 tsutsui Exp $ */ /* $OpenBSD: compat_linux.h,v 1.5 2006/01/15 17:58:27 deraadt Exp $ */ /* @@ -64,6 +64,7 @@ extern int register_chrdev(unsigned int, extern int unregister_chrdev(unsigned int, const char *); extern void printk(const char *, ...) __printflike(1, 2); extern void *memcpy(void *, const void *, size_t); +extern void *memset(void *, int, size_t); /* procfs support */ struct proc_dir_entry { Index: src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c diff -u src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.10 src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.11 --- src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:1.10 Sat Oct 26 09:58:40 2019 +++ src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c Mon Oct 28 15:26:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: zbsdmod.c,v 1.10 2019/10/26 09:58:40 tsutsui Exp $ */ +/* $NetBSD: zbsdmod.c,v 1.11 2019/10/28 15:26:09 tsutsui Exp $ */ /* $OpenBSD: zbsdmod.c,v 1.7 2005/05/02 02:45:29 uwe Exp $ */ /* @@ -262,6 +262,10 @@ elf32bsdboot(void) (((char *)elf) + phdr[i].p_offset)[sz]; } } + if (IS_BSS(phdr[i])) { + memset((void *)(phdr[i].p_vaddr + phdr[i].p_filesz), 0, + phdr[i].p_memsz - phdr[i].p_filesz); + } } addr = (int *)(elf->e_entry);