CVS commit: src/tests/rump/kernspace
Module Name:src Committed By: thorpej Date: Fri Jan 4 05:35:24 UTC 2019 Modified Files: src/tests/rump/kernspace: threadpool.c Log Message: Fix a silly bug the "cancel thrash" test: the exit condition for the job was never set, and so if the job actually got started before the cancellation request came in, it would never finish and the cancellation request would just hang forever. Should address a spurious automated test failure reported by kre@. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/rump/kernspace/threadpool.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/rump/kernspace
Module Name:src
Committed By: thorpej
Date: Fri Jan 4 05:35:24 UTC 2019
Modified Files:
src/tests/rump/kernspace: threadpool.c
Log Message:
Fix a silly bug the "cancel thrash" test: the exit condition for the
job was never set, and so if the job actually got started before the
cancellation request came in, it would never finish and the cancellation
request would just hang forever.
Should address a spurious automated test failure reported by kre@.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/rump/kernspace/threadpool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/kernspace/threadpool.c
diff -u src/tests/rump/kernspace/threadpool.c:1.4 src/tests/rump/kernspace/threadpool.c:1.5
--- src/tests/rump/kernspace/threadpool.c:1.4 Fri Dec 28 19:54:36 2018
+++ src/tests/rump/kernspace/threadpool.c Fri Jan 4 05:35:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: threadpool.c,v 1.4 2018/12/28 19:54:36 thorpej Exp $ */
+/* $NetBSD: threadpool.c,v 1.5 2019/01/04 05:35:24 thorpej Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
#if !defined(lint)
-__RCSID("$NetBSD: threadpool.c,v 1.4 2018/12/28 19:54:36 thorpej Exp $");
+__RCSID("$NetBSD: threadpool.c,v 1.5 2019/01/04 05:35:24 thorpej Exp $");
#endif /* !lint */
#include
@@ -120,10 +120,12 @@ test_job_func_cancel(struct threadpool_j
{
struct test_job_data *data =
container_of(job, struct test_job_data, job);
-
+
mutex_enter(>mutex);
- data->count = 1;
- cv_broadcast(>cond);
+ if (data->count == 0) {
+ data->count = 1;
+ cv_broadcast(>cond);
+ }
while (data->count != FINAL_COUNT - 1)
cv_wait(>cond, >mutex);
data->count = FINAL_COUNT;
@@ -257,7 +259,26 @@ rumptest_threadpool_job_cancelthrash(voi
mutex_exit();
mutex_enter();
}
+ /*
+ * If the job managed to start, ensure that its exit
+ * condition is met so that we don't wait forever
+ * for the job to finish.
+ */
+ data.count = FINAL_COUNT - 1;
+ cv_broadcast();
+
threadpool_cancel_job(pool, );
+
+ /*
+ * After cancellation, either the job didn't start
+ * (data.count == FINAL_COUNT - 1, per above) or
+ * it finished (data.count == FINAL_COUNT).
+ */
+ KASSERT(data.count == (FINAL_COUNT - 1) ||
+ data.count == FINAL_COUNT);
+
+ /* Reset for the loop. */
+ data.count = 0;
}
mutex_exit();
CVS commit: src/lib/libedit
Module Name:src
Committed By: uwe
Date: Fri Jan 4 03:03:44 UTC 2019
Modified Files:
src/lib/libedit: refresh.c
Log Message:
Fix mis-applied change in previous. Don't increment r_oldcv twice.
PR lib/53803
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/lib/libedit/refresh.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/refresh.c
diff -u src/lib/libedit/refresh.c:1.55 src/lib/libedit/refresh.c:1.56
--- src/lib/libedit/refresh.c:1.55 Tue Oct 23 16:49:13 2018
+++ src/lib/libedit/refresh.c Fri Jan 4 03:03:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.55 2018/10/23 16:49:13 christos Exp $ */
+/* $NetBSD: refresh.c,v 1.56 2019/01/04 03:03:44 uwe Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: refresh.c,v 1.55 2018/10/23 16:49:13 christos Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.56 2019/01/04 03:03:44 uwe Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -1123,7 +1123,6 @@ re_fastputc(EditLine *el, wint_t c)
el->el_display[i - 1] = lastline;
} else {
el->el_cursor.v++;
- el->el_refresh.r_oldcv++;
lastline = el->el_display[++el->el_refresh.r_oldcv];
}
re__copy_and_pad(lastline, L"", (size_t)el->el_terminal.t_size.h);
CVS commit: src/lib/libedit
Module Name:src Committed By: uwe Date: Fri Jan 4 03:03:44 UTC 2019 Modified Files: src/lib/libedit: refresh.c Log Message: Fix mis-applied change in previous. Don't increment r_oldcv twice. PR lib/53803 To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/lib/libedit/refresh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios
Module Name:xsrc
Committed By: mrg
Date: Fri Jan 4 00:09:11 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c
Log Message:
redo previous slightly: restore packed attribute.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.7 xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.8
--- xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c:1.7 Wed Jan 2 18:51:58 2019
+++ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Fri Jan 4 00:09:11 2019
@@ -215,8 +215,10 @@ VOID IndirectIOCommand_CLEAR(PARSER_TEMP
pParserTempData->IndirectData &= ~((0x >> (32-pParserTempData->IndirectIOTablePointer[1])) << pParserTempData->IndirectIOTablePointer[2]);
}
-/* Avoid conflicts with older versions of compiler.h */
+/* from xorg-server 1.18 compiler.h */
+struct local__una_u32 { uint32_t x __attribute__((packed)); };
+/* Avoid conflicts with older versions of compiler.h */
#define ldw_u xldw_u
#define ldl_u xldl_u
#define stl_u xstl_u
@@ -224,20 +226,21 @@ VOID IndirectIOCommand_CLEAR(PARSER_TEMP
static __inline__ uint16_t ldw_u(uint16_t *p)
{
uint16_t ret;
- memmove(, p, sizeof(ret));
+ memmove(, p, sizeof(*p));
return ret;
}
static __inline__ uint32_t ldl_u(uint32_t *p)
{
uint32_t ret;
- memmove(, p, sizeof(ret));
+ memmove(, p, sizeof(*p));
return ret;
}
static __inline__ void stl_u(uint32_t val, uint32_t *p)
{
- memmove(p, , sizeof(*p));
+ struct local__una_u32 *ptr = (struct local__una_u32 *) p;
+ ptr->x = val;
}
UINT32 IndirectInputOutput(PARSER_TEMP_DATA STACK_BASED * pParserTempData)
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc
Committed By: mrg
Date: Fri Jan 4 00:09:24 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-ati/dist/src: theatre.h
Log Message:
minor style fix for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-ati/dist/src/theatre.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-ati/dist/src/theatre.h
diff -u xsrc/external/mit/xf86-video-ati/dist/src/theatre.h:1.2 xsrc/external/mit/xf86-video-ati/dist/src/theatre.h:1.3
--- xsrc/external/mit/xf86-video-ati/dist/src/theatre.h:1.2 Tue Jan 1 05:29:40 2019
+++ xsrc/external/mit/xf86-video-ati/dist/src/theatre.h Fri Jan 4 00:09:24 2019
@@ -11,9 +11,9 @@ typedef struct {
int theatre_num;
uint32_t theatre_id;
int mode;
- const char*microc_path;
- const char*microc_type;
-
+ const char* microc_path;
+ const char* microc_type;
+
uint16_t video_decoder_type;
uint32_t wStandard;
uint32_t wConnector;
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios
Module Name:xsrc Committed By: mrg Date: Fri Jan 4 00:09:11 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src/AtomBios: CD_Operations.c Log Message: redo previous slightly: restore packed attribute. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 \ xsrc/external/mit/xf86-video-ati/dist/src/AtomBios/CD_Operations.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-video-ati/dist/src
Module Name:xsrc Committed By: mrg Date: Fri Jan 4 00:09:24 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-ati/dist/src: theatre.h Log Message: minor style fix for previous. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-ati/dist/src/theatre.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg
Module Name:src
Committed By: mrg
Date: Thu Jan 3 23:39:47 UTC 2019
Modified Files:
src/external/mit/xorg/bin/proxymngr: Makefile
src/external/mit/xorg/bin/xauth: Makefile
src/external/mit/xorg/bin/xhost: Makefile
src/external/mit/xorg/lib/libSM: Makefile
Log Message:
define IPv6 unless not building INET6.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/proxymngr/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xauth/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xhost/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libSM/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/proxymngr/Makefile
diff -u src/external/mit/xorg/bin/proxymngr/Makefile:1.2 src/external/mit/xorg/bin/proxymngr/Makefile:1.3
--- src/external/mit/xorg/bin/proxymngr/Makefile:1.2 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/bin/proxymngr/Makefile Thu Jan 3 23:39:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
.include
@@ -23,6 +23,10 @@ FILESDIR= ${PROXYMANAGERDIR}
LDADD+= -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DIPv6
+.endif
+
.PATH: ${X11SRCDIR.${PROG}}
.include
Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.6 src/external/mit/xorg/bin/xauth/Makefile:1.7
--- src/external/mit/xorg/bin/xauth/Makefile:1.6 Sat Mar 4 23:23:21 2017
+++ src/external/mit/xorg/bin/xauth/Makefile Thu Jan 3 23:39:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/03/04 23:23:21 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/01/03 23:39:47 mrg Exp $
.include
@@ -10,6 +10,10 @@ CPPFLAGS+= -DHAVE_STRLCPY
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DIPv6
+.endif
+
CWARNFLAGS.clang= -Wno-empty-body
LDADD+= -lXau -lXmuu -lXt -lSM -lICE -lXext -lX11
Index: src/external/mit/xorg/bin/xhost/Makefile
diff -u src/external/mit/xorg/bin/xhost/Makefile:1.2 src/external/mit/xorg/bin/xhost/Makefile:1.3
--- src/external/mit/xorg/bin/xhost/Makefile:1.2 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xhost/Makefile Thu Jan 3 23:39:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
.include
@@ -6,6 +6,10 @@ PROG= xhost
CPPFLAGS+=${X11FLAGS.CONNECTION} -DBSD44SOCKETS
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DIPv6
+.endif
+
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/lib/libSM/Makefile
diff -u src/external/mit/xorg/lib/libSM/Makefile:1.3 src/external/mit/xorg/lib/libSM/Makefile:1.4
--- src/external/mit/xorg/lib/libSM/Makefile:1.3 Sat Sep 13 04:32:30 2008
+++ src/external/mit/xorg/lib/libSM/Makefile Thu Jan 3 23:39:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/09/13 04:32:30 cube Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/03 23:39:47 mrg Exp $
.include
@@ -19,6 +19,10 @@ CONN_DEFINES= ${X11FLAGS.CONNECTION} -DI
CPPFLAGS.sm_manager.c= $(CONN_DEFINES)
CPPFLAGS.sm_genid.c= $(CONN_DEFINES)
+.if (${USE_INET6} != "no")
+CPPFLAGS+= -DIPv6
+.endif
+
LIBDPLIBS=ICE ${.CURDIR}/../libICE
# XXXMRG
CVS commit: src/external/mit/xorg
Module Name:src Committed By: mrg Date: Thu Jan 3 23:39:47 UTC 2019 Modified Files: src/external/mit/xorg/bin/proxymngr: Makefile src/external/mit/xorg/bin/xauth: Makefile src/external/mit/xorg/bin/xhost: Makefile src/external/mit/xorg/lib/libSM: Makefile Log Message: define IPv6 unless not building INET6. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/proxymngr/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xauth/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xhost/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libSM/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: mrg
Date: Thu Jan 3 23:26:58 UTC 2019
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
XXX: add hw/xfree86/common to the include path.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.4 Mon Dec 31 11:14:04 2018
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Thu Jan 3 23:26:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/12/31 11:14:04 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $
.include
@@ -30,6 +30,7 @@ SRCS+= fbcmap_mi.c
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
-I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+ -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/fb \
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/render \
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src Committed By: mrg Date: Thu Jan 3 23:26:58 UTC 2019 Modified Files: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile Log Message: XXX: add hw/xfree86/common to the include path. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jan 3 23:24:50 UTC 2019 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: revert some of the previous update to xorg-server 1.20. i forgot that some of them were moved into makefiles so that Xx68k could build without them being defined. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.16 -r1.17 \ xsrc/external/mit/xorg-server/include/xorg-server.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/include/dix-config.h diff -u xsrc/external/mit/xorg-server/include/dix-config.h:1.30 xsrc/external/mit/xorg-server/include/dix-config.h:1.31 --- xsrc/external/mit/xorg-server/include/dix-config.h:1.30 Mon Dec 31 22:17:21 2018 +++ xsrc/external/mit/xorg-server/include/dix-config.h Thu Jan 3 23:24:49 2019 @@ -269,7 +269,9 @@ #define PANORAMIX 1 /* Support Present extension */ +#if 0 #define PRESENT 1 +#endif /* Overall prefix */ /* #define PROJECTROOT "/usr/X11R7" */ @@ -278,7 +280,9 @@ #define RANDR 1 /* Support Record extension */ +#if 0 #define XRECORD 1 +#endif /* Support RENDER extension */ #define RENDER 1 @@ -334,14 +338,18 @@ /* Build XFree86 BigFont extension */ /* #undef XF86BIGFONT */ +#if 0 /* Support XFree86 Video Mode extension */ #define XF86VIDMODE 1 +#endif /* Support XFixes extension */ #define XFIXES 1 +#if 0 /* Build XDGA support */ #define XFreeXDGA 1 +#endif /* Support Xinerama extension */ #define XINERAMA 1 @@ -371,7 +379,9 @@ #define DRI2 1 /* Build DBE support */ +#if 0 #define DBE 1 +#endif /* Vendor name */ #define XVENDORNAME "The X.Org Foundation" Index: xsrc/external/mit/xorg-server/include/xorg-server.h diff -u xsrc/external/mit/xorg-server/include/xorg-server.h:1.16 xsrc/external/mit/xorg-server/include/xorg-server.h:1.17 --- xsrc/external/mit/xorg-server/include/xorg-server.h:1.16 Mon Dec 31 10:19:09 2018 +++ xsrc/external/mit/xorg-server/include/xorg-server.h Thu Jan 3 23:24:49 2019 @@ -75,8 +75,10 @@ /* Internal define for Xinerama */ #define PANORAMIX 1 +#if 0 /* Support Present extension */ #define PRESENT 1 +#endif /* Support RANDR extension */ #define RANDR 1 @@ -111,6 +113,7 @@ /* Build XFree86 BigFont extension */ /* #undef XF86BIGFONT */ +#if 0 /* Support XFree86 Video Mode extension */ #define XF86VIDMODE 1 @@ -122,6 +125,7 @@ /* Support X Input extension */ #define XINPUT 1 +#endif /* XKB default rules */ #define XKB_DFLT_RULES "base" @@ -192,11 +196,13 @@ /* System has wscons console */ #define WSCONS_SUPPORT 1 +#if 0 /* Loadable XFree86 server awesomeness */ #define XFree86LOADER /* Use libpciaccess */ #define XSERVER_LIBPCIACCESS 1 +#endif /* X Access Control Extension */ #define XACE 1
CVS commit: src
Module Name:src Committed By: mrg Date: Thu Jan 3 23:25:53 UTC 2019 Modified Files: src/external/mit/xorg/server/drivers: Makefile.xf86-driver src/share/mk: bsd.x11.mk Log Message: move some defines from xorg-server dix-config.h back into makefiles, so that Xx68k can build. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 \ src/external/mit/xorg/server/drivers/Makefile.xf86-driver cvs rdiff -u -r1.126 -r1.127 src/share/mk/bsd.x11.mk 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: mrg
Date: Thu Jan 3 23:25:53 UTC 2019
Modified Files:
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/share/mk: bsd.x11.mk
Log Message:
move some defines from xorg-server dix-config.h back into makefiles,
so that Xx68k can build.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.126 -r1.127 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.26
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.25 Mon Dec 31 11:58:43 2018
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Thu Jan 3 23:25:52 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.25 2018/12/31 11:58:43 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.26 2019/01/03 23:25:52 mrg Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -37,7 +37,8 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
-DHAVE_XORG_SERVER_1_1_0 \
-DSERVER_1_5 \
-DXSERVER_LIBPCIACCESS \
- -DHAVE_XEXTPROTO_71
+ -DHAVE_XEXTPROTO_71 \
+ -DXFree86LOADER
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
CPPFLAGS+= -DHAVE_XAA_H
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.126 src/share/mk/bsd.x11.mk:1.127
--- src/share/mk/bsd.x11.mk:1.126 Mon Dec 31 11:19:58 2018
+++ src/share/mk/bsd.x11.mk Thu Jan 3 23:25:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.126 2018/12/31 11:19:58 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.127 2019/01/03 23:25:53 mrg Exp $
.include
@@ -44,7 +44,7 @@ X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTE
${X11FLAGS.PERVASIVE_EXTENSION}
X11FLAGS.DIX= -DHAVE_DIX_CONFIG_H -D_BSD_SOURCE -DHAS_FCHOWN \
- -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS \
+ -DHAS_STICKY_DIR_BIT -D_POSIX_THREAD_SAFE_FUNCTIONS=200112L \
-DHAVE_XORG_CONFIG_H
X11INCS.DIX= -I${X11INCSDIR}/freetype2 \
-I${X11INCSDIR}/pixman-1 \
@@ -88,7 +88,6 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
${MACHINE} == "x68k" || \
${MACHINE} == "vax")
# EXT_DEFINES
-. if ${XORG_SERVER_SUBDIR:Uxorg-server.old} == "xorg-server.old"
X11FLAGS.EXTENSION+= -DXF86VIDMODE
X11FLAGS.DIX+= -DDBE -DXRECORD -DPRESENT
@@ -96,7 +95,6 @@ X11FLAGS.DIX+= -DDBE -DXRECORD -DPRESEN
# ServerDefines
X11FLAGS.SERVER+= -DXFreeXDGA -DXF86VIDMODE
X11FLAGS.SERVER+= -DXINPUT -DXSERVER_LIBPCIACCESS
-. endif
.endif
.if ${MACHINE_ARCH} == "alpha" || \
CVS commit: xsrc/external/mit/xorg-server/include
Module Name:xsrc Committed By: mrg Date: Thu Jan 3 23:24:50 UTC 2019 Modified Files: xsrc/external/mit/xorg-server/include: dix-config.h xorg-server.h Log Message: revert some of the previous update to xorg-server 1.20. i forgot that some of them were moved into makefiles so that Xx68k could build without them being defined. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 xsrc/external/mit/xorg-server/include/dix-config.h cvs rdiff -u -r1.16 -r1.17 \ xsrc/external/mit/xorg-server/include/xorg-server.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/samsung
Module Name:src Committed By: jmcneill Date: Thu Jan 3 23:04:09 UTC 2019 Modified Files: src/sys/arch/arm/samsung: exynos_platform.c files.exynos Log Message: Add multi-cluster CPU spinup code for Exynos5422. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/samsung/exynos_platform.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/samsung/files.exynos 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/samsung
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 23:04:09 UTC 2019
Modified Files:
src/sys/arch/arm/samsung: exynos_platform.c files.exynos
Log Message:
Add multi-cluster CPU spinup code for Exynos5422.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/samsung/exynos_platform.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/samsung/files.exynos
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/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.20 src/sys/arch/arm/samsung/exynos_platform.c:1.21
--- src/sys/arch/arm/samsung/exynos_platform.c:1.20 Tue Oct 30 16:41:52 2018
+++ src/sys/arch/arm/samsung/exynos_platform.c Thu Jan 3 23:04:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.20 2018/10/30 16:41:52 skrll Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.21 2019/01/03 23:04:09 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -35,7 +35,7 @@
#include "ukbd.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.20 2018/10/30 16:41:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.21 2019/01/03 23:04:09 jmcneill Exp $");
#include
#include
@@ -62,60 +62,116 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_platf
void exynos_platform_early_putchar(char);
-#define EXYNOS5_SWRESET_REG 0x10040400
-
-#define EXYNOS_IOPHYSTOVIRT(a) \
-((vaddr_t)(((a) - EXYNOS_CORE_PBASE) + EXYNOS_CORE_VBASE))
-
#define EXYNOS5800_PMU_BASE 0x1004
#define EXYNOS5800_PMU_SIZE 0x2
-#define EXYNOS5800_PMU_CORE_CONFIG(n) (0x2000 + 0x80 * (n))
-#define EXYNOS5800_PMU_CORE_STATUS(n) (0x2004 + 0x80 * (n))
-#define EXYNOS5800_PMU_CORE_POWER_EN 0x3
-#define EXYNOS5800_SYSRAM_BASE 0x0207301c
-#define EXYNOS5800_SYSRAM_SIZE 0x4
-
-static void
-exynos_platform_bootstrap(void)
-{
-
-#if defined(MULTIPROCESSOR)
- arm_cpu_max = 1 + __SHIFTOUT(armreg_l2ctrl_read(), L2CTRL_NUMCPU);
-#endif
-}
+#define EXYNOS5800_PMU_SWRESET 0x0400
+#define EXYNOS5800_PMU_KFC_ETM_RESET(n) __BIT(20 + (n))
+#define EXYNOS5800_PMU_KFC_CORE_RESET(n) __BIT(8 + (n))
+#define EXYNOS5800_PMU_SPARE2 0x0908
+#define EXYNOS5800_PMU_SPARE3 0x090c
+#define EXYNOS5800_PMU_SWRESET_KFC_SEL 0x3
+#define EXYNOS5800_PMU_CORE_CONFIG(n) (0x2000 + 0x80 * (n))
+#define EXYNOS5800_PMU_CORE_STATUS(n) (0x2004 + 0x80 * (n))
+#define EXYNOS5800_PMU_CORE_POWER_EN 0x3
+#define EXYNOS5800_PMU_COMMON_CONFIG(n) (0x2500 + 0x80 * (n))
+#define EXYNOS5800_PMU_COMMON_POWER_EN 0x3
+#define EXYNOS5800_PMU_COMMON_OPTION(n) (0x2508 + 0x80 * (n))
+#define EXYNOS5800_PMU_USE_L2_COMMON_UP_STATE __BIT(30)
+#define EXYNOS5800_PMU_USE_ARM_CORE_DOWN_STATE __BIT(29)
+#define EXYNOS5800_PMU_AUTO_CORE_DOWN __BIT(9)
+
+#define EXYNOS5800_SYSRAM_BASE 0x02073000
+#define EXYNOS5800_SYSRAM_SIZE 0x1000
+#define EXYNOS5800_SYSRAM_HOTPLUG 0x001c
static void
exynos5800_mpstart(void)
{
#if defined(MULTIPROCESSOR)
- extern void cpu_mpstart(void);
bus_space_tag_t bst = _generic_bs_tag;
bus_space_handle_t pmu_bsh, sysram_bsh;
+ uint64_t mpidr, bp_mpidr;
uint32_t val, started = 0;
- int n;
+ u_int cpuindex, n;
+ int child;
bus_space_map(bst, EXYNOS5800_PMU_BASE, EXYNOS5800_PMU_SIZE, 0, _bsh);
bus_space_map(bst, EXYNOS5800_SYSRAM_BASE, EXYNOS5800_SYSRAM_SIZE, 0, _bsh);
- bus_space_write_4(bst, sysram_bsh, 0, KERN_VTOPHYS((vaddr_t)cpu_mpstart));
- bus_space_barrier(bst, sysram_bsh, 0, 4, BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
+ const int cpus = OF_finddevice("/cpus");
+ if (cpus == -1) {
+ aprint_error("%s: no /cpus node found\n", __func__);
+ return;
+ }
+
+ /* MPIDR affinity levels of boot processor. */
+ bp_mpidr = cpu_mpidr_aff_read();
+
+ /* Setup KFC reset */
+ bus_space_write_4(bst, pmu_bsh, EXYNOS5800_PMU_SPARE3, EXYNOS5800_PMU_SWRESET_KFC_SEL);
- for (n = 1; n < arm_cpu_max; n++) {
- bus_space_write_4(bst, pmu_bsh, EXYNOS5800_PMU_CORE_CONFIG(n),
+ const uint32_t option = EXYNOS5800_PMU_USE_L2_COMMON_UP_STATE |
+ EXYNOS5800_PMU_USE_ARM_CORE_DOWN_STATE |
+ EXYNOS5800_PMU_AUTO_CORE_DOWN;
+ val = bus_space_read_4(bst, pmu_bsh, EXYNOS5800_PMU_COMMON_OPTION(0));
+ bus_space_write_4(bst, pmu_bsh, EXYNOS5800_PMU_COMMON_OPTION(0), val | option);
+ val = bus_space_read_4(bst, pmu_bsh, EXYNOS5800_PMU_COMMON_OPTION(1));
+ bus_space_write_4(bst, pmu_bsh, EXYNOS5800_PMU_COMMON_OPTION(1), val | option);
+
+ bus_space_write_4(bst, sysram_bsh, EXYNOS5800_SYSRAM_HOTPLUG, KERN_VTOPHYS((vaddr_t)cpu_mpstart));
+ arm_dsb();
+
+ /* Power on clusters */
+ bus_space_write_4(bst, pmu_bsh, EXYNOS5800_PMU_COMMON_CONFIG(0),
+ EXYNOS5800_PMU_COMMON_POWER_EN);
+ bus_space_write_4(bst, pmu_bsh, EXYNOS5800_PMU_COMMON_CONFIG(1),
+ EXYNOS5800_PMU_COMMON_POWER_EN);
+
+ /* Boot APs */
+ cpuindex = 1;
+ for (child = OF_child(cpus); child; child = OF_peer(child)) {
+ if (fdtbus_get_reg64(child, 0, , NULL)
re: CVS commit: src
Roy Marples writes: > I can see both sides here, and it seems that our repository is split the > same way - we have src and xsrc. this split is generally considered a mistake by most of us these days. the only reason i did not import modular xorg components into src originally, when we moved from xfree to xorg, was that i did not want to deal with people complaining about it, but i would not hold back today since it has proven problematic at times. this fortunately doesn't affect having a special-for-Mesa version of llvm.. .mrg.
CVS commit: src/usr.sbin/rpcbind
Module Name:src
Committed By: christos
Date: Thu Jan 3 19:26:50 UTC 2019
Modified Files:
src/usr.sbin/rpcbind: rpcb_svc_com.c rpcbind.c
Log Message:
check strdup results too
include the function name in out of memory messages
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rpcbind/rpcb_svc_com.c
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/rpcbind/rpcbind.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/rpcbind/rpcb_svc_com.c
diff -u src/usr.sbin/rpcbind/rpcb_svc_com.c:1.21 src/usr.sbin/rpcbind/rpcb_svc_com.c:1.22
--- src/usr.sbin/rpcbind/rpcb_svc_com.c:1.21 Thu Jan 3 14:04:21 2019
+++ src/usr.sbin/rpcbind/rpcb_svc_com.c Thu Jan 3 14:26:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_svc_com.c,v 1.21 2019/01/03 19:04:21 christos Exp $ */
+/* $NetBSD: rpcb_svc_com.c,v 1.22 2019/01/03 19:26:50 christos Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/rpcb_svc_com.c 301770 2016-06-09 22:25:00Z pfg $ */
/*-
@@ -306,8 +306,12 @@ delete_prog(rpcprog_t prog)
reg.r_prog = rbl->rpcb_map.r_prog;
reg.r_vers = rbl->rpcb_map.r_vers;
reg.r_netid = strdup(rbl->rpcb_map.r_netid);
- (void)map_unset(, rpcbind_superuser);
- free(reg.r_netid);
+ if (reg.r_netid == NULL)
+ syslog(LOG_ERR, "%s: Cannot allocate memory", __func__);
+ else {
+ (void)map_unset(, rpcbind_superuser);
+ free(reg.r_netid);
+ }
}
}
@@ -508,16 +512,16 @@ create_rmtcall_fd(struct netconfig *ncon
nconf->nc_device, errno);
return (-1);
}
- xprt = svc_tli_create(fd, 0, (struct t_bind *) 0, 0, 0);
+ xprt = svc_tli_create(fd, 0, NULL, 0, 0);
if (xprt == NULL) {
if (debugging)
fprintf(stderr,
-"create_rmtcall_fd: svc_tli_create failed\n");
+"%s: svc_tli_create failed\n", __func__);
return (-1);
}
- rmt = malloc(sizeof(struct rmtcallfd_list));
+ rmt = malloc(sizeof(*rmt));
if (rmt == NULL) {
- syslog(LOG_ERR, "create_rmtcall_fd: no memory!");
+ syslog(LOG_ERR, "%s: Cannot allocate memory", __func__);
return (-1);
}
rmt->xprt = xprt;
@@ -813,9 +817,7 @@ rpcbproc_callit_com(struct svc_req *rqst
if (outbuf_alloc == NULL) {
if (reply_type == RPCBPROC_INDIRECT)
svcerr_systemerr(transp);
- if (debugging)
-fprintf(stderr,
-"rpcbproc_callit_com: No memory!\n");
+ syslog(LOG_ERR, "%s: Cannot allocate memory", __func__);
goto error;
}
xdrmem_create(, outbuf_alloc, sendsz, XDR_ENCODE);
@@ -1462,7 +1464,7 @@ add_pmaplist(RPCB *arg)
*/
pml = malloc(sizeof(*pml));
if (pml == NULL) {
- (void) syslog(LOG_ERR, "rpcbind: no memory!\n");
+ syslog(LOG_ERR, "%s: Cannot allocate memory", __func__);
return (1);
}
pml->pml_map = pmap;
@@ -1474,7 +1476,7 @@ add_pmaplist(RPCB *arg)
/* Attach to the end of the list */
for (fnd = list_pml; fnd->pml_next; fnd = fnd->pml_next)
- ;
+ continue;
fnd->pml_next = pml;
}
return (0);
Index: src/usr.sbin/rpcbind/rpcbind.c
diff -u src/usr.sbin/rpcbind/rpcbind.c:1.26 src/usr.sbin/rpcbind/rpcbind.c:1.27
--- src/usr.sbin/rpcbind/rpcbind.c:1.26 Thu Jan 3 14:04:21 2019
+++ src/usr.sbin/rpcbind/rpcbind.c Thu Jan 3 14:26:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcbind.c,v 1.26 2019/01/03 19:04:21 christos Exp $ */
+/* $NetBSD: rpcbind.c,v 1.27 2019/01/03 19:26:50 christos Exp $ */
/*-
* Copyright (c) 2009, Sun Microsystems, Inc.
@@ -482,9 +482,8 @@ init_transport(struct netconfig *nconf)
taddr.addr.len = taddr.addr.maxlen = addrlen;
taddr.addr.buf = malloc(addrlen);
if (taddr.addr.buf == NULL) {
-syslog(LOG_ERR,
-"cannot allocate memory for %s address",
-nconf->nc_netid);
+syslog(LOG_ERR, "%s: Cannot allocate memory",
+__func__);
if (res != NULL)
freeaddrinfo(res);
return 1;
@@ -540,8 +539,7 @@ init_transport(struct netconfig *nconf)
taddr.addr.len = taddr.addr.maxlen = addrlen;
taddr.addr.buf = malloc(addrlen);
if (taddr.addr.buf == NULL) {
- syslog(LOG_ERR, "cannot allocate memory for %s address",
- nconf->nc_netid);
+ syslog(LOG_ERR, "%s: Cannot allocate memory", __func__);
if (res != NULL)
freeaddrinfo(res);
return 1;
@@ -567,7 +565,7 @@ init_transport(struct netconfig *nconf)
my_xprt = (SVCXPRT *)svc_tli_create(fd, nconf, ,
RPC_MAXDATASIZE, RPC_MAXDATASIZE);
- if (my_xprt == (SVCXPRT *)NULL) {
+ if (my_xprt == NULL) {
syslog(LOG_ERR, "%s: could not create service",
nconf->nc_netid);
goto error;
@@ -592,7 +590,7 @@ init_transport(struct netconfig *nconf)
}
pml = malloc(sizeof(*pml));
if (pml == NULL) {
- syslog(LOG_ERR, "Cannot allocate memory");
+ syslog(LOG_ERR, "%s: Cannot allocate memory", __func__);
goto error;
}
@@ -609,7 +607,8 @@ init_transport(struct netconfig *nconf)
tcptrans = strdup(nconf->nc_netid);
if (tcptrans == NULL) {
free(pml);
-syslog(LOG_ERR, "Cannot allocate memory");
+
CVS commit: src/usr.sbin/rpcbind
Module Name:src Committed By: christos Date: Thu Jan 3 19:26:50 UTC 2019 Modified Files: src/usr.sbin/rpcbind: rpcb_svc_com.c rpcbind.c Log Message: check strdup results too include the function name in out of memory messages To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rpcbind/rpcb_svc_com.c cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/rpcbind/rpcbind.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/rpcbind
Module Name:src Committed By: christos Date: Thu Jan 3 19:04:21 UTC 2019 Modified Files: src/usr.sbin/rpcbind: check_bound.c rpcb_stat.c rpcb_svc_4.c rpcb_svc_com.c rpcbind.c util.c Log Message: Handle memory allocations and error exit codes consistently. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/rpcbind/check_bound.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/rpcbind/rpcb_stat.c cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/rpcbind/rpcb_svc_4.c cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/rpcbind/rpcb_svc_com.c cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/rpcbind/rpcbind.c cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rpcbind/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/rpcbind
Module Name:src
Committed By: christos
Date: Thu Jan 3 19:04:21 UTC 2019
Modified Files:
src/usr.sbin/rpcbind: check_bound.c rpcb_stat.c rpcb_svc_4.c
rpcb_svc_com.c rpcbind.c util.c
Log Message:
Handle memory allocations and error exit codes consistently.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/rpcbind/check_bound.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/rpcbind/rpcb_stat.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/rpcbind/rpcb_svc_4.c
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/rpcbind/rpcb_svc_com.c
cvs rdiff -u -r1.25 -r1.26 src/usr.sbin/rpcbind/rpcbind.c
cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/rpcbind/util.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/rpcbind/check_bound.c
diff -u src/usr.sbin/rpcbind/check_bound.c:1.7 src/usr.sbin/rpcbind/check_bound.c:1.8
--- src/usr.sbin/rpcbind/check_bound.c:1.7 Wed Aug 16 04:44:40 2017
+++ src/usr.sbin/rpcbind/check_bound.c Thu Jan 3 14:04:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: check_bound.c,v 1.7 2017/08/16 08:44:40 christos Exp $ */
+/* $NetBSD: check_bound.c,v 1.8 2019/01/03 19:04:21 christos Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/check_bound.c 300942 2016-05-29 06:01:18Z ngie $ */
/*-
@@ -125,7 +125,7 @@ add_bndlist(struct netconfig *nconf, str
newnconf = getnetconfigent(nconf->nc_netid);
if (newnconf == NULL)
return (-1);
- fdl = malloc(sizeof(struct fdlist));
+ fdl = malloc(sizeof(*fdl));
if (fdl == NULL) {
freenetconfigent(newnconf);
syslog(LOG_ERR, "no memory!");
Index: src/usr.sbin/rpcbind/rpcb_stat.c
diff -u src/usr.sbin/rpcbind/rpcb_stat.c:1.6 src/usr.sbin/rpcbind/rpcb_stat.c:1.7
--- src/usr.sbin/rpcbind/rpcb_stat.c:1.6 Wed Aug 16 04:44:40 2017
+++ src/usr.sbin/rpcbind/rpcb_stat.c Thu Jan 3 14:04:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_stat.c,v 1.6 2017/08/16 08:44:40 christos Exp $ */
+/* $NetBSD: rpcb_stat.c,v 1.7 2019/01/03 19:04:21 christos Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/rpcb_stat.c 301605 2016-06-08 12:45:22Z ngie $ */
/*-
@@ -125,7 +125,7 @@ rpcbs_getaddr(rpcvers_t rtype, rpcprog_t
if (nconf == NULL) {
return;
}
- al = (rpcbs_addrlist *) malloc(sizeof (rpcbs_addrlist));
+ al = malloc(sizeof(*al));
if (al == NULL) {
return;
}
@@ -174,7 +174,7 @@ rpcbs_rmtcall(rpcvers_t rtype, rpcproc_t
if (nconf == NULL) {
return;
}
- rl = (rpcbs_rmtcalllist *) malloc(sizeof (rpcbs_rmtcalllist));
+ rl = malloc(sizeof(*rl));
if (rl == NULL) {
return;
}
Index: src/usr.sbin/rpcbind/rpcb_svc_4.c
diff -u src/usr.sbin/rpcbind/rpcb_svc_4.c:1.8 src/usr.sbin/rpcbind/rpcb_svc_4.c:1.9
--- src/usr.sbin/rpcbind/rpcb_svc_4.c:1.8 Wed Aug 16 04:44:40 2017
+++ src/usr.sbin/rpcbind/rpcb_svc_4.c Thu Jan 3 14:04:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_svc_4.c,v 1.8 2017/08/16 08:44:40 christos Exp $ */
+/* $NetBSD: rpcb_svc_4.c,v 1.9 2019/01/03 19:04:21 christos Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/rpcb_svc_4.c 258564 2013-11-25 16:44:02Z hrs $ */
/*-
@@ -387,7 +387,7 @@ rpcbproc_getaddrlist_4_local(void *arg,
/*
* Add it to rlist.
*/
- rp = malloc(sizeof(rpcb_entry_list));
+ rp = malloc(sizeof(*rp));
if (rp == NULL)
goto fail;
a = >rpcb_entry_map;
Index: src/usr.sbin/rpcbind/rpcb_svc_com.c
diff -u src/usr.sbin/rpcbind/rpcb_svc_com.c:1.20 src/usr.sbin/rpcbind/rpcb_svc_com.c:1.21
--- src/usr.sbin/rpcbind/rpcb_svc_com.c:1.20 Wed Aug 16 04:44:40 2017
+++ src/usr.sbin/rpcbind/rpcb_svc_com.c Thu Jan 3 14:04:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcb_svc_com.c,v 1.20 2017/08/16 08:44:40 christos Exp $ */
+/* $NetBSD: rpcb_svc_com.c,v 1.21 2019/01/03 19:04:21 christos Exp $ */
/* $FreeBSD: head/usr.sbin/rpcbind/rpcb_svc_com.c 301770 2016-06-09 22:25:00Z pfg $ */
/*-
@@ -179,7 +179,7 @@ map_set(RPCB *regp, char *owner)
/*
* add to the end of the list
*/
- rbl = malloc(sizeof(RPCBLIST));
+ rbl = malloc(sizeof(*rbl));
if (rbl == NULL)
return (FALSE);
a = &(rbl->rpcb_map);
@@ -1460,7 +1460,7 @@ add_pmaplist(RPCB *arg)
/*
* add to END of list
*/
- pml = malloc(sizeof(struct pmaplist));
+ pml = malloc(sizeof(*pml));
if (pml == NULL) {
(void) syslog(LOG_ERR, "rpcbind: no memory!\n");
return (1);
Index: src/usr.sbin/rpcbind/rpcbind.c
diff -u src/usr.sbin/rpcbind/rpcbind.c:1.25 src/usr.sbin/rpcbind/rpcbind.c:1.26
--- src/usr.sbin/rpcbind/rpcbind.c:1.25 Mon Aug 21 13:01:04 2017
+++ src/usr.sbin/rpcbind/rpcbind.c Thu Jan 3 14:04:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcbind.c,v 1.25 2017/08/21 17:01:04 christos Exp $ */
+/* $NetBSD: rpcbind.c,v 1.26 2019/01/03 19:04:21 christos Exp $ */
/*-
* Copyright (c) 2009, Sun Microsystems, Inc.
@@ -175,10 +175,11 @@ rpcbind_main(void *arg)
#ifndef RPCBIND_RUMP
/* Check that another rpcbind isn't already running. */
if ((rpcbindlockfd = open(RPCBINDDLOCK, O_RDONLY|O_CREAT, 0444)) == -1)
- err(1, "%s", RPCBINDDLOCK);
+ err(EXIT_FAILURE,
CVS commit: src/sys/arch/shark/ofw
Module Name:src Committed By: macallan Date: Thu Jan 3 18:28:21 UTC 2019 Modified Files: src/sys/arch/shark/ofw: vlpci.c Log Message: catch up with struct arm32_pci_chipset changes To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/shark/ofw/vlpci.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/shark/ofw
Module Name:src
Committed By: macallan
Date: Thu Jan 3 18:28:21 UTC 2019
Modified Files:
src/sys/arch/shark/ofw: vlpci.c
Log Message:
catch up with struct arm32_pci_chipset changes
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/shark/ofw/vlpci.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/shark/ofw/vlpci.c
diff -u src/sys/arch/shark/ofw/vlpci.c:1.8 src/sys/arch/shark/ofw/vlpci.c:1.9
--- src/sys/arch/shark/ofw/vlpci.c:1.8 Tue Apr 18 14:11:42 2017
+++ src/sys/arch/shark/ofw/vlpci.c Thu Jan 3 18:28:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vlpci.c,v 1.8 2017/04/18 14:11:42 flxd Exp $ */
+/* $NetBSD: vlpci.c,v 1.9 2019/01/03 18:28:21 macallan Exp $ */
/*
* Copyright (c) 2017 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.8 2017/04/18 14:11:42 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vlpci.c,v 1.9 2019/01/03 18:28:21 macallan Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -78,7 +78,7 @@ static const char * vlpci_pc_intr_string
size_t);
static const struct evcnt * vlpci_pc_intr_evcnt(void *, pci_intr_handle_t);
static void * vlpci_pc_intr_establish(void *, pci_intr_handle_t, int,
-int (*)(void *), void *);
+int (*)(void *), void *, const char *);
static void vlpci_pc_intr_disestablish(void *, void *);
#ifdef __HAVE_PCI_CONF_HOOK
@@ -433,7 +433,7 @@ vlpci_pc_intr_string(void *v, pci_intr_h
if (ih == PCI_INTERRUPT_PIN_NONE)
return NULL;
- snprintf(buf, len, "irq %lu", ih);
+ snprintf(buf, len, "irq %llu", ih);
return buf;
}
@@ -446,7 +446,7 @@ vlpci_pc_intr_evcnt(void *v, pci_intr_ha
static void *
vlpci_pc_intr_establish(void *v, pci_intr_handle_t pih, int ipl,
-int (*callback)(void *), void *arg)
+int (*callback)(void *), void *arg, const char *foo)
{
if (pih == 0)
CVS commit: src/distrib/utils/embedded/files
Module Name:src Committed By: jmcneill Date: Thu Jan 3 18:21:55 UTC 2019 Modified Files: src/distrib/utils/embedded/files: armv7_boot.cmd Log Message: Fix mmcpart for exynos SD card To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/files/armv7_boot.cmd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/embedded/files
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 18:21:55 UTC 2019
Modified Files:
src/distrib/utils/embedded/files: armv7_boot.cmd
Log Message:
Fix mmcpart for exynos SD card
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/files/armv7_boot.cmd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/files/armv7_boot.cmd
diff -u src/distrib/utils/embedded/files/armv7_boot.cmd:1.9 src/distrib/utils/embedded/files/armv7_boot.cmd:1.10
--- src/distrib/utils/embedded/files/armv7_boot.cmd:1.9 Thu Nov 22 21:11:37 2018
+++ src/distrib/utils/embedded/files/armv7_boot.cmd Thu Jan 3 18:21:55 2019
@@ -13,7 +13,7 @@ fi
if test "${soc}" = "exynos" ; then
setenv kernel netbsd-GENERIC.ub
setenv bootargs 'root=ld1a'
- setenv mmcpart 0:1
+ setenv mmcpart 2:1
setenv use_fdt 1
fi
if test "${soc}" = "sunxi" ; then
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Thu Jan 3 17:41:26 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Move x68k to the old xserver. It does not build with the new one (yet).
To generate a diff of this commit:
cvs rdiff -u -r1.1092 -r1.1093 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1092 src/share/mk/bsd.own.mk:1.1093
--- src/share/mk/bsd.own.mk:1.1092 Wed Jan 2 11:08:53 2019
+++ src/share/mk/bsd.own.mk Thu Jan 3 12:41:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1092 2019/01/02 16:08:53 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1093 2019/01/03 17:41:26 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1442,6 +1442,7 @@ X11SRCDIR.${_proto}proto?= ${X11SRCDIRM
${MACHINE} == "newsmips" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "vax" || \
+${MACHINE} == "x68k" || \
${MACHINE} == "zaurus"
HAVE_XORG_SERVER_VER?=110
.else
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Thu Jan 3 17:41:26 UTC 2019 Modified Files: src/share/mk: bsd.own.mk Log Message: Move x68k to the old xserver. It does not build with the new one (yet). To generate a diff of this commit: cvs rdiff -u -r1.1092 -r1.1093 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Jan 3 17:33:20 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: sync services/protocols with IANA versions To generate a diff of this commit: cvs rdiff -u -r1.1583 -r1.1584 src/doc/3RDPARTY cvs rdiff -u -r1.2479 -r1.2480 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1583 src/doc/3RDPARTY:1.1584 --- src/doc/3RDPARTY:1.1583 Mon Dec 31 22:06:39 2018 +++ src/doc/3RDPARTY Thu Jan 3 12:33:20 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1583 2019/01/01 03:06:39 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1584 2019/01/03 17:33:20 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1457,8 +1457,8 @@ Imported to src/common/dist/zlib and sha Remember to run cleantags Package: services, protocols -Version: 2015-11-13 (services), 2015-10-06 (protocols) -Current Vers: 2018-08-01 (services), 2017-10-13 (protocols) +Version: 2018-12-19 (services), 2017-10-13 (protocols) +Current Vers: 2018-12-19 (services), 2017-10-13 (protocols) Maintainer: IANA Archive Site: http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt (services) Archive Site: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.txt (protocols) @@ -1480,6 +1480,8 @@ Notes: - protocol 84 is defined for as ttp and iptm, merge the two entries since libc getprotoent() does not read the whole file and merge in the "files" implementation. + - add alias carp to vrrp + - put back 240 (pfsync), splitting the unassigned entries Package: pigz Version: 2.3.1 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2479 src/doc/CHANGES:1.2480 --- src/doc/CHANGES:1.2479 Mon Dec 31 22:06:39 2018 +++ src/doc/CHANGES Thu Jan 3 12:33:20 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2479 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2480 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -283,3 +283,5 @@ Changes from NetBSD 8.0 to NetBSD 9.0: tzdata: Updated to 2018i. [kre 20181231] tzcode: Updated to 2018i. [christos 20181231] binutils: Updated to FSF binutils 2.31.1. [christos 20181231] + services(5), protocols(5): Pull iana-generated services and protocols + [christos 20190103]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Jan 3 17:33:20 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: sync services/protocols with IANA versions To generate a diff of this commit: cvs rdiff -u -r1.1583 -r1.1584 src/doc/3RDPARTY cvs rdiff -u -r1.2479 -r1.2480 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: christos Date: Thu Jan 3 17:30:06 UTC 2019 Modified Files: src/etc: protocols services Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/etc/protocols cvs rdiff -u -r1.99 -r1.100 src/etc/services 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: src/etc
Module Name:src Committed By: christos Date: Thu Jan 3 17:30:06 UTC 2019 Modified Files: src/etc: protocols services Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/etc/protocols cvs rdiff -u -r1.99 -r1.100 src/etc/services 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/sunxi
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 15:49:09 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sun9i_a80_ccu.c
Log Message:
Add c0cpux and c1cpux clocks
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sun9i_a80_ccu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sun9i_a80_ccu.c
diff -u src/sys/arch/arm/sunxi/sun9i_a80_ccu.c:1.1 src/sys/arch/arm/sunxi/sun9i_a80_ccu.c:1.2
--- src/sys/arch/arm/sunxi/sun9i_a80_ccu.c:1.1 Sun Oct 8 18:00:36 2017
+++ src/sys/arch/arm/sunxi/sun9i_a80_ccu.c Thu Jan 3 15:49:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun9i_a80_ccu.c,v 1.1 2017/10/08 18:00:36 jmcneill Exp $ */
+/* $NetBSD: sun9i_a80_ccu.c,v 1.2 2019/01/03 15:49:09 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: sun9i_a80_ccu.c,v 1.1 2017/10/08 18:00:36 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun9i_a80_ccu.c,v 1.2 2019/01/03 15:49:09 jmcneill Exp $");
#include
#include
@@ -41,14 +41,19 @@ __KERNEL_RCSID(1, "$NetBSD: sun9i_a80_cc
#include
/* CCU */
+#define PLL_C0CPUX_CTRL_REG 0x000
+#define PLL_C1CPUX_CTRL_REG 0x004
#define PLL_PERIPH0_CTRL_REG 0x00c
#define PLL_PERIPH1_CTRL_REG 0x02c
+#define CPU_CLK_SRC_REG 0x050
+#define CPU_CLK_SRC_SELECT(cluster) __BIT((cluster) * 8)
#define GTBUS_CLK_CFG_REG 0x05c
#define AHB0_CLK_CFG_REG 0x060
#define AHB1_CLK_CFG_REG 0x064
#define AHB2_CLK_CFG_REG 0x068
#define APB0_CLK_CFG_REG 0x070
#define APB1_CLK_CFG_REG 0x074
+#define PLL_STABLE_STATUS_REG 0x09c
/* CCU_SCLK */
#define SDMMC0_CLK_REG 0x410
@@ -125,7 +130,91 @@ static const char *ahb2_parents[] = { "h
static const char *apb_parents[] = { "hosc", "pll_periph0" };
static const char *mmc_parents[] = { "hosc", "pll_periph0" };
+static kmutex_t cpux_axi_cfg_lock;
+
+static int
+sun9i_a80_ccu_cpux_set_rate(struct sunxi_ccu_softc *sc,
+struct sunxi_ccu_clk *clk, u_int rate)
+{
+ const int cluster = clk->u.nkmp.reg == PLL_C0CPUX_CTRL_REG ? 0 : 1;
+ struct sunxi_ccu_nkmp *nkmp = >u.nkmp;
+ uint32_t val;
+ u_int n;
+
+ n = rate / 2400;
+ if (n < 0x11 || n > 0xff)
+ return EINVAL;
+
+ /* Switch cluster to OSC24M clock */
+ mutex_enter(_axi_cfg_lock);
+ val = CCU_READ(sc, CPU_CLK_SRC_REG);
+ val &= ~CPU_CLK_SRC_SELECT(cluster);
+ CCU_WRITE(sc, CPU_CLK_SRC_REG, val);
+ mutex_exit(_axi_cfg_lock);
+
+ /* Set new PLL rate */
+ val = CCU_READ(sc, nkmp->reg);
+ val &= ~nkmp->n;
+ val |= __SHIFTIN(n, nkmp->n);
+ CCU_WRITE(sc, nkmp->reg, val);
+
+ /* Wait for PLL lock */
+ while ((CCU_READ(sc, PLL_STABLE_STATUS_REG) & nkmp->lock) == 0)
+ ;
+
+ /* Switch cluster back to CPUX PLL */
+ mutex_enter(_axi_cfg_lock);
+ val = CCU_READ(sc, CPU_CLK_SRC_REG);
+ val |= CPU_CLK_SRC_SELECT(cluster);
+ CCU_WRITE(sc, CPU_CLK_SRC_SELECT(cluster), val);
+ mutex_exit(_axi_cfg_lock);
+
+ return 0;
+}
+
static struct sunxi_ccu_clk sun9i_a80_ccu_clks[] = {
+ [A80_CLK_C0CPUX] = {
+ .type = SUNXI_CCU_NKMP,
+ .base.name = "pll_c0cpux",
+ .u.nkmp.reg = PLL_C0CPUX_CTRL_REG,
+ .u.nkmp.parent = "hosc",
+ .u.nkmp.n = __BITS(15,8),
+ .u.nkmp.k = 0,
+ .u.nkmp.m = __BITS(1,0),
+ .u.nkmp.p = __BIT(16),
+ .u.nkmp.enable = __BIT(31),
+ .u.nkmp.flags = SUNXI_CCU_NKMP_SCALE_CLOCK |
+ SUNXI_CCU_NKMP_FACTOR_N_EXACT |
+ SUNXI_CCU_NKMP_FACTOR_P_X4,
+ .u.nkmp.lock = __BIT(1),/* PLL_STABLE_STATUS_REG */
+ .u.nkmp.table = NULL,
+ .enable = sunxi_ccu_nkmp_enable,
+ .get_rate = sunxi_ccu_nkmp_get_rate,
+ .set_rate = sun9i_a80_ccu_cpux_set_rate,
+ .get_parent = sunxi_ccu_nkmp_get_parent,
+ },
+
+ [A80_CLK_C1CPUX] = {
+ .type = SUNXI_CCU_NKMP,
+ .base.name = "pll_c1cpux",
+ .u.nkmp.reg = PLL_C1CPUX_CTRL_REG,
+ .u.nkmp.parent = "hosc",
+ .u.nkmp.n = __BITS(15,8),
+ .u.nkmp.k = 0,
+ .u.nkmp.m = __BITS(1,0),
+ .u.nkmp.p = __BIT(16),
+ .u.nkmp.enable = __BIT(31),
+ .u.nkmp.flags = SUNXI_CCU_NKMP_SCALE_CLOCK |
+ SUNXI_CCU_NKMP_FACTOR_N_EXACT |
+ SUNXI_CCU_NKMP_FACTOR_P_X4,
+ .u.nkmp.lock = __BIT(1),/* PLL_STABLE_STATUS_REG */
+ .u.nkmp.table = NULL,
+ .enable = sunxi_ccu_nkmp_enable,
+ .get_rate = sunxi_ccu_nkmp_get_rate,
+ .set_rate = sun9i_a80_ccu_cpux_set_rate,
+ .get_parent = sunxi_ccu_nkmp_get_parent,
+ },
+
SUNXI_CCU_NKMP(A80_CLK_PLL_PERIPH0, "pll_periph0", "hosc",
PLL_PERIPH0_CTRL_REG, /* reg */
__BITS(15,8), /* n */
@@ -315,6 +404,8 @@ sun9i_a80_ccu_attach(device_t parent, de
sc->sc_clks = sun9i_a80_ccu_clks;
sc->sc_nclks = __arraycount(sun9i_a80_ccu_clks);
+ mutex_init(_axi_cfg_lock, MUTEX_DEFAULT, IPL_HIGH);
+
if (sunxi_ccu_attach(sc) != 0)
return;
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Thu Jan 3 15:49:09 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sun9i_a80_ccu.c Log Message: Add c0cpux and c1cpux clocks To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sun9i_a80_ccu.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/sunxi
Module Name:src Committed By: jmcneill Date: Thu Jan 3 15:34:41 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_mmc.c Log Message: Reduce timeouts and add hw reset support To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/sunxi/sunxi_mmc.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/sunxi
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 15:34:41 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_mmc.c
Log Message:
Reduce timeouts and add hw reset support
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/sunxi/sunxi_mmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.31 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.32
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.31 Thu Jan 3 14:49:05 2019
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c Thu Jan 3 15:34:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.31 2019/01/03 14:49:05 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.32 2019/01/03 15:34:41 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_sunximmc.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.31 2019/01/03 14:49:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.32 2019/01/03 15:34:41 jmcneill Exp $");
#include
#include
@@ -525,6 +525,15 @@ sunxi_mmc_set_clock(struct sunxi_mmc_sof
}
static void
+sunxi_mmc_hw_reset(struct sunxi_mmc_softc *sc)
+{
+ MMC_WRITE(sc, SUNXI_MMC_HWRST, 0);
+ delay(1000);
+ MMC_WRITE(sc, SUNXI_MMC_HWRST, 1);
+ delay(1000);
+}
+
+static void
sunxi_mmc_attach_i(device_t self)
{
struct sunxi_mmc_softc *sc = device_private(self);
@@ -535,6 +544,9 @@ sunxi_mmc_attach_i(device_t self)
if (sc->sc_pwrseq)
fdtbus_mmc_pwrseq_pre_power_on(sc->sc_pwrseq);
+ if (of_hasprop(sc->sc_phandle, "cap-mmc-hw-reset"))
+ sunxi_mmc_hw_reset(sc);
+
sunxi_mmc_host_reset(sc);
sunxi_mmc_bus_width(sc, 1);
sunxi_mmc_set_clock(sc, 400, false);
@@ -1144,7 +1156,7 @@ sunxi_mmc_exec_command(sdmmc_chipset_han
}
cmd->c_error = sunxi_mmc_wait_rint(sc,
- SUNXI_MMC_INT_ERROR|SUNXI_MMC_INT_CMD_DONE, hz * 10, poll);
+ SUNXI_MMC_INT_ERROR|SUNXI_MMC_INT_CMD_DONE, hz * 3, poll);
if (cmd->c_error == 0 && (sc->sc_intr_rint & SUNXI_MMC_INT_ERROR)) {
if (sc->sc_intr_rint & SUNXI_MMC_INT_RESP_TIMEOUT) {
cmd->c_error = ETIMEDOUT;
@@ -1165,7 +1177,7 @@ sunxi_mmc_exec_command(sdmmc_chipset_han
SUNXI_MMC_INT_ERROR|
SUNXI_MMC_INT_AUTO_CMD_DONE|
SUNXI_MMC_INT_DATA_OVER,
- hz*10, poll);
+ hz*3, poll);
if (cmd->c_error == 0 &&
(sc->sc_intr_rint & SUNXI_MMC_INT_ERROR)) {
cmd->c_error = ETIMEDOUT;
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Thu Jan 3 15:33:06 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c
Log Message:
Simplify
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm32/arm32_boot.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.29 src/sys/arch/arm/arm32/arm32_boot.c:1.30
--- src/sys/arch/arm/arm32/arm32_boot.c:1.29 Thu Jan 3 15:12:00 2019
+++ src/sys/arch/arm/arm32/arm32_boot.c Thu Jan 3 15:33:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.29 2019/01/03 15:12:00 jmcneill Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.30 2019/01/03 15:33:06 skrll Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.29 2019/01/03 15:12:00 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.30 2019/01/03 15:33:06 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -350,7 +350,7 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
VPRINTF("%s(%s): ", __func__, cpu_name(ci));
ci->ci_ctrl = armreg_sctlr_read();
uint32_t mpidr = armreg_mpidr_read();
- ci->ci_mpidr = armreg_mpidr_read();
+ ci->ci_mpidr = mpidr;
if (mpidr & MPIDR_MT) {
ci->ci_smt_id = mpidr & MPIDR_AFF0;
ci->ci_core_id = mpidr & MPIDR_AFF1;
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Thu Jan 3 15:33:06 UTC 2019 Modified Files: src/sys/arch/arm/arm32: arm32_boot.c Log Message: Simplify To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm32/arm32_boot.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/arm32
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 15:12:00 UTC 2019
Modified Files:
src/sys/arch/arm/arm32: arm32_boot.c cpu.c
Log Message:
Read mpidr and cpuid from the secondary processor itself instead of the
boot processor. While here, add Cortex-A15 r4p0 to supported list.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/arm/arm32/cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.28 src/sys/arch/arm/arm32/arm32_boot.c:1.29
--- src/sys/arch/arm/arm32/arm32_boot.c:1.28 Thu Jan 3 10:26:41 2019
+++ src/sys/arch/arm/arm32/arm32_boot.c Thu Jan 3 15:12:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.28 2019/01/03 10:26:41 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.29 2019/01/03 15:12:00 jmcneill Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.28 2019/01/03 10:26:41 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.29 2019/01/03 15:12:00 jmcneill Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -350,6 +350,7 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
VPRINTF("%s(%s): ", __func__, cpu_name(ci));
ci->ci_ctrl = armreg_sctlr_read();
uint32_t mpidr = armreg_mpidr_read();
+ ci->ci_mpidr = armreg_mpidr_read();
if (mpidr & MPIDR_MT) {
ci->ci_smt_id = mpidr & MPIDR_AFF0;
ci->ci_core_id = mpidr & MPIDR_AFF1;
@@ -359,6 +360,10 @@ cpu_hatch(struct cpu_info *ci, u_int cpu
ci->ci_package_id = mpidr & MPIDR_AFF1;
}
+ ci->ci_arm_cpuid = cpu_idnum();
+ ci->ci_arm_cputype = ci->ci_arm_cpuid & CPU_ID_CPU_MASK;
+ ci->ci_arm_cpurev = ci->ci_arm_cpuid & CPU_ID_REVISION_MASK;
+
/*
* Make sure we have the right vector page.
*/
Index: src/sys/arch/arm/arm32/cpu.c
diff -u src/sys/arch/arm/arm32/cpu.c:1.125 src/sys/arch/arm/arm32/cpu.c:1.126
--- src/sys/arch/arm/arm32/cpu.c:1.125 Thu Jan 3 10:26:41 2019
+++ src/sys/arch/arm/arm32/cpu.c Thu Jan 3 15:12:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.125 2019/01/03 10:26:41 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.126 2019/01/03 15:12:00 jmcneill Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.125 2019/01/03 10:26:41 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.126 2019/01/03 15:12:00 jmcneill Exp $");
#include
#include
@@ -111,21 +111,8 @@ cpu_attach(device_t dv, cpuid_t id)
ci = kmem_zalloc(sizeof(*ci), KM_SLEEP);
ci->ci_cpl = IPL_HIGH;
ci->ci_cpuid = id;
- ci->ci_mpidr = armreg_mpidr_read();
- if (ci->ci_mpidr & MPIDR_MT) {
- ci->ci_smt_id = ci->ci_mpidr & MPIDR_AFF0;
- ci->ci_core_id = ci->ci_mpidr & MPIDR_AFF1;
- ci->ci_package_id = ci->ci_mpidr & MPIDR_AFF2;
- } else {
- ci->ci_core_id = ci->ci_mpidr & MPIDR_AFF0;
- ci->ci_package_id = ci->ci_mpidr & MPIDR_AFF1;
- }
ci->ci_data.cpu_cc_freq = cpu_info_store.ci_data.cpu_cc_freq;
- ci->ci_arm_cpuid = cpu_idnum();
- ci->ci_arm_cputype = ci->ci_arm_cpuid & CPU_ID_CPU_MASK;
- ci->ci_arm_cpurev = ci->ci_arm_cpuid & CPU_ID_REVISION_MASK;
-
ci->ci_undefsave[2] = cpu_info_store.ci_undefsave[2];
cpu_info[unit] = ci;
@@ -191,13 +178,8 @@ cpu_attach(device_t dv, cpuid_t id)
* and we are done if this is a secondary processor.
*/
if (unit != 0) {
-#if 1
aprint_naive("\n");
aprint_normal("\n");
-#else
- aprint_naive(": %s\n", cpu_getmodel());
- aprint_normal(": %s\n", cpu_getmodel());
-#endif
mi_cpu_attach(ci);
#ifdef ARM_MMU_EXTENDED
pmap_tlb_info_attach(_tlb0_info, ci);
@@ -526,6 +508,8 @@ const struct cpuidtab cpuids[] = {
pN_steppings, "7A" },
{ CPU_ID_CORTEXA15R3, CPU_CLASS_CORTEX, "Cortex-A15 r3",
pN_steppings, "7A" },
+ { CPU_ID_CORTEXA15R4, CPU_CLASS_CORTEX, "Cortex-A15 r4",
+ pN_steppings, "7A" },
{ CPU_ID_CORTEXA17R1, CPU_CLASS_CORTEX, "Cortex-A17 r1",
pN_steppings, "7A" },
{ CPU_ID_CORTEXA35R0, CPU_CLASS_CORTEX, "Cortex-A35 r0",
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: jmcneill Date: Thu Jan 3 15:12:00 UTC 2019 Modified Files: src/sys/arch/arm/arm32: arm32_boot.c cpu.c Log Message: Read mpidr and cpuid from the secondary processor itself instead of the boot processor. While here, add Cortex-A15 r4p0 to supported list. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/arm32/arm32_boot.c cvs rdiff -u -r1.125 -r1.126 src/sys/arch/arm/arm32/cpu.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: jmcneill Date: Thu Jan 3 15:10:37 UTC 2019 Modified Files: src/sys/arch/arm/include: cputypes.h Log Message: Add CPU_ID_CORTEXA15R4 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/cputypes.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/cputypes.h diff -u src/sys/arch/arm/include/cputypes.h:1.4 src/sys/arch/arm/include/cputypes.h:1.5 --- src/sys/arch/arm/include/cputypes.h:1.4 Sat Nov 24 15:44:13 2018 +++ src/sys/arch/arm/include/cputypes.h Thu Jan 3 15:10:37 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cputypes.h,v 1.4 2018/11/24 15:44:13 skrll Exp $ */ +/* $NetBSD: cputypes.h,v 1.5 2019/01/03 15:10:37 jmcneill Exp $ */ /* * Copyright (c) 1998, 2001 Ben Harris @@ -153,6 +153,7 @@ #define CPU_ID_CORTEXA9R4 0x414fc090 #define CPU_ID_CORTEXA15R2 0x412fc0f0 #define CPU_ID_CORTEXA15R3 0x413fc0f0 +#define CPU_ID_CORTEXA15R4 0x414fc0f0 #define CPU_ID_CORTEXA17R1 0x411fc0e0 #define CPU_ID_CORTEXA35R0 0x410fd040 #define CPU_ID_CORTEXA53R0 0x410fd030
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: jmcneill Date: Thu Jan 3 15:10:37 UTC 2019 Modified Files: src/sys/arch/arm/include: cputypes.h Log Message: Add CPU_ID_CORTEXA15R4 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/cputypes.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/sunxi
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 14:49:05 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_mmc.c
Log Message:
Reduce sunxi_mmc_update_clock timeout from 10s to 1s
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/sunxi/sunxi_mmc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.30 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.31
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.30 Wed Jan 2 18:39:01 2019
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c Thu Jan 3 14:49:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.30 2019/01/02 18:39:01 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.31 2019/01/03 14:49:05 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_sunximmc.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.30 2019/01/02 18:39:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.31 2019/01/03 14:49:05 jmcneill Exp $");
#include
#include
@@ -761,7 +761,7 @@ sunxi_mmc_update_clock(struct sunxi_mmc_
SUNXI_MMC_CMD_UPCLK_ONLY |
SUNXI_MMC_CMD_WAIT_PRE_OVER;
MMC_WRITE(sc, SUNXI_MMC_CMD, cmd);
- retry = 0xf;
+ retry = 10;
while (--retry > 0) {
if (!(MMC_READ(sc, SUNXI_MMC_CMD) & SUNXI_MMC_CMD_START))
break;
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Thu Jan 3 14:49:05 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sunxi_mmc.c Log Message: Reduce sunxi_mmc_update_clock timeout from 10s to 1s To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/sunxi/sunxi_mmc.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/sunxi
Module Name:src Committed By: jmcneill Date: Thu Jan 3 14:44:21 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: files.sunxi sunxi_mc_smp.c sunxi_mc_smp.h sunxi_platform.c Log Message: Add Allwinner A80 SMP support. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/sunxi/files.sunxi cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_mc_smp.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_mc_smp.h cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/sunxi/sunxi_platform.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/sunxi
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 14:44:21 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: files.sunxi sunxi_mc_smp.c sunxi_mc_smp.h
sunxi_platform.c
Log Message:
Add Allwinner A80 SMP support.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/arm/sunxi/files.sunxi
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/sunxi/sunxi_mc_smp.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_mc_smp.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/sunxi/sunxi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/files.sunxi
diff -u src/sys/arch/arm/sunxi/files.sunxi:1.58 src/sys/arch/arm/sunxi/files.sunxi:1.59
--- src/sys/arch/arm/sunxi/files.sunxi:1.58 Thu Jan 3 11:01:59 2019
+++ src/sys/arch/arm/sunxi/files.sunxi Thu Jan 3 14:44:21 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.sunxi,v 1.58 2019/01/03 11:01:59 jmcneill Exp $
+# $NetBSD: files.sunxi,v 1.59 2019/01/03 14:44:21 jmcneill Exp $
#
# Configuration info for Allwinner sunxi family SoCs
#
@@ -312,7 +312,7 @@ defflag opt_soc.h SOC_SUN8I: SOC_SUNXI
defflag opt_soc.h SOC_SUN8I_A83T: SOC_SUN8I, SOC_SUNXI_MC
defflag opt_soc.h SOC_SUN8I_H3: SOC_SUN8I
defflag opt_soc.h SOC_SUN9I: SOC_SUNXI
-defflag opt_soc.h SOC_SUN9I_A80: SOC_SUN9I
+defflag opt_soc.h SOC_SUN9I_A80: SOC_SUN9I, SOC_SUNXI_MC
defflag opt_soc.h SOC_SUN50I: SOC_SUNXI
defflag opt_soc.h SOC_SUN50I_A64: SOC_SUN50I
defflag opt_soc.h SOC_SUN50I_H5: SOC_SUN50I, SOC_SUN8I_H3
Index: src/sys/arch/arm/sunxi/sunxi_mc_smp.c
diff -u src/sys/arch/arm/sunxi/sunxi_mc_smp.c:1.2 src/sys/arch/arm/sunxi/sunxi_mc_smp.c:1.3
--- src/sys/arch/arm/sunxi/sunxi_mc_smp.c:1.2 Thu Jan 3 12:52:40 2019
+++ src/sys/arch/arm/sunxi/sunxi_mc_smp.c Thu Jan 3 14:44:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mc_smp.c,v 1.2 2019/01/03 12:52:40 jmcneill Exp $ */
+/* $NetBSD: sunxi_mc_smp.c,v 1.3 2019/01/03 14:44:21 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mc_smp.c,v 1.2 2019/01/03 12:52:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mc_smp.c,v 1.3 2019/01/03 14:44:21 jmcneill Exp $");
#include
#include
@@ -46,14 +46,16 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_mc_smp
#include
-#define A83T_SMP_ENABLE_METHOD "allwinner,sun8i-a83t-smp"
+#define A80_PRCM_BASE 0x08001400
+#define A80_PRCM_SIZE 0x200
-#define PRCM_BASE 0x01f01400
-#define PRCM_SIZE 0x800
+#define A83T_PRCM_BASE 0x01f01400
+#define A83T_PRCM_SIZE 0x800
#define PRCM_CL_RST_CTRL(cluster) (0x4 + (cluster) * 0x4)
#define PRCM_CL_PWROFF(cluster) (0x100 + (cluster) * 0x4)
#define PRCM_CL_PWR_CLAMP(cluster, cpu) (0x140 + (cluster) * 0x10 + (cpu) * 0x4)
+#define PRCM_CPU_SOFT_ENTRY 0x164
#define CPUCFG_BASE 0x01f01c00
#define CPUCFG_SIZE 0x400
@@ -70,27 +72,31 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_mc_smp
#define CPUXCFG_CL_RST_DBG_RST(cpu) __BIT(16 + (cpu))
#define CPUXCFG_CL_RST_H_RST __BIT(12)
#define CPUXCFG_CL_RST_L2_RST __BIT(8)
+#define CPUXCFG_CL_RST_CX_RST(cpu) __BIT(4 + (cpu))
#define CPUXCFG_CL_CTRL0(cluster) (0x0 + (cluster) * 0x10)
#define CPUXCFG_CL_CTRL1(cluster) (0x4 + (cluster) * 0x10)
#define CPUXCFG_CL_CTRL1_ACINACTM __BIT(0)
-#define CCI_BASE 0x0179
-#define CCI_SLAVEIF3_BASE (CCI_BASE + 0x4000)
-#define CCI_SLAVEIF4_BASE (CCI_BASE + 0x5000)
+#define A80_CCI_BASE 0x01c9
+#define A83T_CCI_BASE 0x0179
+
+#define CCI_SLAVEIF3_OFFSET 0x4000
+#define CCI_SLAVEIF4_OFFSET 0x5000
extern struct bus_space arm_generic_bs_tag;
-uint32_t sunxi_mc_cci_port[MAXCPUS] = {
- CCI_SLAVEIF3_BASE,
- CCI_SLAVEIF3_BASE,
- CCI_SLAVEIF3_BASE,
- CCI_SLAVEIF3_BASE,
- CCI_SLAVEIF4_BASE,
- CCI_SLAVEIF4_BASE,
- CCI_SLAVEIF4_BASE,
- CCI_SLAVEIF4_BASE,
+enum sunxi_mc_soc {
+ MC_SOC_A80,
+ MC_SOC_A83T
+};
+
+enum sunxi_mc_cpu {
+ MC_CORE_CA7,
+ MC_CORE_CA15
};
+uint32_t sunxi_mc_cci_port[MAXCPUS];
+
static uint32_t
sunxi_mc_smp_pa(void)
{
@@ -106,28 +112,30 @@ sunxi_mc_smp_pa(void)
static int
sunxi_mc_smp_start(bus_space_tag_t bst, bus_space_handle_t prcm, bus_space_handle_t cpucfg,
-bus_space_handle_t cpuxcfg, u_int cluster, u_int cpu)
+bus_space_handle_t cpuxcfg, u_int cluster, u_int cpu, enum sunxi_mc_soc soc,
+enum sunxi_mc_cpu core)
{
uint32_t val;
int i;
- /* Set start vector */
- bus_space_write_4(bst, cpucfg, CPUCFG_P_REG0, sunxi_mc_smp_pa());
-
/* Assert core reset */
val = bus_space_read_4(bst, cpuxcfg, CPUXCFG_CL_RST(cluster));
val &= ~__BIT(cpu);
bus_space_write_4(bst, cpuxcfg, CPUXCFG_CL_RST(cluster), val);
- /* Assert power-on reset */
- val = bus_space_read_4(bst, cpucfg, CPUCFG_CL_RST(cluster));
- val &= ~__BIT(cpu);
- bus_space_write_4(bst, cpucfg, CPUCFG_CL_RST(cluster), val);
+ if (soc == MC_SOC_A83T) {
+ /* Assert power-on reset */
+ val =
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Thu Jan 3 14:14:08 UTC 2019 Modified Files: src/sys/arch/arm/fdt: cpu_fdt.c Log Message: No need to swap cpu-release-addr twice To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/fdt/cpu_fdt.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/fdt
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 14:14:08 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: cpu_fdt.c
Log Message:
No need to swap cpu-release-addr twice
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/fdt/cpu_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/cpu_fdt.c
diff -u src/sys/arch/arm/fdt/cpu_fdt.c:1.19 src/sys/arch/arm/fdt/cpu_fdt.c:1.20
--- src/sys/arch/arm/fdt/cpu_fdt.c:1.19 Thu Jan 3 12:52:40 2019
+++ src/sys/arch/arm/fdt/cpu_fdt.c Thu Jan 3 14:14:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_fdt.c,v 1.19 2019/01/03 12:52:40 jmcneill Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.20 2019/01/03 14:14:08 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -30,7 +30,7 @@
#include "psci_fdt.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.19 2019/01/03 12:52:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.20 2019/01/03 14:14:08 jmcneill Exp $");
#include
#include
@@ -368,17 +368,15 @@ ARM_CPU_METHOD(psci, "psci", cpu_enable_
static int
cpu_enable_spin_table(int phandle)
{
- uint64_t mpidr, data;
- paddr_t cpu_release_addr;
+ uint64_t mpidr, addr;
int ret;
fdtbus_get_reg64(phandle, 0, , NULL);
- if (of_getprop_uint64(phandle, "cpu-release-addr", ) != 0)
+ if (of_getprop_uint64(phandle, "cpu-release-addr", ) != 0)
return ENXIO;
- cpu_release_addr = (paddr_t)be64toh(data);
- ret = spintable_cpu_on(mpidr, cpu_fdt_mpstart_pa(), cpu_release_addr);
+ ret = spintable_cpu_on(mpidr, cpu_fdt_mpstart_pa(), (paddr_t)addr);
if (ret != 0)
return EIO;
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Thu Jan 3 12:54:25 UTC 2019 Modified Files: src/sys/arch/arm/fdt: arm_fdt.c arm_fdtvar.h Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/fdt/arm_fdt.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/fdt/arm_fdtvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 12:54:25 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: arm_fdt.c arm_fdtvar.h
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/fdt/arm_fdt.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/fdt/arm_fdtvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/arm_fdt.c
diff -u src/sys/arch/arm/fdt/arm_fdt.c:1.8 src/sys/arch/arm/fdt/arm_fdt.c:1.9
--- src/sys/arch/arm/fdt/arm_fdt.c:1.8 Sun Aug 5 14:02:35 2018
+++ src/sys/arch/arm/fdt/arm_fdt.c Thu Jan 3 12:54:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdt.c,v 1.8 2018/08/05 14:02:35 skrll Exp $ */
+/* $NetBSD: arm_fdt.c,v 1.9 2019/01/03 12:54:25 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "opt_arm_timer.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.8 2018/08/05 14:02:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.9 2019/01/03 12:54:25 jmcneill Exp $");
#include
#include
@@ -49,9 +49,6 @@ static void arm_fdt_attach(device_t, dev
CFATTACH_DECL_NEW(arm_fdt, 0,
arm_fdt_match, arm_fdt_attach, NULL, NULL);
-static struct arm_platlist arm_platform_list =
-TAILQ_HEAD_INITIALIZER(arm_platform_list);
-
struct arm_fdt_cpu_hatch_cb {
TAILQ_ENTRY(arm_fdt_cpu_hatch_cb) next;
void (*cb)(void *, struct cpu_info *);
Index: src/sys/arch/arm/fdt/arm_fdtvar.h
diff -u src/sys/arch/arm/fdt/arm_fdtvar.h:1.13 src/sys/arch/arm/fdt/arm_fdtvar.h:1.14
--- src/sys/arch/arm/fdt/arm_fdtvar.h:1.13 Thu Jan 3 12:52:40 2019
+++ src/sys/arch/arm/fdt/arm_fdtvar.h Thu Jan 3 12:54:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdtvar.h,v 1.13 2019/01/03 12:52:40 jmcneill Exp $ */
+/* $NetBSD: arm_fdtvar.h,v 1.14 2019/01/03 12:54:25 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -62,8 +62,6 @@ static const struct arm_platform_info __
}; \
_ARM_PLATFORM_REGISTER(_name)
-TAILQ_HEAD(arm_platlist, arm_platform_info);
-
const struct arm_platform * arm_fdt_platform(void);
/*
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 12:52:40 UTC 2019
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/arm/fdt: arm_fdtvar.h cpu_fdt.c
src/sys/arch/arm/nvidia: tegra_platform.c
src/sys/arch/arm/sunxi: sunxi_mc_smp.c sunxi_platform.c
Log Message:
Add a link set for cpu enable methods.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/fdt/arm_fdtvar.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/fdt/cpu_fdt.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/nvidia/tegra_platform.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_mc_smp.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/sunxi/sunxi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.22 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.23
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.22 Tue Oct 30 16:41:52 2018
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Thu Jan 3 12:52:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.22 2018/10/30 16:41:52 skrll Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.23 2019/01/03 12:52:40 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.22 2018/10/30 16:41:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.23 2019/01/03 12:52:40 jmcneill Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -724,60 +724,25 @@ bcm2836_bootparams(void)
bcm283x_bootparams(iot, ioh);
}
-static void
-bcm2836_mpstart(void)
+#if defined(MULTIPROCESSOR)
+static int
+cpu_enable_bcm2836(int phandle)
{
-#ifdef MULTIPROCESSOR
-#ifdef __arm__
- /* implementation dependent string "brcm,bcm2836-smp" for ARM 32-bit */
- const char *method;
-
- const int cpus = OF_finddevice("/cpus");
- if (cpus == -1) {
- aprint_error("%s: no /cpus node found\n", __func__);
- arm_cpu_max = 1;
- return;
- }
-
- method = fdtbus_get_string(cpus, "enable-method");
- if ((method != NULL) && (strcmp(method, "brcm,bcm2836-smp") == 0)) {
- arm_cpu_max = RPI_CPU_MAX;
- VPRINTF("%s: %d cpus present\n", __func__, arm_cpu_max);
-
- extern void cpu_mpstart(void);
-
- for (size_t i = 1; i < RPI_CPU_MAX; i++) {
- bus_space_tag_t iot = _bs_tag;
- bus_space_handle_t ioh = BCM2836_ARM_LOCAL_VBASE;
-
- bus_space_write_4(iot, ioh,
- BCM2836_LOCAL_MAILBOX3_SETN(i),
- KERN_VTOPHYS((vaddr_t)cpu_mpstart));
- }
+ bus_space_tag_t iot = _bs_tag;
+ bus_space_handle_t ioh = BCM2836_ARM_LOCAL_VBASE;
+ uint64_t mpidr;
- /* Wake up AP in case firmware has placed it in WFE state */
- __asm __volatile("sev" ::: "memory");
+ fdtbus_get_reg64(phandle, 0, , NULL);
- for (int loop = 0; loop < 16; loop++) {
- if (arm_cpu_hatched == __BITS(arm_cpu_max - 1, 1))
-break;
- gtmr_delay(1);
- }
+ const u_int cpuno = __SHIFTOUT(mpidr, MPIDR_AFF0);
- for (size_t i = 1; i < arm_cpu_max; i++) {
- if ((arm_cpu_hatched & __BIT(i)) == 0) {
-printf("%s: warning: cpu%zu failed to hatch\n",
-__func__, i);
- }
- }
- return;
- }
-#endif /* __arm__ */
+ bus_space_write_4(iot, ioh, BCM2836_LOCAL_MAILBOX3_SETN(cpuno),
+ KERN_VTOPHYS((vaddr_t)cpu_mpstart));
- /* try enable-method each cpus */
- arm_fdt_cpu_mpstart();
-#endif /* MULTIPROCESSOR */
+ return 0;
}
+ARM_CPU_METHOD(bcm2836, "brcm,bcm2836-smp", cpu_enable_bcm2836);
+#endif
#endif /* SOC_BCM2836 */
@@ -1374,7 +1339,7 @@ static const struct arm_platform bcm2836
.ap_reset = bcm2835_system_reset,
.ap_delay = gtmr_delay,
.ap_uart_freq = bcm283x_platform_uart_freq,
- .ap_mpstart = bcm2836_mpstart,
+ .ap_mpstart = arm_fdt_cpu_mpstart,
};
static const struct arm_platform bcm2837_platform = {
@@ -1385,7 +1350,7 @@ static const struct arm_platform bcm2837
.ap_reset = bcm2835_system_reset,
.ap_delay = gtmr_delay,
.ap_uart_freq = bcm2837_platform_uart_freq,
- .ap_mpstart = bcm2836_mpstart,
+ .ap_mpstart = arm_fdt_cpu_mpstart,
};
ARM_PLATFORM(bcm2836, "brcm,bcm2836", _platform);
Index: src/sys/arch/arm/fdt/arm_fdtvar.h
diff -u src/sys/arch/arm/fdt/arm_fdtvar.h:1.12 src/sys/arch/arm/fdt/arm_fdtvar.h:1.13
--- src/sys/arch/arm/fdt/arm_fdtvar.h:1.12 Tue Oct 30 16:41:52 2018
+++ src/sys/arch/arm/fdt/arm_fdtvar.h Thu Jan 3 12:52:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_fdtvar.h,v 1.12 2018/10/30 16:41:52 skrll Exp $ */
+/* $NetBSD: arm_fdtvar.h,v 1.13 2019/01/03 12:52:40 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -29,12 +29,12 @@
#ifndef _ARM_ARM_FDTVAR_H
#define _ARM_ARM_FDTVAR_H
+struct fdt_attach_args;
+
/*
* Platform-specific data
*/
-struct fdt_attach_args;
-
struct arm_platform {
const struct
CVS commit: src/sys/arch/arm
Module Name:src Committed By: jmcneill Date: Thu Jan 3 12:52:40 UTC 2019 Modified Files: src/sys/arch/arm/broadcom: bcm283x_platform.c src/sys/arch/arm/fdt: arm_fdtvar.h cpu_fdt.c src/sys/arch/arm/nvidia: tegra_platform.c src/sys/arch/arm/sunxi: sunxi_mc_smp.c sunxi_platform.c Log Message: Add a link set for cpu enable methods. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/broadcom/bcm283x_platform.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/fdt/arm_fdtvar.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/fdt/cpu_fdt.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/nvidia/tegra_platform.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_mc_smp.c cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/sunxi/sunxi_platform.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.sbin/acpitools/acpidump
Module Name:src
Committed By: martin
Date: Thu Jan 3 11:26:42 UTC 2019
Modified Files:
src/usr.sbin/acpitools/acpidump [netbsd-8]: acpi.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1154):
usr.sbin/acpitools/acpidump/acpi.c: revision 1.43
Fix acpi_print_string(). Treat NUL termination correctly to not to print
NUL character. For example, this change prints an OEMID "41 4d 44 00 41 4d"
with "AMD". Tested by Patrick Welche.
To generate a diff of this commit:
cvs rdiff -u -r1.15.8.2 -r1.15.8.3 src/usr.sbin/acpitools/acpidump/acpi.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/acpitools/acpidump/acpi.c
diff -u src/usr.sbin/acpitools/acpidump/acpi.c:1.15.8.2 src/usr.sbin/acpitools/acpidump/acpi.c:1.15.8.3
--- src/usr.sbin/acpitools/acpidump/acpi.c:1.15.8.2 Tue Dec 4 11:58:10 2018
+++ src/usr.sbin/acpitools/acpidump/acpi.c Thu Jan 3 11:26:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.15.8.2 2018/12/04 11:58:10 martin Exp $ */
+/* $NetBSD: acpi.c,v 1.15.8.3 2019/01/03 11:26:42 martin Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: acpi.c,v 1.15.8.2 2018/12/04 11:58:10 martin Exp $");
+__RCSID("$NetBSD: acpi.c,v 1.15.8.3 2019/01/03 11:26:42 martin Exp $");
#include
#include
@@ -212,6 +212,8 @@ acpi_print_string(char *s, size_t length
while (length--) {
c = *s++;
+ if (c == '\0')
+ return;
putchar(c);
}
}
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:27:32 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1153 and #1154 To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:27:32 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1153 and #1154 To generate a diff of this commit: cvs rdiff -u -r1.1.2.84 -r1.1.2.85 src/doc/CHANGES-8.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-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.84 src/doc/CHANGES-8.1:1.1.2.85 --- src/doc/CHANGES-8.1:1.1.2.84 Thu Jan 3 09:03:41 2019 +++ src/doc/CHANGES-8.1 Thu Jan 3 11:27:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.84 2019/01/03 09:03:41 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.85 2019/01/03 11:27:32 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2163,3 +2163,16 @@ sys/conf/copyright1.17 Welcome to 2019! [jnemeth, ticket #1152] +sys/dev/ic/spdmem.c1.29,1.30 +sys/dev/ic/spdmemvar.h1.14 + + - Fix DDR4's rows and columns value. + - Print "banks/group" instead of "banks". + - Print rank on DDR4. + [msaitoh, ticket #1153] + +usr.sbin/acpitools/acpidump/acpi.c 1.43 + + Fix acpi_print_string(), handle NUL termination correctly. + [msaitoh, ticket #1154] +
CVS commit: [netbsd-8] src/usr.sbin/acpitools/acpidump
Module Name:src Committed By: martin Date: Thu Jan 3 11:26:42 UTC 2019 Modified Files: src/usr.sbin/acpitools/acpidump [netbsd-8]: acpi.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1154): usr.sbin/acpitools/acpidump/acpi.c: revision 1.43 Fix acpi_print_string(). Treat NUL termination correctly to not to print NUL character. For example, this change prints an OEMID "41 4d 44 00 41 4d" with "AMD". Tested by Patrick Welche. To generate a diff of this commit: cvs rdiff -u -r1.15.8.2 -r1.15.8.3 src/usr.sbin/acpitools/acpidump/acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Thu Jan 3 11:23:54 UTC 2019
Modified Files:
src/sys/dev/ic [netbsd-8]: spdmem.c spdmemvar.h
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1153):
sys/dev/ic/spdmemvar.h: revision 1.14
sys/dev/ic/spdmem.c: revision 1.30
sys/dev/ic/spdmem.c: revision 1.29
- Fix DDR4's rows and columns value.
- Print "banks/group" instead of "banks" because it's not the total bank
number.
-
Print rank on DDR4.
To generate a diff of this commit:
cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/dev/ic/spdmem.c
cvs rdiff -u -r1.13 -r1.13.6.1 src/sys/dev/ic/spdmemvar.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/spdmem.c
diff -u src/sys/dev/ic/spdmem.c:1.24.6.1 src/sys/dev/ic/spdmem.c:1.24.6.2
--- src/sys/dev/ic/spdmem.c:1.24.6.1 Wed Nov 22 14:33:23 2017
+++ src/sys/dev/ic/spdmem.c Thu Jan 3 11:23:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.24.6.1 2017/11/22 14:33:23 martin Exp $ */
+/* $NetBSD: spdmem.c,v 1.24.6.2 2019/01/03 11:23:54 martin Exp $ */
/*
* Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.24.6.1 2017/11/22 14:33:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.24.6.2 2019/01/03 11:23:54 martin Exp $");
#include
#include
@@ -869,7 +869,7 @@ decode_fbdimm(const struct sysctlnode *n
static void
decode_ddr4(const struct sysctlnode *node, device_t self, struct spdmem *s)
{
- int dimm_size, cycle_time;
+ int dimm_size, cycle_time, ranks;
int tAA_clocks, tRCD_clocks,tRP_clocks, tRAS_clocks;
aprint_naive("\n");
@@ -937,14 +937,17 @@ decode_ddr4(const struct sysctlnode *nod
1 << (s->sm_ddr4.ddr4_primary_bus_width + 3),
TRUE, "PC4", 0);
+ ranks = s->sm_ddr4.ddr4_package_ranks + 1;
aprint_verbose_dev(self,
- "%d rows, %d cols, %d banks, %d bank groups, "
- "%d.%03dns cycle time\n",
- s->sm_ddr4.ddr4_rows + 9, s->sm_ddr4.ddr4_cols + 12,
+ "%d rows, %d cols, %d ranks%s, %d banks/group, %d bank groups\n",
+ s->sm_ddr4.ddr4_rows + 12, s->sm_ddr4.ddr4_cols + 9,
+ ranks, (ranks > 1) ? ((s->sm_ddr4.ddr4_rank_mix == 1)
+ ? " (asymmetric)" : " (symmetiric)") : "",
1 << (2 + s->sm_ddr4.ddr4_logbanks),
- 1 << s->sm_ddr4.ddr4_bankgroups,
- cycle_time / 1000, cycle_time % 1000);
+ 1 << s->sm_ddr4.ddr4_bankgroups);
+ aprint_verbose_dev(self, "%d.%03dns cycle time\n",
+ cycle_time / 1000, cycle_time % 1000);
tAA_clocks = __DDR4_VALUE(tAAmin) * 1000 / cycle_time;
tRCD_clocks = __DDR4_VALUE(tRCDmin) * 1000 / cycle_time;
Index: src/sys/dev/ic/spdmemvar.h
diff -u src/sys/dev/ic/spdmemvar.h:1.13 src/sys/dev/ic/spdmemvar.h:1.13.6.1
--- src/sys/dev/ic/spdmemvar.h:1.13 Wed Jan 18 06:02:50 2017
+++ src/sys/dev/ic/spdmemvar.h Thu Jan 3 11:23:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmemvar.h,v 1.13 2017/01/18 06:02:50 msaitoh Exp $ */
+/* $NetBSD: spdmemvar.h,v 1.13.6.1 2019/01/03 11:23:54 martin Exp $ */
/*
* Copyright (c) 2007 Paul Goyette
@@ -768,7 +768,8 @@ struct spdmem_ddr4 {/* Dual Data Rat
uint8_t ddr4_device_width:3, \
/* number of package ranks is field value plus 1 */ \
uint8_t ddr4_package_ranks:3, \
- uint8_t ddr4_unused9:2, \
+ uint8_t ddr4_rank_mix:1, \
+ uint8_t ddr4_unused9:1 \
);
SPD_BITFIELD( \
/* primary width is offset by 3, extension is offset by 2 */ \
CVS commit: [netbsd-8] src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Jan 3 11:23:54 UTC 2019 Modified Files: src/sys/dev/ic [netbsd-8]: spdmem.c spdmemvar.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1153): sys/dev/ic/spdmemvar.h: revision 1.14 sys/dev/ic/spdmem.c: revision 1.30 sys/dev/ic/spdmem.c: revision 1.29 - Fix DDR4's rows and columns value. - Print "banks/group" instead of "banks" because it's not the total bank number. - Print rank on DDR4. To generate a diff of this commit: cvs rdiff -u -r1.24.6.1 -r1.24.6.2 src/sys/dev/ic/spdmem.c cvs rdiff -u -r1.13 -r1.13.6.1 src/sys/dev/ic/spdmemvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:16:35 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ammend ticket #1668 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.126 src/doc/CHANGES-7.0.3:1.1.2.127 --- src/doc/CHANGES-7.0.3:1.1.2.126 Wed Jan 2 15:30:17 2019 +++ src/doc/CHANGES-7.0.3 Thu Jan 3 11:16:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.126 2019/01/02 15:30:17 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.127 2019/01/03 11:16:35 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5645,6 +5645,7 @@ sys/kern/kern_time.c1.191 sys/compat/netbsd32/netbsd32_compat_14.c 1.27 sys/compat/netbsd32/netbsd32_conv.h 1.37 sys/compat/sys/msg.h1.5 +sys/compat/sys/time_types.h 1.3 Fix kernel info leaks. [maxv, ticket #1668]
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:16:35 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ammend ticket #1668 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.126 -r1.1.2.127 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-0] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 11:16:04 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-7-0]: time_types.h Log Message: Additionally pull up the following for ticket #1668: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.44.1 src/sys/compat/sys/time_types.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/compat/sys/time_types.h diff -u src/sys/compat/sys/time_types.h:1.1 src/sys/compat/sys/time_types.h:1.1.44.1 --- src/sys/compat/sys/time_types.h:1.1 Thu Nov 5 16:59:01 2009 +++ src/sys/compat/sys/time_types.h Thu Jan 3 11:16:04 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: time_types.h,v 1.1 2009/11/05 16:59:01 pooka Exp $ */ +/* $NetBSD: time_types.h,v 1.1.44.1 2019/01/03 11:16:04 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,13 @@ #ifndef _COMPAT_SYS_TIME_TYPES_H_ #define _COMPAT_SYS_TIME_TYPES_H_ +#ifdef _KERNEL +#include +#else +#include +#include +#endif + /* * Structure returned by gettimeofday(2) system call, * and used in other calls.
CVS commit: [netbsd-7-0] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 11:16:04 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-7-0]: time_types.h Log Message: Additionally pull up the following for ticket #1668: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.44.1 src/sys/compat/sys/time_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:15:32 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ammend ticket #1668 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.33 src/doc/CHANGES-7.1.3:1.1.2.34 --- src/doc/CHANGES-7.1.3:1.1.2.33 Wed Jan 2 15:31:18 2019 +++ src/doc/CHANGES-7.1.3 Thu Jan 3 11:15:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.33 2019/01/02 15:31:18 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.34 2019/01/03 11:15:32 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -337,6 +337,7 @@ sys/kern/kern_time.c1.191 sys/compat/netbsd32/netbsd32_compat_14.c 1.27 sys/compat/netbsd32/netbsd32_conv.h 1.37 sys/compat/sys/msg.h1.5 +sys/compat/sys/time_types.h 1.3 Fix kernel info leaks. [maxv, ticket #1668]
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:15:32 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ammend ticket #1668 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 11:15:01 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-7-1]: time_types.h Log Message: Additionally pull up the following for ticket #1668: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.52.1 src/sys/compat/sys/time_types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7-1] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 11:15:01 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-7-1]: time_types.h Log Message: Additionally pull up the following for ticket #1668: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.52.1 src/sys/compat/sys/time_types.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/compat/sys/time_types.h diff -u src/sys/compat/sys/time_types.h:1.1 src/sys/compat/sys/time_types.h:1.1.52.1 --- src/sys/compat/sys/time_types.h:1.1 Thu Nov 5 16:59:01 2009 +++ src/sys/compat/sys/time_types.h Thu Jan 3 11:15:01 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: time_types.h,v 1.1 2009/11/05 16:59:01 pooka Exp $ */ +/* $NetBSD: time_types.h,v 1.1.52.1 2019/01/03 11:15:01 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,13 @@ #ifndef _COMPAT_SYS_TIME_TYPES_H_ #define _COMPAT_SYS_TIME_TYPES_H_ +#ifdef _KERNEL +#include +#else +#include +#include +#endif + /* * Structure returned by gettimeofday(2) system call, * and used in other calls.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:13:59 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ammend ticket #1668 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.29 src/doc/CHANGES-7.3:1.1.2.30 --- src/doc/CHANGES-7.3:1.1.2.29 Wed Jan 2 15:32:26 2019 +++ src/doc/CHANGES-7.3 Thu Jan 3 11:13:59 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.29 2019/01/02 15:32:26 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.30 2019/01/03 11:13:59 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -350,6 +350,7 @@ sys/kern/kern_time.c1.191 sys/compat/netbsd32/netbsd32_compat_14.c 1.27 sys/compat/netbsd32/netbsd32_conv.h 1.37 sys/compat/sys/msg.h1.5 +sys/compat/sys/time_types.h 1.3 Fix kernel info leaks. [maxv, ticket #1668]
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 11:13:59 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ammend ticket #1668 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.29 -r1.1.2.30 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 11:13:19 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-7]: time_types.h Log Message: Additionally pull up the following for ticket #1668: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/compat/sys/time_types.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/compat/sys/time_types.h diff -u src/sys/compat/sys/time_types.h:1.1 src/sys/compat/sys/time_types.h:1.1.40.1 --- src/sys/compat/sys/time_types.h:1.1 Thu Nov 5 16:59:01 2009 +++ src/sys/compat/sys/time_types.h Thu Jan 3 11:13:19 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: time_types.h,v 1.1 2009/11/05 16:59:01 pooka Exp $ */ +/* $NetBSD: time_types.h,v 1.1.40.1 2019/01/03 11:13:19 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,13 @@ #ifndef _COMPAT_SYS_TIME_TYPES_H_ #define _COMPAT_SYS_TIME_TYPES_H_ +#ifdef _KERNEL +#include +#else +#include +#include +#endif + /* * Structure returned by gettimeofday(2) system call, * and used in other calls.
CVS commit: [netbsd-7] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 11:13:19 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-7]: time_types.h Log Message: Additionally pull up the following for ticket #1668: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.40.1 src/sys/compat/sys/time_types.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/sunxi
Module Name:src
Committed By: jmcneill
Date: Thu Jan 3 11:01:59 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: files.sunxi sunxi_platform.c
Added Files:
src/sys/arch/arm/sunxi: sunxi_mc_mpstart.S sunxi_mc_smp.c
sunxi_mc_smp.h
Log Message:
Add Allwinner A83T SMP support.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/sunxi/files.sunxi
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/sunxi/sunxi_mc_mpstart.S \
src/sys/arch/arm/sunxi/sunxi_mc_smp.c \
src/sys/arch/arm/sunxi/sunxi_mc_smp.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/sunxi/sunxi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/files.sunxi
diff -u src/sys/arch/arm/sunxi/files.sunxi:1.57 src/sys/arch/arm/sunxi/files.sunxi:1.58
--- src/sys/arch/arm/sunxi/files.sunxi:1.57 Fri Jun 1 22:11:54 2018
+++ src/sys/arch/arm/sunxi/files.sunxi Thu Jan 3 11:01:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.sunxi,v 1.57 2018/06/01 22:11:54 jmcneill Exp $
+# $NetBSD: files.sunxi,v 1.58 2019/01/03 11:01:59 jmcneill Exp $
#
# Configuration info for Allwinner sunxi family SoCs
#
@@ -6,6 +6,9 @@
file arch/arm/sunxi/sunxi_platform.c soc_sunxi
+file arch/arm/sunxi/sunxi_mc_smp.c soc_sunxi_mc
+file arch/arm/sunxi/sunxi_mc_mpstart.S soc_sunxi_mc
+
# CCU
define sunxi_ccu
file arch/arm/sunxi/sunxi_ccu.c sunxi_ccu
@@ -293,8 +296,10 @@ file arch/arm/sunxi/sunxi_can.c sunxi_c
device sunxilradc
attach sunxilradc at fdt with sunxi_lradc
file arch/arm/sunxi/sunxi_lradc.c sunxi_lradc
+
# SOC parameters
defflag opt_soc.h SOC_SUNXI
+defflag opt_soc.h SOC_SUNXI_MC
defflag opt_soc.h SOC_SUN4I: SOC_SUNXI
defflag opt_soc.h SOC_SUN4I_A10: SOC_SUN4I
defflag opt_soc.h SOC_SUN5I: SOC_SUNXI
@@ -304,7 +309,7 @@ defflag opt_soc.h SOC_SUN6I_A31: SOC_S
defflag opt_soc.h SOC_SUN7I: SOC_SUNXI
defflag opt_soc.h SOC_SUN7I_A20: SOC_SUN7I
defflag opt_soc.h SOC_SUN8I: SOC_SUNXI
-defflag opt_soc.h SOC_SUN8I_A83T: SOC_SUN8I
+defflag opt_soc.h SOC_SUN8I_A83T: SOC_SUN8I, SOC_SUNXI_MC
defflag opt_soc.h SOC_SUN8I_H3: SOC_SUN8I
defflag opt_soc.h SOC_SUN9I: SOC_SUNXI
defflag opt_soc.h SOC_SUN9I_A80: SOC_SUN9I
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.31 src/sys/arch/arm/sunxi/sunxi_platform.c:1.32
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.31 Tue Oct 30 16:41:52 2018
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Thu Jan 3 11:01:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.31 2018/10/30 16:41:52 skrll Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.32 2019/01/03 11:01:59 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -31,7 +31,7 @@
#include "opt_console.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.31 2018/10/30 16:41:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.32 2019/01/03 11:01:59 jmcneill Exp $");
#include
#include
@@ -58,6 +58,10 @@ __KERNEL_RCSID(0, "$NetBSD: sunxi_platfo
#include
+#if defined(SOC_SUNXI_MC)
+#include
+#endif
+
#include
#define SUNXI_REF_FREQ 2400
@@ -123,6 +127,26 @@ sunxi_platform_devmap(void)
return devmap;
}
+#define SUN8I_A83T_CPU_VBASE (SUNXI_CORE_VBASE + SUNXI_CORE_SIZE)
+#define SUN8I_A83T_CPU_PBASE 0x0170
+#define SUN8I_A83T_CPU_SIZE 0x0010
+
+static const struct pmap_devmap *
+sun8i_a83t_platform_devmap(void)
+{
+ static const struct pmap_devmap devmap[] = {
+ DEVMAP_ENTRY(SUNXI_CORE_VBASE,
+ SUNXI_CORE_PBASE,
+ SUNXI_CORE_SIZE),
+ DEVMAP_ENTRY(SUN8I_A83T_CPU_VBASE,
+ SUN8I_A83T_CPU_PBASE,
+ SUN8I_A83T_CPU_SIZE),
+ DEVMAP_ENTRY_END
+ };
+
+ return devmap;
+}
+
static void
sunxi_platform_init_attach_args(struct fdt_attach_args *faa)
{
@@ -211,6 +235,55 @@ sunxi_platform_bootstrap(void)
}
}
+static void
+sunxi_mc_platform_mpstart(void)
+{
+ uint32_t started = 0;
+
+#if defined(MULTIPROCESSOR) && defined(SOC_SUNXI_MC)
+ const char *method;
+ uint64_t mpidr, bp_mpidr;
+ u_int cpuindex;
+ int child;
+
+ const int cpus = OF_finddevice("/cpus");
+ if (cpus == -1)
+ return;
+
+ /* MPIDR affinity levels of boot processor. */
+ bp_mpidr = cpu_mpidr_aff_read();
+
+ cpuindex = 1;
+ for (child = OF_child(cpus); child; child = OF_peer(child)) {
+ if (fdtbus_get_reg64(child, 0, , NULL) != 0)
+ continue;
+ if (mpidr == bp_mpidr)
+ continue;
+
+ method = fdtbus_get_string(child, "enable-method");
+ if (method == NULL)
+ method = fdtbus_get_string(cpus, "enable-method");
+ if (method == NULL)
+ continue;
+
+ if (sunxi_mc_smp_match(method) != 0) {
+ if (sunxi_mc_smp_enable(mpidr) != 0)
+continue;
+
+ started |= __BIT(cpuindex);
+ cpuindex++;
+ for (u_int i = 0x10; i > 0; i--) {
+membar_consumer();
+if (arm_cpu_hatched & __BIT(cpuindex))
+ break;
+ }
+ }
+ }
+#endif
+
+ if (started == 0)
+
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: jmcneill Date: Thu Jan 3 11:01:59 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: files.sunxi sunxi_platform.c Added Files: src/sys/arch/arm/sunxi: sunxi_mc_mpstart.S sunxi_mc_smp.c sunxi_mc_smp.h Log Message: Add Allwinner A83T SMP support. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/arch/arm/sunxi/files.sunxi cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/sunxi/sunxi_mc_mpstart.S \ src/sys/arch/arm/sunxi/sunxi_mc_smp.c \ src/sys/arch/arm/sunxi/sunxi_mc_smp.h cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/sunxi/sunxi_platform.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [pgoyette-compat] src/sys/compat
Module Name:src
Committed By: pgoyette
Date: Thu Jan 3 10:57:32 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_14_sysv.c
netbsd32_conv.h
src/sys/compat/sys [pgoyette-compat]: msg.h
Log Message:
Bring in some more changes from HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \
src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c
cvs rdiff -u -r1.33.2.3 -r1.33.2.4 src/sys/compat/netbsd32/netbsd32_conv.h
cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/compat/sys/msg.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/compat/netbsd32/netbsd32_compat_14_sysv.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.1.2.2
--- src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c:1.1.2.1 Wed Sep 12 04:35:22 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c Thu Jan 3 10:57:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.1 2018/09/12 04:35:22 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.2 2019/01/03 10:57:32 pgoyette Exp $ */
/*
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.1 2018/09/12 04:35:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_14_sysv.c,v 1.1.2.2 2019/01/03 10:57:32 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_sysv.h"
@@ -112,6 +112,7 @@ static inline void
native_to_netbsd32_msqid_ds14(struct msqid_ds *msqbuf, struct netbsd32_msqid_ds14 *omsqbuf)
{
+ memset(omsqbuf, 0, sizeof(*omsqbuf));
native_to_netbsd32_ipc_perm14(>msg_perm, >msg_perm);
#define CVT(x) omsqbuf->x = msqbuf->x
Index: src/sys/compat/netbsd32/netbsd32_conv.h
diff -u src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.3 src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.4
--- src/sys/compat/netbsd32/netbsd32_conv.h:1.33.2.3 Mon Nov 26 01:52:29 2018
+++ src/sys/compat/netbsd32/netbsd32_conv.h Thu Jan 3 10:57:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_conv.h,v 1.33.2.3 2018/11/26 01:52:29 pgoyette Exp $ */
+/* $NetBSD: netbsd32_conv.h,v 1.33.2.4 2019/01/03 10:57:32 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -555,6 +555,7 @@ netbsd32_from_msqid_ds50(const struct ms
struct netbsd32_msqid_ds50 *ds32p)
{
+ nemset(ds32p, 0, sizeof(*ds32p));
netbsd32_from_ipc_perm(>msg_perm, >msg_perm);
ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes;
ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
@@ -571,6 +572,7 @@ netbsd32_from_msqid_ds(const struct msqi
struct netbsd32_msqid_ds *ds32p)
{
+ memset(ds32p, 0, sizeof(*ds32p));
netbsd32_from_ipc_perm(>msg_perm, >msg_perm);
ds32p->_msg_cbytes = (netbsd32_u_long)dsp->_msg_cbytes;
ds32p->msg_qnum = (netbsd32_u_long)dsp->msg_qnum;
Index: src/sys/compat/sys/msg.h
diff -u src/sys/compat/sys/msg.h:1.4 src/sys/compat/sys/msg.h:1.4.64.1
--- src/sys/compat/sys/msg.h:1.4 Mon Jan 19 19:39:41 2009
+++ src/sys/compat/sys/msg.h Thu Jan 3 10:57:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.h,v 1.4 2009/01/19 19:39:41 christos Exp $ */
+/* $NetBSD: msg.h,v 1.4.64.1 2019/01/03 10:57:32 pgoyette Exp $ */
/*
* SVID compatible msg.h file
@@ -108,6 +108,7 @@ static __inline void
__native_to_msqid_ds13(const struct msqid_ds *msqbuf, struct msqid_ds13 *omsqbuf)
{
+ memset(omsqbuf, 0, sizeof(*omsqbuf));
omsqbuf->msg_perm = msqbuf->msg_perm;
#define CVT(x) omsqbuf->x = msqbuf->x
@@ -149,6 +150,7 @@ static __inline void
__native_to_msqid_ds14(const struct msqid_ds *msqbuf, struct msqid_ds14 *omsqbuf)
{
+ memset(omsqbuf, 0, sizeof(*omsqbuf));
__native_to_ipc_perm14(>msg_perm, >msg_perm);
#define CVT(x) omsqbuf->x = msqbuf->x
CVS commit: [pgoyette-compat] src/sys/compat
Module Name:src Committed By: pgoyette Date: Thu Jan 3 10:57:32 UTC 2019 Modified Files: src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_14_sysv.c netbsd32_conv.h src/sys/compat/sys [pgoyette-compat]: msg.h Log Message: Bring in some more changes from HEAD. To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 \ src/sys/compat/netbsd32/netbsd32_compat_14_sysv.c cvs rdiff -u -r1.33.2.3 -r1.33.2.4 src/sys/compat/netbsd32/netbsd32_conv.h cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/compat/sys/msg.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/conf
Module Name:src Committed By: jmcneill Date: Thu Jan 3 10:44:04 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: Attach sunxirsb earlier so axppmic regulators are available for usbphy To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.72 -r1.73 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/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.14 src/sys/arch/evbarm/conf/GENERIC:1.15 --- src/sys/arch/evbarm/conf/GENERIC:1.14 Thu Nov 22 21:08:19 2018 +++ src/sys/arch/evbarm/conf/GENERIC Thu Jan 3 10:44:04 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.14 2018/11/22 21:08:19 aymeric Exp $ +# $NetBSD: GENERIC,v 1.15 2019/01/03 10:44:04 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -418,7 +418,7 @@ exuart* at fdt? # SSCOM UART # I2C controllers bsciic* at fdt? # Broadcom BCM283x Serial Control exyoi2c* at fdt? # Samsung Exynos I2C -sunxirsb* at fdt? # Allwinner RSB +sunxirsb* at fdt? pass 4 # Allwinner RSB sunxitwi* at fdt? # Allwinner TWI tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C iic* at i2cbus? Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.72 src/sys/arch/evbarm/conf/GENERIC64:1.73 --- src/sys/arch/evbarm/conf/GENERIC64:1.72 Sun Dec 30 16:25:15 2018 +++ src/sys/arch/evbarm/conf/GENERIC64 Thu Jan 3 10:44:04 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.72 2018/12/30 16:25:15 skrll Exp $ +# $NetBSD: GENERIC64,v 1.73 2019/01/03 10:44:04 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -276,7 +276,7 @@ bsciic* at fdt? # Broadcom BCM283x Se dwiic* at fdt? # Designware I2C dwiic* at acpi? rkiic* at fdt? # Rockchip I2C -sunxirsb* at fdt? # Allwinner RSB +sunxirsb* at fdt? pass 4 # Allwinner RSB sunxitwi* at fdt? # Allwinner TWI tegrai2c* at fdt? pass 4 # NVIDIA Tegra I2C iic* at i2cbus?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Thu Jan 3 10:44:04 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: Attach sunxirsb earlier so axppmic regulators are available for usbphy To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.72 -r1.73 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.
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Thu Jan 3 10:27:30 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna.h sna_accel.c
sna_driver.c
xsrc/external/mit/xorg-server/dist/Xext: xf86bigfont.c
Log Message:
make the intel driver work again with xorg-server 1.20:
- BlockHandler() timeout value changed from struct timeval ** to int **
that has a millisecond value.
- avoid a NULL ptr deref in ProcXF86BigfontQueryFont() and make some
code actually able to be run.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
cvs rdiff -u -r1.1.1.6 -r1.2 \
xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h:1.2 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h Thu Jan 3 10:27:30 2019
@@ -998,7 +998,11 @@ static inline uint32_t pixmap_size(Pixma
bool sna_accel_init(ScreenPtr sreen, struct sna *sna);
void sna_accel_create(struct sna *sna);
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
void sna_accel_block_handler(struct sna *sna, struct timeval **tv);
+#else
+void sna_accel_block_handler(struct sna *sna, int *tv_msec);
+#endif
void sna_accel_wakeup_handler(struct sna *sna);
void sna_accel_watch_flush(struct sna *sna, int enable);
void sna_accel_flush(struct sna *sna);
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c:1.2 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c Thu Jan 3 10:27:30 2019
@@ -740,14 +740,23 @@ sna_block_handler(BLOCKHANDLER_ARGS_DECL
#else
struct sna *sna = to_sna_from_screen(arg);
#endif
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
struct timeval **tv = timeout;
DBG(("%s (tv=%ld.%06ld)\n", __FUNCTION__,
*tv ? (*tv)->tv_sec : -1, *tv ? (*tv)->tv_usec : 0));
+#else
+ int *tv = timeout;
+
+ DBG(("%s (tv=%ld.%06ld)\n", __FUNCTION__,
+ *tv / 1000, *tv % (1000 * 1000)));
+#endif
sna->BlockHandler(BLOCKHANDLER_ARGS);
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
if (*tv == NULL || ((*tv)->tv_usec | (*tv)->tv_sec) || has_shadow(sna))
+#endif
sna_accel_block_handler(sna, tv);
}
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.4
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.3 Mon Dec 31 22:17:20 2018
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Thu Jan 3 10:27:30 2019
@@ -18010,7 +18010,12 @@ void sna_accel_close(struct sna *sna)
kgem_cleanup_cache(>kgem);
}
+/* tv changed from timeval to milliseconds in ABI 23 */
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
void sna_accel_block_handler(struct sna *sna, struct timeval **tv)
+#else
+void sna_accel_block_handler(struct sna *sna, int *tv_msec)
+#endif
{
sigtrap_assert_inactive();
@@ -18069,6 +18074,7 @@ restart:
if (timeout < 3)
goto restart;
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(23, 0)
if (*tv == NULL) {
*tv = >timer_tv;
goto set_tv;
@@ -18078,6 +18084,10 @@ set_tv:
(*tv)->tv_sec = timeout / 1000;
(*tv)->tv_usec = timeout % 1000 * 1000;
}
+#else
+ if (*tv_msec > timeout)
+ *tv_msec = timeout;
+#endif
}
sna->kgem.scanout_busy = false;
Index: xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c
diff -u xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c:1.2
--- xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c:1.1.1.6 Mon Dec 31 09:36:08 2018
+++ xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.c Thu Jan 3 10:27:30 2019
@@ -377,7 +377,7 @@ ProcXF86BigfontQueryFont(ClientPtr clien
#ifdef HAS_SHM
if (!badSysCall)
pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
-if (pDesc) {
+if (pDesc && pDesc->attach_addr) {
pCI = (xCharInfo *) pDesc->attach_addr;
if (stuff_flags & XF86Bigfont_FLAGS_Shm)
shmid = pDesc->shmid;
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: mrg Date: Thu Jan 3 10:27:30 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src/sna: sna.h sna_accel.c sna_driver.c xsrc/external/mit/xorg-server/dist/Xext: xf86bigfont.c Log Message: make the intel driver work again with xorg-server 1.20: - BlockHandler() timeout value changed from struct timeval ** to int ** that has a millisecond value. - avoid a NULL ptr deref in ProcXF86BigfontQueryFont() and make some code actually able to be run. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna.h \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_driver.c cvs rdiff -u -r1.3 -r1.4 \ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c cvs rdiff -u -r1.1.1.6 -r1.2 \ xsrc/external/mit/xorg-server/dist/Xext/xf86bigfont.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
Module Name:src
Committed By: skrll
Date: Thu Jan 3 10:26:41 UTC 2019
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
src/sys/arch/arm/arm32: arm32_boot.c arm32_machdep.c cpu.c
src/sys/arch/arm/broadcom: bcm2835_intr.c
src/sys/arch/arm/fdt: cpu_fdt.c
src/sys/arch/arm/include: cpu.h
src/sys/arch/arm/include/arm32: machdep.h
Log Message:
Start CPUs more like aarch64 by using a cpu_mpidr array (if populated)
to map MPIDRs to an index for each CPU.
Towards big.LITTLE support.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/armv6_start.S
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/arm/arm32/arm32_machdep.c \
src/sys/arch/arm/arm32/cpu.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/broadcom/bcm2835_intr.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/fdt/cpu_fdt.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/arm32/machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.4 src/sys/arch/arm/arm/armv6_start.S:1.5
--- src/sys/arch/arm/arm/armv6_start.S:1.4 Wed Jan 2 16:27:04 2019
+++ src/sys/arch/arm/arm/armv6_start.S Thu Jan 3 10:26:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.4 2019/01/02 16:27:04 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.5 2019/01/03 10:26:41 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -160,6 +160,12 @@ ENTRY_NP(generic_start)
#endif
#ifdef VERBOSE_INIT_ARM
+ VPRINTF("\n\rmidr :")
+ mrc p15, 0, r0, c0, c0, 0 // MIDR
+ VPRINTX(r0)
+ VPRINTF("\n\rmpidr:")
+ mrc p15, 0, r0, c0, c0, 5 // MPIDR
+ VPRINTX(r0)
VPRINTF("\n\rttb0 :")
mrc p15, 0, r0, c2, c0, 0 // TTBR0 read
VPRINTX(r0)
@@ -516,8 +522,14 @@ generic_startv6:
0)
-//
-// Perform the initialization of the an ARMv7 core required by NetBSD.
+/*
+ * Perform the initialization of the an ARMv7 core required by NetBSD.
+ *
+ * Uses the following callee saved registers:
+ *
+ * Callee saved:
+ * r4, r5, r6, r7
+ */
armv7_init:
.arch armv7a
@@ -618,6 +630,14 @@ armv7_init:
.ltorg
+/*
+ * Transititions the CPU to using the TTB passed in r0.
+ *
+ * Uses the following callee saved registers:
+ *
+ * Callee saved:
+ * r4, r5
+ */
armv7_mmuinit:
// Because the MMU may already be on do a typical sequence to set
@@ -740,22 +760,45 @@ ENTRY_NP(cpu_mpstart)
ldr R_TMP2, =start_stacks_top
sub sp, R_TMP2, R_VTOPDIFF
+#ifdef VERBOSE_INIT_ARM
+ VPRINTF("\n\rmidr :")
+ mrc p15, 0, r0, c0, c0, 0 // MIDR
+ VPRINTX(r0)
+ VPRINTF("\n\rmpidr:")
+ mrc p15, 0, r0, c0, c0, 5 // MPIDR
+ VPRINTX(r0)
+#endif
+
mrc p15, 0, r4, c0, c0, 5 // MPIDR get
- and r4, r4, #7 // get our cpu numder
+ and r4, #(MPIDR_AFF2|MPIDR_AFF1|MPIDR_AFF0)
- mov r5, r4
- lsl r5, #INIT_ARM_STACK_SHIFT
- sub sp, sp, r5
+ mov r0, #0
+ ldr r1, =cpu_mpidr
+ sub r1, R_VTOPDIFF
+1:
+ ldr r2, [r1, r0, lsl #2] // r2 = cpu_mpidr[r0]
+ cmp r2, r4
+ beq 2f// found our mpidr
- XPUTC('c')
- mov r0, r4
- add r0, #'0'
- bl uartputc
- XPUTC(':')
+ add r0, #1
+ cmp r0, #MAXCPUS
+ bne 1b
+
+ // Not found our mpidr in the list - use Aff0 for cpuindex
+ and r0, r4, #7
+2:
+ mov R_TMP2, r0 // save cpu_index for later
- mov r0, sp
- bl generic_printx
+ VPRINTF("index: ")
+ VPRINTX(R_TMP2)
+ XPUTC('\n')
+ XPUTC('\r')
+
+ mov r5, R_TMP2
+ lsl r5, #INIT_ARM_STACK_SHIFT
+ sub sp, sp, r5
+ VPRINTX(sp)
XPUTC('\n')
XPUTC('\r')
@@ -776,21 +819,12 @@ ASEND(cpu_mpstart)
* Now running with real kernel VA via bootstrap tables
*/
armv7_mpcontinuation:
- ldr R_TMP2, =start_stacks_top
-
- mrc p15, 0, r4, c0, c0, 5 // MPIDR get
- and r4, r4, #7 // get our cpu numder
-
- mov r5, r4
- lsl r5, #INIT_ARM_STACK_SHIFT
- sub sp, R_TMP2, r5
+ // Adjust stack back to KVA address
+ add sp, sp, R_VTOPDIFF
VPRINTF("go\n\r")
- mrc p15, 0, r4, c0, c0, 5 // MPIDR get
- and r4, r4, #7 // get our cpu numder
-
- mov r0, r4
+ mov r0, R_TMP2 // index into cpu_mpidr[] or cpu_number if not found
bl cpu_init_secondary_processor
/* Wait for cpu_boot_secondary_processors the when cpu_info is allocated, etc */
@@ -799,7 +833,7 @@ armv7_mpcontinuation:
movt r6, #:upper16:arm_cpu_mbox
mov r5, #1// bitmask...
- lsl r5, r4// ... for our cpu
+ lsl r5, R_TMP2 // ... for our cpu
1: dmb // data memory barrier
ldr r2, [r6] // load mbox
@@ -809,7 +843,7 @@ armv7_mpcontinuation:
movw r0, #:lower16:cpu_info
movt r0, #:upper16:cpu_info // get pointer to cpu_infos
- ldr r5, [r0, r4, lsl #2] // load our cpu_info
+ ldr r5, [r0, R_TMP2, lsl #2] // load our cpu_info
ldr r6, [r5, #CI_IDLELWP] // get the idlelwp
ldr r7, [r6, #L_PCB] // now get its pcb
ldr sp, [r7, #PCB_KSP] // finally, we can
CVS commit: src/sys/arch/arm
Module Name:src Committed By: skrll Date: Thu Jan 3 10:26:41 UTC 2019 Modified Files: src/sys/arch/arm/arm: armv6_start.S src/sys/arch/arm/arm32: arm32_boot.c arm32_machdep.c cpu.c src/sys/arch/arm/broadcom: bcm2835_intr.c src/sys/arch/arm/fdt: cpu_fdt.c src/sys/arch/arm/include: cpu.h src/sys/arch/arm/include/arm32: machdep.h Log Message: Start CPUs more like aarch64 by using a cpu_mpidr array (if populated) to map MPIDRs to an index for each CPU. Towards big.LITTLE support. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/arm/armv6_start.S cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/arm32/arm32_boot.c cvs rdiff -u -r1.124 -r1.125 src/sys/arch/arm/arm32/arm32_machdep.c \ src/sys/arch/arm/arm32/cpu.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/broadcom/bcm2835_intr.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/fdt/cpu_fdt.c cvs rdiff -u -r1.99 -r1.100 src/sys/arch/arm/include/cpu.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/arm32/machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Thu Jan 3 10:16:43 UTC 2019 Modified Files: src/sys/kern: kern_descrip.c Log Message: Add KASSERT. To generate a diff of this commit: cvs rdiff -u -r1.241 -r1.242 src/sys/kern/kern_descrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/kern_descrip.c diff -u src/sys/kern/kern_descrip.c:1.241 src/sys/kern/kern_descrip.c:1.242 --- src/sys/kern/kern_descrip.c:1.241 Sat Nov 24 16:41:48 2018 +++ src/sys/kern/kern_descrip.c Thu Jan 3 10:16:43 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_descrip.c,v 1.241 2018/11/24 16:41:48 maxv Exp $ */ +/* $NetBSD: kern_descrip.c,v 1.242 2019/01/03 10:16:43 maxv Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.241 2018/11/24 16:41:48 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.242 2019/01/03 10:16:43 maxv Exp $"); #include #include @@ -1229,6 +1229,7 @@ file_dtor(void *arg, void *obj) LIST_REMOVE(fp, f_list); mutex_exit(_lock); + KASSERT(fp->f_count == 0); kauth_cred_free(fp->f_cred); mutex_destroy(>f_lock); }
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Thu Jan 3 10:16:43 UTC 2019 Modified Files: src/sys/kern: kern_descrip.c Log Message: Add KASSERT. To generate a diff of this commit: cvs rdiff -u -r1.241 -r1.242 src/sys/kern/kern_descrip.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: skrll
Date: Thu Jan 3 09:09:40 UTC 2019
Modified Files:
src/sys/sys: cpu_data.h
Log Message:
Remove stale comment. There are more than just compat definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/sys/cpu_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/sys/cpu_data.h
diff -u src/sys/sys/cpu_data.h:1.38 src/sys/sys/cpu_data.h:1.39
--- src/sys/sys/cpu_data.h:1.38 Fri Sep 5 05:45:34 2014
+++ src/sys/sys/cpu_data.h Thu Jan 3 09:09:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_data.h,v 1.38 2014/09/05 05:45:34 matt Exp $ */
+/* $NetBSD: cpu_data.h,v 1.39 2019/01/03 09:09:39 skrll Exp $ */
/*-
* Copyright (c) 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -112,7 +112,6 @@ struct cpu_data {
kcpuset_t *cpu_kcpuset; /* kcpuset_t of this cpu only */
};
-/* compat definitions */
#define ci_schedstate ci_data.cpu_schedstate
#define ci_index ci_data.cpu_index
#define ci_biglock_count ci_data.cpu_biglock_count
CVS commit: src/sys/sys
Module Name:src Committed By: skrll Date: Thu Jan 3 09:09:40 UTC 2019 Modified Files: src/sys/sys: cpu_data.h Log Message: Remove stale comment. There are more than just compat definitions. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/sys/cpu_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 09:03:41 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ammend ticket #1151 for additional pullups. To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Jan 3 09:03:41 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Ammend ticket #1151 for additional pullups. To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-8.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-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.83 src/doc/CHANGES-8.1:1.1.2.84 --- src/doc/CHANGES-8.1:1.1.2.83 Sun Dec 30 12:51:53 2018 +++ src/doc/CHANGES-8.1 Thu Jan 3 09:03:41 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.83 2018/12/30 12:51:53 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.84 2019/01/03 09:03:41 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2130,3 +2130,36 @@ sys/dev/mii/mii_physubr.c 1.81,1.82 Fix default phy reset timeout. [msaitoh, ticket #1149] +doc/3RDPARTY 1.1581 (patch) +distrib/sets/lists/base/mi 1.1196 (patch) +external/public-domain/tz/dist/Makefile up to 1.1.1.23 +external/public-domain/tz/dist/NEWS up to 1.1.1.26 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.16 +external/public-domain/tz/dist/africa up to 1.1.1.19 +external/public-domain/tz/dist/asia up to 1.1.1.22 +external/public-domain/tz/dist/australasia up to 1.1.1.17 +external/public-domain/tz/dist/leapseconds up to 1.1.1.12 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.8 +external/public-domain/tz/dist/northamerica up to 1.1.1.22 +external/public-domain/tz/dist/theory.html up to 1.1.1.7 +external/public-domain/tz/dist/version up to 1.1.1.13 +external/public-domain/tz/dist/ziguard.awk up to 1.1.1.4 +external/public-domain/tz/dist/zone.tab up to 1.1.1.16 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.18 + + tzdata updated to 2018i. + [kre, ticket #1150] + +sys/compat/netbsd32/netbsd32_compat_14.c 1.27 +sys/compat/netbsd32/netbsd32_conv.h 1.37 +sys/compat/sys/msg.h1.5 +sys/compat/sys/time_types.h 1.3 + + Fix kernel info leaks. + [maxv, ticket #1151] + +sys/conf/copyright1.17 + + Welcome to 2019! + [jnemeth, ticket #1152] +
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/uxa
Module Name:xsrc
Committed By: mrg
Date: Thu Jan 3 09:00:22 UTC 2019
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_display.c
Log Message:
avoid using an uninitialised variable.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.2 xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.3
--- xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c:1.2 Tue Jan 1 00:34:53 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c Thu Jan 3 09:00:22 2019
@@ -2079,7 +2079,7 @@ intel_pageflip_abort(ScrnInfoPtr scrn, x
#if HAVE_NOTIFY_FD
static void drmmode_notify_fd(int fd, int notify, void *data)
{
- struct intel_mode *mode;
+ struct intel_mode *mode = data;
drmHandleEvent(fd, >event_context);
}
CVS commit: [netbsd-8] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 09:00:01 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-8]: time_types.h Log Message: Additionally pull up the following for ticket #1151: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.58.1 src/sys/compat/sys/time_types.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/compat/sys/time_types.h diff -u src/sys/compat/sys/time_types.h:1.1 src/sys/compat/sys/time_types.h:1.1.58.1 --- src/sys/compat/sys/time_types.h:1.1 Thu Nov 5 16:59:01 2009 +++ src/sys/compat/sys/time_types.h Thu Jan 3 09:00:01 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: time_types.h,v 1.1 2009/11/05 16:59:01 pooka Exp $ */ +/* $NetBSD: time_types.h,v 1.1.58.1 2019/01/03 09:00:01 martin Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -34,6 +34,13 @@ #ifndef _COMPAT_SYS_TIME_TYPES_H_ #define _COMPAT_SYS_TIME_TYPES_H_ +#ifdef _KERNEL +#include +#else +#include +#include +#endif + /* * Structure returned by gettimeofday(2) system call, * and used in other calls.
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src/uxa
Module Name:xsrc Committed By: mrg Date: Thu Jan 3 09:00:22 UTC 2019 Modified Files: xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_display.c Log Message: avoid using an uninitialised variable. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_display.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/compat/sys
Module Name:src Committed By: martin Date: Thu Jan 3 09:00:01 UTC 2019 Modified Files: src/sys/compat/sys [netbsd-8]: time_types.h Log Message: Additionally pull up the following for ticket #1151: sys/compat/sys/time_types.h 1.3 include libkern.h or string.h & stddef.h, to get the offsetof() and memset() definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.58.1 src/sys/compat/sys/time_types.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/pci
Module Name:src Committed By: msaitoh Date: Thu Jan 3 08:46:03 UTC 2019 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Fix error check. reported by David Binderman in kern/53821. To generate a diff of this commit: cvs rdiff -u -r1.612 -r1.613 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.612 src/sys/dev/pci/if_wm.c:1.613 --- src/sys/dev/pci/if_wm.c:1.612 Sun Dec 30 04:18:09 2018 +++ src/sys/dev/pci/if_wm.c Thu Jan 3 08:46:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.612 2018/12/30 04:18:09 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.613 2019/01/03 08:46:03 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.612 2018/12/30 04:18:09 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.613 2019/01/03 08:46:03 msaitoh Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -14636,7 +14636,8 @@ wm_resume_workarounds_pchlan(struct wm_s /* Restore clear on SMB if no manageability engine * is present */ - sc->phy.readreg_locked(dev, 1, I217_MEMPWR, _reg); + rv = sc->phy.readreg_locked(dev, 1, I217_MEMPWR, + _reg); if (rv != 0) goto release; phy_reg |= I217_MEMPWR_DISABLE_SMB_RELEASE;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Thu Jan 3 08:46:03 UTC 2019 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Fix error check. reported by David Binderman in kern/53821. To generate a diff of this commit: cvs rdiff -u -r1.612 -r1.613 src/sys/dev/pci/if_wm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Thu Jan 3 08:02:50 UTC 2019 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_svm.c Log Message: Fix another gross copy-pasto. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/nvmm/x86/nvmm_x86_svm.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/nvmm/x86/nvmm_x86_svm.c diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.8 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.9 --- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.8 Wed Jan 2 12:18:08 2019 +++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Thu Jan 3 08:02:49 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: nvmm_x86_svm.c,v 1.8 2019/01/02 12:18:08 maxv Exp $ */ +/* $NetBSD: nvmm_x86_svm.c,v 1.9 2019/01/03 08:02:49 maxv Exp $ */ /* * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.8 2019/01/02 12:18:08 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.9 2019/01/03 08:02:49 maxv Exp $"); #include #include @@ -1820,7 +1820,7 @@ svm_vcpu_getstate(struct nvmm_cpu *vcpu, memcpy(>fpu, cpudata->gfpu.xsh_fxsave, sizeof(cstate->fpu)); - memcpy(>fpu, >fpu, sizeof(cstate->fpu)); + memcpy(>fpu, >fpu, sizeof(cstate->fpu)); } }
CVS commit: src/sys/dev/nvmm/x86
Module Name:src Committed By: maxv Date: Thu Jan 3 08:02:50 UTC 2019 Modified Files: src/sys/dev/nvmm/x86: nvmm_x86_svm.c Log Message: Fix another gross copy-pasto. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/nvmm/x86/nvmm_x86_svm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
