CVS commit: src/sys/ddb
Module Name:src
Committed By: hikaru
Date: Wed Feb 26 07:57:24 UTC 2020
Modified Files:
src/sys/ddb: db_proc.c
Log Message:
Correct PPID of "show all procs/n"
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/ddb/db_proc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ddb/db_proc.c
diff -u src/sys/ddb/db_proc.c:1.10 src/sys/ddb/db_proc.c:1.11
--- src/sys/ddb/db_proc.c:1.10 Sat Feb 15 18:12:14 2020
+++ src/sys/ddb/db_proc.c Wed Feb 26 07:57:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_proc.c,v 1.10 2020/02/15 18:12:14 ad Exp $ */
+/* $NetBSD: db_proc.c,v 1.11 2020/02/26 07:57:24 hikaru Exp $ */
/*-
* Copyright (c) 2009, 2020 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_proc.c,v 1.10 2020/02/15 18:12:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_proc.c,v 1.11 2020/02/26 07:57:24 hikaru Exp $");
#ifndef _KERNEL
#include
@@ -233,7 +233,7 @@ db_show_all_procs(db_expr_t addr, bool h
wbuf[0] = '\0';
}
db_printf("%8d %8d %10d %d %#7x %4d %16s %7.7s\n",
- p.p_pptr != NULL ? p.p_pid : -1, pgrp.pg_id,
+ p.p_pptr != NULL ? p.p_pptr->p_pid : -1, pgrp.pg_id,
#ifdef _KERNEL
kauth_cred_getuid(p.p_cred),
#else
CVS commit: src
Module Name:src
Committed By: riastradh
Date: Wed Feb 26 07:31:51 UTC 2020
Modified Files:
src/distrib/sets/lists/man: mi
src/share/man/man7: Makefile intro.7
Added Files:
src/share/man/man7: groups.7 users.7
Log Message:
Draft man pages for the standard users and groups.
These are currently listed in order of uid because I went through
src/etc/group and src/etc/master.passwd line by line, and sorting any
other way after the fact -- like lexicographically, how it should be
-- was kinda inconvenient.
Feel free to sort, add information, add historical references,
correct any mistakes, , so that these remain living documents
describing NetBSD's standard users and groups and practices around
them.
To generate a diff of this commit:
cvs rdiff -u -r1.1680 -r1.1681 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.33 -r1.34 src/share/man/man7/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man7/groups.7 src/share/man/man7/users.7
cvs rdiff -u -r1.26 -r1.27 src/share/man/man7/intro.7
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/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1680 src/distrib/sets/lists/man/mi:1.1681
--- src/distrib/sets/lists/man/mi:1.1680 Sun Feb 9 16:06:17 2020
+++ src/distrib/sets/lists/man/mi Wed Feb 26 07:31:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1680 2020/02/09 16:06:17 jmcneill Exp $
+# $NetBSD: mi,v 1.1681 2020/02/26 07:31:51 riastradh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5403,6 +5403,7 @@
./usr/share/man/html7/editline.html man-sys-htmlman html
./usr/share/man/html7/environ.html man-reference-htmlman html
./usr/share/man/html7/glob.html man-reference-htmlman html
+./usr/share/man/html7/groups.html man-reference-htmlman html
./usr/share/man/html7/hier.html man-reference-htmlman html
./usr/share/man/html7/hostname.html man-reference-htmlman html
./usr/share/man/html7/intro.html man-reference-htmlman html
@@ -5436,6 +5437,7 @@
./usr/share/man/html7/symlink.html man-reference-htmlman html
./usr/share/man/html7/sysctl.html man-reference-htmlman html
./usr/share/man/html7/tests.html man-reference-htmlman html
+./usr/share/man/html7/users.html man-reference-htmlman html
./usr/share/man/html7/zpool-features.html man-zfs-htmlman zfs,html
./usr/share/man/html8/MAKEDEV.html man-sysutil-htmlman html
./usr/share/man/html8/MAKEDEV.local.html man-sysutil-htmlman html
@@ -8460,6 +8462,7 @@
./usr/share/man/man7/editline.7 man-sys-man .man
./usr/share/man/man7/environ.7 man-reference-man .man
./usr/share/man/man7/glob.7 man-reference-man .man
+./usr/share/man/man7/groups.7 man-reference-man .man
./usr/share/man/man7/hier.7 man-reference-man .man
./usr/share/man/man7/hostname.7 man-reference-man .man
./usr/share/man/man7/intro.7 man-reference-man .man
@@ -8496,6 +8499,7 @@
./usr/share/man/man7/symlink.7 man-reference-man .man
./usr/share/man/man7/sysctl.7 man-reference-man .man
./usr/share/man/man7/tests.7 man-reference-man .man
+./usr/share/man/man7/users.7 man-reference-man .man
./usr/share/man/man7/zpool-features.7 man-zfs-man zfs,.man
./usr/share/man/man8/MAKEDEV.8 man-sysutil-man .man
./usr/share/man/man8/MAKEDEV.local.8 man-sysutil-man .man
Index: src/share/man/man7/Makefile
diff -u src/share/man/man7/Makefile:1.33 src/share/man/man7/Makefile:1.34
--- src/share/man/man7/Makefile:1.33 Mon May 28 00:18:06 2018
+++ src/share/man/man7/Makefile Wed Feb 26 07:31:51 2020
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.33 2018/05/28 00:18:06 nat Exp $
+# $NetBSD: Makefile,v 1.34 2020/02/26 07:31:51 riastradh Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
.include
# missing: eqnchar.7 man.7 ms.7 term.7
-MAN= ascii.7 c.7 environ.7 glob.7 hier.7 hostname.7 intro.7 mailaddr.7 \
- module.7 nls.7 operator.7 orders.7 pkgsrc.7 release.7 rfc6056.7 \
- security.7 script.7 setuid.7 signal.7 src.7 sticky.7 symlink.7 \
- sysctl.7 tests.7
+MAN= ascii.7 c.7 environ.7 glob.7 groups.7 hier.7 hostname.7 intro.7 \
+ mailaddr.7 module.7 nls.7 operator.7 orders.7 pkgsrc.7 release.7 \
+ rfc6056.7 security.7 script.7 setuid.7 signal.7 src.7 sticky.7 \
+ symlink.7 sysctl.7 tests.7 users.7
CLEANFILES= tests.7
.if ${MKKYUA} != "no"
Index: src/share/man/man7/intro.7
diff -u src/share/man/man7/intro.7:1.26 src/share/man/man7/intro.7:1.27
--- src/share/man/man7/intro.7:1.26 Mon May 28 00:18:06 2018
+++ src/share/man/man7/intro.7 Wed Feb 26 07:31:51 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: intro.7,v 1.26 2018/05/28 00:18:06 nat Exp $
+.\" $NetBSD: intro.7,v 1.27 2020/02/26 07:31:51 riastradh Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -48,6 +48,10 @@ user environment
shell-style pattern matching
.\" .It Sy eqnchar
.\" special character definitions for eqn
+.It Xr groups 7
CVS commit: src/bin/echo
Module Name:src Committed By: wiz Date: Wed Feb 26 07:14:47 UTC 2020 Modified Files: src/bin/echo: echo.1 Log Message: Add some commas. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/bin/echo/echo.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/echo/echo.1 diff -u src/bin/echo/echo.1:1.18 src/bin/echo/echo.1:1.19 --- src/bin/echo/echo.1:1.18 Wed Feb 26 02:09:46 2020 +++ src/bin/echo/echo.1 Wed Feb 26 07:14:47 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: echo.1,v 1.18 2020/02/26 02:09:46 gutteridge Exp $ +.\" $NetBSD: echo.1,v 1.19 2020/02/26 07:14:47 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -66,8 +66,8 @@ and backslashes. .Sh EXIT STATUS .Ex -std echo .Sh SEE ALSO -.Xr csh 1 -.Xr ksh 1 +.Xr csh 1 , +.Xr ksh 1 , .Xr printf 1 .Sh STANDARDS The
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Wed Feb 26 05:55:27 UTC 2020 Modified Files: src/usr.bin/ftp: version.h Log Message: update ftp version to 20190622 To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/usr.bin/ftp/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/ftp/version.h diff -u src/usr.bin/ftp/version.h:1.87 src/usr.bin/ftp/version.h:1.88 --- src/usr.bin/ftp/version.h:1.87 Sat Sep 12 20:18:52 2015 +++ src/usr.bin/ftp/version.h Wed Feb 26 05:55:27 2020 @@ -1,7 +1,7 @@ -/* $NetBSD: version.h,v 1.87 2015/09/12 20:18:52 wiz Exp $ */ +/* $NetBSD: version.h,v 1.88 2020/02/26 05:55:27 lukem Exp $ */ /*- - * Copyright (c) 1999-2015 The NetBSD Foundation, Inc. + * Copyright (c) 1999-2020 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -34,5 +34,5 @@ #endif #ifndef FTP_VERSION -#define FTP_VERSION "20150912" +#define FTP_VERSION "20190622" #endif
CVS commit: src/bin/echo
Module Name:src Committed By: gutteridge Date: Wed Feb 26 02:09:46 UTC 2020 Modified Files: src/bin/echo: echo.1 Log Message: echo.1: add a note about other echo implementations The other BSDs all have a note reminding that many shells have their own internal echo implementations which may vary from this utility, so add one. (Much of the wording is borrowed from FreeBSD's man page.) (The other BSDs also have notes about the -n option not really being portable, and printf[1] being preferable, we might want to add something about that, too.) To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/bin/echo/echo.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/echo/echo.1 diff -u src/bin/echo/echo.1:1.17 src/bin/echo/echo.1:1.18 --- src/bin/echo/echo.1:1.17 Tue Jul 4 06:48:41 2017 +++ src/bin/echo/echo.1 Wed Feb 26 02:09:46 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: echo.1,v 1.17 2017/07/04 06:48:41 wiz Exp $ +.\" $NetBSD: echo.1,v 1.18 2020/02/26 02:09:46 gutteridge Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 .\" -.Dd August 14, 2016 +.Dd February 26, 2020 .Dt ECHO 1 .Os .Sh NAME @@ -54,9 +54,20 @@ The following option is available: .It Fl n Do not print the trailing newline character. .El +.Pp +Note that many shells (e.g., +.Xr csh 1 +and +.Xr ksh 1 ) +provide a built-in +.Nm +command which tends to differ from this utility in the treatment of options +and backslashes. .Sh EXIT STATUS .Ex -std echo .Sh SEE ALSO +.Xr csh 1 +.Xr ksh 1 .Xr printf 1 .Sh STANDARDS The
CVS commit: src/sys/dev/pckbport
Module Name:src
Committed By: ryoon
Date: Tue Feb 25 21:41:38 UTC 2020
Modified Files:
src/sys/dev/pckbport: synaptics.c
Log Message:
Messages in pms_synaptics_input() should not start with "pms_input"
Use "pms_synaptics_input" instead for another 2 messages.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.53 src/sys/dev/pckbport/synaptics.c:1.54
--- src/sys/dev/pckbport/synaptics.c:1.53 Tue Feb 25 21:38:42 2020
+++ src/sys/dev/pckbport/synaptics.c Tue Feb 25 21:41:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.53 2020/02/25 21:38:42 ryoon Exp $ */
+/* $NetBSD: synaptics.c,v 1.54 2020/02/25 21:41:38 ryoon Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.53 2020/02/25 21:38:42 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.54 2020/02/25 21:41:38 ryoon Exp $");
#include
#include
@@ -1182,7 +1182,7 @@ pms_synaptics_input(void *vsc, int data)
case 0:
if ((data & 0xc8) != 0x80) {
aprint_debug_dev(psc->sc_dev,
- "pms_input: 0x%02x out of sync\n", data);
+ "pms_synaptics_input: 0x%02x out of sync\n", data);
/* use negative counts to limit resync phase */
psc->inputstate--;
return; /* not in sync yet, discard input */
@@ -1194,7 +1194,7 @@ pms_synaptics_input(void *vsc, int data)
case 3:
if ((data & 8) == 8) {
aprint_debug_dev(psc->sc_dev,
- "pms_input: dropped in relative mode, reset\n");
+ "pms_synaptics_input: dropped in relative mode, reset\n");
psc->inputstate = 0;
psc->sc_enabled = 0;
wakeup(>sc_enabled);
CVS commit: src/sys/dev/pckbport
Module Name:src
Committed By: ryoon
Date: Tue Feb 25 21:38:42 UTC 2020
Modified Files:
src/sys/dev/pckbport: synaptics.c
Log Message:
Messages in pms_synaptics_input() should not start with "pms_input"
Use "pms_synaptics_input" instead.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.52 src/sys/dev/pckbport/synaptics.c:1.53
--- src/sys/dev/pckbport/synaptics.c:1.52 Tue Feb 25 21:36:13 2020
+++ src/sys/dev/pckbport/synaptics.c Tue Feb 25 21:38:42 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.52 2020/02/25 21:36:13 ryoon Exp $ */
+/* $NetBSD: synaptics.c,v 1.53 2020/02/25 21:38:42 ryoon Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.52 2020/02/25 21:36:13 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.53 2020/02/25 21:38:42 ryoon Exp $");
#include
#include
@@ -1159,10 +1159,10 @@ pms_synaptics_input(void *vsc, int data)
timersub(>current, >last, );
if (diff.tv_sec > 0 || diff.tv_usec >= 4) {
aprint_debug_dev(psc->sc_dev,
- "pms_input: unusual delay (%ld.%06ld s), "
+ "pms_synaptics_input: unusual delay (%ld.%06ld s), "
"scheduling reset\n",
(long)diff.tv_sec, (long)diff.tv_usec);
- printf("pms_input: unusual delay (%ld.%06ld s), "
+ printf("pms_synaptics_input: unusual delay (%ld.%06ld s), "
"scheduling reset\n",
(long)diff.tv_sec, (long)diff.tv_usec);
psc->inputstate = 0;
CVS commit: src/sys/dev/pckbport
Module Name:src
Committed By: ryoon
Date: Tue Feb 25 21:36:13 UTC 2020
Modified Files:
src/sys/dev/pckbport: synaptics.c
Log Message:
Do not enter extended W mode conditional for non extended W mode device
Even without extended W mode, sp_w can be 2. This causes
"invalid extended w mode N" warning messages.
Restrict extended W mode conditional for hardwares with extended W
support.
Tested with Synaptics 6.2 device on Panasonic CF-Y8, however it does
not work with X.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.51 src/sys/dev/pckbport/synaptics.c:1.52
--- src/sys/dev/pckbport/synaptics.c:1.51 Tue Feb 25 16:24:47 2020
+++ src/sys/dev/pckbport/synaptics.c Tue Feb 25 21:36:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.51 2020/02/25 16:24:47 ryoon Exp $ */
+/* $NetBSD: synaptics.c,v 1.52 2020/02/25 21:36:13 ryoon Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.51 2020/02/25 16:24:47 ryoon Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.52 2020/02/25 21:36:13 ryoon Exp $");
#include
#include
@@ -945,7 +945,8 @@ pms_synaptics_parse(struct pms_softc *ps
((psc->packet[0] & 0x04) >> 1) +
((psc->packet[3] & 0x04) >> 2);
sp.sp_finger = 0;
- if (sp.sp_w == SYNAPTICS_WIDTH_EXTENDED_W) {
+ if ((sc->flags & SYN_FLAG_HAS_EXTENDED_WMODE) &&
+ (sp.sp_w == SYNAPTICS_WIDTH_EXTENDED_W)) {
ew_mode = psc->packet[5] >> 4;
switch (ew_mode)
{
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Feb 25 20:29:30 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #717, #718, #720 - #730 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-9.1 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.1 diff -u src/doc/CHANGES-9.1:1.1.2.2 src/doc/CHANGES-9.1:1.1.2.3 --- src/doc/CHANGES-9.1:1.1.2.2 Thu Feb 20 14:54:22 2020 +++ src/doc/CHANGES-9.1 Tue Feb 25 20:29:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.2 2020/02/20 14:54:22 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.3 2020/02/25 20:29:30 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -52,3 +52,106 @@ sys/dev/usb/usbdi.c1.194 pipe is aborted will not be restarted afterward. [riastradh, ticket #716] +sys/dev/fdt/dwcmmc_fdt.c 1.11 +sys/dev/ic/bwfm.c1.15-1.18 +sys/dev/ic/bwfmreg.h1.4-1.6 +sys/dev/ic/bwfmvar.h1.4,1.5 +sys/dev/ic/dwc_mmc.c1.21,1.22 +sys/dev/ic/dwc_mmc_reg.h 1.8,1.9,1.12,1.13 +sys/dev/pcmcia/pcmciareg.h 1.11 +sys/dev/sdmmc/if_bwfm_sdio.c 1.4,1.6-1.12 +sys/dev/sdmmc/if_bwfm_sdio.h 1.1,1.2 +sys/dev/sdmmc/sdhc.c1.105,1.106 +sys/dev/sdmmc/sdmmc.c1.37,1.39 +sys/dev/sdmmc/sdmmc_cis.c 1.6,1.8 +sys/dev/sdmmc/sdmmc_io.c 1.15-1.19 +sys/dev/sdmmc/sdmmc_ioreg.h 1.4,1.5 +sys/dev/sdmmc/sdmmc_mem.c 1.69-1.71 +sys/dev/sdmmc/sdmmcdevs1.5-1.8 +sys/dev/sdmmc/sdmmcvar.h 1.31,1.33,1.34 +sys/net/if_media.h1.66 +sys/dev/sdmmc/sdmmcdevs.h (regen) + + Various fixes to make bwfm@sdio work on Pinebook Pro: + - Several fixes to SDIO (generic for the dwc driver) + - bwfm sdio attachment. + - Various bwfm fixes + - isplay 802.11 modes beyond 'g' + - sdhc voltage setting fixes + [mrg, ticket #717] + +sys/arch/mips/adm5120/dev/ahci.c 1.21 +sys/dev/usb/ehci.c1.274 +sys/dev/usb/ohci.c1.296 +sys/dev/usb/uhci.c1.294 +sys/external/bsd/dwc2/dwc2.c 1.72 + + Fix a memory leak. + [skrll, ticket #718] + +sys/kern/uipc_socket.c1.288 + + SO_RCVTIMEO: zero out the time value, to prevent uninitialized + bytes in its padding from leaking to userland. + [maxv, ticket #720] + +sys/arch/arm/arm32/bus_dma.c 1.119,1.120 + + Make sure to convey a failure to the calling function. + [skrll, ticket #721] + +sys/arch/i386/stand/efiboot/eficons.c 1.10,1.11 + + If the default GOP mode is unavailable, fallback to the first mode + defined. + [jmcneill, ticket #723] + +xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h 1.5 +xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h 1.6 + + mesa: sync w/ pkgsrc: don't assume the current gl dispatch table + points to noop if NULL, instead call the ENTRY_CURRENT_TABLE_GET + function. + [tnn, ticket #724] + +etc/rc.d/mountall1.12 +external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c 1.5,1.6 +external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c 1.59-1.61 +external/cddl/osnet/sys/kern/misc.c 1.8 + + - Make block device nodes with /dev on zfs work. + - Mount zfs if zfs=YES whether or not /etc/zfs/zpool.cache is there. + - Allow random seed to be stored on zfs. + - Mark our changes to zpools as NetBSD, not OpenSolaris. + [riastradh, ticket #725] + +external/gpl3/binutils/dist/bfd/elf.c 1.14 + + Fix 'nm /dev/ksyms'. + [rin, ticket #726] + +sys/arch/powerpc/include/db_machdep.h 1.27 + + Do not mask out LK bit (bit 31) from M_BCTR, which distinguishes + bcctr and bcctrl. + [rin, ticket #727] + +sys/arch/powerpc/ibm4xx/dev/com_opb.c 1.23 + + Fix a panic during attach of com(4) for powerpc/ibm4xx peripheral. + [rin, ticket #728] + +sys/arch/powerpc/include/intr.h 1.15 + + Fix !__HAVE_FAST_SOFTINTS build for debugging. + [rin, ticket #729] + +sys/arch/powerpc/conf/files.powerpc 1.93 +sys/arch/powerpc/include/pio.h 1.8 +sys/arch/powerpc/pic/intr.c 1.27 +sys/arch/powerpc/powerpc/bus_dma.c 1.50 +sys/arch/powerpc/powerpc/pio_subr.S 1.17 + + Remove redundant "eieio" instructions for powerpc/ibm4xx. + [rin, ticket #730] +
CVS commit: [netbsd-9] src/sys/arch/powerpc
Module Name:src
Committed By: martin
Date: Tue Feb 25 20:22:14 UTC 2020
Modified Files:
src/sys/arch/powerpc/conf [netbsd-9]: files.powerpc
src/sys/arch/powerpc/include [netbsd-9]: pio.h
src/sys/arch/powerpc/pic [netbsd-9]: intr.c
src/sys/arch/powerpc/powerpc [netbsd-9]: bus_dma.c pio_subr.S
Log Message:
Pull up following revision(s) (requested by rin in ticket #730):
sys/arch/powerpc/conf/files.powerpc: revision 1.93
sys/arch/powerpc/include/pio.h: revision 1.8
sys/arch/powerpc/pic/intr.c: revision 1.27
sys/arch/powerpc/powerpc/bus_dma.c: revision 1.50
sys/arch/powerpc/powerpc/pio_subr.S: revision 1.17
Add PPC_IBM440 flag as 440 is significantly different from 40x processors.
(It may be more easily supported by booke than by ibm4xx.)
-
eieio is implemented as sync on 40x. Therefore, "sync; eieio" and
"eieio; sync" can be replaced by a single sync.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.92.4.1 src/sys/arch/powerpc/conf/files.powerpc
cvs rdiff -u -r1.7 -r1.7.52.1 src/sys/arch/powerpc/include/pio.h
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.49 -r1.49.4.1 src/sys/arch/powerpc/powerpc/bus_dma.c
cvs rdiff -u -r1.16 -r1.16.32.1 src/sys/arch/powerpc/powerpc/pio_subr.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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.92 src/sys/arch/powerpc/conf/files.powerpc:1.92.4.1
--- src/sys/arch/powerpc/conf/files.powerpc:1.92 Sat Apr 6 03:06:26 2019
+++ src/sys/arch/powerpc/conf/files.powerpc Tue Feb 25 20:22:14 2020
@@ -1,9 +1,9 @@
-# $NetBSD: files.powerpc,v 1.92 2019/04/06 03:06:26 thorpej Exp $
+# $NetBSD: files.powerpc,v 1.92.4.1 2020/02/25 20:22:14 martin Exp $
defflag opt_altivec.h ALTIVEC K_ALTIVEC PPC_HAVE_SPE
defflag opt_openpic.h OPENPIC_DISTRIBUTE
defparam opt_ppcparam.h L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
-defflag opt_ppcarch.h PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_BOOKE
+defflag opt_ppcarch.h PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_IBM440 PPC_BOOKE
defflag opt_ppccache.h CACHE_PROTO_MEI
defflag opt_pmap.h PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB
defparam opt_pmap.h PTEGCOUNT PMAP_MEMLIMIT
Index: src/sys/arch/powerpc/include/pio.h
diff -u src/sys/arch/powerpc/include/pio.h:1.7 src/sys/arch/powerpc/include/pio.h:1.7.52.1
--- src/sys/arch/powerpc/include/pio.h:1.7 Mon Jan 30 23:34:58 2012
+++ src/sys/arch/powerpc/include/pio.h Tue Feb 25 20:22:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pio.h,v 1.7 2012/01/30 23:34:58 matt Exp $ */
+/* $NetBSD: pio.h,v 1.7.52.1 2020/02/25 20:22:14 martin Exp $ */
/* $OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $ */
/*
@@ -39,6 +39,13 @@
* I/O macros.
*/
+#if defined(PPC_IBM4XX) && !defined(PPC_IBM440)
+/* eieio is implemented as sync */
+#define IO_BARRIER() __asm volatile("sync")
+#else
+#define IO_BARRIER() __asm volatile("eieio; sync")
+#endif
+
static __inline void __outb(volatile uint8_t *a, uint8_t v);
static __inline void __outw(volatile uint16_t *a, uint16_t v);
static __inline void __outl(volatile uint32_t *a, uint32_t v);
@@ -64,35 +71,35 @@ static __inline void
__outb(volatile uint8_t *a, uint8_t v)
{
*a = v;
- __asm volatile("eieio; sync");
+ IO_BARRIER();
}
static __inline void
__outw(volatile uint16_t *a, uint16_t v)
{
*a = v;
- __asm volatile("eieio; sync");
+ IO_BARRIER();
}
static __inline void
__outl(volatile uint32_t *a, uint32_t v)
{
*a = v;
- __asm volatile("eieio; sync");
+ IO_BARRIER();
}
static __inline void
__outwrb(volatile uint16_t *a, uint16_t v)
{
__asm volatile("sthbrx %0, 0, %1" :: "r"(v), "r"(a));
- __asm volatile("eieio; sync");
+ IO_BARRIER();
}
static __inline void
__outlrb(volatile uint32_t *a, uint32_t v)
{
__asm volatile("stwbrx %0, 0, %1" :: "r"(v), "r"(a));
- __asm volatile("eieio; sync");
+ IO_BARRIER();
}
static __inline uint8_t
@@ -101,7 +108,7 @@ __inb(volatile uint8_t *a)
uint8_t _v_;
_v_ = *a;
- __asm volatile("eieio; sync");
+ IO_BARRIER();
return _v_;
}
@@ -111,7 +118,7 @@ __inw(volatile uint16_t *a)
uint16_t _v_;
_v_ = *a;
- __asm volatile("eieio; sync");
+ IO_BARRIER();
return _v_;
}
@@ -121,7 +128,7 @@ __inl(volatile uint32_t *a)
uint32_t _v_;
_v_ = *a;
- __asm volatile("eieio; sync");
+ IO_BARRIER();
return _v_;
}
@@ -131,7 +138,7 @@ __inwrb(volatile uint16_t *a)
uint16_t _v_;
__asm volatile("lhbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
- __asm volatile("eieio; sync");
+ IO_BARRIER();
return _v_;
}
@@ -141,7 +148,7 @@ __inlrb(volatile uint32_t *a)
uint32_t _v_;
__asm volatile("lwbrx %0, 0, %1" : "=r"(_v_) : "r"(a));
- __asm volatile("eieio; sync");
+ IO_BARRIER();
return _v_;
}
CVS commit: [netbsd-9] src/sys/arch/powerpc/include
Module Name:src
Committed By: martin
Date: Tue Feb 25 20:14:04 UTC 2020
Modified Files:
src/sys/arch/powerpc/include [netbsd-9]: intr.h
Log Message:
Pull up following revision(s) (requested by rin in ticket #729):
sys/arch/powerpc/include/intr.h: revision 1.15
Fix !__HAVE_FAST_SOFTINTS build for debugging.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.6.1 src/sys/arch/powerpc/include/intr.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/powerpc/include/intr.h
diff -u src/sys/arch/powerpc/include/intr.h:1.13 src/sys/arch/powerpc/include/intr.h:1.13.6.1
--- src/sys/arch/powerpc/include/intr.h:1.13 Thu Apr 19 21:50:07 2018
+++ src/sys/arch/powerpc/include/intr.h Tue Feb 25 20:14:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.13 2018/04/19 21:50:07 christos Exp $ */
+/* $NetBSD: intr.h,v 1.13.6.1 2020/02/25 20:14:04 martin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -28,7 +28,7 @@
#ifndef _LOCORE
#include
-__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.13 2018/04/19 21:50:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.h,v 1.13.6.1 2020/02/25 20:14:04 martin Exp $");
#endif
#ifndef _POWERPC_INTR_MACHDEP_H_
@@ -92,8 +92,10 @@ struct intrhand {
void softint_fast_dispatch(struct lwp *, int);
+#ifdef __HAVE_FAST_SOFTINTS
#define softint_init_md powerpc_softint_init_md
#define softint_trigger powerpc_softint_trigger
+#endif
#ifdef __IMASK_T
typedef __IMASK_T imask_t;
CVS commit: [netbsd-9] src/sys/arch/powerpc/ibm4xx/dev
Module Name:src
Committed By: martin
Date: Tue Feb 25 20:12:20 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx/dev [netbsd-9]: com_opb.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #728):
sys/arch/powerpc/ibm4xx/dev/com_opb.c: revision 1.23
Belatedly catch up with MI com(4) change in com.c rev. 1.351:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/ic/com.c#rev1.351
XXX
pullup to netbsd-9
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.22.4.1 src/sys/arch/powerpc/ibm4xx/dev/com_opb.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/powerpc/ibm4xx/dev/com_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22.4.1
--- src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.22 Sat Dec 8 17:46:12 2018
+++ src/sys/arch/powerpc/ibm4xx/dev/com_opb.c Tue Feb 25 20:12:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $ */
+/* $NetBSD: com_opb.c,v 1.22.4.1 2020/02/25 20:12:20 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.22 2018/12/08 17:46:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.22.4.1 2020/02/25 20:12:20 martin Exp $");
#include
#include
@@ -143,9 +143,6 @@ void
com_opb_cnattach(int com_freq, int conaddr, int conspeed, int conmode)
{
static int attached = 0;
-#if (NCOM > 0)
- struct com_regs regs;
-#endif
if (attached)
return;
@@ -153,12 +150,8 @@ com_opb_cnattach(int com_freq, int conad
#if (NCOM > 0)
/* We *know* the com-console attaches to opb */
- regs.cr_iot = opb_get_bus_space_tag();
- regs.cr_iobase = conaddr;
- regs.cr_nports = COM_NPORTS;
- /* regs.ioh is initialized by comcnattach */
-
- if (comcnattach1(, conspeed, com_freq, COM_TYPE_NORMAL, conmode))
+ if (comcnattach(opb_get_bus_space_tag(), conaddr, conspeed, com_freq,
+ COM_TYPE_NORMAL, conmode))
panic("can't init serial console @%x", conaddr);
else
return;
CVS commit: [netbsd-9] src/sys/arch/powerpc/include
Module Name:src Committed By: martin Date: Tue Feb 25 20:08:38 UTC 2020 Modified Files: src/sys/arch/powerpc/include [netbsd-9]: db_machdep.h Log Message: Pull up following revision(s) (requested by rin in ticket #727): sys/arch/powerpc/include/db_machdep.h: revision 1.27 Do not mask out LK bit (bit 31) from M_BCTR, which distinguishes bcctr and bcctrl. Fix build failure for ibm4xx kernels with GCC8. XXX pullup to netbsd-9, -8, and -7 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.8.1 src/sys/arch/powerpc/include/db_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/db_machdep.h diff -u src/sys/arch/powerpc/include/db_machdep.h:1.26 src/sys/arch/powerpc/include/db_machdep.h:1.26.8.1 --- src/sys/arch/powerpc/include/db_machdep.h:1.26 Mon Nov 6 03:47:48 2017 +++ src/sys/arch/powerpc/include/db_machdep.h Tue Feb 25 20:08:38 2020 @@ -1,5 +1,5 @@ /* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */ -/* $NetBSD: db_machdep.h,v 1.26 2017/11/06 03:47:48 christos Exp $ */ +/* $NetBSD: db_machdep.h,v 1.26.8.1 2020/02/25 20:08:38 martin Exp $ */ /* * Mach Operating System @@ -98,7 +98,7 @@ extern db_regs_t ddb_regs; /* register #define M_B 0xfc01 #define I_B 0x4800 #define I_BL 0x4801 -#define M_BCTR 0xfc0007fe +#define M_BCTR 0xfc0007ff #define I_BCTR 0x4c000420 #define I_BCTRL 0x4c000421 #define M_RFI 0xfc0007fe
CVS commit: [netbsd-9] src/external/gpl3/binutils/dist/bfd
Module Name:src Committed By: martin Date: Tue Feb 25 20:05:48 UTC 2020 Modified Files: src/external/gpl3/binutils/dist/bfd [netbsd-9]: elf.c Log Message: Pull up following revision(s) (requested by rin in ticket #726): external/gpl3/binutils/dist/bfd/elf.c: revision 1.14 Fix 'nm /dev/ksyms' (noticed by ryo). Since binutils 2.15, nm(1) cannot be used for character devices. We worked around this by a local patch: http://cvsweb.netbsd.org/bsdweb.cgi/src/gnu/dist/binutils/binutils/Attic/bucomm.c?r1=1.1.1.2=0#rev1.2 With recent update of binutils, 'nm /dev/ksyms' got broken again. This is due to a consistency check involving file size reported by stat(2), which is always zero for character devices. So, skip this check if file size is zero. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.13.2.1 src/external/gpl3/binutils/dist/bfd/elf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/bfd/elf.c diff -u src/external/gpl3/binutils/dist/bfd/elf.c:1.13 src/external/gpl3/binutils/dist/bfd/elf.c:1.13.2.1 --- src/external/gpl3/binutils/dist/bfd/elf.c:1.13 Wed Nov 7 01:13:52 2018 +++ src/external/gpl3/binutils/dist/bfd/elf.c Tue Feb 25 20:05:48 2020 @@ -298,7 +298,8 @@ bfd_elf_get_str_section (bfd *abfd, unsi /* Allocate and clear an extra byte at the end, to prevent crashes in case the string table is not terminated. */ if (shstrtabsize + 1 <= 1 - || shstrtabsize > bfd_get_file_size (abfd) + || (bfd_get_file_size (abfd) > 0 /* not a character device */ + && shstrtabsize > bfd_get_file_size (abfd)) || bfd_seek (abfd, offset, SEEK_SET) != 0 || (shstrtab = (bfd_byte *) bfd_alloc (abfd, shstrtabsize + 1)) == NULL) shstrtab = NULL;
CVS commit: src/distrib/common
Module Name:src Committed By: roy Date: Tue Feb 25 20:05:10 UTC 2020 Modified Files: src/distrib/common: zfsroot.rc Log Message: ramdisk-zfsroot: Remove the module loading magic It's been determined that it's too magical and it's either the job of the bootloader or you compile it into the kernel yourself. This entry works in /boot.cfg: menu=Boot ZFS Root:load solaris;load zfs;fs /ramdisk-zfsroot.fs;boot To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/common/zfsroot.rc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/common/zfsroot.rc diff -u src/distrib/common/zfsroot.rc:1.3 src/distrib/common/zfsroot.rc:1.4 --- src/distrib/common/zfsroot.rc:1.3 Sun Feb 23 10:51:12 2020 +++ src/distrib/common/zfsroot.rc Tue Feb 25 20:05:10 2020 @@ -1,40 +1,24 @@ #/bin/sh # -# $NetBSD: zfsroot.rc,v 1.3 2020/02/23 10:51:12 roy Exp $ +# $NetBSD: zfsroot.rc,v 1.4 2020/02/25 20:05:10 roy Exp $ -echo "Starting root on ZFS boot strapper" - -# Abort on any error -set -e +# Assumption - boot.cfg loads this ramdisk. +# Assumption - The needed kernel modules: solaris and zfs; are either on this +# ramdisk OR loaded by boot.cfg. +# Finding the correct dev node to mount to get them is too magic. +# NetBSD cannot build and distribute a kernel with ZFS builtin. +# Assumption - the root pool is set to legacy mount. # Configurable - define the ZFS root pool and ROOT. # XXX Can these be set in boot.cfg? -# Assumption - the root pool is set to legacy mount. rpool=rpool rroot=ROOT -# Assumption - the boot device is named boot. -# Could use /dev/dk0, /dev/wd0a, etc instead. -# XXX Can be exposed by sysctl kern.boot_device? -bootdev="NAME=boot" - # Setup some stuff incase things go south and we drop to the shell export HOME=/ export PATH=/sbin:/bin:/usr/sbin:/usr/bin umask 022 -# Avoid having the solaris and zfs modules in ramdisk directly. -# Means we don't need to update the ramdisk with the kernel modules -# or load them from boot.cfg so it's less pain for the user. -#bootdev="$(/sbin/sysctl -n kern.boot_device)" -modpath="$(/sbin/sysctl -n kern.module.path)" -echo "Loading needed kernel modules from $bootdev:$modpath" -/sbin/mount -o ro "$bootdev" /mnt -for m in solaris zfs; do - /sbin/modload "/mnt/$modpath/$m/$m.kmod" -done -/sbin/umount /mnt - # FIXME XXX Sometimes zpool import gets SIGBUS # Ensure that we are in a writable directory to try and capture a coredump # Not that we actually get a coredump @@ -46,5 +30,4 @@ echo "Importing $rpool" echo "Mounting $rpool/$rroot to /altroot" /sbin/mount -t zfs "$rpool/$rroot" /altroot; -echo "Pivoting to /altroot, welcome to root on ZFS" /sbin/sysctl -w init.root=/altroot
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Tue Feb 25 20:03:13 UTC 2020
Modified Files:
src/etc/rc.d [netbsd-9]: mountall
src/external/cddl/osnet/dist/uts/common/fs/zfs [netbsd-9]:
spa_history.c zfs_vnops.c
src/external/cddl/osnet/sys/kern [netbsd-9]: misc.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #725):
etc/rc.d/mountall: revision 1.12
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.59
external/cddl/osnet/sys/kern/misc.c: revision 1.8
external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c: revision 1.5
external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c: revision 1.6
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.60
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c: revision 1.61
Define VOP_STRATEGY on zfs device nodes too.
Fixes eternal hangs in attempts to do I/O on device nodes on zfs.
XXX pullup
Teach zfs spec nodes to VOP_BWRITE too.
Fixes hang on writing to, e.g., ffs mounted on a device node that
lives on zfs.
XXX pullup
Teach device nodes on zfs to handle fsync by calling spec_fsync too.
If zfs=YES, unconditioally do zfs mount/unmount -a.
If you set zfs=YES, presumably you positively want the automatic rc.d
actions, so if there's no /sbin/zfs or if zfs can't find pools with
/etc/zfs/zpool.cache, presumably you would like feedback about that
in rc.log.
Report the OS name and release appropriately for NetBSD.
We are not OpenSolaris or uts!
Mark previous #ifdef __NetBSD__, per request from hannken.
To generate a diff of this commit:
cvs rdiff -u -r1.10.4.1 -r1.10.4.2 src/etc/rc.d/mountall
cvs rdiff -u -r1.4 -r1.4.4.1 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c
cvs rdiff -u -r1.50.2.5 -r1.50.2.6 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
cvs rdiff -u -r1.5 -r1.5.4.1 src/external/cddl/osnet/sys/kern/misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/mountall
diff -u src/etc/rc.d/mountall:1.10.4.1 src/etc/rc.d/mountall:1.10.4.2
--- src/etc/rc.d/mountall:1.10.4.1 Fri Sep 27 09:18:37 2019
+++ src/etc/rc.d/mountall Tue Feb 25 20:03:12 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountall,v 1.10.4.1 2019/09/27 09:18:37 martin Exp $
+# $NetBSD: mountall,v 1.10.4.2 2020/02/25 20:03:12 martin Exp $
#
# REQUIRE: mountcritremote named ypbind
@@ -17,7 +17,7 @@ mountall_start()
echo 'Mounting all file systems...'
# Mount file systems noted in fstab.
mount -a
- if checkyesno zfs && [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then
+ if checkyesno zfs; then
# Mount ZFS file systems.
zfs mount -a
fi
@@ -26,7 +26,7 @@ mountall_start()
mountall_stop()
{
echo 'Unmounting all file systems...'
- if checkyesno zfs && [ -x /sbin/zfs -a -f /etc/zfs/zpool.cache ]; then
+ if checkyesno zfs; then
# Unmount ZFS file systems.
zfs unmount -a
fi
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.4.4.1
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c:1.4 Mon May 28 21:05:07 2018
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/spa_history.c Tue Feb 25 20:03:12 2020
@@ -540,9 +540,17 @@ spa_history_log_internal_dd(dsl_dir_t *d
void
spa_history_log_version(spa_t *spa, const char *operation)
{
+#ifdef __NetBSD__
+ spa_history_log_internal(spa, operation, NULL,
+ "pool version %llu; software version %llu/%d; %s %s %s %s %s",
+ (u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
+ utsname.sysname, utsname.nodename, utsname.release, utsname.version,
+ utsname.machine);
+#else
spa_history_log_internal(spa, operation, NULL,
"pool version %llu; software version %llu/%d; uts %s %s %s %s",
(u_longlong_t)spa_version(spa), SPA_VERSION, ZPL_VERSION,
utsname.nodename, utsname.release, utsname.version,
utsname.machine);
+#endif
}
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.5 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.6
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.50.2.5 Sun Feb 16 12:20:02 2020
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Tue Feb 25 20:03:12 2020
@@ -5487,6 +5487,19 @@ zfs_netbsd_fsync(void *v)
}
static int
+zfs_spec_fsync(void *v)
+{
+ struct vop_fsync_args *ap = v;
+ int error;
+
+ error = spec_fsync(v);
+ if (error)
+ return error;
+
+ return (zfs_fsync(ap->a_vp, ap->a_flags, ap->a_cred, NULL));
+}
+
+static int
zfs_netbsd_getattr(void *v)
{
struct vop_getattr_args *ap = v;
@@ -6332,7 +6345,7 @@ const struct vnodeopv_entry_desc zfs_spe
{ _poll_desc, spec_poll
CVS commit: [netbsd-9] xsrc/external/mit/MesaLib/dist/src/mapi
Module Name:xsrc
Committed By: martin
Date: Tue Feb 25 19:33:40 UTC 2020
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-9]: entry_x86-64_tls.h
entry_x86_tls.h
Log Message:
Pull up following revision(s) (requested by tnn in ticket #724):
xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h: revision 1.6
xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h: revision 1.5
mesa: sync w/ pkgsrc: don't assume the current gl dispatch table points
to noop if NULL, instead call the ENTRY_CURRENT_TABLE_GET function.
Additionally the previous i386 implementation probably never worked
because it looks like it used the wrong asm label when computing GOT ptr.
Likely relevant to PR port-i386/54782.
XXX pullup -9
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.2.1 \
xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h
cvs rdiff -u -r1.5 -r1.5.2.1 \
xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h
diff -u xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h:1.4 xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h:1.4.2.1
--- xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h:1.4 Tue Apr 9 14:14:59 2019
+++ xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86-64_tls.h Tue Feb 25 19:33:40 2020
@@ -32,24 +32,27 @@
#endif
__asm__(".text\n"
-".balign 32\n"
+".balign 64\n"
"x86_64_entry_start:");
#define STUB_ASM_ENTRY(func) \
".globl " func "\n" \
".type " func ", @function\n" \
- ".balign 32\n"\
+ ".balign 64\n"\
func ":"
#ifndef __ILP32__
-#if defined(__NetBSD__) && defined(MAPI_MODE_GLAPI)
+#if defined(__NetBSD__)
#define STUB_ASM_CODE(slot) \
"movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t" \
"movq %fs:(%rax), %r11\n\t" \
"testq %r11, %r11\n\t"\
- "cmoveq table_noop_array@GOTPCREL(%rip), %r11\n\t"\
- "jmp *(8 * " slot ")(%r11)"
+ "je 1f\n\t" \
+ "jmp *(8 * " slot ")(%r11)\n\t" \
+ "1:\n\t" \
+ "callq " ENTRY_CURRENT_TABLE_GET "@PLT\n\t" \
+ "jmp *(8 * " slot ")(%rax)"
#else
#define STUB_ASM_CODE(slot) \
"movq " ENTRY_CURRENT_TABLE "@GOTTPOFF(%rip), %rax\n\t" \
@@ -86,7 +89,7 @@ x86_64_entry_start[] HIDDEN;
mapi_func
entry_get_public(int slot)
{
- return (mapi_func) (x86_64_entry_start + slot * 32);
+ return (mapi_func) (x86_64_entry_start + slot * 64);
}
void
Index: xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h
diff -u xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h:1.5 xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h:1.5.2.1
--- xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h:1.5 Tue Apr 9 14:14:59 2019
+++ xsrc/external/mit/MesaLib/dist/src/mapi/entry_x86_tls.h Tue Feb 25 19:33:40 2020
@@ -43,6 +43,20 @@ __asm__("x86_current_tls:\n\t"
"movl " ENTRY_CURRENT_TABLE "@GOTNTPOFF(%eax), %eax\n\t"
"ret");
+#if defined(__NetBSD__)
+__asm__("x86_current_table_helper:\n\t"
+ "movl %gs:(%eax), %eax\n\t" \
+ "testl %eax, %eax\n\t"\
+ "je 1f\n\t" \
+ "ret\n\t" \
+ "1:\n\t" \
+ "call 2f\n\t" \
+ "2:\n\t" \
+ "popl %eax\n\t" \
+ "addl $_GLOBAL_OFFSET_TABLE_+[.-2b], %eax\n\t" \
+ "jmp *" ENTRY_CURRENT_TABLE_GET "@GOT(%eax)");
+#endif
+
#ifndef GLX_X86_READONLY_TEXT
__asm__(".section wtext, \"awx\", @progbits");
#endif /* GLX_X86_READONLY_TEXT */
@@ -56,20 +70,10 @@ __asm__(".balign 16\n"
".balign 16\n"\
func ":"
-#if defined(__NetBSD__) && defined(MAPI_MODE_GLAPI)
-extern const mapi_func table_noop_array[];
+#if defined(__NetBSD__)
#define STUB_ASM_CODE(slot) \
"call x86_current_tls\n\t"\
- "movl %gs:(%eax), %eax\n\t" \
- "testl %eax, %eax\n\t"\
- "je 1f\n\t" \
- "jmp *(4 * " slot ")(%eax)\n\t" \
- "1:\n\t" \
- "call 2f\n" \
- "2:\n\t" \
- "popl %eax\n\t" \
- "addl $_GLOBAL_OFFSET_TABLE_+[.-1b], %eax\n\t" \
- "movl table_noop_array@GOT(%eax), %eax\n\t" \
+ "call x86_current_table_helper\n\t"\
"jmp *(4 * " slot ")(%eax)"
#else
#define STUB_ASM_CODE(slot) \
CVS commit: src/sys/kern
Module Name:src Committed By: jdolecek Date: Tue Feb 25 19:34:37 UTC 2020 Modified Files: src/sys/kern: subr_autoconf.c Log Message: Previous commit resolves: netbsd boot error: panic: ASan: Unauthorized Access In ADDR: Addr ADDR [8 bytes, read, PoolUseAfterFree] Reported-by: syzbot+43111d810160fb4b9...@syzkaller.appspotmail.com To generate a diff of this commit: cvs rdiff -u -r1.267 -r1.268 src/sys/kern/subr_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_autoconf.c diff -u src/sys/kern/subr_autoconf.c:1.267 src/sys/kern/subr_autoconf.c:1.268 --- src/sys/kern/subr_autoconf.c:1.267 Tue Feb 25 19:14:05 2020 +++ src/sys/kern/subr_autoconf.c Tue Feb 25 19:34:37 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_autoconf.c,v 1.267 2020/02/25 19:14:05 jdolecek Exp $ */ +/* $NetBSD: subr_autoconf.c,v 1.268 2020/02/25 19:34:37 jdolecek Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -77,7 +77,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.267 2020/02/25 19:14:05 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.268 2020/02/25 19:34:37 jdolecek Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h"
CVS commit: [netbsd-9] src/sys/arch/i386/stand/efiboot
Module Name:src
Committed By: martin
Date: Tue Feb 25 19:25:19 UTC 2020
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-9]: eficons.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #723):
sys/arch/i386/stand/efiboot/eficons.c: revision 1.10
sys/arch/i386/stand/efiboot/eficons.c: revision 1.11
If the default GOP mode is unavailable, fallback to the first mode defined.
PR# port-amd64/55000
Remove check for bestmode==-1 (shouldn't happen)
To generate a diff of this commit:
cvs rdiff -u -r1.6.6.3 -r1.6.6.4 src/sys/arch/i386/stand/efiboot/eficons.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/i386/stand/efiboot/eficons.c
diff -u src/sys/arch/i386/stand/efiboot/eficons.c:1.6.6.3 src/sys/arch/i386/stand/efiboot/eficons.c:1.6.6.4
--- src/sys/arch/i386/stand/efiboot/eficons.c:1.6.6.3 Tue Feb 11 11:36:34 2020
+++ src/sys/arch/i386/stand/efiboot/eficons.c Tue Feb 25 19:25:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: eficons.c,v 1.6.6.3 2020/02/11 11:36:34 martin Exp $ */
+/* $NetBSD: eficons.c,v 1.6.6.4 2020/02/25 19:25:19 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -37,6 +37,7 @@
#ifndef DEFAULT_GOP_MODE
#define DEFAULT_GOP_MODE "1024x768"
#endif
+#define FALLBACK_GOP_MODE 0
extern struct x86_boot_params boot_params;
@@ -420,7 +421,7 @@ bi_framebuffer(void)
EFI_STATUS status;
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *info;
struct btinfo_framebuffer fb;
- INT32 bestmode = -1;
+ INT32 bestmode;
UINTN sz;
if (efi_gop == NULL)
@@ -431,9 +432,9 @@ bi_framebuffer(void)
} else {
/* If a mode has not been selected, choose a default */
bestmode = efi_find_gop_mode(DEFAULT_GOP_MODE);
+ if (bestmode == -1)
+ bestmode = FALLBACK_GOP_MODE;
}
- if (bestmode == -1)
- goto nofb;
status = uefi_call_wrapper(efi_gop->SetMode, 2, efi_gop,
bestmode);
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Tue Feb 25 19:22:18 UTC 2020 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1507, #1509, #1510 To generate a diff of this commit: cvs rdiff -u -r1.1.2.99 -r1.1.2.100 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.99 src/doc/CHANGES-8.2:1.1.2.100 --- src/doc/CHANGES-8.2:1.1.2.99 Thu Feb 20 14:32:21 2020 +++ src/doc/CHANGES-8.2 Tue Feb 25 19:22:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.99 2020/02/20 14:32:21 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.100 2020/02/25 19:22:18 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -2051,3 +2051,23 @@ sys/arch/hpcmips/hpcmips/hpcapm_machdep. Fix spelling in commments. [sevan, ticket #1506] +sys/arch/mips/adm5120/dev/ahci.c 1.21 +sys/dev/usb/ehci.c1.274 +sys/dev/usb/ohci.c1.296 +sys/dev/usb/uhci.c1.294 +sys/external/bsd/dwc2/dwc2.c 1.72 + + Fix a memory leak. + [skrll, ticket #1507] + +sys/kern/uipc_socket.c1.288 + + SO_RCVTIMEO: zero out the time value, to prevent uninitialized + bytes in its padding from leaking to userland. + [maxv, ticket #1509] + +sys/arch/arm/arm32/bus_dma.c 1.119,1.120 + + Make sure to convey a failure to the calling function. + [skrll, ticket #1510] +
CVS commit: [netbsd-8] src/sys/arch/arm/arm32
Module Name:src
Committed By: martin
Date: Tue Feb 25 19:20:43 UTC 2020
Modified Files:
src/sys/arch/arm/arm32 [netbsd-8]: bus_dma.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1510):
sys/arch/arm/arm32/bus_dma.c: revision 1.119
sys/arch/arm/arm32/bus_dma.c: revision 1.120
Make sure to convey a failure to the calling function
Likely fix for PR kern/54999, but that was a one-off panic.
-
Fix previous for non-_ARM32_NEED_BUS_DMA_BOUNCE builds
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.98.8.1 src/sys/arch/arm/arm32/bus_dma.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/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.98 src/sys/arch/arm/arm32/bus_dma.c:1.98.8.1
--- src/sys/arch/arm/arm32/bus_dma.c:1.98 Thu Jan 5 09:08:45 2017
+++ src/sys/arch/arm/arm32/bus_dma.c Tue Feb 25 19:20:43 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.98 2017/01/05 09:08:45 msaitoh Exp $ */
+/* $NetBSD: bus_dma.c,v 1.98.8.1 2020/02/25 19:20:43 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "opt_arm_bus_space.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.98 2017/01/05 09:08:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.98.8.1 2020/02/25 19:20:43 martin Exp $");
#include
#include
@@ -323,6 +323,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct arm32_bus_dmamap *map;
void *mapstore;
+ int error = 0;
#ifdef DEBUG_DMA
printf("dmamap_create: t=%p size=%lx nseg=%x msegsz=%lx boundary=%lx flags=%x\n",
@@ -365,7 +366,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
struct arm32_bus_dma_cookie *cookie;
int cookieflags;
void *cookiestore;
- int error;
cookieflags = 0;
@@ -412,7 +412,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
#ifdef DEBUG_DMA
printf("dmamap_create:map=%p\n", map);
#endif /* DEBUG_DMA */
- return (0);
+ return error;
}
/*
CVS commit: [netbsd-9] src/sys/arch/arm/arm32
Module Name:src
Committed By: martin
Date: Tue Feb 25 19:16:23 UTC 2020
Modified Files:
src/sys/arch/arm/arm32 [netbsd-9]: bus_dma.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #721):
sys/arch/arm/arm32/bus_dma.c: revision 1.119
sys/arch/arm/arm32/bus_dma.c: revision 1.120
Make sure to convey a failure to the calling function
Likely fix for PR kern/54999, but that was a one-off panic.
-
Fix previous for non-_ARM32_NEED_BUS_DMA_BOUNCE builds
To generate a diff of this commit:
cvs rdiff -u -r1.115.2.2 -r1.115.2.3 src/sys/arch/arm/arm32/bus_dma.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/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.115.2.2 src/sys/arch/arm/arm32/bus_dma.c:1.115.2.3
--- src/sys/arch/arm/arm32/bus_dma.c:1.115.2.2 Wed Nov 6 09:43:19 2019
+++ src/sys/arch/arm/arm32/bus_dma.c Tue Feb 25 19:16:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.115.2.2 2019/11/06 09:43:19 martin Exp $ */
+/* $NetBSD: bus_dma.c,v 1.115.2.3 2020/02/25 19:16:23 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.115.2.2 2019/11/06 09:43:19 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.115.2.3 2020/02/25 19:16:23 martin Exp $");
#include
#include
@@ -315,6 +315,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
{
struct arm32_bus_dmamap *map;
void *mapstore;
+ int error = 0;
#ifdef DEBUG_DMA
printf("dmamap_create: t=%p size=%lx nseg=%x msegsz=%lx boundary=%lx"
@@ -357,7 +358,6 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
struct arm32_bus_dma_cookie *cookie;
int cookieflags;
void *cookiestore;
- int error;
cookieflags = 0;
@@ -404,7 +404,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
#ifdef DEBUG_DMA
printf("dmamap_create:map=%p\n", map);
#endif /* DEBUG_DMA */
- return 0;
+ return error;
}
/*
CVS commit: src/sys/kern
Module Name:src
Committed By: jdolecek
Date: Tue Feb 25 19:14:05 UTC 2020
Modified Files:
src/sys/kern: subr_autoconf.c
Log Message:
fix use-after-free in config_interrupts_thread() found by KASAN, introduced
with addition of the locking; problem pointed out by kamil@
To generate a diff of this commit:
cvs rdiff -u -r1.266 -r1.267 src/sys/kern/subr_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.266 src/sys/kern/subr_autoconf.c:1.267
--- src/sys/kern/subr_autoconf.c:1.266 Thu Feb 20 21:14:23 2020
+++ src/sys/kern/subr_autoconf.c Tue Feb 25 19:14:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.266 2020/02/20 21:14:23 jdolecek Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.267 2020/02/25 19:14:05 jdolecek Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.266 2020/02/20 21:14:23 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.267 2020/02/25 19:14:05 jdolecek Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -442,21 +442,23 @@ static void
config_interrupts_thread(void *cookie)
{
struct deferred_config *dc;
+ device_t dev;
mutex_enter(_misc_lock);
while ((dc = TAILQ_FIRST(_config_queue)) != NULL) {
TAILQ_REMOVE(_config_queue, dc, dc_queue);
mutex_exit(_misc_lock);
- (*dc->dc_func)(dc->dc_dev);
- if (!device_pmf_is_registered(dc->dc_dev))
- aprint_debug_dev(dc->dc_dev,
+ dev = dc->dc_dev;
+ (*dc->dc_func)(dev);
+ if (!device_pmf_is_registered(dev))
+ aprint_debug_dev(dev,
"WARNING: power management not supported\n");
- config_pending_decr(dc->dc_dev);
+ config_pending_decr(dev);
kmem_free(dc, sizeof(*dc));
mutex_enter(_misc_lock);
- dc->dc_dev->dv_flags &= ~DVF_ATTACH_INPROGRESS;
+ dev->dv_flags &= ~DVF_ATTACH_INPROGRESS;
}
mutex_exit(_misc_lock);
CVS commit: [netbsd-8] src/sys/kern
Module Name:src Committed By: martin Date: Tue Feb 25 19:12:14 UTC 2020 Modified Files: src/sys/kern [netbsd-8]: uipc_socket.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1509): sys/kern/uipc_socket.c: revision 1.288 Zero out 'tv', to prevent uninitialized bytes in its padding from leaking to userland. Found by kMSan. To generate a diff of this commit: cvs rdiff -u -r1.255.2.4 -r1.255.2.5 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.255.2.4 src/sys/kern/uipc_socket.c:1.255.2.5 --- src/sys/kern/uipc_socket.c:1.255.2.4 Mon Nov 12 09:43:19 2018 +++ src/sys/kern/uipc_socket.c Tue Feb 25 19:12:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.255.2.4 2018/11/12 09:43:19 martin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.255.2.5 2020/02/25 19:12:14 martin Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.4 2018/11/12 09:43:19 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.255.2.5 2020/02/25 19:12:14 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -2015,6 +2015,7 @@ sogetopt1(struct socket *so, struct sock optval = (opt == SO_SNDTIMEO ? so->so_snd.sb_timeo : so->so_rcv.sb_timeo); + memset(, 0, sizeof(tv)); tv.tv_sec = optval / hz; tv.tv_usec = (optval % hz) * tick;
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Tue Feb 25 19:10:52 UTC 2020 Modified Files: src/sys/kern [netbsd-9]: uipc_socket.c Log Message: Pull up following revision(s) (requested by maxv in ticket #720): sys/kern/uipc_socket.c: revision 1.288 Zero out 'tv', to prevent uninitialized bytes in its padding from leaking to userland. Found by kMSan. To generate a diff of this commit: cvs rdiff -u -r1.281.2.1 -r1.281.2.2 src/sys/kern/uipc_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.281.2.1 src/sys/kern/uipc_socket.c:1.281.2.2 --- src/sys/kern/uipc_socket.c:1.281.2.1 Mon Oct 21 20:06:17 2019 +++ src/sys/kern/uipc_socket.c Tue Feb 25 19:10:51 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.281.2.1 2019/10/21 20:06:17 martin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.281.2.2 2020/02/25 19:10:51 martin Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281.2.1 2019/10/21 20:06:17 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.281.2.2 2020/02/25 19:10:51 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -1990,6 +1990,7 @@ sogetopt1(struct socket *so, struct sock optval = (opt == SO_SNDTIMEO ? so->so_snd.sb_timeo : so->so_rcv.sb_timeo); + memset(, 0, sizeof(tv)); tv.tv_sec = optval / hz; tv.tv_usec = (optval % hz) * tick;
CVS commit: [netbsd-9] src/sys/dev/sdmmc
Module Name:src
Committed By: martin
Date: Tue Feb 25 19:00:00 UTC 2020
Modified Files:
src/sys/dev/sdmmc [netbsd-9]: sdmmcdevs.h
Log Message:
Regen (for ticket #717)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/dev/sdmmc/sdmmcdevs.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/sdmmc/sdmmcdevs.h
diff -u src/sys/dev/sdmmc/sdmmcdevs.h:1.4 src/sys/dev/sdmmc/sdmmcdevs.h:1.4.4.1
--- src/sys/dev/sdmmc/sdmmcdevs.h:1.4 Sat Dec 29 04:59:33 2018
+++ src/sys/dev/sdmmc/sdmmcdevs.h Tue Feb 25 19:00:00 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: sdmmcdevs.h,v 1.4 2018/12/29 04:59:33 thorpej Exp $ */
+/* $NetBSD: sdmmcdevs.h,v 1.4.4.1 2020/02/25 19:00:00 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: sdmmcdevs,v 1.4 2018/12/29 04:58:52 thorpej Exp
+ * NetBSD: sdmmcdevs,v 1.4.4.1 2020/02/25 18:40:43 martin Exp
*/
/* $OpenBSD: sdmmcdevs,v 1.8 2007/05/11 17:16:16 mglocker Exp $ */
@@ -32,6 +32,7 @@
#define SDMMC_VENDOR_SOCKETCOM 0x0104 /* Socket Communications, Inc. */
#define SDMMC_VENDOR_REALTEK 0x024c /* Realtek */
#define SDMMC_VENDOR_ATHEROS 0x0271 /* Atheros */
+#define SDMMC_VENDOR_BROADCOM 0x02d0 /* Broadcom */
#define SDMMC_VENDOR_SYCHIP 0x02db /* SyChip Inc. */
#define SDMMC_VENDOR_SPECTEC 0x02fe /* Spectec Computer Co., Ltd */
#define SDMMC_VENDOR_MEDIATEK 0x037a /* MediaTek Inc. */
@@ -47,7 +48,7 @@
#define SDMMC_CIS_ABOCOM_SDW11G { NULL, NULL, NULL, NULL }
#define SDMMC_PRODUCT_ABOCOM_SDW11G 0xac02
-/* Atheros */
+/* Atheros */
#define SDMMC_CIS_ATHEROS_AR6001_8 { NULL, NULL, NULL, NULL }
#define SDMMC_PRODUCT_ATHEROS_AR6001_8 0x0108
#define SDMMC_CIS_ATHEROS_AR6001_9 { NULL, NULL, NULL, NULL }
@@ -57,6 +58,34 @@
#define SDMMC_CIS_ATHEROS_AR6001_b { NULL, NULL, NULL, NULL }
#define SDMMC_PRODUCT_ATHEROS_AR6001_b 0x010b
+/* Broadcom */
+#define SDMMC_CIS_BROADCOM_BCM4324 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4324 0x4324
+#define SDMMC_CIS_BROADCOM_BCM4329 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4329 0x4329
+#define SDMMC_CIS_BROADCOM_BCM4330 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4330 0x4330
+#define SDMMC_CIS_BROADCOM_BCM4334 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4334 0x4334
+#define SDMMC_CIS_BROADCOM_BCM4339 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4339 0x4339
+#define SDMMC_CIS_BROADCOM_BCM4345 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4345 0x4345
+#define SDMMC_CIS_BROADCOM_BCM4354 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM4354 0x4354
+#define SDMMC_CIS_BROADCOM_BCM43143 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM43143 0xa887
+#define SDMMC_CIS_BROADCOM_BCM43340 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM43340 0xa94c
+#define SDMMC_CIS_BROADCOM_BCM43341 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM43341 0xa94d
+#define SDMMC_CIS_BROADCOM_BCM43362 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM43362 0xa962
+#define SDMMC_CIS_BROADCOM_BCM43430 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM43430 0xa9a6
+#define SDMMC_CIS_BROADCOM_BCM43455 { NULL, NULL, NULL, NULL }
+#define SDMMC_PRODUCT_BROADCOM_BCM43455 0xa9bf
+
/* C-guys, Inc. */
#define SDMMC_CIS_CGUYS_TIACX100 { NULL, NULL, NULL, NULL }
#define SDMMC_PRODUCT_CGUYS_TIACX100 0x0001
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Tue Feb 25 18:52:44 UTC 2020
Modified Files:
src/sys/arch/mips/adm5120/dev [netbsd-8]: ahci.c
src/sys/dev/usb [netbsd-8]: ehci.c ohci.c uhci.c
src/sys/external/bsd/dwc2 [netbsd-8]: dwc2.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1507):
sys/dev/usb/ohci.c: revision 1.296
sys/dev/usb/uhci.c: revision 1.294
sys/external/bsd/dwc2/dwc2.c: revision 1.72
sys/arch/mips/adm5120/dev/ahci.c: revision 1.21
sys/dev/usb/ehci.c: revision 1.274
Fix a memory leak. Spotted by nat@
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.254.8.6 -r1.254.8.7 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.273.6.5 -r1.273.6.6 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.275.2.5 -r1.275.2.6 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.46.2.4 -r1.46.2.5 src/sys/external/bsd/dwc2/dwc2.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/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.14 src/sys/arch/mips/adm5120/dev/ahci.c:1.14.2.1
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.14 Thu Jun 1 02:45:06 2017
+++ src/sys/arch/mips/adm5120/dev/ahci.c Tue Feb 25 18:52:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.14 2017/06/01 02:45:06 chs Exp $ */
+/* $NetBSD: ahci.c,v 1.14.2.1 2020/02/25 18:52:44 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.14 2017/06/01 02:45:06 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.14.2.1 2020/02/25 18:52:44 martin Exp $");
#include
#include
@@ -922,6 +922,9 @@ ahci_device_ctrl_start(struct usbd_xfer
usb_transfer_complete(xfer);
mutex_exit(>sc_lock);
+
+ usb_freemem(>sc_bus, );
+
return USBD_NORMAL_COMPLETION;
}
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.254.8.6 src/sys/dev/usb/ehci.c:1.254.8.7
--- src/sys/dev/usb/ehci.c:1.254.8.6 Fri Sep 28 08:33:43 2018
+++ src/sys/dev/usb/ehci.c Tue Feb 25 18:52:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.254.8.6 2018/09/28 08:33:43 martin Exp $ */
+/* $NetBSD: ehci.c,v 1.254.8.7 2020/02/25 18:52:44 martin Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.6 2018/09/28 08:33:43 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.254.8.7 2020/02/25 18:52:44 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -3831,7 +3831,7 @@ Static void
ehci_device_ctrl_close(struct usbd_pipe *pipe)
{
ehci_softc_t *sc = EHCI_PIPE2SC(pipe);
- /*struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);*/
+ struct ehci_pipe * const epipe = EHCI_PIPE2EPIPE(pipe);
EHCIHIST_FUNC(); EHCIHIST_CALLED();
@@ -3840,6 +3840,8 @@ ehci_device_ctrl_close(struct usbd_pipe
DPRINTF("pipe=%#jx", (uintptr_t)pipe, 0, 0, 0);
ehci_close_pipe(pipe, sc->sc_async_head);
+
+ usb_freemem(>sc_bus, >ctrl.reqdma);
}
/*
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.273.6.5 src/sys/dev/usb/ohci.c:1.273.6.6
--- src/sys/dev/usb/ohci.c:1.273.6.5 Mon Aug 12 17:19:02 2019
+++ src/sys/dev/usb/ohci.c Tue Feb 25 18:52:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.273.6.5 2019/08/12 17:19:02 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.273.6.6 2020/02/25 18:52:44 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.5 2019/08/12 17:19:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.6 2020/02/25 18:52:44 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2929,6 +2929,8 @@ ohci_device_ctrl_close(struct usbd_pipe
DPRINTF("pipe=%#jx", (uintptr_t)pipe, 0, 0, 0);
ohci_close_pipe(pipe, sc->sc_ctrl_head);
ohci_free_std_locked(sc, opipe->tail.td);
+
+ usb_freemem(>sc_bus, >ctrl.reqdma);
}
//
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.275.2.5 src/sys/dev/usb/uhci.c:1.275.2.6
--- src/sys/dev/usb/uhci.c:1.275.2.5 Thu Sep 27 14:52:26 2018
+++ src/sys/dev/usb/uhci.c Tue Feb 25 18:52:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.275.2.5 2018/09/27 14:52:26 martin Exp $ */
+/* $NetBSD: uhci.c,v 1.275.2.6 2020/02/25 18:52:44 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.275.2.5 2018/09/27 14:52:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.275.2.6 2020/02/25 18:52:44 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2845,6 +2845,7 @@ uhci_device_ctrl_close(struct usbd_pipe
uhci_free_std_locked(sc, upipe->ctrl.setup);
uhci_free_std_locked(sc, upipe->ctrl.stat);
+
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Tue Feb 25 18:50:29 UTC 2020
Modified Files:
src/sys/arch/mips/adm5120/dev [netbsd-9]: ahci.c
src/sys/dev/usb [netbsd-9]: ehci.c ohci.c uhci.c
src/sys/external/bsd/dwc2 [netbsd-9]: dwc2.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #718):
sys/dev/usb/ohci.c: revision 1.296
sys/dev/usb/uhci.c: revision 1.294
sys/external/bsd/dwc2/dwc2.c: revision 1.72
sys/arch/mips/adm5120/dev/ahci.c: revision 1.21
sys/dev/usb/ehci.c: revision 1.274
Fix a memory leak. Spotted by nat@
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.4.1 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.267.2.1 -r1.267.2.2 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.289.4.3 -r1.289.4.4 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.288 -r1.288.4.1 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.59.4.1 -r1.59.4.2 src/sys/external/bsd/dwc2/dwc2.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/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.17 src/sys/arch/mips/adm5120/dev/ahci.c:1.17.4.1
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.17 Sun Feb 17 04:17:52 2019
+++ src/sys/arch/mips/adm5120/dev/ahci.c Tue Feb 25 18:50:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.17 2019/02/17 04:17:52 rin Exp $ */
+/* $NetBSD: ahci.c,v 1.17.4.1 2020/02/25 18:50:29 martin Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.17 2019/02/17 04:17:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.17.4.1 2020/02/25 18:50:29 martin Exp $");
#include
#include
@@ -912,6 +912,9 @@ ahci_device_ctrl_start(struct usbd_xfer
usb_transfer_complete(xfer);
mutex_exit(>sc_lock);
+
+ usb_freemem(>sc_bus, );
+
return USBD_NORMAL_COMPLETION;
}
Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.267.2.1 src/sys/dev/usb/ehci.c:1.267.2.2
--- src/sys/dev/usb/ehci.c:1.267.2.1 Mon Feb 10 18:50:29 2020
+++ src/sys/dev/usb/ehci.c Tue Feb 25 18:50:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.267.2.1 2020/02/10 18:50:29 martin Exp $ */
+/* $NetBSD: ehci.c,v 1.267.2.2 2020/02/25 18:50:29 martin Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.267.2.1 2020/02/10 18:50:29 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.267.2.2 2020/02/25 18:50:29 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -3813,7 +3813,7 @@ Static void
ehci_device_ctrl_close(struct usbd_pipe *pipe)
{
ehci_softc_t *sc = EHCI_PIPE2SC(pipe);
- /*struct ehci_pipe *epipe = EHCI_PIPE2EPIPE(pipe);*/
+ struct ehci_pipe * const epipe = EHCI_PIPE2EPIPE(pipe);
EHCIHIST_FUNC(); EHCIHIST_CALLED();
@@ -3822,6 +3822,8 @@ ehci_device_ctrl_close(struct usbd_pipe
DPRINTF("pipe=%#jx", (uintptr_t)pipe, 0, 0, 0);
ehci_close_pipe(pipe, sc->sc_async_head);
+
+ usb_freemem(>sc_bus, >ctrl.reqdma);
}
/*
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.289.4.3 src/sys/dev/usb/ohci.c:1.289.4.4
--- src/sys/dev/usb/ohci.c:1.289.4.3 Sat Dec 14 12:35:58 2019
+++ src/sys/dev/usb/ohci.c Tue Feb 25 18:50:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.289.4.3 2019/12/14 12:35:58 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.289.4.4 2020/02/25 18:50:29 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.3 2019/12/14 12:35:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.4 2020/02/25 18:50:29 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2915,6 +2915,8 @@ ohci_device_ctrl_close(struct usbd_pipe
DPRINTF("pipe=%#jx", (uintptr_t)pipe, 0, 0, 0);
ohci_close_pipe(pipe, sc->sc_ctrl_head);
ohci_free_std_locked(sc, opipe->tail.td);
+
+ usb_freemem(>sc_bus, >ctrl.reqdma);
}
//
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.288 src/sys/dev/usb/uhci.c:1.288.4.1
--- src/sys/dev/usb/uhci.c:1.288 Sun Feb 17 04:17:52 2019
+++ src/sys/dev/usb/uhci.c Tue Feb 25 18:50:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.288 2019/02/17 04:17:52 rin Exp $ */
+/* $NetBSD: uhci.c,v 1.288.4.1 2020/02/25 18:50:29 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.288 2019/02/17 04:17:52 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.288.4.1 2020/02/25 18:50:29 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2848,6 +2848,7 @@ uhci_device_ctrl_close(struct usbd_pipe
uhci_free_std_locked(sc, upipe->ctrl.setup);
uhci_free_std_locked(sc, upipe->ctrl.stat);
+ usb_freemem(>sc_bus, >ctrl.reqdma);
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Tue Feb 25 18:40:44 UTC 2020 Modified Files: src/sys/dev/fdt [netbsd-9]: dwcmmc_fdt.c src/sys/dev/ic [netbsd-9]: bwfm.c bwfmreg.h bwfmvar.h dwc_mmc.c dwc_mmc_reg.h dwc_mmc_var.h src/sys/dev/pcmcia [netbsd-9]: pcmciareg.h src/sys/dev/sdmmc [netbsd-9]: if_bwfm_sdio.c sdhc.c sdmmc.c sdmmc_cis.c sdmmc_io.c sdmmc_ioreg.h sdmmc_mem.c sdmmcdevs sdmmcvar.h src/sys/net [netbsd-9]: if_media.h Added Files: src/sys/dev/sdmmc [netbsd-9]: if_bwfm_sdio.h Log Message: Pull up following revision(s) (requested by mrg in ticket #717): sys/dev/fdt/dwcmmc_fdt.c1.11 sys/dev/ic/bwfm.c 1.15-1.18 sys/dev/ic/bwfmreg.h1.4-1.6 sys/dev/ic/bwfmvar.h1.4,1.5 sys/dev/ic/dwc_mmc.c1.21,1.22 sys/dev/ic/dwc_mmc_reg.h1.8,1.9,1.12,1.13 sys/dev/pcmcia/pcmciareg.h 1.11 sys/dev/sdmmc/if_bwfm_sdio.c1.4,1.6-1.12 sys/dev/sdmmc/if_bwfm_sdio.h1.1,1.2 sys/dev/sdmmc/sdhc.c1.105,1.106 sys/dev/sdmmc/sdmmc.c 1.37,1.39 sys/dev/sdmmc/sdmmc_cis.c 1.6,1.8 sys/dev/sdmmc/sdmmc_io.c1.15-1.19 sys/dev/sdmmc/sdmmc_ioreg.h 1.4,1.5 sys/dev/sdmmc/sdmmc_mem.c 1.69-1.71 sys/dev/sdmmc/sdmmcdevs 1.5-1.8 sys/dev/sdmmc/sdmmcvar.h1.31,1.33,1.34 sys/net/if_media.h 1.66 Add Broadcom devices - Fix typo - add PCMCIA_CISTPL_SDIO definition. - >From OpenBSD: - move event handling to workqueue - check for save/restore capability - Tag work queue as MPsafe and increase length. - Juse use bpf_mtap(), the 802.11 encapsulation is handled by firmware. - >From OpenBSD: - support block length per function - add functions to read/write regions - Decode (but not use) SDIO tuple in CIS. - Fix locking. - Add more SDIO defines (partially from version 3.0). - >From OpenBSD: - All the missing pieces (firmware load, chip setup, protocol handling) TX queue and interrupt handling via sdmmc_task. - Fix locking. - Fix packet parsing. - Add parser for original firmware config files. - tagging work queue as MPSAFE was premature. Revert. - SD_IO_RW_EXTENDED is a data transfer command, so set ADTC flag instead of AC Use correct function to verify if a task has been queued. Avoids race that can corrupt the task queue. - More register definitions. - Add IFM_IEEE80211_VHT subtype, IFM_IEEE80211_11AC operating mode, and missing descriptions - If firmware is connected in HT or VHT mode, report it to SIOCGIFMEDIA - white space police. Skip setting power when the voltage doesn't change. Also increase some timeouts. - Add and use sdmmc_pause to avoid long-term busy waits. - Add sdio abort function. - Additional error messages. - Print parameters for SDIO devices. - Minor cosmetics. - Simplyfy sdmmc_io_set_blocklen function signature by dropping the extra softc pointer. Aligns with OpenBSD. - Missing commit for sdio abort function. - More code from OpenBSD - no need to splnet() when enqueing packets - explicit structure padding - make internal functions static - also prepare for GPIO interrupts. - Avoid warnings for tautological shifts as sole conditional. - Follow the Linux driver an use the FDT "compatible" property to build a filename for the nvram config file, fall back to the standard filename. E.g. [Caching 123 nodes and 1093 properties] compatible 73696e6f 766f6970 2c627069 2d6d322d "sinovoip,bpi-m2- 0010: 7a65726f 00.. zero" 0015: 616c6c77 696e6e65 722c7375 6e38692d "allwinner,sun8i- 0025: 68322d70 6c757300 h2-plus" interrupt-parent0001 model 42616e61 6e612050 69204250 492d4d32 "Banana Pi BPI-M2 0010: 2d5a6572 6f00 -Zero" name00.. "" serial-number 30326330 30303432 65636431 36376566 02c00042ecd167ef 0010: 00.. . -rw-r--r-- 1 root wheel 875 Nov 2 12:06 brcmfmac43430-sdio.AP6212.txt lrwxr-xr-x 1 root wheel 29 Dec 30 16:19 brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt -> brcmfmac43430-sdio.AP6212.txt -rw-r--r-- 1 root wheel 874 Jun 30 2019 brcmfmac43430-sdio.raspberrypi,3-model-b.txt -rw-r--r-- 1 root wheel1864 Jun 30 2019 brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt lrwxr-xr-x 1 root wheel 29
CVS commit: src/sys/dev/pckbport
Module Name:src Committed By: ryoon Date: Tue Feb 25 16:24:47 UTC 2020 Modified Files: src/sys/dev/pckbport: synaptics.c Log Message: Remove a trailing tab. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pckbport/synaptics.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/pckbport/synaptics.c diff -u src/sys/dev/pckbport/synaptics.c:1.50 src/sys/dev/pckbport/synaptics.c:1.51 --- src/sys/dev/pckbport/synaptics.c:1.50 Fri Jul 5 05:09:24 2019 +++ src/sys/dev/pckbport/synaptics.c Tue Feb 25 16:24:47 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: synaptics.c,v 1.50 2019/07/05 05:09:24 mlelstv Exp $ */ +/* $NetBSD: synaptics.c,v 1.51 2020/02/25 16:24:47 ryoon Exp $ */ /* * Copyright (c) 2005, Steve C. Woodford @@ -48,7 +48,7 @@ #include "opt_pms.h" #include -__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.50 2019/07/05 05:09:24 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.51 2020/02/25 16:24:47 ryoon Exp $"); #include #include @@ -956,7 +956,7 @@ pms_synaptics_parse(struct pms_softc *ps case SYNAPTICS_EW_SECONDARY_FINGER: /* parse the second finger report */ - + sp.sp_finger = 1; /* just one other finger for now */ sp.sp_x = psc->packet[1] + ((psc->packet[4] & 0x0f) << 8);
CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Tue Feb 25 11:36:48 UTC 2020 Modified Files: src/share/man/man4: uftdi.4 Log Message: Add one more: Buffalo BSUSRC06. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/share/man/man4/uftdi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/uftdi.4 diff -u src/share/man/man4/uftdi.4:1.21 src/share/man/man4/uftdi.4:1.22 --- src/share/man/man4/uftdi.4:1.21 Tue Feb 25 11:32:09 2020 +++ src/share/man/man4/uftdi.4 Tue Feb 25 11:36:48 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: uftdi.4,v 1.21 2020/02/25 11:32:09 rin Exp $ +.\" $NetBSD: uftdi.4,v 1.22 2020/02/25 11:36:48 rin Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -55,6 +55,7 @@ driver supports the following adapters: .Pp .Bl -tag -width Dv -offset indent -compact .It Tn B Electronics uLinks RS-422/485 +.It Tn Buffalo BSUSRC06 .It Tn CableCreation CD0487 .It Tn Coastal ChipWorks TNC-X .It Tn Crystalfontz CFA-631 LCD
CVS commit: src/share/man/man4
Module Name:src Committed By: rin Date: Tue Feb 25 11:32:09 UTC 2020 Modified Files: src/share/man/man4: uftdi.4 Log Message: Add CableCreation CD0487 to supported adapter list. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/share/man/man4/uftdi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/uftdi.4 diff -u src/share/man/man4/uftdi.4:1.20 src/share/man/man4/uftdi.4:1.21 --- src/share/man/man4/uftdi.4:1.20 Mon Jul 3 21:30:58 2017 +++ src/share/man/man4/uftdi.4 Tue Feb 25 11:32:09 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: uftdi.4,v 1.20 2017/07/03 21:30:58 wiz Exp $ +.\" $NetBSD: uftdi.4,v 1.21 2020/02/25 11:32:09 rin Exp $ .\" .\" Copyright (c) 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 30, 2017 +.Dd February 25, 2020 .Dt UFTDI 4 .Os .Sh NAME @@ -55,6 +55,7 @@ driver supports the following adapters: .Pp .Bl -tag -width Dv -offset indent -compact .It Tn B Electronics uLinks RS-422/485 +.It Tn CableCreation CD0487 .It Tn Coastal ChipWorks TNC-X .It Tn Crystalfontz CFA-631 LCD .It Tn Crystalfontz CFA-632 LCD
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: nakayama
Date: Tue Feb 25 10:27:01 UTC 2020
Modified Files:
src/usr.sbin/postinstall: postinstall.in
Log Message:
Fix the fixup script to follow the URL change in /etc/motd (http->https).
PR install/54990, pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.14 src/usr.sbin/postinstall/postinstall.in:1.15
--- src/usr.sbin/postinstall/postinstall.in:1.14 Thu Jan 30 13:54:05 2020
+++ src/usr.sbin/postinstall/postinstall.in Tue Feb 25 10:27:01 2020
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.14 2020/01/30 13:54:05 christos Exp $
+# $NetBSD: postinstall.in,v 1.15 2020/02/25 10:27:01 nakayama Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1271,7 +1271,7 @@ do_motd()
if ${GREP} -i 'http://www.NetBSD.org/Misc/send-pr.html' \
"${DEST_DIR}/etc/motd" >/dev/null 2>&1 \
- || ${GREP} -i 'http://www.NetBSD.org/support/send-pr.html' \
+ || ${GREP} -i 'https*://www.NetBSD.org/support/send-pr.html' \
"${DEST_DIR}/etc/motd" >/dev/null 2>&1
then
tmp1="$(mktemp /tmp/postinstall.motd.)"
CVS commit: src/external/bsd/libarchive/dist/libarchive
Module Name:src
Committed By: kamil
Date: Tue Feb 25 09:01:25 UTC 2020
Modified Files:
src/external/bsd/libarchive/dist/libarchive: archive_read.c
Log Message:
Avoid NULL pointer arithmetic
Cherry-pick upstream patch:
>From ec5b86b48e99c5501374b01606f1ccdae6a8a93e Mon Sep 17 00:00:00 2001
From: Kamil Rytarowski
Date: Mon, 24 Feb 2020 22:58:00 +0100
Subject: [PATCH] archive_read.c: silence UBSan warning about undefined
behavior
Fixes #1335
https://github.com/libarchive/libarchive/commit/ec5b86b48e99c5501374b01606f1ccdae6a8a93e.patch
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/bsd/libarchive/dist/libarchive/archive_read.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/dist/libarchive/archive_read.c
diff -u src/external/bsd/libarchive/dist/libarchive/archive_read.c:1.1.1.4 src/external/bsd/libarchive/dist/libarchive/archive_read.c:1.2
--- src/external/bsd/libarchive/dist/libarchive/archive_read.c:1.1.1.4 Wed Jul 24 13:50:24 2019
+++ src/external/bsd/libarchive/dist/libarchive/archive_read.c Tue Feb 25 09:01:25 2020
@@ -891,15 +891,16 @@ archive_read_data(struct archive *_a, vo
len = a->read_data_remaining;
if (len > s)
len = s;
- if (len)
+ if (len) {
memcpy(dest, a->read_data_block, len);
- s -= len;
- a->read_data_block += len;
- a->read_data_remaining -= len;
- a->read_data_output_offset += len;
- a->read_data_offset += len;
- dest += len;
- bytes_read += len;
+s -= len;
+a->read_data_block += len;
+a->read_data_remaining -= len;
+a->read_data_output_offset += len;
+a->read_data_offset += len;
+dest += len;
+bytes_read += len;
+ }
}
}
a->read_data_is_posix_read = 0;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: yamaguchi Date: Tue Feb 25 08:05:24 UTC 2020 Modified Files: src/sys/dev/pci: if_ixl.c Log Message: Add a comment about RSS and remove a wrong comment pointed out and reviewed by knakahara@n.o., thanks To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_ixl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_ixl.c diff -u src/sys/dev/pci/if_ixl.c:1.55 src/sys/dev/pci/if_ixl.c:1.56 --- src/sys/dev/pci/if_ixl.c:1.55 Tue Feb 25 08:02:29 2020 +++ src/sys/dev/pci/if_ixl.c Tue Feb 25 08:05:24 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_ixl.c,v 1.55 2020/02/25 08:02:29 yamaguchi Exp $ */ +/* $NetBSD: if_ixl.c,v 1.56 2020/02/25 08:05:24 yamaguchi Exp $ */ /* * Copyright (c) 2013-2015, Intel Corporation @@ -74,7 +74,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.55 2020/02/25 08:02:29 yamaguchi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.56 2020/02/25 08:05:24 yamaguchi Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -4805,6 +4805,11 @@ ixl_register_rss_pctype(struct ixl_softc uint64_t set_hena = 0; uint32_t hena0, hena1; + /* + * We use TCP/UDP with IPv4/IPv6 by default. + * Note: the device can not use just IP header in each + * TCP/UDP packets for the RSS hash calculation. + */ if (sc->sc_mac_type == I40E_MAC_X722) set_hena = IXL_RSS_HENA_DEFAULT_X722; else @@ -5713,7 +5718,6 @@ ixl_set_link_status(struct ixl_softc *sc baudrate = ixl_search_link_speed(status->link_speed); done: - /* NET_ASSERT_LOCKED() except during attach */ sc->sc_media_active = ifm_active; sc->sc_media_status = ifm_status;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: yamaguchi
Date: Tue Feb 25 08:02:29 UTC 2020
Modified Files:
src/sys/dev/pci: if_ixl.c
Log Message:
Use IFM_25G_ACC
pointed out and reviewed by msaitoh@n.o., thanks
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/if_ixl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_ixl.c
diff -u src/sys/dev/pci/if_ixl.c:1.54 src/sys/dev/pci/if_ixl.c:1.55
--- src/sys/dev/pci/if_ixl.c:1.54 Tue Feb 25 07:58:44 2020
+++ src/sys/dev/pci/if_ixl.c Tue Feb 25 08:02:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ixl.c,v 1.54 2020/02/25 07:58:44 yamaguchi Exp $ */
+/* $NetBSD: if_ixl.c,v 1.55 2020/02/25 08:02:29 yamaguchi Exp $ */
/*
* Copyright (c) 2013-2015, Intel Corporation
@@ -74,7 +74,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.54 2020/02/25 07:58:44 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ixl.c,v 1.55 2020/02/25 08:02:29 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -934,7 +934,7 @@ static const struct ixl_phy_type ixl_phy
{ 1ULL << IXL_PHY_TYPE_25GBASE_SR, IFM_25G_SR },
{ 1ULL << IXL_PHY_TYPE_25GBASE_LR, IFM_25G_LR },
{ 1ULL << IXL_PHY_TYPE_25GBASE_AOC, IFM_25G_AOC },
- { 1ULL << IXL_PHY_TYPE_25GBASE_ACC, IFM_25G_CR },
+ { 1ULL << IXL_PHY_TYPE_25GBASE_ACC, IFM_25G_ACC },
};
static const struct ixl_speed_type ixl_speed_type_map[] = {
