CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Dec 31 05:44:25 UTC 2022
Modified Files:
src/external/gpl3/binutils.old/dist/gas: Makefile.am Makefile.in
src/external/gpl3/binutils/dist/gas: Makefile.am Makefile.in
src/tools/binutils: Makefile
Log Message:
fix the binutils build with read-only source trees
don't play with m68k-parse.c in tools/binutils/Makefile but disable
the rules that rebuild it so we always use the upstream version,
using the standard "NetBSD_DISABLED" method.
this was necessary to build on linux in 2014 (which may or may not
still ne necessary), but it also avoids triggering rebuild rules
based upon the timestamps on .y vs .c.
tested with amiga, amd64, and i386 "build.sh tools" builds.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils.old/dist/gas/Makefile.am \
src/external/gpl3/binutils.old/dist/gas/Makefile.in
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/gas/Makefile.am
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/gas/Makefile.in
cvs rdiff -u -r1.35 -r1.36 src/tools/binutils/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils.old/dist/gas/Makefile.am
diff -u src/external/gpl3/binutils.old/dist/gas/Makefile.am:1.7 src/external/gpl3/binutils.old/dist/gas/Makefile.am:1.8
--- src/external/gpl3/binutils.old/dist/gas/Makefile.am:1.7 Fri Dec 23 17:09:21 2022
+++ src/external/gpl3/binutils.old/dist/gas/Makefile.am Sat Dec 31 05:44:25 2022
@@ -452,6 +452,8 @@ EXTRA_as_new_SOURCES += config/m68k-pars
# the other hand it's good that people who use the prebuilt
# m68k-parse.c don't get a spurious absolute path.
m68k-parse.c: $(srcdir)/config/m68k-parse.y
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_m68k-parse.c:
f=$(srcdir)/config/m68k-parse.y; \
if [ $$f = "./config/m68k-parse.y" ]; then \
ln -s config/m68k-parse.y . > /dev/null 2>/dev/null || \
Index: src/external/gpl3/binutils.old/dist/gas/Makefile.in
diff -u src/external/gpl3/binutils.old/dist/gas/Makefile.in:1.7 src/external/gpl3/binutils.old/dist/gas/Makefile.in:1.8
--- src/external/gpl3/binutils.old/dist/gas/Makefile.in:1.7 Fri Dec 23 17:09:21 2022
+++ src/external/gpl3/binutils.old/dist/gas/Makefile.in Sat Dec 31 05:44:25 2022
@@ -1583,6 +1583,8 @@ development.exp: $(BFDDIR)/development.s
# the other hand it's good that people who use the prebuilt
# m68k-parse.c don't get a spurious absolute path.
m68k-parse.c: $(srcdir)/config/m68k-parse.y
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_m68k-parse.c:
f=$(srcdir)/config/m68k-parse.y; \
if [ $$f = "./config/m68k-parse.y" ]; then \
ln -s config/m68k-parse.y . > /dev/null 2>/dev/null || \
Index: src/external/gpl3/binutils/dist/gas/Makefile.am
diff -u src/external/gpl3/binutils/dist/gas/Makefile.am:1.9 src/external/gpl3/binutils/dist/gas/Makefile.am:1.10
--- src/external/gpl3/binutils/dist/gas/Makefile.am:1.9 Sat Dec 24 20:17:05 2022
+++ src/external/gpl3/binutils/dist/gas/Makefile.am Sat Dec 31 05:44:25 2022
@@ -445,6 +445,8 @@ development.exp: $(BFDDIR)/development.s
EXTRA_as_new_SOURCES += config/m68k-parse.y
config/m68k-parse.c: $(srcdir)/config/m68k-parse.y
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_config_m68k-parse.c:
$(SHELL) $(YLWRAP) $(srcdir)/config/m68k-parse.y y.tab.c $@ -- $(YACCCOMPILE)
config/m68k-parse.h: config/m68k-parse.c
@true
Index: src/external/gpl3/binutils/dist/gas/Makefile.in
diff -u src/external/gpl3/binutils/dist/gas/Makefile.in:1.10 src/external/gpl3/binutils/dist/gas/Makefile.in:1.11
--- src/external/gpl3/binutils/dist/gas/Makefile.in:1.10 Fri Dec 30 15:41:35 2022
+++ src/external/gpl3/binutils/dist/gas/Makefile.in Sat Dec 31 05:44:25 2022
@@ -2048,6 +2048,8 @@ development.exp: $(BFDDIR)/development.s
$(EGREP) "(development|experimental)=" $(BFDDIR)/development.sh \
| $(AWK) -F= '{ print "set " $$1 " " $$2 }' > $@
config/m68k-parse.c: $(srcdir)/config/m68k-parse.y
+ @echo "NOT REBUILDING $@"
+NetBSD_DISABLED_config_m68k-parse.c:
$(SHELL) $(YLWRAP) $(srcdir)/config/m68k-parse.y y.tab.c $@ -- $(YACCCOMPILE)
config/m68k-parse.h: config/m68k-parse.c
@true
Index: src/tools/binutils/Makefile
diff -u src/tools/binutils/Makefile:1.35 src/tools/binutils/Makefile:1.36
--- src/tools/binutils/Makefile:1.35 Sun Dec 25 17:25:22 2022
+++ src/tools/binutils/Makefile Sat Dec 31 05:44:25 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2022/12/25 17:25:22 christos Exp $
+# $NetBSD: Makefile,v 1.36 2022/12/31 05:44:25 mrg Exp $
.include
@@ -16,21 +16,6 @@ CONFIGURE_ARGS= --target=${MACHINE_GNU_P
--disable-werror --enable-initfini-array=yes \
${BRANDING}
-.if exists(${GNUHOSTDIST}/gas/config/m68k-parse.c)
-M68K_PARSE=${GNUHOSTDIST}/gas/config/m68k-parse.c
-.elif exists(${GNUHOSTDIST}/gas/m68k-parse.c)
-M68K_PARSE=${GNUHOSTDIST}/gas/m68k-parse.c
-.else
-.error "Can't find m68k-parse.c
-.endif
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Dec 31 05:44:25 UTC 2022 Modified Files: src/external/gpl3/binutils.old/dist/gas: Makefile.am Makefile.in src/external/gpl3/binutils/dist/gas: Makefile.am Makefile.in src/tools/binutils: Makefile Log Message: fix the binutils build with read-only source trees don't play with m68k-parse.c in tools/binutils/Makefile but disable the rules that rebuild it so we always use the upstream version, using the standard "NetBSD_DISABLED" method. this was necessary to build on linux in 2014 (which may or may not still ne necessary), but it also avoids triggering rebuild rules based upon the timestamps on .y vs .c. tested with amiga, amd64, and i386 "build.sh tools" builds. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils.old/dist/gas/Makefile.am \ src/external/gpl3/binutils.old/dist/gas/Makefile.in cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/gas/Makefile.am cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/binutils/dist/gas/Makefile.in cvs rdiff -u -r1.35 -r1.36 src/tools/binutils/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: snj Date: Sat Dec 31 05:03:52 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: 1558 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.34 src/doc/CHANGES-9.4:1.1.2.35 --- src/doc/CHANGES-9.4:1.1.2.34 Fri Dec 30 14:40:05 2022 +++ src/doc/CHANGES-9.4 Sat Dec 31 05:03:52 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.34 2022/12/30 14:40:05 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.35 2022/12/31 05:03:52 snj Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -502,3 +502,9 @@ sys/dev/usb/umass_isdata.c (apply patc fix a use-after-free, fix silent stall on NOIRQ ports. [tsutsui, ticket #1557] +usr.sbin/sysinst/disklabel.c 1.46-1.48 +usr.sbin/sysinst/label.c 1.40-1.41 + + PR 56886: fix space accounting in sysinst after deleting partitions. + [martin, ticket #1558] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: snj Date: Sat Dec 31 05:03:52 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: 1558 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Sat Dec 31 05:03:14 UTC 2022 Modified Files: src/usr.sbin/sysinst [netbsd-9]: disklabel.c label.c Log Message: Pull up following revision(s) (requested by martin in ticket #1558): usr.sbin/sysinst/disklabel.c: 1.46-1.48 usr.sbin/sysinst/label.c: 1.40-1.41 disklabel_can_add_partition() did not consider additional partitions (while there still is space in the disklabel). Part of PR 56886. Fix free space accounting for partition size changes and deletions. Part of PR 56886. renumber_partitions() needs to deal with removed/added partitions. Fix free space accounting when partitions change size or are deleted. Part of PR 56886. Fix inverted condition in previous and only apply special handling for the "all of NetBSD" partition when we have an outer MBR label. Pointed out by Izumi Tsutsui. Hopefully the last fix needed for PR 56886. To generate a diff of this commit: cvs rdiff -u -r1.10.2.10 -r1.10.2.11 src/usr.sbin/sysinst/disklabel.c cvs rdiff -u -r1.10.2.8 -r1.10.2.9 src/usr.sbin/sysinst/label.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Sat Dec 31 05:03:14 UTC 2022
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: disklabel.c label.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #1558):
usr.sbin/sysinst/disklabel.c: 1.46-1.48
usr.sbin/sysinst/label.c: 1.40-1.41
disklabel_can_add_partition() did not consider additional partitions
(while there still is space in the disklabel). Part of PR 56886.
Fix free space accounting for partition size changes and deletions.
Part of PR 56886.
renumber_partitions() needs to deal with removed/added partitions.
Fix free space accounting when partitions change size or are deleted.
Part of PR 56886.
Fix inverted condition in previous and only apply special handling for
the "all of NetBSD" partition when we have an outer MBR label.
Pointed out by Izumi Tsutsui. Hopefully the last fix needed for PR 56886.
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.10 -r1.10.2.11 src/usr.sbin/sysinst/disklabel.c
cvs rdiff -u -r1.10.2.8 -r1.10.2.9 src/usr.sbin/sysinst/label.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.10.2.10 src/usr.sbin/sysinst/disklabel.c:1.10.2.11
--- src/usr.sbin/sysinst/disklabel.c:1.10.2.10 Thu Oct 15 19:36:50 2020
+++ src/usr.sbin/sysinst/disklabel.c Sat Dec 31 05:03:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.10.2.10 2020/10/15 19:36:50 bouyer Exp $ */
+/* $NetBSD: disklabel.c,v 1.10.2.11 2022/12/31 05:03:14 snj Exp $ */
/*
* Copyright 2018 The NetBSD Foundation, Inc.
@@ -520,6 +520,8 @@ disklabel_delete(struct disk_partitions
if (parts->install_target ==
parts->l.d_partitions[part].p_offset)
parts->install_target = -1;
+ parts->dp.free_space +=
+ parts->l.d_partitions[part].p_size;
parts->l.d_partitions[part].p_size = 0;
parts->l.d_partitions[part].p_offset = 0;
parts->l.d_partitions[part].p_fstype = FS_UNUSED;
@@ -821,6 +823,16 @@ disklabel_set_part_info(struct disk_part
was_inst_target = parts->l.d_partitions[part].p_offset
== parts->install_target;
parts->l.d_partitions[part].p_offset = info->start;
+ if (part != RAW_PART
+#if RAW_PART == 3
+&& (part != RAW_PART-1 ||
+parts->dp.parent == NULL)
+#endif
+ ) {
+parts->dp.free_space +=
+parts->l.d_partitions[part].p_size -
+info->size;
+ }
parts->l.d_partitions[part].p_size = info->size;
parts->l.d_partitions[part].p_fstype =
dl_part_type_from_generic(info->nat_type);
@@ -939,7 +951,8 @@ disklabel_can_add_partition(const struct
if (disklabel_get_free_spaces_internal(parts, , 1,
parts->ptn_alignment, parts->ptn_alignment, 0, -1) < 1)
return false;
-
+ if (parts->l.d_npartitions < dl_maxpart)
+ return true;
for (i = 0; i < parts->l.d_npartitions; i++) {
if (i == RAW_PART)
continue;
Index: src/usr.sbin/sysinst/label.c
diff -u src/usr.sbin/sysinst/label.c:1.10.2.8 src/usr.sbin/sysinst/label.c:1.10.2.9
--- src/usr.sbin/sysinst/label.c:1.10.2.8 Wed Jun 22 23:48:54 2022
+++ src/usr.sbin/sysinst/label.c Sat Dec 31 05:03:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.10.2.8 2022/06/22 23:48:54 msaitoh Exp $ */
+/* $NetBSD: label.c,v 1.10.2.9 2022/12/31 05:03:14 snj Exp $ */
/*
* Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.10.2.8 2022/06/22 23:48:54 msaitoh Exp $");
+__RCSID("$NetBSD: label.c,v 1.10.2.9 2022/12/31 05:03:14 snj Exp $");
#endif
#include
@@ -505,7 +505,7 @@ renumber_partitions(struct partition_usa
if (!pset->parts->pscheme->get_part_info(pset->parts, pno,
))
continue;
- for (i = 0; i < pset->parts->num_part; i++) {
+ for (i = 0; i < pset->num; i++) {
if (pset->infos[i].cur_start != info.start)
continue;
if (pset->infos[i].cur_flags != info.flags)
@@ -522,8 +522,9 @@ renumber_partitions(struct partition_usa
}
}
- memcpy(pset->infos, ninfos, sizeof(*pset->infos)*pset->parts->num_part);
- free(ninfos);
+ free(pset->infos);
+ pset->infos = ninfos;
+ pset->num = pset->parts->num_part;
}
/*
@@ -980,6 +981,9 @@ edit_ptn(menudesc *menu, void *arg)
if (!pset->parts->pscheme->set_part_info(pset->parts,
edit.id, , ))
err_msg_win(err);
+ else
+pset->cur_free_space += edit.old_info.size -
+edit.info.size;
}
/*
@@ -1009,7 +1013,7 @@ edit_ptn(menudesc *menu, void *arg)
}
remember_deleted(pset,
pset->infos[edit.index].parts);
- pset->cur_free_space += pset->infos[edit.index].size;
+ pset->cur_free_space += edit.info.size;
memmove(pset->infos+edit.index,
pset->infos+edit.index+1,
sizeof(*pset->infos)*(pset->num-edit.index));
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: snj Date: Sat Dec 31 04:55:53 UTC 2022 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: 30 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: snj Date: Sat Dec 31 04:55:53 UTC 2022 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: 30 To generate a diff of this commit: cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/doc/CHANGES-10.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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.13 src/doc/CHANGES-10.0:1.1.2.14 --- src/doc/CHANGES-10.0:1.1.2.13 Thu Dec 29 09:40:26 2022 +++ src/doc/CHANGES-10.0 Sat Dec 31 04:55:53 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.13 2022/12/29 09:40:26 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.14 2022/12/31 04:55:53 snj Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -406,3 +406,11 @@ sys/arch/arm/nxp/if_enet_imx.c 1.7 invalid DTB. [mrg, ticket #29] +usr.sbin/sysinst/bsddisklabel.c 1.71 + + PR 57132: when calculation additional space available for the + "expanded" partition (typically /) do not forget the reserved + space (that might be required for the system/bootloader/other + MD stuff). + [martin, ticket #30] +
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src
Committed By: snj
Date: Sat Dec 31 04:55:13 UTC 2022
Modified Files:
src/usr.sbin/sysinst [netbsd-10]: bsddisklabel.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #30):
usr.sbin/sysinst/bsddisklabel.c: revision 1.71
PR 57132: when calculation additional space available for the "expanded"
partition (typically /) do not forget the reserved space (that might
be required for the system/bootloader/other MD stuff).
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.2.1 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.69 src/usr.sbin/sysinst/bsddisklabel.c:1.69.2.1
--- src/usr.sbin/sysinst/bsddisklabel.c:1.69 Thu Dec 15 15:32:04 2022
+++ src/usr.sbin/sysinst/bsddisklabel.c Sat Dec 31 04:55:12 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.69 2022/12/15 15:32:04 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.69.2.1 2022/12/31 04:55:12 snj Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1434,7 +1434,8 @@ apply_settings_to_partitions(struct disk
* but check size limits.
*/
if (exp_ndx < wanted->num) {
- daddr_t free_space = parts->free_space - planned_space;
+ daddr_t free_space = parts->free_space - planned_space -
+ wanted->reserved_space;
daddr_t new_size = wanted->infos[exp_ndx].size;
if (free_space > 0)
new_size += roundup(free_space,align);
CVS commit: [netbsd-10] src/usr.sbin/sysinst
Module Name:src Committed By: snj Date: Sat Dec 31 04:55:13 UTC 2022 Modified Files: src/usr.sbin/sysinst [netbsd-10]: bsddisklabel.c Log Message: Pull up following revision(s) (requested by martin in ticket #30): usr.sbin/sysinst/bsddisklabel.c: revision 1.71 PR 57132: when calculation additional space available for the "expanded" partition (typically /) do not forget the reserved space (that might be required for the system/bootloader/other MD stuff). To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.69.2.1 src/usr.sbin/sysinst/bsddisklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/shar
Module Name:src Committed By: ginsbach Date: Sat Dec 31 03:44:18 UTC 2022 Modified Files: src/usr.bin/shar: shar.sh Log Message: shar: send usage message to standard error so it is not swallowd by redirection. >From FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/shar/shar.sh 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/shar/shar.sh diff -u src/usr.bin/shar/shar.sh:1.5 src/usr.bin/shar/shar.sh:1.6 --- src/usr.bin/shar/shar.sh:1.5 Sat Dec 31 03:38:59 2022 +++ src/usr.bin/shar/shar.sh Sat Dec 31 03:44:18 2022 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: shar.sh,v 1.5 2022/12/31 03:38:59 ginsbach Exp $ +# $NetBSD: shar.sh,v 1.6 2022/12/31 03:44:18 ginsbach Exp $ # # Copyright (c) 1990, 1993 # The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ # if [ $# -eq 0 ]; then - echo 'usage: shar file ...' + echo 'usage: shar file ...' 1>&2 exit 1 fi
CVS commit: src/usr.bin/shar
Module Name:src Committed By: ginsbach Date: Sat Dec 31 03:44:18 UTC 2022 Modified Files: src/usr.bin/shar: shar.sh Log Message: shar: send usage message to standard error so it is not swallowd by redirection. >From FreeBSD To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/shar/shar.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/shar
Module Name:src Committed By: ginsbach Date: Sat Dec 31 03:38:59 UTC 2022 Modified Files: src/usr.bin/shar: shar.sh Log Message: better handle special characters or white space in file names fed to shar Code from Dave Sainty in PR bin/11107 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/shar/shar.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/shar
Module Name:src Committed By: ginsbach Date: Sat Dec 31 03:38:59 UTC 2022 Modified Files: src/usr.bin/shar: shar.sh Log Message: better handle special characters or white space in file names fed to shar Code from Dave Sainty in PR bin/11107 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/shar/shar.sh 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/shar/shar.sh diff -u src/usr.bin/shar/shar.sh:1.4 src/usr.bin/shar/shar.sh:1.5 --- src/usr.bin/shar/shar.sh:1.4 Sat Dec 31 03:33:53 2022 +++ src/usr.bin/shar/shar.sh Sat Dec 31 03:38:59 2022 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: shar.sh,v 1.4 2022/12/31 03:33:53 ginsbach Exp $ +# $NetBSD: shar.sh,v 1.5 2022/12/31 03:38:59 ginsbach Exp $ # # Copyright (c) 1990, 1993 # The Regents of the University of California. All rights reserved. @@ -56,13 +56,13 @@ echo "#" for i do - if [ -d $i ]; then - echo "echo c - $i" - echo "mkdir -p $i > /dev/null 2>&1" + if [ -d "$i" ]; then + echo "echo c - '$i'" + echo "mkdir -p '$i' > /dev/null 2>&1" else - echo "echo x - $i" - echo "sed 's/^X//' >$i << 'END-of-$i'" - sed 's/^/X/' $i || exit 1 + echo "echo x - '$i'" + echo "sed 's/^X//' >'$i' << 'END-of-$i'" + sed 's/^/X/' "$i" || exit 1 echo "END-of-$i" fi done
CVS commit: src/usr.bin/shar
Module Name:src Committed By: ginsbach Date: Sat Dec 31 03:33:53 UTC 2022 Modified Files: src/usr.bin/shar: shar.sh Log Message: make sure a sed failure in the generated archive stops execution Code from Dave Sainty in PR bin/11107 (similar in FreeBSD) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/shar/shar.sh 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/shar/shar.sh diff -u src/usr.bin/shar/shar.sh:1.3 src/usr.bin/shar/shar.sh:1.4 --- src/usr.bin/shar/shar.sh:1.3 Thu Jun 30 02:36:35 2005 +++ src/usr.bin/shar/shar.sh Sat Dec 31 03:33:53 2022 @@ -1,6 +1,6 @@ #!/bin/sh - # -# $NetBSD: shar.sh,v 1.3 2005/06/30 02:36:35 perry Exp $ +# $NetBSD: shar.sh,v 1.4 2022/12/31 03:33:53 ginsbach Exp $ # # Copyright (c) 1990, 1993 # The Regents of the University of California. All rights reserved. @@ -62,7 +62,7 @@ do else echo "echo x - $i" echo "sed 's/^X//' >$i << 'END-of-$i'" - sed 's/^/X/' $i + sed 's/^/X/' $i || exit 1 echo "END-of-$i" fi done
CVS commit: src/usr.bin/shar
Module Name:src Committed By: ginsbach Date: Sat Dec 31 03:33:53 UTC 2022 Modified Files: src/usr.bin/shar: shar.sh Log Message: make sure a sed failure in the generated archive stops execution Code from Dave Sainty in PR bin/11107 (similar in FreeBSD) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/shar/shar.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/isa
Module Name:src Committed By: jakllsch Date: Fri Dec 30 21:40:20 UTC 2022 Modified Files: src/sys/arch/x86/isa: rtc.c Log Message: Honor ACPI FADT Century byte; should fix many "unknown CMOS layout" messages. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/isa/rtc.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/isa/rtc.c diff -u src/sys/arch/x86/isa/rtc.c:1.1 src/sys/arch/x86/isa/rtc.c:1.2 --- src/sys/arch/x86/isa/rtc.c:1.1 Tue Jun 16 21:05:34 2009 +++ src/sys/arch/x86/isa/rtc.c Fri Dec 30 21:40:20 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: rtc.c,v 1.1 2009/06/16 21:05:34 bouyer Exp $ */ +/* $NetBSD: rtc.c,v 1.2 2022/12/30 21:40:20 jakllsch Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -121,7 +121,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT */ #include -__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.1 2009/06/16 21:05:34 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.2 2022/12/30 21:40:20 jakllsch Exp $"); #include #include @@ -145,6 +145,11 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.1 #include /* for MCA_system */ #endif +#include "acpica.h" +#if NACPICA > 0 +#include +#endif + static void rtcinit(void); static int rtcget(mc_todregs *); static void rtcput(mc_todregs *); @@ -269,6 +274,12 @@ clock_expandyear(int clockyear) return (clockyear); s = splclock(); +#if NACPICA > 0 + if (acpi_active) + cmoscentury = mc146818_read(NULL, + (centb = AcpiGbl_FADT.Century)); + else +#endif if (cmoscheck()) cmoscentury = mc146818_read(NULL, NVRAM_CENTURY); #if NMCA > 0
CVS commit: src/sys/arch/x86/isa
Module Name:src Committed By: jakllsch Date: Fri Dec 30 21:40:20 UTC 2022 Modified Files: src/sys/arch/x86/isa: rtc.c Log Message: Honor ACPI FADT Century byte; should fix many "unknown CMOS layout" messages. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/isa/rtc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Fri Dec 30 21:38:13 UTC 2022
Modified Files:
src/sys/dev/pci: virtio.c
Log Message:
Fix dmamap_syncs more; the number of ring elements is vq->vq_num, not
sc->sc_nvqs.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.63 src/sys/dev/pci/virtio.c:1.64
--- src/sys/dev/pci/virtio.c:1.63 Mon Oct 31 13:00:34 2022
+++ src/sys/dev/pci/virtio.c Fri Dec 30 21:38:13 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.63 2022/10/31 13:00:34 simonb Exp $ */
+/* $NetBSD: virtio.c,v 1.64 2022/12/30 21:38:13 jakllsch Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.63 2022/10/31 13:00:34 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.64 2022/12/30 21:38:13 jakllsch Exp $");
#include
#include
@@ -450,7 +450,7 @@ static inline void
vq_sync_aring_all(struct virtio_softc *sc, struct virtqueue *vq, int ops)
{
uint16_t hdrlen = offsetof(struct vring_avail, ring);
- size_t payloadlen = sc->sc_nvqs * sizeof(uint16_t);
+ size_t payloadlen = vq->vq_num * sizeof(uint16_t);
size_t usedlen = 0;
if (sc->sc_active_features & VIRTIO_F_RING_EVENT_IDX)
@@ -472,7 +472,7 @@ static inline void
vq_sync_aring_payload(struct virtio_softc *sc, struct virtqueue *vq, int ops)
{
uint16_t hdrlen = offsetof(struct vring_avail, ring);
- size_t payloadlen = sc->sc_nvqs * sizeof(uint16_t);
+ size_t payloadlen = vq->vq_num * sizeof(uint16_t);
bus_dmamap_sync(sc->sc_dmat, vq->vq_dmamap,
vq->vq_availoffset + hdrlen, payloadlen, ops);
@@ -482,7 +482,7 @@ static inline void
vq_sync_aring_used(struct virtio_softc *sc, struct virtqueue *vq, int ops)
{
uint16_t hdrlen = offsetof(struct vring_avail, ring);
- size_t payloadlen = sc->sc_nvqs * sizeof(uint16_t);
+ size_t payloadlen = vq->vq_num * sizeof(uint16_t);
size_t usedlen = sizeof(uint16_t);
if ((sc->sc_active_features & VIRTIO_F_RING_EVENT_IDX) == 0)
@@ -495,7 +495,7 @@ static inline void
vq_sync_uring_all(struct virtio_softc *sc, struct virtqueue *vq, int ops)
{
uint16_t hdrlen = offsetof(struct vring_used, ring);
- size_t payloadlen = sc->sc_nvqs * sizeof(struct vring_used_elem);
+ size_t payloadlen = vq->vq_num * sizeof(struct vring_used_elem);
size_t availlen = 0;
if (sc->sc_active_features & VIRTIO_F_RING_EVENT_IDX)
@@ -517,7 +517,7 @@ static inline void
vq_sync_uring_payload(struct virtio_softc *sc, struct virtqueue *vq, int ops)
{
uint16_t hdrlen = offsetof(struct vring_used, ring);
- size_t payloadlen = sc->sc_nvqs * sizeof(struct vring_used_elem);
+ size_t payloadlen = vq->vq_num * sizeof(struct vring_used_elem);
bus_dmamap_sync(sc->sc_dmat, vq->vq_dmamap,
vq->vq_usedoffset + hdrlen, payloadlen, ops);
@@ -527,7 +527,7 @@ static inline void
vq_sync_uring_avail(struct virtio_softc *sc, struct virtqueue *vq, int ops)
{
uint16_t hdrlen = offsetof(struct vring_used, ring);
- size_t payloadlen = sc->sc_nvqs * sizeof(struct vring_used_elem);
+ size_t payloadlen = vq->vq_num * sizeof(struct vring_used_elem);
size_t availlen = sizeof(uint16_t);
if ((sc->sc_active_features & VIRTIO_F_RING_EVENT_IDX) == 0)
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Fri Dec 30 21:38:13 UTC 2022 Modified Files: src/sys/dev/pci: virtio.c Log Message: Fix dmamap_syncs more; the number of ring elements is vq->vq_num, not sc->sc_nvqs. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Fri Dec 30 21:12:45 UTC 2022 Modified Files: src/share/misc: style Log Message: Move a style recommendation closer to the syntax that it describes. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: jkoshy
Date: Fri Dec 30 21:12:45 UTC 2022
Modified Files:
src/share/misc: style
Log Message:
Move a style recommendation closer to the syntax that it describes.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/share/misc/style
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/style
diff -u src/share/misc/style:1.66 src/share/misc/style:1.67
--- src/share/misc/style:1.66 Fri Dec 30 17:02:31 2022
+++ src/share/misc/style Fri Dec 30 21:12:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $ */
+/* $NetBSD: style,v 1.67 2022/12/30 21:12:44 jkoshy Exp $ */
/*
* The revision control tag appears first, with a blank line after it.
@@ -30,7 +30,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $");
+__RCSID("$NetBSD: style,v 1.67 2022/12/30 21:12:44 jkoshy Exp $");
/*
* VERY important single-line comments look like this.
@@ -260,11 +260,13 @@ main(int argc, char *argv[])
* Braces around single-line bodies are optional; use discretion.
*
* Use narrow scopes for loop variables where possible.
- *
- * Forever loops are done with for's, not while's.
*/
for (char *p = buf; *p != '\0'; ++p)
continue; /* Explicit no-op */
+
+ /*
+ * Forever loops are done with for's, not while's.
+ */
for (;;)
stmt;
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Fri Dec 30 20:37:01 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: KOBO NETWALKER Log Message: s/Cotroller/Controller/ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/NETWALKER Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/KOBO diff -u src/sys/arch/evbarm/conf/KOBO:1.12 src/sys/arch/evbarm/conf/KOBO:1.13 --- src/sys/arch/evbarm/conf/KOBO:1.12 Tue Sep 29 19:58:50 2020 +++ src/sys/arch/evbarm/conf/KOBO Fri Dec 30 20:37:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: KOBO,v 1.12 2020/09/29 19:58:50 jmcneill Exp $ +# $NetBSD: KOBO,v 1.13 2022/12/30 20:37:01 andvar Exp $ # # KOBO -- http://kobo.com # @@ -55,7 +55,7 @@ cpu* at mainbus? # On-chip bus axi0 at mainbus? -# Interrupt Cotroller +# Interrupt Controller tzic0 at axi? addr 0x0fffc000 size 0x4000 irqbase 0 # Serial Index: src/sys/arch/evbarm/conf/NETWALKER diff -u src/sys/arch/evbarm/conf/NETWALKER:1.41 src/sys/arch/evbarm/conf/NETWALKER:1.42 --- src/sys/arch/evbarm/conf/NETWALKER:1.41 Tue Sep 29 19:58:50 2020 +++ src/sys/arch/evbarm/conf/NETWALKER Fri Dec 30 20:37:01 2022 @@ -1,4 +1,4 @@ -# $NetBSD: NETWALKER,v 1.41 2020/09/29 19:58:50 jmcneill Exp $ +# $NetBSD: NETWALKER,v 1.42 2022/12/30 20:37:01 andvar Exp $ # # NETWALKER -- http://www.sharp.co.jp/netwalker/ # @@ -48,7 +48,7 @@ cpu0 at mainbus? # On-chip bus axi0 at mainbus? -# Interrupt Cotroller +# Interrupt Controller tzic0 at axi? addr 0xe000 size 0x4000 irqbase 0 # Serial
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: andvar Date: Fri Dec 30 20:37:01 UTC 2022 Modified Files: src/sys/arch/evbarm/conf: KOBO NETWALKER Log Message: s/Cotroller/Controller/ To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/KOBO cvs rdiff -u -r1.41 -r1.42 src/sys/arch/evbarm/conf/NETWALKER Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: andvar Date: Fri Dec 30 20:25:56 UTC 2022 Modified Files: src/sys/dev/ic: cd18xxreg.h Log Message: s/mdoem/modem/ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/cd18xxreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: andvar Date: Fri Dec 30 20:25:56 UTC 2022 Modified Files: src/sys/dev/ic: cd18xxreg.h Log Message: s/mdoem/modem/ To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/cd18xxreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/cd18xxreg.h diff -u src/sys/dev/ic/cd18xxreg.h:1.4 src/sys/dev/ic/cd18xxreg.h:1.5 --- src/sys/dev/ic/cd18xxreg.h:1.4 Thu May 29 14:51:27 2008 +++ src/sys/dev/ic/cd18xxreg.h Fri Dec 30 20:25:56 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cd18xxreg.h,v 1.4 2008/05/29 14:51:27 mrg Exp $ */ +/* $NetBSD: cd18xxreg.h,v 1.5 2022/12/30 20:25:56 andvar Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -99,7 +99,7 @@ #define CD18xx_MCOR2 0x11 /* modem change option (2) */ #define CD18xx_MSVR 0x28 /* modem signal value */ #define CD18xx_MSVRTS 0x29 /* modem signal value RTS */ -#define CD18xx_MSVDTR 0x2a /* mdoem signal value DTR */ +#define CD18xx_MSVDTR 0x2a /* modem signal value DTR */ /*
CVS commit: src/external/gpl3/binutils/dist/binutils/doc
Module Name:src Committed By: christos Date: Fri Dec 30 19:19:21 UTC 2022 Modified Files: src/external/gpl3/binutils/dist/binutils/doc: c++filt.1 Log Message: match the name of the program in the description To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/binutils/doc/c++filt.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/binutils/doc/c++filt.1 diff -u src/external/gpl3/binutils/dist/binutils/doc/c++filt.1:1.3 src/external/gpl3/binutils/dist/binutils/doc/c++filt.1:1.4 --- src/external/gpl3/binutils/dist/binutils/doc/c++filt.1:1.3 Fri Dec 30 10:41:35 2022 +++ src/external/gpl3/binutils/dist/binutils/doc/c++filt.1 Fri Dec 30 14:19:21 2022 @@ -139,7 +139,7 @@ .if n .ad l .nh .SH "NAME" -cxxfilt \- demangle C++ and Java symbols +c++filt \- demangle C++ and Java symbols .SH "SYNOPSIS" .IX Header "SYNOPSIS" c++filt [\fB\-_\fR|\fB\-\-strip\-underscore\fR]
CVS commit: src/external/gpl3/binutils/dist/binutils/doc
Module Name:src Committed By: christos Date: Fri Dec 30 19:19:21 UTC 2022 Modified Files: src/external/gpl3/binutils/dist/binutils/doc: c++filt.1 Log Message: match the name of the program in the description To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/dist/binutils/doc/c++filt.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: jkoshy
Date: Fri Dec 30 17:02:31 UTC 2022
Modified Files:
src/share/misc: style
Log Message:
C99: Suggest using narrow scopes for loop indices.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/share/misc/style
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/style
diff -u src/share/misc/style:1.65 src/share/misc/style:1.66
--- src/share/misc/style:1.65 Thu Dec 29 18:23:37 2022
+++ src/share/misc/style Fri Dec 30 17:02:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: style,v 1.65 2022/12/29 18:23:37 jkoshy Exp $ */
+/* $NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $ */
/*
* The revision control tag appears first, with a blank line after it.
@@ -30,7 +30,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: style,v 1.65 2022/12/29 18:23:37 jkoshy Exp $");
+__RCSID("$NetBSD: style,v 1.66 2022/12/30 17:02:31 jkoshy Exp $");
/*
* VERY important single-line comments look like this.
@@ -259,9 +259,11 @@ main(int argc, char *argv[])
*
* Braces around single-line bodies are optional; use discretion.
*
+ * Use narrow scopes for loop variables where possible.
+ *
* Forever loops are done with for's, not while's.
*/
- for (p = buf; *p != '\0'; ++p)
+ for (char *p = buf; *p != '\0'; ++p)
continue; /* Explicit no-op */
for (;;)
stmt;
CVS commit: src/share/misc
Module Name:src Committed By: jkoshy Date: Fri Dec 30 17:02:31 UTC 2022 Modified Files: src/share/misc: style Log Message: C99: Suggest using narrow scopes for loop indices. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/share/misc/style Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils/dist
Module Name:src Committed By: christos Date: Fri Dec 30 15:41:35 UTC 2022 Modified Files: src/external/gpl3/binutils/dist/binutils: Makefile.in src/external/gpl3/binutils/dist/binutils/doc: local.mk src/external/gpl3/binutils/dist/gas: Makefile.in src/external/gpl3/binutils/dist/gas/doc: local.mk Added Files: src/external/gpl3/binutils/dist/binutils/doc: c++filt.1 Log Message: disable rebuilding man pages from texinfo to avoid writing to the source tree To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/binutils/dist/binutils/Makefile.in cvs rdiff -u -r0 -r1.3 src/external/gpl3/binutils/dist/binutils/doc/c++filt.1 cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/binutils/dist/binutils/doc/local.mk cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/gas/Makefile.in cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/binutils/dist/gas/doc/local.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/binutils/Makefile.in diff -u src/external/gpl3/binutils/dist/binutils/Makefile.in:1.11 src/external/gpl3/binutils/dist/binutils/Makefile.in:1.12 --- src/external/gpl3/binutils/dist/binutils/Makefile.in:1.11 Sat Dec 24 15:17:05 2022 +++ src/external/gpl3/binutils/dist/binutils/Makefile.in Fri Dec 30 10:41:35 2022 @@ -2023,120 +2023,120 @@ install-exec-local: install-binPROGRAMS done # Man page generation from texinfo -doc/addr2line.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Daddr2line < $(binutils_TEXI) > addr2line.pod - $(AM_V_at)-($(POD2MAN) addr2line.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f addr2line.pod - -doc/ar.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dar < $(binutils_TEXI) > ar.pod - $(AM_V_at)-($(POD2MAN) ar.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f ar.pod - -doc/dlltool.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Ddlltool < $(binutils_TEXI) > dlltool.pod - $(AM_V_at)-($(POD2MAN) dlltool.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f dlltool.pod - -doc/nm.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dnm < $(binutils_TEXI) > nm.pod - $(AM_V_at)-($(POD2MAN) nm.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f nm.pod - -doc/objcopy.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjcopy < $(binutils_TEXI) > objcopy.pod - $(AM_V_at)-($(POD2MAN) objcopy.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f objcopy.pod - -doc/objdump.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dobjdump < $(binutils_TEXI) > objdump.pod - $(AM_V_at)-($(POD2MAN) objdump.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f objdump.pod - -doc/ranlib.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dranlib < $(binutils_TEXI) > ranlib.pod - $(AM_V_at)-($(POD2MAN) ranlib.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f ranlib.pod - -doc/readelf.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dreadelf < $(binutils_TEXI) > readelf.pod - $(AM_V_at)-($(POD2MAN) readelf.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f readelf.pod - -doc/size.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dsize < $(binutils_TEXI) > size.pod - $(AM_V_at)-($(POD2MAN) size.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f size.pod - -doc/strings.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrings < $(binutils_TEXI) > strings.pod - $(AM_V_at)-($(POD2MAN) strings.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f strings.pod - -doc/strip.1: $(binutils_TEXI) doc/$(am__dirstamp) - $(AM_V_GEN)touch $@ - $(AM_V_at)-$(TEXI2POD) $(MANCONF) -Dstrip < $(binutils_TEXI) > strip.pod - $(AM_V_at)-($(POD2MAN) strip.pod | sed -e '/^.if n .na/d' > $@.T && \ - mv -f $@.T $@) || (rm -f $@.T && exit 1) - $(AM_V_at)rm -f strip.pod - -doc/elfedit.1: $(binutils_TEXI)
CVS commit: src/external/gpl3/binutils/dist
Module Name:src Committed By: christos Date: Fri Dec 30 15:41:35 UTC 2022 Modified Files: src/external/gpl3/binutils/dist/binutils: Makefile.in src/external/gpl3/binutils/dist/binutils/doc: local.mk src/external/gpl3/binutils/dist/gas: Makefile.in src/external/gpl3/binutils/dist/gas/doc: local.mk Added Files: src/external/gpl3/binutils/dist/binutils/doc: c++filt.1 Log Message: disable rebuilding man pages from texinfo to avoid writing to the source tree To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/binutils/dist/binutils/Makefile.in cvs rdiff -u -r0 -r1.3 src/external/gpl3/binutils/dist/binutils/doc/c++filt.1 cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/binutils/dist/binutils/doc/local.mk cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/binutils/dist/gas/Makefile.in cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/binutils/dist/gas/doc/local.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Fri Dec 30 15:25:15 UTC 2022
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen.
To generate a diff of this commit:
cvs rdiff -u -r1.1453 -r1.1454 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1452 -r1.1453 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1453 src/sys/dev/pci/pcidevs.h:1.1454
--- src/sys/dev/pci/pcidevs.h:1.1453 Wed Dec 28 13:27:11 2022
+++ src/sys/dev/pci/pcidevs.h Fri Dec 30 15:25:14 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1453 2022/12/28 13:27:11 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1454 2022/12/30 15:25:14 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1472 2022/12/28 13:26:44 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1473 2022/12/30 15:24:38 msaitoh Exp
*/
/*
@@ -5919,6 +5919,7 @@
#define PCI_PRODUCT_INTEL_EHL_SIO_I2C_3 0x4b7b /* Elkhart Lake SIO I2C 3 */
#define PCI_PRODUCT_INTEL_EHL_XHCI 0x4b7d /* Elkhart Lake xHCI */
#define PCI_PRODUCT_INTEL_EHL_XDCI 0x4b7e /* Elkhart Lake xDCI */
+#define PCI_PRODUCT_INTEL_EHL_SSRAM 0x4b7f /* Elkhart Lake Shared SRAM */
#define PCI_PRODUCT_INTEL_EHL_PSE_QEP_1 0x4b81 /* Elkhart Lake PSE QEP 1 */
#define PCI_PRODUCT_INTEL_EHL_PSE_QEP_2 0x4b82 /* Elkhart Lake PSE QEP 2 */
#define PCI_PRODUCT_INTEL_EHL_PSE_QEP_3 0x4b83 /* Elkhart Lake PSE QEP 3 */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1452 src/sys/dev/pci/pcidevs_data.h:1.1453
--- src/sys/dev/pci/pcidevs_data.h:1.1452 Wed Dec 28 13:27:10 2022
+++ src/sys/dev/pci/pcidevs_data.h Fri Dec 30 15:25:14 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1452 2022/12/28 13:27:10 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1453 2022/12/30 15:25:14 msaitoh Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1472 2022/12/28 13:26:44 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1473 2022/12/30 15:24:38 msaitoh Exp
*/
/*
@@ -10539,6 +10539,8 @@ static const uint32_t pci_products[] = {
28757, 23042, 8183, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EHL_XDCI,
28757, 23042, 23258, 0,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EHL_SSRAM,
+ 28757, 23042, 23263, 23270, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EHL_PSE_QEP_1,
28757, 23042, 29240, 29244, 8079, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_EHL_PSE_QEP_2,
@@ -20858,7 +20860,7 @@ static const char pci_words[] = { "."
"TwinTurbo\0" /* 1 refs @ 23022 */
"128M\0" /* 1 refs @ 23032 */
"Iron\0" /* 6 refs @ 23037 */
- "Lake\0" /* 408 refs @ 23042 */
+ "Lake\0" /* 409 refs @ 23042 */
"Core\0" /* 181 refs @ 23047 */
"Centrino\0" /* 28 refs @ 23052 */
"Advanced-N\0" /* 10 refs @ 23061 */
@@ -20898,8 +20900,8 @@ static const char pci_words[] = { "."
"2x1\0" /* 5 refs @ 23250 */
"1x1\0" /* 7 refs @ 23254 */
"xDCI\0" /* 8 refs @ 23258 */
- "Shared\0" /* 12 refs @ 23263 */
- "SRAM\0" /* 12 refs @ 23270 */
+ "Shared\0" /* 13 refs @ 23263 */
+ "SRAM\0" /* 13 refs @ 23270 */
"CNVi\0" /* 8 refs @ 23275 */
"SDXC\0" /* 5 refs @ 23280 */
"Thermal\0" /* 45 refs @ 23285 */
@@ -21698,7 +21700,7 @@ static const char pci_words[] = { "."
"mobile)\0" /* 4 refs @ 28738 */
"(RAID,\0" /* 6 refs @ 28746 */
"2x2\0" /* 2 refs @ 28753 */
- "Elkhart\0" /* 119 refs @ 28757 */
+ "Elkhart\0" /* 120 refs @ 28757 */
"(2C,\0" /* 1 refs @ 28765 */
"(SKU\0" /* 25 refs @ 28770 */
"8)\0" /* 1 refs @ 28775 */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Dec 30 15:25:15 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1453 -r1.1454 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1452 -r1.1453 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Dec 30 15:24:38 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Elkhart Lake Shared SRAM. To generate a diff of this commit: cvs rdiff -u -r1.1472 -r1.1473 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1472 src/sys/dev/pci/pcidevs:1.1473 --- src/sys/dev/pci/pcidevs:1.1472 Wed Dec 28 13:26:44 2022 +++ src/sys/dev/pci/pcidevs Fri Dec 30 15:24:38 2022 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1472 2022/12/28 13:26:44 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1473 2022/12/30 15:24:38 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5912,6 +5912,7 @@ product INTEL EHL_SIO_I2C_2 0x4b7a Elkha product INTEL EHL_SIO_I2C_3 0x4b7b Elkhart Lake SIO I2C 3 product INTEL EHL_XHCI 0x4b7d Elkhart Lake xHCI product INTEL EHL_XDCI 0x4b7e Elkhart Lake xDCI +product INTEL EHL_SSRAM 0x4b7f Elkhart Lake Shared SRAM product INTEL EHL_PSE_QEP_1 0x4b81 Elkhart Lake PSE QEP 1 product INTEL EHL_PSE_QEP_2 0x4b82 Elkhart Lake PSE QEP 2 product INTEL EHL_PSE_QEP_3 0x4b83 Elkhart Lake PSE QEP 3
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Fri Dec 30 15:24:38 UTC 2022 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Elkhart Lake Shared SRAM. To generate a diff of this commit: cvs rdiff -u -r1.1472 -r1.1473 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Dec 30 14:50:52 UTC 2022 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Fix comment. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Dec 30 14:50:52 UTC 2022 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Fix comment. To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.200 src/sys/arch/x86/include/specialreg.h:1.201 --- src/sys/arch/x86/include/specialreg.h:1.200 Fri Dec 30 12:12:54 2022 +++ src/sys/arch/x86/include/specialreg.h Fri Dec 30 14:50:52 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.200 2022/12/30 12:12:54 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.201 2022/12/30 14:50:52 msaitoh Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -550,10 +550,10 @@ /* %ecx = 2, %edx */ #define CPUID_SEF_PSFD __BIT(0) /* Fast Forwarding Predictor Dis. */ -#define CPUID_SEF_IPRED_CTRL __BIT(1) /* bit 3&4 */ -#define CPUID_SEF_RRSBA_CTRL __BIT(2) /* bit 5 */ -#define CPUID_SEF_DDPD_U __BIT(3) /* bit 8 Data Dependent Prefetcher */ -#define CPUID_SEF_BHI_CTRL __BIT(4) /* bit 10 */ +#define CPUID_SEF_IPRED_CTRL __BIT(1) /* IPRED_DIS */ +#define CPUID_SEF_RRSBA_CTRL __BIT(2) /* RRSBA for CPL3 */ +#define CPUID_SEF_DDPD_U __BIT(3) /* Data Dependent Prefetcher */ +#define CPUID_SEF_BHI_CTRL __BIT(4) /* BHI_DIS_S */ #define CPUID_SEF_MCDT_NO __BIT(5) /* !MXCSR Config Dependent Timing */ #define CPUID_SEF2_FLAGS_D "\20"\
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Dec 30 14:40:05 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1557 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-9.4 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.4 diff -u src/doc/CHANGES-9.4:1.1.2.33 src/doc/CHANGES-9.4:1.1.2.34 --- src/doc/CHANGES-9.4:1.1.2.33 Wed Dec 28 17:59:01 2022 +++ src/doc/CHANGES-9.4 Fri Dec 30 14:40:05 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.33 2022/12/28 17:59:01 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.34 2022/12/30 14:40:05 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -483,3 +483,22 @@ usr.bin/calendar/calendars/calendar.chri calendar(8): update calendar.christian for 2023. [nia, ticket #1556] +sys/dev/ata/ata.c1.155,1.164 +sys/dev/ata/ata_recovery.c 1.4 +sys/dev/ata/ata_wdc.c1.115,1.120 +sys/dev/ata/atavar.h1.105,1.109 +sys/dev/ata/satapmp_subr.c 1.16 +sys/dev/ata/wd.c1.460,1.462 +sys/dev/ic/ahcisata_core.c 1.83,1.93,1.102 +sys/dev/ic/mvsata.c1.56,1.61 +sys/dev/ic/siisata.c1.42,1.49 +sys/dev/ic/wdc.c1.299,1.308 +sys/dev/ic/wdcvar.h1.100 +sys/dev/scsipi/atapi_wdc.c 1.138 +sys/dev/scsipi/atapi_wdc.c 1.141 +sys/dev/usb/umass_isdata.c (apply patch) + + PR 56403, 56973, 56982: fix locking issues in ATA layer, + fix a use-after-free, fix silent stall on NOIRQ ports. + [tsutsui, ticket #1557] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Dec 30 14:40:05 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1557 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-9.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Fri Dec 30 14:39:10 UTC 2022 Modified Files: src/sys/dev/ata [netbsd-9]: ata.c ata_recovery.c ata_wdc.c atavar.h satapmp_subr.c wd.c src/sys/dev/ic [netbsd-9]: ahcisata_core.c mvsata.c siisata.c wdc.c wdcvar.h src/sys/dev/scsipi [netbsd-9]: atapi_wdc.c src/sys/dev/usb [netbsd-9]: umass_isdata.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1557): sys/dev/ic/ahcisata_core.c: revision 1.83 sys/dev/ic/ahcisata_core.c: revision 1.102 sys/dev/ata/ata.c: revision 1.164 sys/dev/ata/ata_wdc.c: revision 1.115 sys/dev/ata/ata_recovery.c: revision 1.4 sys/dev/ic/siisata.c: revision 1.42 sys/dev/ic/wdc.c: revision 1.308 sys/dev/ic/mvsata.c: revision 1.56 sys/dev/scsipi/atapi_wdc.c: revision 1.138 sys/dev/ic/siisata.c: revision 1.49 sys/dev/ata/atavar.h: revision 1.105 sys/dev/ata/wd.c: revision 1.460 sys/dev/ata/ata.c: revision 1.155 sys/dev/ata/wd.c: revision 1.462 sys/dev/ata/atavar.h: revision 1.109 sys/dev/ata/satapmp_subr.c: revision 1.16 sys/dev/ic/wdc.c: revision 1.299 sys/dev/ic/ahcisata_core.c: revision 1.93 sys/dev/ata/ata_wdc.c: revision 1.120 sys/dev/ic/wdcvar.h: revision 1.100 sys/dev/scsipi/atapi_wdc.c: revision 1.141 sys/dev/ic/mvsata.c: revision 1.61 sys/dev/usb/umass_isdata.c (apply patch) drop wd lock in wdstart1() before calling the ata_bio hook; when called from ata thread context, that can still need to sleep for wdc attachments in wdcwait() fix use-after-free for ata xfer on bio submission found by KASAN driver ata_bio hooks read parts of the xfer after ata_exec_xfer() call in order to determine return value, change so that the hook doesn't return any value - callers do not care already, as all I/O requests are asynchronous this problem was uncovered by recent change for wd(4) to not hold wd mutex during ata_bio call, the interrupt for the xfer might thus actually fire immediately adjust also ata_exec_command driver hooks similarily - remove all completion and waiting logic from drivers, upper layer ata code using AT_WAIT/AT_POLL changed to call ata_wait_cmd() itself PR kern/55169 by Nick Hudson Function declaration formating whitespace consistency. NFCI. PR kern/56403 Fix kernel freeze for wdc(4) variants with ATAC_CAP_NOIRQ: (1) Change ata_xfer_ops:c_poll from void to int function. When it returns ATAPOLL_AGAIN, let ata_xfer_start() iterate itself again. (2) Let wdc_ata_bio_poll() return ATAPOLL_AGAIN until ATA_ITSDONE is achieved. A similar change has been made for mvsata(4) (see mvsata_bio_poll()), and no functional changes for other devices. This is how the drivers worked before jdolecek-ncq branch was merged. Note that this changes are less likely to cause infinite recursion: (1) wdc_ata_bio_intr() called from wdc_ata_bio_poll() asserts ATA_ITSDONE in its error handling paths via wdc_ata_bio_done(). (2) Return value from c_start (= wdc_ata_bio_start()) is checked in ata_xfer_start(). Therefore, errors encountered in ata_xfer_ops:c_poll and c_start routines terminate the recursion for wdc(4). The situation is similar for mvsata(4). Still, there is a possibility where ata_xfer_start() takes long time to finish a normal operation. This can result in a delayed response for lower priority interrupts. But, I've never observed such a situation, even when heavy thrashing takes place for swap partition in wd(4). "Go ahead" by jdolecek@. To generate a diff of this commit: cvs rdiff -u -r1.149.2.2 -r1.149.2.3 src/sys/dev/ata/ata.c cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/sys/dev/ata/ata_recovery.c cvs rdiff -u -r1.113 -r1.113.4.1 src/sys/dev/ata/ata_wdc.c cvs rdiff -u -r1.103 -r1.103.4.1 src/sys/dev/ata/atavar.h cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/dev/ata/satapmp_subr.c cvs rdiff -u -r1.452.2.2 -r1.452.2.3 src/sys/dev/ata/wd.c cvs rdiff -u -r1.75.4.4 -r1.75.4.5 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/dev/ic/mvsata.c cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/dev/ic/siisata.c cvs rdiff -u -r1.291.4.1 -r1.291.4.2 src/sys/dev/ic/wdc.c cvs rdiff -u -r1.98.10.1 -r1.98.10.2 src/sys/dev/ic/wdcvar.h cvs rdiff -u -r1.133 -r1.133.4.1 src/sys/dev/scsipi/atapi_wdc.c cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/dev/usb/umass_isdata.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/ata/ata.c diff -u src/sys/dev/ata/ata.c:1.149.2.2 src/sys/dev/ata/ata.c:1.149.2.3 --- src/sys/dev/ata/ata.c:1.149.2.2 Tue Aug 30 18:28:42 2022 +++ src/sys/dev/ata/ata.c Fri Dec 30 14:39:10 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ata.c,v 1.149.2.2 2022/08/30 18:28:42 martin Exp $ */ +/* $NetBSD: ata.c,v 1.149.2.3 2022/12/30 14:39:10 martin Exp $ */ /* *
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Fri Dec 30 14:39:10 UTC 2022 Modified Files: src/sys/dev/ata [netbsd-9]: ata.c ata_recovery.c ata_wdc.c atavar.h satapmp_subr.c wd.c src/sys/dev/ic [netbsd-9]: ahcisata_core.c mvsata.c siisata.c wdc.c wdcvar.h src/sys/dev/scsipi [netbsd-9]: atapi_wdc.c src/sys/dev/usb [netbsd-9]: umass_isdata.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1557): sys/dev/ic/ahcisata_core.c: revision 1.83 sys/dev/ic/ahcisata_core.c: revision 1.102 sys/dev/ata/ata.c: revision 1.164 sys/dev/ata/ata_wdc.c: revision 1.115 sys/dev/ata/ata_recovery.c: revision 1.4 sys/dev/ic/siisata.c: revision 1.42 sys/dev/ic/wdc.c: revision 1.308 sys/dev/ic/mvsata.c: revision 1.56 sys/dev/scsipi/atapi_wdc.c: revision 1.138 sys/dev/ic/siisata.c: revision 1.49 sys/dev/ata/atavar.h: revision 1.105 sys/dev/ata/wd.c: revision 1.460 sys/dev/ata/ata.c: revision 1.155 sys/dev/ata/wd.c: revision 1.462 sys/dev/ata/atavar.h: revision 1.109 sys/dev/ata/satapmp_subr.c: revision 1.16 sys/dev/ic/wdc.c: revision 1.299 sys/dev/ic/ahcisata_core.c: revision 1.93 sys/dev/ata/ata_wdc.c: revision 1.120 sys/dev/ic/wdcvar.h: revision 1.100 sys/dev/scsipi/atapi_wdc.c: revision 1.141 sys/dev/ic/mvsata.c: revision 1.61 sys/dev/usb/umass_isdata.c (apply patch) drop wd lock in wdstart1() before calling the ata_bio hook; when called from ata thread context, that can still need to sleep for wdc attachments in wdcwait() fix use-after-free for ata xfer on bio submission found by KASAN driver ata_bio hooks read parts of the xfer after ata_exec_xfer() call in order to determine return value, change so that the hook doesn't return any value - callers do not care already, as all I/O requests are asynchronous this problem was uncovered by recent change for wd(4) to not hold wd mutex during ata_bio call, the interrupt for the xfer might thus actually fire immediately adjust also ata_exec_command driver hooks similarily - remove all completion and waiting logic from drivers, upper layer ata code using AT_WAIT/AT_POLL changed to call ata_wait_cmd() itself PR kern/55169 by Nick Hudson Function declaration formating whitespace consistency. NFCI. PR kern/56403 Fix kernel freeze for wdc(4) variants with ATAC_CAP_NOIRQ: (1) Change ata_xfer_ops:c_poll from void to int function. When it returns ATAPOLL_AGAIN, let ata_xfer_start() iterate itself again. (2) Let wdc_ata_bio_poll() return ATAPOLL_AGAIN until ATA_ITSDONE is achieved. A similar change has been made for mvsata(4) (see mvsata_bio_poll()), and no functional changes for other devices. This is how the drivers worked before jdolecek-ncq branch was merged. Note that this changes are less likely to cause infinite recursion: (1) wdc_ata_bio_intr() called from wdc_ata_bio_poll() asserts ATA_ITSDONE in its error handling paths via wdc_ata_bio_done(). (2) Return value from c_start (= wdc_ata_bio_start()) is checked in ata_xfer_start(). Therefore, errors encountered in ata_xfer_ops:c_poll and c_start routines terminate the recursion for wdc(4). The situation is similar for mvsata(4). Still, there is a possibility where ata_xfer_start() takes long time to finish a normal operation. This can result in a delayed response for lower priority interrupts. But, I've never observed such a situation, even when heavy thrashing takes place for swap partition in wd(4). "Go ahead" by jdolecek@. To generate a diff of this commit: cvs rdiff -u -r1.149.2.2 -r1.149.2.3 src/sys/dev/ata/ata.c cvs rdiff -u -r1.2.8.1 -r1.2.8.2 src/sys/dev/ata/ata_recovery.c cvs rdiff -u -r1.113 -r1.113.4.1 src/sys/dev/ata/ata_wdc.c cvs rdiff -u -r1.103 -r1.103.4.1 src/sys/dev/ata/atavar.h cvs rdiff -u -r1.15 -r1.15.4.1 src/sys/dev/ata/satapmp_subr.c cvs rdiff -u -r1.452.2.2 -r1.452.2.3 src/sys/dev/ata/wd.c cvs rdiff -u -r1.75.4.4 -r1.75.4.5 src/sys/dev/ic/ahcisata_core.c cvs rdiff -u -r1.48 -r1.48.2.1 src/sys/dev/ic/mvsata.c cvs rdiff -u -r1.39 -r1.39.4.1 src/sys/dev/ic/siisata.c cvs rdiff -u -r1.291.4.1 -r1.291.4.2 src/sys/dev/ic/wdc.c cvs rdiff -u -r1.98.10.1 -r1.98.10.2 src/sys/dev/ic/wdcvar.h cvs rdiff -u -r1.133 -r1.133.4.1 src/sys/dev/scsipi/atapi_wdc.c cvs rdiff -u -r1.42 -r1.42.4.1 src/sys/dev/usb/umass_isdata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: msaitoh Date: Fri Dec 30 13:48:40 UTC 2022 Modified Files: src/sys/arch/x86/x86: procfs_machdep.c Log Message: Add x2avic. Modify comment. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/procfs_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Fri Dec 30 13:48:40 UTC 2022
Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c
Log Message:
Add x2avic. Modify comment.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/x86/x86/procfs_machdep.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/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.45 src/sys/arch/x86/x86/procfs_machdep.c:1.46
--- src/sys/arch/x86/x86/procfs_machdep.c:1.45 Mon Jun 20 15:40:24 2022
+++ src/sys/arch/x86/x86/procfs_machdep.c Fri Dec 30 13:48:40 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.45 2022/06/20 15:40:24 msaitoh Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.46 2022/12/30 13:48:40 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.45 2022/06/20 15:40:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.46 2022/12/30 13:48:40 msaitoh Exp $");
#include
#include
@@ -171,7 +171,7 @@ static const char * const x86_features[]
"tsc_scale", "vmcb_clean", "flushbyasid", "decodeassists",
NULL, NULL, "pausefilter", NULL, "pfthreshold", "avic", NULL,
"v_vmsave_vmload",
- "vgif", NULL, NULL, NULL, "v_spec_ctrl", NULL, NULL, NULL,
+ "vgif", NULL, "x2avic", NULL, "v_spec_ctrl", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
{ /* (16) 0x0007:0 ecx */
@@ -183,7 +183,7 @@ static const char * const x86_features[]
NULL, "cldemote", NULL, "movdiri",
"movdir64b", "enqcmd", "sgx_lc", NULL},
- { /* (17) 0x8007 ebx */
+ { /* (17) AMD 0x8007 ebx */
"overflow_recov", "succor", NULL, "smca", NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Fri Dec 30 13:32:46 UTC 2022 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Add Raptor Lake and Sapphire Rapids. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Fri Dec 30 13:32:46 UTC 2022
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Add Raptor Lake and Sapphire Rapids.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/usr.sbin/cpuctl/arch/i386.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/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.134 src/usr.sbin/cpuctl/arch/i386.c:1.135
--- src/usr.sbin/cpuctl/arch/i386.c:1.134 Fri Dec 30 12:21:07 2022
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Dec 30 13:32:46 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.134 2022/12/30 12:21:07 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.135 2022/12/30 13:32:46 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.134 2022/12/30 12:21:07 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.135 2022/12/30 13:32:46 msaitoh Exp $");
#endif /* not lint */
#include
@@ -351,7 +351,7 @@ const struct cpu_cpuid_nameclass i386_cp
[0x8c] = "11th gen Core (Tiger Lake)",
[0x8d] = "11th gen Core (Tiger Lake)",
[0x8e] = "7th or 8th gen Core (Kaby Lake, Coffee Lake) or Xeon E (Coffee Lake)",
-[0x8f] = "future Xeon (Sapphire Rapids)",
+[0x8f] = "4th gen Xeon Scalable (Sapphire Rapids)",
[0x96] = "Atom x6000E (Elkhart Lake)",
[0x97] = "12th gen Core (Alder Lake)",
[0x9a] = "12th gen Core (Alder Lake)",
@@ -361,7 +361,9 @@ const struct cpu_cpuid_nameclass i386_cp
[0xa6] = "10th gen Core (Comet Lake)",
[0xa7] = "11th gen Core (Rocket Lake)",
[0xa8] = "11th gen Core (Rocket Lake)",
-[0xbf] = "12th gen Core (Alder Lake)",
+[0xba] = "13th gen Core (Raptor Lake)",
+[0xb7] = "13th gen Core (Raptor Lake)",
+[0xbf] = "13th gen Core (Raptor Lake)",
},
"Pentium Pro, II or III", /* Default */
NULL,
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Fri Dec 30 12:21:07 UTC 2022
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
Print cpuid 7 sub-leaf 1 %ebx, %edx and sub-leaf 2 %edx.
To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 src/usr.sbin/cpuctl/arch/i386.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/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.133 src/usr.sbin/cpuctl/arch/i386.c:1.134
--- src/usr.sbin/cpuctl/arch/i386.c:1.133 Thu Nov 17 15:21:31 2022
+++ src/usr.sbin/cpuctl/arch/i386.c Fri Dec 30 12:21:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.133 2022/11/17 15:21:31 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.134 2022/12/30 12:21:07 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.133 2022/11/17 15:21:31 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.134 2022/12/30 12:21:07 msaitoh Exp $");
#endif /* not lint */
#include
@@ -2210,13 +2210,25 @@ identifycpu(int fd, const char *cpuname)
if ((ci->ci_max_cpuid >= 7)
&& ((cpu_vendor == CPUVENDOR_INTEL)
|| (cpu_vendor == CPUVENDOR_AMD))) {
+ unsigned int maxsubleaf;
+
x86_cpuid(7, descs);
+ maxsubleaf = descs[0];
aprint_verbose("%s: SEF highest subleaf %08x\n",
- cpuname, descs[0]);
- if (descs[0] >= 1) {
+ cpuname, maxsubleaf);
+ if (maxsubleaf >= 1) {
x86_cpuid2(7, 1, descs);
print_bits(cpuname, "SEF-subleaf1-eax",
CPUID_SEF1_FLAGS_A, descs[0]);
+ print_bits(cpuname, "SEF-subleaf1-ebx",
+ CPUID_SEF1_FLAGS_B, descs[1]);
+ print_bits(cpuname, "SEF-subleaf1-edx",
+ CPUID_SEF1_FLAGS_D, descs[3]);
+ }
+ if (maxsubleaf >= 2) {
+ x86_cpuid2(7, 2, descs);
+ print_bits(cpuname, "SEF-subleaf2-edx",
+ CPUID_SEF2_FLAGS_D, descs[3]);
}
}
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src Committed By: msaitoh Date: Fri Dec 30 12:21:07 UTC 2022 Modified Files: src/usr.sbin/cpuctl/arch: i386.c Log Message: Print cpuid 7 sub-leaf 1 %ebx, %edx and sub-leaf 2 %edx. To generate a diff of this commit: cvs rdiff -u -r1.133 -r1.134 src/usr.sbin/cpuctl/arch/i386.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Dec 30 12:12:54 UTC 2022 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Update definitions from the latest Intel SDM. - Rename HW_FEEDBACK to HWI (Hardware Feedback Interface). - Add CPUID Fn_0006 %eax bit 24 IA32_THERM_INTERRUPT MSR bit 25 Hardware Feedback Notification support. - Add CPUID Fn_0007 %ecx bit 29 ENQCMD. - Add CPUID Fn_0007 %edx bit 1 SGX-KEYS. - Add CPUID Fn_0007 %edx bit 5 UINTR(User INTeRrupts). - Add CPUID Fn_0007 %edx bit 1 RTM_ALWAYS_ABORT. - Rename TSX_FORCE_ABORT to RTM_FORCE_ABORT. - Add CPUID Fn_0007 %edx bit 22 AMX_BF16. - Add CPUID Fn_0007 %edx bit 23 AVX512_FP16. - Add CPUID Fn_0007 %edx bit 24 AMX_TILE. - Add CPUID Fn_0007 %edx bit 25 AMX_INT8. - Add CPUID Fn_0007 sub-leaf 1 %edx bit 18 CET_SSS. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 0 PSFD. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 1 IPRED_CTRL. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 2 RRSBA_CTRL. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 3 DDPD_U. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 4 BHI_CTRL. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 5 MCDT_NO. - Modify comment. Both Intel and AMD support CPUID Fn000b. - Add CPUID Fn_000d sub-leaf 1 %eax bit 4 XFD. - Modify comment. Hybrid Information -> Native Model ID Information. - Add CPUID Fn_001d Tile Information. - Add CPUID Fn_001e TMUL Information. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/specialreg.h diff -u src/sys/arch/x86/include/specialreg.h:1.199 src/sys/arch/x86/include/specialreg.h:1.200 --- src/sys/arch/x86/include/specialreg.h:1.199 Tue Dec 27 09:36:29 2022 +++ src/sys/arch/x86/include/specialreg.h Fri Dec 30 12:12:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: specialreg.h,v 1.199 2022/12/27 09:36:29 msaitoh Exp $ */ +/* $NetBSD: specialreg.h,v 1.200 2022/12/30 12:12:54 msaitoh Exp $ */ /* * Copyright (c) 2014-2020 The NetBSD Foundation, Inc. @@ -366,17 +366,19 @@ #define CPUID_DSPM_HWP_PECI __BIT(16) /* HWP PECI override */ #define CPUID_DSPM_HWP_FLEX __BIT(17) /* Flexible HWP */ #define CPUID_DSPM_HWP_FAST __BIT(18) /* Fast access for IA32_HWP_REQUEST */ -#define CPUID_DSPM_HW_FEEDBACK __BIT(19) /* HW_FEEDBACK*, IA32_PACKAGE_TERM* */ +#define CPUID_DSPM_HFI __BIT(19) /* Hardware Feedback Interface */ #define CPUID_DSPM_HWP_IGNIDL __BIT(20) /* Ignore Idle Logical Processor HWP */ #define CPUID_DSPM_TD __BIT(23) /* Thread Director */ +#define CPUID_DSPM_THERMI_HFN __BIT(24) /* THERM_INTERRUPT MSR HFN bit */ #define CPUID_DSPM_FLAGS "\20" \ "\1" "DTS" "\2" "IDA" "\3" "ARAT" \ "\5" "PLN" "\6" "ECMD" "\7" "PTM" "\10" "HWP" \ "\11" "HWP_NOTIFY" "\12" "HWP_ACTWIN" "\13" "HWP_EPP" "\14" "HWP_PLR" \ "\16" "HDC" "\17" "TBM3" "\20" "HWP_CAP" \ - "\21" "HWP_PECI" "\22" "HWP_FLEX" "\23" "HWP_FAST" "\24HW_FEEDBACK" \ - "\25" "HWP_IGNIDL""\30" "TD" + "\21" "HWP_PECI" "\22" "HWP_FLEX" "\23" "HWP_FAST" "\24HFI" \ + "\25" "HWP_IGNIDL""\30" "TD" \ + "\31" "THERMI_HFN" /* %ecx */ #define CPUID_DSPM_HWF __BIT(0) /* MSR_APERF/MSR_MPERF available */ @@ -467,6 +469,7 @@ #define CPUID_SEF_CLDEMOTE __BIT(25) /* Cache line demote */ #define CPUID_SEF_MOVDIRI __BIT(27) /* MOVDIRI instruction */ #define CPUID_SEF_MOVDIR64B __BIT(28) /* MOVDIR64B instruction */ +#define CPUID_SEF_ENQCMD __BIT(29) /* Enqueue Stores */ #define CPUID_SEF_SGXLC __BIT(30) /* SGX Launch Configuration */ #define CPUID_SEF_PKS __BIT(31) /* Protection Keys for kern-mode pages */ @@ -478,22 +481,29 @@ "b\20LA57\0" \ "f\21\5MAWAU\0" "b\26RDPID\0" "b\27KL\0" \ "b\31CLDEMOTE\0" "b\33MOVDIRI\0" \ - "b\34MOVDIR64B\0" "b\36SGXLC\0" "b\37PKS\0" + "b\34MOVDIR64B\0" "b\35ENQCMD\0" "b\36SGXLC\0" "b\37PKS\0" /* %ecx = 0, %edx */ +#define CPUID_SEF_SGX_KEYS __BIT(1) /* Attestation support for SGX */ #define CPUID_SEF_AVX512_4VNNIW __BIT(2) /* AVX512 4-reg Neural Network ins */ #define CPUID_SEF_AVX512_4FMAPS __BIT(3) /* AVX512 4-reg Mult Accum Single precision */ #define CPUID_SEF_FSRM __BIT(4) /* Fast Short Rep Move */ +#define CPUID_SEF_UINTR __BIT(5) /* User Interrupts */ #define CPUID_SEF_AVX512_VP2INTERSECT __BIT(8) /* AVX512 VP2INTERSECT */ #define CPUID_SEF_SRBDS_CTRL __BIT(9) /* IA32_MCU_OPT_CTRL */ #define CPUID_SEF_MD_CLEAR __BIT(10) /* VERW clears CPU buffers */ -#define CPUID_SEF_TSX_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */ +#define CPUID_SEF_RTM_ALWAYS_ABORT __BIT(11) /* XBEGIN immediately abort */ +#define CPUID_SEF_RTM_FORCE_ABORT __BIT(13) /* MSR_TSX_FORCE_ABORT bit 0 */ #define CPUID_SEF_SERIALIZE __BIT(14) /* SERIALIZE instruction */
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: msaitoh Date: Fri Dec 30 12:12:54 UTC 2022 Modified Files: src/sys/arch/x86/include: specialreg.h Log Message: Update definitions from the latest Intel SDM. - Rename HW_FEEDBACK to HWI (Hardware Feedback Interface). - Add CPUID Fn_0006 %eax bit 24 IA32_THERM_INTERRUPT MSR bit 25 Hardware Feedback Notification support. - Add CPUID Fn_0007 %ecx bit 29 ENQCMD. - Add CPUID Fn_0007 %edx bit 1 SGX-KEYS. - Add CPUID Fn_0007 %edx bit 5 UINTR(User INTeRrupts). - Add CPUID Fn_0007 %edx bit 1 RTM_ALWAYS_ABORT. - Rename TSX_FORCE_ABORT to RTM_FORCE_ABORT. - Add CPUID Fn_0007 %edx bit 22 AMX_BF16. - Add CPUID Fn_0007 %edx bit 23 AVX512_FP16. - Add CPUID Fn_0007 %edx bit 24 AMX_TILE. - Add CPUID Fn_0007 %edx bit 25 AMX_INT8. - Add CPUID Fn_0007 sub-leaf 1 %edx bit 18 CET_SSS. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 0 PSFD. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 1 IPRED_CTRL. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 2 RRSBA_CTRL. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 3 DDPD_U. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 4 BHI_CTRL. - Add CPUID Fn_0007 sub-leaf 2 %edx bit 5 MCDT_NO. - Modify comment. Both Intel and AMD support CPUID Fn000b. - Add CPUID Fn_000d sub-leaf 1 %eax bit 4 XFD. - Modify comment. Hybrid Information -> Native Model ID Information. - Add CPUID Fn_001d Tile Information. - Add CPUID Fn_001e TMUL Information. To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/arch/x86/include/specialreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: andvar
Date: Fri Dec 30 09:08:48 UTC 2022
Modified Files:
src/distrib/atari/floppies/prepare: install.sh
src/distrib/miniroot: install.sub
src/sys/dev/ic: seeq8003reg.h
src/sys/ufs/chfs: ebh.c
Log Message:
s/succes/success/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/atari/floppies/prepare/install.sh
cvs rdiff -u -r1.63 -r1.64 src/distrib/miniroot/install.sub
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/seeq8003reg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/chfs/ebh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/atari/floppies/prepare/install.sh
diff -u src/distrib/atari/floppies/prepare/install.sh:1.4 src/distrib/atari/floppies/prepare/install.sh:1.5
--- src/distrib/atari/floppies/prepare/install.sh:1.4 Tue May 3 20:52:30 2022
+++ src/distrib/atari/floppies/prepare/install.sh Fri Dec 30 09:08:47 2022
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sh,v 1.4 2022/05/03 20:52:30 andvar Exp $
+# $NetBSD: install.sh,v 1.5 2022/12/30 09:08:47 andvar Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -61,7 +61,7 @@ getresp() {
}
isin() {
-# test the first argument against the remaining ones, return succes on a match
+# test the first argument against the remaining ones, return success on a match
local a=$1
shift
while [ $# != 0 ]; do
Index: src/distrib/miniroot/install.sub
diff -u src/distrib/miniroot/install.sub:1.63 src/distrib/miniroot/install.sub:1.64
--- src/distrib/miniroot/install.sub:1.63 Sun Mar 13 14:20:24 2022
+++ src/distrib/miniroot/install.sub Fri Dec 30 09:08:47 2022
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: install.sub,v 1.63 2022/03/13 14:20:24 andvar Exp $
+# $NetBSD: install.sub,v 1.64 2022/12/30 09:08:47 andvar Exp $
#
# Copyright (c) 1996 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -63,7 +63,7 @@ getresp() {
}
isin() {
-# test the first argument against the remaining ones, return succes on a match
+# test the first argument against the remaining ones, return success on a match
_a=$1; shift
while [ $# != 0 ]; do
if [ "$_a" = "$1" ]; then return 0; fi
Index: src/sys/dev/ic/seeq8003reg.h
diff -u src/sys/dev/ic/seeq8003reg.h:1.3 src/sys/dev/ic/seeq8003reg.h:1.4
--- src/sys/dev/ic/seeq8003reg.h:1.3 Thu Jun 7 05:19:26 2001
+++ src/sys/dev/ic/seeq8003reg.h Fri Dec 30 09:08:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: seeq8003reg.h,v 1.3 2001/06/07 05:19:26 thorpej Exp $ */
+/* $NetBSD: seeq8003reg.h,v 1.4 2022/12/30 09:08:48 andvar Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -76,7 +76,7 @@
#define TXCMD_IE_UFLOW 0x01 /* Interrupt on Transmit Underflow */
#define TXCMD_IE_COLL 0x02 /* Interrupt on Transmit Collision */
#define TXCMD_IE_16COLL 0x04 /* Interrupt on 16 Collisions */
-#define TXCMD_IE_GOOD 0x08 /* Interrupt on Transmit Succes */
+#define TXCMD_IE_GOOD 0x08 /* Interrupt on Transmit Success */
#define TXCMD_ENABLE_C 0xf0 /* (80C03) Enable 80C03 Mode */
#define TXCMD_BANK_MASK 0x60 /* (80C03) Register Bank Mask */
#define TXCMD_BANK0 0x00 /* (80C03) Register Bank 0 (8003) */
Index: src/sys/ufs/chfs/ebh.c
diff -u src/sys/ufs/chfs/ebh.c:1.9 src/sys/ufs/chfs/ebh.c:1.10
--- src/sys/ufs/chfs/ebh.c:1.9 Tue Dec 7 21:37:37 2021
+++ src/sys/ufs/chfs/ebh.c Fri Dec 30 09:08:48 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ebh.c,v 1.9 2021/12/07 21:37:37 andvar Exp $ */
+/* $NetBSD: ebh.c,v 1.10 2022/12/30 09:08:48 andvar Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -924,7 +924,7 @@ erase_callback(struct flash_erase_instru
*
* This function erases the first physical eraseblock from one of the erase
* lists and adds to the RB-tree of free PEBs.
- * Returns zero in case of succes, error code in case of fail.
+ * Returns zero in case of success, error code in case of fail.
*/
int
free_peb(struct chfs_ebh *ebh)
CVS commit: src
Module Name:src Committed By: andvar Date: Fri Dec 30 09:08:48 UTC 2022 Modified Files: src/distrib/atari/floppies/prepare: install.sh src/distrib/miniroot: install.sub src/sys/dev/ic: seeq8003reg.h src/sys/ufs/chfs: ebh.c Log Message: s/succes/success/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/distrib/atari/floppies/prepare/install.sh cvs rdiff -u -r1.63 -r1.64 src/distrib/miniroot/install.sub cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/seeq8003reg.h cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/chfs/ebh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
