CVS commit: src/sys/arch/sh3/include
Module Name:src Committed By: uwe Date: Sat Jul 11 03:53:32 UTC 2020 Modified Files: src/sys/arch/sh3/include: clock.h Log Message: Fix doc comment for sh_clock_init. Forgot to update it back in 2006 when sh3 ports were converted to todr(9) and its second argument (struct rtc_ops) was removed. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sh3/include/clock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sh3/include
Module Name:src Committed By: uwe Date: Sat Jul 11 03:53:32 UTC 2020 Modified Files: src/sys/arch/sh3/include: clock.h Log Message: Fix doc comment for sh_clock_init. Forgot to update it back in 2006 when sh3 ports were converted to todr(9) and its second argument (struct rtc_ops) was removed. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/sh3/include/clock.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/sh3/include/clock.h diff -u src/sys/arch/sh3/include/clock.h:1.4 src/sys/arch/sh3/include/clock.h:1.5 --- src/sys/arch/sh3/include/clock.h:1.4 Mon Apr 28 20:23:35 2008 +++ src/sys/arch/sh3/include/clock.h Sat Jul 11 03:53:32 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.h,v 1.4 2008/04/28 20:23:35 martin Exp $ */ +/* $NetBSD: clock.h,v 1.5 2020/07/11 03:53:32 uwe Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,14 +30,11 @@ */ /* - * void sh_clock_init(int flags, struct rtc_ops *): + * void sh_clock_init(int flags): * flags: * SH_CLOCK_NORTC ... If SH RTC module is disabled, set this. *internal module don't use RTCCLK. * SH_CLOCK_NOINITTODR ... Don't initialize RTC time. - * rtc_ops: - * Machine dependent RTC ops pointer. If NULL is specified, use SH - * internal RTC. * * void machine_clock_init(void): * Implement machine specific part of clock routines.
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: lukem
Date: Sat Jul 11 02:19:32 UTC 2020
Modified Files:
src/usr.bin/ftp: ftp.c version.h
Log Message:
ftp.c: improve signal handler restoration
Only invoke the old signal handler if it's a real signal handler
and not SIG_IGN, SIG_DFL, SIG_HOLD, or SIG_ERR, using new static
function issighandler().
Avoids an intermittent race condition with a null pointer
dereference via (*SIG_DFL)().
Bug class reported by Joyu Liao from Juniper Networks.
Use SIG_ERR instead of NULL as the indicator that a signal handler
hasn't been changed, so that SIG_DFL (equivalent to NULL)
will be restored.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/usr.bin/ftp/ftp.c
cvs rdiff -u -r1.89 -r1.90 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/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.169 src/usr.bin/ftp/ftp.c:1.170
--- src/usr.bin/ftp/ftp.c:1.169 Mon Jun 8 01:33:27 2020
+++ src/usr.bin/ftp/ftp.c Sat Jul 11 02:19:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.169 2020/06/08 01:33:27 lukem Exp $ */
+/* $NetBSD: ftp.c,v 1.170 2020/07/11 02:19:31 lukem Exp $ */
/*-
* Copyright (c) 1996-2020 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
#if 0
static char sccsid[] = "@(#)ftp.c 8.6 (Berkeley) 10/27/94";
#else
-__RCSID("$NetBSD: ftp.c,v 1.169 2020/06/08 01:33:27 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.170 2020/07/11 02:19:31 lukem Exp $");
#endif
#endif /* not lint */
@@ -320,6 +320,17 @@ cmdtimeout(int notused)
errno = oerrno;
}
+static int
+issighandler(sigfunc func)
+{
+ return (func != SIG_IGN &&
+ func != SIG_DFL &&
+#ifdef SIG_HOLD
+ func != SIG_HOLD &&
+#endif
+ func != SIG_ERR);
+}
+
/*VARARGS*/
int
command(const char *fmt, ...)
@@ -359,8 +370,9 @@ command(const char *fmt, ...)
(void)fflush(cout);
cpend = 1;
r = getreply(!strcmp(fmt, "QUIT"));
- if (abrtflag && oldsigint != SIG_IGN)
+ if (abrtflag && issighandler(oldsigint)) {
(*oldsigint)(SIGINT);
+ }
(void)xsignal(SIGINT, oldsigint);
return (r);
}
@@ -510,11 +522,14 @@ getreply(int expecteof)
(void)xsignal(SIGALRM, oldsigalrm);
if (code == 421 || originalcode == 421)
lostpeer(0);
- if (abrtflag && oldsigint != cmdabort && oldsigint != SIG_IGN)
+ if (abrtflag && oldsigint != cmdabort &&
+ issighandler(oldsigint)) {
(*oldsigint)(SIGINT);
+ }
if (timeoutflag && oldsigalrm != cmdtimeout &&
- oldsigalrm != SIG_IGN)
+ issighandler(oldsigalrm)) {
(*oldsigalrm)(SIGINT);
+ }
return (n - '0');
}
}
@@ -670,7 +685,7 @@ sendrequest(const char *cmd, const char
FILE *volatile dout;
int (*volatile closefunc)(FILE *);
sigfunc volatile oldintr;
- sigfunc volatile oldintp;
+ sigfunc volatile oldpipe;
off_t volatile hashbytes;
int hash_interval;
const char *lmode;
@@ -697,8 +712,8 @@ sendrequest(const char *cmd, const char
if (curtype != type)
changetype(type, 0);
closefunc = NULL;
- oldintr = NULL;
- oldintp = NULL;
+ oldintr = SIG_ERR;
+ oldpipe = SIG_ERR;
lmode = "w";
if (sigsetjmp(xferabort, 1)) {
while (cpend)
@@ -712,7 +727,7 @@ sendrequest(const char *cmd, const char
fin = stdin;
progress = 0;
} else if (*local == '|') {
- oldintp = xsignal(SIGPIPE, SIG_IGN);
+ oldpipe = xsignal(SIGPIPE, SIG_IGN);
fin = popen(local + 1, "r");
if (fin == NULL) {
warn("Can't execute `%s'", local + 1);
@@ -786,7 +801,9 @@ sendrequest(const char *cmd, const char
}
progressmeter(-1);
- oldintp = xsignal(SIGPIPE, SIG_IGN);
+ if (oldpipe == SIG_ERR) {
+ oldpipe = xsignal(SIGPIPE, SIG_IGN);
+ }
hash_interval = (hash && (!progress || filesize < 0)) ? mark : 0;
switch (curtype) {
@@ -855,7 +872,7 @@ sendrequest(const char *cmd, const char
abort:
(void)xsignal(SIGINT, oldintr);
- oldintr = NULL;
+ oldintr = SIG_ERR;
if (!cpend) {
code = -1;
goto cleanupsend;
@@ -874,10 +891,10 @@ sendrequest(const char *cmd, const char
ptransfer(0);
cleanupsend:
- if (oldintr)
+ if (oldintr != SIG_ERR)
(void)xsignal(SIGINT, oldintr);
- if (oldintp)
- (void)xsignal(SIGPIPE, oldintp);
+ if (oldpipe != SIG_ERR)
+ (void)xsignal(SIGPIPE, oldpipe);
if (data >= 0) {
(void)close(data);
data = -1;
@@ -899,7 +916,7 @@ recvrequest(const char *cmd, const char
FILE *volatile din;
int (*volatile closefunc)(FILE *);
sigfunc volatile oldintr;
- sigfunc volatile oldintp;
+ sigfunc volatile oldpipe;
int c, d;
int volatile is_retr;
int volatile tcrflag;
@@ -935,8 +952,8 @@ recvrequest(const char *cmd, const char
return;
}
closefunc = NULL;
- oldintr = NULL;
- oldintp = NULL;
+ oldintr = SIG_ERR;
+ oldpipe = SIG_ERR;
tcrflag = !crflag && is_retr;
if (sigsetjmp(xferabort, 1)) {
while (cpend)
@@ -1017,7 +1034,7 @@ recvrequest(const char *cmd, const char
progress = 0;
preserve = 0;
} else if (!ignorespecial && *local == '|') {
-
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sat Jul 11 02:19:32 UTC 2020 Modified Files: src/usr.bin/ftp: ftp.c version.h Log Message: ftp.c: improve signal handler restoration Only invoke the old signal handler if it's a real signal handler and not SIG_IGN, SIG_DFL, SIG_HOLD, or SIG_ERR, using new static function issighandler(). Avoids an intermittent race condition with a null pointer dereference via (*SIG_DFL)(). Bug class reported by Joyu Liao from Juniper Networks. Use SIG_ERR instead of NULL as the indicator that a signal handler hasn't been changed, so that SIG_DFL (equivalent to NULL) will be restored. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/usr.bin/ftp/ftp.c cvs rdiff -u -r1.89 -r1.90 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.
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Sat Jul 11 00:39:53 UTC 2020 Modified Files: src/usr.bin/make: meta.c Log Message: meta_oodate: if target is explicitly .META missing is oodate If a .meta file is missing for a target marked .META it is out-of-date To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/usr.bin/make/meta.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Sat Jul 11 00:39:53 UTC 2020
Modified Files:
src/usr.bin/make: meta.c
Log Message:
meta_oodate: if target is explicitly .META missing is oodate
If a .meta file is missing for a target marked .META
it is out-of-date
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/usr.bin/make/meta.c
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/make/meta.c
diff -u src/usr.bin/make/meta.c:1.85 src/usr.bin/make/meta.c:1.86
--- src/usr.bin/make/meta.c:1.85 Fri Jul 3 08:13:23 2020
+++ src/usr.bin/make/meta.c Sat Jul 11 00:39:53 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: meta.c,v 1.85 2020/07/03 08:13:23 rillig Exp $ */
+/* $NetBSD: meta.c,v 1.86 2020/07/11 00:39:53 sjg Exp $ */
/*
* Implement 'meta' mode.
@@ -1606,7 +1606,7 @@ meta_oodate(GNode *gn, Boolean oodate)
oodate = TRUE;
}
} else {
- if (writeMeta && metaMissing) {
+ if (writeMeta && (metaMissing || (gn->type & OP_META))) {
cp = NULL;
/* if target is in .CURDIR we do not need a meta file */
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: lukem
Date: Sat Jul 11 00:29:38 UTC 2020
Modified Files:
src/usr.bin/ftp: fetch.c
Log Message:
fetch_url: improve signal handler restoration
Use SIG_ERR not NULL as the indicator that a signal handler
hasn't been changed, so that SIG_DFL (equivalent to NULL)
will be restored.
Fix restoration of SIGQUIT; use the old handler not SIGPIPE's.
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/usr.bin/ftp/fetch.c
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/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.231 src/usr.bin/ftp/fetch.c:1.232
--- src/usr.bin/ftp/fetch.c:1.231 Thu Apr 4 00:36:09 2019
+++ src/usr.bin/ftp/fetch.c Sat Jul 11 00:29:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.231 2019/04/04 00:36:09 christos Exp $ */
+/* $NetBSD: fetch.c,v 1.232 2020/07/11 00:29:38 lukem Exp $ */
/*-
* Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.231 2019/04/04 00:36:09 christos Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.232 2020/07/11 00:29:38 lukem Exp $");
#endif /* not lint */
/*
@@ -1295,7 +1295,7 @@ fetch_url(const char *url, const char *p
DPRINTF("%s: `%s' proxyenv `%s'\n", __func__, url, STRorNULL(penv));
- oldquit = oldalrm = oldint = oldpipe = NULL;
+ oldquit = oldalrm = oldint = oldpipe = SIG_ERR;
closefunc = NULL;
fin = NULL;
fout = NULL;
@@ -1572,9 +1572,9 @@ fetch_url(const char *url, const char *p
bytes = 0;
hashbytes = mark;
- if (oldalrm) {
+ if (oldalrm != SIG_ERR) {
(void)xsignal(SIGALRM, oldalrm);
- oldalrm = NULL;
+ oldalrm = SIG_ERR;
}
progressmeter(-1);
@@ -1736,14 +1736,14 @@ chunkerror:
warnx("Improper response from `%s:%s'", ui.host, ui.port);
cleanup_fetch_url:
- if (oldint)
+ if (oldint != SIG_ERR)
(void)xsignal(SIGINT, oldint);
- if (oldpipe)
+ if (oldpipe != SIG_ERR)
(void)xsignal(SIGPIPE, oldpipe);
- if (oldalrm)
+ if (oldalrm != SIG_ERR)
(void)xsignal(SIGALRM, oldalrm);
- if (oldquit)
- (void)xsignal(SIGQUIT, oldpipe);
+ if (oldquit != SIG_ERR)
+ (void)xsignal(SIGQUIT, oldquit);
if (fin != NULL)
fetch_close(fin);
else if (s != -1)
CVS commit: src/usr.bin/ftp
Module Name:src Committed By: lukem Date: Sat Jul 11 00:29:38 UTC 2020 Modified Files: src/usr.bin/ftp: fetch.c Log Message: fetch_url: improve signal handler restoration Use SIG_ERR not NULL as the indicator that a signal handler hasn't been changed, so that SIG_DFL (equivalent to NULL) will be restored. Fix restoration of SIGQUIT; use the old handler not SIGPIPE's. To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/usr.bin/ftp/fetch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Fri Jul 10 20:34:24 UTC 2020 Modified Files: src/lib/libedit: terminal.c Log Message: Fix numeric variable handling in settc (lyzliyuzhi at 163 dot com) To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/libedit/terminal.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri Jul 10 20:34:24 UTC 2020
Modified Files:
src/lib/libedit: terminal.c
Log Message:
Fix numeric variable handling in settc (lyzliyuzhi at 163 dot com)
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libedit/terminal.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/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.42 src/lib/libedit/terminal.c:1.43
--- src/lib/libedit/terminal.c:1.42 Sun May 31 19:24:23 2020
+++ src/lib/libedit/terminal.c Fri Jul 10 16:34:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.42 2020/05/31 23:24:23 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.43 2020/07/10 20:34:24 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: terminal.c,v 1.42 2020/05/31 23:24:23 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.43 2020/07/10 20:34:24 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1315,6 +1315,8 @@ terminal_settc(EditLine *el, int argc __
const struct termcapstr *ts;
const struct termcapval *tv;
char what[8], how[8];
+ long i;
+ char *ep;
if (argv == NULL || argv[1] == NULL || argv[2] == NULL)
return -1;
@@ -1341,11 +1343,17 @@ terminal_settc(EditLine *el, int argc __
if (strcmp(tv->name, what) == 0)
break;
- if (tv->name != NULL)
+ if (tv->name == NULL) {
+ (void) fprintf(el->el_errfile,
+ "%ls: Bad capability `%s'.\n", argv[0], what);
return -1;
+ }
if (tv == [T_pt] || tv == [T_km] ||
tv == [T_am] || tv == [T_xn]) {
+ /*
+ * Booleans
+ */
if (strcmp(how, "yes") == 0)
el->el_terminal.t_val[tv - tval] = 1;
else if (strcmp(how, "no") == 0)
@@ -1356,28 +1364,30 @@ terminal_settc(EditLine *el, int argc __
return -1;
}
terminal_setflags(el);
- if (terminal_change_size(el, Val(T_li), Val(T_co)) == -1)
- return -1;
return 0;
- } else {
- long i;
- char *ep;
+ }
- i = strtol(how, , 10);
- if (*ep != '\0') {
- (void) fprintf(el->el_errfile,
- "%ls: Bad value `%s'.\n", argv[0], how);
- return -1;
- }
- el->el_terminal.t_val[tv - tval] = (int) i;
+ /*
+ * Numerics
+ */
+ i = strtol(how, , 10);
+ if (*ep != '\0') {
+ (void) fprintf(el->el_errfile,
+ "%ls: Bad value `%s'.\n", argv[0], how);
+ return -1;
+ }
+ el->el_terminal.t_val[tv - tval] = (int) i;
+ i = 0;
+ if (tv == [T_co]) {
el->el_terminal.t_size.v = Val(T_co);
+ i++;
+ } else if (tv == [T_li]) {
el->el_terminal.t_size.h = Val(T_li);
- if (tv == [T_co] || tv == [T_li])
- if (terminal_change_size(el, Val(T_li), Val(T_co))
- == -1)
-return -1;
- return 0;
+ i++;
}
+ if (i && terminal_change_size(el, Val(T_li), Val(T_co)) == -1)
+ return -1;
+ return 0;
}
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: skrll Date: Fri Jul 10 16:02:00 UTC 2020 Removed Files: src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 files.imx7 mk.imx7 std.imx7 src/sys/arch/evbarm/imx7: imx7_ioconfig.c imx7_machdep.c platform.h Log Message: G/C. OK'ed by jmcnell To generate a diff of this commit: cvs rdiff -u -r1.23 -r0 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.imx7 \ src/sys/arch/evbarm/conf/mk.imx7 cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/conf/std.imx7 cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/imx7/imx7_ioconfig.c cvs rdiff -u -r1.14 -r0 src/sys/arch/evbarm/imx7/imx7_machdep.c cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/imx7/platform.h 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
Module Name:src Committed By: skrll Date: Fri Jul 10 16:02:00 UTC 2020 Removed Files: src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 files.imx7 mk.imx7 std.imx7 src/sys/arch/evbarm/imx7: imx7_ioconfig.c imx7_machdep.c platform.h Log Message: G/C. OK'ed by jmcnell To generate a diff of this commit: cvs rdiff -u -r1.23 -r0 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3 cvs rdiff -u -r1.2 -r0 src/sys/arch/evbarm/conf/files.imx7 \ src/sys/arch/evbarm/conf/mk.imx7 cvs rdiff -u -r1.5 -r0 src/sys/arch/evbarm/conf/std.imx7 cvs rdiff -u -r1.3 -r0 src/sys/arch/evbarm/imx7/imx7_ioconfig.c cvs rdiff -u -r1.14 -r0 src/sys/arch/evbarm/imx7/imx7_machdep.c cvs rdiff -u -r1.1 -r0 src/sys/arch/evbarm/imx7/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make/filemon
Module Name:src
Committed By: sjg
Date: Fri Jul 10 15:53:30 UTC 2020
Modified Files:
src/usr.bin/make/filemon: filemon_dev.c
Log Message:
Use O_CLOEXEC and save a syscall.
Reviewed by: riastradh
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/filemon/filemon_dev.c
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/make/filemon/filemon_dev.c
diff -u src/usr.bin/make/filemon/filemon_dev.c:1.2 src/usr.bin/make/filemon/filemon_dev.c:1.3
--- src/usr.bin/make/filemon/filemon_dev.c:1.2 Fri Jul 10 00:42:53 2020
+++ src/usr.bin/make/filemon/filemon_dev.c Fri Jul 10 15:53:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: filemon_dev.c,v 1.2 2020/07/10 00:42:53 sjg Exp $ */
+/* $NetBSD: filemon_dev.c,v 1.3 2020/07/10 15:53:30 sjg Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -70,13 +70,12 @@ filemon_open(void)
return NULL;
/* Try opening /dev/filemon, up to six times (cargo cult!). */
- for (i = 0; (F->fd = open(_PATH_FILEMON, O_RDWR)) == -1; i++) {
+ for (i = 0; (F->fd = open(_PATH_FILEMON, O_RDWR|O_CLOEXEC)) == -1; i++) {
if (i == 5) {
error = errno;
goto fail0;
}
}
- (void)fcntl(F->fd, F_SETFD, FD_CLOEXEC);
/* Success! */
return F;
CVS commit: src/usr.bin/make/filemon
Module Name:src Committed By: sjg Date: Fri Jul 10 15:53:30 UTC 2020 Modified Files: src/usr.bin/make/filemon: filemon_dev.c Log Message: Use O_CLOEXEC and save a syscall. Reviewed by: riastradh To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.bin/make/filemon/filemon_dev.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/include/arm32
Module Name:src Committed By: skrll Date: Fri Jul 10 15:12:33 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Remove stray #else / #endif block in KASAN support commit To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/include/arm32/vmparam.h 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/include/arm32
Module Name:src Committed By: skrll Date: Fri Jul 10 15:12:33 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h Log Message: Remove stray #else / #endif block in KASAN support commit To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/include/arm32/vmparam.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/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.52 src/sys/arch/arm/include/arm32/vmparam.h:1.53 --- src/sys/arch/arm/include/arm32/vmparam.h:1.52 Fri Jul 10 12:45:15 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Fri Jul 10 15:12:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.52 2020/07/10 12:45:15 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.53 2020/07/10 15:12:33 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -139,10 +139,6 @@ #else #define VM_KERNEL_VM_BASE 0x9000 #endif -#else -#ifdef KASAN -#error KASAN is unsupported on pre-ARMv6 -#endif #define VM_KERNEL_VM_SIZE (VM_KERNEL_VM_END - VM_KERNEL_VM_BASE)
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jdolecek
Date: Fri Jul 10 14:23:56 UTC 2020
Modified Files:
src/sys/dev/ic: ciss.c
Log Message:
remove write-only sc_ccbq, and unused sc_ccbdone
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/ciss.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/ciss.c
diff -u src/sys/dev/ic/ciss.c:1.42 src/sys/dev/ic/ciss.c:1.43
--- src/sys/dev/ic/ciss.c:1.42 Fri May 15 19:28:10 2020
+++ src/sys/dev/ic/ciss.c Fri Jul 10 14:23:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss.c,v 1.42 2020/05/15 19:28:10 maxv Exp $ */
+/* $NetBSD: ciss.c,v 1.43 2020/07/10 14:23:56 jdolecek Exp $ */
/* $OpenBSD: ciss.c,v 1.68 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.42 2020/05/15 19:28:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss.c,v 1.43 2020/07/10 14:23:56 jdolecek Exp $");
#include "bio.h"
@@ -247,8 +247,6 @@ ciss_attach(struct ciss_softc *sc)
return -1;
}
- TAILQ_INIT(>sc_ccbq);
- TAILQ_INIT(>sc_ccbdone);
TAILQ_INIT(>sc_free_ccb);
maxfer = sc->maxsg * PAGE_SIZE;
@@ -594,9 +592,6 @@ ciss_cmd(struct ciss_ccb *ccb, int flags
bus_space_read_4(sc->sc_iot, sc->sc_ioh, CISS_IMR) | sc->iem);
#endif
- mutex_enter(>sc_mutex);
- TAILQ_INSERT_TAIL(>sc_ccbq, ccb, ccb_link);
- mutex_exit(>sc_mutex);
ccb->ccb_state = CISS_CCB_ONQ;
CISS_DPRINTF(CISS_D_CMD, ("submit=0x%x ", cmd->id));
if (sc->cfg.methods & (CISS_METH_FIFO64|CISS_METH_FIFO64_RRO)) {
@@ -660,9 +655,6 @@ ciss_done(struct ciss_ccb *ccb)
}
ccb->ccb_state = CISS_CCB_READY;
- mutex_enter(>sc_mutex);
- TAILQ_REMOVE(>sc_ccbq, ccb, ccb_link);
- mutex_exit(>sc_mutex);
if (ccb->ccb_cmd.id & CISS_CMD_ERR)
error = ciss_error(ccb);
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jdolecek
Date: Fri Jul 10 14:24:14 UTC 2020
Modified Files:
src/sys/dev/ic: cissvar.h
Log Message:
remove write-only sc_ccbq, and unused sc_ccbdone
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/cissvar.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/ic/cissvar.h
diff -u src/sys/dev/ic/cissvar.h:1.7 src/sys/dev/ic/cissvar.h:1.8
--- src/sys/dev/ic/cissvar.h:1.7 Mon Feb 12 23:11:00 2018
+++ src/sys/dev/ic/cissvar.h Fri Jul 10 14:24:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cissvar.h,v 1.7 2018/02/12 23:11:00 joerg Exp $ */
+/* $NetBSD: cissvar.h,v 1.8 2020/07/10 14:24:14 jdolecek Exp $ */
/* $OpenBSD: cissvar.h,v 1.15 2013/05/30 16:15:02 deraadt Exp $ */
/*
@@ -57,7 +57,7 @@ struct ciss_softc {
u_int sc_flags;
int ccblen, maxcmd, maxsg, nbus, ndrives, maxunits;
- ciss_queue_head sc_free_ccb, sc_ccbq, sc_ccbdone;
+ ciss_queue_head sc_free_ccb;
kcondvar_t sc_condvar;
bus_dmamap_t cmdmap;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jdolecek Date: Fri Jul 10 14:24:14 UTC 2020 Modified Files: src/sys/dev/ic: cissvar.h Log Message: remove write-only sc_ccbq, and unused sc_ccbdone To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/ic/cissvar.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/ic
Module Name:src Committed By: jdolecek Date: Fri Jul 10 14:23:56 UTC 2020 Modified Files: src/sys/dev/ic: ciss.c Log Message: remove write-only sc_ccbq, and unused sc_ccbdone To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/ciss.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/include
Module Name:src Committed By: skrll Date: Fri Jul 10 12:45:16 UTC 2020 Modified Files: src/sys/arch/arm/include: asan.h src/sys/arch/arm/include/arm32: vmparam.h Log Message: Oops... deal with a last minute #define name change. KASAN support now builds. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/asan.h cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/include/arm32/vmparam.h 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/include
Module Name:src Committed By: skrll Date: Fri Jul 10 12:45:16 UTC 2020 Modified Files: src/sys/arch/arm/include: asan.h src/sys/arch/arm/include/arm32: vmparam.h Log Message: Oops... deal with a last minute #define name change. KASAN support now builds. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/include/asan.h cvs rdiff -u -r1.51 -r1.52 src/sys/arch/arm/include/arm32/vmparam.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/include/asan.h diff -u src/sys/arch/arm/include/asan.h:1.1 src/sys/arch/arm/include/asan.h:1.2 --- src/sys/arch/arm/include/asan.h:1.1 Fri Jul 10 12:25:09 2020 +++ src/sys/arch/arm/include/asan.h Fri Jul 10 12:45:15 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: asan.h,v 1.1 2020/07/10 12:25:09 skrll Exp $ */ +/* $NetBSD: asan.h,v 1.2 2020/07/10 12:45:15 skrll Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -189,8 +189,8 @@ kasan_md_init(void) /* The VAs we've created until now. */ vaddr_t eva; - eva = pmap_growkernel(KERNEL_VM_BASE); - kasan_shadow_map((void *)KERNEL_VM_BASE, eva - KERNEL_VM_BASE); + eva = pmap_growkernel(VM_KERNEL_VM_BASE); + kasan_shadow_map((void *)VM_KERNEL_VM_BASE, eva - VM_KERNEL_VM_BASE); } Index: src/sys/arch/arm/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.51 src/sys/arch/arm/include/arm32/vmparam.h:1.52 --- src/sys/arch/arm/include/arm32/vmparam.h:1.51 Fri Jul 10 12:25:09 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Fri Jul 10 12:45:15 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.51 2020/07/10 12:25:09 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.52 2020/07/10 12:45:15 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -124,7 +124,7 @@ #ifdef KASAN #define VM_KERNEL_KASAN_BASE 0xc000 -#define VM_KERNEL_KASAN_SIZE (KERNEL_VM_SIZE >> KASAN_SHADOW_SCALE_SHIFT) +#define VM_KERNEL_KASAN_SIZE (VM_KERNEL_VM_SIZE >> KASAN_SHADOW_SCALE_SHIFT) #define VM_KERNEL_KASAN_END (VM_KERNEL_KASAN_BASE + VM_KERNEL_KASAN_SIZE) #define VM_KERNEL_VM_END VM_KERNEL_KASAN_BASE #else
CVS commit: src
Module Name:src Committed By: skrll Date: Fri Jul 10 12:25:11 UTC 2020 Modified Files: src/share/man/man7: kernel_sanitizers.7 src/sys/arch/arm/altera: cycv_platform.c src/sys/arch/arm/amlogic: meson_platform.c src/sys/arch/arm/arm: armv6_start.S bootconfig.c cpufunc.c src/sys/arch/arm/arm32: arm32_boot.c arm32_kvminit.c arm32_machdep.c cpuswitch.S pmap.c src/sys/arch/arm/broadcom: bcm283x_platform.c src/sys/arch/arm/conf: Makefile.arm src/sys/arch/arm/imx/fdt: imx6_platform.c src/sys/arch/arm/include/arm32: param.h vmparam.h src/sys/arch/arm/nvidia: tegra_platform.c src/sys/arch/arm/rockchip: rk_platform.c src/sys/arch/arm/samsung: exynos_platform.c src/sys/arch/arm/sunxi: sunxi_platform.c src/sys/arch/arm/ti: am3_platform.c omap3_platform.c src/sys/arch/arm/vexpress: vexpress_platform.c src/sys/arch/arm/virt: virt_platform.c src/sys/arch/arm/xilinx: zynq_platform.c src/sys/arch/evbarm/beagle: beagle_machdep.c src/sys/arch/evbarm/conf: GENERIC ldscript.evbarm src/sys/arch/evbarm/imx7: imx7_machdep.c src/sys/arch/evbarm/include: asan.h src/sys/arch/evbarm/zynq: zynq_machdep.c Added Files: src/sys/arch/arm/include: asan.h Log Message: Add support for KASAN on ARMv[67] Thanks to maxv for many pointers and reviews. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/kernel_sanitizers.7 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/altera/cycv_platform.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/amlogic/meson_platform.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/arm/armv6_start.S cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm/bootconfig.c cvs rdiff -u -r1.176 -r1.177 src/sys/arch/arm/arm/cpufunc.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/arm32/arm32_boot.c cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arm/arm32/arm32_kvminit.c cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/arm32/arm32_machdep.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/arm/arm32/cpuswitch.S cvs rdiff -u -r1.416 -r1.417 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/broadcom/bcm283x_platform.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/conf/Makefile.arm cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/fdt/imx6_platform.c cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/asan.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/arm32/param.h cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arm/include/arm32/vmparam.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_platform.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk_platform.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/samsung/exynos_platform.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/sunxi/sunxi_platform.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/am3_platform.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/omap3_platform.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/vexpress/vexpress_platform.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/virt/virt_platform.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/xilinx/zynq_platform.c cvs rdiff -u -r1.82 -r1.83 src/sys/arch/evbarm/beagle/beagle_machdep.c cvs rdiff -u -r1.80 -r1.81 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/ldscript.evbarm cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/imx7/imx7_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/include/asan.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/zynq/zynq_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: skrll Date: Fri Jul 10 12:25:11 UTC 2020 Modified Files: src/share/man/man7: kernel_sanitizers.7 src/sys/arch/arm/altera: cycv_platform.c src/sys/arch/arm/amlogic: meson_platform.c src/sys/arch/arm/arm: armv6_start.S bootconfig.c cpufunc.c src/sys/arch/arm/arm32: arm32_boot.c arm32_kvminit.c arm32_machdep.c cpuswitch.S pmap.c src/sys/arch/arm/broadcom: bcm283x_platform.c src/sys/arch/arm/conf: Makefile.arm src/sys/arch/arm/imx/fdt: imx6_platform.c src/sys/arch/arm/include/arm32: param.h vmparam.h src/sys/arch/arm/nvidia: tegra_platform.c src/sys/arch/arm/rockchip: rk_platform.c src/sys/arch/arm/samsung: exynos_platform.c src/sys/arch/arm/sunxi: sunxi_platform.c src/sys/arch/arm/ti: am3_platform.c omap3_platform.c src/sys/arch/arm/vexpress: vexpress_platform.c src/sys/arch/arm/virt: virt_platform.c src/sys/arch/arm/xilinx: zynq_platform.c src/sys/arch/evbarm/beagle: beagle_machdep.c src/sys/arch/evbarm/conf: GENERIC ldscript.evbarm src/sys/arch/evbarm/imx7: imx7_machdep.c src/sys/arch/evbarm/include: asan.h src/sys/arch/evbarm/zynq: zynq_machdep.c Added Files: src/sys/arch/arm/include: asan.h Log Message: Add support for KASAN on ARMv[67] Thanks to maxv for many pointers and reviews. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man7/kernel_sanitizers.7 cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/altera/cycv_platform.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/amlogic/meson_platform.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/arm/armv6_start.S cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm/bootconfig.c cvs rdiff -u -r1.176 -r1.177 src/sys/arch/arm/arm/cpufunc.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/arm32/arm32_boot.c cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arm/arm32/arm32_kvminit.c cvs rdiff -u -r1.135 -r1.136 src/sys/arch/arm/arm32/arm32_machdep.c cvs rdiff -u -r1.100 -r1.101 src/sys/arch/arm/arm32/cpuswitch.S cvs rdiff -u -r1.416 -r1.417 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/broadcom/bcm283x_platform.c cvs rdiff -u -r1.54 -r1.55 src/sys/arch/arm/conf/Makefile.arm cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/fdt/imx6_platform.c cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/include/asan.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/include/arm32/param.h cvs rdiff -u -r1.50 -r1.51 src/sys/arch/arm/include/arm32/vmparam.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_platform.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/rockchip/rk_platform.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/samsung/exynos_platform.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/sunxi/sunxi_platform.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/am3_platform.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/omap3_platform.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/vexpress/vexpress_platform.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/virt/virt_platform.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/xilinx/zynq_platform.c cvs rdiff -u -r1.82 -r1.83 src/sys/arch/evbarm/beagle/beagle_machdep.c cvs rdiff -u -r1.80 -r1.81 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/ldscript.evbarm cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/imx7/imx7_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/include/asan.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/zynq/zynq_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/kernel_sanitizers.7 diff -u src/share/man/man7/kernel_sanitizers.7:1.3 src/share/man/man7/kernel_sanitizers.7:1.4 --- src/share/man/man7/kernel_sanitizers.7:1.3 Tue Jun 30 16:22:55 2020 +++ src/share/man/man7/kernel_sanitizers.7 Fri Jul 10 12:25:11 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: kernel_sanitizers.7,v 1.3 2020/06/30 16:22:55 maxv Exp $ +.\" $NetBSD: kernel_sanitizers.7,v 1.4 2020/07/10 12:25:11 skrll Exp $ .\" .\" Copyright (c) 2020 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 June 30, 2020 +.Dd July 10, 2020 .Dt KERNEL_SANITIZERS 7 .Os .Sh NAME @@ -67,7 +67,7 @@ Heavy runtime checks, and ~12.5% increas Shadow memory, compiler instrumentation, special kernel wrappers, and light MD infrastructure. .Ss Supported architectures -aarch64 (gcc), amd64 (gcc, llvm). +aarch64 (gcc), amd64 (gcc, llvm), arm (gcc). .Pp KASAN is made of six sub-features that perform memory validation: .Bd -literal @@ -80,6 +80,8 @@ KASAN is made of six sub-features that p +-+--+---+-+---+-+--+ | aarch64 | Yes | Yes | Yes | No| Yes | Yes |
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src Committed By: skrll Date: Fri Jul 10 12:14:58 UTC 2020 Modified Files: src/sys/arch/evbarm/fdt: platform.h Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/fdt/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/fdt/platform.h diff -u src/sys/arch/evbarm/fdt/platform.h:1.7 src/sys/arch/evbarm/fdt/platform.h:1.8 --- src/sys/arch/evbarm/fdt/platform.h:1.7 Fri Jul 10 07:31:33 2020 +++ src/sys/arch/evbarm/fdt/platform.h Fri Jul 10 12:14:58 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.7 2020/07/10 07:31:33 skrll Exp $ */ +/* $NetBSD: platform.h,v 1.8 2020/07/10 12:14:58 skrll Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -34,7 +34,7 @@ void fdt_add_reserved_memory_range(uint6 #endif #define KERNEL_IO_VBASE VM_KERNEL_IO_ADDRESS -#define KERNEL_IO_VSIZE (KERNEL_IO_VBASE - VM_MAX_KERNEL_ADDRESS) +#define KERNEL_IO_VSIZE VM_KERNEL_IO_SIZE #ifdef __aarch64__
CVS commit: src/sys/arch/evbarm/fdt
Module Name:src Committed By: skrll Date: Fri Jul 10 12:14:58 UTC 2020 Modified Files: src/sys/arch/evbarm/fdt: platform.h Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/fdt/platform.h 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: Fri Jul 10 11:59:10 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #990 - #007 To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 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.73 src/doc/CHANGES-9.1:1.1.2.74 --- src/doc/CHANGES-9.1:1.1.2.73 Tue Jul 7 20:04:37 2020 +++ src/doc/CHANGES-9.1 Fri Jul 10 11:59:10 2020 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.1,v 1.1.2.73 2020/07/07 20:04:37 martin Exp $ +# $NetBSD: CHANGES-9.1,v 1.1.2.74 2020/07/10 11:59:10 martin Exp $ A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1 release: @@ -3203,3 +3203,122 @@ usr.sbin/postinstall/postinstall.in 1.3 Sort missing IDs (users and groups) by the numeric ID. [simonb, ticket #989] +sys/dev/mii/miidevs1.168 +sys/dev/mii/miidevs.h(regen) +sys/dev/mii/miidevs_data.h (regen) + + Add some Microsemi (Vitesse) devices. + [msaitoh, ticket #990] + +sys/dev/pci/pcidevs 1.1403-1.1407, 1.1409, + 1.1412-1.1418 via patch +sys/dev/pci/pcidevs.h (regen) +sys/dev/pci/pcidevs_data.h(regen) + + - Add NVIDIA Quadro NVS 295. + - Add more RDC products from Andrius V. + - Add some Intel UHD Graphics devices. Mainly taken from OpenBSD. + - Add Intel Comet Lake, Whiskey Lake U and Amber Lake Y devices. + - Modify description of Intel 0x591e from HD Graphics to UHD Graphics. + - Add Intel XMM 7360 LTE Modem. + - Add Western Digital WD Blue SN550 NVMe SSD. + - Add ATI Radeon R5/R6/R7 Graphics. + - Add IDs for Ampere eMAG PCIe Root Ports. + - Add RTL8192EE Wireless LAN 802.11n PCI-E NIC. + - Add ASIX AX99100 Multi I/O (Serial,Parallel,I2C,SPI,LocalBus,GPIO) + Controller. + - Add a couple of additional device IDs for the AMD Cryptographic + Coprocessor. + - Remove duplicated entries. + [msaitoh, ticket #991] + +sys/dev/i2c/sdtemp.c1.37-1.39 + + Check the return value of iic_acquire_bus(). This function may fail. + If an error occurred in sme_refresh function, pass ENVSYS_SINVALID. + [msaitoh, ticket #992] + +sys/arch/x86/x86/procfs_machdep.c 1.37,1.38 + + Add AMD protected processor identification number (ppin). + [msaitoh, ticket #993] + +sys/dev/pci/if_wm.c1.655-1.658, 1.660, 1.662, + 1.664-1.668, 1.671-1.674, + 1.678,1.680-1.681 via patch +sys/dev/pci/if_wmreg.c1.118-1.119 +sys/dev/pci/if_wmvar.c1.45 + + - Add SFP support. Module insertion/removal is not supported yet. + Currently, SFP detection is only done in the driver's attach phase. + - Detect the Media Auto Sense feature. Not supported yet. + - Fix SFF_SFP_ETH_FLAGS_100FX. It's not 0x10 but 0x20. + - Add extra delay in wm_serdes_power_up_link_82575(). + - Add Intel I219 LM10-LM15 and V10-V14. + - wm(4) can use workqueue as deferred Rx/Tx handler. + Set hw.wm*.txrx_workqueue=1 to use workqueue instead of softint. + The default value of hw.wm*.txrx_workqueue is 0 which use softint + as before. + - Unset RSS UDP flags like ixg(4) and other OSes. To handle IP + fragmented UDP, first packet and second packet should be processed + in the same Rx queue. + - It's useless to not to set PCI_PMCSR_PME_STS bit when writing because + the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear + in case it's already set. + - Actually writing always the checksum offload context descriptor + makes the HW do extra processing, avoid doing that if possible. + - Fix a bug that the WMREG_EEARBC_I210 register is incorrectly set if + the system uses iNVM. + - "wmX: 0" on 82542 is difficult to understand, so don't print it. + - Rename some macros and function. + - KNF. Add comment. + [msaitoh, ticket #994] + +usr.sbin/cpuctl/Makefile 1.9 (patch) +usr.sbin/cpuctl/arch/cpuctl_i386.h 1.5 (patch) +usr.sbin/cpuctl/arch/i386.c 1.111-1.113 (patch) +usr.sbin/cpuctl/cpuctl.c 1.31 (patch) +usr.sbin/cpuctl/cpuctl.h 1.7 (patch) +sys/arch/x86/x86/identcpu_subr.c 1.1-1.7 (patch) + + - Get TSC frequency from CPUID 0x15 and/or x16 for newer Intel + processors. + - Add 0xa5 and 0xa6 for Comet Lake. + - Rename ci_cpuid_level to ci_max_cpuid and ci_cpuid_extlevel to + ci_max_ext_cpuid to match x86/include/cpu.h. No functional change. + - Sort some entries. + - Add comment. + [msaitoh, ticket #995] + +sys/dev/pci/ichsmb.c1.62, 1.66-1.68 + + - Fix LOCKDEBUG panic on detach when attach failed. + - Add Comet Lake, Whiskey Lake U and Amber Lake Y support. + - Whitespace fix. + [msaitoh, ticket #996] + +sys/dev/pci/ixgbe/ix_txrx.c 1.62-1.63 via patch +sys/dev/pci/ixgbe/ixgbe.c 1.225, 1.228-1.229, + 1.232 via patch +sys/dev/pci/ixgbe/ixgbe.h 1.64, 1.66 +sys/dev/pci/ixgbe/ixv.c1.146, 1.148-1.150 +sys/dev/pci/ixgbe/ixgbe_common.c 1.27 +sys/dev/pci/ixgbe/ixgbe_vf.c 1.23 +sys/dev/pci/ixgbe/ixgbe_82598.c 1.15
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Jul 10 11:59:10 UTC 2020 Modified Files: src/doc [netbsd-9]: CHANGES-9.1 Log Message: Tickets #990 - #007 To generate a diff of this commit: cvs rdiff -u -r1.1.2.73 -r1.1.2.74 src/doc/CHANGES-9.1 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/pci/ixgbe
Module Name:src Committed By: martin Date: Fri Jul 10 11:35:51 UTC 2020 Modified Files: src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe.h ixgbe_82598.c ixgbe_common.c ixgbe_netbsd.c ixgbe_osdep.h ixgbe_phy.c ixgbe_vf.c ixgbe_x550.c ixv.c Log Message: Pull up the following revisions, requested by msaitoh in ticket #997: sys/dev/pci/ixgbe/ix_txrx.c 1.62-1.63 via patch sys/dev/pci/ixgbe/ixgbe.c 1.225, 1.228-1.229, 1.232 via patch sys/dev/pci/ixgbe/ixgbe.h 1.64, 1.66 sys/dev/pci/ixgbe/ixv.c 1.146, 1.148-1.150 sys/dev/pci/ixgbe/ixgbe_common.c1.27 sys/dev/pci/ixgbe/ixgbe_vf.c1.23 sys/dev/pci/ixgbe/ixgbe_82598.c 1.15 sys/dev/pci/ixgbe/ixgbe_x550.c 1.18 sys/dev/pci/ixgbe/ixgbe_netbsd.c1.14 sys/dev/pci/ixgbe/ixgbe_phy.c 1.21 sys/dev/pci/ixgbe/ixgbe_osdep.h 1.26 - Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem was only on X550*. - Add debug printf()s. - Use unsigned to avoid undefined behavior in ixgbe_fc_enable_generic(). - Modify a little to reduce diff between ixgbe.c and ixv.c. No functional change. - Modify comment. - Remove unused macros. - Whitespace fix. - Fix typos. To generate a diff of this commit: cvs rdiff -u -r1.54.2.3 -r1.54.2.4 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.199.2.10 -r1.199.2.11 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.56.2.2 -r1.56.2.3 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.12.8.2 -r1.12.8.3 src/sys/dev/pci/ixgbe/ixgbe_82598.c cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/sys/dev/pci/ixgbe/ixgbe_common.c cvs rdiff -u -r1.9.4.2 -r1.9.4.3 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c cvs rdiff -u -r1.23.6.2 -r1.23.6.3 src/sys/dev/pci/ixgbe/ixgbe_osdep.h cvs rdiff -u -r1.18.4.2 -r1.18.4.3 src/sys/dev/pci/ixgbe/ixgbe_phy.c cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/dev/pci/ixgbe/ixgbe_vf.c cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/dev/pci/ixgbe/ixgbe_x550.c cvs rdiff -u -r1.125.2.9 -r1.125.2.10 src/sys/dev/pci/ixgbe/ixv.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/pci/ixgbe
Module Name:src
Committed By: martin
Date: Fri Jul 10 11:35:51 UTC 2020
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-9]: ix_txrx.c ixgbe.c ixgbe.h
ixgbe_82598.c ixgbe_common.c ixgbe_netbsd.c ixgbe_osdep.h
ixgbe_phy.c ixgbe_vf.c ixgbe_x550.c ixv.c
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #997:
sys/dev/pci/ixgbe/ix_txrx.c 1.62-1.63 via patch
sys/dev/pci/ixgbe/ixgbe.c 1.225, 1.228-1.229,
1.232 via patch
sys/dev/pci/ixgbe/ixgbe.h 1.64, 1.66
sys/dev/pci/ixgbe/ixv.c 1.146, 1.148-1.150
sys/dev/pci/ixgbe/ixgbe_common.c1.27
sys/dev/pci/ixgbe/ixgbe_vf.c1.23
sys/dev/pci/ixgbe/ixgbe_82598.c 1.15
sys/dev/pci/ixgbe/ixgbe_x550.c 1.18
sys/dev/pci/ixgbe/ixgbe_netbsd.c1.14
sys/dev/pci/ixgbe/ixgbe_phy.c 1.21
sys/dev/pci/ixgbe/ixgbe_osdep.h 1.26
- Fix IXGBE_LE32_TO_CPUS() macro for big endian machine. This problem
was only on X550*.
- Add debug printf()s.
- Use unsigned to avoid undefined behavior in
ixgbe_fc_enable_generic().
- Modify a little to reduce diff between ixgbe.c and ixv.c.
No functional change.
- Modify comment.
- Remove unused macros.
- Whitespace fix.
- Fix typos.
To generate a diff of this commit:
cvs rdiff -u -r1.54.2.3 -r1.54.2.4 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.199.2.10 -r1.199.2.11 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.56.2.2 -r1.56.2.3 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.12.8.2 -r1.12.8.3 src/sys/dev/pci/ixgbe/ixgbe_82598.c
cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/sys/dev/pci/ixgbe/ixgbe_common.c
cvs rdiff -u -r1.9.4.2 -r1.9.4.3 src/sys/dev/pci/ixgbe/ixgbe_netbsd.c
cvs rdiff -u -r1.23.6.2 -r1.23.6.3 src/sys/dev/pci/ixgbe/ixgbe_osdep.h
cvs rdiff -u -r1.18.4.2 -r1.18.4.3 src/sys/dev/pci/ixgbe/ixgbe_phy.c
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/dev/pci/ixgbe/ixgbe_vf.c
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/dev/pci/ixgbe/ixgbe_x550.c
cvs rdiff -u -r1.125.2.9 -r1.125.2.10 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.3 src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.4
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.54.2.3 Sun Jan 26 11:03:17 2020
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Fri Jul 10 11:35:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.54.2.3 2020/01/26 11:03:17 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.54.2.4 2020/07/10 11:35:51 martin Exp $ */
/**
@@ -926,7 +926,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
vlan_macip_lens |= ip_hlen;
/* No support for offloads for non-L4 next headers */
- switch (ipproto) {
+ switch (ipproto) {
case IPPROTO_TCP:
if (mp->m_pkthdr.csum_flags &
(M_CSUM_TCPv4 | M_CSUM_TCPv6))
@@ -1569,7 +1569,6 @@ ixgbe_setup_receive_ring(struct rx_ring
rxbuf->addr = htole64(rxbuf->pmap->dm_segs[0].ds_addr);
}
-
/* Setup our descriptor indices */
rxr->next_to_check = 0;
rxr->next_to_refresh = 0;
@@ -1625,6 +1624,7 @@ ixgbe_setup_receive_structures(struct ad
struct rx_ring *rxr = adapter->rx_rings;
intj;
+ INIT_DEBUGOUT("ixgbe_setup_receive_structures");
for (j = 0; j < adapter->num_queues; j++, rxr++)
if (ixgbe_setup_receive_ring(rxr))
goto fail;
@@ -2233,7 +2233,7 @@ ixgbe_allocate_queues(struct adapter *ad
/* First, allocate the top level queue structs */
adapter->queues = (struct ix_queue *)malloc(sizeof(struct ix_queue) *
-adapter->num_queues, M_DEVBUF, M_NOWAIT | M_ZERO);
+ adapter->num_queues, M_DEVBUF, M_NOWAIT | M_ZERO);
if (adapter->queues == NULL) {
aprint_error_dev(dev, "Unable to allocate queue memory\n");
error = ENOMEM;
@@ -2300,7 +2300,7 @@ ixgbe_allocate_queues(struct adapter *ad
"Critical Failure setting up transmit buffers\n");
error = ENOMEM;
goto err_tx_desc;
- }
+ }
if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
/* Allocate a buf ring */
txr->txr_interq = pcq_create(IXGBE_BR_SIZE, KM_SLEEP);
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.10 src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.11
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.199.2.10 Tue Jan 28 11:09:27 2020
+++ src/sys/dev/pci/ixgbe/ixgbe.c Fri Jul 10 11:35:51 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.199.2.10 2020/01/28 11:09:27 martin Exp $ */
+/* $NetBSD: ixgbe.c,v 1.199.2.11 2020/07/10 11:35:51 martin Exp $ */
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Jul 10 11:31:59 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-9]: ichsmb.c
Log Message:
Pull up the following revisions, via patch, requested by msaitoh in
ticket #996:
sys/dev/pci/ichsmb.c1.62, 1.66-1.68
- Fix LOCKDEBUG panic on detach when attach failed.
- Add Comet Lake, Whiskey Lake U and Amber Lake Y support.
- Whitespace fix.
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.1 -r1.60.4.2 src/sys/dev/pci/ichsmb.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.60.4.1 src/sys/dev/pci/ichsmb.c:1.60.4.2
--- src/sys/dev/pci/ichsmb.c:1.60.4.1 Sun Mar 1 12:48:25 2020
+++ src/sys/dev/pci/ichsmb.c Fri Jul 10 11:31:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.60.4.1 2020/03/01 12:48:25 martin Exp $ */
+/* $NetBSD: ichsmb.c,v 1.60.4.2 2020/07/10 11:31:59 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.1 2020/03/01 12:48:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.2 2020/07/10 11:31:59 martin Exp $");
#include
#include
@@ -125,8 +125,10 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_100SERIES_LP_SMB:
case PCI_PRODUCT_INTEL_2HS_SMB:
case PCI_PRODUCT_INTEL_3HS_SMB:
+ case PCI_PRODUCT_INTEL_3HS_U_SMB:
case PCI_PRODUCT_INTEL_CORE4G_M_SMB:
case PCI_PRODUCT_INTEL_CORE5G_M_SMB:
+ case PCI_PRODUCT_INTEL_CMTLK_SMB:
case PCI_PRODUCT_INTEL_BAYTRAIL_PCU_SMB:
case PCI_PRODUCT_INTEL_BSW_PCU_SMB:
case PCI_PRODUCT_INTEL_APL_SMB:
@@ -163,6 +165,7 @@ ichsmb_attach(device_t parent, device_t
sc->sc_pc = pa->pa_pc;
pci_aprint_devinfo(pa, NULL);
+ mutex_init(>sc_i2c_mutex, MUTEX_DEFAULT, IPL_NONE);
/* Read configuration */
conf = pci_conf_read(pa->pa_pc, pa->pa_tag, LPCIB_SMB_HOSTC);
@@ -208,7 +211,6 @@ ichsmb_attach(device_t parent, device_t
sc->sc_i2c_device = NULL;
flags = 0;
- mutex_init(>sc_i2c_mutex, MUTEX_DEFAULT, IPL_NONE);
ichsmb_rescan(self, "i2cbus", );
out: if (!pmf_device_register(self, NULL, NULL))
@@ -322,7 +324,7 @@ ichsmb_i2c_exec(void *cookie, i2c_op_t o
LPCIB_SMB_HS_INTR | LPCIB_SMB_HS_DEVERR |
LPCIB_SMB_HS_BUSERR | LPCIB_SMB_HS_FAILED);
bus_space_barrier(sc->sc_iot, sc->sc_ioh, LPCIB_SMB_HS, 1,
- BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
/* Wait for bus to be idle */
for (retries = 100; retries > 0; retries--) {
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Jul 10 11:31:59 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: ichsmb.c Log Message: Pull up the following revisions, via patch, requested by msaitoh in ticket #996: sys/dev/pci/ichsmb.c1.62, 1.66-1.68 - Fix LOCKDEBUG panic on detach when attach failed. - Add Comet Lake, Whiskey Lake U and Amber Lake Y support. - Whitespace fix. To generate a diff of this commit: cvs rdiff -u -r1.60.4.1 -r1.60.4.2 src/sys/dev/pci/ichsmb.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
Module Name:src Committed By: martin Date: Fri Jul 10 11:20:29 UTC 2020 Modified Files: src/usr.sbin/cpuctl [netbsd-9]: Makefile cpuctl.c cpuctl.h src/usr.sbin/cpuctl/arch [netbsd-9]: cpuctl_i386.h i386.c Added Files: src/sys/arch/x86/x86 [netbsd-9]: identcpu_subr.c Log Message: Pull up the following revisions (all via patch) requested by msaitoh in ticket #995: usr.sbin/cpuctl/Makefile1.9 usr.sbin/cpuctl/arch/cpuctl_i386.h 1.5 usr.sbin/cpuctl/arch/i386.c 1.111-1.113 usr.sbin/cpuctl/cpuctl.c1.31 usr.sbin/cpuctl/cpuctl.h1.7 sys/arch/x86/x86/identcpu_subr.c1.1-1.7 - Get TSC frequency from CPUID 0x15 and/or x16 for newer Intel processors. - Add 0xa5 and 0xa6 for Comet Lake. - Rename ci_cpuid_level to ci_max_cpuid and ci_cpuid_extlevel to ci_max_ext_cpuid to match x86/include/cpu.h. No functional change. - Sort some entries. - Add comment. To generate a diff of this commit: cvs rdiff -u -r0 -r1.7.2.2 src/sys/arch/x86/x86/identcpu_subr.c cvs rdiff -u -r1.8 -r1.8.18.1 src/usr.sbin/cpuctl/Makefile cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.sbin/cpuctl/cpuctl.c cvs rdiff -u -r1.6 -r1.6.6.1 src/usr.sbin/cpuctl/cpuctl.h cvs rdiff -u -r1.4 -r1.4.2.1 src/usr.sbin/cpuctl/arch/cpuctl_i386.h cvs rdiff -u -r1.104.2.5 -r1.104.2.6 src/usr.sbin/cpuctl/arch/i386.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
Module Name:src
Committed By: martin
Date: Fri Jul 10 11:20:29 UTC 2020
Modified Files:
src/usr.sbin/cpuctl [netbsd-9]: Makefile cpuctl.c cpuctl.h
src/usr.sbin/cpuctl/arch [netbsd-9]: cpuctl_i386.h i386.c
Added Files:
src/sys/arch/x86/x86 [netbsd-9]: identcpu_subr.c
Log Message:
Pull up the following revisions (all via patch) requested by msaitoh in
ticket #995:
usr.sbin/cpuctl/Makefile1.9
usr.sbin/cpuctl/arch/cpuctl_i386.h 1.5
usr.sbin/cpuctl/arch/i386.c 1.111-1.113
usr.sbin/cpuctl/cpuctl.c1.31
usr.sbin/cpuctl/cpuctl.h1.7
sys/arch/x86/x86/identcpu_subr.c1.1-1.7
- Get TSC frequency from CPUID 0x15 and/or x16 for newer Intel
processors.
- Add 0xa5 and 0xa6 for Comet Lake.
- Rename ci_cpuid_level to ci_max_cpuid and ci_cpuid_extlevel to
ci_max_ext_cpuid to match x86/include/cpu.h. No functional change.
- Sort some entries.
- Add comment.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.7.2.2 src/sys/arch/x86/x86/identcpu_subr.c
cvs rdiff -u -r1.8 -r1.8.18.1 src/usr.sbin/cpuctl/Makefile
cvs rdiff -u -r1.30 -r1.30.2.1 src/usr.sbin/cpuctl/cpuctl.c
cvs rdiff -u -r1.6 -r1.6.6.1 src/usr.sbin/cpuctl/cpuctl.h
cvs rdiff -u -r1.4 -r1.4.2.1 src/usr.sbin/cpuctl/arch/cpuctl_i386.h
cvs rdiff -u -r1.104.2.5 -r1.104.2.6 src/usr.sbin/cpuctl/arch/i386.c
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/cpuctl/Makefile
diff -u src/usr.sbin/cpuctl/Makefile:1.8 src/usr.sbin/cpuctl/Makefile:1.8.18.1
--- src/usr.sbin/cpuctl/Makefile:1.8 Sat Jan 23 21:22:50 2016
+++ src/usr.sbin/cpuctl/Makefile Fri Jul 10 11:20:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/23 21:22:50 christos Exp $
+# $NetBSD: Makefile,v 1.8.18.1 2020/07/10 11:20:29 martin Exp $
.include
@@ -19,6 +19,12 @@ SRCS+= noarch.c
SRCS+= ${MACHINE_ARCH}-asm.S
.endif
+.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
+CPPFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch
+.PATH.c: ${NETBSDSRCDIR}/sys/arch/x86/x86
+SRCS+= identcpu_subr.c
+.endif
+
CPPFLAGS+= -D_KERNTYPES
LDADD+=-lutil
DPADD+=${LIBUTIL}
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.30 src/usr.sbin/cpuctl/cpuctl.c:1.30.2.1
--- src/usr.sbin/cpuctl/cpuctl.c:1.30 Sat May 11 11:59:21 2019
+++ src/usr.sbin/cpuctl/cpuctl.c Fri Jul 10 11:20:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.30 2019/05/11 11:59:21 maxv Exp $ */
+/* $NetBSD: cpuctl.c,v 1.30.2.1 2020/07/10 11:20:29 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: cpuctl.c,v 1.30 2019/05/11 11:59:21 maxv Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.30.2.1 2020/07/10 11:20:29 martin Exp $");
#endif /* not lint */
#include
@@ -382,3 +382,4 @@ aprint_normal_dev(const char *dev, const
}
__strong_alias(aprint_verbose_dev,aprint_normal_dev)
__strong_alias(aprint_error_dev,aprint_normal_dev)
+__strong_alias(aprint_debug_dev,aprint_normal_dev)
Index: src/usr.sbin/cpuctl/cpuctl.h
diff -u src/usr.sbin/cpuctl/cpuctl.h:1.6 src/usr.sbin/cpuctl/cpuctl.h:1.6.6.1
--- src/usr.sbin/cpuctl/cpuctl.h:1.6 Tue Jan 16 08:23:18 2018
+++ src/usr.sbin/cpuctl/cpuctl.h Fri Jul 10 11:20:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.h,v 1.6 2018/01/16 08:23:18 mrg Exp $ */
+/* $NetBSD: cpuctl.h,v 1.6.6.1 2020/07/10 11:20:29 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -26,12 +26,15 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include
+
int aprint_normal(const char *, ...) __printflike(1, 2);
int aprint_verbose(const char *, ...) __printflike(1, 2);
int aprint_error(const char *, ...) __printflike(1, 2);
int aprint_normal_dev(const char *, const char *, ...) __printflike(2, 3);
int aprint_verbose_dev(const char *, const char *, ...) __printflike(2, 3);
int aprint_error_dev(const char *, const char *, ...) __printflike(2, 3);
+int aprint_debug_dev(const char *, const char *, ...) __printflike(2, 3);
void identifycpu(int, const char *);
bool identifycpu_bind(void);
Index: src/usr.sbin/cpuctl/arch/cpuctl_i386.h
diff -u src/usr.sbin/cpuctl/arch/cpuctl_i386.h:1.4 src/usr.sbin/cpuctl/arch/cpuctl_i386.h:1.4.2.1
--- src/usr.sbin/cpuctl/arch/cpuctl_i386.h:1.4 Tue May 21 05:29:21 2019
+++ src/usr.sbin/cpuctl/arch/cpuctl_i386.h Fri Jul 10 11:20:29 2020
@@ -1,4 +1,50 @@
-/* $NetBSD: cpuctl_i386.h,v 1.4 2019/05/21 05:29:21 mlelstv Exp $ */
+/* $NetBSD: cpuctl_i386.h,v 1.4.2.1 2020/07/10 11:20:29 martin Exp $ */
+
+#include
+#include
+#include
+
+struct cpu_info {
+ const char *ci_dev;
+ int32_t ci_cpu_type; /* for cpu's without cpuid */
+ uint32_t ci_signature; /* X86 cpuid type */
+ uint32_t ci_vendor[4]; /* vendor string */
+ int32_t
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Jul 10 10:45:56 UTC 2020
Modified Files:
src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h if_wmvar.h
Log Message:
Pull up the following revisions, requested by msaitoh in ticket #994:
sys/dev/pci/if_wm.c 1.655-1.658, 1.660, 1.662, 1.664-1.668,
1.671-1.674, 1.678,1.680-1.681 via patch
sys/dev/pci/if_wmreg.c 1.118-1.119
sys/dev/pci/if_wmvar.c 1.45
- Add SFP support. Module insertion/removal is not supported yet.
Currently, SFP detection is only done in the driver's attach phase.
- Detect the Media Auto Sense feature. Not supported yet.
- Fix SFF_SFP_ETH_FLAGS_100FX. It's not 0x10 but 0x20.
- Add extra delay in wm_serdes_power_up_link_82575().
- Add Intel I219 LM10-LM15 and V10-V14.
- wm(4) can use workqueue as deferred Rx/Tx handler.
Set hw.wm*.txrx_workqueue=1 to use workqueue instead of softint.
The default value of hw.wm*.txrx_workqueue is 0 which use softint
as before.
- Unset RSS UDP flags like ixg(4) and other OSes. To handle IP
fragmented UDP, first packet and second packet should be processed
in the same Rx queue.
- It's useless to not to set PCI_PMCSR_PME_STS bit when writing because
the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear
in case it's already set.
- Actually writing always the checksum offload context descriptor
makes the HW do extra processing, avoid doing that if possible.
- Fix a bug that the WMREG_EEARBC_I210 register is incorrectly set if
the system uses iNVM.
- "wmX: 0" on 82542 is difficult to understand, so don't print it.
- Rename some macros and function.
- KNF. Add comment.
To generate a diff of this commit:
cvs rdiff -u -r1.645.2.4 -r1.645.2.5 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.115.2.1 -r1.115.2.2 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.645.2.4 src/sys/dev/pci/if_wm.c:1.645.2.5
--- src/sys/dev/pci/if_wm.c:1.645.2.4 Sun Jan 26 11:13:27 2020
+++ src/sys/dev/pci/if_wm.c Fri Jul 10 10:45:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.645.2.4 2020/01/26 11:13:27 martin Exp $ */
+/* $NetBSD: if_wm.c,v 1.645.2.5 2020/07/10 10:45:56 martin Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.4 2020/01/26 11:13:27 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.645.2.5 2020/07/10 10:45:56 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -105,6 +105,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.
#include
#include
#include
+#include
+#include
#include
@@ -156,7 +158,6 @@ __KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.
#define WM_DEBUG_LOCK __BIT(7)
int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX | WM_DEBUG_LINK | WM_DEBUG_GMII
| WM_DEBUG_MANAGE | WM_DEBUG_NVM | WM_DEBUG_INIT | WM_DEBUG_LOCK;
-
#define DPRINTF(x, y) do { if (wm_debug & (x)) printf y; } while (0)
#else
#define DPRINTF(x, y) __nothing
@@ -164,11 +165,17 @@ int wm_debug = WM_DEBUG_TX | WM_DEBUG_RX
#ifdef NET_MPSAFE
#define WM_MPSAFE 1
-#define CALLOUT_FLAGS CALLOUT_MPSAFE
+#define WM_CALLOUT_FLAGS CALLOUT_MPSAFE
+#define WM_SOFTINT_FLAGS SOFTINT_MPSAFE
+#define WM_WORKQUEUE_FLAGS WQ_PERCPU | WQ_MPSAFE
#else
-#define CALLOUT_FLAGS 0
+#define WM_CALLOUT_FLAGS 0
+#define WM_SOFTINT_FLAGS 0
+#define WM_WORKQUEUE_FLAGS WQ_PERCPU
#endif
+#define WM_WORKQUEUE_PRI PRI_SOFTNET
+
/*
* This device driver's max interrupt numbers.
*/
@@ -374,6 +381,12 @@ struct wm_txqueue {
bool txq_sending;
time_t txq_lastsent;
+ /* Checksum flags used for previous packet */
+ uint32_t txq_last_hw_cmd;
+ uint8_t txq_last_hw_fields;
+ uint16_t txq_last_hw_ipcs;
+ uint16_t txq_last_hw_tucs;
+
uint32_t txq_packets; /* for AIM */
uint32_t txq_bytes; /* for AIM */
#ifdef WM_EVENT_COUNTERS
@@ -398,6 +411,7 @@ struct wm_txqueue {
WM_Q_EVCNT_DEFINE(txq, toomanyseg) /* Pkt dropped(toomany DMA segs) */
WM_Q_EVCNT_DEFINE(txq, defrag) /* m_defrag() */
WM_Q_EVCNT_DEFINE(txq, underrun)/* Tx underrun */
+ WM_Q_EVCNT_DEFINE(txq, skipcontext) /* Tx skip wring cksum context */
char txq_txseg_evcnt_names[WM_NTXSEGS][sizeof("txqXXtxsegXXX")];
struct evcnt txq_ev_txseg[WM_NTXSEGS]; /* Tx packets w/ N segments */
@@ -457,6 +471,8 @@ struct wm_queue {
struct wm_txqueue wmq_txq;
struct wm_rxqueue wmq_rxq;
+ bool wmq_txrx_use_workqueue;
+ struct work wmq_cookie;
void *wmq_si;
krndsource_t rnd_source; /* random source */
};
@@ -467,6 +483,7 @@ struct wm_phyop {
int (*readreg_locked)(device_t, int, int, uint16_t *);
int (*writereg_locked)(device_t, int, int, uint16_t);
int reset_delay_us;
+ bool no_errprint;
};
struct
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Jul 10 10:45:56 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: if_wm.c if_wmreg.h if_wmvar.h Log Message: Pull up the following revisions, requested by msaitoh in ticket #994: sys/dev/pci/if_wm.c 1.655-1.658, 1.660, 1.662, 1.664-1.668, 1.671-1.674, 1.678,1.680-1.681 via patch sys/dev/pci/if_wmreg.c 1.118-1.119 sys/dev/pci/if_wmvar.c 1.45 - Add SFP support. Module insertion/removal is not supported yet. Currently, SFP detection is only done in the driver's attach phase. - Detect the Media Auto Sense feature. Not supported yet. - Fix SFF_SFP_ETH_FLAGS_100FX. It's not 0x10 but 0x20. - Add extra delay in wm_serdes_power_up_link_82575(). - Add Intel I219 LM10-LM15 and V10-V14. - wm(4) can use workqueue as deferred Rx/Tx handler. Set hw.wm*.txrx_workqueue=1 to use workqueue instead of softint. The default value of hw.wm*.txrx_workqueue is 0 which use softint as before. - Unset RSS UDP flags like ixg(4) and other OSes. To handle IP fragmented UDP, first packet and second packet should be processed in the same Rx queue. - It's useless to not to set PCI_PMCSR_PME_STS bit when writing because the bit is W1C. Instead, always write PCI_PMCSR_PME_STS bit to clear in case it's already set. - Actually writing always the checksum offload context descriptor makes the HW do extra processing, avoid doing that if possible. - Fix a bug that the WMREG_EEARBC_I210 register is incorrectly set if the system uses iNVM. - "wmX: 0" on 82542 is difficult to understand, so don't print it. - Rename some macros and function. - KNF. Add comment. To generate a diff of this commit: cvs rdiff -u -r1.645.2.4 -r1.645.2.5 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.115.2.1 -r1.115.2.2 src/sys/dev/pci/if_wmreg.h cvs rdiff -u -r1.44 -r1.44.4.1 src/sys/dev/pci/if_wmvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Fri Jul 10 10:36:56 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: procfs_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #993):
sys/arch/x86/x86/procfs_machdep.c: revision 1.37
sys/arch/x86/x86/procfs_machdep.c: revision 1.38
Add AMD protected processor identification number (PPIN).
Lowercase ppin.
To generate a diff of this commit:
cvs rdiff -u -r1.33.2.2 -r1.33.2.3 src/sys/arch/x86/x86/procfs_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.33.2.2 src/sys/arch/x86/x86/procfs_machdep.c:1.33.2.3
--- src/sys/arch/x86/x86/procfs_machdep.c:1.33.2.2 Tue Apr 14 17:15:02 2020
+++ src/sys/arch/x86/x86/procfs_machdep.c Fri Jul 10 10:36:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.33.2.2 2020/04/14 17:15:02 martin Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.33.2.3 2020/07/10 10:36:56 martin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.33.2.2 2020/04/14 17:15:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.33.2.3 2020/07/10 10:36:56 martin Exp $");
#include
#include
@@ -155,7 +155,7 @@ static const char * const x86_features[]
{ /* (13) AMD 0x8008 ebx */
"clzero", "irperf", "xsaveerptr", NULL, "rdpru", NULL, NULL, NULL,
NULL, "wbnoinvd", NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, "ppin",
NULL, "virt_ssbd", NULL, NULL, NULL, NULL, NULL, NULL},
{ /* (14) 0x0006 eax */
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src Committed By: martin Date: Fri Jul 10 10:36:56 UTC 2020 Modified Files: src/sys/arch/x86/x86 [netbsd-9]: procfs_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #993): sys/arch/x86/x86/procfs_machdep.c: revision 1.37 sys/arch/x86/x86/procfs_machdep.c: revision 1.38 Add AMD protected processor identification number (PPIN). Lowercase ppin. To generate a diff of this commit: cvs rdiff -u -r1.33.2.2 -r1.33.2.3 src/sys/arch/x86/x86/procfs_machdep.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/i2c
Module Name:src
Committed By: martin
Date: Fri Jul 10 10:33:38 UTC 2020
Modified Files:
src/sys/dev/i2c [netbsd-9]: sdtemp.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #992):
sys/dev/i2c/sdtemp.c: revision 1.37
sys/dev/i2c/sdtemp.c: revision 1.38
sys/dev/i2c/sdtemp.c: revision 1.39
KNF. No functional change.
Check the return value of iic_acquire_bus(). This function may fail.
One of the case is driver's detaching phase on shutdown. mutex_tryenter()
might fail and return with EBUSY. To avoid calling iic_release_bus() without
taking lock, check the return value of iic_acquire_bus().
If an error occurred in sme_refresh function, pass ENVSYS_SINVALID.
OK'd by pgoyette.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/dev/i2c/sdtemp.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/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.35 src/sys/dev/i2c/sdtemp.c:1.35.4.1
--- src/sys/dev/i2c/sdtemp.c:1.35 Thu Feb 28 16:56:35 2019
+++ src/sys/dev/i2c/sdtemp.c Fri Jul 10 10:33:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.35 2019/02/28 16:56:35 khorben Exp $*/
+/* $NetBSD: sdtemp.c,v 1.35.4.1 2020/07/10 10:33:38 martin Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.35 2019/02/28 16:56:35 khorben Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.35.4.1 2020/07/10 10:33:38 martin Exp $");
#include
#include
@@ -214,8 +214,13 @@ sdtemp_match(device_t parent, cfdata_t c
if ((ia->ia_addr & SDTEMP_ADDRMASK) != SDTEMP_ADDR)
return 0;
- /* Verify that we can read the manufacturer ID, Device ID and the capability */
- iic_acquire_bus(sc.sc_tag, 0);
+ /*
+ * Verify that we can read the manufacturer ID, Device ID and the
+ * capability
+ */
+ error = iic_acquire_bus(sc.sc_tag, 0);
+ if (error)
+ return 0;
error = sdtemp_read_16(, SDTEMP_REG_MFG_ID, ) |
sdtemp_read_16(, SDTEMP_REG_DEV_REV, ) |
sdtemp_read_16(, SDTEMP_REG_CAPABILITY, );
@@ -234,8 +239,8 @@ sdtemp_match(device_t parent, cfdata_t c
}
/*
- * Check by SDTEMP_IS_TSE2004AV() might not be enough, so check the alarm
- * capability, too.
+ * Check by SDTEMP_IS_TSE2004AV() might not be enough, so check the
+ * alarm capability, too.
*/
if ((cap & SDTEMP_CAP_HAS_ALARM) == 0)
return 0;
@@ -255,7 +260,10 @@ sdtemp_attach(device_t parent, device_t
sc->sc_address = ia->ia_addr;
sc->sc_dev = self;
- iic_acquire_bus(sc->sc_tag, 0);
+ error = iic_acquire_bus(sc->sc_tag, 0);
+ if (error)
+ return;
+
if ((error = sdtemp_read_16(sc, SDTEMP_REG_MFG_ID, )) != 0 ||
(error = sdtemp_read_16(sc, SDTEMP_REG_DEV_REV, )) != 0) {
iic_release_bus(sc->sc_tag, 0);
@@ -428,7 +436,9 @@ sdtemp_get_limits(struct sysmon_envsys *
uint16_t lim;
*props = 0;
- iic_acquire_bus(sc->sc_tag, 0);
+ if (iic_acquire_bus(sc->sc_tag, 0) != 0)
+ return;
+
if (sdtemp_read_16(sc, SDTEMP_REG_LOWER_LIM, ) == 0 && lim != 0) {
limits->sel_warnmin = sdtemp_decode_temp(sc, lim);
*props |= PROP_WARNMIN;
@@ -458,7 +468,9 @@ sdtemp_set_limits(struct sysmon_envsys *
limits = >sc_deflims;
props = >sc_defprops;
}
- iic_acquire_bus(sc->sc_tag, 0);
+ if (iic_acquire_bus(sc->sc_tag, 0) != 0)
+ return;
+
if (*props & PROP_WARNMIN) {
val = __UK2C(limits->sel_warnmin);
(void)sdtemp_write_16(sc, SDTEMP_REG_LOWER_LIM,
@@ -570,7 +582,12 @@ sdtemp_refresh(struct sysmon_envsys *sme
uint16_t val;
int error;
- iic_acquire_bus(sc->sc_tag, 0);
+ error = iic_acquire_bus(sc->sc_tag, 0);
+ if (error) {
+ edata->state = ENVSYS_SINVALID;
+ return;
+ }
+
error = sdtemp_read_16(sc, SDTEMP_REG_AMBIENT_TEMP, );
iic_release_bus(sc->sc_tag, 0);
@@ -598,7 +615,7 @@ sdtemp_refresh(struct sysmon_envsys *sme
}
/*
- * power management functions
+ * Power management functions
*
* We go into "shutdown" mode at suspend time, and return to normal
* mode upon resume. This reduces power consumption by disabling
@@ -612,7 +629,10 @@ sdtemp_pmf_suspend(device_t dev, const p
int error;
uint16_t config;
- iic_acquire_bus(sc->sc_tag, 0);
+ error = iic_acquire_bus(sc->sc_tag, 0);
+ if (error != 0)
+ return false;
+
error = sdtemp_read_16(sc, SDTEMP_REG_CONFIG, );
if (error == 0) {
config |= SDTEMP_CONFIG_SHUTDOWN_MODE;
@@ -629,7 +649,10 @@ sdtemp_pmf_resume(device_t dev, const pm
int error;
uint16_t config;
- iic_acquire_bus(sc->sc_tag, 0);
+ error = iic_acquire_bus(sc->sc_tag, 0);
+ if (error != 0)
+ return false;
+
error = sdtemp_read_16(sc, SDTEMP_REG_CONFIG, );
if (error == 0) {
config &= ~SDTEMP_CONFIG_SHUTDOWN_MODE;
CVS commit: [netbsd-9] src/sys/dev/i2c
Module Name:src Committed By: martin Date: Fri Jul 10 10:33:38 UTC 2020 Modified Files: src/sys/dev/i2c [netbsd-9]: sdtemp.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #992): sys/dev/i2c/sdtemp.c: revision 1.37 sys/dev/i2c/sdtemp.c: revision 1.38 sys/dev/i2c/sdtemp.c: revision 1.39 KNF. No functional change. Check the return value of iic_acquire_bus(). This function may fail. One of the case is driver's detaching phase on shutdown. mutex_tryenter() might fail and return with EBUSY. To avoid calling iic_release_bus() without taking lock, check the return value of iic_acquire_bus(). If an error occurred in sme_refresh function, pass ENVSYS_SINVALID. OK'd by pgoyette. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/dev/i2c/sdtemp.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/pci
Module Name:src Committed By: martin Date: Fri Jul 10 10:25:25 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #991 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.8 -r1.1371.2.9 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.8 -r1.1370.2.9 src/sys/dev/pci/pcidevs_data.h 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/pci
Module Name:src Committed By: martin Date: Fri Jul 10 10:25:25 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #991 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.8 -r1.1371.2.9 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.8 -r1.1370.2.9 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Jul 10 10:23:57 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions, requested by msaitoh in ticket #991: sys/dev/pci/pcidevs 1.1403-1.1407, 1.1409, 1.1412-1.1418 via patch - Add NVIDIA Quadro NVS 295. - Add more RDC products from Andrius V. - Add some Intel UHD Graphics devices. Mainly taken from OpenBSD. - Add Intel Comet Lake, Whiskey Lake U and Amber Lake Y devices. - Modify description of Intel 0x591e from HD Graphics to UHD Graphics. - Add Intel XMM 7360 LTE Modem. - Add Western Digital WD Blue SN550 NVMe SSD. - Add ATI Radeon R5/R6/R7 Graphics. - Add IDs for Ampere eMAG PCIe Root Ports. - Add RTL8192EE Wireless LAN 802.11n PCI-E NIC. - Add ASIX AX99100 Multi I/O (Serial,Parallel,I2C,SPI,LocalBus,GPIO) Controller. - Add a couple of additional device IDs for the AMD Cryptographic Coprocessor. - Remove duplicated entries. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.8 -r1.1383.2.9 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1383.2.8 src/sys/dev/pci/pcidevs:1.1383.2.9 --- src/sys/dev/pci/pcidevs:1.1383.2.8 Tue Jul 7 10:29:05 2020 +++ src/sys/dev/pci/pcidevs Fri Jul 10 10:23:57 2020 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.8 2020/07/07 10:29:05 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.9 2020/07/10 10:23:57 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -654,6 +654,7 @@ vendor AMAZON 0x1d0f Amazon.com, Inc. vendor AQUANTIA 0x1d6a Aquantia vendor ROCKCHIP 0x1d87 Rockchip vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID) +vendor AMPERE 0x1def Ampere Computing vendor SUNIX2 0x1fd4 SUNIX Co vendor HINT 0x3388 HiNT vendor 3DLABS 0x3d3d 3D Labs @@ -1024,11 +1025,13 @@ product AMD F17_DF_5 0x1464 Family17h D product AMD F17_DF_6 0x1465 Family17h Data Fabric product AMD F17_DF_7 0x1466 Family17h Data Fabric product AMD F17_DF_8 0x1467 Family17h Data Fabric +product AMD F17_CCP_2 0x1468 Family17h Crypto product AMD F17_PCIE_4 0x1470 Family17h PCIe product AMD F17_PCIE_5 0x1471 Family17h PCIe product AMD F17_7X_RC 0x1480 Family17h/7xh Root Complex product AMD F17_7X_IOMMU 0x1481 Family17h/7xh IOMMU product AMD F17_7X_RESV_SPP 0x1485 Family17h/7xh Reserved SPP +product AMD F17_7X_CCP 0x1486 Family17h/7xh Crypto product AMD F17_7X_USB3 0x149c Family17h/7xh USB 3.0 Host Controller product AMD F14_RC 0x1510 Family14h Root Complex product AMD F14_PCIE_1 0x1512 Family14h PCIe @@ -1219,6 +1222,16 @@ product AMI MEGARAID3 0x1960 MegaRAID 3 product AMI MEGARAID 0x9010 MegaRAID product AMI MEGARAID2 0x9060 MegaRAID 2 +/* Ampere Computing products */ +product AMPERE EMAG_PCIE_0 0xe005 eMAG PCIe Root Port 0 +product AMPERE EMAG_PCIE_1 0xe006 eMAG PCIe Root Port 1 +product AMPERE EMAG_PCIE_2 0xe007 eMAG PCIe Root Port 2 +product AMPERE EMAG_PCIE_3 0xe008 eMAG PCIe Root Port 3 +product AMPERE EMAG_PCIE_4 0xe009 eMAG PCIe Root Port 4 +product AMPERE EMAG_PCIE_5 0xe00a eMAG PCIe Root Port 5 +product AMPERE EMAG_PCIE_6 0xe00b eMAG PCIe Root Port 6 +product AMPERE EMAG_PCIE_7 0xe00c eMAG PCIe Root Port 7 + /* Analog Devices products */ product ANALOG AD1889 0x1889 AD1889 PCI SoundMAX Controller product ANALOG SAFENET 0x2f44 SafeNet Crypto Accelerator ADSP-2141 @@ -1293,7 +1306,6 @@ product AQUANTIA AQC100 0x00b1 AQC100 1 product AQUANTIA AQC107 0x07b1 AQC107 10 Gigabit Network Adapter product AQUANTIA AQC108 0x08b1 AQC108 5 Gigabit Network Adapter product AQUANTIA AQC109 0x09b1 AQC109 2.5 Gigabit Network Adapter -product AQUANTIA AQC100 0x00b1 AQC100 10 Gigabit Network Adapter product AQUANTIA AQC111 0x11b1 AQC111 5 Gigabit Network Adapter product AQUANTIA AQC112 0x12b1 AQC112 2.5 Gigabit Network Adapter product AQUANTIA AQC100S 0x80b1 AQC100S 10 Gigabit Network Adapter @@ -1336,6 +1348,7 @@ product ARECA ARC1880 0x1880 ARC-1880 /* ASIX Electronics products */ product ASIX AX88140A 0x1400 AX88140A 10/100 Ethernet +product ASIX AX99100 0x9100 AX99100 Multi I/O Controller /* ASMedia products */ product ASMEDIA ASM1061_01 0x0601 ASM1061 AHCI SATA III Controller @@ -1786,6 +1799,7 @@ product ATI RADEON_HD6320 0x9806 Radeon product ATI RADEON_HD7340 0x9808 Radeon HD7340 Graphics product ATI RADEON_HDMI_DP_AUDIO 0x9840 HDMI/DP Audio product ATI RADEON_R2_R3_R3E_R4 0x9854 Radeon R2/R3/R4 Graphics +product ATI RADEON_R5_R6_R7 0x9874 Radeon R5/R6/R7 Graphics product ATI RADEON_HD2900_HDA 0xaa00 Radeon HD 2900 HD Audio Controller product ATI RADEON_HD3650_HDA 0xaa01 Radeon HD 3650/3730/3750 HD Audio Controller product ATI RADEON_HD2600_HDA 0xaa08 Radeon HD 2600 HD Audio Controller @@ -3085,6 +3099,41 @@ product INTEL IVYBRIDGE_PCIE_3 0x015d Iv product INTEL IVYBRIDGE_IGD_1 0x0162 Ivy Bridge
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Fri Jul 10 10:23:57 UTC 2020 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up the following revisions, requested by msaitoh in ticket #991: sys/dev/pci/pcidevs 1.1403-1.1407, 1.1409, 1.1412-1.1418 via patch - Add NVIDIA Quadro NVS 295. - Add more RDC products from Andrius V. - Add some Intel UHD Graphics devices. Mainly taken from OpenBSD. - Add Intel Comet Lake, Whiskey Lake U and Amber Lake Y devices. - Modify description of Intel 0x591e from HD Graphics to UHD Graphics. - Add Intel XMM 7360 LTE Modem. - Add Western Digital WD Blue SN550 NVMe SSD. - Add ATI Radeon R5/R6/R7 Graphics. - Add IDs for Ampere eMAG PCIe Root Ports. - Add RTL8192EE Wireless LAN 802.11n PCI-E NIC. - Add ASIX AX99100 Multi I/O (Serial,Parallel,I2C,SPI,LocalBus,GPIO) Controller. - Add a couple of additional device IDs for the AMD Cryptographic Coprocessor. - Remove duplicated entries. To generate a diff of this commit: cvs rdiff -u -r1.1383.2.8 -r1.1383.2.9 src/sys/dev/pci/pcidevs 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/mii
Module Name:src
Committed By: martin
Date: Fri Jul 10 10:18:32 UTC 2020
Modified Files:
src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h
Log Message:
Regen for ticket #990
To generate a diff of this commit:
cvs rdiff -u -r1.151.2.7 -r1.151.2.8 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.139.2.7 -r1.139.2.8 src/sys/dev/mii/miidevs_data.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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.151.2.7 src/sys/dev/mii/miidevs.h:1.151.2.8
--- src/sys/dev/mii/miidevs.h:1.151.2.7 Tue Apr 14 16:44:10 2020
+++ src/sys/dev/mii/miidevs.h Fri Jul 10 10:18:32 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.151.2.7 2020/04/14 16:44:10 martin Exp $ */
+/* $NetBSD: miidevs.h,v 1.151.2.8 2020/07/10 10:18:32 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp
+ * NetBSD: miidevs,v 1.153.2.7 2020/07/10 10:18:01 martin Exp
*/
/*-
@@ -630,8 +630,28 @@
#define MII_STR_xxVITESSE_VSC8601 "VSC8601 10/100/1000 PHY"
#define MII_MODEL_xxVITESSE_VSC8641 0x0003
#define MII_STR_xxVITESSE_VSC8641 "Vitesse VSC8641 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8504 0x000c
+#define MII_STR_xxVITESSE_VSC8504 "Vitesse VSC8504 quad 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8552 0x000e
+#define MII_STR_xxVITESSE_VSC8552 "Vitesse VSC8552 dual 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8502 0x0012
+#define MII_STR_xxVITESSE_VSC8502 "Vitesse VSC8502 dual 10/100/1000TX PHY"
#define MII_MODEL_xxVITESSE_VSC8501 0x0013
#define MII_STR_xxVITESSE_VSC8501 "Vitesse VSC8501 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8531 0x0017
+#define MII_STR_xxVITESSE_VSC8531 "Vitesse VSC8531 10/100/1000TX PHY"
+#define MII_MODEL_xxVITESSE_VSC8662 0x0026
+#define MII_STR_xxVITESSE_VSC8662 "Vitesse VSC866[24] dual/quad 1000T 100FX 1000X PHY"
+#define MII_MODEL_xxVITESSE_VSC8514 0x0027
+#define MII_STR_xxVITESSE_VSC8514 "Vitesse VSC8514 quad 1000T PHY"
+#define MII_MODEL_xxVITESSE_VSC8512 0x002e
+#define MII_STR_xxVITESSE_VSC8512 "Vitesse VSC8512 12port 1000T PHY"
+#define MII_MODEL_xxVITESSE_VSC8522 0x002f
+#define MII_STR_xxVITESSE_VSC8522 "Vitesse VSC8522 12port 1000T PHY"
+#define MII_MODEL_xxVITESSE_VSC8658 0x0035
+#define MII_STR_xxVITESSE_VSC8658 "Vitesse VSC8658 octal 1000T 100FX 1000X PHY"
+#define MII_MODEL_xxVITESSE_VSC8541 0x0037
+#define MII_STR_xxVITESSE_VSC8541 "Vitesse VSC8541 1000T PHY"
/* XaQti Corp. PHYs */
#define MII_MODEL_xxXAQTI_XMACII 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.139.2.7 src/sys/dev/mii/miidevs_data.h:1.139.2.8
--- src/sys/dev/mii/miidevs_data.h:1.139.2.7 Tue Apr 14 16:44:10 2020
+++ src/sys/dev/mii/miidevs_data.h Fri Jul 10 10:18:32 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.139.2.7 2020/04/14 16:44:10 martin Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.139.2.8 2020/07/10 10:18:32 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp
+ * NetBSD: miidevs,v 1.153.2.7 2020/07/10 10:18:01 martin Exp
*/
/*-
@@ -258,7 +258,17 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_xxVIA, MII_MODEL_xxVIA_VT6103_2, MII_STR_xxVIA_VT6103_2 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8601, MII_STR_xxVITESSE_VSC8601 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8641, MII_STR_xxVITESSE_VSC8641 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8504, MII_STR_xxVITESSE_VSC8504 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8552, MII_STR_xxVITESSE_VSC8552 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8502, MII_STR_xxVITESSE_VSC8502 },
{ MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8501, MII_STR_xxVITESSE_VSC8501 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8531, MII_STR_xxVITESSE_VSC8531 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8662, MII_STR_xxVITESSE_VSC8662 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8514, MII_STR_xxVITESSE_VSC8514 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8512, MII_STR_xxVITESSE_VSC8512 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8522, MII_STR_xxVITESSE_VSC8522 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8658, MII_STR_xxVITESSE_VSC8658 },
+ { MII_OUI_xxVITESSE, MII_MODEL_xxVITESSE_VSC8541, MII_STR_xxVITESSE_VSC8541 },
{ MII_OUI_xxXAQTI, MII_MODEL_xxXAQTI_XMACII, MII_STR_xxXAQTI_XMACII },
{ 0, 0, NULL }
};
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Fri Jul 10 10:18:32 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h Log Message: Regen for ticket #990 To generate a diff of this commit: cvs rdiff -u -r1.151.2.7 -r1.151.2.8 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.7 -r1.139.2.8 src/sys/dev/mii/miidevs_data.h 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/mii
Module Name:src Committed By: martin Date: Fri Jul 10 10:18:01 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #990): sys/dev/mii/miidevs: revision 1.168 Add some Microsemi (Vitesse) devices. To generate a diff of this commit: cvs rdiff -u -r1.153.2.6 -r1.153.2.7 src/sys/dev/mii/miidevs 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/mii/miidevs diff -u src/sys/dev/mii/miidevs:1.153.2.6 src/sys/dev/mii/miidevs:1.153.2.7 --- src/sys/dev/mii/miidevs:1.153.2.6 Tue Apr 14 16:43:12 2020 +++ src/sys/dev/mii/miidevs Fri Jul 10 10:18:01 2020 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.153.2.6 2020/04/14 16:43:12 martin Exp $ +$NetBSD: miidevs,v 1.153.2.7 2020/07/10 10:18:01 martin Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -407,7 +407,17 @@ model xxVIA VT6103_2 0x0034 VT6103 10/1 /* Vitesse PHYs (Now Microsemi) */ model xxVITESSE VSC8601 0x0002 VSC8601 10/100/1000 PHY model xxVITESSE VSC8641 0x0003 Vitesse VSC8641 10/100/1000TX PHY +model xxVITESSE VSC8504 0x000c Vitesse VSC8504 quad 10/100/1000TX PHY +model xxVITESSE VSC8552 0x000e Vitesse VSC8552 dual 10/100/1000TX PHY +model xxVITESSE VSC8502 0x0012 Vitesse VSC8502 dual 10/100/1000TX PHY model xxVITESSE VSC8501 0x0013 Vitesse VSC8501 10/100/1000TX PHY +model xxVITESSE VSC8531 0x0017 Vitesse VSC8531 10/100/1000TX PHY +model xxVITESSE VSC8662 0x0026 Vitesse VSC866[24] dual/quad 1000T 100FX 1000X PHY +model xxVITESSE VSC8514 0x0027 Vitesse VSC8514 quad 1000T PHY +model xxVITESSE VSC8512 0x002e Vitesse VSC8512 12port 1000T PHY +model xxVITESSE VSC8522 0x002f Vitesse VSC8522 12port 1000T PHY +model xxVITESSE VSC8658 0x0035 Vitesse VSC8658 octal 1000T 100FX 1000X PHY +model xxVITESSE VSC8541 0x0037 Vitesse VSC8541 1000T PHY /* XaQti Corp. PHYs */ model xxXAQTI XMACII 0x XaQti Corp. XMAC II gigabit interface
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Fri Jul 10 10:18:01 UTC 2020 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #990): sys/dev/mii/miidevs: revision 1.168 Add some Microsemi (Vitesse) devices. To generate a diff of this commit: cvs rdiff -u -r1.153.2.6 -r1.153.2.7 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Fri Jul 10 07:48:28 UTC 2020 Modified Files: src/sys/kern: subr_asan.c src/sys/sys: asan.h Log Message: Expose KASAN_SHADOW_SCALE_SHIFT. OK'ed by maxv. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/kern/subr_asan.c cvs rdiff -u -r1.13 -r1.14 src/sys/sys/asan.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/kern/subr_asan.c diff -u src/sys/kern/subr_asan.c:1.23 src/sys/kern/subr_asan.c:1.24 --- src/sys/kern/subr_asan.c:1.23 Fri Jul 3 08:19:20 2020 +++ src/sys/kern/subr_asan.c Fri Jul 10 07:48:27 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $ */ +/* $NetBSD: subr_asan.c,v 1.24 2020/07/10 07:48:27 skrll Exp $ */ /* * Copyright (c) 2018-2020 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.23 2020/07/03 08:19:20 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_asan.c,v 1.24 2020/07/10 07:48:27 skrll Exp $"); #include #include @@ -50,7 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_asan.c, #endif /* ASAN constants. Part of the compiler ABI. */ -#define KASAN_SHADOW_SCALE_SHIFT 3 #define KASAN_SHADOW_SCALE_SIZE (1UL << KASAN_SHADOW_SCALE_SHIFT) #define KASAN_SHADOW_MASK (KASAN_SHADOW_SCALE_SIZE - 1) #define KASAN_ALLOCA_SCALE_SIZE 32 Index: src/sys/sys/asan.h diff -u src/sys/sys/asan.h:1.13 src/sys/sys/asan.h:1.14 --- src/sys/sys/asan.h:1.13 Sat Feb 8 09:05:08 2020 +++ src/sys/sys/asan.h Fri Jul 10 07:48:28 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: asan.h,v 1.13 2020/02/08 09:05:08 maxv Exp $ */ +/* $NetBSD: asan.h,v 1.14 2020/07/10 07:48:28 skrll Exp $ */ /* * Copyright (c) 2018-2019 The NetBSD Foundation, Inc. @@ -40,6 +40,9 @@ #include #include +/* ASAN constants. Part of the compiler ABI. */ +#define KASAN_SHADOW_SCALE_SHIFT 3 + /* Stack redzone values. Part of the compiler ABI. */ #define KASAN_STACK_LEFT 0xF1 #define KASAN_STACK_MID 0xF2
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Fri Jul 10 07:48:28 UTC 2020 Modified Files: src/sys/kern: subr_asan.c src/sys/sys: asan.h Log Message: Expose KASAN_SHADOW_SCALE_SHIFT. OK'ed by maxv. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/kern/subr_asan.c cvs rdiff -u -r1.13 -r1.14 src/sys/sys/asan.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Fri Jul 10 07:31:33 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h src/sys/arch/evbarm/fdt: platform.h Log Message: Do previous differently for now To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/include/arm32/vmparam.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/fdt/platform.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/include/arm32/vmparam.h diff -u src/sys/arch/arm/include/arm32/vmparam.h:1.49 src/sys/arch/arm/include/arm32/vmparam.h:1.50 --- src/sys/arch/arm/include/arm32/vmparam.h:1.49 Wed Jul 8 09:50:45 2020 +++ src/sys/arch/arm/include/arm32/vmparam.h Fri Jul 10 07:31:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.49 2020/07/08 09:50:45 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.50 2020/07/10 07:31:33 skrll Exp $ */ /* * Copyright (c) 2001, 2002 Wasabi Systems, Inc. @@ -94,7 +94,6 @@ #define VM_MIN_KERNEL_ADDRESS ((vaddr_t) KERNEL_BASE) #define VM_MAX_KERNEL_ADDRESS ((vaddr_t) -(PAGE_SIZE+1)) -#ifdef ARM_MMU_EXTENDED /* * kernel virtual space layout without direct map (common case) * @@ -108,17 +107,16 @@ * 0xf000_ - 256MB IO * */ -#define VM_KERNEL_IO_ADDRESS 0xf000 -#define VM_KERNEL_IO_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS) #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS -#define KERNEL_VM_BASE 0xc000 +#define VM_KERNEL_VM_BASE 0xc000 #else -#define KERNEL_VM_BASE 0x9000 +#define VM_KERNEL_VM_BASE 0x9000 #endif -#define KERNEL_VM_SIZE (KERNEL_IO_VBASE - KERNEL_VM_BASE) +#define VM_KERNEL_VM_SIZE (VM_KERNEL_IO_ADDRESS - VM_KERNEL_VM_BASE) -#endif +#define VM_KERNEL_IO_ADDRESS 0xf000 +#define VM_KERNEL_IO_SIZE (VM_MAX_KERNEL_ADDRESS - VM_KERNEL_IO_ADDRESS) #endif /* _ARM_ARM32_VMPARAM_H_ */ Index: src/sys/arch/evbarm/fdt/platform.h diff -u src/sys/arch/evbarm/fdt/platform.h:1.6 src/sys/arch/evbarm/fdt/platform.h:1.7 --- src/sys/arch/evbarm/fdt/platform.h:1.6 Wed Jul 8 09:50:45 2020 +++ src/sys/arch/evbarm/fdt/platform.h Fri Jul 10 07:31:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.6 2020/07/08 09:50:45 skrll Exp $ */ +/* $NetBSD: platform.h,v 1.7 2020/07/10 07:31:33 skrll Exp $ */ /*- * Copyright (c) 2015-2017 Jared McNeill @@ -41,6 +41,11 @@ void fdt_add_reserved_memory_range(uint6 #define KERNEL_VM_BASE VM_MIN_KERNEL_ADDRESS #define KERNEL_VM_SIZE (VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) +#else + +#define KERNEL_VM_BASE VM_KERNEL_VM_BASE +#define KERNEL_VM_SIZE VM_KERNEL_VM_SIZE + #endif /* !__aarch64 */ #endif /* _EVBARM_FDT_PLATFORM_H */
CVS commit: src/sys/arch
Module Name:src Committed By: skrll Date: Fri Jul 10 07:31:33 UTC 2020 Modified Files: src/sys/arch/arm/include/arm32: vmparam.h src/sys/arch/evbarm/fdt: platform.h Log Message: Do previous differently for now To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/include/arm32/vmparam.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/fdt/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Fri Jul 10 06:28:49 UTC 2020 Modified Files: src/share/man/man9: pci_configure_bus.9 Log Message: Remove trailing comma. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/pci_configure_bus.9 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/man9/pci_configure_bus.9 diff -u src/share/man/man9/pci_configure_bus.9:1.18 src/share/man/man9/pci_configure_bus.9:1.19 --- src/share/man/man9/pci_configure_bus.9:1.18 Fri Jul 10 02:27:13 2020 +++ src/share/man/man9/pci_configure_bus.9 Fri Jul 10 06:28:49 2020 @@ -1,4 +1,4 @@ -.\" $NetBSD: pci_configure_bus.9,v 1.18 2020/07/10 02:27:13 thorpej Exp $ +.\" $NetBSD: pci_configure_bus.9,v 1.19 2020/07/10 06:28:49 wiz Exp $ .\" .\" Copyright 2001 Wasabi Systems, Inc. .\" All rights reserved. @@ -296,7 +296,7 @@ This configuration example is taken from Note that this must be called before the PCI bus is attached during autoconfiguration. .Sh SEE ALSO -.Xr pci 4 , +.Xr pci 4 .Sh HISTORY .Fn pci_configure_bus was added in
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Fri Jul 10 06:28:49 UTC 2020 Modified Files: src/share/man/man9: pci_configure_bus.9 Log Message: Remove trailing comma. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man9/pci_configure_bus.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Fri Jul 10 06:15:23 UTC 2020
Modified Files:
src/sys/arch/x86/x86: identcpu_subr.c
Log Message:
Add missing NetBSD RCS Id.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/identcpu_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/identcpu_subr.c
diff -u src/sys/arch/x86/x86/identcpu_subr.c:1.6 src/sys/arch/x86/x86/identcpu_subr.c:1.7
--- src/sys/arch/x86/x86/identcpu_subr.c:1.6 Tue Jun 9 05:07:13 2020
+++ src/sys/arch/x86/x86/identcpu_subr.c Fri Jul 10 06:15:23 2020
@@ -1,3 +1,5 @@
+/* $NetBSD: identcpu_subr.c,v 1.7 2020/07/10 06:15:23 msaitoh Exp $ */
+
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +35,7 @@
* See src/usr.sbin/cpuctl/{Makefile, arch/i386.c}).
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: identcpu_subr.c,v 1.6 2020/06/09 05:07:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu_subr.c,v 1.7 2020/07/10 06:15:23 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "lapic.h"
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Fri Jul 10 06:15:23 UTC 2020 Modified Files: src/sys/arch/x86/x86: identcpu_subr.c Log Message: Add missing NetBSD RCS Id. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/x86/identcpu_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
