CVS commit: src/lib/librumphijack
Module Name:src
Committed By: ozaki-r
Date: Thu Jun 28 06:20:36 UTC 2018
Modified Files:
src/lib/librumphijack: hijack.c
Log Message:
rumphijack: don't modify a cmsg on just validating it
Pointed out by k-goda@IIJ
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/lib/librumphijack/hijack.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/librumphijack/hijack.c
diff -u src/lib/librumphijack/hijack.c:1.124 src/lib/librumphijack/hijack.c:1.125
--- src/lib/librumphijack/hijack.c:1.124 Mon Oct 23 06:52:17 2017
+++ src/lib/librumphijack/hijack.c Thu Jun 28 06:20:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: hijack.c,v 1.124 2017/10/23 06:52:17 ozaki-r Exp $ */
+/* $NetBSD: hijack.c,v 1.125 2018/06/28 06:20:36 ozaki-r Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@@ -34,7 +34,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: hijack.c,v 1.124 2017/10/23 06:52:17 ozaki-r Exp $");
+__RCSID("$NetBSD: hijack.c,v 1.125 2018/06/28 06:20:36 ozaki-r Exp $");
#endif
#include
@@ -1587,7 +1587,7 @@ write(int fd, const void *buf, size_t bl
*/
static int
-msg_convert(struct msghdr *msg, int (*func)(int))
+_msg_convert_fds(struct msghdr *msg, int (*func)(int), bool dryrun)
{
struct cmsghdr *cmsg;
@@ -1607,7 +1607,8 @@ msg_convert(struct msghdr *msg, int (*fu
if (newval < 0) {
return ENOTSUP;
}
-*fdp = newval;
+if (!dryrun)
+ *fdp = newval;
fdp++;
}
}
@@ -1615,6 +1616,20 @@ msg_convert(struct msghdr *msg, int (*fu
return 0;
}
+static int
+msg_convert_fds(struct msghdr *msg, int (*func)(int))
+{
+
+ return _msg_convert_fds(msg, func, false);
+}
+
+static int
+msg_check_fds(struct msghdr *msg, int (*func)(int))
+{
+
+ return _msg_convert_fds(msg, func, true);
+}
+
ssize_t
recvmsg(int fd, struct msghdr *msg, int flags)
{
@@ -1636,9 +1651,9 @@ recvmsg(int fd, struct msghdr *msg, int
* convert descriptors in the message.
*/
if (isrump) {
- msg_convert(msg, fd_rump2host);
+ msg_convert_fds(msg, fd_rump2host);
} else {
- msg_convert(msg, fd_host2host);
+ msg_convert_fds(msg, fd_host2host);
}
return ret;
}
@@ -1681,7 +1696,7 @@ sendmsg(int fd, const struct msghdr *msg
/*
* reject descriptors from a different kernel.
*/
- error = msg_convert(__UNCONST(msg),
+ error = msg_check_fds(__UNCONST(msg),
isrump ? fd_check_rump: fd_check_host);
if (error != 0) {
errno = error;
@@ -1700,7 +1715,7 @@ sendmsg(int fd, const struct msghdr *msg
*
* it's safer to copy and modify instead.
*/
- msg_convert(__UNCONST(msg), fd_host2rump);
+ msg_convert_fds(__UNCONST(msg), fd_host2rump);
op_sendmsg = GETSYSCALL(rump, SENDMSG);
} else {
op_sendmsg = GETSYSCALL(host, SENDMSG);
CVS commit: src/sys/net
Module Name:src Committed By: ozaki-r Date: Thu Jun 28 06:02:24 UTC 2018 Modified Files: src/sys/net: if_loop.c Log Message: loop: don't allocate a unnecessary link-state-change thread To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_loop.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/net/if_loop.c diff -u src/sys/net/if_loop.c:1.102 src/sys/net/if_loop.c:1.103 --- src/sys/net/if_loop.c:1.102 Tue Jun 26 06:48:02 2018 +++ src/sys/net/if_loop.c Thu Jun 28 06:02:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_loop.c,v 1.102 2018/06/26 06:48:02 msaitoh Exp $ */ +/* $NetBSD: if_loop.c,v 1.103 2018/06/28 06:02:24 ozaki-r Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.102 2018/06/26 06:48:02 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_loop.c,v 1.103 2018/06/28 06:02:24 ozaki-r Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -183,8 +183,9 @@ loop_clone_create(struct if_clone *ifc, ifp->if_mtu = LOMTU; ifp->if_flags = IFF_LOOPBACK | IFF_MULTICAST; + ifp->if_extflags = IFEF_NO_LINK_STATE_CHANGE; #ifdef NET_MPSAFE - ifp->if_extflags = IFEF_MPSAFE; + ifp->if_extflags |= IFEF_MPSAFE; #endif ifp->if_ioctl = loioctl; ifp->if_output = looutput;
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Jun 27 23:26:13 UTC 2018
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add LISPs (programming language & network protocol), Vim
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.210 src/share/misc/acronyms.comp:1.211
--- src/share/misc/acronyms.comp:1.210 Tue Jun 26 22:16:45 2018
+++ src/share/misc/acronyms.comp Wed Jun 27 23:26:13 2018
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.210 2018/06/26 22:16:45 sevan Exp $
+$NetBSD: acronyms.comp,v 1.211 2018/06/27 23:26:13 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -741,6 +741,8 @@ LILO LInux LOader
LILO last in, last out
LINT local interrupt
LIR local Internet registry
+LISP LISt Processor
+LISP Locator/ID Separation Protocol
LKM {Linux,loadable} kernel module
LKML Linux kernel mailing list
LL load linked
@@ -1484,6 +1486,7 @@ VG volume group
VGA Video Graphics Array
VHDCI very high density cable interconnect
VID {VLAN,voltage level} identifier
+VIM Vi IMproved
VIPT virtually indexed, physically tagged
VIVT virtually indexed, virtually tagged
VLAN virtual local area network
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Wed Jun 27 19:49:47 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: dts updated to 4.18-rc2 To generate a diff of this commit: cvs rdiff -u -r1.1530 -r1.1531 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1530 src/doc/3RDPARTY:1.1531 --- src/doc/3RDPARTY:1.1530 Thu Jun 21 12:02:15 2018 +++ src/doc/3RDPARTY Wed Jun 27 19:49:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1530 2018/06/21 12:02:15 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1531 2018/06/27 19:49:47 jmcneill Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1717,8 +1717,8 @@ Notes: external/gpl2/dtc/dtc2netbsd should be used to create directories to import Package: dts -Version: 4.17-rc2 -Current Vers: 4.17-rc2 +Version: 4.18-rc2 +Current Vers: 4.18-rc2 Maintainer: https://www.kernel.org/ Archive Site: https://cdn.kernel.org/pub/linux/kernel/v4.x/ Home Page: https://www.kernel.org/
CVS commit: src/doc
Module Name:src Committed By: kamil Date: Wed Jun 27 18:43:16 UTC 2018 Modified Files: src/doc: TODO.sanitizers Log Message: Remove the expr(1) entry from TODO.sanitizer (finished) While there, fix a typo in text. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/doc/TODO.sanitizers Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.sanitizers diff -u src/doc/TODO.sanitizers:1.1 src/doc/TODO.sanitizers:1.2 --- src/doc/TODO.sanitizers:1.1 Tue Jun 26 17:13:41 2018 +++ src/doc/TODO.sanitizers Wed Jun 27 18:43:16 2018 @@ -11,7 +11,6 @@ Short term: - upstream local patches, mostly to compiler-rt - develop fts(3) interceptors (MSan, for ls(1), find(1), mtree(8) - investigate and address the libcxx failing tests on NetBSD - - expr(1) fixes for issue detected with libFuzzer, addition of new ATF tests - no-ASLR boot.cfg option, required for MKSANITIZER Long term: @@ -34,7 +33,7 @@ Long term: - make MKSANITIZER usable with any supported by a compiler combination of sanitizers - detect and fix more bugs in basesystem - - pkgsrc integration with sanitizers and MKSANITIER (PKGSANITIER?) + - pkgsrc integration with sanitizers and MKSANITIZER (PKGSANITIZER?) - port what possible to !amd64 - fixes with the signal code - attach a NetBSD buildbot testing build of compiler-rt and executing tests
CVS commit: src/tests/bin/expr
Module Name:src
Committed By: kamil
Date: Wed Jun 27 17:39:30 UTC 2018
Modified Files:
src/tests/bin/expr: t_expr.sh
Log Message:
Add 3 more expr(1) ATF tests detecting overflow
Verify 0 * INT.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/bin/expr/t_expr.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/expr/t_expr.sh
diff -u src/tests/bin/expr/t_expr.sh:1.5 src/tests/bin/expr/t_expr.sh:1.6
--- src/tests/bin/expr/t_expr.sh:1.5 Wed Jun 27 17:14:47 2018
+++ src/tests/bin/expr/t_expr.sh Wed Jun 27 17:39:30 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_expr.sh,v 1.5 2018/06/27 17:14:47 kamil Exp $
+# $NetBSD: t_expr.sh,v 1.6 2018/06/27 17:39:30 kamil Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -96,6 +96,9 @@ overflow_body() {
"expr: integer overflow or underflow occurred for operation '-4611686018427387904 * -2'"
test_expr '-4611686018427387904 \* -3' \
"expr: integer overflow or underflow occurred for operation '-4611686018427387904 * -3'"
+ test_expr '0 \* -1' '0'
+ test_expr '0 \* 0' '0'
+ test_expr '0 \* 1' '0'
}
atf_test_case gtkmm
CVS commit: src/bin/expr
Module Name:src
Committed By: kamil
Date: Wed Jun 27 17:23:36 UTC 2018
Modified Files:
src/bin/expr: expr.y
Log Message:
Add a missing check to handle correctly 0 * 0 in expr(1)
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/bin/expr/expr.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/expr/expr.y
diff -u src/bin/expr/expr.y:1.44 src/bin/expr/expr.y:1.45
--- src/bin/expr/expr.y:1.44 Wed Jun 27 17:12:49 2018
+++ src/bin/expr/expr.y Wed Jun 27 17:23:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: expr.y,v 1.44 2018/06/27 17:12:49 kamil Exp $ */
+/* $NetBSD: expr.y,v 1.45 2018/06/27 17:23:36 kamil Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
%{
#include
#ifndef lint
-__RCSID("$NetBSD: expr.y,v 1.44 2018/06/27 17:12:49 kamil Exp $");
+__RCSID("$NetBSD: expr.y,v 1.45 2018/06/27 17:23:36 kamil Exp $");
#endif /* not lint */
#include
@@ -371,7 +371,7 @@ perform_arith_op(const char *left, const
if ((l < 0 && r < 0) ||
(r > 0 && l > INT64_MAX / r) ||
- (r <= 0 && r < INT64_MIN / l)) {
+ (r <= 0 && l != 0 && r < INT64_MIN / l)) {
yyerror("integer overflow or underflow occurred for "
"operation '%s %s %s'", left, op, right);
/* NOTREACHED */
CVS commit: src/tests/bin/expr
Module Name:src
Committed By: kamil
Date: Wed Jun 27 17:14:47 UTC 2018
Modified Files:
src/tests/bin/expr: t_expr.sh
Log Message:
Add a couple of new ATF expr(1) tests
Some of the newly covered test-cases contained regressions.
All tests pass.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/bin/expr/t_expr.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/bin/expr/t_expr.sh
diff -u src/tests/bin/expr/t_expr.sh:1.4 src/tests/bin/expr/t_expr.sh:1.5
--- src/tests/bin/expr/t_expr.sh:1.4 Tue Jun 12 18:54:39 2018
+++ src/tests/bin/expr/t_expr.sh Wed Jun 27 17:14:47 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_expr.sh,v 1.4 2018/06/12 18:54:39 kamil Exp $
+# $NetBSD: t_expr.sh,v 1.5 2018/06/27 17:14:47 kamil Exp $
#
# Copyright (c) 2007 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -80,6 +80,22 @@ overflow_body() {
"expr: integer overflow or underflow occurred for operation '-9223372036854775808 % -1'"
test_expr '-9223372036854775808 / -1' \
"expr: integer overflow or underflow occurred for operation '-9223372036854775808 / -1'"
+ test_expr '0 + -9223372036854775808' '-9223372036854775808'
+ test_expr '0 + -1' '-1'
+ test_expr '0 + 0' '0'
+ test_expr '0 + 1' '1'
+ test_expr '0 + 9223372036854775807' '9223372036854775807'
+ test_expr '-9223372036854775808 + 0' '-9223372036854775808'
+ test_expr '9223372036854775807 + 0' '9223372036854775807'
+ test_expr '4611686018427387904 \* -1' '-4611686018427387904'
+ test_expr '4611686018427387904 \* -2' '-9223372036854775808'
+ test_expr '4611686018427387904 \* -3' \
+ "expr: integer overflow or underflow occurred for operation '4611686018427387904 * -3'"
+ test_expr '-4611686018427387904 \* -1' '4611686018427387904'
+ test_expr '-4611686018427387904 \* -2' \
+ "expr: integer overflow or underflow occurred for operation '-4611686018427387904 * -2'"
+ test_expr '-4611686018427387904 \* -3' \
+ "expr: integer overflow or underflow occurred for operation '-4611686018427387904 * -3'"
}
atf_test_case gtkmm
CVS commit: src/bin/expr
Module Name:src
Committed By: kamil
Date: Wed Jun 27 17:12:50 UTC 2018
Modified Files:
src/bin/expr: expr.y
Log Message:
Improve the * operator handling in expr(1)
Fixes overflow detection in expressions INT * -UINT.
Detected with libFuzzer & UBSan.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/bin/expr/expr.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/expr/expr.y
diff -u src/bin/expr/expr.y:1.43 src/bin/expr/expr.y:1.44
--- src/bin/expr/expr.y:1.43 Thu Jun 14 02:46:56 2018
+++ src/bin/expr/expr.y Wed Jun 27 17:12:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: expr.y,v 1.43 2018/06/14 02:46:56 christos Exp $ */
+/* $NetBSD: expr.y,v 1.44 2018/06/27 17:12:49 kamil Exp $ */
/*_
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
%{
#include
#ifndef lint
-__RCSID("$NetBSD: expr.y,v 1.43 2018/06/14 02:46:56 christos Exp $");
+__RCSID("$NetBSD: expr.y,v 1.44 2018/06/27 17:12:49 kamil Exp $");
#endif /* not lint */
#include
@@ -351,17 +351,27 @@ perform_arith_op(const char *left, const
* Check for over-& underflow.
*/
- /* Simplify the conditions */
+ /*
+ * Simplify the conditions:
+ * - remove the case of both negative arguments
+ *unless the operation will cause an overflow
+ */
if (l < 0 && r < 0 && l != INT64_MIN && r != INT64_MIN) {
l = -l;
r = -r;
}
+ /* - remove the case of legative l and positive r */
+ if (l < 0 && r >= 0) {
+ /* Use res as a temporary variable */
+ res = l;
+ l = r;
+ r = res;
+ }
+
if ((l < 0 && r < 0) ||
- ((l != 0 && r != 0) &&
- (((l > 0 && r > 0) && (l > INT64_MAX / r)) ||
- l < 0 && r > 0) || (l > 0 && r < 0)) &&
- (r != -1 && (l < INT64_MIN / r))) {
+ (r > 0 && l > INT64_MAX / r) ||
+ (r <= 0 && r < INT64_MIN / l)) {
yyerror("integer overflow or underflow occurred for "
"operation '%s %s %s'", left, op, right);
/* NOTREACHED */
CVS commit: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner
Module Name:src
Committed By: jmcneill
Date: Wed Jun 27 16:44:38 UTC 2018
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6.dtsi
Log Message:
Fix merge problem.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.3 Wed Jun 27 16:32:14 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi Wed Jun 27 16:44:38 2018
@@ -459,55 +459,5 @@
#address-cells = <1>;
#size-cells = <0>;
};
-
- r_ccu: clock@701 {
- compatible = "allwinner,sun50i-h6-r-ccu";
- reg = <0x0701 0x400>;
- clocks = <&osc24M>, <&osc32k>, <&iosc>,
- <&ccu CLK_PLL_PERIPH0>;
- clock-names = "hosc", "losc", "iosc", "pll-periph";
- #clock-cells = <1>;
- #reset-cells = <1>;
- };
-
- r_intc: interrupt-controller@7021000 {
- compatible = "allwinner,sun50i-h6-r-intc",
- "allwinner,sun6i-a31-r-intc";
- interrupt-controller;
- #interrupt-cells = <2>;
- reg = <0x07021000 0x400>;
- interrupts = ;
- };
-
- r_pio: pinctrl@7022000 {
- compatible = "allwinner,sun50i-h6-r-pinctrl";
- reg = <0x07022000 0x400>;
- interrupts = ,
- ;
- clocks = <&r_ccu 2>, <&osc24M>, <&osc32k>;
- clock-names = "apb", "hosc", "losc";
- gpio-controller;
- #gpio-cells = <3>;
- interrupt-controller;
- #interrupt-cells = <3>;
-
- r_i2c_pins: r-i2c {
-pins = "PL0", "PL1";
-function = "s_i2c";
- };
- };
-
- r_i2c: i2c@7081400 {
- compatible = "allwinner,sun6i-a31-i2c";
- reg = <0x07081400 0x400>;
- interrupts = ;
- clocks = <&r_ccu 8>;
- resets = <&r_ccu 4>;
- pinctrl-names = "default";
- pinctrl-0 = <&r_i2c_pins>;
- status = "disabled";
- #address-cells = <1>;
- #size-cells = <0>;
- };
};
};
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jun 27 16:38:40 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: dts: add sun50i-h5-libretech-all-h3-cc.dts To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.18 src/sys/arch/evbarm/conf/GENERIC64:1.19 --- src/sys/arch/evbarm/conf/GENERIC64:1.18 Sat Jun 16 14:41:25 2018 +++ src/sys/arch/evbarm/conf/GENERIC64 Wed Jun 27 16:38:40 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.18 2018/06/16 14:41:25 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.19 2018/06/27 16:38:40 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -32,6 +32,7 @@ makeoptions DTS=" sun50i-a64-sopine-baseboard.dts sun50i-a64-teres-i.dts + sun50i-h5-libretech-all-h3-cc.dts sun50i-h5-nanopi-neo-plus2.dts sun50i-h5-nanopi-neo2.dts sun50i-h5-orangepi-pc2.dts
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jun 27 16:38:11 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: SUNXI Log Message: dts: add sun7i-a20-olimex-som-evb-emmc.dts, sun8i-h2-plus-libretech-all-h3-cc.dts, sun50i-h5-libretech-all-h3-cc.dts To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/evbarm/conf/SUNXI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/SUNXI diff -u src/sys/arch/evbarm/conf/SUNXI:1.73 src/sys/arch/evbarm/conf/SUNXI:1.74 --- src/sys/arch/evbarm/conf/SUNXI:1.73 Thu May 10 00:05:22 2018 +++ src/sys/arch/evbarm/conf/SUNXI Wed Jun 27 16:38:11 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: SUNXI,v 1.73 2018/05/10 00:05:22 jmcneill Exp $ +# $NetBSD: SUNXI,v 1.74 2018/06/27 16:38:11 jmcneill Exp $ # # Allwinner sunxi family # @@ -68,6 +68,7 @@ makeoptions DTS=" sun7i-a20-lamobo-r1.dts sun7i-a20-m3.dts sun7i-a20-mk808c.dts + sun7i-a20-olimex-som-evb-emmc.dts sun7i-a20-olimex-som-evb.dts sun7i-a20-olimex-som204-evb-emmc.dts sun7i-a20-olimex-som204-evb.dts @@ -89,6 +90,7 @@ makeoptions DTS=" sun8i-a83t-tbs-a711.dts sun8i-h2-plus-bananapi-m2-zero.dts + sun8i-h2-plus-libretech-all-h3-cc.dts sun8i-h2-plus-orangepi-r1.dts sun8i-h2-plus-orangepi-zero.dts @@ -120,6 +122,7 @@ makeoptions DTS=" sun50i-a64-sopine-baseboard.dts sun50i-a64-teres-i.dts + sun50i-h5-libretech-all-h3-cc.dts sun50i-h5-nanopi-neo-plus2.dts sun50i-h5-nanopi-neo2.dts sun50i-h5-orangepi-pc2.dts
CVS commit: src/sys/external/gpl2/dts/dist/arch
Module Name:src
Committed By: jmcneill
Date: Wed Jun 27 16:32:14 UTC 2018
Modified Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
bcm283x.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
sun50i-h6-pine-h64.dts sun50i-h6.dtsi
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
vexpress-v2m-rs1.dtsi
Removed Files:
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: exynos5440-sd5v1.dts
exynos5440-ssdk5440.dts exynos5440-tmu-sensor-conf.dtsi
exynos5440-trip-points.dtsi exynos5440.dtsi
ste-ccu8540-pinctrl.dtsi ste-ccu8540.dts ste-ccu9540.dts
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell:
berlin4ct-dmp.dts berlin4ct-stb.dts berlin4ct.dtsi
Log Message:
Merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-sd5v1.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi
\
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-trip-points.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-ssdk5440.dts
cvs rdiff -u -r1.1.1.5 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540.dts \
src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu9540.dts
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
\
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
cvs rdiff -u -r1.1.1.2 -r0 \
src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct.dtsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi:1.3 Sat Apr 28 18:28:25 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi Wed Jun 27 16:32:14 2018
@@ -83,12 +83,6 @@
bus-width = <4>;
};
-&pwm {
- pinctrl-names = "default";
- pinctrl-0 = <&pwm0_gpio40 &pwm1_gpio45>;
- status = "okay";
-};
-
&usb {
power-domains = <&power RPI_POWER_DOMAIN_USB>;
};
Index: src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.3 src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.4
--- src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi:1.3 Sat Apr 28 18:28:25 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi Wed Jun 27 16:32:14 2018
@@ -136,6 +136,7 @@
rng@7e104000 {
compatible = "brcm,bcm2835-rng";
reg = <0x7e104000 0x10>;
+ interrupts = <2 29>;
};
mailbox: mailbox@7e00b880 {
Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.2 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts:1.2 Wed May 2 10:06:56 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts Wed Jun 27 16:32:14 2018
@@ -238,6 +238,16 @@
};
};
+&r_i2c {
+ status = "okay";
+
+ pcf8563: rtc@51 {
+ compatible = "nxp,pcf8563";
+ reg = <0x51>;
+ #clock-cells = <0>;
+ };
+};
+
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_ph_pins>;
Index: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
diff -u src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.2 src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.3
--- src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi:1.2 Wed May 2 10:06:56 2018
+++ src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi Wed Jun 27 16:32:14 2018
@@ -459,5 +459,55 @@
#address-cells = <1>;
#size-cells
CVS commit: src/external/bsd/acpica/bin/iasl
Module Name:src
Committed By: maya
Date: Wed Jun 27 16:13:43 UTC 2018
Modified Files:
src/external/bsd/acpica/bin/iasl: Makefile
Log Message:
Remove unused code. No functional change intended.
- We don't need to define __NetBSD__, C compilers do this for us.
- Defines which don't appear anywhere in src
- Don't need libpthread/librt
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/acpica/bin/iasl/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/acpica/bin/iasl/Makefile
diff -u src/external/bsd/acpica/bin/iasl/Makefile:1.19 src/external/bsd/acpica/bin/iasl/Makefile:1.20
--- src/external/bsd/acpica/bin/iasl/Makefile:1.19 Thu May 31 09:08:25 2018
+++ src/external/bsd/acpica/bin/iasl/Makefile Wed Jun 27 16:13:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/05/31 09:08:25 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2018/06/27 16:13:43 maya Exp $
.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
PROG= iasl
@@ -11,13 +11,12 @@ TOPDIR= ${NETBSDSRCDIR}/sys/external/bsd
.include
CPPFLAGS+= -I${TOPDIR}/../include -I${TOPDIR} -I.
-CPPFLAGS+= -D__NetBSD__ -DACPI_ASL_COMPILER -DACPI_USE_ALTERNATE_TIMEOUT
-CPPFLAGS+= -D_USE_BERKELEY_YACC
+CPPFLAGS+= -DACPI_ASL_COMPILER -DACPI_USE_ALTERNATE_TIMEOUT
.if ${MKREPRO:Uno} == "yes"
CPPFLAGS+= -DACPI_REPRO
.endif
-LDADD+= -ll -ly -lrt -lpthread
-DPADD+= ${LIBL} ${LIBY} ${LIBRT} ${LIBPTHREAD}
+LDADD+= -ll -ly
+DPADD+= ${LIBL} ${LIBY}
DPSRCS= aslcompilerparse.y aslcompilerlex.c aslcompilerparse.c \
dtparserparse.c dtparserlex.c prparserparse.c prparserlex.c
CVS commit: src/external/gpl3/gcc/dist/libsanitizer
Module Name:src
Committed By: christos
Date: Wed Jun 27 15:57:20 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_allocator.cc
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common:
sanitizer_allocator.h
Log Message:
Reduce sizes for non _LP64 and compiler checks so that the code compiles
(but it will not work, since there is not enough address space to implement
the shadow space required).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc
cvs rdiff -u -r1.1.1.3 -r1.2 \
src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_allocator.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc:1.1.1.2 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc:1.2
--- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc:1.1.1.2 Thu Feb 1 20:58:47 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_allocator.cc Wed Jun 27 11:57:20 2018
@@ -26,7 +26,11 @@ namespace __lsan {
struct ChunkMetadata {
u8 allocated : 8; // Must be first.
ChunkTag tag : 2;
+#ifdef _LP64
uptr requested_size : 54;
+#else
+ uptr requested_size : 30;
+#endif
u32 stack_trace_id;
};
@@ -40,9 +44,15 @@ typedef SizeClassAllocator32<0, SANITIZE
sizeof(ChunkMetadata), SizeClassMap, kRegionSizeLog, ByteMap>
PrimaryAllocator;
#else
+#if _LP64
static const uptr kMaxAllowedMallocSize = 8UL << 30;
static const uptr kAllocatorSpace = 0x6000ULL;
static const uptr kAllocatorSize = 0x400ULL; // 4T.
+#else
+static const uptr kMaxAllowedMallocSize = 8UL << 20;
+static const uptr kAllocatorSpace = 0x6000UL;
+static const uptr kAllocatorSize = 0x4000ULL; // 2G.
+#endif
typedef SizeClassAllocator64 PrimaryAllocator;
#endif
Index: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_allocator.h
diff -u src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_allocator.h:1.1.1.3 src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_allocator.h:1.2
--- src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_allocator.h:1.1.1.3 Thu Feb 1 20:58:46 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_allocator.h Wed Jun 27 11:57:20 2018
@@ -475,9 +475,11 @@ class SizeClassAllocator64 {
private:
static const uptr kRegionSize = kSpaceSize / kNumClassesRounded;
static const uptr kSpaceEnd = kSpaceBeg + kSpaceSize;
+#if _LP64
COMPILER_CHECK(kSpaceBeg % kSpaceSize == 0);
// kRegionSize must be >= 2^32.
COMPILER_CHECK((kRegionSize) >= (1ULL << (SANITIZER_WORDSIZE / 2)));
+#endif
// Populate the free list with at most this number of bytes at once
// or with one element if its size is greater.
static const uptr kPopulateSize = 1 << 14;
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/lsan
Module Name:src
Committed By: christos
Date: Wed Jun 27 15:56:30 UTC 2018
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/lsan: lsan_interceptors.cc
Log Message:
use the proper types for operator new
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_interceptors.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_interceptors.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_interceptors.cc:1.1.1.2 src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_interceptors.cc:1.2
--- src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_interceptors.cc:1.1.1.2 Thu Feb 1 20:58:47 2018
+++ src/external/gpl3/gcc/dist/libsanitizer/lsan/lsan_interceptors.cc Wed Jun 27 11:56:30 2018
@@ -149,13 +149,13 @@ INTERCEPTOR(void, cfree, void *p) ALIAS(
return Allocate(stack, size, 1, kAlwaysClearMemory);
INTERCEPTOR_ATTRIBUTE
-void *operator new(uptr size) { OPERATOR_NEW_BODY; }
+void *operator new(size_t size) { OPERATOR_NEW_BODY; }
INTERCEPTOR_ATTRIBUTE
-void *operator new[](uptr size) { OPERATOR_NEW_BODY; }
+void *operator new[](size_t size) { OPERATOR_NEW_BODY; }
INTERCEPTOR_ATTRIBUTE
-void *operator new(uptr size, std::nothrow_t const&) { OPERATOR_NEW_BODY; }
+void *operator new(size_t size, std::nothrow_t const&) { OPERATOR_NEW_BODY; }
INTERCEPTOR_ATTRIBUTE
-void *operator new[](uptr size, std::nothrow_t const&) { OPERATOR_NEW_BODY; }
+void *operator new[](size_t size, std::nothrow_t const&) { OPERATOR_NEW_BODY; }
#define OPERATOR_DELETE_BODY \
ENSURE_LSAN_INITED;\
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Wed Jun 27 13:53:55 UTC 2018 Modified Files: src/share/man/man4: radio.4 Log Message: Use An. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/share/man/man4/radio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/radio.4 diff -u src/share/man/man4/radio.4:1.14 src/share/man/man4/radio.4:1.15 --- src/share/man/man4/radio.4:1.14 Wed Jun 27 13:51:21 2018 +++ src/share/man/man4/radio.4 Wed Jun 27 13:53:55 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: radio.4,v 1.14 2018/06/27 13:51:21 rkujawa Exp $ +.\" $NetBSD: radio.4,v 1.15 2018/06/27 13:53:55 wiz Exp $ .\" $RuOBSD: radio.4,v 1.4 2001/10/26 05:38:43 form Exp $ .\" $OpenBSD: radio.4,v 1.3 2001/12/05 10:58:54 mickey Exp $ .\" @@ -174,11 +174,17 @@ device driver appeared in and .Nx 1.6 . .Sh AUTHORS +.An -nosplit The .Nm -driver was written by Vladimir Popov and Maxim Tsyplakov for +driver was written by +.An Vladimir Popov +and +.An Maxim Tsyplakov +for .Ox and ported to .Nx -by Lennart Augustsson. +by +.An Lennart Augustsson . The man page was written by Vladimir Popov.
CVS commit: src/share/man/man4
Module Name:src Committed By: rkujawa Date: Wed Jun 27 13:51:21 UTC 2018 Modified Files: src/share/man/man4: radio.4 Log Message: Note slurm(4) driver, improve history. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/radio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/radio.4 diff -u src/share/man/man4/radio.4:1.13 src/share/man/man4/radio.4:1.14 --- src/share/man/man4/radio.4:1.13 Mon Jul 3 21:30:58 2017 +++ src/share/man/man4/radio.4 Wed Jun 27 13:51:21 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: radio.4,v 1.13 2017/07/03 21:30:58 wiz Exp $ +.\" $NetBSD: radio.4,v 1.14 2018/06/27 13:51:21 rkujawa Exp $ .\" $RuOBSD: radio.4,v 1.4 2001/10/26 05:38:43 form Exp $ .\" $OpenBSD: radio.4,v 1.3 2001/12/05 10:58:54 mickey Exp $ .\" @@ -38,6 +38,7 @@ .Cd "radio* at rt?" .Cd "radio* at rtii?" .Cd "radio* at sf2r?" +.Cd "radio* at slurm?" .Cd "radio* at udsbr?" .Pp .In sys/types.h @@ -175,5 +176,9 @@ and .Sh AUTHORS The .Nm -driver was written by Vladimir Popov and Maxim Tsyplakov. +driver was written by Vladimir Popov and Maxim Tsyplakov for +.Ox +and ported to +.Nx +by Lennart Augustsson. The man page was written by Vladimir Popov.
CVS commit: src/sys/arch
Module Name:src
Committed By: ryo
Date: Wed Jun 27 11:12:15 UTC 2018
Modified Files:
src/sys/arch/arm/arm32: genassym.cf
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/arm/cortex: a9_mpsubr.S
src/sys/arch/evbarm/conf: RPI2
src/sys/arch/evbarm/fdt: fdt_machdep.c
src/sys/arch/evbarm/rpi: rpi2_start.S rpi_start.S
Log Message:
on evbarm/RPI,RPI2, VERBOSE_INIT_ARM had broken.
XPUTC() of evbarm/rpi/rpi*_start.S uses bcm283[567]_platform_early_putchar()
and it requires stack.
fixed to allocate stack when starting from rpi*_start.S and a9_mpsubr.S if
needed.
to work XPUTC(), need to define VERBOSE_INIT_ARM and EARLYCONS option.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/arm/arm32/genassym.cf
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/arm/cortex/a9_mpsubr.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/RPI2
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/fdt/fdt_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/rpi/rpi2_start.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/rpi/rpi_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.77 src/sys/arch/arm/arm32/genassym.cf:1.78
--- src/sys/arch/arm/arm32/genassym.cf:1.77 Wed Jan 24 09:04:44 2018
+++ src/sys/arch/arm/arm32/genassym.cf Wed Jun 27 11:12:14 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.77 2018/01/24 09:04:44 skrll Exp $
+# $NetBSD: genassym.cf,v 1.78 2018/06/27 11:12:14 ryo Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -150,6 +150,8 @@ define PAGE_SIZE PAGE_SIZE
define UPAGES UPAGES
define PGSHIFT PGSHIFT
+define MAXCPUS MAXCPUS
+
# Important offsets into the lwp and proc structs & associated constants
define L_PCB offsetof(struct lwp, l_addr)
define L_CPU offsetof(struct lwp, l_cpu)
Index: src/sys/arch/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.5 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.6
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.5 Fri Jun 8 18:09:43 2018
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Wed Jun 27 11:12:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.5 2018/06/08 18:09:43 jmcneill Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.6 2018/06/27 11:12:14 ryo Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.5 2018/06/08 18:09:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.6 2018/06/27 11:12:14 ryo Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -819,6 +819,10 @@ bcm2836_bootstrap(void)
__func__, i);
}
}
+#if defined(VERBOSE_INIT_ARM) && defined(EARLYCONS)
+ /* for viewability of secondary processor's debug outputs */
+ printf("\n");
+#endif
#endif
}
Index: src/sys/arch/arm/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.56 src/sys/arch/arm/cortex/a9_mpsubr.S:1.57
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.56 Wed Jun 27 11:05:50 2018
+++ src/sys/arch/arm/cortex/a9_mpsubr.S Wed Jun 27 11:12:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: a9_mpsubr.S,v 1.56 2018/06/27 11:05:50 ryo Exp $ */
+/* $NetBSD: a9_mpsubr.S,v 1.57 2018/06/27 11:12:14 ryo Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -589,6 +589,16 @@ cortex_mpfault:
.global cortex_mpstart
.type cortex_mpstart,%object
+#ifdef VERBOSE_INIT_ARM
+ .pushsection .bss
+ /* temporary stack for secondary CPUs (for XPUTC) */
+#define BOOT_STACKSIZE 256
+ .align 3
+ .space BOOT_STACKSIZE * (MAXCPUS - 1)
+bootstk_cpus:
+ .popsection
+#endif
+
cortex_mpstart:
#ifndef MULTIPROCESSOR
//
@@ -601,6 +611,21 @@ cortex_mpstart:
setend be// switch to BE now
#endif
+#ifdef VERBOSE_INIT_ARM
+ mrc p15, 0, r1, c0, c0, 5 // MPIDR get
+ and r1, r1, #7 // get our cpu numder
+
+ mov r0, #BOOT_STACKSIZE
+ mul r1, r1, r0 // r1 = BOOT_STACKSIZE * cpuid
+
+ movw r0, #:lower16:bootstk_cpus
+ movt r0, #:upper16:bootstk_cpus
+#if !defined(KERNEL_BASES_EQUAL)
+ sub r0, r0, #KERNEL_BASE_VOFFSET
+#endif
+ sub sp, r0, r1 // sp = bootstk_cpus - r1
+#endif /* VERBOSE_INIT_ARM */
+
// We haven't used anything from memory yet so we can invalidate the
// L1 cache without fear of losing valuable data. Afterwards, we can
// flush icache without worrying about anything getting written back
Index: src/sys/arch/evbarm/conf/RPI2
diff -u src/sys/arch/evbarm/conf/RPI2:1.4 src/sys/arch/evbarm/conf/RPI2:1.5
--- src/sys/arch/evbarm/conf/RPI2:1.4 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/evbarm/conf/RPI2 Wed Jun 27 11:12:14 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI2,v 1.4 2017/12/10 21:38:26 skrll E
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: ryo Date: Wed Jun 27 11:05:50 UTC 2018 Modified Files: src/sys/arch/arm/cortex: a9_mpsubr.S Log Message: keep stack pointer even if chainging CPU mode. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/cortex/a9_mpsubr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/a9_mpsubr.S diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.55 src/sys/arch/arm/cortex/a9_mpsubr.S:1.56 --- src/sys/arch/arm/cortex/a9_mpsubr.S:1.55 Thu Jan 18 12:49:09 2018 +++ src/sys/arch/arm/cortex/a9_mpsubr.S Wed Jun 27 11:05:50 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: a9_mpsubr.S,v 1.55 2018/01/18 12:49:09 skrll Exp $ */ +/* $NetBSD: a9_mpsubr.S,v 1.56 2018/06/27 11:05:50 ryo Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. * All rights reserved. @@ -351,6 +351,7 @@ xputc: // cortex_init: mov r10, lr// save lr + mov r9, sp// save sp #if defined(CPU_CORTEXVIRT) /* Leave HYP mode and move into supervisor mode with IRQs/FIQs disabled. */ @@ -380,6 +381,8 @@ cortex_init: mov r0, #0 msr spsr_sxc, r0 // set SPSR[23:8] to known value + mov sp, r9// restore sp + #if 0 mrc p14, 0, r0, c0, c0, 0 // MIDR read ufbx r0, r0, #4, #4 // extract cortex part.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: ryo
Date: Wed Jun 27 11:05:38 UTC 2018
Modified Files:
src/sys/arch/evbarm/rpi: rpi2_start.S
Log Message:
remove unnecessary code. .Lmmu_init_table is in same section, and also not r8.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/rpi/rpi2_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rpi/rpi2_start.S
diff -u src/sys/arch/evbarm/rpi/rpi2_start.S:1.5 src/sys/arch/evbarm/rpi/rpi2_start.S:1.6
--- src/sys/arch/evbarm/rpi/rpi2_start.S:1.5 Sat Mar 3 13:46:32 2018
+++ src/sys/arch/evbarm/rpi/rpi2_start.S Wed Jun 27 11:05:38 2018
@@ -39,7 +39,7 @@
#include "assym.h"
-RCSID("$NetBSD: rpi2_start.S,v 1.5 2018/03/03 13:46:32 skrll Exp $")
+RCSID("$NetBSD: rpi2_start.S,v 1.6 2018/06/27 11:05:38 ryo Exp $")
#if defined(KERNEL_BASES_EQUAL)
#define CALL(f) bl _C_LABEL(f)
@@ -124,9 +124,6 @@ _C_LABEL(rpi_start):
movt r0, #:upper16:TEMP_L1_TABLE
movw r1, #:lower16:.Lmmu_init_table
movt r1, #:upper16:.Lmmu_init_table
-#if !defined(KERNEL_BASES_EQUAL)
- sub r8, r8, #KERNEL_BASE_VOFFSET
-#endif
bl arm_boot_l1pt_init
XPUTC(#'D')
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Wed Jun 27 07:51:36 UTC 2018 Modified Files: src/sys/dev/mii: rgephy.c rgephyreg.h Log Message: Use definitions in mii.h and mdio.h. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/dev/mii/rgephy.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/mii/rgephyreg.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/rgephy.c diff -u src/sys/dev/mii/rgephy.c:1.43 src/sys/dev/mii/rgephy.c:1.44 --- src/sys/dev/mii/rgephy.c:1.43 Tue Jun 19 10:36:41 2018 +++ src/sys/dev/mii/rgephy.c Wed Jun 27 07:51:36 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: rgephy.c,v 1.43 2018/06/19 10:36:41 jmcneill Exp $ */ +/* $NetBSD: rgephy.c,v 1.44 2018/06/27 07:51:36 msaitoh Exp $ */ /* * Copyright (c) 2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.43 2018/06/19 10:36:41 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.44 2018/06/27 07:51:36 msaitoh Exp $"); /* @@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1 #include #include +#include #include #include @@ -675,9 +676,9 @@ rgephy_reset(struct mii_softc *sc) /* RTL8211F */ delay(1); /* disable EEE */ - PHY_WRITE(sc, RGEPHY_MII_MACR, 0x0007); - PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x003c); - PHY_WRITE(sc, RGEPHY_MII_MACR, 0x4007); - PHY_WRITE(sc, RGEPHY_MII_MAADR, 0x); + PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_ADDRESS | MDIO_MMD_AN); + PHY_WRITE(sc, MII_MMDAADR, MDIO_AN_EEEADVERT); + PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_DATANPI | MDIO_MMD_AN); + PHY_WRITE(sc, MII_MMDAADR, 0x); } } Index: src/sys/dev/mii/rgephyreg.h diff -u src/sys/dev/mii/rgephyreg.h:1.10 src/sys/dev/mii/rgephyreg.h:1.11 --- src/sys/dev/mii/rgephyreg.h:1.10 Tue Jun 19 10:36:41 2018 +++ src/sys/dev/mii/rgephyreg.h Wed Jun 27 07:51:36 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: rgephyreg.h,v 1.10 2018/06/19 10:36:41 jmcneill Exp $ */ +/* $NetBSD: rgephyreg.h,v 1.11 2018/06/27 07:51:36 msaitoh Exp $ */ /* * Copyright (c) 2003 @@ -64,10 +64,6 @@ #define RGEPHY_MII_PHYCR1 0x18 /* PHY Specific control register 1 */ #define RGEPHY_PHYCR1_MDI_MMCE __BIT(9) #define RGEPHY_PHYCR1_ALDPS_EN __BIT(2) -#define RGEPHY_MII_MACR 0x0d /* MMD Access control register */ -#define RGEPHY_MACR_FUNCTION __BITS(15,14) -#define RGEPHY_MACR_DEVAD __BITS(4,0) -#define RGEPHY_MII_MAADR 0x0e /* MMD Access address data register */ #define RGEPHY_MII_PHYSR 0x1a /* PHY Specific status register */ #define RGEPHY_PHYSR_ALDPS __BIT(14)
