CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mrg
Date: Fri Jun 14 04:48:34 UTC 2019
Modified Files:
src/sys/dev/ic: nvme.c
Log Message:
in nvme_attach() when creating the admin queue to probe the device info,
and also in nvme_dmamem_alloc(), allow as many DMA segment as would be
maximally needed for the size, rather than hard coding '2' for the form
and '1' for the latter.
now ld@nvme on i386 doesn't crash and i see at least 1.3GB/sec.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/nvme.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.42 src/sys/dev/ic/nvme.c:1.43
--- src/sys/dev/ic/nvme.c:1.42 Wed Apr 24 23:39:23 2019
+++ src/sys/dev/ic/nvme.c Fri Jun 14 04:48:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.42 2019/04/24 23:39:23 mlelstv Exp $ */
+/* $NetBSD: nvme.c,v 1.43 2019/06/14 04:48:34 mrg Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.42 2019/04/24 23:39:23 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.43 2019/06/14 04:48:34 mrg Exp $");
#include
#include
@@ -374,7 +374,7 @@ nvme_attach(struct nvme_softc *sc)
sc->sc_rdy_to = NVME_CAP_TO(cap);
sc->sc_mps = 1 << mps;
sc->sc_mdts = MAXPHYS;
- sc->sc_max_sgl = 2;
+ sc->sc_max_sgl = btoc(round_page(sc->sc_mdts));
if (nvme_disable(sc) != 0) {
aprint_error_dev(sc->sc_dev, "unable to disable controller\n");
@@ -1870,7 +1870,7 @@ nvme_dmamem_alloc(struct nvme_softc *sc,
ndm->ndm_size = size;
- if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
+ if (bus_dmamap_create(sc->sc_dmat, size, btoc(round_page(size)), size, 0,
BUS_DMA_WAITOK | BUS_DMA_ALLOCNOW, >ndm_map) != 0)
goto ndmfree;
CVS commit: src/sys/dev/ic
Module Name:src Committed By: mrg Date: Fri Jun 14 04:48:34 UTC 2019 Modified Files: src/sys/dev/ic: nvme.c Log Message: in nvme_attach() when creating the admin queue to probe the device info, and also in nvme_dmamem_alloc(), allow as many DMA segment as would be maximally needed for the size, rather than hard coding '2' for the form and '1' for the latter. now ld@nvme on i386 doesn't crash and i see at least 1.3GB/sec. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/ic/nvme.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: mrg
Date: Fri Jun 14 03:35:31 UTC 2019
Modified Files:
src/sys/arch/x86/x86: bus_dma.c
Log Message:
KASSERT() -> KASSERTMSG() message in _bus_dmamem_alloc_range().
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/x86/x86/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/bus_dma.c
diff -u src/sys/arch/x86/x86/bus_dma.c:1.78 src/sys/arch/x86/x86/bus_dma.c:1.79
--- src/sys/arch/x86/x86/bus_dma.c:1.78 Sun Apr 21 06:37:21 2019
+++ src/sys/arch/x86/x86/bus_dma.c Fri Jun 14 03:35:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.78 2019/04/21 06:37:21 maxv Exp $ */
+/* $NetBSD: bus_dma.c,v 1.79 2019/06/14 03:35:31 mrg Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.78 2019/04/21 06:37:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.79 2019/06/14 03:35:31 mrg Exp $");
/*
* The following is included because _bus_dma_uiomove is derived from
@@ -249,7 +249,8 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t,
segs[curseg].ds_len += PAGE_SIZE;
} else {
curseg++;
- KASSERT(curseg < nsegs);
+ KASSERTMSG(curseg < nsegs, "curseg %d size %llx",
+ curseg, (long long)size);
segs[curseg].ds_addr = curaddr;
segs[curseg].ds_len = PAGE_SIZE;
}
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: mrg Date: Fri Jun 14 03:35:31 UTC 2019 Modified Files: src/sys/arch/x86/x86: bus_dma.c Log Message: KASSERT() -> KASSERTMSG() message in _bus_dmamem_alloc_range(). To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/arch/x86/x86/bus_dma.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/postinstall
Module Name:src Committed By: christos Date: Fri Jun 14 01:54:16 UTC 2019 Modified Files: src/usr.sbin/postinstall: Makefile postinstall.in Log Message: make the script MI again (same across all archs) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/postinstall/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Fri Jun 14 01:54:16 UTC 2019
Modified Files:
src/usr.sbin/postinstall: Makefile postinstall.in
Log Message:
make the script MI again (same across all archs)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/postinstall/Makefile
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/Makefile
diff -u src/usr.sbin/postinstall/Makefile:1.2 src/usr.sbin/postinstall/Makefile:1.3
--- src/usr.sbin/postinstall/Makefile:1.2 Thu Jun 13 21:06:33 2019
+++ src/usr.sbin/postinstall/Makefile Thu Jun 13 21:54:16 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/06/14 01:06:33 christos Exp $
+# $NetBSD: Makefile,v 1.3 2019/06/14 01:54:16 christos Exp $
.include
@@ -9,8 +9,8 @@ FILESDIR= /usr/sbin
FILESMODE= ${BINMODE}
FILESBUILD= yes
-ARCHSUBDIRS != ${MAKE} -f ${NETBSDSRCDIR}/compat/archdirs.mk \
- ACTIVE_CC=clang -V ARCHDIR_SUBDIR | ${TOOL_SED} -e 's@[a-z0-9_]*/@@g'
+ARCHSUBDIRS != ${TOOL_SED} -n '/ARCHDIR_SUBDIR/s/[[:space:]]//gp' \
+ ${NETBSDSRCDIR}/compat/archdirs.mk
.SUFFIXES: .in
.in:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u src/usr.sbin/postinstall/postinstall.in:1.1 src/usr.sbin/postinstall/postinstall.in:1.2
--- src/usr.sbin/postinstall/postinstall.in:1.1 Thu Jun 13 21:06:33 2019
+++ src/usr.sbin/postinstall/postinstall.in Thu Jun 13 21:54:16 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall.in,v 1.1 2019/06/14 01:06:33 christos Exp $
+# $NetBSD: postinstall.in,v 1.2 2019/06/14 01:54:16 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2187,11 +2187,17 @@ do_obsolete_stand()
return ${failed}
}
-getarchsubdirs() {
+listarchsubdirs() {
if ! $SOURCEMODE; then
echo "@ARCHSUBDIRS@"
- return
+ else
+ ${SED} -n -e '/ARCHDIR_SUBDIR/s/[[:space:]]//gp' \
+ ${SRC_DIR}/compat/archdirs.mk
fi
+}
+
+
+getarchsubdirs() {
local m
case ${MACHINE_ARCH} in
*arm*|*aarch64*) m=arm;;
@@ -2199,12 +2205,14 @@ getarchsubdirs() {
*) m=${MACHINE_ARCH};;
esac
- ${SED} -n -e "/[=[:space:]]${m}/s@.*[=[:space:]]${m}/\(.*\)@\1@p" \
- ${SRC_DIR}/compat/archdirs.mk | ${SORT} -u
+ for i in $(listarchsubdirs); do
+ echo $i
+ done | ${SORT} -u | ${SED} -n -e "/=${m}/s@.*=${m}/\(.*\)@\1@p"
}
getcompatlibdirs() {
for i in $(getarchsubdirs); do
+ echo $i 1>&2
if [ -d /usr/lib/$i ]; then
echo /usr/lib/$i
fi
@@ -2539,6 +2547,11 @@ _Fix_me_
esac
}
+if [ -n "$POSTINSTALL_FUNCTION" ]; then
+ eval "$POSTINSTALL_FUNCTION"
+ exit 0
+fi
+
# defaults
#
PROGNAME="${0##*/}"
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Fri Jun 14 01:06:33 UTC 2019
Modified Files:
src/usr.sbin/postinstall: Makefile
Added Files:
src/usr.sbin/postinstall: postinstall.in
Removed Files:
src/usr.sbin/postinstall: postinstall
Log Message:
build dynamically the list of compat archsubdirs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/postinstall/Makefile
cvs rdiff -u -r1.232 -r0 src/usr.sbin/postinstall/postinstall
cvs rdiff -u -r0 -r1.1 src/usr.sbin/postinstall/postinstall.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/Makefile
diff -u src/usr.sbin/postinstall/Makefile:1.1 src/usr.sbin/postinstall/Makefile:1.2
--- src/usr.sbin/postinstall/Makefile:1.1 Sun Apr 17 11:15:49 2005
+++ src/usr.sbin/postinstall/Makefile Thu Jun 13 21:06:33 2019
@@ -1,9 +1,23 @@
-# $NetBSD: Makefile,v 1.1 2005/04/17 15:15:49 lukem Exp $
+# $NetBSD: Makefile,v 1.2 2019/06/14 01:06:33 christos Exp $
+
+.include
FILES= postinstall
MAN= postinstall.8
FILESDIR= /usr/sbin
FILESMODE= ${BINMODE}
+FILESBUILD= yes
+
+ARCHSUBDIRS != ${MAKE} -f ${NETBSDSRCDIR}/compat/archdirs.mk \
+ ACTIVE_CC=clang -V ARCHDIR_SUBDIR | ${TOOL_SED} -e 's@[a-z0-9_]*/@@g'
+
+.SUFFIXES: .in
+.in:
+ ${_MKTARGET_CREATE}
+ @rm -f ${.TARGET}
+ ${TOOL_SED} -e "s#@ARCHSUBDIRS@#${ARCHSUBDIRS}#" < ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+= postinstall
.include
Added files:
Index: src/usr.sbin/postinstall/postinstall.in
diff -u /dev/null src/usr.sbin/postinstall/postinstall.in:1.1
--- /dev/null Thu Jun 13 21:06:33 2019
+++ src/usr.sbin/postinstall/postinstall.in Thu Jun 13 21:06:33 2019
@@ -0,0 +1,2562 @@
+#!/bin/sh
+#
+# $NetBSD: postinstall.in,v 1.1 2019/06/14 01:06:33 christos Exp $
+#
+# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Luke Mewburn.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+# postinstall
+# Check for or fix configuration changes that occur
+# over time as NetBSD evolves.
+#
+
+#
+# XXX BE SURE TO USE ${DEST_DIR} PREFIX BEFORE ALL REAL FILE OPERATIONS XXX
+#
+
+#
+# checks to add:
+# - sysctl(8) renames (net.inet6.ip6.bindv6only -> net.inet6.ip6.v6only)
+# - de* -> tlp* migration (/etc/ifconfig.de*, $ifconfig_de*, ...) ?
+# - support quiet/verbose mode ?
+# - differentiate between failures caused by missing source
+# and real failures
+# - install moduli into usr/share/examples/ssh and use from there?
+# - differentiate between "needs fix" versus "can't fix" issues
+#
+
+# This script is executed as part of a cross build. Allow the build
+# environment to override the locations of some tools.
+: ${AWK:=awk}
+: ${DB:=db}
+: ${GREP:=grep}
+: ${HOST_SH:=sh}
+: ${MAKE:=make}
+: ${PWD_MKDB:=/usr/sbin/pwd_mkdb}
+: ${SED:=sed}
+: ${SORT:=sort}
+: ${STAT:=stat}
+
+#
+# helper functions
+#
+
+err()
+{
+ exitval=$1
+ shift
+ echo 1>&2 "${PROGNAME}: $*"
+ if [ -n "${SCRATCHDIR}" ]; then
+ /bin/rm -rf "${SCRATCHDIR}"
+ fi
+ exit ${exitval}
+}
+
+warn()
+{
+ echo 1>&2 "${PROGNAME}: $*"
+}
+
+msg()
+{
+ echo " $*"
+}
+
+mkdtemp()
+{
+ # Make sure we don't loop forever if mkdir will always fail.
+ [ -d /tmp ] || err 2 /tmp is not a directory
+ [ -w /tmp ] || err 2 /tmp is not writable
+
+ _base="/tmp/_postinstall.$$"
+ _serial=0
+
+ while true; do
+ _dir="${_base}.${_serial}"
+ mkdir -m 0700 "${_dir}" && break
+ _serial=$((${_serial} + 1))
+ done
+ echo "${_dir}"
+}
+
+# Quote args to make them safe in the shell.
+# Usage: quotedlist="$(shell_quote args...)"
+#
+# After building up a quoted list,
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Fri Jun 14 01:06:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: Makefile Added Files: src/usr.sbin/postinstall: postinstall.in Removed Files: src/usr.sbin/postinstall: postinstall Log Message: build dynamically the list of compat archsubdirs. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/postinstall/Makefile cvs rdiff -u -r1.232 -r0 src/usr.sbin/postinstall/postinstall cvs rdiff -u -r0 -r1.1 src/usr.sbin/postinstall/postinstall.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: kamil Date: Fri Jun 14 01:00:52 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: Enhance the GDB support for NetBSD - Enable VFORK events - Add syscall number for SCE/SCX events - Add commented out posix_spawn(3) events To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: kamil
Date: Fri Jun 14 01:00:52 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-nat.c
Log Message:
Enhance the GDB support for NetBSD
- Enable VFORK events
- Add syscall number for SCE/SCX events
- Add commented out posix_spawn(3) events
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.11 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.12
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.11 Tue May 28 15:30:39 2019
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Fri Jun 14 01:00:52 2019
@@ -233,12 +233,13 @@ nbsd_enable_proc_events (pid_t pid)
sizeof (events)) == -1)
perror_with_name (("ptrace"));
events |= PTRACE_FORK;
-#ifdef notyet
events |= PTRACE_VFORK;
events |= PTRACE_VFORK_DONE;
-#endif
events |= PTRACE_LWP_CREATE;
events |= PTRACE_LWP_EXIT;
+#if notyet
+ events |= PTRACE_POSIX_SPAWN;
+#endif
if (ptrace (PT_SET_EVENT_MASK, pid, (PTRACE_TYPE_ARG3),
sizeof (events)) == -1)
perror_with_name (("ptrace"));
@@ -381,11 +382,11 @@ nbsd_nat_target::wait (ptid_t ptid, stru
break;
case TRAP_SCE:
ourstatus->kind = TARGET_WAITKIND_SYSCALL_ENTRY;
-// ourstatus->value.syscall_number = 0;
+ ourstatus->value.syscall_number = psi.psi_siginfo.si_sysnum;
break;
case TRAP_SCX:
ourstatus->kind = TARGET_WAITKIND_SYSCALL_RETURN;
-// ourstatus->value.syscall_number = 0;
+ ourstatus->value.syscall_number = psi.psi_siginfo.si_sysnum;
break;
case TRAP_EXEC:
ourstatus->kind = TARGET_WAITKIND_EXECD;
re: CVS commit: src/usr.sbin/postinstall
"Christos Zoulas" writes: > Module Name: src > Committed By: christos > Date: Thu Jun 13 21:20:05 UTC 2019 > > Modified Files: > src/usr.sbin/postinstall: postinstall > > Log Message: > remove obsolete library files for all the "compat" subdirs not just amd64 > and sparc64. i think this broke running without a source tree. eg, "postinstall -s /path/to/etc.tgz". thanks. .mrg.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Thu Jun 13 21:20:05 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
remove obsolete library files for all the "compat" subdirs not just amd64
and sparc64.
To generate a diff of this commit:
cvs rdiff -u -r1.231 -r1.232 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.231 src/usr.sbin/postinstall/postinstall:1.232
--- src/usr.sbin/postinstall/postinstall:1.231 Thu Jun 13 16:53:33 2019
+++ src/usr.sbin/postinstall/postinstall Thu Jun 13 17:20:05 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.231 2019/06/13 20:53:33 christos Exp $
+# $NetBSD: postinstall,v 1.232 2019/06/13 21:20:05 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -2187,6 +2187,29 @@ do_obsolete_stand()
return ${failed}
}
+getarchsubdirs() {
+ if ! $SOURCEMODE; then
+ return
+ fi
+ local m
+ case ${MACHINE_ARCH} in
+ *arm*|*aarch64*) m=arm;;
+ x86_64) m=amd64;;
+ *) m=${MACHINE_ARCH};;
+ esac
+
+ ${SED} -n -e "/[=[:space:]]${m}/s@.*[=[:space:]]${m}/\(.*\)@\1@p" \
+ ${SRC_DIR}/compat/archdirs.mk | ${SORT} -u
+}
+
+getcompatlibdirs() {
+ for i in $(getarchsubdirs); do
+ if [ -d /usr/lib/$i ]; then
+ echo /usr/lib/$i
+ fi
+ done
+}
+
#
# obsolete
# (this item is last to allow other items to move obsolete files)
@@ -2207,8 +2230,9 @@ do_obsolete()
obsolete_libs /usr/lib/i18n
obsolete_libs /usr/X11R6/lib
obsolete_libs /usr/X11R7/lib
- [ "$MACHINE" = "amd64" ] && obsolete_libs /usr/lib/i386
- [ "$MACHINE" = "sparc64" ] && obsolete_libs /usr/lib/sparc
+ for i in $(getcompatlibdirs); do
+ obsolete_libs $i
+ done
) | obsolete_paths "${op}"
failed=$(( ${failed} + $? ))
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Thu Jun 13 21:20:05 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: remove obsolete library files for all the "compat" subdirs not just amd64 and sparc64. To generate a diff of this commit: cvs rdiff -u -r1.231 -r1.232 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat
Module Name:src Committed By: christos Date: Thu Jun 13 21:17:54 UTC 2019 Modified Files: src/compat: archdirs.mk Log Message: make all lines look the same, and put one arch per line. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/compat/archdirs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/compat
Module Name:src
Committed By: christos
Date: Thu Jun 13 21:17:54 UTC 2019
Modified Files:
src/compat: archdirs.mk
Log Message:
make all lines look the same, and put one arch per line.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/compat/archdirs.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/compat/archdirs.mk
diff -u src/compat/archdirs.mk:1.11 src/compat/archdirs.mk:1.12
--- src/compat/archdirs.mk:1.11 Sun Jul 15 20:33:00 2018
+++ src/compat/archdirs.mk Thu Jun 13 17:17:54 2019
@@ -1,29 +1,30 @@
-# $NetBSD: archdirs.mk,v 1.11 2018/07/16 00:33:00 christos Exp $
+# $NetBSD: archdirs.mk,v 1.12 2019/06/13 21:17:54 christos Exp $
# list of subdirs used per-platform
.if ${MACHINE} == "sparc64"
-ARCHDIR_SUBDIR= sparc64/sparc
+ARCHDIR_SUBDIR+= sparc64/sparc
.endif
.if ${MACHINE} == "amd64"
-ARCHDIR_SUBDIR= amd64/i386
+ARCHDIR_SUBDIR+= amd64/i386
.endif
.if !empty(MACHINE_ARCH:Mearm*)
-ARCHDIR_SUBDIR= arm/oabi
+ARCHDIR_SUBDIR+= arm/oabi
.endif
.if (${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el")
-ARCHDIR_SUBDIR= mips64/64 mips64/o32
+ARCHDIR_SUBDIR+= mips64/64
+ARCHDIR_SUBDIR+= mips64/o32
.endif
.if ${MACHINE_ARCH} == "powerpc64"
-ARCHDIR_SUBDIR= powerpc64/powerpc
+ARCHDIR_SUBDIR+= powerpc64/powerpc
.endif
.if ${MACHINE_ARCH} == "riscv64"
-ARCHDIR_SUBDIR= riscv64/rv32
+ARCHDIR_SUBDIR+= riscv64/rv32
.endif
.if ${ACTIVE_CC} == "clang"
@@ -32,6 +33,6 @@ ARCHDIR_SUBDIR+= arm/eabi
ARCHDIR_SUBDIR+= arm/eabihf
ARCHDIR_SUBDIR+= arm/oabi
.elif (${MACHINE_ARCH} == "aarch64eb")
-ARCHDIR_SUBDIR= arm/eabi
+ARCHDIR_SUBDIR+= arm/eabi
.endif
.endif
CVS commit: src/etc
Module Name:src
Committed By: christos
Date: Thu Jun 13 20:54:05 UTC 2019
Modified Files:
src/etc: MAKEDEV.awk
Log Message:
Fix aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/etc/MAKEDEV.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.awk
diff -u src/etc/MAKEDEV.awk:1.25 src/etc/MAKEDEV.awk:1.26
--- src/etc/MAKEDEV.awk:1.25 Fri Sep 19 05:01:05 2014
+++ src/etc/MAKEDEV.awk Thu Jun 13 16:54:04 2019
@@ -1,6 +1,6 @@
#!/usr/bin/awk -
#
-# $NetBSD: MAKEDEV.awk,v 1.25 2014/09/19 09:01:05 matt Exp $
+# $NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -55,7 +55,7 @@ BEGIN {
# file with major definitions
majors[0] = "conf/majors"
- if (index(maarch, "arm") != 0 && system("test -f '" top "arch/" machine "/conf/majors." machine "'") != 0)
+ if ((index(maarch, "arm") != 0 || index(maarch, "aarch64")) && system("test -f '" top "arch/" machine "/conf/majors." machine "'") != 0)
majors[1] = "arch/arm/conf/majors.arm32";
else if (machine == "sbmips")
majors[1] = "arch/evbmips/conf/majors.evbmips";
@@ -214,7 +214,7 @@ BEGIN {
print "# Generated from:"
# MAKEDEV.awk (this script) RCS Id
- ARCSID = "$NetBSD: MAKEDEV.awk,v 1.25 2014/09/19 09:01:05 matt Exp $"
+ ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $"
gsub(/\$/, "", ARCSID)
print "# " ARCSID
CVS commit: src/etc
Module Name:src Committed By: christos Date: Thu Jun 13 20:54:05 UTC 2019 Modified Files: src/etc: MAKEDEV.awk Log Message: Fix aarch64 To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/etc/MAKEDEV.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Thu Jun 13 20:53:33 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Anchor the egrep search to avoid npf.conf matching pf.conf, but don't
anchor $ so that blacklistd machines blackist.
To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.230 src/usr.sbin/postinstall/postinstall:1.231
--- src/usr.sbin/postinstall/postinstall:1.230 Thu Jun 13 15:30:30 2019
+++ src/usr.sbin/postinstall/postinstall Thu Jun 13 16:53:33 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.230 2019/06/13 19:30:30 christos Exp $
+# $NetBSD: postinstall,v 1.231 2019/06/13 20:53:33 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1423,7 +1423,7 @@ exclude()
if [ -z "$*" ]; then
cat
else
- eval ${GREP} -v -E "'($(echo $* | sed -e 's/ /|/'g))'"
+ eval ${GREP} -v -E "'(^$(echo $* | sed -e 's/ /|^/'g))'"
fi
}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Thu Jun 13 20:53:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Anchor the egrep search to avoid npf.conf matching pf.conf, but don't anchor $ so that blacklistd machines blackist. To generate a diff of this commit: cvs rdiff -u -r1.230 -r1.231 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Thu Jun 13 20:26:06 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Enable vfork(2) ATF tests in t_ptrace_wait*
The racing issues are gone in my local setup.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.126 src/tests/lib/libc/sys/t_ptrace_wait.c:1.127
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.126 Wed Jun 12 17:07:11 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Thu Jun 13 20:26:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.126 2019/06/12 17:07:11 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.127 2019/06/13 20:26:06 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.126 2019/06/12 17:07:11 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.127 2019/06/13 20:26:06 kamil Exp $");
#include
#include
@@ -100,7 +100,7 @@ static int debug = 0;
while (/*CONSTCOND*/0)
#ifndef TEST_VFORK_ENABLED
-#define TEST_VFORK_ENABLED 0
+#define TEST_VFORK_ENABLED 1
#endif
///
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Thu Jun 13 20:26:06 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Enable vfork(2) ATF tests in t_ptrace_wait* The racing issues are gone in my local setup. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/tests/lib/libc/sys/t_ptrace_wait.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: kamil Date: Thu Jun 13 20:23:56 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 8.99.45! struct lwp includes now l_vforkwaiting. To generate a diff of this commit: cvs rdiff -u -r1.592 -r1.593 src/sys/sys/param.h 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: kamil Date: Thu Jun 13 20:23:56 UTC 2019 Modified Files: src/sys/sys: param.h Log Message: Welcome to 8.99.45! struct lwp includes now l_vforkwaiting. To generate a diff of this commit: cvs rdiff -u -r1.592 -r1.593 src/sys/sys/param.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/param.h diff -u src/sys/sys/param.h:1.592 src/sys/sys/param.h:1.593 --- src/sys/sys/param.h:1.592 Tue Jun 11 23:20:18 2019 +++ src/sys/sys/param.h Thu Jun 13 20:23:56 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.592 2019/06/11 23:20:18 kamil Exp $ */ +/* $NetBSD: param.h,v 1.593 2019/06/13 20:23:56 kamil Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 899004400 /* NetBSD 8.99.44 */ +#define __NetBSD_Version__ 899004500 /* NetBSD 8.99.45 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: src/sys
Module Name:src Committed By: kamil Date: Thu Jun 13 20:20:18 UTC 2019 Modified Files: src/sys/kern: kern_exec.c kern_exit.c kern_fork.c src/sys/sys: lwp.h Log Message: Correct use-after-free issue in vfork(2) In the previous behavior vforking parent was keeping pointer to a child and checking whether it clears a PL_PPWAIT in its bitfield p_lflag. However a child can go invalid between exec/exit event from child and waking up vforked parent and this can cause invalid pointer read and in the worst scenario kernel crash. In the new behavior vforked child keeps a reference to vforked parent LWP and sets a value l_vforkwaiting to false. This means that vforked child can finish its work, exec/exit and be terminated and once parent will be woken up it will read its own field whether its child is still blocking. Add new field in struct lwp: l_vforkwaiting protected by proc_lock. In future it should be refactored and all PL_PPWAIT users transformed to l_vforkwaiting and next l_vforkwaiting probably transformed into a bit field. This is another attempt of fixing this bug after from 2012 in commit: Author: rmind Date: Sun Jul 22 22:40:18 2012 + fork1: fix use-after-free problems. Addresses PR/46128 from Andrew Doran. Note: PL_PPWAIT should be fully replaced and modificaiton of l_pflag by other LWP is undesirable, but this is enough for netbsd-6. The new version no longer performs unsafe access in l_lflag changing the LP_VFORKWAIT bit. Verified with ATF t_vfork and t_ptrace* tests and they are no longer causing any issues in my local setup. Fixes PR/46128 by Andrew Doran To generate a diff of this commit: cvs rdiff -u -r1.466 -r1.467 src/sys/kern/kern_exec.c cvs rdiff -u -r1.275 -r1.276 src/sys/kern/kern_exit.c cvs rdiff -u -r1.212 -r1.213 src/sys/kern/kern_fork.c cvs rdiff -u -r1.183 -r1.184 src/sys/sys/lwp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: kamil
Date: Thu Jun 13 20:20:18 UTC 2019
Modified Files:
src/sys/kern: kern_exec.c kern_exit.c kern_fork.c
src/sys/sys: lwp.h
Log Message:
Correct use-after-free issue in vfork(2)
In the previous behavior vforking parent was keeping pointer to a child
and checking whether it clears a PL_PPWAIT in its bitfield p_lflag. However
a child can go invalid between exec/exit event from child and waking up
vforked parent and this can cause invalid pointer read and in the worst
scenario kernel crash.
In the new behavior vforked child keeps a reference to vforked parent LWP
and sets a value l_vforkwaiting to false. This means that vforked child
can finish its work, exec/exit and be terminated and once parent will be
woken up it will read its own field whether its child is still blocking.
Add new field in struct lwp: l_vforkwaiting protected by proc_lock.
In future it should be refactored and all PL_PPWAIT users transformed to
l_vforkwaiting and next l_vforkwaiting probably transformed into a bit
field.
This is another attempt of fixing this bug after from 2012 in
commit:
Author: rmind
Date: Sun Jul 22 22:40:18 2012 +
fork1: fix use-after-free problems. Addresses PR/46128 from Andrew Doran.
Note: PL_PPWAIT should be fully replaced and modificaiton of l_pflag by
other LWP is undesirable, but this is enough for netbsd-6.
The new version no longer performs unsafe access in l_lflag changing the
LP_VFORKWAIT bit.
Verified with ATF t_vfork and t_ptrace* tests and they are no longer
causing any issues in my local setup.
Fixes PR/46128 by Andrew Doran
To generate a diff of this commit:
cvs rdiff -u -r1.466 -r1.467 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.275 -r1.276 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.212 -r1.213 src/sys/kern/kern_fork.c
cvs rdiff -u -r1.183 -r1.184 src/sys/sys/lwp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.466 src/sys/kern/kern_exec.c:1.467
--- src/sys/kern/kern_exec.c:1.466 Tue Jun 11 23:18:55 2019
+++ src/sys/kern/kern_exec.c Thu Jun 13 20:20:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.466 2019/06/11 23:18:55 kamil Exp $ */
+/* $NetBSD: kern_exec.c,v 1.467 2019/06/13 20:20:18 kamil Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.466 2019/06/11 23:18:55 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.467 2019/06/13 20:20:18 kamil Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -1207,10 +1207,17 @@ execve_runproc(struct lwp *l, struct exe
* exited and exec()/exit() are the only places it will be cleared.
*/
if ((p->p_lflag & PL_PPWAIT) != 0) {
+ lwp_t *lp;
+
mutex_enter(proc_lock);
+ lp = p->p_vforklwp;
+ p->p_vforklwp = NULL;
+
l->l_lwpctl = NULL; /* was on loan from blocked parent */
p->p_lflag &= ~PL_PPWAIT;
- cv_broadcast(>p_pptr->p_waitcv);
+ lp->l_vforkwaiting = false;
+
+ cv_broadcast(>l_waitcv);
mutex_exit(proc_lock);
}
Index: src/sys/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.275 src/sys/kern/kern_exit.c:1.276
--- src/sys/kern/kern_exit.c:1.275 Fri May 17 03:34:26 2019
+++ src/sys/kern/kern_exit.c Thu Jun 13 20:20:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exit.c,v 1.275 2019/05/17 03:34:26 ozaki-r Exp $ */
+/* $NetBSD: kern_exit.c,v 1.276 2019/06/13 20:20:18 kamil Exp $ */
/*-
* Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.275 2019/05/17 03:34:26 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.276 2019/06/13 20:20:18 kamil Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -342,9 +342,15 @@ exit1(struct lwp *l, int exitcode, int s
*/
mutex_enter(proc_lock);
if (p->p_lflag & PL_PPWAIT) {
+ lwp_t *lp;
+
l->l_lwpctl = NULL; /* was on loan from blocked parent */
p->p_lflag &= ~PL_PPWAIT;
- cv_broadcast(>p_pptr->p_waitcv);
+
+ lp = p->p_vforklwp;
+ p->p_vforklwp = NULL;
+ lp->l_vforkwaiting = false;
+ cv_broadcast(>l_waitcv);
}
if (SESS_LEADER(p)) {
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.212 src/sys/kern/kern_fork.c:1.213
--- src/sys/kern/kern_fork.c:1.212 Fri May 3 22:34:21 2019
+++ src/sys/kern/kern_fork.c Thu Jun 13 20:20:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.212 2019/05/03 22:34:21 kamil Exp $ */
+/* $NetBSD: kern_fork.c,v 1.213 2019/06/13 20:20:18 kamil Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.212 2019/05/03 22:34:21 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.213 2019/06/13 20:20:18 kamil Exp $");
#include
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Thu Jun 13 19:37:36 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: shl.mi Log Message: fix eager sed that broke xorg_glamor. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xdebug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xdebug/shl.mi diff -u src/distrib/sets/lists/xdebug/shl.mi:1.49 src/distrib/sets/lists/xdebug/shl.mi:1.50 --- src/distrib/sets/lists/xdebug/shl.mi:1.49 Thu Jun 13 09:37:56 2019 +++ src/distrib/sets/lists/xdebug/shl.mi Thu Jun 13 15:37:36 2019 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.49 2019/06/13 13:37:56 christos Exp $ +# $NetBSD: shl.mi,v 1.50 2019/06/13 19:37:36 christos Exp $ ./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete @@ -105,7 +105,7 @@ ./usr/libdata/debug/usr/X11R7/lib/libxkbfile.so.2.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libxkbui.so.2.0.debug -unknown- xorg,debug,compatx11file ./usr/libdata/debug/usr/X11R7/lib/libxshmfence.so.1.0.debug -unknown- xorg,debug,compatx11file -./usr/libdata/debug/usr/X11R7/lib/modules/libglamoregl.so.0.debug -unknown- xorg,debug_glamor +./usr/libdata/debug/usr/X11R7/lib/modules/libglamoregl.so.0.debug -unknown- xorg,debug,xorg_glamor ./usr/libdata/debug/usr/X11R7/lib/modules/dri/gallium_dri.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/kms_swrast_dri.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmesa_dri.so.0.debug -unknown- xorg,obsolete,machine=amd64,mesa_ver=18
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Thu Jun 13 19:37:36 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: shl.mi Log Message: fix eager sed that broke xorg_glamor. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/xdebug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Thu Jun 13 19:30:30 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: 1. fix /etc/defaults/*.conf files a. there are more rc.conf.append arch than only for x86, deal with them too. b. populate new /etc/defaults/rc.conf files 2. merge sed patterns 3. deal with empty exclude lists To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Thu Jun 13 19:30:30 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
1. fix /etc/defaults/*.conf files
a. there are more rc.conf.append arch than only for x86, deal with them too.
b. populate new /etc/defaults/rc.conf files
2. merge sed patterns
3. deal with empty exclude lists
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.229 src/usr.sbin/postinstall/postinstall:1.230
--- src/usr.sbin/postinstall/postinstall:1.229 Wed Jun 12 20:24:43 2019
+++ src/usr.sbin/postinstall/postinstall Thu Jun 13 15:30:30 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.229 2019/06/13 00:24:43 christos Exp $
+# $NetBSD: postinstall,v 1.230 2019/06/13 19:30:30 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -847,21 +847,23 @@ additem defaults "/etc/defaults/ being u
do_defaults()
{
[ -n "$1" ] || err 3 "USAGE: do_defaults fix|check"
- op="$1"
- failed=0
+ local op="$1"
+ local failed=0
+ local etcsets=$(getetcsets)
- # Except for i386 and amd64, rc.conf(5) should be the same as the
- # one obtained from a source directory
- extra_scripts="rc.conf"
- if [ "$MACHINE" = "i386" -o "$MACHINE" = "amd64" ]; then
- if $SOURCEMODE; then
- extra_scripts= # clear
+ local rc_exclude_scripts=""
+ if $SOURCEMODE; then
+ # For most architectures rc.conf(5) should be the same as the
+ # one obtained from a source directory, except for the ones
+ # that have an append file for it.
+ local rc_conf_app="${SRC_DIR}/etc/etc.${MACHINE}/rc.conf.append"
+ if [ -f "${rc_conf_app}" ]; then
+ rc_exclude_scripts="rc.conf"
# Generate and compare the correct rc.conf(5) file
mkdir "${SCRATCHDIR}/defaults"
- cat "${SRC_DIR}/etc/defaults/rc.conf" \
- "${SRC_DIR}/etc/etc.${MACHINE}/rc.conf.append" \
+ cat "${SRC_DIR}/etc/defaults/rc.conf" "${rc_conf_app}" \
> "${SCRATCHDIR}/defaults/rc.conf"
compare_dir "${op}" "${SCRATCHDIR}/defaults" \
@@ -872,19 +874,24 @@ do_defaults()
fi
fi
- compare_dir "$op" "${SRC_DIR}/etc/defaults" "${DEST_DIR}/etc/defaults" \
- 444 \
- daily.conf monthly.conf npf.boot.conf pkgpath.conf \
- security.conf weekly.conf ${extra_scripts}
- failed=$(( ${failed} + $? ))
-
find_file_in_dirlist pf.boot.conf "pf.boot.conf" \
"${SRC_DIR}/usr.sbin/pf/etc/defaults" "${SRC_DIR}/etc/defaults" \
|| return 1
- # ${dir} is set by find_file_in_dirlist()
+ # ${dir} is set by find_file_in_dirlist()
compare_dir "$op" "${dir}" "${DEST_DIR}/etc/defaults" 444 pf.boot.conf
failed=$(( ${failed} + $? ))
+ rc_exclude_scripts="${rc_exclude_scripts} pf.boot.conf"
+
+ local rc_default_conf_files="$(select_set_files /etc/defaults/ \
+ "/etc/defaults/\([^[:space:]]*\.conf\)" ${etcsets} | \
+ exclude ${rc_exclude_scripts})"
+ compare_dir "$op" "${SRC_DIR}/etc/defaults" "${DEST_DIR}/etc/defaults" \
+ 444 \
+ ${rc_default_conf_files}
+ failed=$(( ${failed} + $? ))
+
+
return ${failed}
}
@@ -1400,9 +1407,33 @@ update_rc()
return $?
}
+# select non-obsolete files in a sets file
+# $1: directory pattern
+# $2: file pattern
+# $3: filename
+select_set_files()
+{
+ local qdir="$(echo $1 | ${SED} -e s@/@/@g -e s/\\././g)"
+ ${SED} -n -e /obsolete/d \
+ -e "/^\.${qdir}/s@^.$2[[:space:]].*@\1@p" $3
+}
+
exclude()
{
- eval ${GREP} -v -E "'($(echo $* | sed -e 's/ /|/'g))'"
+ if [ -z "$*" ]; then
+ cat
+ else
+ eval ${GREP} -v -E "'($(echo $* | sed -e 's/ /|/'g))'"
+ fi
+}
+
+getetcsets()
+{
+ if $SOURCEMODE; then
+ echo "${SRC_DIR}/distrib/sets/lists/etc/mi"
+ else
+ echo "${SRC_DIR}/etc/mtree/set.etc"
+ fi
}
additem rc "/etc/rc* and /etc/rc.d/ being up to date"
@@ -1412,12 +1443,7 @@ do_rc()
local op="$1"
local failed=0
local generated_scripts=""
- local etcsets=
- if $SOURCEMODE; then
- etcsets="${SRC_DIR}/distrib/sets/lists/etc/mi"
- else
- etcsets="${SRC_DIR}/etc/mtree/set.etc"
- fi
+ local etcsets=$(getetcsets)
if [ "${MKX11}" != "no" ]; then
generated_scripts="${generated_scripts} xdm xfs"
fi
@@ -1426,14 +1452,12 @@ do_rc()
local rc_external_files="blacklist nsd unbound"
# rc* files in /etc/
- local rc_444_files="$(${SED} -n -e /obsolete/d -e '/^\.\/etc\/rc\.d/d' \
- -e '/^\.\/etc\/rc/s@./etc/\([^[:space:]]*\)[[:space:]].*@\1@p' \
- ${etcsets})"
+ local rc_444_files="$(select_set_files /etc/rc \
+ "/etc/\(rc[^[:space:]/]*\)" ${etcsets})"
# no-obsolete rc files in /etc/rc.d
- local rc_555_files="$(${SED} -n -e /obsolete/d \
- -e 's@./etc/rc.d/\([^[:space:]]*\)[[:space:]].*@\1@p' \
- ${etcsets} | \
+ local rc_555_files="$(select_set_files /etc/rc.d/ \
+
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Thu Jun 13 19:13:05 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disks.c
Log Message:
Disable debug output
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/disks.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/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.30 src/usr.sbin/sysinst/disks.c:1.31
--- src/usr.sbin/sysinst/disks.c:1.30 Wed Jun 12 06:20:17 2019
+++ src/usr.sbin/sysinst/disks.c Thu Jun 13 19:13:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.30 2019/06/12 06:20:17 martin Exp $ */
+/* $NetBSD: disks.c,v 1.31 2019/06/13 19:13:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -66,7 +66,7 @@
#include "menu_defs.h"
#include "txtwalk.h"
-#define DEBUG_VERBOSE 1
+/* #define DEBUG_VERBOSE 1 */
/* Disk descriptions */
struct disk_desc {
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 19:13:05 UTC 2019 Modified Files: src/usr.sbin/sysinst: disks.c Log Message: Disable debug output To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/sysinst/disks.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/pci
Module Name:src Committed By: maxv Date: Thu Jun 13 17:33:34 UTC 2019 Modified Files: src/sys/dev/pci: ehci_pci.c Log Message: Fix the error handling in ehci_pci_attach(): if we got a USB<2 device we won't call ehci_init(), so don't call ehci_detach() in ehci_pci_detach(). Fixes a panic seen on a recent Lenovo machine, which has an USB 1.1 controller; ehci_detach() was getting called while 'sc' had not been completely initialized. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/ehci_pci.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/pci
Module Name:src
Committed By: maxv
Date: Thu Jun 13 17:33:34 UTC 2019
Modified Files:
src/sys/dev/pci: ehci_pci.c
Log Message:
Fix the error handling in ehci_pci_attach(): if we got a USB<2 device we
won't call ehci_init(), so don't call ehci_detach() in ehci_pci_detach().
Fixes a panic seen on a recent Lenovo machine, which has an USB 1.1
controller; ehci_detach() was getting called while 'sc' had not been
completely initialized.
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/ehci_pci.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.69 src/sys/dev/pci/ehci_pci.c:1.70
--- src/sys/dev/pci/ehci_pci.c:1.69 Thu Jun 13 17:20:25 2019
+++ src/sys/dev/pci/ehci_pci.c Thu Jun 13 17:33:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.69 2019/06/13 17:20:25 maxv Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.70 2019/06/13 17:33:34 maxv Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.69 2019/06/13 17:20:25 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.70 2019/06/13 17:33:34 maxv Exp $");
#include
#include
@@ -83,6 +83,10 @@ struct ehci_pci_softc {
pcitag_t sc_tag;
pci_intr_handle_t *sc_pihp;
void *sc_ih; /* interrupt vectoring */
+ enum {
+ EHCI_INIT_NONE,
+ EHCI_INIT_INITED
+ } sc_init_state;
};
static int ehci_sb700_match(const struct pci_attach_args *);
@@ -120,6 +124,7 @@ ehci_pci_attach(device_t parent, device_
int ncomp, quirk;
pcireg_t csr;
+ sc->sc_init_state = EHCI_INIT_NONE;
sc->sc.sc_dev = self;
sc->sc.sc_bus.ub_hcpriv = sc;
@@ -243,6 +248,7 @@ ehci_pci_attach(device_t parent, device_
aprint_error_dev(self, "init failed, error=%d\n", err);
goto fail;
}
+ sc->sc_init_state = EHCI_INIT_INITED;
if (!pmf_device_register1(self, ehci_pci_suspend, ehci_pci_resume,
ehci_shutdown))
@@ -270,9 +276,11 @@ ehci_pci_detach(device_t self, int flags
struct ehci_pci_softc *sc = device_private(self);
int rv;
- rv = ehci_detach(>sc, flags);
- if (rv)
- return rv;
+ if (sc->sc_init_state >= EHCI_INIT_INITED) {
+ rv = ehci_detach(>sc, flags);
+ if (rv)
+ return rv;
+ }
pmf_device_deregister(self);
ehci_shutdown(self, flags);
@@ -300,10 +308,12 @@ ehci_pci_detach(device_t self, int flags
#if 1
/* XXX created in ehci.c */
- mutex_destroy(>sc.sc_lock);
- mutex_destroy(>sc.sc_intr_lock);
- softint_disestablish(sc->sc.sc_doorbell_si);
- softint_disestablish(sc->sc.sc_pcd_si);
+ if (sc->sc_init_state >= EHCI_INIT_INITED) {
+ mutex_destroy(>sc.sc_lock);
+ mutex_destroy(>sc.sc_intr_lock);
+ softint_disestablish(sc->sc.sc_doorbell_si);
+ softint_disestablish(sc->sc.sc_pcd_si);
+ }
#endif
return 0;
CVS commit: src/sys/dev
Module Name:src Committed By: maxv Date: Thu Jun 13 17:20:25 UTC 2019 Modified Files: src/sys/dev/pci: ehci_pci.c src/sys/dev/usb: ehci.c Log Message: Random style in ehci, also KM_SLEEP does not fail. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/ehci_pci.c cvs rdiff -u -r1.266 -r1.267 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src
Committed By: maxv
Date: Thu Jun 13 17:20:25 UTC 2019
Modified Files:
src/sys/dev/pci: ehci_pci.c
src/sys/dev/usb: ehci.c
Log Message:
Random style in ehci, also KM_SLEEP does not fail.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.266 -r1.267 src/sys/dev/usb/ehci.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.68 src/sys/dev/pci/ehci_pci.c:1.69
--- src/sys/dev/pci/ehci_pci.c:1.68 Thu Oct 25 21:07:58 2018
+++ src/sys/dev/pci/ehci_pci.c Thu Jun 13 17:20:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.68 2018/10/25 21:07:58 jdolecek Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.69 2019/06/13 17:20:25 maxv Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.68 2018/10/25 21:07:58 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.69 2019/06/13 17:20:25 maxv Exp $");
#include
#include
@@ -72,10 +72,8 @@ static const struct pci_quirkdata ehci_p
EHCI_PCI_QUIRK_AMD_SB700 },
};
-static void ehci_release_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc,
- pcitag_t tag);
-static void ehci_get_ownership(ehci_softc_t *sc, pci_chipset_tag_t pc,
- pcitag_t tag);
+static void ehci_release_ownership(ehci_softc_t *, pci_chipset_tag_t, pcitag_t);
+static void ehci_get_ownership(ehci_softc_t *, pci_chipset_tag_t, pcitag_t);
static bool ehci_pci_suspend(device_t, const pmf_qual_t *);
static bool ehci_pci_resume(device_t, const pmf_qual_t *);
@@ -87,16 +85,15 @@ struct ehci_pci_softc {
void *sc_ih; /* interrupt vectoring */
};
-static int ehci_sb700_match(const struct pci_attach_args *pa);
-static int ehci_apply_amd_quirks(struct ehci_pci_softc *sc);
-enum ehci_pci_quirk_flags ehci_pci_lookup_quirkdata(pci_vendor_id_t,
- pci_product_id_t);
+static int ehci_sb700_match(const struct pci_attach_args *);
+static int ehci_apply_amd_quirks(struct ehci_pci_softc *);
+static enum ehci_pci_quirk_flags ehci_pci_lookup_quirkdata(pci_vendor_id_t,
+pci_product_id_t);
#define EHCI_MAX_BIOS_WAIT 100 /* ms*10 */
#define EHCI_SBx00_WORKAROUND_REG 0x50
#define EHCI_SBx00_WORKAROUND_ENABLE __BIT(27)
-
static int
ehci_pci_match(device_t parent, cfdata_t match, void *aux)
{
@@ -117,12 +114,11 @@ ehci_pci_attach(device_t parent, device_
struct pci_attach_args *pa = (struct pci_attach_args *)aux;
pci_chipset_tag_t pc = pa->pa_pc;
pcitag_t tag = pa->pa_tag;
+ char intrbuf[PCI_INTRSTR_LEN];
char const *intrstr;
- pcireg_t csr;
- int ncomp;
struct usb_pci *up;
- int quirk;
- char intrbuf[PCI_INTRSTR_LEN];
+ int ncomp, quirk;
+ pcireg_t csr;
sc->sc.sc_dev = self;
sc->sc.sc_bus.ub_hcpriv = sc;
@@ -131,11 +127,11 @@ ehci_pci_attach(device_t parent, device_
/* Check for quirks */
quirk = ehci_pci_lookup_quirkdata(PCI_VENDOR(pa->pa_id),
- PCI_PRODUCT(pa->pa_id));
+ PCI_PRODUCT(pa->pa_id));
/* Map I/O registers */
if (pci_mapreg_map(pa, PCI_CBMEM, PCI_MAPREG_TYPE_MEM, 0,
- >sc.iot, >sc.ioh, NULL, >sc.sc_size)) {
+ >sc.iot, >sc.ioh, NULL, >sc.sc_size)) {
sc->sc.sc_size = 0;
aprint_error_dev(self, "can't map memory space\n");
return;
@@ -199,7 +195,7 @@ ehci_pci_attach(device_t parent, device_
case PCI_USBREV_1_0:
case PCI_USBREV_1_1:
sc->sc.sc_bus.ub_revision = USBREV_UNKNOWN;
- aprint_verbose_dev(self, "pre-2.0 USB rev\n");
+ aprint_verbose_dev(self, "pre-2.0 USB rev, device ignored\n");
goto fail;
case PCI_USBREV_2_0:
sc->sc.sc_bus.ub_revision = USBREV_2_0;
@@ -228,10 +224,10 @@ ehci_pci_attach(device_t parent, device_
KASSERT(maxncomp <= EHCI_COMPANION_MAX);
ncomp = 0;
TAILQ_FOREACH(up, _pci_alldevs, next) {
- if (up->bus == pa->pa_bus && up->device == pa->pa_device
- && !up->claimed) {
+ if (up->bus == pa->pa_bus && up->device == pa->pa_device &&
+ !up->claimed) {
DPRINTF(("ehci_pci_attach: companion %s\n",
- device_xname(up->usb)));
+ device_xname(up->usb)));
sc->sc.sc_comps[ncomp++] = up->usb;
up->claimed = true;
if (ncomp == maxncomp)
@@ -249,7 +245,7 @@ ehci_pci_attach(device_t parent, device_
}
if (!pmf_device_register1(self, ehci_pci_suspend, ehci_pci_resume,
- ehci_shutdown))
+ ehci_shutdown))
aprint_error_dev(self, "couldn't establish power handler\n");
/* Attach usb device. */
@@ -266,7 +262,6 @@ fail:
bus_space_unmap(sc->sc.iot, sc->sc.ioh, sc->sc.sc_size);
sc->sc.sc_size = 0;
}
- return;
}
static int
@@ -307,7 +302,6 @@ ehci_pci_detach(device_t self, int flags
/* XXX created in ehci.c */
mutex_destroy(>sc.sc_lock);
mutex_destroy(>sc.sc_intr_lock);
-
softint_disestablish(sc->sc.sc_doorbell_si);
softint_disestablish(sc->sc.sc_pcd_si);
#endif
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Jun 13 15:10:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Indent consistently. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/include/i82489reg.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/x86/include/i82489reg.h diff -u src/sys/arch/x86/include/i82489reg.h:1.17 src/sys/arch/x86/include/i82489reg.h:1.18 --- src/sys/arch/x86/include/i82489reg.h:1.17 Thu Jun 13 07:44:27 2019 +++ src/sys/arch/x86/include/i82489reg.h Thu Jun 13 15:10:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: i82489reg.h,v 1.17 2019/06/13 07:44:27 msaitoh Exp $ */ +/* $NetBSD: i82489reg.h,v 1.18 2019/06/13 15:10:27 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -35,36 +35,36 @@ * "local" APIC. */ -#define LAPIC_ID 0x020 /* ID. (xAPIC: RW, x2APIC: RO) */ +#define LAPIC_ID 0x020 /* ID. (xAPIC: RW, x2APIC: RO) */ # define LAPIC_ID_MASK 0xff00 # define LAPIC_ID_SHIFT 24 -#define LAPIC_VERS 0x030 /* Version. RO */ +#define LAPIC_VERS 0x030 /* Version. RO */ # define LAPIC_VERSION_MASK 0x00ff # define LAPIC_VERSION_LVT_MASK 0x00ff # define LAPIC_VERSION_LVT_SHIFT 16 # define LAPIC_VERSION_DIRECTED_EOI 0x0100 # define LAPIC_VERSION_EXTAPIC_SPACE 0x8000 -#define LAPIC_TPRI 0x080 /* Task Prio. RW */ +#define LAPIC_TPRI 0x080 /* Task Prio. RW */ # define LAPIC_TPRI_MASK 0x00ff # define LAPIC_TPRI_INT_MASK 0x00f0 # define LAPIC_TPRI_SUB_MASK 0x000f -#define LAPIC_APRI 0x090 /* Arbitration prio (xAPIC: RO, x2APIC: NA) */ +#define LAPIC_APRI 0x090 /* Arbitration prio (xAPIC: RO, x2APIC: NA) */ # define LAPIC_APRI_MASK 0x00ff -#define LAPIC_PPRI 0x0a0 /* Processor prio. RO */ -#define LAPIC_EOI 0x0b0 /* End Int. W */ -#define LAPIC_RRR 0x0c0 /* Remote read (xAPIC: RO, x2APIC: NA) */ -#define LAPIC_LDR 0x0d0 /* Logical dest. (xAPIC: RW, x2APIC: RO) */ +#define LAPIC_PPRI 0x0a0 /* Processor prio. RO */ +#define LAPIC_EOI 0x0b0 /* End Int. W */ +#define LAPIC_RRR 0x0c0 /* Remote read (xAPIC: RO, x2APIC: NA) */ +#define LAPIC_LDR 0x0d0 /* Logical dest. (xAPIC: RW, x2APIC: RO) */ -#define LAPIC_DFR 0x0e0 /* Dest. format (xAPIC: RW, x2APIC: NA) */ +#define LAPIC_DFR 0x0e0 /* Dest. format (xAPIC: RW, x2APIC: NA) */ # define LAPIC_DFR_MASK 0xf000 # define LAPIC_DFR_FLAT 0xf000 # define LAPIC_DFR_CLUSTER 0x -#define LAPIC_SVR 0x0f0 /* Spurious intvec RW */ +#define LAPIC_SVR 0x0f0 /* Spurious intvec RW */ # define LAPIC_SVR_VECTOR_MASK 0x00ff # define LAPIC_SVR_VEC_FIX 0x000f # define LAPIC_SVR_VEC_PROG 0x00f0 @@ -74,14 +74,14 @@ # define LAPIC_SVR_FDIS 0x0200 # define LAPIC_SVR_EOI_BC_DIS 0x1000 -#define LAPIC_ISR 0x100 /* In-Service Status RO */ -#define LAPIC_TMR 0x180 /* Trigger Mode RO */ -#define LAPIC_IRR 0x200 /* Interrupt Req RO */ -#define LAPIC_ESR 0x280 /* Err status. RW */ +#define LAPIC_ISR 0x100 /* In-Service Status RO */ +#define LAPIC_TMR 0x180 /* Trigger Mode RO */ +#define LAPIC_IRR 0x200 /* Interrupt Req RO */ +#define LAPIC_ESR 0x280 /* Err status. RW */ -#define LAPIC_LVT_CMCI 0x2f0 /* Loc.vec (CMCI) RW */ +#define LAPIC_LVT_CMCI 0x2f0 /* Loc.vec (CMCI) RW */ -#define LAPIC_ICRLO 0x300 /* Int. cmd. (xAPIC: RW, x2APIC: RW64) */ +#define LAPIC_ICRLO 0x300 /* Int. cmd. (xAPIC: RW, x2APIC: RW64) */ # define LAPIC_DLMODE_MASK 0x0700 /* Delivery Mode */ # define LAPIC_DLMODE_FIXED 0x # define LAPIC_DLMODE_LOW 0x0100 /* N/A in x2APIC mode */ @@ -111,17 +111,17 @@ # define LAPIC_DEST_ALLINCL 0x0008 # define LAPIC_DEST_ALLEXCL 0x000c -#define LAPIC_ICRHI 0x310 /* Int. cmd. (xAPIC: RW, x2APIC: NA) */ +#define LAPIC_ICRHI 0x310 /* Int. cmd. (xAPIC: RW, x2APIC: NA) */ -#define LAPIC_LVTT 0x320 /* Loc.vec.(timer) RW */ +#define LAPIC_LVTT 0x320 /* Loc.vec.(timer) RW */ # define LAPIC_LVTT_VEC_MASK 0x00ff # define LAPIC_LVTT_DS 0x1000 # define LAPIC_LVTT_M 0x0001 # define LAPIC_LVTT_TM 0x0002 -#define LAPIC_TMINT 0x330 /* Loc.vec (Thermal) RW */ -#define LAPIC_PCINT 0x340 /* Loc.vec (Perf Mon) RW */ -#define LAPIC_LVINT0 0x350 /* Loc.vec (LINT0) RW */ +#define LAPIC_TMINT 0x330 /* Loc.vec (Thermal) RW */ +#define LAPIC_PCINT 0x340 /* Loc.vec (Perf Mon) RW */ +#define LAPIC_LVINT0 0x350 /* Loc.vec (LINT0) RW */ # define LAPIC_LVT_DM_MASK 0x0700 # define LAPIC_LVT_DM_FIXED 0x # define LAPIC_LVT_DM_SMI 0x0200 @@ -134,12 +134,12 @@ # define LAPIC_INP_POL 0x2000 # define LAPIC_PEND_SEND 0x1000 -#define LAPIC_LVINT1 0x360 /* Loc.vec (LINT1) RW */ -#define LAPIC_LVERR 0x370 /* Loc.vec (ERROR) RW */ -#define LAPIC_ICR_TIMER 0x380 /* Initial count RW */ -#define LAPIC_CCR_TIMER 0x390 /* Current count RO */ +#define LAPIC_LVINT1 0x360
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Jun 13 15:10:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Indent consistently. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/x86/include/i82489reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: christos Date: Thu Jun 13 13:37:56 UTC 2019 Modified Files: src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.amiga md.bebox md.cats md.dreamcast md.evbarm md.evbarm.armeb md.evbmips md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.i386 md.ibmnws md.iyonix md.luna68k md.mac68k md.macppc md.netwinder md.newsmips md.ofppc md.prep md.sgimips md.shark md.sparc md.sparc64 md.vax md.x68k md.zaurus mi shl.mi Log Message: Consistency in keyword order and contents: debug*,xorg -> xorg,debug* xorg,debug*,*,obsolete -> xorg,obsolete,* To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xdebug/md.alpha \ src/distrib/sets/lists/xdebug/md.evbarm.armeb \ src/distrib/sets/lists/xdebug/md.ofppc \ src/distrib/sets/lists/xdebug/md.sparc \ src/distrib/sets/lists/xdebug/md.sparc64 cvs rdiff -u -r1.48 -r1.49 src/distrib/sets/lists/xdebug/md.amd64 \ src/distrib/sets/lists/xdebug/shl.mi cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.amiga \ src/distrib/sets/lists/xdebug/md.evbmips cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.bebox \ src/distrib/sets/lists/xdebug/md.ews4800mips \ src/distrib/sets/lists/xdebug/md.hpcarm \ src/distrib/sets/lists/xdebug/md.hpcmips \ src/distrib/sets/lists/xdebug/md.hpcsh \ src/distrib/sets/lists/xdebug/md.netwinder \ src/distrib/sets/lists/xdebug/md.newsmips \ src/distrib/sets/lists/xdebug/md.prep \ src/distrib/sets/lists/xdebug/md.vax cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xdebug/md.cats cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.dreamcast \ src/distrib/sets/lists/xdebug/md.hp300 \ src/distrib/sets/lists/xdebug/md.sgimips cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xdebug/md.evbarm cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xdebug/md.i386 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xdebug/md.ibmnws cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/xdebug/md.iyonix cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xdebug/md.luna68k \ src/distrib/sets/lists/xdebug/md.mac68k \ src/distrib/sets/lists/xdebug/md.zaurus cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xdebug/md.macppc \ src/distrib/sets/lists/xdebug/md.shark cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.x68k cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xdebug/mi 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 Jun 13 13:35:41 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: add ahcisata at pci To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.97 -r1.98 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.38 src/sys/arch/evbarm/conf/GENERIC:1.39 --- src/sys/arch/evbarm/conf/GENERIC:1.38 Tue Jun 11 13:01:48 2019 +++ src/sys/arch/evbarm/conf/GENERIC Thu Jun 13 13:35:41 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.38 2019/06/11 13:01:48 skrll Exp $ +# $NetBSD: GENERIC,v 1.39 2019/06/13 13:35:41 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -537,6 +537,7 @@ flash* at nand? dynamic 1 # SATA ahcisata* at fdt? # AHCI SATA +ahcisata* at pci? dev ? function ? atabus* at ata? atapibus* at atapi? wd* at atabus? drive ? Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.97 src/sys/arch/evbarm/conf/GENERIC64:1.98 --- src/sys/arch/evbarm/conf/GENERIC64:1.97 Wed Jun 12 10:14:05 2019 +++ src/sys/arch/evbarm/conf/GENERIC64 Thu Jun 13 13:35:41 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.97 2019/06/12 10:14:05 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.98 2019/06/13 13:35:41 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -382,6 +382,7 @@ ld* at sdmmc? # SATA ahcisata* at fdt? # AHCI SATA ahcisata* at acpi? +ahcisata* at pci? dev ? function ? atabus* at ata? atapibus* at atapi? wd* at atabus? drive ?
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Thu Jun 13 13:35:41 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC GENERIC64 Log Message: add ahcisata at pci To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/conf/GENERIC cvs rdiff -u -r1.97 -r1.98 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: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 12:44:20 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: When merging existing partitions into our install description, mark them as to-be-mounted. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/bsddisklabel.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/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 12:44:20 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: When merging existing partitions into our install description, mark them as to-be-mounted. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/bsddisklabel.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/sysinst/bsddisklabel.c diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.10 src/usr.sbin/sysinst/bsddisklabel.c:1.11 --- src/usr.sbin/sysinst/bsddisklabel.c:1.10 Thu Jun 13 12:31:28 2019 +++ src/usr.sbin/sysinst/bsddisklabel.c Thu Jun 13 12:44:20 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bsddisklabel.c,v 1.10 2019/06/13 12:31:28 martin Exp $ */ +/* $NetBSD: bsddisklabel.c,v 1.11 2019/06/13 12:44:20 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -932,6 +932,9 @@ merge_part_with_wanted(struct disk_parti wanted->infos[i].size = info->size; wanted->infos[i].cur_start = info->start; wanted->infos[i].flags &= ~PUIFLAG_EXTEND; + if (wanted->infos[i].fs_type != FS_UNUSED && + wanted->infos[i].type != PT_swap) + wanted->infos[i].instflags |= PUIINST_MOUNT; if (is_outer) wanted->infos[i].flags |= PUIFLG_IS_OUTER; return;
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Thu Jun 13 12:31:28 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
Do not use dynamic size adjustments on install descriptions based
on existing partitions - we need to keep them fixed to not confuse
free space calculation.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/bsddisklabel.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/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.9 src/usr.sbin/sysinst/bsddisklabel.c:1.10
--- src/usr.sbin/sysinst/bsddisklabel.c:1.9 Wed Jun 12 06:20:17 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Thu Jun 13 12:31:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.9 2019/06/12 06:20:17 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.10 2019/06/13 12:31:28 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1081,7 +1081,7 @@ fill_defaults(struct partition_usage_set
daddr_t align = parts->pscheme->get_part_alignment(parts);
- if (root < wanted->num) {
+ if (root < wanted->num && wanted->infos[root].cur_part_id == NO_PART) {
daddr_t max_root_size = parts->disk_start + parts->disk_size;
if (root_limit > 0) {
/* Bah - bios can not read all the disk, limit root */
@@ -1093,15 +1093,20 @@ fill_defaults(struct partition_usage_set
if (have_x11_by_default()) {
daddr_t xsize = XNEEDMB * (MEG / 512);
if (usr < wanted->num) {
- wanted->infos[usr].size += xsize;
- wanted->infos[usr].def_size += xsize;
+ if (wanted->infos[usr].cur_part_id == NO_PART) {
+wanted->infos[usr].size += xsize;
+wanted->infos[usr].def_size += xsize;
+ }
} else if (root < wanted->num &&
+ wanted->infos[root].cur_part_id == NO_PART &&
+ (wanted->infos[root].limit == 0 ||
(wanted->infos[root].size + xsize) <=
- wanted->infos[root].limit) {
+ wanted->infos[root].limit)) {
wanted->infos[root].size += xsize;
}
}
- if (wanted->infos[root].size > wanted->infos[root].limit) {
+ if (wanted->infos[root].limit > 0 &&
+ wanted->infos[root].size > wanted->infos[root].limit) {
if (usr < wanted->num) {
/* move space from root to usr */
daddr_t spill = wanted->infos[root].size -
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 12:31:28 UTC 2019 Modified Files: src/usr.sbin/sysinst: bsddisklabel.c Log Message: Do not use dynamic size adjustments on install descriptions based on existing partitions - we need to keep them fixed to not confuse free space calculation. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: uki Date: Thu Jun 13 12:01:20 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 Log Message: Package naming to xbase md files To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xbase/md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xbase/md.evbarm cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xbase/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/xbase
Module Name:src Committed By: uki Date: Thu Jun 13 12:01:20 UTC 2019 Modified Files: src/distrib/sets/lists/xbase: md.amd64 md.evbarm md.i386 Log Message: Package naming to xbase md files To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xbase/md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xbase/md.evbarm cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xbase/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/xbase/md.amd64 diff -u src/distrib/sets/lists/xbase/md.amd64:1.17 src/distrib/sets/lists/xbase/md.amd64:1.18 --- src/distrib/sets/lists/xbase/md.amd64:1.17 Sun Mar 10 11:18:02 2019 +++ src/distrib/sets/lists/xbase/md.amd64 Thu Jun 13 12:01:20 2019 @@ -1,26 +1,26 @@ -# $NetBSD: md.amd64,v 1.17 2019/03/10 11:18:02 mrg Exp $ -./usr/X11R7/lib/libI810XvMC.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libI810XvMC.so.1 -unknown- xorg,compatx11file -./usr/X11R7/lib/libI810XvMC.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libIntelXvMC.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libIntelXvMC.so.1 -unknown- xorg,compatx11file -./usr/X11R7/lib/libIntelXvMC.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libchromeXvMC.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libchromeXvMC.so.1 -unknown- xorg,compatx11file -./usr/X11R7/lib/libchromeXvMC.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libchromeXvMCPro.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libchromeXvMCPro.so.1 -unknown- xorg,compatx11file -./usr/X11R7/lib/libchromeXvMCPro.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_amdgpu.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_amdgpu.so.1 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_amdgpu.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_intel.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_intel.so.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_intel.so.0.2 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_nouveau.so.3 -unknown- xorg,compatx11file -./usr/X11R7/lib/libdrm_nouveau.so.3.0 -unknown- xorg,compatx11file -./usr/X11R7/lib/libvdpau.so -unknown- xorg,compatx11file -./usr/X11R7/lib/libvdpau.so.1 -unknown- xorg,compatx11file -./usr/X11R7/lib/libvdpau.so.1.0 -unknown- xorg,compatx11file -./usr/X11R7/share/pciids/pci.ids -unknown- obsolete +# $NetBSD: md.amd64,v 1.18 2019/06/13 12:01:20 uki Exp $ +./usr/X11R7/lib/libI810XvMC.so xbase-i810-lib xorg,compatx11file +./usr/X11R7/lib/libI810XvMC.so.1 xbase-i810-lib xorg,compatx11file +./usr/X11R7/lib/libI810XvMC.so.1.0 xbase-i810-lib xorg,compatx11file +./usr/X11R7/lib/libIntelXvMC.so xbase-xvmc-lib xorg,compatx11file +./usr/X11R7/lib/libIntelXvMC.so.1 xbase-xvmc-lib xorg,compatx11file +./usr/X11R7/lib/libIntelXvMC.so.1.0 xbase-xvmc-lib xorg,compatx11file +./usr/X11R7/lib/libchromeXvMC.so xbase-openchrome-lib xorg,compatx11file +./usr/X11R7/lib/libchromeXvMC.so.1 xbase-openchrome-lib xorg,compatx11file +./usr/X11R7/lib/libchromeXvMC.so.1.0 xbase-openchrome-lib xorg,compatx11file +./usr/X11R7/lib/libchromeXvMCPro.so xbase-openchrome-lib xorg,compatx11file +./usr/X11R7/lib/libchromeXvMCPro.so.1 xbase-openchrome-lib xorg,compatx11file +./usr/X11R7/lib/libchromeXvMCPro.so.1.0 xbase-openchrome-lib xorg,compatx11file +./usr/X11R7/lib/libdrm_amdgpu.so xbase-libdrm-amdgpu xorg,compatx11file +./usr/X11R7/lib/libdrm_amdgpu.so.1 xbase-libdrm-amdgpu xorg,compatx11file +./usr/X11R7/lib/libdrm_amdgpu.so.1.0 xbase-libdrm-amdgpu xorg,compatx11file +./usr/X11R7/lib/libdrm_intel.so xbase-libdrm-intel xorg,compatx11file +./usr/X11R7/lib/libdrm_intel.so.0 xbase-libdrm-intel xorg,compatx11file +./usr/X11R7/lib/libdrm_intel.so.0.2 xbase-libdrm-intel xorg,compatx11file +./usr/X11R7/lib/libdrm_nouveau.so xbase-libdrm-nouveau xorg,compatx11file +./usr/X11R7/lib/libdrm_nouveau.so.3 xbase-libdrm-nouveau xorg,compatx11file +./usr/X11R7/lib/libdrm_nouveau.so.3.0 xbase-libdrm-nouveau xorg,compatx11file +./usr/X11R7/lib/libvdpau.so xbase-libvdpau-lib xorg,compatx11file +./usr/X11R7/lib/libvdpau.so.1 xbase-libvdpau-lib xorg,compatx11file +./usr/X11R7/lib/libvdpau.so.1.0 xbase-libvdpau-lib xorg,compatx11file +./usr/X11R7/share/pciids/pci.ids xbase-obsolete obsolete Index: src/distrib/sets/lists/xbase/md.evbarm diff -u src/distrib/sets/lists/xbase/md.evbarm:1.3 src/distrib/sets/lists/xbase/md.evbarm:1.4 --- src/distrib/sets/lists/xbase/md.evbarm:1.3 Sun Mar 10 22:00:37 2019 +++ src/distrib/sets/lists/xbase/md.evbarm Thu Jun 13 12:01:20 2019 @@ -1,7 +1,7 @@ -# $NetBSD: md.evbarm,v 1.3 2019/03/10 22:00:37 christos Exp $ -./usr/X11R7/lib/libdrm_nouveau.so -unknown- xorg -./usr/X11R7/lib/libdrm_nouveau.so.3 -unknown- xorg
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src
Committed By: martin
Date: Thu Jun 13 09:36:56 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/arc: md.c
src/usr.sbin/sysinst/arch/bebox: md.c
src/usr.sbin/sysinst/arch/cobalt: md.c
src/usr.sbin/sysinst/arch/evbarm: md.c
src/usr.sbin/sysinst/arch/evbmips: md.c
src/usr.sbin/sysinst/arch/evbppc: md.c
src/usr.sbin/sysinst/arch/hpcarm: md.c
src/usr.sbin/sysinst/arch/hpcmips: md.c
src/usr.sbin/sysinst/arch/hpcsh: md.c
src/usr.sbin/sysinst/arch/landisk: md.c
src/usr.sbin/sysinst/arch/ofppc: md.c
src/usr.sbin/sysinst/arch/prep: md.c
src/usr.sbin/sysinst/arch/sandpoint: md.c
src/usr.sbin/sysinst/arch/zaurus: md.c
Log Message:
In the new world order disks may come without any partitioning scheme
attached - so the user may have to select one.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/arc/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/bebox/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/cobalt/md.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/evbarm/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/evbmips/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/evbppc/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/hpcarm/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/hpcmips/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcsh/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/landisk/md.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/ofppc/md.c
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/prep/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/sandpoint/md.c
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/zaurus/md.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/sysinst/arch/arc/md.c
diff -u src/usr.sbin/sysinst/arch/arc/md.c:1.5 src/usr.sbin/sysinst/arch/arc/md.c:1.6
--- src/usr.sbin/sysinst/arch/arc/md.c:1.5 Wed Jun 12 06:20:18 2019
+++ src/usr.sbin/sysinst/arch/arc/md.c Thu Jun 13 09:36:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/12 06:20:18 martin Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/06/13 09:36:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -65,6 +65,29 @@ md_init_set_status(int flags)
bool
md_get_info(struct install_partition_desc *install)
{
+
+ if (pm->no_mbr || pm->no_part)
+ return true;
+
+ if (pm->parts == NULL) {
+
+ const struct disk_partitioning_scheme *ps =
+ select_part_scheme(pm, NULL, true, NULL);
+
+ if (!ps)
+ return true;
+
+ struct disk_partitions *parts =
+ (*ps->create_new_for_disk)(pm->diskdev,
+ 0, pm->dlsize, pm->dlsize, true);
+ if (!parts)
+ return false;
+
+ pm->parts = parts;
+ if (ps->size_limit > 0 && pm->dlsize > ps->size_limit)
+ pm->dlsize = ps->size_limit;
+ }
+
return set_bios_geom_with_mbr_guess(pm->parts);
}
Index: src/usr.sbin/sysinst/arch/bebox/md.c
diff -u src/usr.sbin/sysinst/arch/bebox/md.c:1.3 src/usr.sbin/sysinst/arch/bebox/md.c:1.4
--- src/usr.sbin/sysinst/arch/bebox/md.c:1.3 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/bebox/md.c Thu Jun 13 09:36:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2019/06/12 06:20:19 martin Exp $ */
+/* $NetBSD: md.c,v 1.4 2019/06/13 09:36:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -58,6 +58,29 @@ md_init_set_status(int flags)
bool
md_get_info(struct install_partition_desc *install)
{
+
+ if (pm->no_mbr || pm->no_part)
+ return true;
+
+ if (pm->parts == NULL) {
+
+ const struct disk_partitioning_scheme *ps =
+ select_part_scheme(pm, NULL, true, NULL);
+
+ if (!ps)
+ return true;
+
+ struct disk_partitions *parts =
+ (*ps->create_new_for_disk)(pm->diskdev,
+ 0, pm->dlsize, pm->dlsize, true);
+ if (!parts)
+ return false;
+
+ pm->parts = parts;
+ if (ps->size_limit > 0 && pm->dlsize > ps->size_limit)
+ pm->dlsize = ps->size_limit;
+ }
+
return set_bios_geom_with_mbr_guess(pm->parts);
}
Index: src/usr.sbin/sysinst/arch/cobalt/md.c
diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.5 src/usr.sbin/sysinst/arch/cobalt/md.c:1.6
--- src/usr.sbin/sysinst/arch/cobalt/md.c:1.5 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/cobalt/md.c Thu Jun 13 09:36:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.5 2019/06/12 06:20:19 martin Exp $ */
+/* $NetBSD: md.c,v 1.6 2019/06/13 09:36:54 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -65,6 +65,29 @@ md_init_set_status(int flags)
bool
md_get_info(struct install_partition_desc *install)
{
+
+ if (pm->no_mbr || pm->no_part)
+ return true;
+
+ if (pm->parts == NULL) {
+
+ const struct disk_partitioning_scheme *ps =
+ select_part_scheme(pm, NULL, true, NULL);
+
+ if (!ps)
+ return true;
+
+ struct disk_partitions *parts =
+
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: martin Date: Thu Jun 13 09:36:56 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/bebox: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/evbarm: md.c src/usr.sbin/sysinst/arch/evbmips: md.c src/usr.sbin/sysinst/arch/evbppc: md.c src/usr.sbin/sysinst/arch/hpcarm: md.c src/usr.sbin/sysinst/arch/hpcmips: md.c src/usr.sbin/sysinst/arch/hpcsh: md.c src/usr.sbin/sysinst/arch/landisk: md.c src/usr.sbin/sysinst/arch/ofppc: md.c src/usr.sbin/sysinst/arch/prep: md.c src/usr.sbin/sysinst/arch/sandpoint: md.c src/usr.sbin/sysinst/arch/zaurus: md.c Log Message: In the new world order disks may come without any partitioning scheme attached - so the user may have to select one. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/bebox/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/sysinst/arch/evbarm/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/evbmips/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/evbppc/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/hpcarm/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/hpcmips/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/hpcsh/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/landisk/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/ofppc/md.c cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/sysinst/arch/prep/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/sandpoint/md.c cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/zaurus/md.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/x86/include
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:44:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Modify LAPIC_LVT_CMCI's comment to be consistent with other LVT's. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/include/i82489reg.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/x86/include/i82489reg.h diff -u src/sys/arch/x86/include/i82489reg.h:1.16 src/sys/arch/x86/include/i82489reg.h:1.17 --- src/sys/arch/x86/include/i82489reg.h:1.16 Fri Apr 28 01:23:58 2017 +++ src/sys/arch/x86/include/i82489reg.h Thu Jun 13 07:44:27 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: i82489reg.h,v 1.16 2017/04/28 01:23:58 nonaka Exp $ */ +/* $NetBSD: i82489reg.h,v 1.17 2019/06/13 07:44:27 msaitoh Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -79,7 +79,7 @@ #define LAPIC_IRR 0x200 /* Interrupt Req RO */ #define LAPIC_ESR 0x280 /* Err status. RW */ -#define LAPIC_LVT_CMCI 0x2f0 /* LVT CMCI RW */ +#define LAPIC_LVT_CMCI 0x2f0 /* Loc.vec (CMCI) RW */ #define LAPIC_ICRLO 0x300 /* Int. cmd. (xAPIC: RW, x2APIC: RW64) */ # define LAPIC_DLMODE_MASK 0x0700 /* Delivery Mode */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:44:27 UTC 2019 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Modify LAPIC_LVT_CMCI's comment to be consistent with other LVT's. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/x86/include/i82489reg.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/x86/x86
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:42:45 UTC 2019 Modified Files: src/sys/arch/x86/x86: lapic.c Log Message: lapic_dump(): Print CMCI and thermal local vector table, too. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/x86/x86/lapic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/lapic.c diff -u src/sys/arch/x86/x86/lapic.c:1.72 src/sys/arch/x86/x86/lapic.c:1.73 --- src/sys/arch/x86/x86/lapic.c:1.72 Thu Jun 13 05:19:40 2019 +++ src/sys/arch/x86/x86/lapic.c Thu Jun 13 07:42:45 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: lapic.c,v 1.72 2019/06/13 05:19:40 msaitoh Exp $ */ +/* $NetBSD: lapic.c,v 1.73 2019/06/13 07:42:45 msaitoh Exp $ */ /*- * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.72 2019/06/13 05:19:40 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.73 2019/06/13 07:42:45 msaitoh Exp $"); #include "acpica.h" #include "ioapic.h" @@ -954,7 +954,9 @@ lapic_dump(void) struct cpu_info *ci = curcpu(); const char *xname = device_xname(ci->ci_dev); + apic_format_redir(xname, "cmci", 0, 0, lapic_readreg(LAPIC_LVT_CMCI)); apic_format_redir(xname, "timer", 0, 0, lapic_readreg(LAPIC_LVTT)); + apic_format_redir(xname, "thermal", 0, 0, lapic_readreg(LAPIC_TMINT)); apic_format_redir(xname, "pcint", 0, 0, lapic_readreg(LAPIC_PCINT)); apic_format_redir(xname, "lint", 0, 0, lapic_readreg(LAPIC_LVINT0)); apic_format_redir(xname, "lint", 1, 0, lapic_readreg(LAPIC_LVINT1));
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:42:45 UTC 2019 Modified Files: src/sys/arch/x86/x86: lapic.c Log Message: lapic_dump(): Print CMCI and thermal local vector table, too. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/x86/x86/lapic.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/x86/x86
Module Name:src
Committed By: msaitoh
Date: Thu Jun 13 07:28:17 UTC 2019
Modified Files:
src/sys/arch/x86/x86: apic.c ioapic.c
Log Message:
Whitespace fix. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/apic.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/x86/ioapic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/apic.c
diff -u src/sys/arch/x86/x86/apic.c:1.8 src/sys/arch/x86/x86/apic.c:1.9
--- src/sys/arch/x86/x86/apic.c:1.8 Tue Dec 16 22:35:28 2008
+++ src/sys/arch/x86/x86/apic.c Thu Jun 13 07:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: apic.c,v 1.8 2008/12/16 22:35:28 christos Exp $ */
+/* $NetBSD: apic.c,v 1.9 2019/06/13 07:28:17 msaitoh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: apic.c,v 1.8 2008/12/16 22:35:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apic.c,v 1.9 2019/06/13 07:28:17 msaitoh Exp $");
#include
#include
@@ -70,7 +70,6 @@ apic_format_redir(const char *where1, co
snprintb(buf, sizeof(buf), redirhifmt, redirhi);
printf(" %s", buf);
}
-
printf("\n");
}
Index: src/sys/arch/x86/x86/ioapic.c
diff -u src/sys/arch/x86/x86/ioapic.c:1.59 src/sys/arch/x86/x86/ioapic.c:1.60
--- src/sys/arch/x86/x86/ioapic.c:1.59 Mon Oct 8 08:05:08 2018
+++ src/sys/arch/x86/x86/ioapic.c Thu Jun 13 07:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ioapic.c,v 1.59 2018/10/08 08:05:08 cherry Exp $ */
+/* $NetBSD: ioapic.c,v 1.60 2019/06/13 07:28:17 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2009 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.59 2018/10/08 08:05:08 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioapic.c,v 1.60 2019/06/13 07:28:17 msaitoh Exp $");
#include "opt_ddb.h"
@@ -139,10 +139,10 @@ ioapic_unlock(struct ioapic_softc *sc, u
* Register read/write routines.
*/
static inline uint32_t
-ioapic_read_ul(struct ioapic_softc *sc,int regid)
+ioapic_read_ul(struct ioapic_softc *sc, int regid)
{
uint32_t val;
-
+
*(sc->sc_reg) = regid;
val = *sc->sc_data;
@@ -150,7 +150,7 @@ ioapic_read_ul(struct ioapic_softc *sc,i
}
static inline void
-ioapic_write_ul(struct ioapic_softc *sc,int regid, uint32_t val)
+ioapic_write_ul(struct ioapic_softc *sc, int regid, uint32_t val)
{
*(sc->sc_reg) = regid;
*(sc->sc_data) = val;
@@ -170,7 +170,7 @@ ioapic_read(struct ioapic_softc *sc, int
}
static inline void
-ioapic_write(struct ioapic_softc *sc,int regid, int val)
+ioapic_write(struct ioapic_softc *sc, int regid, int val)
{
u_long flags;
@@ -233,7 +233,7 @@ ioapic_add(struct ioapic_softc *sc)
}
void
-ioapic_print_redir (struct ioapic_softc *sc, const char *why, int pin)
+ioapic_print_redir(struct ioapic_softc *sc, const char *why, int pin)
{
uint32_t redirlo = ioapic_read(sc, IOAPIC_REDLO(pin));
uint32_t redirhi = ioapic_read(sc, IOAPIC_REDHI(pin));
@@ -255,15 +255,15 @@ ioapic_match(device_t parent, cfdata_t m
/*
* can't use bus_space_xxx as we don't have a bus handle ...
*/
-void
+void
ioapic_attach(device_t parent, device_t self, void *aux)
{
- struct ioapic_softc *sc = device_private(self);
+ struct ioapic_softc *sc = device_private(self);
struct apic_attach_args *aaa = (struct apic_attach_args *)aux;
int apic_id;
uint32_t ver_sz;
int i;
-
+
sc->sc_dev = self;
sc->sc_flags = aaa->flags;
sc->sc_pic.pic_apicid = aaa->apic_id;
@@ -287,7 +287,7 @@ ioapic_attach(device_t parent, device_t
return;
}
sc->sc_reg = (volatile uint32_t *)(bh + IOAPIC_REG);
- sc->sc_data = (volatile uint32_t *)(bh + IOAPIC_DATA);
+ sc->sc_data = (volatile uint32_t *)(bh + IOAPIC_DATA);
}
#endif
sc->sc_pa = aaa->apic_address;
@@ -332,7 +332,7 @@ ioapic_attach(device_t parent, device_t
printf(", %s mode",
aaa->flags & IOAPIC_PICMODE ? "PIC" : "virtual wire");
}
-
+
aprint_verbose(", version 0x%x, %d pins", sc->sc_apic_vers,
sc->sc_apic_sz);
aprint_normal("\n");
@@ -340,7 +340,7 @@ ioapic_attach(device_t parent, device_t
sc->sc_pins = malloc(sizeof(struct ioapic_pin) * sc->sc_apic_sz,
M_DEVBUF, M_WAITOK);
- for (i=0; isc_apic_sz; i++) {
+ for (i = 0; i < sc->sc_apic_sz; i++) {
uint32_t redlo, redhi;
sc->sc_pins[i].ip_next = NULL;
@@ -356,14 +356,14 @@ ioapic_attach(device_t parent, device_t
*
* Expect all other interrupts to be PCI-like
* level triggered on low.
- */
+ */
if (i >= 16)
redlo |= IOAPIC_REDLO_LEVEL | IOAPIC_REDLO_ACTLO;
redhi = (cpu_info_primary.ci_cpuid << IOAPIC_REDHI_DEST_SHIFT);
ioapic_write(sc, IOAPIC_REDHI(i), redhi);
ioapic_write(sc, IOAPIC_REDLO(i), redlo);
}
-
+
/*
* In case the APIC is not initialized to the correct ID
* do it now.
@@ -377,10 +377,10 @@ ioapic_attach(device_t parent, device_t
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Thu Jun 13 07:28:17 UTC 2019 Modified Files: src/sys/arch/x86/x86: apic.c ioapic.c Log Message: Whitespace fix. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x86/x86/apic.c cvs rdiff -u -r1.59 -r1.60 src/sys/arch/x86/x86/ioapic.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/sysinst/arch
Module Name:src Committed By: martin Date: Thu Jun 13 06:34:31 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/acorn32: Makefile src/usr.sbin/sysinst/arch/emips: Makefile src/usr.sbin/sysinst/arch/ews4800mips: Makefile Log Message: Remove GPT and extended partitioning support on size restrained install media. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/acorn32/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/emips/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/ews4800mips/Makefile 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/sysinst/arch/acorn32/Makefile diff -u src/usr.sbin/sysinst/arch/acorn32/Makefile:1.1 src/usr.sbin/sysinst/arch/acorn32/Makefile:1.2 --- src/usr.sbin/sysinst/arch/acorn32/Makefile:1.1 Sat Jul 26 19:30:44 2014 +++ src/usr.sbin/sysinst/arch/acorn32/Makefile Thu Jun 13 06:34:30 2019 @@ -1,8 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:44 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/13 06:34:30 martin Exp $ # # Makefile for acorn32 # MD_OPTIONS= AOUT2ELF +.ifdef SMALLPROG +NOPARTMAN= yes +NO_GPT= yes +.endif + .include "../../Makefile.inc" Index: src/usr.sbin/sysinst/arch/emips/Makefile diff -u src/usr.sbin/sysinst/arch/emips/Makefile:1.1 src/usr.sbin/sysinst/arch/emips/Makefile:1.2 --- src/usr.sbin/sysinst/arch/emips/Makefile:1.1 Sat Jul 26 19:30:45 2014 +++ src/usr.sbin/sysinst/arch/emips/Makefile Thu Jun 13 06:34:30 2019 @@ -1,6 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:45 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/13 06:34:30 martin Exp $ # # Makefile for emips # +.ifdef SMALLPROG +NOPARTMAN= yes +NO_GPT= yes +.endif + .include "../../Makefile.inc" Index: src/usr.sbin/sysinst/arch/ews4800mips/Makefile diff -u src/usr.sbin/sysinst/arch/ews4800mips/Makefile:1.1 src/usr.sbin/sysinst/arch/ews4800mips/Makefile:1.2 --- src/usr.sbin/sysinst/arch/ews4800mips/Makefile:1.1 Sat Jul 26 19:30:45 2014 +++ src/usr.sbin/sysinst/arch/ews4800mips/Makefile Thu Jun 13 06:34:31 2019 @@ -1,8 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:45 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/13 06:34:31 martin Exp $ # # Makefile for ews4800mips # LANGUAGES= # no translations +.ifdef SMALLPROG +NOPARTMAN= yes +NO_GPT= yes +.endif + .include "../../Makefile.inc"
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: martin Date: Thu Jun 13 06:34:31 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/acorn32: Makefile src/usr.sbin/sysinst/arch/emips: Makefile src/usr.sbin/sysinst/arch/ews4800mips: Makefile Log Message: Remove GPT and extended partitioning support on size restrained install media. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/acorn32/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/emips/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/ews4800mips/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: martin Date: Thu Jun 13 06:25:03 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove GPT boot (not available for sparc64 yet) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/sparc64/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/arch/sparc64/md.h diff -u src/usr.sbin/sysinst/arch/sparc64/md.h:1.3 src/usr.sbin/sysinst/arch/sparc64/md.h:1.4 --- src/usr.sbin/sysinst/arch/sparc64/md.h:1.3 Wed Jun 12 06:20:23 2019 +++ src/usr.sbin/sysinst/arch/sparc64/md.h Thu Jun 13 06:25:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:23 martin Exp $ */ +/* $NetBSD: md.h,v 1.4 2019/06/13 06:25:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,9 +60,8 @@ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT -/* XXX - this is a lie! for testing only! */ /* have support for booting from GPT disks */ -#define HAVE_GPT_BOOT +/* #define HAVE_GPT_BOOT */ /* not yet */ /* allow using tmpfs for /tmp instead of mfs */ #define HAVE_TMPFS
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: martin Date: Thu Jun 13 06:25:03 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove GPT boot (not available for sparc64 yet) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/sparc64/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 06:20:35 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Fix unitialized variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/disklabel.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/sysinst/disklabel.c diff -u src/usr.sbin/sysinst/disklabel.c:1.1 src/usr.sbin/sysinst/disklabel.c:1.2 --- src/usr.sbin/sysinst/disklabel.c:1.1 Wed Jun 12 06:20:17 2019 +++ src/usr.sbin/sysinst/disklabel.c Thu Jun 13 06:20:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.1 2019/06/12 06:20:17 martin Exp $ */ +/* $NetBSD: disklabel.c,v 1.2 2019/06/13 06:20:34 martin Exp $ */ /* * Copyright 2018 The NetBSD Foundation, Inc. @@ -264,7 +264,7 @@ disklabel_write_to_disk(struct disk_part (struct disklabel_disk_partitions*)arg; FILE *f; char fname[PATH_MAX], packname[sizeof(parts->l.d_packname)+1]; - int i, rv; + int i, rv = 0; const char *disk = parts->dp.disk, *s; const struct partition *lp; char *d;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 06:20:35 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Fix unitialized variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/disklabel.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
Module Name:src
Committed By: martin
Date: Thu Jun 13 06:12:55 UTC 2019
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h
src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c
Log Message:
Ooops, fix misaplied patch from ticket #1281
To generate a diff of this commit:
cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/arch/x86/x86/hypervvar.h
cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/dev/hyperv/genfb_vmbus.c \
src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/hypervvar.h
diff -u src/sys/arch/x86/x86/hypervvar.h:1.1.4.3 src/sys/arch/x86/x86/hypervvar.h:1.1.4.4
--- src/sys/arch/x86/x86/hypervvar.h:1.1.4.3 Wed Jun 12 11:35:40 2019
+++ src/sys/arch/x86/x86/hypervvar.h Thu Jun 13 06:12:54 2019
@@ -1,41 +1,4 @@
-/* $NetBSD: hypervvar.h,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
-
-/*-
- * Copyright (c) 2009-2012,2016 Microsoft Corp.
- * Copyright (c) 2012 NetApp Inc.
- * Copyright (c) 2012 Citrix Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice unmodified, this list of conditions, and the following
- *disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _X86_HYPERVVAR_H_
-#define _X86_HYPERVVAR_H_
-
-void hyperv_early_init(void);
-device_t device_hyperv_register(device_t, void *);
-
-#endif /* _X86_HYPERVVAR_H_ */
-/* $NetBSD: hypervvar.h,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
+/* $NetBSD: hypervvar.h,v 1.1.4.4 2019/06/13 06:12:54 martin Exp $ */
/*-
* Copyright (c) 2009-2012,2016 Microsoft Corp.
Index: src/sys/dev/hyperv/genfb_vmbus.c
diff -u src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.3 src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.4
--- src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.3 Wed Jun 12 11:35:40 2019
+++ src/sys/dev/hyperv/genfb_vmbus.c Thu Jun 13 06:12:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_vmbus.c,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
+/* $NetBSD: genfb_vmbus.c,v 1.1.4.4 2019/06/13 06:12:55 martin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,165 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $");
-
-#include "opt_wsfb.h"
-#include "opt_genfb.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include
-#include
-
-static int genfb_vmbus_match(device_t, cfdata_t, void *);
-static void genfb_vmbus_attach(device_t, device_t, void *);
-static int genfb_vmbus_ioctl(void *, void *, u_long, void *, int,
- struct lwp *);
-static paddr_t genfb_vmbus_mmap(void *, void *, off_t, int);
-static int genfb_vmbus_drm_print(void *, const char *);
-static bool genfb_vmbus_shutdown(device_t, int);
-
-CFATTACH_DECL_NEW(genfb_vmbus, sizeof(struct genfb_vmbus_softc),
-genfb_vmbus_match, genfb_vmbus_attach, NULL, NULL);
-
-static int
-genfb_vmbus_match(device_t parent, cfdata_t match, void *aux)
-{
- struct vmbus_attach_args *aa = aux;
-
- if (memcmp(aa->aa_type, _guid_video, sizeof(*aa->aa_type)) != 0)
- return 0;
-
- if (!genfb_is_enabled())
- return 0; /* explicitly disabled by MD code */
-
- /* Use genfb(4) at pci in Gen.1 VM. */
- if (hyperv_is_gen1())
- return 0;
-
- return 1;
-}
-
-static void
-genfb_vmbus_attach(device_t parent, device_t self, void *aux)
-{
- static const struct genfb_ops zero_ops;
- struct genfb_vmbus_softc *sc = device_private(self);
- struct vmbus_attach_args *aa = aux;
- struct genfb_ops ops = zero_ops;
-
- aprint_naive("\n");
- aprint_normal(": Hyper-V Synthetic Video\n");
-
- sc->sc_gen.sc_dev = self;
- sc->sc_memt = aa->aa_memt;
-
- genfb_init(>sc_gen);
-
- /* firmware / MD code responsible for restoring the display */
- if (sc->sc_gen.sc_pmfcb
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Thu Jun 13 06:12:55 UTC 2019 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c Log Message: Ooops, fix misaplied patch from ticket #1281 To generate a diff of this commit: cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/arch/x86/x86/hypervvar.h cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/dev/hyperv/genfb_vmbus.c \ src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
