CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: rin Date: Sun Dec 15 06:05:00 UTC 2019 Modified Files: src/sys/arch/powerpc/include: db_machdep.h Log Message: Do not mask out LK bit (bit 31) from M_BCTR, which distinguishes bcctr and bcctrl. Fix build failure for ibm4xx kernels with GCC8. XXX pullup to netbsd-9, -8, and -7 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/include/db_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/db_machdep.h diff -u src/sys/arch/powerpc/include/db_machdep.h:1.26 src/sys/arch/powerpc/include/db_machdep.h:1.27 --- src/sys/arch/powerpc/include/db_machdep.h:1.26 Mon Nov 6 03:47:48 2017 +++ src/sys/arch/powerpc/include/db_machdep.h Sun Dec 15 06:05:00 2019 @@ -1,5 +1,5 @@ /* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */ -/* $NetBSD: db_machdep.h,v 1.26 2017/11/06 03:47:48 christos Exp $ */ +/* $NetBSD: db_machdep.h,v 1.27 2019/12/15 06:05:00 rin Exp $ */ /* * Mach Operating System @@ -98,7 +98,7 @@ extern db_regs_t ddb_regs; /* register #define M_B 0xfc01 #define I_B 0x4800 #define I_BL 0x4801 -#define M_BCTR 0xfc0007fe +#define M_BCTR 0xfc0007ff #define I_BCTR 0x4c000420 #define I_BCTRL 0x4c000421 #define M_RFI 0xfc0007fe
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sun Dec 15 05:56:02 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_ioctl.c dm_target.c dm_target_error.c
dm_target_linear.c dm_target_mirror.c dm_target_snapshot.c
dm_target_stripe.c dm_target_zero.c
Log Message:
dm: Rename targets' ->status() to ->table() given ->info() exists
Since now that dm targets in NetBSD have ->info() for "status",
->status() should be renamed to ->table() for "table",
given how dm target status was originally designed in Linux kernel.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/dm/dm_ioctl.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/dm/dm_target.c \
src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/dm/dm_target_zero.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/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.41 src/sys/dev/dm/dm.h:1.42
--- src/sys/dev/dm/dm.h:1.41 Sat Dec 14 17:15:54 2019
+++ src/sys/dev/dm/dm.h Sun Dec 15 05:56:02 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.41 2019/12/14 17:15:54 tkusumi Exp $ */
+/*$NetBSD: dm.h,v 1.42 2019/12/15 05:56:02 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -184,12 +184,12 @@ typedef struct dm_target {
int (*deps) (dm_table_entry_t *, prop_array_t);
/*
- * Info/status routine are called to get params string, which is target
+ * Info/table routine are called to get params string, which is target
* specific. When dm_table_status_ioctl is called with flag
* DM_STATUS_TABLE_FLAG I have to sent params string back.
*/
char *(*info)(void *);
- char * (*status)(void *);
+ char *(*table)(void *);
int (*strategy)(dm_table_entry_t *, struct buf *);
int (*sync)(dm_table_entry_t *);
int (*upcall)(dm_table_entry_t *, struct buf *);
@@ -242,7 +242,7 @@ int dm_target_init(void);
/* dm_target_linear.c */
int dm_target_linear_init(dm_table_entry_t *, int, char **);
-char *dm_target_linear_status(void *);
+char *dm_target_linear_table(void *);
int dm_target_linear_strategy(dm_table_entry_t *, struct buf *);
int dm_target_linear_sync(dm_table_entry_t *);
int dm_target_linear_deps(dm_table_entry_t *, prop_array_t);
@@ -255,7 +255,7 @@ uint64_t atoi(const char *);
/* dm_target_stripe.c */
int dm_target_stripe_init(dm_table_entry_t *, int, char **);
-char *dm_target_stripe_status(void *);
+char *dm_target_stripe_table(void *);
int dm_target_stripe_strategy(dm_table_entry_t *, struct buf *);
int dm_target_stripe_sync(dm_table_entry_t *);
int dm_target_stripe_deps(dm_table_entry_t *, prop_array_t);
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.44 src/sys/dev/dm/dm_ioctl.c:1.45
--- src/sys/dev/dm/dm_ioctl.c:1.44 Sat Dec 14 17:15:54 2019
+++ src/sys/dev/dm/dm_ioctl.c Sun Dec 15 05:56:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.44 2019/12/14 17:15:54 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.45 2019/12/15 05:56:02 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.44 2019/12/14 17:15:54 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.45 2019/12/15 05:56:02 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -943,7 +943,7 @@ dm_table_status_ioctl(prop_dictionary_t
prop_dictionary_set_cstring(target_dict, DM_TABLE_PARAMS, "");
if (flags & DM_STATUS_TABLE_FLAG)
- params = table_en->target->status(
+ params = table_en->target->table(
table_en->target_config);
else if (table_en->target->info)
params = table_en->target->info(
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.28 src/sys/dev/dm/dm_target.c:1.29
--- src/sys/dev/dm/dm_target.c:1.28 Sat Dec 14 10:49:30 2019
+++ src/sys/dev/dm/dm_target.c Sun Dec 15 05:56:02 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target.c,v 1.28 2019/12/14 10:49:30 tkusumi Exp $ */
+/*$NetBSD: dm_target.c,v 1.29 2019/12/15 05:56:02 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.28 2019/12/14 10:49:30 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.29 2019/12/15 05:56:02 tkusumi Exp $");
#include
#include
@@ -160,8 +160,8 @@ dm_target_insert(dm_target_t *dm_target)
printf("%s missing init\n", dm_target->name);
return
CVS commit: src/usr.bin/cksum
Module Name:src Committed By: christos Date: Sun Dec 15 04:50:29 UTC 2019 Modified Files: src/usr.bin/cksum: cksum.1 Log Message: bump date To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/usr.bin/cksum/cksum.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/cksum/cksum.1 diff -u src/usr.bin/cksum/cksum.1:1.49 src/usr.bin/cksum/cksum.1:1.50 --- src/usr.bin/cksum/cksum.1:1.49 Sat Dec 14 22:55:56 2019 +++ src/usr.bin/cksum/cksum.1 Sat Dec 14 23:50:28 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: cksum.1,v 1.49 2019/12/15 03:55:56 christos Exp $ +.\" $NetBSD: cksum.1,v 1.50 2019/12/15 04:50:28 christos Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)cksum.1 8.2 (Berkeley) 4/28/95 .\" -.Dd August 31, 2014 +.Dd December 14, 2019 .Dt CKSUM 1 .Os .Sh NAME
CVS commit: src/usr.bin/mail
Module Name:src
Committed By: christos
Date: Sun Dec 15 04:17:38 UTC 2019
Modified Files:
src/usr.bin/mail: complete.c
Log Message:
treat empty variables are unset (Steffen Nurpmeso)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/mail/complete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/complete.c
diff -u src/usr.bin/mail/complete.c:1.21 src/usr.bin/mail/complete.c:1.22
--- src/usr.bin/mail/complete.c:1.21 Sat Dec 14 15:28:02 2019
+++ src/usr.bin/mail/complete.c Sat Dec 14 23:17:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: complete.c,v 1.21 2019/12/14 20:28:02 christos Exp $ */
+/* $NetBSD: complete.c,v 1.22 2019/12/15 04:17:38 christos Exp $ */
/*-
* Copyright (c) 1997-2000,2005,2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: complete.c,v 1.21 2019/12/14 20:28:02 christos Exp $");
+__RCSID("$NetBSD: complete.c,v 1.22 2019/12/15 04:17:38 christos Exp $");
#endif /* not lint */
/*
@@ -339,7 +339,8 @@ complete_filename(EditLine *el, char *wo
size_t len;
if ((fname = strrchr(word, '/')) == NULL) {
- if (word[0] == '+' && (mf = value(ENAME_FOLDER)) != NULL) {
+ if (word[0] == '+' && (mf = value(ENAME_FOLDER)) != NULL && *mf)
+ {
if (mf[0] == '/') {
(void)estrlcpy(dir, mf, sizeof(dir));
} else {
CVS commit: src
Module Name:src
Committed By: christos
Date: Sun Dec 15 03:55:57 UTC 2019
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
src/usr.bin/cksum: Makefile cksum.1
Log Message:
PR/54768: elo: Missing cksum(1) convenience links (and docs) for new sha2
functions.
To generate a diff of this commit:
cvs rdiff -u -r1.1221 -r1.1222 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1664 -r1.1665 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/cksum/Makefile
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/cksum/cksum.1
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/mi
diff -u src/distrib/sets/lists/base/mi:1.1221 src/distrib/sets/lists/base/mi:1.1222
--- src/distrib/sets/lists/base/mi:1.1221 Wed Nov 20 04:37:44 2019
+++ src/distrib/sets/lists/base/mi Sat Dec 14 22:55:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1221 2019/11/20 09:37:44 hikaru Exp $
+# $NetBSD: mi,v 1.1222 2019/12/15 03:55:56 christos Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -957,6 +957,9 @@
./usr/bin/setextattrbase-util-bin
./usr/bin/sftp base-secsh-bin
./usr/bin/sha1 base-util-bin
+./usr/bin/sha256base-util-bin
+./usr/bin/sha384base-util-bin
+./usr/bin/sha512base-util-bin
./usr/bin/shar base-util-bin
./usr/bin/shlockbase-util-bin
./usr/bin/shmif_dumpbusbase-util-bin rump
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1664 src/distrib/sets/lists/man/mi:1.1665
--- src/distrib/sets/lists/man/mi:1.1664 Tue Dec 10 07:08:52 2019
+++ src/distrib/sets/lists/man/mi Sat Dec 14 22:55:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1664 2019/12/10 12:08:52 yamaguchi Exp $
+# $NetBSD: mi,v 1.1665 2019/12/15 03:55:56 christos Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -518,6 +518,9 @@
./usr/share/man/cat1/sftp.0 man-secsh-catman .cat
./usr/share/man/cat1/sh.0 man-util-catman .cat
./usr/share/man/cat1/sha1.0 man-util-catman .cat
+./usr/share/man/cat1/sha256.0 man-util-catman .cat
+./usr/share/man/cat1/sha384.0 man-util-catman .cat
+./usr/share/man/cat1/sha512.0 man-util-catman .cat
./usr/share/man/cat1/shar.0 man-util-catman .cat
./usr/share/man/cat1/shlock.0 man-util-catman .cat
./usr/share/man/cat1/shmif_dumpbus.0 man-util-catman rump,.cat
@@ -3759,6 +3762,9 @@
./usr/share/man/html1/sftp.html man-secsh-htmlman html
./usr/share/man/html1/sh.html man-util-htmlman html
./usr/share/man/html1/sha1.html man-util-htmlman html
+./usr/share/man/html1/sha256.html man-util-htmlman html
+./usr/share/man/html1/sha384.html man-util-htmlman html
+./usr/share/man/html1/sha512.html man-util-htmlman html
./usr/share/man/html1/shar.html man-util-htmlman html
./usr/share/man/html1/shlock.html man-util-htmlman html
./usr/share/man/html1/shmif_dumpbus.html man-util-htmlman rump,html
@@ -6652,6 +6658,9 @@
./usr/share/man/man1/sftp.1 man-secsh-man .man
./usr/share/man/man1/sh.1 man-util-man .man
./usr/share/man/man1/sha1.1 man-util-man .man
+./usr/share/man/man1/sha256.1 man-util-man .man
+./usr/share/man/man1/sha384.1 man-util-man .man
+./usr/share/man/man1/sha512.1 man-util-man .man
./usr/share/man/man1/shar.1 man-util-man .man
./usr/share/man/man1/shlock.1 man-util-man .man
./usr/share/man/man1/shmif_dumpbus.1 man-util-man rump,.man
Index: src/usr.bin/cksum/Makefile
diff -u src/usr.bin/cksum/Makefile:1.16 src/usr.bin/cksum/Makefile:1.17
--- src/usr.bin/cksum/Makefile:1.16 Tue Apr 14 18:15:18 2009
+++ src/usr.bin/cksum/Makefile Sat Dec 14 22:55:56 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2009/04/14 22:15:18 lukem Exp $
+# $NetBSD: Makefile,v 1.17 2019/12/15 03:55:56 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 4/28/95
PROG= cksum
@@ -9,12 +9,18 @@ LINKS+= ${BINDIR}/cksum ${BINDIR}/md2
LINKS+= ${BINDIR}/cksum ${BINDIR}/md4
LINKS+= ${BINDIR}/cksum ${BINDIR}/md5
LINKS+= ${BINDIR}/cksum ${BINDIR}/sha1
+LINKS+= ${BINDIR}/cksum ${BINDIR}/sha256
+LINKS+= ${BINDIR}/cksum ${BINDIR}/sha384
+LINKS+= ${BINDIR}/cksum ${BINDIR}/sha512
LINKS+= ${BINDIR}/cksum ${BINDIR}/rmd160
MLINKS= cksum.1 sum.1
MLINKS+=cksum.1 md2.1
MLINKS+=cksum.1 md4.1
MLINKS+=cksum.1 md5.1
MLINKS+=cksum.1 sha1.1
+MLINKS+=cksum.1 sha256.1
+MLINKS+=cksum.1 sha384.1
+MLINKS+=cksum.1 sha512.1
MLINKS+=cksum.1 rmd160.1
.include
Index: src/usr.bin/cksum/cksum.1
diff -u src/usr.bin/cksum/cksum.1:1.48 src/usr.bin/cksum/cksum.1:1.49
--- src/usr.bin/cksum/cksum.1:1.48 Mon Jul 3 17:34:18 2017
+++ src/usr.bin/cksum/cksum.1 Sat Dec 14 22:55:56 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: cksum.1,v 1.48 2017/07/03 21:34:18 wiz Exp $
+.\" $NetBSD: cksum.1,v 1.49 2019/12/15 03:55:56 christos Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: christos
Date: Sun Dec 15 03:38:17 UTC 2019
Modified Files:
src/sys/arch/i386/stand/lib: vbe.c
Log Message:
PR/54767: elo: fix incorrect test (mlelstv)
Add symbolic constants and reference to the standard.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/i386/stand/lib/vbe.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/i386/stand/lib/vbe.c
diff -u src/sys/arch/i386/stand/lib/vbe.c:1.9 src/sys/arch/i386/stand/lib/vbe.c:1.10
--- src/sys/arch/i386/stand/lib/vbe.c:1.9 Tue Jan 24 06:09:14 2017
+++ src/sys/arch/i386/stand/lib/vbe.c Sat Dec 14 22:38:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vbe.c,v 1.9 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: vbe.c,v 1.10 2019/12/15 03:38:17 christos Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill
@@ -45,19 +45,57 @@ static struct _vbestate {
int modenum;
} vbestate;
+/*
+ * https://pdos.csail.mit.edu/6.828/2018/readings/hardware/vbe3.pdf
+ * p32
+ */
+#define VBE_MODEATTR_MODE_HARDWARE_SUPPORTED 0x0001u
+#define VBE_MODEATTR_RESERVED_10x0002u
+#define VBE_MODEATTR_TTY_OUTPUT_FUNCTIONS_SUPPORTED 0x0004u
+#define VBE_MODEATTR_COLOR_MODE0x0008u
+#define VBE_MODEATTR_GRAPHICS_MODE 0x0010u
+#define VBE_MODEATTR_VGA_COMPATIBLE_MODE 0x0020u
+#define VBE_MODEATTR_VGA_COMPATIBLE_WINDOWD_MEMORY_MODE 0x0040u
+#define VBE_MODEATTR_LINEAR_FRAME_BUFFER_MODE 0x0080u
+#define VBE_MODEATTR_DOUBLE_SCAN_MODE 0x0100u
+#define VBE_MODEATTR_INTERLACED_MODE 0x0200u
+#define VBE_MODEATTR_HARDWARE_TRIPPLE_BUFFERING_SUPPORT 0x0400u
+#define VBE_MODEATTR_HARDWARE_STEREOSCOPIC_SUPPORT 0x0800u
+#define VBE_MODEATTR_DUAL_DISPLAY_START_ADDRESS_SUPPORT 0x1000u
+#define VBE_MODEATTR_RESERVED_20x2000u
+#define VBE_MODEATTR_RESERVED_30x4000u
+#define VBE_MODEATTR_RESERVED_40x8000u
+
+/*
+ * p36
+ */
+#define VBE_MEMMODEL_TEXT 0x00u
+#define VBE_MEMMODEL_CGA 0x01u
+#define VBE_MEMMODEL_HERCULES 0x02u
+#define VBE_MEMMODEL_PLANAR 0x03u
+#define VBE_MEMMODEL_PACKED_PIXEL 0x04u
+#define VBE_MEMMODEL_NON_CHAIN_4_256 0x05u
+#define VBE_MEMMODEL_DIRECT_COLOR 0x06u
+#define VBE_MEMMODEL_YUV 0x07u
+/* VESA Reserved 0x08u-0x0fu */
+/* OEM Reserved0x10u-0xffU */
+
+
static int
vbe_mode_is_supported(struct modeinfoblock *mi)
{
- if ((mi->ModeAttributes & 0x01) == 0)
+ if ((mi->ModeAttributes & VBE_MODEATTR_MODE_HARDWARE_SUPPORTED) == 0)
return 0; /* mode not supported by hardware */
- if ((mi->ModeAttributes & 0x08) == 0)
- return 0; /* linear fb not available */
- if ((mi->ModeAttributes & 0x10) == 0)
+ if ((mi->ModeAttributes & VBE_MODEATTR_COLOR_MODE) == 0)
+ return 0; /* only color modes are supported */
+ if ((mi->ModeAttributes & VBE_MODEATTR_GRAPHICS_MODE) == 0)
return 0; /* text mode */
+ if ((mi->ModeAttributes & VBE_MODEATTR_LINEAR_FRAME_BUFFER_MODE) == 0)
+ return 0; /* linear fb not available */
if (mi->NumberOfPlanes != 1)
return 0; /* planar mode not supported */
- if (mi->MemoryModel != 0x04 /* Packed pixel */ &&
- mi->MemoryModel != 0x06 /* Direct Color */)
+ if (mi->MemoryModel != VBE_MEMMODEL_PACKED_PIXEL /* Packed pixel */ &&
+ mi->MemoryModel != VBE_MEMMODEL_DIRECT_COLOR /* Direct Color */)
return 0; /* unsupported pixel format */
return 1;
}
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: manu Date: Sun Dec 15 02:58:22 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: locore.S Log Message: Fix typo that caused two instructions to be commented out Oddly, that did not break booting. To generate a diff of this commit: cvs rdiff -u -r1.194 -r1.195 src/sys/arch/amd64/amd64/locore.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/amd64/amd64/locore.S diff -u src/sys/arch/amd64/amd64/locore.S:1.194 src/sys/arch/amd64/amd64/locore.S:1.195 --- src/sys/arch/amd64/amd64/locore.S:1.194 Sun Dec 15 02:56:40 2019 +++ src/sys/arch/amd64/amd64/locore.S Sun Dec 15 02:58:21 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.194 2019/12/15 02:56:40 manu Exp $ */ +/* $NetBSD: locore.S,v 1.195 2019/12/15 02:58:21 manu Exp $ */ /* * Copyright-o-rama! @@ -544,7 +544,7 @@ next: pop %r8 mov $(KERNTEXTOFF - KERNBASE), %rdi /* dest */ mov %r8, %rsi sub $(start - kernel_text), %rsi /* src */ - mov $(__kernel_end - kernel_text), %rcx /* size *. + mov $(__kernel_end - kernel_text), %rcx /* size */ mov %rcx, %r12 movq %rdi, %r11 /* for misaligned check */
CVS commit: src/sys/arch/amd64
Module Name:src
Committed By: manu
Date: Sun Dec 15 02:56:40 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/amd64/conf: kern.ldscript
Log Message:
Restore multiboot 2 header in amd64 kernel
The header must appear below 32k offset in the kernel file, but we
have to make sure it does not load at low addresses, otherwise we
break BIOS boot.
.text section used to load at 0x20, we just load multiboot section
there, and have .text loaded just after.
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amd64/conf/kern.ldscript
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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.193 src/sys/arch/amd64/amd64/locore.S:1.194
--- src/sys/arch/amd64/amd64/locore.S:1.193 Tue Dec 10 02:06:07 2019
+++ src/sys/arch/amd64/amd64/locore.S Sun Dec 15 02:56:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.193 2019/12/10 02:06:07 manu Exp $ */
+/* $NetBSD: locore.S,v 1.194 2019/12/15 02:56:40 manu Exp $ */
/*
* Copyright-o-rama!
@@ -432,7 +432,7 @@ END(farjmp64)
.space 512
tmpstk:
-.section multiboot,"ax",@progbits
+.section multiboot,"a"
#if defined(MULTIBOOT)
.align 8
.globl Multiboot2_Header
Index: src/sys/arch/amd64/conf/kern.ldscript
diff -u src/sys/arch/amd64/conf/kern.ldscript:1.29 src/sys/arch/amd64/conf/kern.ldscript:1.30
--- src/sys/arch/amd64/conf/kern.ldscript:1.29 Wed Dec 11 02:31:44 2019
+++ src/sys/arch/amd64/conf/kern.ldscript Sun Dec 15 02:56:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern.ldscript,v 1.29 2019/12/11 02:31:44 manu Exp $ */
+/* $NetBSD: kern.ldscript,v 1.30 2019/12/15 02:56:40 manu Exp $ */
#include "assym.h"
@@ -13,7 +13,17 @@ __LARGE_PAGE_SIZE = 0x20 ;
ENTRY(_start)
SECTIONS
{
- .text : AT (ADDR(.text) & 0x0fff)
+ /*
+ * multiboot (file_offset) : AT (load_address)
+ * file_offset must be below 32k for multiboot 2 specification
+ * BIOS boot requires load_address above 0x20
+ */
+ multiboot 0x1000 : AT (0x20)
+ {
+ . = ALIGN(8);
+ KEEP(*(multiboot));
+ }
+ .text : AT (0x20 + SIZEOF(multiboot))
{
. = ALIGN(__PAGE_SIZE);
__text_user_start = . ;
CVS commit: src/sys/arch/arm/sunxi
Module Name:src Committed By: riastradh Date: Sun Dec 15 01:16:33 UTC 2019 Modified Files: src/sys/arch/arm/sunxi: sun8i_crypto.c Log Message: Fix typo -- acknowledge interrupts _and_ errors. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/sunxi/sun8i_crypto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/sunxi/sun8i_crypto.c diff -u src/sys/arch/arm/sunxi/sun8i_crypto.c:1.7 src/sys/arch/arm/sunxi/sun8i_crypto.c:1.8 --- src/sys/arch/arm/sunxi/sun8i_crypto.c:1.7 Tue Dec 10 22:30:34 2019 +++ src/sys/arch/arm/sunxi/sun8i_crypto.c Sun Dec 15 01:16:33 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i_crypto.c,v 1.7 2019/12/10 22:30:34 riastradh Exp $ */ +/* $NetBSD: sun8i_crypto.c,v 1.8 2019/12/15 01:16:33 riastradh Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.7 2019/12/10 22:30:34 riastradh Exp $"); +__KERNEL_RCSID(1, "$NetBSD: sun8i_crypto.c,v 1.8 2019/12/15 01:16:33 riastradh Exp $"); #include #include @@ -671,7 +671,7 @@ sun8i_crypto_intr(void *cookie) isr = sun8i_crypto_read(sc, SUN8I_CRYPTO_ISR); esr = sun8i_crypto_read(sc, SUN8I_CRYPTO_ESR); sun8i_crypto_write(sc, SUN8I_CRYPTO_ISR, isr); - sun8i_crypto_write(sc, SUN8I_CRYPTO_ISR, esr); + sun8i_crypto_write(sc, SUN8I_CRYPTO_ESR, esr); /* Start the worker if necessary. */ sun8i_crypto_schedule_worker(sc);
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: mrg
Date: Sun Dec 15 01:00:59 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk_drm.c
src/sys/arch/arm/sunxi: sunxi_drm.c
src/sys/arch/arm/ti: ti_lcdc.c
Log Message:
ensure to call drm_mode_config_cleanup() when erroring.
tripped up 'active lock in free' checks, and perhaps
lead to other lock corruption. (crash with un-init lock
in arpresolve that does not make sense now seems to not
occur either.)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk_drm.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/sunxi/sunxi_drm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_lcdc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_drm.c
diff -u src/sys/arch/arm/rockchip/rk_drm.c:1.2 src/sys/arch/arm/rockchip/rk_drm.c:1.3
--- src/sys/arch/arm/rockchip/rk_drm.c:1.2 Thu Nov 14 20:39:46 2019
+++ src/sys/arch/arm/rockchip/rk_drm.c Sun Dec 15 01:00:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_drm.c,v 1.2 2019/11/14 20:39:46 jmcneill Exp $ */
+/* $NetBSD: rk_drm.c,v 1.3 2019/12/15 01:00:58 mrg Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.2 2019/11/14 20:39:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_drm.c,v 1.3 2019/12/15 01:00:58 mrg Exp $");
#include
#include
@@ -401,7 +401,8 @@ rk_drm_load(struct drm_device *ddev, uns
if (num_crtc == 0) {
aprint_error_dev(sc->sc_dev, "no display interface ports configured\n");
- return ENXIO;
+ error = ENXIO;
+ goto drmerr;
}
fbdev = kmem_zalloc(sizeof(*fbdev), KM_SLEEP);
@@ -410,7 +411,7 @@ rk_drm_load(struct drm_device *ddev, uns
error = drm_fb_helper_init(ddev, >helper, num_crtc, num_crtc);
if (error)
- goto drmerr;
+ goto allocerr;
fbdev->helper.fb = kmem_zalloc(sizeof(struct rk_drm_framebuffer), KM_SLEEP);
@@ -426,9 +427,10 @@ rk_drm_load(struct drm_device *ddev, uns
return 0;
+allocerr:
+ kmem_free(fbdev, sizeof(*fbdev));
drmerr:
drm_mode_config_cleanup(ddev);
- kmem_free(fbdev, sizeof(*fbdev));
return error;
}
Index: src/sys/arch/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.9 src/sys/arch/arm/sunxi/sunxi_drm.c:1.10
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.9 Sun Nov 24 12:21:14 2019
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Sun Dec 15 01:00:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.9 2019/11/24 12:21:14 jmcneill Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.10 2019/12/15 01:00:58 mrg Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.9 2019/11/24 12:21:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.10 2019/12/15 01:00:58 mrg Exp $");
#include
#include
@@ -440,7 +440,8 @@ sunxi_drm_load(struct drm_device *ddev,
if (num_crtc == 0) {
aprint_error_dev(sc->sc_dev, "no pipelines configured\n");
- return ENXIO;
+ error = ENXIO;
+ goto drmerr;
}
fbdev = kmem_zalloc(sizeof(*fbdev), KM_SLEEP);
@@ -449,7 +450,7 @@ sunxi_drm_load(struct drm_device *ddev,
error = drm_fb_helper_init(ddev, >helper, num_crtc, num_crtc);
if (error)
- goto drmerr;
+ goto allocerr;
fbdev->helper.fb = kmem_zalloc(sizeof(struct sunxi_drm_framebuffer), KM_SLEEP);
@@ -465,9 +466,10 @@ sunxi_drm_load(struct drm_device *ddev,
return 0;
+allocerr:
+ kmem_free(fbdev, sizeof(*fbdev));
drmerr:
drm_mode_config_cleanup(ddev);
- kmem_free(fbdev, sizeof(*fbdev));
return error;
}
Index: src/sys/arch/arm/ti/ti_lcdc.c
diff -u src/sys/arch/arm/ti/ti_lcdc.c:1.3 src/sys/arch/arm/ti/ti_lcdc.c:1.4
--- src/sys/arch/arm/ti/ti_lcdc.c:1.3 Mon Nov 4 09:38:38 2019
+++ src/sys/arch/arm/ti/ti_lcdc.c Sun Dec 15 01:00:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_lcdc.c,v 1.3 2019/11/04 09:38:38 jmcneill Exp $ */
+/* $NetBSD: ti_lcdc.c,v 1.4 2019/12/15 01:00:58 mrg Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ti_lcdc.c,v 1.3 2019/11/04 09:38:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_lcdc.c,v 1.4 2019/12/15 01:00:58 mrg Exp $");
#include
#include
@@ -622,12 +622,14 @@ tilcdc_load(struct drm_device *ddev, uns
ep = fdt_endpoint_get_from_index(>sc_ports, TILCDC_PORT_OUTPUT, 0);
if (ep == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't find endpoint\n");
- return ENXIO;
+ error = ENXIO;
+ goto drmerr;
}
error = fdt_endpoint_activate_direct(ep, true);
if (error != 0) {
aprint_error_dev(sc->sc_dev, "couldn't activate endpoint: %d\n", error);
- return error;
+ error = ENXIO;
+ goto drmerr;
}
fbdev = kmem_zalloc(sizeof(*fbdev), KM_SLEEP);
@@ -636,7 +638,7 @@ tilcdc_load(struct drm_device *ddev, uns
error = drm_fb_helper_init(ddev, >helper, 1, 1);
if (error)
- goto drmerr;
+ goto
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: mrg
Date: Sun Dec 15 00:49:01 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk_vop.c
Log Message:
rework slightly to avoid stupid gcc warnings.
ok jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk_vop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_vop.c
diff -u src/sys/arch/arm/rockchip/rk_vop.c:1.2 src/sys/arch/arm/rockchip/rk_vop.c:1.3
--- src/sys/arch/arm/rockchip/rk_vop.c:1.2 Thu Nov 14 20:31:50 2019
+++ src/sys/arch/arm/rockchip/rk_vop.c Sun Dec 15 00:49:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.2 2019/11/14 20:31:50 jmcneill Exp $ */
+/* $NetBSD: rk_vop.c,v 1.3 2019/12/15 00:49:00 mrg Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.2 2019/11/14 20:31:50 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.3 2019/12/15 00:49:00 mrg Exp $");
#include
#include
@@ -542,11 +542,6 @@ rk_vop_ep_activate(device_t dev, struct
}
const u_int ep_index = fdt_endpoint_index(ep);
- if (ep_index >= VOP_NEP) {
- DRM_ERROR("endpoint index %d out of range\n", ep_index);
- return ENXIO;
- }
-
switch (ep_index) {
case VOP_EP_MIPI:
case VOP_EP_MIPI1:
@@ -557,6 +552,9 @@ rk_vop_ep_activate(device_t dev, struct
case VOP_EP_DP:
encoder_type = DRM_MODE_ENCODER_TMDS;
break;
+ default:
+ DRM_ERROR("endpoint index %d out of range\n", ep_index);
+ return ENXIO;
}
sc->sc_encoder[ep_index].sc = sc;
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Sat Dec 14 21:36:00 UTC 2019
Modified Files:
src/sys/uvm: uvm_pager.c uvm_pdaemon.c
Log Message:
The uvmexp.pdpending change was incorrect - revert for now.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.114 -r1.115 src/sys/uvm/uvm_pdaemon.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/uvm/uvm_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.115 src/sys/uvm/uvm_pager.c:1.116
--- src/sys/uvm/uvm_pager.c:1.115 Sat Dec 14 15:04:47 2019
+++ src/sys/uvm/uvm_pager.c Sat Dec 14 21:36:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.115 2019/12/14 15:04:47 ad Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.116 2019/12/14 21:36:00 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.115 2019/12/14 15:04:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.116 2019/12/14 21:36:00 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -473,6 +473,7 @@ uvm_aio_aiodone_pages(struct vm_page **p
else
uvm_swap_free(swslot, npages);
}
+ atomic_dec_uint();
#endif /* defined(VMSWAP) */
}
}
Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.114 src/sys/uvm/uvm_pdaemon.c:1.115
--- src/sys/uvm/uvm_pdaemon.c:1.114 Sat Dec 14 15:04:47 2019
+++ src/sys/uvm/uvm_pdaemon.c Sat Dec 14 21:36:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.114 2019/12/14 15:04:47 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.115 2019/12/14 21:36:00 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.114 2019/12/14 15:04:47 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.115 2019/12/14 21:36:00 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -368,7 +368,6 @@ void
uvm_pageout_start(int npages)
{
- atomic_inc_uint();
atomic_add_int(, npages);
}
@@ -377,7 +376,6 @@ uvm_pageout_done(int npages)
{
KASSERT(uvmexp.paging >= npages);
- atomic_dec_uint();
atomic_add_int(, -npages);
/*
@@ -901,12 +899,14 @@ uvmpd_scan_queue(void)
}
mutex_exit(slock);
+ swapcluster_flush(, false);
+
/*
- * set the pageout in progress. bump counters and set up
+ * the pageout is in progress. bump counters and set up
* for the next loop.
*/
- swapcluster_flush(, false);
+ atomic_inc_uint();
#else /* defined(VMSWAP) */
uvm_pageactivate(p);
CVS commit: src/sbin/fdisk
Module Name:src Committed By: christos Date: Sat Dec 14 20:46:13 UTC 2019 Modified Files: src/sbin/fdisk: fdisk.8 Log Message: PR/54756: germain: Avoid confusion caused by overuse of the word "file" both as a noun and an argument name. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/sbin/fdisk/fdisk.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fdisk/fdisk.8 diff -u src/sbin/fdisk/fdisk.8:1.88 src/sbin/fdisk/fdisk.8:1.89 --- src/sbin/fdisk/fdisk.8:1.88 Tue Apr 9 05:03:41 2019 +++ src/sbin/fdisk/fdisk.8 Sat Dec 14 15:46:13 2019 @@ -1,6 +1,6 @@ -.\" $NetBSD: fdisk.8,v 1.88 2019/04/09 09:03:41 tnn Exp $ +.\" $NetBSD: fdisk.8,v 1.89 2019/12/14 20:46:13 christos Exp $ .\" -.Dd April 9, 2019 +.Dd December 14, 2019 .Dt FDISK 8 .Os .Sh NAME @@ -13,7 +13,7 @@ .Fl 0 | 1 | 2 | 3 | E Ar number .Op Fl s Oo Ar id Oc Ns Oo / Ns Oo Ar start Oc Ns Oo / Ns Oo Ar size Oc Ns Oo / Ns Oo Ar bootmenu Oc Oc Oc Oc .Oc -.Op Fl r Ar file | Fl w Ar file +.Op Fl r Ar bootfile | Fl w Ar bootfile .Op Fl A Ar ptn_alignment Ns Bq Ar /ptn_0_offset .Op Fl b Ar cylinders/heads/sectors .Op Fl c Ar bootcode @@ -282,9 +282,9 @@ The partition table is left alone by thi Lists known .Em sysid values and exit. -.It Fl r Ar file +.It Fl r Ar bootfile Read the boot record from file -.Ar file +.Ar bootfile instead of the specified disk. The geometry information used is still that of the disk volume. Any changes are written back to the file. @@ -386,9 +386,9 @@ Using with .Fl u allows the user to change more parameters than normally permitted. -.It Fl w Ar file +.It Fl w Ar bootfile Write the modified partition table to file -.Ar file +.Ar bootfile instead of the disk. .It Fl z Ar sectorsize Specify a sector size other than 512, for devices that only @@ -585,9 +585,9 @@ lose all the data in that partition. You should run this program interactively once or twice to see how it works. This is completely safe as long as you answer the last question in the negative. You can also specify -.Fl w Ar file +.Fl w Ar bootfile to write the output to a file and later specify -.Fl r Ar file +.Fl r Ar bootfile to read back the updated information. This can be done without having write access to the disk volume. .Sh FILES
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sat Dec 14 20:41:58 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disklabel.c
Log Message:
Pass proper track size when initializing the default alignment - this is
important with sunlabels.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 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.24 src/usr.sbin/sysinst/disklabel.c:1.25
--- src/usr.sbin/sysinst/disklabel.c:1.24 Sat Dec 14 19:26:17 2019
+++ src/usr.sbin/sysinst/disklabel.c Sat Dec 14 20:41:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.24 2019/12/14 19:26:17 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.25 2019/12/14 20:41:58 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -226,7 +226,7 @@ disklabel_parts_read(const char *disk, d
parts->dp.disk = strdup(disk);
parts->dp.disk_start = start;
parts->dp.disk_size = parts->dp.free_space = len;
- disklabel_init_default_alignment(parts, 0);
+ disklabel_init_default_alignment(parts, parts->l.d_secpercyl);
for (int part = 0; part < parts->l.d_npartitions; part++) {
if (parts->l.d_partitions[part].p_fstype == FS_UNUSED
CVS commit: src/usr.bin/mail
Module Name:src
Committed By: christos
Date: Sat Dec 14 20:28:03 UTC 2019
Modified Files:
src/usr.bin/mail: complete.c
Log Message:
PR/54764: elo: Incorrect '+file' filename completion in mail(1)
Add propel completion stem so that file completion works.
pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/mail/complete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/complete.c
diff -u src/usr.bin/mail/complete.c:1.20 src/usr.bin/mail/complete.c:1.21
--- src/usr.bin/mail/complete.c:1.20 Tue Jan 12 09:44:24 2010
+++ src/usr.bin/mail/complete.c Sat Dec 14 15:28:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: complete.c,v 1.20 2010/01/12 14:44:24 christos Exp $ */
+/* $NetBSD: complete.c,v 1.21 2019/12/14 20:28:02 christos Exp $ */
/*-
* Copyright (c) 1997-2000,2005,2006 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: complete.c,v 1.20 2010/01/12 14:44:24 christos Exp $");
+__RCSID("$NetBSD: complete.c,v 1.21 2019/12/14 20:28:02 christos Exp $");
#endif /* not lint */
/*
@@ -332,16 +332,27 @@ complete_filename(EditLine *el, char *wo
{
StringList *words;
char dir[MAXPATHLEN];
- char *fname;
+ char *fname, *mf;
DIR *dd;
struct dirent *dp;
unsigned char rv;
size_t len;
if ((fname = strrchr(word, '/')) == NULL) {
- dir[0] = '.';
- dir[1] = '\0';
- fname = word;
+ if (word[0] == '+' && (mf = value(ENAME_FOLDER)) != NULL) {
+ if (mf[0] == '/') {
+(void)estrlcpy(dir, mf, sizeof(dir));
+ } else {
+dir[0] = '~';
+dir[1] = '/';
+(void)estrlcpy(dir + 2, mf, sizeof(dir) - 2);
+ }
+ fname = word + 1;
+ } else {
+ dir[0] = '.';
+ dir[1] = '\0';
+ fname = word;
+ }
} else {
if (fname == word) {
dir[0] = '/';
CVS commit: src/usr.bin/mail
Module Name:src Committed By: christos Date: Sat Dec 14 20:23:38 UTC 2019 Modified Files: src/usr.bin/mail: mail.1 Log Message: PR/54765: elo: Minor error in the mail(1) man page (-F description truncated) pullup-9 To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/usr.bin/mail/mail.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/mail/mail.1 diff -u src/usr.bin/mail/mail.1:1.67 src/usr.bin/mail/mail.1:1.68 --- src/usr.bin/mail/mail.1:1.67 Sun Sep 1 15:10:39 2019 +++ src/usr.bin/mail/mail.1 Sat Dec 14 15:23:38 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mail.1,v 1.67 2019/09/01 19:10:39 wiz Exp $ +.\" $NetBSD: mail.1,v 1.68 2019/12/14 20:23:38 christos Exp $ .\" .\" Copyright (c) 1980, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)mail.1 8.8 (Berkeley) 4/28/95 .\" -.Dd September 1, 2019 +.Dd December 14, 2019 .Dt MAIL 1 .Os .Sh NAME @@ -1328,7 +1328,7 @@ Message headers currently being ignored or .Ic retain command) are not included. -.It Ic \&~ +.It Ic \&~F Ns Ar messages Identical to .Ic \&~f , except all message headers are included.
CVS commit: src/usr.bin/mail
Module Name:src
Committed By: christos
Date: Sat Dec 14 20:21:43 UTC 2019
Modified Files:
src/usr.bin/mail: mime_child.c
Log Message:
PR/54766: elo: Broken mime-hooks handling in mail(1)
pullup-9.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/mail/mime_child.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/mail/mime_child.c
diff -u src/usr.bin/mail/mime_child.c:1.9 src/usr.bin/mail/mime_child.c:1.10
--- src/usr.bin/mail/mime_child.c:1.9 Thu Nov 9 15:27:50 2017
+++ src/usr.bin/mail/mime_child.c Sat Dec 14 15:21:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mime_child.c,v 1.9 2017/11/09 20:27:50 christos Exp $ */
+/* $NetBSD: mime_child.c,v 1.10 2019/12/14 20:21:43 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#ifndef __lint__
-__RCSID("$NetBSD: mime_child.c,v 1.9 2017/11/09 20:27:50 christos Exp $");
+__RCSID("$NetBSD: mime_child.c,v 1.10 2019/12/14 20:21:43 christos Exp $");
#endif /* not __lint__ */
#include
@@ -159,7 +159,7 @@ mime_run_command(const char *cmd, FILE *
default: /* parent */
(void)close(p[READ]);
- nfo = fdopen(p[WRITE], "wef");
+ nfo = fdopen(p[WRITE], "we");
if (nfo == NULL) {
warn("mime_run_command: fdopen");
(void)close(p[WRITE]);
@@ -203,7 +203,7 @@ mime_run_function(void (*fn)(FILE *, FIL
default: /* parent */
(void)close(p[READ]);
- nfo = fdopen(p[WRITE], "wef");
+ nfo = fdopen(p[WRITE], "we");
if (nfo == NULL) {
warn("run_function: fdopen");
(void)close(p[WRITE]);
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sat Dec 14 19:26:17 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disklabel.c
Log Message:
If a fictious label has no RAW_PART assume there is no valid disk label.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 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.23 src/usr.sbin/sysinst/disklabel.c:1.24
--- src/usr.sbin/sysinst/disklabel.c:1.23 Fri Dec 13 22:12:41 2019
+++ src/usr.sbin/sysinst/disklabel.c Sat Dec 14 19:26:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.23 2019/12/13 22:12:41 martin Exp $ */
+/* $NetBSD: disklabel.c,v 1.24 2019/12/14 19:26:17 martin Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -270,6 +270,10 @@ disklabel_parts_read(const char *disk, d
if (!have_raw_label && !only_dl) {
bool found_real_part = false;
+ if (parts->l.d_npartitions <= RAW_PART ||
+ parts->l.d_partitions[RAW_PART].p_size == 0)
+ goto no_valid_label;
+
/*
* Check if kernel translation gave us "something" besides
* the raw or the whole-disk partition.
@@ -291,6 +295,7 @@ disklabel_parts_read(const char *disk, d
}
if (!found_real_part) {
/* no partion there yet */
+no_valid_label:
free(parts);
return NULL;
}
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Sat Dec 14 17:31:53 UTC 2019
Modified Files:
src/sys/uvm: uvm_page.h
Log Message:
Merge from yamt-pagecache: use radixtree for page lookup.
rbtree page lookup was introduced during the NetBSD 5.0 development cycle to
bypass lock contention problems with the (then) global page hash, and was a
temporary solution to allow us to make progress.radixtree is the intended
replacement.
Ok yamt@.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/uvm/uvm_page.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/uvm/uvm_page.h
diff -u src/sys/uvm/uvm_page.h:1.85 src/sys/uvm/uvm_page.h:1.86
--- src/sys/uvm/uvm_page.h:1.85 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_page.h Sat Dec 14 17:31:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page.h,v 1.85 2019/12/13 20:10:22 ad Exp $ */
+/* $NetBSD: uvm_page.h,v 1.86 2019/12/14 17:31:53 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -67,8 +67,6 @@
#include
#include
-#include
-
/*
* Management of resident (logical) pages.
*
@@ -151,8 +149,6 @@
*/
struct vm_page {
- struct rb_node rb_node; /* o: tree of pages in obj */
-
union {
TAILQ_ENTRY(vm_page) queue; /* w: wired page queue
* or uvm_pglistalloc output */
CVS commit: src/sys
Module Name:src
Committed By: ad
Date: Sat Dec 14 17:28:59 UTC 2019
Modified Files:
src/sys/rump/librump/rumpkern: vm.c
src/sys/uvm: uvm_km.c uvm_object.c uvm_object.h uvm_page.c
Log Message:
Merge from yamt-pagecache: use radixtree for page lookup.
rbtree page lookup was introduced during the NetBSD 5.0 development cycle to
bypass lock contention problems with the (then) global page hash, and was a
temporary solution to allow us to make progress. radixtree is the intended
replacement.
Ok yamt@.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/rump/librump/rumpkern/vm.c
cvs rdiff -u -r1.151 -r1.152 src/sys/uvm/uvm_km.c
cvs rdiff -u -r1.16 -r1.17 src/sys/uvm/uvm_object.c
cvs rdiff -u -r1.33 -r1.34 src/sys/uvm/uvm_object.h
cvs rdiff -u -r1.201 -r1.202 src/sys/uvm/uvm_page.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/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.174 src/sys/rump/librump/rumpkern/vm.c:1.175
--- src/sys/rump/librump/rumpkern/vm.c:1.174 Fri Dec 13 20:10:21 2019
+++ src/sys/rump/librump/rumpkern/vm.c Sat Dec 14 17:28:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.174 2019/12/13 20:10:21 ad Exp $ */
+/* $NetBSD: vm.c,v 1.175 2019/12/14 17:28:58 ad Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.174 2019/12/13 20:10:21 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.175 2019/12/14 17:28:58 ad Exp $");
#include
#include
@@ -52,6 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.174
#include
#include
#include
+#include
#include
@@ -125,34 +126,6 @@ static unsigned long dddlim; /* 90% of
static struct pglist vmpage_lruqueue;
static unsigned vmpage_onqueue;
-static int
-pg_compare_key(void *ctx, const void *n, const void *key)
-{
- voff_t a = ((const struct vm_page *)n)->offset;
- voff_t b = *(const voff_t *)key;
-
- if (a < b)
- return -1;
- else if (a > b)
- return 1;
- else
- return 0;
-}
-
-static int
-pg_compare_nodes(void *ctx, const void *n1, const void *n2)
-{
-
- return pg_compare_key(ctx, n1, &((const struct vm_page *)n2)->offset);
-}
-
-const rb_tree_ops_t uvm_page_tree_ops = {
- .rbto_compare_nodes = pg_compare_nodes,
- .rbto_compare_key = pg_compare_key,
- .rbto_node_offset = offsetof(struct vm_page, rb_node),
- .rbto_context = NULL
-};
-
/*
* vm pages
*/
@@ -204,7 +177,11 @@ uvm_pagealloc_strat(struct uvm_object *u
}
TAILQ_INSERT_TAIL(>memq, pg, listq.queue);
- (void)rb_tree_insert_node(>rb_tree, pg);
+ if (radix_tree_insert_node(>uo_pages, off >> PAGE_SHIFT,
+ pg) != 0) {
+ pool_cache_put(, pg);
+ return NULL;
+ }
/*
* Don't put anons on the LRU page queue. We can't flush them
@@ -232,6 +209,7 @@ void
uvm_pagefree(struct vm_page *pg)
{
struct uvm_object *uobj = pg->uobject;
+ struct vm_page *pg2 __unused;
KASSERT(mutex_owned(uobj->vmobjlock));
@@ -241,7 +219,8 @@ uvm_pagefree(struct vm_page *pg)
TAILQ_REMOVE(>memq, pg, listq.queue);
uobj->uo_npages--;
- rb_tree_remove_node(>rb_tree, pg);
+ pg2 = radix_tree_remove_node(>uo_pages, pg->offset >> PAGE_SHIFT);
+ KASSERT(pg == pg2);
if (!UVM_OBJ_IS_AOBJ(uobj)) {
mutex_enter(_lruqueue_lock);
@@ -396,6 +375,8 @@ uvm_init(void)
pool_cache_bootstrap(, sizeof(struct vm_page), 0, 0, 0,
"page$", NULL, IPL_NONE, pgctor, pgdtor, NULL);
+ radix_tree_init();
+
/* create vmspace used by local clients */
rump_vmspace_local = kmem_zalloc(sizeof(*rump_vmspace_local), KM_SLEEP);
uvmspace_init(rump_vmspace_local, _pmap_local, 0, 0, false);
@@ -618,7 +599,7 @@ uvm_pagelookup(struct uvm_object *uobj,
struct vm_page *pg;
bool ispagedaemon = curlwp == uvm.pagedaemon_lwp;
- pg = rb_tree_find_node(>rb_tree, );
+ pg = radix_tree_lookup_node(>uo_pages, off >> PAGE_SHIFT);
if (pg && !UVM_OBJ_IS_AOBJ(pg->uobject) && !ispagedaemon) {
mutex_enter(_lruqueue_lock);
TAILQ_REMOVE(_lruqueue, pg, pageq.queue);
Index: src/sys/uvm/uvm_km.c
diff -u src/sys/uvm/uvm_km.c:1.151 src/sys/uvm/uvm_km.c:1.152
--- src/sys/uvm/uvm_km.c:1.151 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_km.c Sat Dec 14 17:28:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_km.c,v 1.151 2019/12/13 20:10:22 ad Exp $ */
+/* $NetBSD: uvm_km.c,v 1.152 2019/12/14 17:28:58 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -152,7 +152,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.151 2019/12/13 20:10:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_km.c,v 1.152 2019/12/14 17:28:58 ad Exp $");
#include "opt_uvmhist.h"
@@ -545,9 +545,7 @@ uvm_km_pgremove_intrsafe(struct vm_map *
void
uvm_km_check_empty(struct vm_map *map, vaddr_t start, vaddr_t end)
{
- struct vm_page *pg;
vaddr_t va;
- paddr_t pa;
UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: riastradh Date: Sat Dec 14 17:24:43 UTC 2019 Modified Files: src/sys/lib/libkern: Makefile.libkern Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/lib/libkern/Makefile.libkern Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libkern/Makefile.libkern diff -u src/sys/lib/libkern/Makefile.libkern:1.46 src/sys/lib/libkern/Makefile.libkern:1.47 --- src/sys/lib/libkern/Makefile.libkern:1.46 Sat Dec 14 17:23:47 2019 +++ src/sys/lib/libkern/Makefile.libkern Sat Dec 14 17:24:43 2019 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.libkern,v 1.46 2019/12/14 17:23:47 riastradh Exp $ +# $NetBSD: Makefile.libkern,v 1.47 2019/12/14 17:24:43 riastradh Exp $ -# -# Variable definitions for libkern. +# +# Variable definitions for libkern. # # Before including this, you _must_ set # KERNDIR: location of sys/lib/libkern @@ -68,7 +68,7 @@ SRCS+= memcmp.c memmem.c SRCS+= memcpy.c .if empty(SRCS:Mmemset2.*) -SRCS+= memset.c +SRCS+= memset.c .endif SRCS+= popcount32.c popcount64.c
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Sat Dec 14 17:24:30 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: start.S
Log Message:
revert previous - i was confused about boot files on rpi + aarch64
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/aarch64/aarch64/start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/start.S
diff -u src/sys/arch/aarch64/aarch64/start.S:1.4 src/sys/arch/aarch64/aarch64/start.S:1.5
--- src/sys/arch/aarch64/aarch64/start.S:1.4 Sat Dec 14 17:04:02 2019
+++ src/sys/arch/aarch64/aarch64/start.S Sat Dec 14 17:24:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: start.S,v 1.4 2019/12/14 17:04:02 skrll Exp $ */
+/* $NetBSD: start.S,v 1.5 2019/12/14 17:24:30 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -32,7 +32,7 @@
#include
-RCSID("$NetBSD: start.S,v 1.4 2019/12/14 17:04:02 skrll Exp $")
+RCSID("$NetBSD: start.S,v 1.5 2019/12/14 17:24:30 skrll Exp $")
/* load far effective address (pc relative) */
.macro ADDR, reg, addr
@@ -40,14 +40,10 @@ RCSID("$NetBSD: start.S,v 1.4 2019/12/14
add \reg, \reg, #:lo12:\addr
.endm
-rpi_start:
- b start
-
/*
* Padding at start of kernel image to make room for 64-byte header (non-ELF booting)
*/
-
- .align 6
+.space 64, 0x0
/*
* Kernel start routine for aarch64 boards.
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: riastradh
Date: Sat Dec 14 17:23:47 UTC 2019
Modified Files:
src/sys/lib/libkern: Makefile.libkern libkern.h
Removed Files:
src/sys/lib/libkern: mertwist.c
Log Message:
Remove never-used Mersenne twister from libkern.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/lib/libkern/Makefile.libkern
cvs rdiff -u -r1.136 -r1.137 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.8 -r0 src/sys/lib/libkern/mertwist.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/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.45 src/sys/lib/libkern/Makefile.libkern:1.46
--- src/sys/lib/libkern/Makefile.libkern:1.45 Sat Dec 14 17:23:31 2019
+++ src/sys/lib/libkern/Makefile.libkern Sat Dec 14 17:23:47 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.45 2019/12/14 17:23:31 riastradh Exp $
+# $NetBSD: Makefile.libkern,v 1.46 2019/12/14 17:23:47 riastradh Exp $
#
# Variable definitions for libkern.
@@ -54,7 +54,7 @@ SRCS+= cpuset.c inet_addr.c intoa.c
SRCS+= bswap64.c
.endif
SRCS+= md4c.c md5c.c rmd160.c sha1.c sha2.c sha3.c keccak.c murmurhash.c
-SRCS+= pmatch.c mcount.c mertwist.c crc32.c
+SRCS+= pmatch.c mcount.c crc32.c
SRCS+= ppath_kmem_alloc.c
Index: src/sys/lib/libkern/libkern.h
diff -u src/sys/lib/libkern/libkern.h:1.136 src/sys/lib/libkern/libkern.h:1.137
--- src/sys/lib/libkern/libkern.h:1.136 Thu Dec 5 04:17:13 2019
+++ src/sys/lib/libkern/libkern.h Sat Dec 14 17:23:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libkern.h,v 1.136 2019/12/05 04:17:13 riastradh Exp $ */
+/* $NetBSD: libkern.h,v 1.137 2019/12/14 17:23:47 riastradh Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -356,14 +356,6 @@ tolower(int ch)
((const TYPE *)(((const char *)(PTR)) - offsetof(TYPE, FIELD)) \
+ __validate_const_container_of(PTR, TYPE, FIELD))
-#define MTPRNG_RLEN 624
-struct mtprng_state {
- unsigned int mt_idx;
- uint32_t mt_elem[MTPRNG_RLEN];
- uint32_t mt_count;
- uint32_t mt_sparse[3];
-};
-
/* Prototypes for which GCC built-ins exist. */
void *memcpy(void *, const void *, size_t);
int memcmp(const void *, const void *, size_t);
@@ -497,10 +489,6 @@ char *setstate(char *);
long random(void);
void mi_vector_hash(const void * __restrict, size_t, uint32_t,
uint32_t[3]);
-void mtprng_init32(struct mtprng_state *, uint32_t);
-void mtprng_initarray(struct mtprng_state *, const uint32_t *, size_t);
-uint32_t mtprng_rawrandom(struct mtprng_state *);
-uint32_t mtprng_random(struct mtprng_state *);
int scanc(u_int, const u_char *, const u_char *, int);
int skpc(int, size_t, u_char *);
int strcasecmp(const char *, const char *);
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: riastradh
Date: Sat Dec 14 17:23:31 UTC 2019
Modified Files:
src/sys/lib/libkern: Makefile.libkern
Log Message:
Omit vestigial unused commented-out experiment.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/lib/libkern/Makefile.libkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.44 src/sys/lib/libkern/Makefile.libkern:1.45
--- src/sys/lib/libkern/Makefile.libkern:1.44 Sat Dec 14 15:30:37 2019
+++ src/sys/lib/libkern/Makefile.libkern Sat Dec 14 17:23:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.44 2019/12/14 15:30:37 ad Exp $
+# $NetBSD: Makefile.libkern,v 1.45 2019/12/14 17:23:31 riastradh Exp $
#
# Variable definitions for libkern.
@@ -98,9 +98,6 @@ SRCS+= explicit_memset.c consttime_memeq
SRCS+= cdbr.c
SRCS+= mi_vector_hash.c
-#.PATH: ${NETBSDSRCDIR}/external/bsd/liblzf/dist
-#SRCS+= lzf_c.c lzf_d.c
-
# Files to clean up
CLEANFILES+= lib${LIB}.o lib${LIB}.po
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sat Dec 14 17:15:54 UTC 2019
Modified Files:
src/sys/dev/dm: dm.h dm_ioctl.c
Log Message:
dm: Don't try to implement "status" as subset of "table"
The way dm_table_status_ioctl() implements "status" and "table" is
not compatible with Linux kernel. Some targets have different outputs
that "status" can't be implemented as subset of "table".
Add ->info() handler to sync with "status" behavior in Linux kernel.
Some targets which currently exist in NetBSD (I think striped)
as well as some minor targets that I plan to port to NetBSD
can/should implement ->info(), but will do that in a different commit.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/dm/dm.h
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/dm/dm_ioctl.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/dm/dm.h
diff -u src/sys/dev/dm/dm.h:1.40 src/sys/dev/dm/dm.h:1.41
--- src/sys/dev/dm/dm.h:1.40 Sat Dec 14 11:20:51 2019
+++ src/sys/dev/dm/dm.h Sat Dec 14 17:15:54 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm.h,v 1.40 2019/12/14 11:20:51 tkusumi Exp $ */
+/*$NetBSD: dm.h,v 1.41 2019/12/14 17:15:54 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -184,10 +184,11 @@ typedef struct dm_target {
int (*deps) (dm_table_entry_t *, prop_array_t);
/*
- * Status routine is called to get params string, which is target
+ * Info/status routine are called to get params string, which is target
* specific. When dm_table_status_ioctl is called with flag
* DM_STATUS_TABLE_FLAG I have to sent params string back.
*/
+ char *(*info)(void *);
char * (*status)(void *);
int (*strategy)(dm_table_entry_t *, struct buf *);
int (*sync)(dm_table_entry_t *);
Index: src/sys/dev/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.43 src/sys/dev/dm/dm_ioctl.c:1.44
--- src/sys/dev/dm/dm_ioctl.c:1.43 Sat Dec 14 14:43:38 2019
+++ src/sys/dev/dm/dm_ioctl.c Sat Dec 14 17:15:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.43 2019/12/14 14:43:38 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.44 2019/12/14 17:15:54 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.43 2019/12/14 14:43:38 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.44 2019/12/14 17:15:54 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -942,17 +942,21 @@ dm_table_status_ioctl(prop_dictionary_t
*/
prop_dictionary_set_cstring(target_dict, DM_TABLE_PARAMS, "");
- if (flags & DM_STATUS_TABLE_FLAG) {
- params = table_en->target->status
- (table_en->target_config);
-
- if (params != NULL) {
-prop_dictionary_set_cstring(target_dict,
-DM_TABLE_PARAMS, params);
+ if (flags & DM_STATUS_TABLE_FLAG)
+ params = table_en->target->status(
+ table_en->target_config);
+ else if (table_en->target->info)
+ params = table_en->target->info(
+ table_en->target_config);
+ else
+ params = NULL;
-kmem_free(params, DM_MAX_PARAMS_SIZE);
- }
+ if (params != NULL) {
+ prop_dictionary_set_cstring(target_dict,
+ DM_TABLE_PARAMS, params);
+ kmem_free(params, DM_MAX_PARAMS_SIZE);
}
+
prop_array_add(cmd_array, target_dict);
prop_object_release(target_dict);
}
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Sat Dec 14 17:04:02 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: start.S
Log Message:
Allow RPI firmware boots to work again
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/aarch64/aarch64/start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/start.S
diff -u src/sys/arch/aarch64/aarch64/start.S:1.3 src/sys/arch/aarch64/aarch64/start.S:1.4
--- src/sys/arch/aarch64/aarch64/start.S:1.3 Wed Dec 4 11:24:31 2019
+++ src/sys/arch/aarch64/aarch64/start.S Sat Dec 14 17:04:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: start.S,v 1.3 2019/12/04 11:24:31 jmcneill Exp $ */
+/* $NetBSD: start.S,v 1.4 2019/12/14 17:04:02 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -32,7 +32,7 @@
#include
-RCSID("$NetBSD: start.S,v 1.3 2019/12/04 11:24:31 jmcneill Exp $")
+RCSID("$NetBSD: start.S,v 1.4 2019/12/14 17:04:02 skrll Exp $")
/* load far effective address (pc relative) */
.macro ADDR, reg, addr
@@ -40,10 +40,14 @@ RCSID("$NetBSD: start.S,v 1.3 2019/12/04
add \reg, \reg, #:lo12:\addr
.endm
+rpi_start:
+ b start
+
/*
* Padding at start of kernel image to make room for 64-byte header (non-ELF booting)
*/
-.space 64, 0x0
+
+ .align 6
/*
* Kernel start routine for aarch64 boards.
CVS commit: src/sys/dev
Module Name:src
Committed By: riastradh
Date: Sat Dec 14 16:58:38 UTC 2019
Modified Files:
src/sys/dev: cgd.c cgd_crypto.c
Log Message:
Just use KASSERTMSG and panic. No need for custom wrappers.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/sys/dev/cgd.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/cgd_crypto.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/cgd.c
diff -u src/sys/dev/cgd.c:1.117 src/sys/dev/cgd.c:1.118
--- src/sys/dev/cgd.c:1.117 Sun Dec 8 12:14:40 2019
+++ src/sys/dev/cgd.c Sat Dec 14 16:58:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.117 2019/12/08 12:14:40 mlelstv Exp $ */
+/* $NetBSD: cgd.c,v 1.118 2019/12/14 16:58:38 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.117 2019/12/08 12:14:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd.c,v 1.118 2019/12/14 16:58:38 riastradh Exp $");
#include
#include
@@ -262,14 +262,6 @@ static void hexprint(const char *, void
#define DPRINTF_FOLLOW(y)
#endif
-#ifdef DIAGNOSTIC
-#define DIAGPANIC(x) panic x
-#define DIAGCONDPANIC(x,y) if (x) panic y
-#else
-#define DIAGPANIC(x)
-#define DIAGCONDPANIC(x,y)
-#endif
-
/* Global variables */
/* Utility Functions */
@@ -1047,15 +1039,15 @@ cgd_cipher(struct cgd_softc *cs, void *d
DPRINTF_FOLLOW(("cgd_cipher() dir=%d\n", dir));
- DIAGCONDPANIC(len % blocksize != 0,
- ("cgd_cipher: len %% blocksize != 0"));
+ KASSERTMSG(len % blocksize == 0,
+ "cgd_cipher: len %% blocksize != 0");
/* ensure that sizeof(daddr_t) <= blocksize (for encblkno IVing) */
- DIAGCONDPANIC(sizeof(daddr_t) > blocksize,
- ("cgd_cipher: sizeof(daddr_t) > blocksize"));
+ KASSERTMSG(sizeof(daddr_t) <= blocksize,
+ "cgd_cipher: sizeof(daddr_t) > blocksize");
- DIAGCONDPANIC(blocksize > CGD_MAXBLOCKSIZE,
- ("cgd_cipher: blocksize > CGD_MAXBLOCKSIZE"));
+ KASSERTMSG(blocksize <= CGD_MAXBLOCKSIZE,
+ "cgd_cipher: blocksize > CGD_MAXBLOCKSIZE");
dstuio.uio_iov = dstiov;
dstuio.uio_iovcnt = 1;
@@ -1098,7 +1090,7 @@ hexprint(const char *start, void *buf, i
{
char *c = buf;
- DIAGCONDPANIC(len < 0, ("hexprint: called with len < 0"));
+ KASSERTMSG(len >= 0, "hexprint: called with len < 0");
printf("%s: len=%06d 0x", start, len);
while (len--)
printf("%02x", (unsigned char) *c++);
Index: src/sys/dev/cgd_crypto.c
diff -u src/sys/dev/cgd_crypto.c:1.16 src/sys/dev/cgd_crypto.c:1.17
--- src/sys/dev/cgd_crypto.c:1.16 Thu Sep 26 11:47:38 2019
+++ src/sys/dev/cgd_crypto.c Sat Dec 14 16:58:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd_crypto.c,v 1.16 2019/09/26 11:47:38 gutteridge Exp $ */
+/* $NetBSD: cgd_crypto.c,v 1.17 2019/12/14 16:58:38 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.16 2019/09/26 11:47:38 gutteridge Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c,v 1.17 2019/12/14 16:58:38 riastradh Exp $");
#include
#include
@@ -49,12 +49,6 @@ __KERNEL_RCSID(0, "$NetBSD: cgd_crypto.c
#include
#include
-#ifdef DIAGNOSTIC
-#define DIAGPANIC(x) panic x
-#else
-#define DIAGPANIC(x)
-#endif
-
/*
* The general framework provides only one generic function.
* It takes the name of an algorithm and returns a struct cryptfuncs *
@@ -296,7 +290,7 @@ cgd_cipher_aes_cbc(void *privdata, struc
cgd_cipher_uio(, aes_cbc_dec_int, dstuio, srcuio);
break;
default:
- DIAGPANIC(("%s: unrecognised direction %d", __func__, dir));
+ panic("%s: unrecognised direction %d", __func__, dir);
}
}
@@ -396,7 +390,7 @@ cgd_cipher_aes_xts(void *privdata, struc
cgd_cipher_uio(, aes_xts_dec_int, dstuio, srcuio);
break;
default:
- DIAGPANIC(("%s: unrecognised direction %d", __func__, dir));
+ panic("%s: unrecognised direction %d", __func__, dir);
}
}
@@ -511,7 +505,7 @@ cgd_cipher_3des_cbc(void *privdata, stru
cgd_cipher_uio(, c3des_cbc_dec_int, dstuio, srcuio);
break;
default:
- DIAGPANIC(("%s: unrecognised direction %d", __func__, dir));
+ panic("%s: unrecognised direction %d", __func__, dir);
}
}
@@ -609,7 +603,7 @@ cgd_cipher_bf_cbc(void *privdata, struct
cgd_cipher_uio(, bf_cbc_dec_int, dstuio, srcuio);
break;
default:
- DIAGPANIC(("%s: unrecognised direction %d", __func__, dir));
+ panic("%s: unrecognised direction %d", __func__, dir);
}
}
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Dec 14 16:57:49 UTC 2019 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new acpica To generate a diff of this commit: cvs rdiff -u -r1.1673 -r1.1674 src/doc/3RDPARTY cvs rdiff -u -r1.2619 -r1.2620 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.1673 src/doc/3RDPARTY:1.1674 --- src/doc/3RDPARTY:1.1673 Mon Dec 2 09:15:22 2019 +++ src/doc/3RDPARTY Sat Dec 14 11:57:48 2019 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1673 2019/12/02 14:15:22 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1674 2019/12/14 16:57:48 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -41,12 +41,12 @@ # Package: acpica -Version: 20190816 -Current Vers: 20190816 +Version: 20191213 +Current Vers: 20191213 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Home Page: http://www.acpica.org/ -Date: 2019-10-09 +Date: 2019-12-14 Mailing List: de...@acpica.org License: BSD-like Responsible: jruoho Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2619 src/doc/CHANGES:1.2620 --- src/doc/CHANGES:1.2619 Tue Dec 10 07:08:52 2019 +++ src/doc/CHANGES Sat Dec 14 11:57:48 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2619 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2620 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -77,3 +77,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0: terminfo: Import 20190609 [christos 20191127] ixl(4): Ported driver for Intel Ethernet 700 series [yamaguchi 20191210] + acpi(4): Updated ACPICA to 20191213. [christos 20191214]
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Sat Dec 14 16:58:25 UTC 2019
Modified Files:
src/sys/kern: kern_ras.c
Log Message:
Remove charade dancing around now-dead RCU patent.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/kern/kern_ras.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_ras.c
diff -u src/sys/kern/kern_ras.c:1.39 src/sys/kern/kern_ras.c:1.40
--- src/sys/kern/kern_ras.c:1.39 Sun Oct 6 15:11:17 2019
+++ src/sys/kern/kern_ras.c Sat Dec 14 16:58:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ras.c,v 1.39 2019/10/06 15:11:17 uwe Exp $ */
+/* $NetBSD: kern_ras.c,v 1.40 2019/12/14 16:58:25 riastradh Exp $ */
/*-
* Copyright (c) 2002, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_ras.c,v 1.39 2019/10/06 15:11:17 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ras.c,v 1.40 2019/12/14 16:58:25 riastradh Exp $");
#include
#include
@@ -65,25 +65,7 @@ ras_sync(void)
/* No need to sync if exiting or single threaded. */
if (curproc->p_nlwps > 1 && ncpu > 1) {
-#ifdef NO_SOFTWARE_PATENTS
xc_barrier(0);
-#else
- /*
- * Assumptions:
- *
- * o preemption is disabled by the thread in
- * ras_lookup().
- * o proc::p_raslist is only inspected with
- * preemption disabled.
- * o ras_lookup() plus loads reordered in advance
- * will take no longer than 1/8s to complete.
- */
- const int delta = hz >> 3;
- int target = hardclock_ticks + delta;
- do {
- kpause("ras", false, delta, NULL);
- } while (hardclock_ticks < target);
-#endif
}
}
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Sat Dec 14 16:56:34 UTC 2019 Modified Files: src/sys/external/bsd/acpica/dist/common: dmtables.c src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c aslerror.c aslfiles.c aslload.c asloptions.c aslprepkg.c aslutils.c aslxref.c dtcompile.c dtcompilerparser.y dtfield.c src/sys/external/bsd/acpica/dist/debugger: dbdisply.c dbinput.c dbmethod.c dbnames.c src/sys/external/bsd/acpica/dist/disassembler: dmresrc.c dmwalk.c src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c src/sys/external/bsd/acpica/dist/hardware: hwxfsleep.c src/sys/external/bsd/acpica/dist/include: acdebug.h acpixf.h acutils.h src/sys/external/bsd/acpica/dist/namespace: nsdump.c nsxfname.c src/sys/external/bsd/acpica/dist/tables: tbdata.c tbxfload.c src/sys/external/bsd/acpica/dist/utilities: uttrack.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/common/dmtables.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/compiler/aslcompile.c cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/acpica/dist/compiler/aslerror.c cvs rdiff -u -r1.14 -r1.15 \ src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \ src/sys/external/bsd/acpica/dist/compiler/dtcompile.c \ src/sys/external/bsd/acpica/dist/compiler/dtfield.c cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/compiler/aslload.c \ src/sys/external/bsd/acpica/dist/compiler/aslxref.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/compiler/asloptions.c \ src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c cvs rdiff -u -r1.24 -r1.25 \ src/sys/external/bsd/acpica/dist/compiler/aslutils.c cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c cvs rdiff -u -r1.19 -r1.20 \ src/sys/external/bsd/acpica/dist/debugger/dbinput.c cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/acpica/dist/debugger/dbmethod.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/debugger/dbnames.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \ src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c cvs rdiff -u -r1.13 -r1.14 \ src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/events/evregion.c cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/events/evrgnini.c cvs rdiff -u -r1.12 -r1.13 \ src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/include/acdebug.h cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/acpica/dist/include/acpixf.h cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/include/acutils.h cvs rdiff -u -r1.16 -r1.17 \ src/sys/external/bsd/acpica/dist/namespace/nsdump.c cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/namespace/nsxfname.c cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/tables/tbdata.c cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/tables/tbxfload.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/utilities/uttrack.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/external/bsd/acpica/dist/common/dmtables.c diff -u src/sys/external/bsd/acpica/dist/common/dmtables.c:1.2 src/sys/external/bsd/acpica/dist/common/dmtables.c:1.3 --- src/sys/external/bsd/acpica/dist/common/dmtables.c:1.2 Sat Oct 19 11:48:48 2019 +++ src/sys/external/bsd/acpica/dist/common/dmtables.c Sat Dec 14 11:56:32 2019 @@ -219,7 +219,7 @@ AdCreateTableHeader ( * makes it easier to rename the disassembled ASL file if needed. */ AcpiOsPrintf ( -"DefinitionBlock (\"\", \"%4.4s\", %hhu, \"%.6s\", \"%.8s\", 0x%8.8X)\n", +"DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n", Table->Signature, Table->Revision, Table->OemId, Table->OemTableId, Table->OemRevision); } @@ -400,6 +400,8 @@ AdParseTable ( AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER)); ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength); +AcpiUtSetIntegerWidth (Table->Revision); + /* Create the root object */ AcpiGbl_ParseOpRoot = AcpiPsCreateScopeOp (AmlStart); @@ -435,7 +437,6 @@ AdParseTable ( } WalkState->ParseFlags &= ~ACPI_PARSE_DELETE_TREE; -
CVS import: src/sys/external/bsd/acpica/dist
Module Name:src Committed By: christos Date: Sat Dec 14 16:33:33 UTC 2019 Update of /cvsroot/src/sys/external/bsd/acpica/dist In directory ivanova.netbsd.org:/tmp/cvs-serv981 Log Message: 13 December 2019. Summary of changes for version 20191213: 1) ACPICA kernel-resident subsystem: Return a Buffer object for all fields created via the CreateField operator. Previously, an Integer would be returned if the size of the field was less than or equal to the current size of an Integer. Although this goes against the ACPI specification, it provides compatibility with other ACPI implementations. Also updated the ASLTS test suite to reflect this new behavior. 2) iASL Compiler/Disassembler and ACPICA tools: iASL: Implemented detection of (and throw an error for) duplicate values for Case statements within a single Switch statement. Duplicate Integers, Strings, and Buffers are supported. iASL: Fix error logging issue during multiple file compilation -- Switch to the correct input file during error node creation. iASL: For duplicate named object creation, now emit an error instead of a warning - since this will cause a runtime error. AcpiSrc: Add unix line-ending support for non-Windows builds. iASL: Add an error condition for an attempt to create a NameString with > 255 NameSegs (the max allowable via the AML definition). 18 October 2019. Summary of changes for version 20191018: 1) ACPICA kernel-resident subsystem: Debugger: added a new command: ?Fields [address space ID]?. This command dumps the contents of all field units that are defined within the namespace with a particular address space ID. Modified the external interface AcpiLoadTable() to return a table index. This table index can be used for unloading a table for debugging. ACPI_STATUS AcpiLoadTable ( ACPI_TABLE_HEADER *Table, UINT32 *TableIndex)) Implemented a new external interface: AcpiUnloadTable() This new function takes a table index as an argument and unloads the table. Useful for debugging only. ACPI_STATUS AcpiUnloadTable ( UINT32 TableIndex)) Ported the AcpiNames utility to use the new table initialization sequence. The utility was broken before this change. Also, it was required to include most of the AML interpreter into the utility in order to process table initialization (module-level code execution.) Update for results from running Clang V8.0.1. This fixes all "dead assignment" warnings. There are still several "Dereference of NULL pointer" warnings, but these have been found to be false positive warnings. 2) iASL Compiler/Disassembler and ACPICA tools: iASL: numerous table compiler changes to ensure that the usage of yacc/bison syntax is POSIX-compliant. iASL/disassembler: several simple bug fixes in the data table disassembler. Acpiexec: expanded the initialization file (the -fi option) to initialize strings, buffers, packages, and field units. Status: Vendor Tag: intel Release Tags: acpica-20191213 U src/sys/external/bsd/acpica/dist/changes.txt U src/sys/external/bsd/acpica/dist/Makefile U src/sys/external/bsd/acpica/dist/generate/lint/options.lnt U src/sys/external/bsd/acpica/dist/generate/lint/files.lnt U src/sys/external/bsd/acpica/dist/generate/lint/lint.bat U src/sys/external/bsd/acpica/dist/generate/lint/lset.bat U src/sys/external/bsd/acpica/dist/generate/lint/readme.txt U src/sys/external/bsd/acpica/dist/generate/lint/std16.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std32.lnt U src/sys/external/bsd/acpica/dist/generate/lint/std64.lnt U src/sys/external/bsd/acpica/dist/generate/release/release.sh U src/sys/external/bsd/acpica/dist/generate/release/build.sh U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.common U src/sys/external/bsd/acpica/dist/generate/unix/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.config U src/sys/external/bsd/acpica/dist/generate/unix/Makefile.rules U src/sys/external/bsd/acpica/dist/generate/unix/readme.txt U src/sys/external/bsd/acpica/dist/generate/unix/acpibin/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpidump/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexamples/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpiexec/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpihelp/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpisrc/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/acpixtract/Makefile U src/sys/external/bsd/acpica/dist/generate/unix/iasl/Makefile U src/sys/external/bsd/acpica/dist/common/acfileio.c U src/sys/external/bsd/acpica/dist/common/acgetline.c U src/sys/external/bsd/acpica/dist/common/adfile.c U src/sys/external/bsd/acpica/dist/common/adisasm.c U
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: maya
Date: Sat Dec 14 15:40:43 UTC 2019
Modified Files:
src/sys/dev/usb: usbnet.c
Log Message:
Don't assume mii is not null here. Some drivers like urndis don't use
mii, so they always have mii == NULL.
ok riastradh. fixes PR kern/54762
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/usb/usbnet.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/usb/usbnet.c
diff -u src/sys/dev/usb/usbnet.c:1.32 src/sys/dev/usb/usbnet.c:1.33
--- src/sys/dev/usb/usbnet.c:1.32 Tue Dec 3 05:01:58 2019
+++ src/sys/dev/usb/usbnet.c Sat Dec 14 15:40:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: usbnet.c,v 1.32 2019/12/03 05:01:58 riastradh Exp $ */
+/* $NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $ */
/*
* Copyright (c) 2019 Matthew R. Green
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.32 2019/12/03 05:01:58 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbnet.c,v 1.33 2019/12/14 15:40:43 maya Exp $");
#include
#include
@@ -1188,7 +1188,6 @@ usbnet_tick_task(void *arg)
struct mii_data * const mii = usbnet_mii(un);
KASSERT(ifp != NULL); /* embedded member */
- KASSERT(mii != NULL); /* only removed after dying=true and wait */
unp->unp_refcnt++;
mutex_exit(>unp_lock);
@@ -1197,9 +1196,11 @@ usbnet_tick_task(void *arg)
usbnet_watchdog(ifp);
DPRINTFN(8, "mii %jx ifp %jx", (uintptr_t)mii, (uintptr_t)ifp, 0, 0);
- mii_tick(mii);
- if (!unp->unp_link)
- (*mii->mii_statchg)(ifp);
+ if (mii) {
+ mii_tick(mii);
+ if (!unp->unp_link)
+ (*mii->mii_statchg)(ifp);
+ }
/* Call driver if requested. */
uno_tick(un);
CVS commit: src/sys/modules/examples/executor
Module Name:src
Committed By: ad
Date: Sat Dec 14 15:36:08 UTC 2019
Modified Files:
src/sys/modules/examples/executor: executor.c
Log Message:
Use MPSAFE callouts.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/examples/executor/executor.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/modules/examples/executor/executor.c
diff -u src/sys/modules/examples/executor/executor.c:1.1 src/sys/modules/examples/executor/executor.c:1.2
--- src/sys/modules/examples/executor/executor.c:1.1 Fri Apr 13 20:30:09 2018
+++ src/sys/modules/examples/executor/executor.c Sat Dec 14 15:36:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: executor.c,v 1.1 2018/04/13 20:30:09 kamil Exp $ */
+/* $NetBSD: executor.c,v 1.2 2019/12/14 15:36:08 ad Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: executor.c,v 1.1 2018/04/13 20:30:09 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: executor.c,v 1.2 2019/12/14 15:36:08 ad Exp $");
#include
#include
@@ -93,12 +93,12 @@ executor_modcmd(modcmd_t cmd, void *arg)
switch(cmd) {
case MODULE_CMD_INIT:
printf("executor module inserted\n");
- callout_init(, 0);
+ callout_init(, CALLOUT_MPSAFE);
callout_reset(, mstohz(1000), callout_example, NULL);
break;
case MODULE_CMD_FINI:
printf("executor module unloaded\n");
- callout_stop();
+ callout_halt(, NULL);
callout_destroy();
break;
default:
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Sat Dec 14 15:34:19 UTC 2019
Modified Files:
src/sys/uvm: uvm_swap.c
Log Message:
Update uvmexp.nswget with atomics.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.184 src/sys/uvm/uvm_swap.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/uvm/uvm_swap.c
diff -u src/sys/uvm/uvm_swap.c:1.183 src/sys/uvm/uvm_swap.c:1.184
--- src/sys/uvm/uvm_swap.c:1.183 Sun Dec 1 23:14:47 2019
+++ src/sys/uvm/uvm_swap.c Sat Dec 14 15:34:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_swap.c,v 1.183 2019/12/01 23:14:47 uwe Exp $ */
+/* $NetBSD: uvm_swap.c,v 1.184 2019/12/14 15:34:18 ad Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 2009 Matthew R. Green
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.183 2019/12/01 23:14:47 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_swap.c,v 1.184 2019/12/14 15:34:18 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_compat_netbsd.h"
@@ -1738,7 +1738,7 @@ uvm_swap_get(struct vm_page *page, int s
{
int error;
- uvmexp.nswget++;
+ atomic_inc_uint();
KASSERT(flags & PGO_SYNCIO);
if (swslot == SWSLOT_BAD) {
return EIO;
CVS commit: src
Module Name:src Committed By: ad Date: Sat Dec 14 15:30:37 UTC 2019 Modified Files: src/distrib/sets/lists/comp: mi src/sys/kern: init_main.c src/sys/lib/libkern: Makefile.libkern src/sys/sys: Makefile Log Message: Include radixtree in the kernel. To generate a diff of this commit: cvs rdiff -u -r1.2296 -r1.2297 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.509 -r1.510 src/sys/kern/init_main.c cvs rdiff -u -r1.43 -r1.44 src/sys/lib/libkern/Makefile.libkern cvs rdiff -u -r1.170 -r1.171 src/sys/sys/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/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2296 src/distrib/sets/lists/comp/mi:1.2297 --- src/distrib/sets/lists/comp/mi:1.2296 Sat Dec 7 15:13:59 2019 +++ src/distrib/sets/lists/comp/mi Sat Dec 14 15:30:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2296 2019/12/07 15:13:59 riastradh Exp $ +# $NetBSD: mi,v 1.2297 2019/12/14 15:30:37 ad Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -3102,6 +3102,7 @@ ./usr/include/sys/quota.h comp-c-include ./usr/include/sys/quotactl.h comp-c-include ./usr/include/sys/radioio.h comp-c-include +./usr/include/sys/radixtree.h comp-c-include ./usr/include/sys/ras.hcomp-c-include ./usr/include/sys/rb.hcomp-obsolete obsolete ./usr/include/sys/rbtree.h comp-c-include Index: src/sys/kern/init_main.c diff -u src/sys/kern/init_main.c:1.509 src/sys/kern/init_main.c:1.510 --- src/sys/kern/init_main.c:1.509 Thu Dec 12 22:55:20 2019 +++ src/sys/kern/init_main.c Sat Dec 14 15:30:37 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: init_main.c,v 1.509 2019/12/12 22:55:20 pgoyette Exp $ */ +/* $NetBSD: init_main.c,v 1.510 2019/12/14 15:30:37 ad Exp $ */ /*- * Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.509 2019/12/12 22:55:20 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.510 2019/12/14 15:30:37 ad Exp $"); #include "opt_ddb.h" #include "opt_inet.h" @@ -197,6 +197,7 @@ extern void *_binary_splash_image_end; #include #include #include +#include #include #include @@ -476,6 +477,7 @@ main(void) /* Initialize fstrans. */ fstrans_init(); + radix_tree_init(); /* used for page cache */ vfsinit(); lf_init(); Index: src/sys/lib/libkern/Makefile.libkern diff -u src/sys/lib/libkern/Makefile.libkern:1.43 src/sys/lib/libkern/Makefile.libkern:1.44 --- src/sys/lib/libkern/Makefile.libkern:1.43 Mon Sep 3 16:54:54 2018 +++ src/sys/lib/libkern/Makefile.libkern Sat Dec 14 15:30:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.libkern,v 1.43 2018/09/03 16:54:54 riastradh Exp $ +# $NetBSD: Makefile.libkern,v 1.44 2019/12/14 15:30:37 ad Exp $ # # Variable definitions for libkern. @@ -87,7 +87,7 @@ SRCS+= strcasecmp.c strncasecmp.c SRCS+= xlat_mbr_fstype.c -SRCS+= heapsort.c ptree.c rb.c +SRCS+= heapsort.c ptree.c radixtree.c rb.c rpst.c SRCS+= hexdump.c Index: src/sys/sys/Makefile diff -u src/sys/sys/Makefile:1.170 src/sys/sys/Makefile:1.171 --- src/sys/sys/Makefile:1.170 Sat May 18 08:38:00 2019 +++ src/sys/sys/Makefile Sat Dec 14 15:30:37 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.170 2019/05/18 08:38:00 mlelstv Exp $ +# $NetBSD: Makefile,v 1.171 2019/12/14 15:30:37 ad Exp $ .include @@ -33,8 +33,8 @@ INCS= acct.h agpio.h aio.h ansi.h aout_m param.h pcu.h pipe.h pmf.h poll.h pool.h power.h proc.h \ protosw.h pset.h psref.h ptrace.h ptree.h \ queue.h quota.h quotactl.h \ - ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \ - rnd.h rndio.h rwlock.h \ + radixtree.h ras.h rbtree.h reboot.h radioio.h resource.h \ + resourcevar.h rmd160.h rnd.h rndio.h rwlock.h \ scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h semaphore.h \ sha1.h sha2.h sha3.h shm.h siginfo.h signal.h signalvar.h sigtypes.h \ sleepq.h socket.h \
CVS commit: src/sys/net/npf
Module Name:src
Committed By: riastradh
Date: Sat Dec 14 15:21:51 UTC 2019
Modified Files:
src/sys/net/npf: npf_conndb.c
Log Message:
Skip npf_config_sync if nothing to do.
Saves an unnecessary pserialize_perform every second.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/net/npf/npf_conndb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_conndb.c
diff -u src/sys/net/npf/npf_conndb.c:1.6 src/sys/net/npf/npf_conndb.c:1.7
--- src/sys/net/npf/npf_conndb.c:1.6 Tue Jul 23 00:52:01 2019
+++ src/sys/net/npf/npf_conndb.c Sat Dec 14 15:21:51 2019
@@ -46,7 +46,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_conndb.c,v 1.6 2019/07/23 00:52:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_conndb.c,v 1.7 2019/12/14 15:21:51 riastradh Exp $");
#include
#include
@@ -371,7 +371,7 @@ npf_conndb_gc(npf_t *npf, npf_conndb_t *
* Note: drop the conn_lock (see the lock order).
*/
gcref = thmap_stage_gc(cd->cd_map);
- if (sync) {
+ if (sync && (gcref || !LIST_EMPTY(>cd_gclist))) {
npf_config_enter(npf);
npf_config_sync(npf);
npf_config_exit(npf);
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Sat Dec 14 15:08:45 UTC 2019
Modified Files:
src/sys/uvm: uvm_loan.c
Log Message:
Don't call uvm_pagedequeue() while holding pg->interlock.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/uvm/uvm_loan.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/uvm/uvm_loan.c
diff -u src/sys/uvm/uvm_loan.c:1.89 src/sys/uvm/uvm_loan.c:1.90
--- src/sys/uvm/uvm_loan.c:1.89 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_loan.c Sat Dec 14 15:08:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_loan.c,v 1.89 2019/12/13 20:10:22 ad Exp $ */
+/* $NetBSD: uvm_loan.c,v 1.90 2019/12/14 15:08:45 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.89 2019/12/13 20:10:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.90 2019/12/14 15:08:45 ad Exp $");
#include
#include
@@ -1149,6 +1149,7 @@ uvm_loanbreak(struct vm_page *uobjpage)
mutex_enter(>interlock);
uvm_pagereplace(uobjpage, pg);
+ mutex_exit(>interlock);
/*
* if the page is no longer referenced by
@@ -1157,7 +1158,6 @@ uvm_loanbreak(struct vm_page *uobjpage)
*/
if (uobjpage->uanon == NULL)
uvm_pagedequeue(uobjpage);
- mutex_exit(>interlock);
/*
* at this point we have absolutely no
@@ -1177,7 +1177,7 @@ uvm_loanbreak(struct vm_page *uobjpage)
int
uvm_loanbreak_anon(struct vm_anon *anon, struct uvm_object *uobj)
{
- struct vm_page *pg;
+ struct vm_page *pg, *dequeuepg;
KASSERT(mutex_owned(anon->an_lock));
KASSERT(uobj == NULL || mutex_owned(uobj->vmobjlock));
@@ -1207,12 +1207,13 @@ uvm_loanbreak_anon(struct vm_anon *anon,
if (uobj) {
/* if we were receiver of loan */
anon->an_page->loan_count--;
+ dequeuepg = NULL;
} else {
/*
* we were the lender (A->K); need to remove the page from
* pageq's.
*/
- uvm_pagedequeue(anon->an_page);
+ dequeuepg = anon->an_page;
}
/* install new page in anon */
@@ -1223,6 +1224,9 @@ uvm_loanbreak_anon(struct vm_anon *anon,
mutex_exit(>interlock);
mutex_exit(>an_page->interlock);
uvm_pageactivate(pg);
+ if (dequeuepg != NULL) {
+ uvm_pagedequeue(anon->an_page);
+ }
pg->flags &= ~(PG_BUSY|PG_FAKE);
UVM_PAGE_OWN(pg, NULL);
CVS commit: src/sys/uvm
Module Name:src
Committed By: ad
Date: Sat Dec 14 15:04:48 UTC 2019
Modified Files:
src/sys/uvm: uvm_pager.c uvm_pdaemon.c
Log Message:
Adjust pdpending in uvm_pageout_start() and uvm_pageout_done() to avoid
the value going temporarily negative.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/sys/uvm/uvm_pager.c
cvs rdiff -u -r1.113 -r1.114 src/sys/uvm/uvm_pdaemon.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/uvm/uvm_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.114 src/sys/uvm/uvm_pager.c:1.115
--- src/sys/uvm/uvm_pager.c:1.114 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_pager.c Sat Dec 14 15:04:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.114 2019/12/13 20:10:22 ad Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.115 2019/12/14 15:04:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.114 2019/12/13 20:10:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pager.c,v 1.115 2019/12/14 15:04:47 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -473,7 +473,6 @@ uvm_aio_aiodone_pages(struct vm_page **p
else
uvm_swap_free(swslot, npages);
}
- atomic_dec_uint();
#endif /* defined(VMSWAP) */
}
}
Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.113 src/sys/uvm/uvm_pdaemon.c:1.114
--- src/sys/uvm/uvm_pdaemon.c:1.113 Fri Dec 13 20:10:22 2019
+++ src/sys/uvm/uvm_pdaemon.c Sat Dec 14 15:04:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.113 2019/12/13 20:10:22 ad Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.114 2019/12/14 15:04:47 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.113 2019/12/13 20:10:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.114 2019/12/14 15:04:47 ad Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -368,6 +368,7 @@ void
uvm_pageout_start(int npages)
{
+ atomic_inc_uint();
atomic_add_int(, npages);
}
@@ -376,6 +377,7 @@ uvm_pageout_done(int npages)
{
KASSERT(uvmexp.paging >= npages);
+ atomic_dec_uint();
atomic_add_int(, -npages);
/*
@@ -899,14 +901,12 @@ uvmpd_scan_queue(void)
}
mutex_exit(slock);
- swapcluster_flush(, false);
-
/*
- * the pageout is in progress. bump counters and set up
+ * set the pageout in progress. bump counters and set up
* for the next loop.
*/
- atomic_inc_uint();
+ swapcluster_flush(, false);
#else /* defined(VMSWAP) */
uvm_pageactivate(p);
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: ad
Date: Sat Dec 14 14:46:11 UTC 2019
Modified Files:
src/sys/uvm/pmap: pmap_segtab.c
Log Message:
Use pageq.list instead of listq.list.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/uvm/pmap/pmap_segtab.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/uvm/pmap/pmap_segtab.c
diff -u src/sys/uvm/pmap/pmap_segtab.c:1.11 src/sys/uvm/pmap/pmap_segtab.c:1.12
--- src/sys/uvm/pmap/pmap_segtab.c:1.11 Sun Oct 20 07:22:51 2019
+++ src/sys/uvm/pmap/pmap_segtab.c Sat Dec 14 14:46:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_segtab.c,v 1.11 2019/10/20 07:22:51 skrll Exp $ */
+/* $NetBSD: pmap_segtab.c,v 1.12 2019/12/14 14:46:11 ad Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.11 2019/10/20 07:22:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.12 2019/12/14 14:46:11 ad Exp $");
/*
* Manages physical address maps.
@@ -247,7 +247,7 @@ pmap_segtab_release(pmap_t pmap, pmap_se
struct vm_page *pg = PHYS_TO_VM_PAGE(pa);
#ifdef PMAP_PTP_CACHE
mutex_spin_enter(_segtab_lock);
- LIST_INSERT_HEAD(_segtab_info.ptp_pgflist, pg, listq.list);
+ LIST_INSERT_HEAD(_segtab_info.ptp_pgflist, pg, pageq.list);
mutex_spin_exit(_segtab_lock);
#else
uvm_pagefree(pg);
@@ -457,7 +457,7 @@ pmap_pte_reserve(pmap_t pmap, vaddr_t va
#ifdef PMAP_PTP_CACHE
mutex_spin_enter(_segtab_lock);
if ((pg = LIST_FIRST(_segtab_info.ptp_pgflist)) != NULL) {
- LIST_REMOVE(pg, listq.list);
+ LIST_REMOVE(pg, pageq.list);
KASSERT(LIST_FIRST(_segtab_info.ptp_pgflist) != pg);
}
mutex_spin_exit(_segtab_lock);
@@ -485,7 +485,7 @@ pmap_pte_reserve(pmap_t pmap, vaddr_t va
#ifdef PMAP_PTP_CACHE
mutex_spin_enter(_segtab_lock);
LIST_INSERT_HEAD(_segtab_info.ptp_pgflist,
- pg, listq.list);
+ pg, pageq.list);
mutex_spin_exit(_segtab_lock);
#else
PMAP_UNMAP_POOLPAGE((vaddr_t)pte);
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sat Dec 14 14:43:38 UTC 2019
Modified Files:
src/sys/dev/dm: dm_ioctl.c
Log Message:
dm: Make dm_dbg_print_flags() take uint32_t flag
which comes from prop_dictionary_get_uint32() result.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/dm/dm_ioctl.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/dm/dm_ioctl.c
diff -u src/sys/dev/dm/dm_ioctl.c:1.42 src/sys/dev/dm/dm_ioctl.c:1.43
--- src/sys/dev/dm/dm_ioctl.c:1.42 Sat Dec 14 11:20:51 2019
+++ src/sys/dev/dm/dm_ioctl.c Sat Dec 14 14:43:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_ioctl.c,v 1.42 2019/12/14 11:20:51 tkusumi Exp $ */
+/* $NetBSD: dm_ioctl.c,v 1.43 2019/12/14 14:43:38 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.42 2019/12/14 11:20:51 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.43 2019/12/14 14:43:38 tkusumi Exp $");
/*
* Locking is used to synchronise between ioctl calls and between dm_table's
@@ -116,14 +116,14 @@ static struct cfdata dm_cfdata = {
prop_dictionary_set_uint32(dm_dict,DM_IOCTL_FLAGS,flag); \
} while (/*CONSTCOND*/0)
-static int dm_dbg_print_flags(int);
+static int dm_dbg_print_flags(uint32_t);
static int dm_table_init(dm_target_t *, dm_table_entry_t *, char *);
/*
* Print flags sent to the kernel from libevmapper.
*/
static int
-dm_dbg_print_flags(int flags)
+dm_dbg_print_flags(uint32_t flags)
{
aprint_debug("dbg_print --- %d\n", flags);
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: skrll
Date: Sat Dec 14 13:48:10 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
Log Message:
Fix build... wire_count probably doesn't need atomics
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.52 src/sys/arch/aarch64/aarch64/pmap.c:1.53
--- src/sys/arch/aarch64/aarch64/pmap.c:1.52 Fri Dec 13 08:11:12 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Sat Dec 14 13:48:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.52 2019/12/13 08:11:12 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.53 2019/12/14 13:48:09 skrll Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.52 2019/12/13 08:11:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.53 2019/12/14 13:48:09 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -655,7 +655,7 @@ _pmap_sweep_pdp(struct pmap *pm)
/* unlink from parent */
opte = atomic_swap_64(ptep_in_parent, 0);
KASSERT(lxpde_valid(opte));
- wirecount = atomic_add_16_nv(>wire_count, -1); /* 1 -> 0 */
+ wirecount = atomic_add_32_nv(>wire_count, -1); /* 1 -> 0 */
KASSERT(wirecount == 0);
pmap_free_pdp(pm, pg);
nsweep++;
@@ -670,7 +670,7 @@ _pmap_sweep_pdp(struct pmap *pm)
KASSERTMSG(pg->wire_count >= 1,
"wire_count=%d", pg->wire_count);
/* decrement wire_count of parent */
- wirecount = atomic_add_16_nv(>wire_count, -1);
+ wirecount = atomic_add_32_nv(>wire_count, -1);
KASSERTMSG(pg->wire_count <= (Ln_ENTRIES + 1),
"pm=%p[%d], pg=%p, wire_count=%d",
pm, pm->pm_asid, pg, pg->wire_count);
@@ -1443,8 +1443,8 @@ _pmap_pdp_addref(struct pmap *pm, paddr_
pg = PHYS_TO_VM_PAGE(pdppa);
KASSERT(pg != NULL);
- CTASSERT(sizeof(pg->wire_count) == sizeof(uint16_t));
- atomic_add_16(>wire_count, 1);
+ CTASSERT(sizeof(pg->wire_count) == sizeof(uint32_t));
+ atomic_add_32(>wire_count, 1);
KASSERTMSG(pg->wire_count <= (Ln_ENTRIES + 1),
"pg=%p, wire_count=%d", pg, pg->wire_count);
@@ -1473,7 +1473,7 @@ _pmap_pdp_delref(struct pmap *pm, paddr_
pg = PHYS_TO_VM_PAGE(pdppa);
KASSERT(pg != NULL);
- wirecount = atomic_add_16_nv(>wire_count, -1);
+ wirecount = atomic_add_32_nv(>wire_count, -1);
if (!do_free_pdp) {
/*
@@ -1501,7 +1501,7 @@ _pmap_pdp_delref(struct pmap *pm, paddr_
/* unlink from parent */
opte = atomic_swap_64(ptep_in_parent, 0);
KASSERT(lxpde_valid(opte));
- wirecount = atomic_add_16_nv(>wire_count, -1); /* 1 -> 0 */
+ wirecount = atomic_add_32_nv(>wire_count, -1); /* 1 -> 0 */
KASSERT(wirecount == 0);
pmap_free_pdp(pm, pg);
removed = true;
@@ -1516,7 +1516,7 @@ _pmap_pdp_delref(struct pmap *pm, paddr_
KASSERTMSG(pg->wire_count >= 1,
"wire_count=%d", pg->wire_count);
/* decrement wire_count of parent */
- wirecount = atomic_add_16_nv(>wire_count, -1);
+ wirecount = atomic_add_32_nv(>wire_count, -1);
KASSERTMSG(pg->wire_count <= (Ln_ENTRIES + 1),
"pm=%p[%d], pg=%p, wire_count=%d",
pm, pm->pm_asid, pg, pg->wire_count);
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Sat Dec 14 13:36:14 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: PCBC To generate a diff of this commit: cvs rdiff -u -r1.295 -r1.296 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.295 src/share/misc/acronyms.comp:1.296 --- src/share/misc/acronyms.comp:1.295 Sun Dec 1 23:08:09 2019 +++ src/share/misc/acronyms.comp Sat Dec 14 13:36:14 2019 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.295 2019/12/01 23:08:09 sevan Exp $ +$NetBSD: acronyms.comp,v 1.296 2019/12/14 13:36:14 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1135,6 +1135,7 @@ PC program counter PCB printed circuit board PCB process control block PCB Protocol Control Block +PCBC propagating cipher block chaining PCC Portable C Compiler PCD page-level cache disable PCE path computation element
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Dec 14 12:36:33 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #554 To generate a diff of this commit: cvs rdiff -u -r1.1.2.138 -r1.1.2.139 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.138 src/doc/CHANGES-9.0:1.1.2.139 --- src/doc/CHANGES-9.0:1.1.2.138 Sat Dec 14 12:32:11 2019 +++ src/doc/CHANGES-9.0 Sat Dec 14 12:36:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.138 2019/12/14 12:32:11 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.139 2019/12/14 12:36:33 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -7046,3 +7046,9 @@ sys/dev/usb/ohci.c1.291 Descriptor when handling a DataUnderrun condition. [gson, ticket #553] +sys/dev/usb/ohci.c1.292 + + PR kern/50278: preserve the toggleCarry bit in the Endpoint + Descriptor in ohci_abort_xfer(). + [gson, ticket #554] +
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sat Dec 14 12:35:58 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-9]: ohci.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #554):
sys/dev/usb/ohci.c: revision 1.292
Preserve the toggleCarry bit in the Endpoint Descriptor in
ohci_abort_xfer(). Fixes the OHCI part of PR kern/50278.
To generate a diff of this commit:
cvs rdiff -u -r1.289.4.2 -r1.289.4.3 src/sys/dev/usb/ohci.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/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.289.4.2 src/sys/dev/usb/ohci.c:1.289.4.3
--- src/sys/dev/usb/ohci.c:1.289.4.2 Sat Dec 14 12:30:57 2019
+++ src/sys/dev/usb/ohci.c Sat Dec 14 12:35:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $ */
+/* $NetBSD: ohci.c,v 1.289.4.3 2019/12/14 12:35:58 martin Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.3 2019/12/14 12:35:58 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2349,7 +2349,9 @@ ohci_abort_xfer(struct usbd_xfer *xfer,
if (hit) {
DPRINTFN(1, "set hd=0x%08jx, tl=0x%08jx", (int)p->physaddr,
(int)O32TOH(sed->ed.ed_tailp), 0, 0);
- sed->ed.ed_headp = HTOO32(p->physaddr); /* unlink TDs */
+ /* unlink TDs, preserving toggle carry */
+ sed->ed.ed_headp = HTOO32(p->physaddr |
+ (O32TOH(sed->ed.ed_headp) & OHCI_TOGGLECARRY));
usb_syncmem(>dma,
sed->offs + offsetof(ohci_ed_t, ed_headp),
sizeof(sed->ed.ed_headp),
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sat Dec 14 12:34:19 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Ticket #1472 To generate a diff of this commit: cvs rdiff -u -r1.1.2.79 -r1.1.2.80 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.79 src/doc/CHANGES-8.2:1.1.2.80 --- src/doc/CHANGES-8.2:1.1.2.79 Thu Dec 12 20:49:15 2019 +++ src/doc/CHANGES-8.2 Sat Dec 14 12:34:19 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.79 2019/12/12 20:49:15 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.80 2019/12/14 12:34:19 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1790,3 +1790,8 @@ external/mit/lua/dist/src/lapi.c 1.12 Apply upstream fix for a use-after-free. [sevan, ticket #1471] +sys/dev/usb/if_urtwn.c1.76 + + PR kern/54728: reset MCU ready status before resetting the MCU. + [mlelstv, ticket #1472] +
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sat Dec 14 12:33:47 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-8]: if_urtwn.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #1472):
sys/dev/usb/if_urtwn.c: revision 1.76
Reset MCU ready status before resetting the MCU.
Fixes PR kern/54728
To generate a diff of this commit:
cvs rdiff -u -r1.53.2.5 -r1.53.2.6 src/sys/dev/usb/if_urtwn.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/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.53.2.5 src/sys/dev/usb/if_urtwn.c:1.53.2.6
--- src/sys/dev/usb/if_urtwn.c:1.53.2.5 Tue Dec 18 18:32:00 2018
+++ src/sys/dev/usb/if_urtwn.c Sat Dec 14 12:33:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.53.2.5 2018/12/18 18:32:00 martin Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.53.2.6 2019/12/14 12:33:47 martin Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.5 2018/12/18 18:32:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.6 2019/12/14 12:33:47 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3412,6 +3412,8 @@ urtwn_load_firmware(struct urtwn_softc *
}
if (urtwn_read_1(sc, R92C_MCUFWDL) & R92C_MCUFWDL_RAM_DL_SEL) {
+ /* Reset MCU ready status */
+ urtwn_write_1(sc, R92C_MCUFWDL, 0);
if (ISSET(sc->chip, URTWN_CHIP_88E) ||
ISSET(sc->chip, URTWN_CHIP_92EU))
urtwn_r88e_fw_reset(sc);
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat Dec 14 12:32:11 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #549 - #553 To generate a diff of this commit: cvs rdiff -u -r1.1.2.137 -r1.1.2.138 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.137 src/doc/CHANGES-9.0:1.1.2.138 --- src/doc/CHANGES-9.0:1.1.2.137 Thu Dec 12 21:02:18 2019 +++ src/doc/CHANGES-9.0 Sat Dec 14 12:32:11 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.137 2019/12/12 21:02:18 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.138 2019/12/14 12:32:11 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -7016,3 +7016,33 @@ sys/external/bsd/drm2/dist/drm/i915/inte Fix CVE-2019-0154 and CVE-2019-0155. [maya, ticket #548] +sys/arch/emips/emips/interrupt.c 1.7,1.8 + + Fix incorrect argument order of cpu_intr(). + PR/45080: fix a longstanding freeze. + [tsutsui, ticket #549] + +sys/arch/x86/x86/spectre.c 1.32 + + Check CPUID.IBRS in addition to ARCH_CAP.IBRS_ALL to + fix booting on VirtualBox. + [maxv, ticket #550] + +sys/dev/usb/if_urtwn.c1.76,1.77 + + Reset MCU ready status before resetting the MCU. + Do not deregister twice with pmf. + [mlelstv, ticket #551] + +sys/dev/i2c/i2c.c1.70 + + Revert previous. Indirect matches are not wanted on platforms that + use external configuration data (FDT or OF). + [mlelstev, ticket #552] + +sys/dev/usb/ohci.c1.291 + + PR kern/54070: preserve the toggleCarry bit in the Endpoint + Descriptor when handling a DataUnderrun condition. + [gson, ticket #553] +
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sat Dec 14 12:30:58 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: ohci.c Log Message: Pull up following revision(s) (requested by gson in ticket #553): sys/dev/usb/ohci.c: revision 1.291 Preserve the toggleCarry bit in the Endpoint Descriptor when handling a DataUnderrun condition. Fixes PR kern/54070. To generate a diff of this commit: cvs rdiff -u -r1.289.4.1 -r1.289.4.2 src/sys/dev/usb/ohci.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/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.289.4.1 src/sys/dev/usb/ohci.c:1.289.4.2 --- src/sys/dev/usb/ohci.c:1.289.4.1 Sun Sep 1 13:00:37 2019 +++ src/sys/dev/usb/ohci.c Sat Dec 14 12:30:57 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.289.4.1 2019/09/01 13:00:37 martin Exp $ */ +/* $NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.1 2019/09/01 13:00:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.289.4.2 2019/12/14 12:30:57 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -1515,8 +1515,9 @@ ohci_softintr(void *v) ohci_soft_ed_t *sed = opipe->sed; - /* clear halt and TD chain */ - sed->ed.ed_headp = HTOO32(p->physaddr); + /* clear halt and TD chain, preserving toggle carry */ + sed->ed.ed_headp = HTOO32(p->physaddr | + (O32TOH(sed->ed.ed_headp) & OHCI_TOGGLECARRY)); usb_syncmem(>dma, sed->offs + offsetof(ohci_ed_t, ed_headp), sizeof(sed->ed.ed_headp),
CVS commit: [netbsd-9] src/sys/dev/i2c
Module Name:src
Committed By: martin
Date: Sat Dec 14 12:29:13 UTC 2019
Modified Files:
src/sys/dev/i2c [netbsd-9]: i2c.c
Log Message:
Pull up following revision(s) (requested by mlelstev in ticket #552):
sys/dev/i2c/i2c.c: revision 1.70
Revert previous. Indirect matches are not wanted on platforms that
use external configuration data (FDT or OF).
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.4.1 src/sys/dev/i2c/i2c.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.69 src/sys/dev/i2c/i2c.c:1.69.4.1
--- src/sys/dev/i2c/i2c.c:1.69 Tue Mar 26 09:20:38 2019
+++ src/sys/dev/i2c/i2c.c Sat Dec 14 12:29:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.69 2019/03/26 09:20:38 mlelstv Exp $ */
+/* $NetBSD: i2c.c,v 1.69.4.1 2019/12/14 12:29:13 martin Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.69 2019/03/26 09:20:38 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.69.4.1 2019/12/14 12:29:13 martin Exp $");
#include
#include
@@ -719,8 +719,6 @@ iic_use_direct_match(const struct i2c_at
const struct device_compatible_entry *compats,
int *match_resultp)
{
- int res;
-
KASSERT(match_resultp != NULL);
if (ia->ia_name != NULL &&
@@ -730,11 +728,8 @@ iic_use_direct_match(const struct i2c_at
}
if (ia->ia_ncompat > 0 && ia->ia_compat != NULL) {
- res = iic_compatible_match(ia, compats, NULL);
- if (res) {
- *match_resultp = res;
- return true;
- }
+ *match_resultp = iic_compatible_match(ia, compats, NULL);
+ return true;
}
return false;
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Sat Dec 14 12:26:05 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-9]: if_urtwn.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #551):
sys/dev/usb/if_urtwn.c: revision 1.76
sys/dev/usb/if_urtwn.c: revision 1.77
Reset MCU ready status before resetting the MCU.
Fixes PR kern/54728
Don't deregister twice with pmf.
To generate a diff of this commit:
cvs rdiff -u -r1.71.2.1 -r1.71.2.2 src/sys/dev/usb/if_urtwn.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/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.71.2.1 src/sys/dev/usb/if_urtwn.c:1.71.2.2
--- src/sys/dev/usb/if_urtwn.c:1.71.2.1 Sun Sep 1 13:00:36 2019
+++ src/sys/dev/usb/if_urtwn.c Sat Dec 14 12:26:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.71.2.1 2019/09/01 13:00:36 martin Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.71.2.2 2019/12/14 12:26:05 martin Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.71.2.1 2019/09/01 13:00:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.71.2.2 2019/12/14 12:26:05 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -550,8 +550,6 @@ urtwn_detach(device_t self, int flags)
callout_halt(>sc_scan_to, NULL);
callout_halt(>sc_calib_to, NULL);
- pmf_device_deregister(self);
-
if (ISSET(sc->sc_flags, URTWN_FLAG_ATTACHED)) {
urtwn_stop(ifp, 0);
usb_rem_task_wait(sc->sc_udev, >sc_task, USB_TASKQ_DRIVER,
@@ -3463,6 +3461,8 @@ urtwn_load_firmware(struct urtwn_softc *
}
if (urtwn_read_1(sc, R92C_MCUFWDL) & R92C_MCUFWDL_RAM_DL_SEL) {
+ /* Reset MCU ready status */
+ urtwn_write_1(sc, R92C_MCUFWDL, 0);
if (ISSET(sc->chip, URTWN_CHIP_88E) ||
ISSET(sc->chip, URTWN_CHIP_92EU))
urtwn_r88e_fw_reset(sc);
CVS commit: [netbsd-9] src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Dec 14 12:24:23 UTC 2019
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: spectre.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #550):
sys/arch/x86/x86/spectre.c: revision 1.32
Check CPUID.IBRS in addition to ARCH_CAP.IBRS_ALL. For clarity, and also
because VirtualBox clears the former but forgets to clear the latter (which
makes us hit a #GP on RDMSR).
To generate a diff of this commit:
cvs rdiff -u -r1.29.2.2 -r1.29.2.3 src/sys/arch/x86/x86/spectre.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/spectre.c
diff -u src/sys/arch/x86/x86/spectre.c:1.29.2.2 src/sys/arch/x86/x86/spectre.c:1.29.2.3
--- src/sys/arch/x86/x86/spectre.c:1.29.2.2 Tue Nov 12 18:24:37 2019
+++ src/sys/arch/x86/x86/spectre.c Sat Dec 14 12:24:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spectre.c,v 1.29.2.2 2019/11/12 18:24:37 martin Exp $ */
+/* $NetBSD: spectre.c,v 1.29.2.3 2019/12/14 12:24:23 martin Exp $ */
/*
* Copyright (c) 2018-2019 NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.29.2.2 2019/11/12 18:24:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spectre.c,v 1.29.2.3 2019/12/14 12:24:23 martin Exp $");
#include "opt_spectre.h"
@@ -126,20 +126,20 @@ v2_detect_method(void)
if (cpuid_level >= 7) {
x86_cpuid(7, descs);
- if (descs[3] & CPUID_SEF_ARCH_CAP) {
-msr = rdmsr(MSR_IA32_ARCH_CAPABILITIES);
-if (msr & IA32_ARCH_IBRS_ALL) {
- v2_mitigation_method =
- V2_MITIGATION_INTEL_ENHANCED_IBRS;
- return;
+ if (descs[3] & CPUID_SEF_IBRS) {
+if (descs[3] & CPUID_SEF_ARCH_CAP) {
+ msr = rdmsr(MSR_IA32_ARCH_CAPABILITIES);
+ if (msr & IA32_ARCH_IBRS_ALL) {
+ v2_mitigation_method =
+ V2_MITIGATION_INTEL_ENHANCED_IBRS;
+ return;
+ }
}
- }
#ifdef __x86_64__
- if (descs[3] & CPUID_SEF_IBRS) {
v2_mitigation_method = V2_MITIGATION_INTEL_IBRS;
return;
- }
#endif
+ }
}
v2_mitigation_method = V2_MITIGATION_NONE;
} else if (cpu_vendor == CPUVENDOR_AMD) {
CVS commit: [netbsd-9] src/sys/arch/emips/emips
Module Name:src
Committed By: martin
Date: Sat Dec 14 12:22:43 UTC 2019
Modified Files:
src/sys/arch/emips/emips [netbsd-9]: interrupt.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #549):
sys/arch/emips/emips/interrupt.c: revision 1.7
sys/arch/emips/emips/interrupt.c: revision 1.8
Fix incorrect argument order of cpu_intr(), slipped in rev 1.2.
Pointed out by maya@ in PR/45080.
Should be pulled up to netbsd-9.
-
Fix a longstanding "freeze right after enabling interrupt" problem.
With this fix, finally NetBSD/emips on Giano is fully functional.
See PR/45080 for more details.
Should be pulled up to netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.22.1 src/sys/arch/emips/emips/interrupt.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/emips/emips/interrupt.c
diff -u src/sys/arch/emips/emips/interrupt.c:1.6 src/sys/arch/emips/emips/interrupt.c:1.6.22.1
--- src/sys/arch/emips/emips/interrupt.c:1.6 Mon Jul 11 16:18:56 2016
+++ src/sys/arch/emips/emips/interrupt.c Sat Dec 14 12:22:43 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.6 2016/07/11 16:18:56 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.6.22.1 2019/12/14 12:22:43 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6 2016/07/11 16:18:56 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.6.22.1 2019/12/14 12:22:43 martin Exp $");
#include
#include
@@ -95,13 +95,26 @@ intr_init(void)
* emips uses one line for all I/O interrupts (0x8000).
*/
void
-cpu_intr(int ppl, uint32_t status, vaddr_t pc)
+cpu_intr(int ppl, vaddr_t pc, uint32_t status)
{
uint32_t ipending;
int ipl;
curcpu()->ci_data.cpu_nintr++;
+#if 0
+ /*
+ * According to Giano simulator sources (Cpus/mips_cpu.cpp),
+ * interrupt register bits in CAUSE register are updated
+ * only when the exception is triggered. This means checking
+ * CAUSE register via splintr() in a while loop in this
+ * interrupt handler doesn't work as expected on Giano.
+ *
+ * I don't know whether the real FPGA eMIPS has the same
+ * design as the Giano simulator, but for now I'd like to
+ * choose 'call only one handler per each interrupt' strategy,
+ * as the original NetBSD/emips implementation.
+ */
while (ppl < (ipl = splintr())) {
splx(ipl);
/* device interrupts */
@@ -110,6 +123,14 @@ cpu_intr(int ppl, uint32_t status, vaddr
}
(void)splhigh();
}
+#else
+ ipl = splintr();
+ __USE(ipl);
+ /* device interrupts */
+ if (ipending & MIPS_INT_MASK_5) {
+ (*platform.iointr)(status, pc, ipending);
+ }
+#endif
}
/*
CVS commit: src/sys/fs/autofs
Module Name:src
Committed By: tkusumi
Date: Sat Dec 14 12:01:13 UTC 2019
Modified Files:
src/sys/fs/autofs: autofs.c
Log Message:
autofs: Make /dev/autofs cdevsw functions static
Also less confusing since autofs vnops also has autofs_{open,close} in NetBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/fs/autofs/autofs.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/fs/autofs/autofs.c
diff -u src/sys/fs/autofs/autofs.c:1.3 src/sys/fs/autofs/autofs.c:1.4
--- src/sys/fs/autofs/autofs.c:1.3 Tue Jan 9 16:19:39 2018
+++ src/sys/fs/autofs/autofs.c Sat Dec 14 12:01:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: autofs.c,v 1.3 2018/01/09 16:19:39 christos Exp $ */
+/* $NetBSD: autofs.c,v 1.4 2019/12/14 12:01:13 tkusumi Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1.3 2018/01/09 16:19:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1.4 2019/12/14 12:01:13 tkusumi Exp $");
#include "autofs.h"
@@ -78,9 +78,9 @@ __KERNEL_RCSID(0, "$NetBSD: autofs.c,v 1
#include
#include
-dev_type_open(autofs_open);
-dev_type_close(autofs_close);
-dev_type_ioctl(autofs_ioctl);
+static dev_type_open(autofs_open);
+static dev_type_close(autofs_close);
+static dev_type_ioctl(autofs_ioctl);
const struct cdevsw autofs_cdevsw = {
.d_open = autofs_open,
@@ -519,7 +519,7 @@ autofs_ioctl_done(struct autofs_daemon_d
return 0;
}
-int
+static int
autofs_open(dev_t dev, int flags, int mode, struct lwp *l)
{
@@ -543,7 +543,7 @@ autofs_open(dev_t dev, int flags, int mo
return 0;
}
-int
+static int
autofs_close(dev_t dev, int flags, int mode, struct lwp *l)
{
@@ -555,7 +555,7 @@ autofs_close(dev_t dev, int flags, int m
return 0;
}
-int
+static int
autofs_ioctl(dev_t dev, const u_long cmd, void *data, int flag, struct lwp *l)
{
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: martin Date: Sat Dec 14 12:00:40 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/arc: md.c src/usr.sbin/sysinst/arch/cobalt: md.c src/usr.sbin/sysinst/arch/ews4800mips: md.c src/usr.sbin/sysinst/arch/prep: md.c Log Message: Adapt MD parts to changes in get_fs_part_type (pass partition type). To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/arc/md.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/cobalt/md.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/sysinst/arch/ews4800mips/md.c cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sysinst/arch/prep/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.9 src/usr.sbin/sysinst/arch/arc/md.c:1.10 --- src/usr.sbin/sysinst/arch/arc/md.c:1.9 Wed Aug 14 12:55:35 2019 +++ src/usr.sbin/sysinst/arch/arc/md.c Sat Dec 14 12:00:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.9 2019/08/14 12:55:35 martin Exp $ */ +/* $NetBSD: md.c,v 1.10 2019/12/14 12:00:40 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -271,7 +271,7 @@ md_parts_use_wholedisk(struct disk_parti }; boot_part.nat_type = parts->pscheme->get_fs_part_type( - boot_part.fs_type, boot_part.fs_sub_type); + PT_root, boot_part.fs_type, boot_part.fs_sub_type); return parts_use_wholedisk(parts, 1, _part); } Index: src/usr.sbin/sysinst/arch/cobalt/md.c diff -u src/usr.sbin/sysinst/arch/cobalt/md.c:1.9 src/usr.sbin/sysinst/arch/cobalt/md.c:1.10 --- src/usr.sbin/sysinst/arch/cobalt/md.c:1.9 Wed Aug 14 12:55:36 2019 +++ src/usr.sbin/sysinst/arch/cobalt/md.c Sat Dec 14 12:00:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.9 2019/08/14 12:55:36 martin Exp $ */ +/* $NetBSD: md.c,v 1.10 2019/12/14 12:00:40 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -286,7 +286,7 @@ md_parts_use_wholedisk(struct disk_parti }; boot_part.nat_type = parts->pscheme->get_fs_part_type( - boot_part.fs_type, boot_part.fs_sub_type); + PT_root, boot_part.fs_type, boot_part.fs_sub_type); return parts_use_wholedisk(parts, 1, _part); } Index: src/usr.sbin/sysinst/arch/ews4800mips/md.c diff -u src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.4 src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.5 --- src/usr.sbin/sysinst/arch/ews4800mips/md.c:1.4 Sat Jul 13 17:13:37 2019 +++ src/usr.sbin/sysinst/arch/ews4800mips/md.c Sat Dec 14 12:00:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.4 2019/07/13 17:13:37 martin Exp $ */ +/* $NetBSD: md.c,v 1.5 2019/12/14 12:00:40 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -259,7 +259,7 @@ md_parts_use_wholedisk(struct disk_parti }; boot_part.nat_type = parts->pscheme->get_fs_part_type( - boot_part.fs_type, boot_part.fs_sub_type); + PT_root, boot_part.fs_type, boot_part.fs_sub_type); return parts_use_wholedisk(parts, 1, _part); } Index: src/usr.sbin/sysinst/arch/prep/md.c diff -u src/usr.sbin/sysinst/arch/prep/md.c:1.9 src/usr.sbin/sysinst/arch/prep/md.c:1.10 --- src/usr.sbin/sysinst/arch/prep/md.c:1.9 Wed Aug 14 12:55:37 2019 +++ src/usr.sbin/sysinst/arch/prep/md.c Sat Dec 14 12:00:40 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.9 2019/08/14 12:55:37 martin Exp $ */ +/* $NetBSD: md.c,v 1.10 2019/12/14 12:00:40 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -282,7 +282,7 @@ md_parts_use_wholedisk(struct disk_parti }; boot_part.nat_type = parts->pscheme->get_fs_part_type( - boot_part.fs_type, boot_part.fs_sub_type); + PT_root, boot_part.fs_type, boot_part.fs_sub_type); return parts_use_wholedisk(parts, 1, _part); }
CVS commit: src/sys/dev/dm
Module Name:src Committed By: tkusumi Date: Sat Dec 14 11:20:51 UTC 2019 Modified Files: src/sys/dev/dm: device-mapper.c dm.h dm_ioctl.c Log Message: dm: Move extern declaration of global variables to dm.h To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/dev/dm/device-mapper.c cvs rdiff -u -r1.39 -r1.40 src/sys/dev/dm/dm.h cvs rdiff -u -r1.41 -r1.42 src/sys/dev/dm/dm_ioctl.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/dm/device-mapper.c diff -u src/sys/dev/dm/device-mapper.c:1.50 src/sys/dev/dm/device-mapper.c:1.51 --- src/sys/dev/dm/device-mapper.c:1.50 Sat Dec 14 10:49:30 2019 +++ src/sys/dev/dm/device-mapper.c Sat Dec 14 11:20:51 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: device-mapper.c,v 1.50 2019/12/14 10:49:30 tkusumi Exp $ */ +/*$NetBSD: device-mapper.c,v 1.51 2019/12/14 11:20:51 tkusumi Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -111,8 +111,6 @@ CFATTACH_DECL3_NEW(dm, 0, dm_match, dm_attach, dm_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN); -extern uint32_t dm_dev_counter; - /* * This structure is used to translate command sent to kernel driver in * command Index: src/sys/dev/dm/dm.h diff -u src/sys/dev/dm/dm.h:1.39 src/sys/dev/dm/dm.h:1.40 --- src/sys/dev/dm/dm.h:1.39 Thu Dec 12 16:28:24 2019 +++ src/sys/dev/dm/dm.h Sat Dec 14 11:20:51 2019 @@ -1,4 +1,4 @@ -/*$NetBSD: dm.h,v 1.39 2019/12/12 16:28:24 tkusumi Exp $ */ +/*$NetBSD: dm.h,v 1.40 2019/12/14 11:20:51 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -65,6 +65,9 @@ /*** Internal device-mapper structures ***/ +extern const struct dkdriver dmdkdriver; +extern uint32_t dm_dev_counter; + /* * A device mapper table is a list of physical ranges plus the mapping target * applied to them. Index: src/sys/dev/dm/dm_ioctl.c diff -u src/sys/dev/dm/dm_ioctl.c:1.41 src/sys/dev/dm/dm_ioctl.c:1.42 --- src/sys/dev/dm/dm_ioctl.c:1.41 Thu Dec 12 16:28:24 2019 +++ src/sys/dev/dm/dm_ioctl.c Sat Dec 14 11:20:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: dm_ioctl.c,v 1.41 2019/12/12 16:28:24 tkusumi Exp $ */ +/* $NetBSD: dm_ioctl.c,v 1.42 2019/12/14 11:20:51 tkusumi Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.41 2019/12/12 16:28:24 tkusumi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.42 2019/12/14 11:20:51 tkusumi Exp $"); /* * Locking is used to synchronise between ioctl calls and between dm_table's @@ -95,7 +95,6 @@ __KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v #include "dm.h" static uint32_t sc_minor_num; -extern const struct dkdriver dmdkdriver; uint32_t dm_dev_counter; /* Generic cf_data for device-mapper driver */
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Sat Dec 14 10:59:25 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
switch powerpc to GCC 8.
To generate a diff of this commit:
cvs rdiff -u -r1.1168 -r1.1169 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.1168 src/share/mk/bsd.own.mk:1.1169
--- src/share/mk/bsd.own.mk:1.1168 Wed Dec 4 11:47:52 2019
+++ src/share/mk/bsd.own.mk Sat Dec 14 10:59:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1168 2019/12/04 11:47:52 jmcneill Exp $
+# $NetBSD: bsd.own.mk,v 1.1169 2019/12/14 10:59:25 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -66,11 +66,12 @@ TOOLCHAIN_MISSING?= no
.if ${MACHINE} == "amd64" || \
${MACHINE} == "i386" || \
${MACHINE} == "ia64" || \
-${MACHINE} == "powerpc64" || \
${MACHINE} == "sparc" || \
${MACHINE} == "sparc64" || \
${MACHINE_CPU} == "aarch64" || \
${MACHINE_CPU} == "arm" || \
+${MACHINE_CPU} == "powerpc" || \
+${MACHINE_CPU} == "powerpc64" || \
${MACHINE_CPU} == "riscv"
HAVE_GCC?= 8
.else
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sat Dec 14 10:49:30 UTC 2019
Modified Files:
src/sys/dev/dm: device-mapper.c dm_dev.c dm_table.c dm_target.c
Log Message:
dm: Remove void casts of function calls
Use of void casts in dm is not consistent, just get rid of them.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/dm/device-mapper.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/dm/dm_dev.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dm/dm_table.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/dm/dm_target.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/dm/device-mapper.c
diff -u src/sys/dev/dm/device-mapper.c:1.49 src/sys/dev/dm/device-mapper.c:1.50
--- src/sys/dev/dm/device-mapper.c:1.49 Wed Dec 11 14:03:37 2019
+++ src/sys/dev/dm/device-mapper.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: device-mapper.c,v 1.49 2019/12/11 14:03:37 tkusumi Exp $ */
+/*$NetBSD: device-mapper.c,v 1.50 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -282,7 +282,7 @@ dm_detach(device_t self, int flags)
disk_destroy(dmv->diskp);
/* Destroy device */
- (void)dm_dev_free(dmv);
+ dm_dev_free(dmv);
/* Decrement device counter After removing device */
atomic_dec_32(_dev_counter);
@@ -505,9 +505,8 @@ disk_ioctl_switch(dev_t dev, u_long cmd,
* Call sync target routine for all table entries. Target sync
* routine basically call DIOCCACHESYNC on underlying devices.
*/
- SLIST_FOREACH(table_en, tbl, next) {
- (void)table_en->target->sync(table_en);
- }
+ SLIST_FOREACH(table_en, tbl, next)
+ table_en->target->sync(table_en);
dm_table_release(>table_head, DM_TABLE_ACTIVE);
dm_dev_unbusy(dmv);
break;
Index: src/sys/dev/dm/dm_dev.c
diff -u src/sys/dev/dm/dm_dev.c:1.14 src/sys/dev/dm/dm_dev.c:1.15
--- src/sys/dev/dm/dm_dev.c:1.14 Sat Dec 7 15:28:39 2019
+++ src/sys/dev/dm/dm_dev.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $ */
+/*$NetBSD: dm_dev.c,v 1.15 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.14 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_dev.c,v 1.15 2019/12/14 10:49:30 tkusumi Exp $");
#include
#include
@@ -306,7 +306,7 @@ dm_dev_destroy(void)
mutex_destroy(>dev_mtx);
cv_destroy(>dev_cv);
- (void)kmem_free(dmv, sizeof(dm_dev_t));
+ kmem_free(dmv, sizeof(dm_dev_t));
}
mutex_exit(_dev_mutex);
@@ -340,9 +340,9 @@ dm_dev_free(dm_dev_t *dmv)
cv_destroy(>dev_cv);
if (dmv->diskp != NULL)
- (void)kmem_free(dmv->diskp, sizeof(struct disk));
+ kmem_free(dmv->diskp, sizeof(struct disk));
- (void)kmem_free(dmv, sizeof(dm_dev_t));
+ kmem_free(dmv, sizeof(dm_dev_t));
return 0;
}
Index: src/sys/dev/dm/dm_table.c
diff -u src/sys/dev/dm/dm_table.c:1.12 src/sys/dev/dm/dm_table.c:1.13
--- src/sys/dev/dm/dm_table.c:1.12 Sat Dec 7 15:28:39 2019
+++ src/sys/dev/dm/dm_table.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_table.c,v 1.12 2019/12/07 15:28:39 tkusumi Exp $ */
+/*$NetBSD: dm_table.c,v 1.13 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.12 2019/12/07 15:28:39 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_table.c,v 1.13 2019/12/14 10:49:30 tkusumi Exp $");
#include
#include
@@ -248,7 +248,7 @@ dm_table_disksize(dm_table_head_t *head,
secsize = 0;
SLIST_FOREACH(table_en, tbl, next) {
length += table_en->length;
- (void)table_en->target->secsize(table_en, );
+ table_en->target->secsize(table_en, );
if (secsize < tsecsize)
secsize = tsecsize;
}
Index: src/sys/dev/dm/dm_target.c
diff -u src/sys/dev/dm/dm_target.c:1.27 src/sys/dev/dm/dm_target.c:1.28
--- src/sys/dev/dm/dm_target.c:1.27 Fri Dec 13 16:15:54 2019
+++ src/sys/dev/dm/dm_target.c Sat Dec 14 10:49:30 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target.c,v 1.27 2019/12/13 16:15:54 tkusumi Exp $ */
+/*$NetBSD: dm_target.c,v 1.28 2019/12/14 10:49:30 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.27 2019/12/13 16:15:54 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target.c,v 1.28 2019/12/14 10:49:30 tkusumi Exp $");
#include
#include
@@ -87,7 +87,7 @@ dm_target_autoload(const char *dm_target
gen = module_gen;
/* Try to autoload target module */
- (void)module_autoload(name, MODULE_CLASS_MISC);
+ module_autoload(name, MODULE_CLASS_MISC);
} while (gen !=
CVS commit: src/sys/dev/dm
Module Name:src
Committed By: tkusumi
Date: Sat Dec 14 10:02:35 UTC 2019
Modified Files:
src/sys/dev/dm: dm_target_error.c dm_target_linear.c dm_target_mirror.c
dm_target_snapshot.c dm_target_stripe.c dm_target_zero.c
Log Message:
dm: Remove unconditional debug prints in targets' ->strategy()
Having debug prints in ->strategy() by default just to tell ->strategy()
is called is overkill.
taken-from: DragonFlyBSD
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/dm/dm_target_mirror.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/dm/dm_target_snapshot.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/dm/dm_target_zero.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/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.19 src/sys/dev/dm/dm_target_error.c:1.20
--- src/sys/dev/dm/dm_target_error.c:1.19 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_error.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_error.c,v 1.19 2019/12/12 16:28:24 tkusumi Exp $ */
+/*$NetBSD: dm_target_error.c,v 1.20 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.19 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.20 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -133,8 +133,6 @@ int
dm_target_error_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- printf("Error target read function called!!\n");
-
bp->b_error = EIO;
bp->b_resid = 0;
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.27 src/sys/dev/dm/dm_target_linear.c:1.28
--- src/sys/dev/dm/dm_target_linear.c:1.27 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_linear.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_linear.c,v 1.27 2019/12/12 16:28:24 tkusumi Exp $ */
+/*$NetBSD: dm_target_linear.c,v 1.28 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.27 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.28 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -114,15 +114,11 @@ dm_target_linear_strategy(dm_table_entry
tlc = table_en->target_config;
-/* printf("Linear target read function called %" PRIu64 "!!\n",
- tlc->offset);*/
-
bp->b_blkno += tlc->offset;
VOP_STRATEGY(tlc->pdev->pdev_vnode, bp);
return 0;
-
}
/*
Index: src/sys/dev/dm/dm_target_mirror.c
diff -u src/sys/dev/dm/dm_target_mirror.c:1.18 src/sys/dev/dm/dm_target_mirror.c:1.19
--- src/sys/dev/dm/dm_target_mirror.c:1.18 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_mirror.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_mirror.c,v 1.18 2019/12/12 16:28:24 tkusumi Exp $*/
+/*$NetBSD: dm_target_mirror.c,v 1.19 2019/12/14 10:02:35 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.18 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_mirror.c,v 1.19 2019/12/14 10:02:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper mirror target.
@@ -149,8 +149,6 @@ int
dm_target_mirror_strategy(dm_table_entry_t *table_en, struct buf *bp)
{
- printf("Mirror target read function called!!\n");
-
bp->b_error = EIO;
bp->b_resid = 0;
Index: src/sys/dev/dm/dm_target_snapshot.c
diff -u src/sys/dev/dm/dm_target_snapshot.c:1.30 src/sys/dev/dm/dm_target_snapshot.c:1.31
--- src/sys/dev/dm/dm_target_snapshot.c:1.30 Thu Dec 12 16:28:24 2019
+++ src/sys/dev/dm/dm_target_snapshot.c Sat Dec 14 10:02:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_snapshot.c,v 1.30 2019/12/12 16:28:24 tkusumi Exp $ */
+/*$NetBSD: dm_target_snapshot.c,v 1.31 2019/12/14 10:02:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.30 2019/12/12 16:28:24 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_snapshot.c,v 1.31 2019/12/14 10:02:35 tkusumi Exp $");
/*
* 1. Suspend my_data to temporarily stop any I/O while the snapshot is being
@@
CVS commit: src/external/gpl2/lvm2/dist/libdm/ioctl
Module Name:src
Committed By: mlelstv
Date: Sat Dec 14 09:05:30 UTC 2019
Modified Files:
src/external/gpl2/lvm2/dist/libdm/ioctl: libdm_netbsd.c
Log Message:
Handle NULL params, fix error paths.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.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/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c
diff -u src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.7 src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.8
--- src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c:1.7 Tue Feb 8 03:26:12 2011
+++ src/external/gpl2/lvm2/dist/libdm/ioctl/libdm_netbsd.c Sat Dec 14 09:05:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: libdm_netbsd.c,v 1.7 2011/02/08 03:26:12 haad Exp $*/
+/* $NetBSD: libdm_netbsd.c,v 1.8 2019/12/14 09:05:30 mlelstv Exp $*/
/*
* Copyright (c) 1996, 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -345,9 +345,10 @@ dm_table_status(libdm_task_t task, struc
type = libdm_table_get_target(table);
params = libdm_table_get_params(table);
- if (params != NULL)
- plen = strlen(params) + 1;
+ if (params == NULL)
+ params = "";
+ plen = strlen(params) + 1;
rec_size = sizeof(struct dm_target_spec) + plen;
/*
@@ -357,17 +358,17 @@ dm_table_status(libdm_task_t task, struc
*/
next += rec_size;
- if (rec_size > dmi->data_size)
+ if (rec_size > dmi->data_size) {
+ libdm_table_destroy(table);
+ libdm_iter_destroy(iter);
return -ENOMEM;
+ }
dmts->next = next;
strlcpy(dmts->target_type, type, DM_MAX_TYPE_NAME);
params_start = (char *)dmts + sizeof(struct dm_target_spec);
- if (params != NULL)
- strlcpy(params_start, params, plen);
- else
- params_start = "\0";
+ strlcpy(params_start, params, plen);
odmts = dmts;
dmts = (struct dm_target_spec *)((uint8_t *)dmts + rec_size);
