CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: rin
Date: Fri May 29 05:35:47 UTC 2020
Modified Files:
src/sys/arch/amiga/dev: clock.c
Log Message:
For clk_timecounter:
- Use C99 initializer.
- Leave .tc_name NULL initially.
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/amiga/dev/clock.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/amiga/dev/clock.c
diff -u src/sys/arch/amiga/dev/clock.c:1.56 src/sys/arch/amiga/dev/clock.c:1.57
--- src/sys/arch/amiga/dev/clock.c:1.56 Tue May 19 08:43:30 2020
+++ src/sys/arch/amiga/dev/clock.c Fri May 29 05:35:47 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.56 2020/05/19 08:43:30 rin Exp $ */
+/* $NetBSD: clock.c,v 1.57 2020/05/29 05:35:47 rin Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.56 2020/05/19 08:43:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.57 2020/05/29 05:35:47 rin Exp $");
#include
#include
@@ -93,14 +93,9 @@ struct CIA *clockcia;
static u_int clk_getcounter(struct timecounter *);
static struct timecounter clk_timecounter = {
- clk_getcounter, /* get_timecount */
- 0, /* no poll_pps */
- ~0u, /* counter_mask */
- 0, /* frequency */
- "clock", /* name, overriden later */
- 100, /* quality */
- NULL, /* prev */
- NULL, /* next */
+ .tc_get_timecount = clk_getcounter,
+ .tc_counter_mask = ~0u,
+ .tc_quality = 100,
};
CFATTACH_DECL_NEW(clock, 0,
CVS commit: src/sys/sys
Module Name:src
Committed By: rin
Date: Fri May 29 05:29:24 UTC 2020
Modified Files:
src/sys/sys: timetc.h
Log Message:
u_int64_t --> uint64_t. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/timetc.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/timetc.h
diff -u src/sys/sys/timetc.h:1.7 src/sys/sys/timetc.h:1.8
--- src/sys/sys/timetc.h:1.7 Sat Oct 6 13:03:55 2018
+++ src/sys/sys/timetc.h Fri May 29 05:29:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: timetc.h,v 1.7 2018/10/06 13:03:55 maya Exp $ */
+/* $NetBSD: timetc.h,v 1.8 2020/05/29 05:29:23 rin Exp $ */
/*-
*
@@ -60,7 +60,7 @@ struct timecounter {
*/
u_int tc_counter_mask;
/* This mask should mask off any unimplemented bits. */
- u_int64_t tc_frequency;
+ uint64_t tc_frequency;
/* Frequency of the counter in Hz. */
const char *tc_name;
/* Name of the timecounter. */
@@ -79,7 +79,7 @@ struct timecounter {
extern struct timecounter *timecounter;
-u_int64_t tc_getfrequency(void);
+uint64_t tc_getfrequency(void);
void tc_init(struct timecounter *tc);
int tc_detach(struct timecounter *);
void tc_setclock(const struct timespec *ts);
CVS commit: src/sys/dev/audio
Module Name:src
Committed By: isaki
Date: Fri May 29 03:09:14 UTC 2020
Modified Files:
src/sys/dev/audio: audio.c audiovar.h
Log Message:
Fix suspend/resume.
- Revert temporary usage of sc_[pr]busy during suspend. These indicate
whether the mixer needs to be restarted or not.
- Avoid timeout error when about to suspend.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/audio/audiovar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.74 src/sys/dev/audio/audio.c:1.75
--- src/sys/dev/audio/audio.c:1.74 Tue May 26 15:20:16 2020
+++ src/sys/dev/audio/audio.c Fri May 29 03:09:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.74 2020/05/26 15:20:16 nia Exp $ */
+/* $NetBSD: audio.c,v 1.75 2020/05/29 03:09:14 isaki Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -138,7 +138,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.74 2020/05/26 15:20:16 nia Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.75 2020/05/29 03:09:14 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -1566,6 +1566,13 @@ audio_track_waitio(struct audio_softc *s
/* Wait for pending I/O to complete. */
error = cv_timedwait_sig(>mixer->outcv, sc->sc_lock,
mstohz(AUDIO_TIMEOUT));
+ if (sc->sc_suspending) {
+ /* If it's about to suspend, ignore timeout error. */
+ if (error == EWOULDBLOCK) {
+ TRACET(2, track, "timeout (suspending)");
+ return 0;
+ }
+ }
if (sc->sc_dying) {
error = EIO;
}
@@ -7754,13 +7761,18 @@ audio_suspend(device_t dv, const pmf_qua
error = audio_exlock_mutex_enter(sc);
if (error)
return error;
+ sc->sc_suspending = true;
audio_mixer_capture(sc);
if (sc->sc_pbusy) {
audio_pmixer_halt(sc);
+ /* Reuse this as need-to-restart flag while suspending */
+ sc->sc_pbusy = true;
}
if (sc->sc_rbusy) {
audio_rmixer_halt(sc);
+ /* Reuse this as need-to-restart flag while suspending */
+ sc->sc_rbusy = true;
}
#ifdef AUDIO_PM_IDLE
@@ -7782,15 +7794,28 @@ audio_resume(device_t dv, const pmf_qual
if (error)
return error;
+ sc->sc_suspending = false;
audio_mixer_restore(sc);
/* XXX ? */
AUDIO_INITINFO();
audio_hw_setinfo(sc, , NULL);
- if (!sc->sc_pbusy)
+ /*
+ * During from suspend to resume here, sc_[pr]busy is used as
+ * need-to-restart flag temporarily. After this point,
+ * sc_[pr]busy is returned to its original usage (busy flag).
+ * And note that sc_[pr]busy must be false to call [pr]mixer_start().
+ */
+ if (sc->sc_pbusy) {
+ /* pmixer_start() requires pbusy is false */
+ sc->sc_pbusy = false;
audio_pmixer_start(sc, true);
- if (!sc->sc_rbusy && sc->sc_ropens > 0)
+ }
+ if (sc->sc_rbusy) {
+ /* rmixer_start() requires rbusy is false */
+ sc->sc_rbusy = false;
audio_rmixer_start(sc);
+ }
audio_exlock_mutex_exit(sc);
Index: src/sys/dev/audio/audiovar.h
diff -u src/sys/dev/audio/audiovar.h:1.11 src/sys/dev/audio/audiovar.h:1.12
--- src/sys/dev/audio/audiovar.h:1.11 Sat Mar 7 06:25:57 2020
+++ src/sys/dev/audio/audiovar.h Fri May 29 03:09:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audiovar.h,v 1.11 2020/03/07 06:25:57 isaki Exp $ */
+/* $NetBSD: audiovar.h,v 1.12 2020/05/29 03:09:14 isaki Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -235,6 +235,12 @@ struct audio_softc {
bool sc_dying;
/*
+ * Indicates that about to suspend.
+ * Must be protected by sc_lock.
+ */
+ bool sc_suspending;
+
+ /*
* If multiuser is false, other users who have different euid
* than the first user cannot open this device.
* Must be protected by sc_exlock.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri May 29 01:20:43 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
remove useless MACHINE_ARCH == sh3 check for GCC 8.
To generate a diff of this commit:
cvs rdiff -u -r1.1196 -r1.1197 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1196 src/share/mk/bsd.own.mk:1.1197
--- src/share/mk/bsd.own.mk:1.1196 Fri May 29 00:14:07 2020
+++ src/share/mk/bsd.own.mk Fri May 29 01:20:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1196 2020/05/29 00:14:07 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1197 2020/05/29 01:20:43 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,8 +63,7 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE_ARCH} == "sh3" || \
-${MACHINE_CPU} == "m68k"
+.if ${MACHINE_CPU} == "m68k"
HAVE_GCC?= 7
.endif
HAVE_GCC?= 8
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Fri May 29 01:18:50 UTC 2020
Modified Files:
src/external/gpl3/gcc: README.gcc8
Log Message:
alpha, vax, and sh3 have switched. (sh3 swithed a month ago by
accident when i wrote ${MACHINE_ARCH} != "sh3", but this should
have been MACHINE_CPU.) this means m68k is the only one left.
update various other parts and note some of the m68k issues.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/README.gcc8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/README.gcc8
diff -u src/external/gpl3/gcc/README.gcc8:1.8 src/external/gpl3/gcc/README.gcc8:1.9
--- src/external/gpl3/gcc/README.gcc8:1.8 Mon Apr 27 03:29:57 2020
+++ src/external/gpl3/gcc/README.gcc8 Fri May 29 01:18:50 2020
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc8,v 1.8 2020/04/27 03:29:57 mrg Exp $
+$NetBSD: README.gcc8,v 1.9 2020/05/29 01:18:50 mrg Exp $
new stuff:
cc1objcplus
@@ -27,37 +27,37 @@ switched: has port switched? y (yes), n
architecture tools kernels libgcc native-gcc make release runs atf switched
- --- -- -- ---
aarch64 y y y y y y y y
-alpha y y y y y ? ? ?
-earmv4 y y y y y y ? y
-earmv4eb y ? y y ? ? ? y
-earm y ? y y ? ? ? y
-earmeb y ? y y ? ? ? y
-earmhf y ? y y ? ? ? y
-earmhfeb y ? y y ? ? ? y
-earmv6 y ? y y ? ? ? y
-earmv6eb y ? y y ? ? ? y
-earmv6hf y ? y y ? ? ? y
-earmv6hfeb y ? y y ? ? ? y
-earmv7 y ? y y ? ? ? y
-earmv7eb y ? y y ? ? ? y
-earmv7hf y y y y y y n[3] y
-earmv7hfeb y ? y y ? ? ? y
+alpha y y y y y y y y
+earmv4 y y y y y y y y
+earmv4eb y y y y y y y y
+earm y y y y y y y y
+earmeb y y y y y y y y
+earmhf y y y y y y y y
+earmhfeb y y y y y y y y
+earmv6 y y y y y y y y
+earmv6eb y y y y y y y y
+earmv6hf y y y y y y y y
+earmv6hfeb y y y y y y y y
+earmv7 y y y y y y y y
+earmv7eb y y y y y y y y
+earmv7hf y y y y y y y y
+earmv7hfeb y y y y y y y y
hppa y y y y y y y y
i386 y y y y y y y y
-ia64 y y y y y y n[4] y
-m68000 y ? y y ? ? ? ?
+ia64 y y y y y y n y
+m68000 y n[3] y y y ? ? ?
m68k y y y y y ? ? ?
-mipseb y y y y ? ? ? y
-mipsel y ? y y ? ? ? y
-mips64eb y y y y y y y[2] y
-mips64el y ? y y ? ? ? y
-powerpc y y y y y y y[1] y
-powerpc64 y n y y y y y y
-sh3eb y y y y y y y ?
-sh3el y y y y y ? ? ?
+mipseb y y y y y y y y
+mipsel y y y y y y y y
+mips64eb y y y y y y y y
+mips64el y y y y y y y y
+powerpc y y y y y y y y
+powerpc64 y n y y y ? y y
+sh3eb y y y y y y y y
+sh3el y y y y y y y y
sparc y y y y y y y y
sparc64 y y y y y y y y
-vax y ? ? y ? ? ? ?
+vax y y y y y y n[5] y
x86_64 y y y y y y y y
riscv32 y ? y y y ? ? y
riscv64 y ? y y y ? ? y
@@ -66,10 +66,8 @@ coldfire ? N/A ? ? ? N/A N/A
- --- -- -- ---
architecture tools kernels libgcc native-gcc make release runs atf
-[1] - many ipsec atf and c++ failures
-[2] - lots of failures, no idea if bad
-[3] - c++ exceptions are broken, all arm
-[4] - not upto userland yet
+[3] - kernel faults loading, too large?
+[5] - c++ exceptions are broken
CPU vs platform test table (for CPUs with multiple ports). this is "make release" or just kernels.
values: y (yes), k (kernels only), n (failed), r (running), ? (not attempted)
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Fri May 29 00:14:07 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch vax to GCC 8. testing in simh shows the same set of bugs.
To generate a diff of this commit:
cvs rdiff -u -r1.1195 -r1.1196 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1195 src/share/mk/bsd.own.mk:1.1196
--- src/share/mk/bsd.own.mk:1.1195 Wed May 27 10:53:18 2020
+++ src/share/mk/bsd.own.mk Fri May 29 00:14:07 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1195 2020/05/27 10:53:18 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1196 2020/05/29 00:14:07 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -63,8 +63,7 @@ TOOLCHAIN_MISSING?= no
#
# What GCC is used?
#
-.if ${MACHINE} == "vax" || \
-${MACHINE_ARCH} == "sh3" || \
+.if ${MACHINE_ARCH} == "sh3" || \
${MACHINE_CPU} == "m68k"
HAVE_GCC?= 7
.endif
CVS commit: src/sys/rump
Module Name:src
Committed By: kamil
Date: Fri May 29 00:05:26 UTC 2020
Modified Files:
src/sys/rump: Makefile.rump
Log Message:
Set -fno-delete-null-pointer-checks for RUMP/MKSANITIZER with Clang
NULL + 0 arithmetic raises LLVM UBSan warnings, specially in sys/pslist.h
in the type-safe macros _PSLIST_VALIDATE_PTRS and _PSLIST_VALIDATE_CONTAINER.
Proposes on without objections.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/rump/Makefile.rump
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.127 src/sys/rump/Makefile.rump:1.128
--- src/sys/rump/Makefile.rump:1.127 Mon Mar 9 14:45:41 2020
+++ src/sys/rump/Makefile.rump Fri May 29 00:05:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.127 2020/03/09 14:45:41 kamil Exp $
+# $NetBSD: Makefile.rump,v 1.128 2020/05/29 00:05:26 kamil Exp $
#
.if !defined(_RUMP_MK)
@@ -24,6 +24,12 @@ CPPFLAGS+= -D_RUMPKERNEL -I${RUMPTOP}/li
# aborts after kern_assert on NULL pointer checks.
CFLAGS+=${${ACTIVE_CC} == "gcc":? -fno-delete-null-pointer-checks :}
+# NULL + 0 arithmetic raises LLVM UBSan warnings, specially in sys/pslist.h
+# in the type-safe macros _PSLIST_VALIDATE_PTRS and _PSLIST_VALIDATE_CONTAINER.
+.if ${MKSANITIZER:Uno} == "yes" || ${MKLIBCSANITIZER:Uno} == "yes"
+CFLAGS+=${${ACTIVE_CC} == "clang":? -fno-delete-null-pointer-checks :}
+.endif
+
# Define baseline cpu for mips ports, required for
# rumpcomp_sync_icache() hypercall.
.if !empty(MACHINE_ARCH:Mmips*)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: riastradh
Date: Thu May 28 23:25:17 UTC 2020
Modified Files:
src/sys/dev/pci: if_vioif.c
Log Message:
Allocate proper storage for the event counter group names.
Can't use a stack buffer for these because the evcnt remembers the
pointer!
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pci/if_vioif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vioif.c
diff -u src/sys/dev/pci/if_vioif.c:1.64 src/sys/dev/pci/if_vioif.c:1.65
--- src/sys/dev/pci/if_vioif.c:1.64 Mon May 25 09:45:40 2020
+++ src/sys/dev/pci/if_vioif.c Thu May 28 23:25:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vioif.c,v 1.64 2020/05/25 09:45:40 yamaguchi Exp $ */
+/* $NetBSD: if_vioif.c,v 1.65 2020/05/28 23:25:17 riastradh Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.64 2020/05/25 09:45:40 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.65 2020/05/28 23:25:17 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -238,6 +238,7 @@ struct vioif_txqueue {
bool txq_workqueue;
bool txq_active;
+ char txq_evgroup[16];
struct evcnt txq_defrag_failed;
struct evcnt txq_mbuf_load_failed;
struct evcnt txq_enqueue_reserve_failed;
@@ -260,6 +261,7 @@ struct vioif_rxqueue {
bool rxq_workqueue;
bool rxq_active;
+ char rxq_evgroup[16];
struct evcnt rxq_mbuf_add_failed;
};
@@ -2477,34 +2479,31 @@ vioif_setup_stats(struct vioif_softc *sc
{
struct vioif_rxqueue *rxq;
struct vioif_txqueue *txq;
-
- char namebuf[16];
int i;
for (i = 0; i < sc->sc_max_nvq_pairs; i++) {
rxq = >sc_rxq[i];
txq = >sc_txq[i];
- snprintf(namebuf, sizeof(namebuf), "%s-TX%d",
+ snprintf(txq->txq_evgroup, sizeof(txq->txq_evgroup), "%s-TX%d",
device_xname(sc->sc_dev), i);
evcnt_attach_dynamic(>txq_defrag_failed, EVCNT_TYPE_MISC,
- NULL, namebuf, "tx m_defrag() failed");
+ NULL, txq->txq_evgroup, "tx m_defrag() failed");
evcnt_attach_dynamic(>txq_mbuf_load_failed, EVCNT_TYPE_MISC,
- NULL, namebuf, "tx dmamap load failed");
+ NULL, txq->txq_evgroup, "tx dmamap load failed");
evcnt_attach_dynamic(>txq_enqueue_reserve_failed, EVCNT_TYPE_MISC,
- NULL, namebuf, "virtio_enqueue_reserve failed");
+ NULL, txq->txq_evgroup, "virtio_enqueue_reserve failed");
- snprintf(namebuf, sizeof(namebuf), "%s-RX%d",
+ snprintf(rxq->rxq_evgroup, sizeof(rxq->rxq_evgroup), "%s-RX%d",
device_xname(sc->sc_dev), i);
evcnt_attach_dynamic(>rxq_mbuf_add_failed, EVCNT_TYPE_MISC,
- NULL, namebuf, "rx mbuf allocation failed");
+ NULL, rxq->rxq_evgroup, "rx mbuf allocation failed");
}
- snprintf(namebuf, sizeof(namebuf), "%s-CTRL", device_xname(sc->sc_dev));
evcnt_attach_dynamic(>sc_ctrlq.ctrlq_cmd_load_failed, EVCNT_TYPE_MISC,
- NULL, namebuf, "control command dmamap load failed");
+ NULL, device_xname(sc->sc_dev), "control command dmamap load failed");
evcnt_attach_dynamic(>sc_ctrlq.ctrlq_cmd_failed, EVCNT_TYPE_MISC,
- NULL, namebuf, "control command failed");
+ NULL, device_xname(sc->sc_dev), "control command failed");
}
MODULE(MODULE_CLASS_DRIVER, if_vioif, "virtio");
CVS commit: src/sys/secmodel/securelevel
Module Name:src Committed By: riastradh Date: Thu May 28 23:17:25 UTC 2020 Modified Files: src/sys/secmodel/securelevel: secmodel_securelevel.c Log Message: Accept ioctl(RNDADDDATA) estimates at securelevel 1 (but not 2). securelevel=1 is supposed to be a reasonable default for normal computers. This got in the way of ever getting entropy from a seed on a machine with no HWRNG -- e.g., from another machine, or by making the executive decision that what has been sampled is good enough and issuing `head -c 32 < /dev/urandom > /dev/random'. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 \ src/sys/secmodel/securelevel/secmodel_securelevel.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/secmodel/securelevel/secmodel_securelevel.c diff -u src/sys/secmodel/securelevel/secmodel_securelevel.c:1.35 src/sys/secmodel/securelevel/secmodel_securelevel.c:1.36 --- src/sys/secmodel/securelevel/secmodel_securelevel.c:1.35 Mon May 11 19:36:39 2020 +++ src/sys/secmodel/securelevel/secmodel_securelevel.c Thu May 28 23:17:25 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: secmodel_securelevel.c,v 1.35 2020/05/11 19:36:39 alnsn Exp $ */ +/* $NetBSD: secmodel_securelevel.c,v 1.36 2020/05/28 23:17:25 riastradh Exp $ */ /*- * Copyright (c) 2006 Elad Efrat * All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.35 2020/05/11 19:36:39 alnsn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: secmodel_securelevel.c,v 1.36 2020/05/28 23:17:25 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_insecure.h" @@ -593,7 +593,7 @@ secmodel_securelevel_device_cb(kauth_cre break; case KAUTH_DEVICE_RND_ADDDATA_ESTIMATE: - if (securelevel > 0) + if (securelevel > 1) result = KAUTH_RESULT_DENY; break;
CVS commit: src/sys/kern
Module Name:src
Committed By: ad
Date: Thu May 28 20:29:18 UTC 2020
Modified Files:
src/sys/kern: kern_cpu.c
Log Message:
At least panic with a useful message if there are too many CPUs.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/kern/kern_cpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.90 src/sys/kern/kern_cpu.c:1.91
--- src/sys/kern/kern_cpu.c:1.90 Sat May 23 23:42:43 2020
+++ src/sys/kern/kern_cpu.c Thu May 28 20:29:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.90 2020/05/23 23:42:43 ad Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.91 2020/05/28 20:29:18 ad Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.90 2020/05/23 23:42:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.91 2020/05/28 20:29:18 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -130,7 +130,8 @@ mi_cpu_attach(struct cpu_info *ci)
KASSERT(maxcpus > 0);
- ci->ci_index = ncpu;
+ if ((ci->ci_index = ncpu) >= maxcpus)
+ panic("Too many CPUs. Increase MAXCPUS?");
kcpuset_set(kcpuset_attached, cpu_index(ci));
/*
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Thu May 28 20:29:22 UTC 2020 Modified Files: src/doc: CHANGES Log Message: evbarm: Add install media for earmv7hf and aarch64. To generate a diff of this commit: cvs rdiff -u -r1.2697 -r1.2698 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2697 src/doc/CHANGES:1.2698 --- src/doc/CHANGES:1.2697 Thu May 28 17:07:27 2020 +++ src/doc/CHANGES Thu May 28 20:29:21 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2697 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2698 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -215,3 +215,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: acpi(4): Updated ACPICA to 20200430. [christos 20200525] postfix(1): Import version 3.5.2. [christos 20200525] OpenSSH: Import 8.3. [christos 20200528] + evbarm: Add install media for earmv7hf and aarch64. [jmcneill 20200528]
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Thu May 28 20:27:41 UTC 2020 Modified Files: src/doc: TODO Log Message: Remove "write a BSD-licensed web browser" from the list of suggested smaller projects. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO diff -u src/doc/TODO:1.20 src/doc/TODO:1.21 --- src/doc/TODO:1.20 Fri Jan 24 09:33:42 2020 +++ src/doc/TODO Thu May 28 20:27:41 2020 @@ -1,4 +1,4 @@ -# $NetBSD: TODO,v 1.20 2020/01/24 09:33:42 ad Exp $ +# $NetBSD: TODO,v 1.21 2020/05/28 20:27:41 jmcneill Exp $ THINGS TO BE DONE: @@ -45,7 +45,6 @@ This is a list of suggested smaller proj + investigate zebra or quagga in gnusrc rather than routed + do a type-punned pointer sweep for -fstrict-aliases (and fix the problems, not the symptoms) -+ write a BSD-licensed web browser + perhaps look at putting wonka into src/ (with uuencoded class lib?) + write an overview document for openssl and certificates + documentation project help
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: ad Date: Thu May 28 20:03:19 UTC 2020 Modified Files: src/sys/arch/i386/i386: cpufunc.S Log Message: PR port-i386/55314: i386 no longer boots Oops, EDI and ESI are callee saved on i386. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/i386/i386/cpufunc.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/i386/cpufunc.S diff -u src/sys/arch/i386/i386/cpufunc.S:1.44 src/sys/arch/i386/i386/cpufunc.S:1.45 --- src/sys/arch/i386/i386/cpufunc.S:1.44 Wed May 27 20:49:14 2020 +++ src/sys/arch/i386/i386/cpufunc.S Thu May 28 20:03:19 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.S,v 1.44 2020/05/27 20:49:14 ad Exp $ */ +/* $NetBSD: cpufunc.S,v 1.45 2020/05/28 20:03:19 ad Exp $ */ /*- * Copyright (c) 1998, 2007, 2020 The NetBSD Foundation, Inc. @@ -38,7 +38,7 @@ #include #include -__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.44 2020/05/27 20:49:14 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpufunc.S,v 1.45 2020/05/28 20:03:19 ad Exp $"); #include "opt_xen.h" @@ -322,11 +322,15 @@ END(outl) ENTRY(x86_stos) pushl %ebp movl %esp,%ebp + pushl %edi + pushl %esi movl 8(%ebp),%edi movl 12(%ebp),%eax movl 16(%ebp),%ecx rep stosl + popl %esi + popl %edi leave ret END(x86_stos) @@ -334,11 +338,15 @@ END(x86_stos) ENTRY(x86_movs) pushl %ebp movl %esp,%ebp + pushl %edi + pushl %esi movl 8(%ebp),%edi movl 12(%ebp),%esi movl 16(%ebp),%ecx rep movsl + popl %esi + popl %edi leave ret END(x86_movs)
CVS commit: src/distrib
Module Name:src
Committed By: jmcneill
Date: Thu May 28 19:20:57 UTC 2020
Modified Files:
src/distrib/common/bootimage: Makefile.installimage
src/distrib/evbarm/installimage: Makefile
Log Message:
Shrink the evbarm install image by not including the live images on the install
media
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.1 -r1.2 src/distrib/evbarm/installimage/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.7 src/distrib/common/bootimage/Makefile.installimage:1.8
--- src/distrib/common/bootimage/Makefile.installimage:1.7 Thu May 28 15:12:03 2020
+++ src/distrib/common/bootimage/Makefile.installimage Thu May 28 19:20:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.7 2020/05/28 15:12:03 jmcneill Exp $
+# $NetBSD: Makefile.installimage,v 1.8 2020/05/28 19:20:57 jmcneill Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -49,6 +49,9 @@ IMGDIR_EXTRA= ${RELEASEDIR}/${RELEASEMAC
IMGDIR_EXCLUDE= -s ',./installation/cdrom.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/liveimage.*,,gp'
IMGDIR_EXCLUDE+= -s ',./installation/installimage.*,,gp'
+.if defined(MD_IMGDIR_EXCLUDE)
+IMGDIR_EXCLUDE+= ${MD_IMGDIR_EXCLUDE}
+.endif
IMGBASE=${INSTIMGBASE}
Index: src/distrib/evbarm/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.1 src/distrib/evbarm/installimage/Makefile:1.2
--- src/distrib/evbarm/installimage/Makefile:1.1 Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/Makefile Thu May 28 19:20:57 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/28 19:20:57 jmcneill Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
-INSTIMAGEMB?= 1550 # for all installation binaries
+INSTIMAGEMB?= 750 # for all installation binaries
.if ${MACHINE_ARCH} == "aarch64"
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
@@ -30,4 +30,7 @@ IMGFILE_EXTRA=\
${SYSINSTDIR}/sysinstmsgs.pl .\
${SYSINSTDIR}/sysinst .
+MD_IMGDIR_EXCLUDE= -s ',./binary/gzimg.*,,gp'
+MD_IMGDIR_EXCLUDE+= -s ',./binary/instkernel.*,,gp'
+
.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
CVS commit: src/usr.sbin/sysinst/arch/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu May 28 19:03:09 UTC 2020
Modified Files:
src/usr.sbin/sysinst/arch/evbarm: Makefile
Log Message:
Set HAVE_INSTALL_IMAGE for evbarm
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/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/evbarm/Makefile
diff -u src/usr.sbin/sysinst/arch/evbarm/Makefile:1.2 src/usr.sbin/sysinst/arch/evbarm/Makefile:1.3
--- src/usr.sbin/sysinst/arch/evbarm/Makefile:1.2 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/evbarm/Makefile Thu May 28 19:03:09 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2019/06/12 06:20:19 martin Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/28 19:03:09 jmcneill Exp $
#
# Makefile for evbarm
#
MENUS_MD= menus.md.${SYSINSTLANG}
MSG_MD= msg.md.${SYSINSTLANG} msg.mbr.${SYSINSTLANG}
-MD_OPTIONS= AOUT2ELF
+MD_OPTIONS= AOUT2ELF HAVE_INSTALL_IMAGE
NO_MBR=no
.include "../../Makefile.inc"
CVS commit: src/usr.sbin/sysinst/arch/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu May 28 19:00:52 UTC 2020
Modified Files:
src/usr.sbin/sysinst/arch/evbarm: msg.md.en
Log Message:
Remove "If you booted from a floppy" message
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbarm/msg.md.en
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/evbarm/msg.md.en
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.en:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.en:1.2
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.en:1.1 Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.en Thu May 28 19:00:52 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.md.en,v 1.1 2014/07/26 19:30:45 dholland Exp $ */
+/* $NetBSD: msg.md.en,v 1.2 2020/05/28 19:00:52 jmcneill Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -41,7 +41,7 @@ message md_hello
}
message md_may_remove_boot_medium
-{If you booted from a floppy, you may now remove the disk.
+{
}
message badreadbb
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu May 28 17:07:27 UTC 2020 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSH To generate a diff of this commit: cvs rdiff -u -r1.1722 -r1.1723 src/doc/3RDPARTY cvs rdiff -u -r1.2696 -r1.2697 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1722 src/doc/3RDPARTY:1.1723 --- src/doc/3RDPARTY:1.1722 Wed May 27 02:17:45 2020 +++ src/doc/3RDPARTY Thu May 28 13:07:27 2020 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1722 2020/05/27 06:17:45 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1723 2020/05/28 17:07:27 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1057,12 +1057,12 @@ Notes: Patch applied after OpenSSH import. Package: OpenSSH -Version: 8.2 +Version: 8.3 Current Vers: 8.3 / portable 8.3p1 Maintainer: OpenSSH Archive Site: http://www.openssh.com/ftp.html Home Page: http://www.openssh.com/portable.html -Date: 2020-02-26 +Date: 2020-05-28 Mailing List: openssh-unix-annou...@mindrot.org Responsible: thorpej, christos, elric License: BSD. See src/crypto/external/bsd/openssh/dist/LICENSE Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2696 src/doc/CHANGES:1.2697 --- src/doc/CHANGES:1.2696 Mon May 25 19:48:26 2020 +++ src/doc/CHANGES Thu May 28 13:07:27 2020 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2696 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2697 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -214,3 +214,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: ntp: Import ntp 4.2.8p14. [christos 20200525] acpi(4): Updated ACPICA to 20200430. [christos 20200525] postfix(1): Import version 3.5.2. [christos 20200525] + OpenSSH: Import 8.3. [christos 20200528]
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu May 28 17:06:24 UTC 2020 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: bump openssh To generate a diff of this commit: cvs rdiff -u -r1.888 -r1.889 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.249 -r1.250 src/distrib/sets/lists/debug/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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.888 src/distrib/sets/lists/base/shl.mi:1.889 --- src/distrib/sets/lists/base/shl.mi:1.888 Sun May 24 15:47:59 2020 +++ src/distrib/sets/lists/base/shl.mi Thu May 28 13:06:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.888 2020/05/24 19:47:59 christos Exp $ +# $NetBSD: shl.mi,v 1.889 2020/05/28 17:06:24 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -862,8 +862,8 @@ ./usr/lib/libsqlite3.so.1.4 base-sys-shlib compatfile ./usr/lib/libss.sobase-obsolete obsolete ./usr/lib/libssh.sobase-secsh-shlib compatfile -./usr/lib/libssh.so.36base-secsh-shlib compatfile -./usr/lib/libssh.so.36.0 base-secsh-shlib compatfile +./usr/lib/libssh.so.37base-secsh-shlib compatfile +./usr/lib/libssh.so.37.0 base-secsh-shlib compatfile ./usr/lib/libssl.sobase-crypto-shlib compatfile ./usr/lib/libssl.so.12base-crypto-shlib compatfile,openssl=10 ./usr/lib/libssl.so.12.0 base-crypto-shlib compatfile,openssl=10 Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.249 src/distrib/sets/lists/debug/shl.mi:1.250 --- src/distrib/sets/lists/debug/shl.mi:1.249 Sun May 24 15:48:00 2020 +++ src/distrib/sets/lists/debug/shl.mi Thu May 28 13:06:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.249 2020/05/24 19:48:00 christos Exp $ +# $NetBSD: shl.mi,v 1.250 2020/05/28 17:06:24 christos Exp $ ./usr/lib/libbfd_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libavl.so.0.0.debug comp-zfs-debug debug,dynamicroot,zfs @@ -302,7 +302,7 @@ ./usr/libdata/debug/usr/lib/libskey.so.2.0.debug comp-sys-debug debug,compatfile,skey ./usr/libdata/debug/usr/lib/libsl.so.6.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libsqlite3.so.1.4.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libssh.so.36.0.debug comp-secsh-debug debug,compatfile +./usr/libdata/debug/usr/lib/libssh.so.37.0.debug comp-secsh-debug debug,compatfile ./usr/libdata/debug/usr/lib/libssl.so.12.0.debug comp-crypto-debug debug,compatfile,openssl=10 ./usr/libdata/debug/usr/lib/libssl.so.14.0.debug comp-crypto-debug debug,compatfile,openssl=11 ./usr/libdata/debug/usr/lib/libstdc++.so.9.0.debug comp-sys-debug debug,compatfile,gcc=7,cxx,libstdcxx
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: christos Date: Thu May 28 17:05:50 UTC 2020 Modified Files: src/crypto/external/bsd/openssh/dist: PROTOCOL PROTOCOL.mux auth-options.c auth-rhosts.c auth2-chall.c auth2-passwd.c auth2.c authfd.c authfile.c channels.c cipher-chachapoly.c cipher-chachapoly.h cipher.c clientloop.c clientloop.h digest-libc.c gss-serv.c hmac.c hostfile.c kex.c krl.c krl.h misc.c monitor.c mux.c packet.c packet.h readconf.c readconf.h scp.1 scp.c servconf.c servconf.h session.c sftp.1 sftp.c sk-usbhid.c ssh-add.c ssh-agent.c ssh-dss.c ssh-ed25519-sk.c ssh-ed25519.c ssh-keygen.1 ssh-keygen.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh-sk.c ssh-xmss.c ssh.1 ssh.c ssh_config.5 sshbuf-misc.c sshbuf.c sshbuf.h sshconnect.c sshconnect2.c sshd.c sshd_config.5 sshkey.c sshkey.h sshsig.c umac.c utf8.c utf8.h version.h src/crypto/external/bsd/openssh/dist/moduli-gen: moduli.2048 moduli.3072 moduli.4096 moduli.6144 moduli.7680 moduli.8192 src/crypto/external/bsd/openssh/lib: shlib_version Log Message: Merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/openssh/dist/PROTOCOL \ src/crypto/external/bsd/openssh/dist/sshbuf.h cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/dist/PROTOCOL.mux \ src/crypto/external/bsd/openssh/dist/sshbuf-misc.c cvs rdiff -u -r1.22 -r1.23 \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/sshkey.c cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/auth-rhosts.c \ src/crypto/external/bsd/openssh/dist/sshbuf.c \ src/crypto/external/bsd/openssh/dist/sshkey.h cvs rdiff -u -r1.17 -r1.18 src/crypto/external/bsd/openssh/dist/auth2-chall.c \ src/crypto/external/bsd/openssh/dist/cipher.c \ src/crypto/external/bsd/openssh/dist/clientloop.h cvs rdiff -u -r1.12 -r1.13 \ src/crypto/external/bsd/openssh/dist/auth2-passwd.c cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/auth2.c \ src/crypto/external/bsd/openssh/dist/packet.h \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp.1 \ src/crypto/external/bsd/openssh/dist/ssh-add.c cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/scp.1 cvs rdiff -u -r1.23 -r1.24 src/crypto/external/bsd/openssh/dist/authfile.c \ src/crypto/external/bsd/openssh/dist/readconf.h cvs rdiff -u -r1.26 -r1.27 src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/ssh.1 \ src/crypto/external/bsd/openssh/dist/ssh_config.5 \ src/crypto/external/bsd/openssh/dist/sshconnect.c cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssh/dist/cipher-chachapoly.c cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/openssh/dist/cipher-chachapoly.h \ src/crypto/external/bsd/openssh/dist/sk-usbhid.c \ src/crypto/external/bsd/openssh/dist/ssh-ed25519-sk.c \ src/crypto/external/bsd/openssh/dist/ssh-sk.c \ src/crypto/external/bsd/openssh/dist/ssh-xmss.c cvs rdiff -u -r1.28 -r1.29 src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/sftp.c \ src/crypto/external/bsd/openssh/dist/ssh-agent.c cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/dist/digest-libc.c \ src/crypto/external/bsd/openssh/dist/hmac.c cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/gss-serv.c cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/hostfile.c \ src/crypto/external/bsd/openssh/dist/krl.c \ src/crypto/external/bsd/openssh/dist/ssh-dss.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/krl.h cvs rdiff -u -r1.33 -r1.34 src/crypto/external/bsd/openssh/dist/monitor.c cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/scp.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.1 cvs rdiff -u -r1.40 -r1.41 src/crypto/external/bsd/openssh/dist/packet.c cvs rdiff -u -r1.30 -r1.31 src/crypto/external/bsd/openssh/dist/readconf.c \ src/crypto/external/bsd/openssh/dist/session.c \ src/crypto/external/bsd/openssh/dist/sshd_config.5 cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/ssh.c \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/ssh-ed25519.c cvs rdiff -u -r1.35 -r1.36 src/crypto/external/bsd/openssh/dist/ssh-keygen.c cvs rdiff -u -r1.18 -r1.19 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \ src/crypto/external/bsd/openssh/dist/umac.c cvs rdiff -u -r1.19 -r1.20
CVS import: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: christos Date: Thu May 28 17:03:03 UTC 2020 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv12459 Log Message: OpenSSH 8.3 was released on 2020-05-27. It is available from the mirrors listed at https://www.openssh.com/. OpenSSH is a 100% complete SSH protocol 2.0 implementation and includes sftp client and server support. Once again, we would like to thank the OpenSSH community for their continued support of the project, especially those who contributed code or patches, reported bugs, tested snapshots or donated to the project. More information on donations may be found at: https://www.openssh.com/donations.html Future deprecation notice = It is now possible[1] to perform chosen-prefix attacks against the SHA-1 algorithm for less than USD$50K. For this reason, we will be disabling the "ssh-rsa" public key signature algorithm by default in a near-future release. This algorithm is unfortunately still used widely despite the existence of better alternatives, being the only remaining public key signature algorithm specified by the original SSH RFCs. The better alternatives include: * The RFC8332 RSA SHA-2 signature algorithms rsa-sha2-256/512. These algorithms have the advantage of using the same key type as "ssh-rsa" but use the safe SHA-2 hash algorithms. These have been supported since OpenSSH 7.2 and are already used by default if the client and server support them. * The ssh-ed25519 signature algorithm. It has been supported in OpenSSH since release 6.5. * The RFC5656 ECDSA algorithms: ecdsa-sha2-nistp256/384/521. These have been supported by OpenSSH since release 5.7. To check whether a server is using the weak ssh-rsa public key algorithm, for host authentication, try to connect to it after removing the ssh-rsa algorithm from ssh(1)'s allowed list: ssh -oHostKeyAlgorithms=-ssh-rsa user@host If the host key verification fails and no other supported host key types are available, the server software on that host should be upgraded. A future release of OpenSSH will enable UpdateHostKeys by default to allow the client to automatically migrate to better algorithms. Users may consider enabling this option manually. Vendors of devices that implement the SSH protocol should ensure that they support the new signature algorithms for RSA keys. [1] "SHA-1 is a Shambles: First Chosen-Prefix Collision on SHA-1 and Application to the PGP Web of Trust" Leurent, G and Peyrin, T (2020) https://eprint.iacr.org/2020/014.pdf Security * scp(1): when receiving files, scp(1) could be become desynchronised if a utimes(2) system call failed. This could allow file contents to be interpreted as file metadata and thereby permit an adversary to craft a file system that, when copied with scp(1) in a configuration that caused utimes(2) to fail (e.g. under a SELinux policy or syscall sandbox), transferred different file names and contents to the actual file system layout. Exploitation of this is not likely as utimes(2) does not fail under normal circumstances. Successful exploitation is not silent - the output of scp(1) would show transfer errors followed by the actual file(s) that were received. Finally, filenames returned from the peer are (since openssh-8.0) matched against the user's requested destination, thereby disallowing a successful exploit from writing files outside the user's selected target glob (or directory, in the case of a recursive transfer). This ensures that this attack can achieve no more than a hostile peer is already able to achieve within the scp protocol. Potentially-incompatible changes This release includes a number of changes that may affect existing configurations: * sftp(1): reject an argument of "-1" in the same way as ssh(1) and scp(1) do instead of accepting and silently ignoring it. Changes since OpenSSH 8.2 = The focus of this release is bug fixing. New Features * sshd(8): make IgnoreRhosts a tri-state option: "yes" to ignore rhosts/shosts, "no" allow rhosts/shosts or (new) "shosts-only" to allow .shosts files but not .rhosts. * sshd(8): allow the IgnoreRhosts directive to appear anywhere in a sshd_config, not just before any Match blocks; bz3148 * ssh(1): add %TOKEN percent expansion for the LocalFoward and RemoteForward keywords when used for Unix domain socket forwarding. bz#3014 * all: allow loading public keys from the unencrypted envelope of a private key file if no corresponding public key file is present. * ssh(1), sshd(8): prefer to use chacha20 from libcrypto where possible instead of the (slower) portable C implementation included in OpenSSH. * ssh-keygen(1): add ability to dump the contents of a binary key revocation list via
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu May 28 15:27:59 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Removed Files:
src/distrib/evbarm/cdroms: Makefile
src/distrib/evbarm/cdroms/installcd: Makefile
Log Message:
Remove support for evbarm cdrom images. Not sure that any of them can even
be used.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/evbarm/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/evbarm/cdroms/Makefile
cvs rdiff -u -r1.4 -r0 src/distrib/evbarm/cdroms/installcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.11 src/distrib/evbarm/Makefile:1.12
--- src/distrib/evbarm/Makefile:1.11 Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/Makefile Thu May 28 15:27:59 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2020/05/28 15:23:43 jmcneill Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/28 15:27:59 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include
-SUBDIR= gzboot instkernel cdroms
+SUBDIR= gzboot instkernel
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
SUBDIR+= installimage
.endif
@@ -19,9 +19,6 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
-iso_image:
- ${MAKEDIRTARGET} cdroms iso_image
-
install_image:
${MAKEDIRTARGET} installimage install_image
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: jmcneill
Date: Thu May 28 15:23:43 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
Added Files:
src/distrib/evbarm/installimage: Makefile etc.rc etc.ttys install.sh
spec.inst
Log Message:
Build install images for aarch64 and earmv7hf.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/evbarm/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/evbarm/installimage/Makefile \
src/distrib/evbarm/installimage/etc.rc \
src/distrib/evbarm/installimage/etc.ttys \
src/distrib/evbarm/installimage/install.sh \
src/distrib/evbarm/installimage/spec.inst
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.10 src/distrib/evbarm/Makefile:1.11
--- src/distrib/evbarm/Makefile:1.10 Sun Apr 1 04:35:01 2018
+++ src/distrib/evbarm/Makefile Thu May 28 15:23:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/04/01 04:35:01 ryo Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/28 15:23:43 jmcneill Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,6 +6,9 @@
.include
SUBDIR= gzboot instkernel cdroms
+.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
+SUBDIR+= installimage
+.endif
TARGETS+= release
.if ${MACHINE_CPU} == "arm"
@@ -19,4 +22,7 @@ release: check_RELEASEDIR .WAIT ${MDECBO
iso_image:
${MAKEDIRTARGET} cdroms iso_image
+install_image:
+ ${MAKEDIRTARGET} installimage install_image
+
.include
Added files:
Index: src/distrib/evbarm/installimage/Makefile
diff -u /dev/null src/distrib/evbarm/installimage/Makefile:1.1
--- /dev/null Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/Makefile Thu May 28 15:23:43 2020
@@ -0,0 +1,33 @@
+# $NetBSD: Makefile,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
+
+.include
+
+INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACHINE_ARCH}-install # gives ${IMGBASE}.img
+
+INSTIMAGEMB?= 1550 # for all installation binaries
+
+.if ${MACHINE_ARCH} == "aarch64"
+EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
+KERN_SET= kern-GENERIC64
+.elif ${MACHINE_ARCH} == "earmv7hf"
+EFIBOOT+= ${WORKDIR}/usr/mdec/bootarm.efi
+KERN_SET= kern-GENERIC
+.endif
+
+USE_GPT= yes
+
+DISTRIBDIR!= cd ${.CURDIR}/../.. ; pwd
+SYSINSTDIR!= cd ${.CURDIR}/../../../usr.sbin/sysinst/arch/${MACHINE} && ${PRINTOBJDIR}
+
+SPEC_EXTRA= ${.CURDIR}/spec.inst
+IMGFILE_EXTRA=\
+ ${.CURDIR}/etc.ttys etc/ttys \
+ ${.CURDIR}/etc.rc etc/rc\
+ ${.CURDIR}/install.sh .\
+ ${SYSINSTDIR}/sysinstmsgs.de .\
+ ${SYSINSTDIR}/sysinstmsgs.es .\
+ ${SYSINSTDIR}/sysinstmsgs.fr .\
+ ${SYSINSTDIR}/sysinstmsgs.pl .\
+ ${SYSINSTDIR}/sysinst .
+
+.include "${NETBSDSRCDIR}/distrib/common/bootimage/Makefile.installimage"
Index: src/distrib/evbarm/installimage/etc.rc
diff -u /dev/null src/distrib/evbarm/installimage/etc.rc:1.1
--- /dev/null Thu May 28 15:23:43 2020
+++ src/distrib/evbarm/installimage/etc.rc Thu May 28 15:23:43 2020
@@ -0,0 +1,49 @@
+# $NetBSD: etc.rc,v 1.1 2020/05/28 15:23:43 jmcneill Exp $
+#
+# Copyright (c) 1997 Perry E. Metzger
+# Copyright (c) 1994 Christopher G. Demetriou
+# 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, 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.
+# 3. All advertising materials mentioning features or use of this software
+#must display the following acknowledgement:
+# This product includes software developed for the
+# NetBSD Project. See http://www.NetBSD.org/ for
+# information about NetBSD.
+# 4. The name of the author may not be used to endorse or promote products
+#derived from this software without specific prior written permission.
+#
+# 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.
+#
+# <>
+
CVS commit: src/distrib
Module Name:src
Committed By: jmcneill
Date: Thu May 28 15:13:21 UTC 2020
Modified Files:
src/distrib/amd64/installimage: Makefile
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Only install gptmbr.bin if USE_GPTMBR=yes
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/amd64/installimage/Makefile
cvs rdiff -u -r1.24 -r1.25 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/installimage/Makefile
diff -u src/distrib/amd64/installimage/Makefile:1.11 src/distrib/amd64/installimage/Makefile:1.12
--- src/distrib/amd64/installimage/Makefile:1.11 Wed May 27 22:27:58 2020
+++ src/distrib/amd64/installimage/Makefile Thu May 28 15:13:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/05/27 22:27:58 maya Exp $
+# $NetBSD: Makefile,v 1.12 2020/05/28 15:13:21 jmcneill Exp $
.include
@@ -16,6 +16,7 @@ EFIBOOT+= ${WORKDIR}/usr/mdec/bootia32.
USE_MBR= yes
USE_GPT= yes
+USE_GPTMBR= yes
CLEANFILES+= boot.cfg
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.24 src/distrib/common/bootimage/Makefile.bootimage:1.25
--- src/distrib/common/bootimage/Makefile.bootimage:1.24 Sat Mar 21 14:19:26 2020
+++ src/distrib/common/bootimage/Makefile.bootimage Thu May 28 15:13:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.24 2020/03/21 14:19:26 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.25 2020/05/28 15:13:21 jmcneill Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -166,6 +166,7 @@ RM?= rm
#
USE_MBR?= no
USE_GPT?= no
+USE_GPTMBR?= no
USE_SUNLABEL?= no
INSTALLBOOT_AFTER_DISKLABEL?= no
@@ -549,8 +550,10 @@ ${IMGBASE}.img: ${WORKLABEL}
${IMGBASE}.img: ${TARGET_BLOCKS}
${CAT} ${TARGET_BLOCKS} > ${WORKIMG}
.if ${USE_GPT} != "no"
+.if ${USE_GPTMBR} != "no"
${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2 \
-c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
+.endif
${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
.endif # USE_GPT != "no"
.if ${USE_SUNLABEL} != "no"
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: jmcneill
Date: Thu May 28 15:12:03 UTC 2020
Modified Files:
src/distrib/common/bootimage: Makefile.installimage
Log Message:
Default USE_MBR to no
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/common/bootimage/Makefile.installimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.6 src/distrib/common/bootimage/Makefile.installimage:1.7
--- src/distrib/common/bootimage/Makefile.installimage:1.6 Thu Nov 21 22:29:03 2019
+++ src/distrib/common/bootimage/Makefile.installimage Thu May 28 15:12:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.6 2019/11/21 22:29:03 joerg Exp $
+# $NetBSD: Makefile.installimage,v 1.7 2020/05/28 15:12:03 jmcneill Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -36,6 +36,8 @@ SETS?= modules base etc
FSTAB_IN?= ${NETBSDSRCDIR}/distrib/common/bootimage/fstab.install.in
+USE_MBR?= no
+
.if ${USE_MBR} != "no"
DISKPROTO_IN?= ${NETBSDSRCDIR}/distrib/common/bootimage/diskproto.noswap.mbr.in
.else
CVS commit: src/usr.sbin/puffs/mount_9p
Module Name:src
Committed By: uwe
Date: Thu May 28 14:00:05 UTC 2020
Modified Files:
src/usr.sbin/puffs/mount_9p: fs.c
Log Message:
Do not send dummy Tauth, it's completely unnecessary.
The best way to not use authentication is to not use authentication.
Cf. http://man.cat-v.org/plan_9/5/attach
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/mount_9p/fs.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/puffs/mount_9p/fs.c
diff -u src/usr.sbin/puffs/mount_9p/fs.c:1.10 src/usr.sbin/puffs/mount_9p/fs.c:1.11
--- src/usr.sbin/puffs/mount_9p/fs.c:1.10 Fri May 17 08:48:04 2019
+++ src/usr.sbin/puffs/mount_9p/fs.c Thu May 28 14:00:05 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.c,v 1.10 2019/05/17 08:48:04 ozaki-r Exp $ */
+/* $NetBSD: fs.c,v 1.11 2020/05/28 14:00:05 uwe Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -27,7 +27,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: fs.c,v 1.10 2019/05/17 08:48:04 ozaki-r Exp $");
+__RCSID("$NetBSD: fs.c,v 1.11 2020/05/28 14:00:05 uwe Exp $");
#endif /* !lint */
#include
@@ -109,27 +109,6 @@ p9p_handshake(struct puffs_usermount *pu
/* Should downgrade from 9P2000.u to 9P2000 if the server request? */
}
- /* tell the server we don't support authentication */
- p9pbuf_recycleout(pb);
- tagid = NEXTTAG(p9p);
- p9pbuf_put_1(pb, P9PROTO_T_AUTH);
- p9pbuf_put_2(pb, tagid);
- p9pbuf_put_4(pb, P9PROTO_NOFID);
- p9pbuf_put_str(pb, username);
- p9pbuf_put_str(pb, "");
- if (p9p->protover == P9PROTO_VERSION_U)
- p9pbuf_put_4(pb, P9PROTO_NUNAME_UNSPECIFIED); /* n_uname[4] */
- DO_IO(p9pbuf_write, pu, pb, p9p->servsock, , rv);
-
- puffs_framebuf_recycle(pb);
- DO_IO(p9pbuf_read, pu, pb, p9p->servsock, , rv);
-
- /* assume all Rerror is "no auth" */
- if (p9pbuf_get_type(pb) != P9PROTO_R_ERROR)
- errx(1, "mount_9p supports only NO auth");
- if ((rtagid = p9pbuf_get_tag(pb)) != tagid)
- errx(1, "server invalid tag: %d vs. %d", tagid, rtagid);
-
/* build attach message */
p9pbuf_recycleout(pb);
tagid = NEXTTAG(p9p);
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: skrll Date: Thu May 28 12:41:15 UTC 2020 Modified Files: src/sys/arch/aarch64/include: armreg.h Log Message: Add some new CTR_EL0 bits To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/arch/aarch64/include/armreg.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/aarch64/include/armreg.h diff -u src/sys/arch/aarch64/include/armreg.h:1.47 src/sys/arch/aarch64/include/armreg.h:1.48 --- src/sys/arch/aarch64/include/armreg.h:1.47 Mon May 25 05:17:05 2020 +++ src/sys/arch/aarch64/include/armreg.h Thu May 28 12:41:15 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.47 2020/05/25 05:17:05 ryo Exp $ */ +/* $NetBSD: armreg.h,v 1.48 2020/05/28 12:41:15 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -108,6 +108,9 @@ reg_##regname##_write(uint64_t __val) */ AARCH64REG_READ_INLINE(ctr_el0) // Cache Type Register +#define CTR_EL0_TMIN_LINE __BITS(37,32) // Tag MIN LINE size +#define CTR_EL0_DIC __BIT(29) // Instruction cache requirement +#define CTR_EL0_IDC __BIT(28) // Data Cache clean requirement #define CTR_EL0_CWG_LINE __BITS(27,24) // Cacheback Writeback Granule #define CTR_EL0_ERG_LINE __BITS(23,20) // Exclusives Reservation Granule #define CTR_EL0_DMIN_LINE __BITS(19,16) // Dcache MIN LINE size (log2 - 2)
CVS commit: src
Module Name:src
Committed By: jmcneill
Date: Thu May 28 10:22:49 UTC 2020
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Added Files:
src/distrib/utils/embedded/conf: arm64mbr.conf
Log Message:
Create a separate Arm64 image that uses MBR partitioning. Amlogic SoCs
require the bootloader to be installed on SD cards at LBA1 which makes
them incompatible with GPT images.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/conf/arm64mbr.conf
cvs rdiff -u -r1.119 -r1.120 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.119 src/etc/etc.evbarm/Makefile.inc:1.120
--- src/etc/etc.evbarm/Makefile.inc:1.119 Sun May 24 14:44:11 2020
+++ src/etc/etc.evbarm/Makefile.inc Thu May 28 10:22:49 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.119 2020/05/24 14:44:11 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.120 2020/05/28 10:22:49 jmcneill Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -146,6 +146,9 @@ SNAP_MD_POST_DEPS+= smp_armv7
smp_arm64: __mkimage
MKI_OPTS.smp_arm64= -K ${IMAGE.kern}
SNAP_MD_POST_DEPS+= smp_arm64
+smp_arm64mbr: __mkimage
+MKI_OPTS.smp_arm64mbr= -K ${IMAGE.kern}
+SNAP_MD_POST_DEPS+= smp_arm64mbr
.endif
.if !empty(KERNEL_SETS:MRPI)
Added files:
Index: src/distrib/utils/embedded/conf/arm64mbr.conf
diff -u /dev/null src/distrib/utils/embedded/conf/arm64mbr.conf:1.1
--- /dev/null Thu May 28 10:22:49 2020
+++ src/distrib/utils/embedded/conf/arm64mbr.conf Thu May 28 10:22:49 2020
@@ -0,0 +1,110 @@
+# $NetBSD: arm64mbr.conf,v 1.1 2020/05/28 10:22:49 jmcneill Exp $
+# ARM64 (MBR partitioning) customization script used by mkimage
+#
+board=arm64mbr
+hostname=arm64
+console=fb
+resize=true
+
+. ${DIR}/conf/evbarm.conf
+
+kernel_GENERIC64="GENERIC64"
+
+make_label() {
+ make_label_evbarm
+}
+
+make_fstab() {
+ make_fstab_evbarm
+}
+
+customize() {
+ customize_evbarm
+ cat >> "${mnt}/etc/rc.conf" << EOF
+mdnsd=YES
+devpubd=YES
+wscons=\$(dev_exists wsdisplay0)
+ec2_init=\$(dev_exists ena0)
+EOF
+}
+
+populate_common() {
+ # Add EC2 init script
+ cp ${DIR}/files/ec2_init ${mnt}/etc/rc.d/ec2_init
+ echo "./etc/rc.d/ec2_init type=file uname=root gname=wheel mode=0555" \
+ >> "$tmp/selected_sets"
+
+ # Rename kernel to netbsd.img
+ mv "${mnt}/boot/netbsd-${kernel_GENERIC64}.img" "${mnt}/boot/netbsd.img"
+
+ # Install EFI bootloader
+ mkdir -p "${mnt}/boot/EFI/BOOT"
+ cp "${release}/usr/mdec/bootaa64.efi" "${mnt}/boot/EFI/BOOT/bootaa64.efi"
+
+ # Install kernel to root of the FFS partition
+ ${GZIP_CMD} -dc ${kernel}/netbsd-${kernel_GENERIC64}.gz > "${mnt}/netbsd"
+ echo "./netbsd type=file uname=root gname=wheel mode=0755" \
+ >> "$tmp/selected_sets"
+}
+
+
+populate_rpi() {
+ firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
+ firmwarefiles="LICENCE.broadcom bootcode.bin fixup4cd.dat fixup4.dat fixup_cd.dat fixup.dat start4cd.elf start4.elf start_cd.elf start.elf"
+
+ cat > "${mnt}/boot/cmdline.txt" << EOF
+root=ld0a console=${console}
+EOF
+
+ cat > "${mnt}/boot/config.txt" << EOF
+#
+upstream_kernel=1
+#
+arm_64bit=1
+os_prefix=dtb/broadcom/
+cmdline=../../cmdline.txt
+kernel=/netbsd.img
+kernel_address=0x20
+enable_uart=1
+force_turbo=0
+EOF
+
+ echo "${bar} installing firmware files ${bar}"
+ (cd "${mnt}/boot" &&
+ for f in ${firmwarefiles}; do
+ echo " $f"
+ cp "${firmwaredir}/${f}" .
+ done
+ )
+}
+
+populate() {
+ echo "${bar} looking for kernel in ${kernel} ${bar}"
+ kernels=""
+ k="$kernel_GENERIC64"
+
+ # .img kernel
+ f="${kernel}/netbsd-${k}.img.gz"
+ test -f "${f}" && kernels="${kernels} ${f}"
+
+ # install files to /boot partition
+ for k in ${kernels}; do
+ tgt="$(basename ${k} | sed 's/\.gz$//')"
+ echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
+ case "${k}" in
+ *.gz)
+ ${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
+ ;;
+ *)
+ cp "${k}" "${mnt}/boot/${tgt}"
+ ;;
+ esac ||
+ fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"
+ done
+
+ # Board specific configuration
+ populate_rpi
+
+ # common configuration
+ populate_common
+}
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Thu May 28 10:19:02 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf
Log Message:
Allow config file to override hostname
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/embedded/conf/evbarm.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.35 src/distrib/utils/embedded/conf/evbarm.conf:1.36
--- src/distrib/utils/embedded/conf/evbarm.conf:1.35 Sun May 24 14:45:49 2020
+++ src/distrib/utils/embedded/conf/evbarm.conf Thu May 28 10:19:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.35 2020/05/24 14:45:49 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.36 2020/05/28 10:19:02 jmcneill Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -151,7 +151,7 @@ dev_exists() {
}
rc_configured=YES
-hostname=${board}
+hostname=${hostname:-${board}}
no_swap=YES
savecore=NO
sshd=YES
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Thu May 28 07:59:38 UTC 2020 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Add AMD MSR_DE_CFG's bit 1 as DE_CFG_LFENCE_SERIALIZE. This bit makes lfence instruction serializing. To generate a diff of this commit: cvs rdiff -u -r1.164 -r1.165 src/sys/arch/x86/include/specialreg.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/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.164 src/sys/arch/x86/include/specialreg.h:1.165 --- src/sys/arch/x86/include/specialreg.h:1.164 Fri May 1 04:07:24 2020 +++ src/sys/arch/x86/include/specialreg.h Thu May 28 07:59:38 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.164 2020/05/01 04:07:24 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.165 2020/05/28 07:59:38 msaitoh Exp $ */ /* * Copyright (c) 2014-2019 The NetBSD Foundation, Inc. @@ -1121,6 +1121,7 @@ #define MSR_DE_CFG 0xc0011029 #define DE_CFG_ERRATA_721 0x0001 +#define DE_CFG_LFENCE_SERIALIZE __BIT(1) #define DE_CFG_ERRATA_1021 __BIT(13) #define MSR_BU_CFG2 0xc001102a
