CVS commit: src/lib/libc/string
Module Name:src Committed By: simonb Date: Tue Jan 31 01:42:32 UTC 2023 Modified Files: src/lib/libc/string: strchr.3 Log Message: Note that strchrnul() first appeared in glibc 2.1.1 and appeared in FreeBSD 10 before it appeared in NetBSD 8. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/string/strchr.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/string/strchr.3 diff -u src/lib/libc/string/strchr.3:1.14 src/lib/libc/string/strchr.3:1.15 --- src/lib/libc/string/strchr.3:1.14 Thu Nov 26 23:13:55 2020 +++ src/lib/libc/string/strchr.3 Tue Jan 31 01:42:32 2023 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)strchr.3 8.2 (Berkeley) 4/19/94 -.\" $NetBSD: strchr.3,v 1.14 2020/11/26 23:13:55 rillig Exp $ +.\" $NetBSD: strchr.3,v 1.15 2023/01/31 01:42:32 simonb Exp $ .\" .Dd November 27, 2020 .Dt STRCHR 3 @@ -109,7 +109,10 @@ The function conforms to .St -ansiC . -.The +.Sh HISTORY +The .Fn strchrnul -function appeared in +first appeared in glibc 2.1.1 and was added to +.Fx 10 +and .Nx 8 .
CVS commit: src/lib/libc/string
Module Name:src Committed By: simonb Date: Tue Jan 31 01:42:32 UTC 2023 Modified Files: src/lib/libc/string: strchr.3 Log Message: Note that strchrnul() first appeared in glibc 2.1.1 and appeared in FreeBSD 10 before it appeared in NetBSD 8. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/string/strchr.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jan 30 19:51:33 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: add t_strchrnul To generate a diff of this commit: cvs rdiff -u -r1.395 -r1.396 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1249 -r1.1250 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.395 src/distrib/sets/lists/debug/mi:1.396 --- src/distrib/sets/lists/debug/mi:1.395 Mon Dec 26 11:42:50 2022 +++ src/distrib/sets/lists/debug/mi Mon Jan 30 14:51:33 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.395 2022/12/26 16:42:50 christos Exp $ +# $NetBSD: mi,v 1.396 2023/01/30 19:51:33 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2152,6 +2152,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/string/t_strcat.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/string/t_strchr.debug tests-lib-debug debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/string/t_strchrnul.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/string/t_strcmp.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/string/t_strcoll.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/string/t_strcpy.debug tests-lib-debug debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.1249 src/distrib/sets/lists/tests/mi:1.1250 --- src/distrib/sets/lists/tests/mi:1.1249 Sun Jan 29 12:02:09 2023 +++ src/distrib/sets/lists/tests/mi Mon Jan 30 14:51:33 2023 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1249 2023/01/29 17:02:09 rillig Exp $ +# $NetBSD: mi,v 1.1250 2023/01/30 19:51:33 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3146,6 +3146,7 @@ ./usr/tests/lib/libc/string/t_popcount tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/string/t_strcat tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/string/t_strchr tests-lib-tests compattestfile,atf +./usr/tests/lib/libc/string/t_strchrnul tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/string/t_strcmp tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/string/t_strcoll tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/string/t_strcpy tests-lib-tests compattestfile,atf
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jan 30 19:51:33 UTC 2023 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: add t_strchrnul To generate a diff of this commit: cvs rdiff -u -r1.395 -r1.396 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1249 -r1.1250 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/string
Module Name:src
Committed By: christos
Date: Mon Jan 30 19:49:50 UTC 2023
Modified Files:
src/tests/lib/libc/string: Makefile t_strchr.c
Added Files:
src/tests/lib/libc/string: t_strchrnul.c
Log Message:
PR/57205: Dag-Erling Sm�rgrav: Add tests strchrnul(3), fix strchr pasto
from strlen.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libc/string/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/string/t_strchr.c
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/string/t_strchrnul.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/string/Makefile
diff -u src/tests/lib/libc/string/Makefile:1.12 src/tests/lib/libc/string/Makefile:1.13
--- src/tests/lib/libc/string/Makefile:1.12 Thu Dec 19 14:19:28 2019
+++ src/tests/lib/libc/string/Makefile Mon Jan 30 14:49:49 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/12/19 19:19:28 macallan Exp $
+# $NetBSD: Makefile,v 1.13 2023/01/30 19:49:49 christos Exp $
.include
@@ -15,6 +15,7 @@ TESTS_C+= t_memset
TESTS_C+= t_popcount
TESTS_C+= t_strcat
TESTS_C+= t_strchr
+TESTS_C+= t_strchrnul
TESTS_C+= t_strcmp
TESTS_C+= t_strcoll
TESTS_C+= t_strcpy
Index: src/tests/lib/libc/string/t_strchr.c
diff -u src/tests/lib/libc/string/t_strchr.c:1.2 src/tests/lib/libc/string/t_strchr.c:1.3
--- src/tests/lib/libc/string/t_strchr.c:1.2 Tue Jan 10 10:34:49 2017
+++ src/tests/lib/libc/string/t_strchr.c Mon Jan 30 14:49:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: t_strchr.c,v 1.2 2017/01/10 15:34:49 christos Exp $ */
+/* $NetBSD: t_strchr.c,v 1.3 2023/01/30 19:49:49 christos Exp $ */
/*
* Written by J.T. Conklin
@@ -247,7 +247,7 @@ ATF_TC_BODY(strchr_basic, tc)
};
dl_handle = dlopen(NULL, RTLD_LAZY);
- strchr_fn = dlsym(dl_handle, "test_strlen");
+ strchr_fn = dlsym(dl_handle, "test_strchr");
if (!strchr_fn)
strchr_fn = strchr;
@@ -269,11 +269,11 @@ ATF_TC_BODY(strchr_basic, tc)
/* Then for the '/' in the strings */
verify_strchr(buf + a, '/', t, a);
- /* check zero extension of char arg */
- verify_strchr(buf + a, 0xff00 | '/', t, a);
+ /* check zero extension of char arg */
+ verify_strchr(buf + a, 0xff00 | '/', t, a);
- /* Replace all the '/' with 0xff */
- while ((off = slow_strchr(buf + a, '/')) != NULL)
+ /* Replace all the '/' with 0xff */
+ while ((off = slow_strchr(buf + a, '/')) != NULL)
*off = 0xff;
buf[a + len] = 0xff;
Added files:
Index: src/tests/lib/libc/string/t_strchrnul.c
diff -u /dev/null src/tests/lib/libc/string/t_strchrnul.c:1.1
--- /dev/null Mon Jan 30 14:49:50 2023
+++ src/tests/lib/libc/string/t_strchrnul.c Mon Jan 30 14:49:49 2023
@@ -0,0 +1,293 @@
+/* $NetBSD: t_strchrnul.c,v 1.1 2023/01/30 19:49:49 christos Exp $ */
+
+/*
+ * Written by J.T. Conklin
+ * Public domain.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+static char *slow_strchrnul(char *, int);
+static void verify_strchrnul(char *, int, unsigned int, unsigned int);
+
+char * (*volatile strchrnul_fn)(const char *, int);
+
+static char *
+slow_strchrnul(char *buf, int ch)
+{
+ unsigned char c = 1;
+
+ ch &= 0xff;
+
+ for (; ; buf++) {
+ c = *buf;
+ if (c == ch || c == 0)
+ return buf;
+ }
+}
+
+static void
+verify_strchrnul(char *buf, int ch, unsigned int t, unsigned int a)
+{
+ const char *off, *ok_off;
+
+ off = strchrnul_fn(buf, ch);
+ ok_off = slow_strchrnul(buf, ch);
+ if (off == ok_off)
+ return;
+
+ fprintf(stderr, "test_strchrnul(\"%s\", %#x) gave %zd not %zd (test %d, "
+ "alignment %d)\n",
+ buf, ch, off ? off - buf : -1, ok_off ? ok_off - buf : -1, t, a);
+
+ atf_tc_fail("Check stderr for details");
+}
+
+ATF_TC(strchrnul_basic);
+ATF_TC_HEAD(strchrnul_basic, tc)
+{
+
+atf_tc_set_md_var(tc, "descr", "Test strchrnul(3) results");
+}
+
+ATF_TC_BODY(strchrnul_basic, tc)
+{
+ void *dl_handle;
+ char *off;
+ char buf[32];
+ unsigned int t, a;
+
+ const char *tab[] = {
+ "",
+ "a",
+ "aa",
+ "abc",
+ "abcd",
+ "abcde",
+ "abcdef",
+ "abcdefg",
+ "abcdefgh",
+
+ "/",
+ "//",
+ "/a",
+ "/a/",
+ "/ab",
+ "/ab/",
+ "/abc",
+ "/abc/",
+ "/abcd",
+ "/abcd/",
+ "/abcde",
+ "/abcde/",
+ "/abcdef",
+ "/abcdef/",
+ "/abcdefg",
+ "/abcdefg/",
+ "/abcdefgh",
+ "/abcdefgh/",
+
+ "a/",
+ "a//",
+ "a/a",
+ "a/a/",
+ "a/ab",
+ "a/ab/",
+ "a/abc",
+ "a/abc/",
+ "a/abcd",
+ "a/abcd/",
+ "a/abcde",
+ "a/abcde/",
+ "a/abcdef",
+ "a/abcdef/",
+ "a/abcdefg",
+ "a/abcdefg/",
+ "a/abcdefgh",
+ "a/abcdefgh/",
+
+ "ab/",
+ "ab//",
+ "ab/a",
+ "ab/a/",
+ "ab/ab",
+ "ab/ab/",
+ "ab/abc",
+ "ab/abc/",
+ "ab/abcd",
+ "ab/abcd/",
+ "ab/abcde",
+ "ab/abcde/",
+ "ab/abcdef",
+ "ab/abcdef/",
+ "ab/abcdefg",
+ "ab/abcdefg/",
+ "ab/abcdefgh",
+ "ab/abcdefgh/",
+
+ "abc/",
+ "abc//",
+ "abc/a",
+ "abc/a/",
+ "abc/ab",
+ "abc/ab/",
+ "abc/abc",
+ "abc/abc/",
+
CVS commit: src/tests/lib/libc/string
Module Name:src Committed By: christos Date: Mon Jan 30 19:49:50 UTC 2023 Modified Files: src/tests/lib/libc/string: Makefile t_strchr.c Added Files: src/tests/lib/libc/string: t_strchrnul.c Log Message: PR/57205: Dag-Erling Sm�rgrav: Add tests strchrnul(3), fix strchr pasto from strlen. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/tests/lib/libc/string/Makefile cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/string/t_strchr.c cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/string/t_strchrnul.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/split
Module Name:src Committed By: jschauma Date: Mon Jan 30 15:22:03 UTC 2023 Modified Files: src/usr.bin/split: split.1 split.c Log Message: auto-extend suffix length if required If the input cannot be split into the number of files resulting from the default suffix length, automatically extend the suffix length rather than bailing out with 'too many files'. Suffixes are extended such that the resulting files continue to sort lexically and "cat *" would reproduce the input. For example, splitting a 1M lines file into (default) 1000 lines per file would yield files named 'xaa', 'xab', ..., 'xyy', 'xyz', 'xzaaa', 'xzaab', ..., 'xzanl'. If '-a' is specified, the suffix length is not auto-extended. This behavior matches GNU sort(1) since around version 8.16. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/usr.bin/split/split.1 cvs rdiff -u -r1.28 -r1.29 src/usr.bin/split/split.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/split
Module Name:src
Committed By: jschauma
Date: Mon Jan 30 15:22:03 UTC 2023
Modified Files:
src/usr.bin/split: split.1 split.c
Log Message:
auto-extend suffix length if required
If the input cannot be split into the number of files resulting from the
default suffix length, automatically extend the suffix length rather than
bailing out with 'too many files'.
Suffixes are extended such that the resulting files continue to sort
lexically and "cat *" would reproduce the input. For example, splitting
a 1M lines file into (default) 1000 lines per file would yield files
named 'xaa', 'xab', ..., 'xyy', 'xyz', 'xzaaa', 'xzaab', ..., 'xzanl'.
If '-a' is specified, the suffix length is not auto-extended.
This behavior matches GNU sort(1) since around version 8.16.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/split/split.1
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/split/split.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/split/split.1
diff -u src/usr.bin/split/split.1:1.15 src/usr.bin/split/split.1:1.16
--- src/usr.bin/split/split.1:1.15 Thu May 31 01:35:35 2007
+++ src/usr.bin/split/split.1 Mon Jan 30 15:22:02 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: split.1,v 1.15 2007/05/31 01:35:35 jschauma Exp $
+.\" $NetBSD: split.1,v 1.16 2023/01/30 15:22:02 jschauma Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)split.1 8.3 (Berkeley) 4/16/94
.\"
-.Dd May 28, 2007
+.Dd January 28, 2023
.Dt SPLIT 1
.Os
.Sh NAME
@@ -99,7 +99,12 @@ characters in the range
.Dq Li a-z .
If
.Fl a
-is not specified, two letters are used as the suffix.
+is not specified, two letters are used as the initial
+suffix.
+If the output does not fit into the resulting number
+of files, then the suffix length is automatically
+extended as needed such that all output files continue
+to sort in lexical order.
.Pp
If the
.Ar name
Index: src/usr.bin/split/split.c
diff -u src/usr.bin/split/split.c:1.28 src/usr.bin/split/split.c:1.29
--- src/usr.bin/split/split.c:1.28 Fri Jan 27 19:39:04 2023
+++ src/usr.bin/split/split.c Mon Jan 30 15:22:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: split.c,v 1.28 2023/01/27 19:39:04 jschauma Exp $ */
+/* $NetBSD: split.c,v 1.29 2023/01/30 15:22:02 jschauma Exp $ */
/*
* Copyright (c) 1987, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)split.c 8.3 (Berkeley) 4/25/94";
#endif
-__RCSID("$NetBSD: split.c,v 1.28 2023/01/27 19:39:04 jschauma Exp $");
+__RCSID("$NetBSD: split.c,v 1.29 2023/01/30 15:22:02 jschauma Exp $");
#endif /* not lint */
#include
@@ -60,6 +60,7 @@ static int file_open; /* If a file is o
static int ifd = STDIN_FILENO, ofd = -1; /* Input/output file descriptors. */
static char *fname; /* File name prefix. */
static size_t sfxlen = 2; /* Suffix length. */
+static int autosfx = 1; /* Whether to auto-extend the suffix length. */
static void newfile(void);
static void split1(off_t, int) __dead;
@@ -120,6 +121,7 @@ main(int argc, char *argv[])
(sfxlen = (size_t)strtoul(optarg, , 10)) == 0 ||
*ep != '\0')
errx(1, "%s: illegal suffix length.", optarg);
+ autosfx = 0;
break;
case 'n': /* Chunks. */
if (!isdigit((unsigned char)optarg[0]) ||
@@ -323,6 +325,38 @@ newfile(void)
err(1, "%s", fname);
quot = fnum;
+
+ /* If '-a' is not specified, then we automatically expand the
+ * suffix length to accomodate splitting all input. We do this
+ * by moving the suffix pointer (fpnt) forward and incrementing
+ * sfxlen by one, thereby yielding an additional two characters
+ * and allowing all output files to sort such that 'cat *' yields
+ * the input in order. I.e., the order is '... xyy xyz xzaaa
+ * xzaab ... xzyzy, xzyzz, xzz, xzzaaab' and so on. */
+ if (autosfx && (fpnt[0] == 'y') && (strspn(fpnt+1, "z") == strlen(fpnt+1))) {
+ if ((fname = realloc(fname, strlen(fname) + sfxlen + 2 + 1)) == NULL)
+ err(EXIT_FAILURE, NULL);
+ /* NOTREACHED */
+
+ fpnt = fname + strlen(fname) - sfxlen;
+ fpnt[sfxlen + 2] = '\0';
+
+ fpnt[0] = 'z';
+ fpnt[1] = 'a';
+
+ /* Basename | Suffix
+ * before:
+ * x| yz
+ * after:
+ * xz | a.. */
+ fpnt++;
+ sfxlen++;
+
+ /* Reset so we start back at all 'a's in our extended suffix. */
+ quot = 0;
+ fnum = 0;
+ }
+
for (i = sfxlen - 1; i >= 0; i--) {
fpnt[i] = quot % 26 + 'a';
quot = quot / 26;
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: andvar Date: Mon Jan 30 13:45:26 UTC 2023 Modified Files: src/sys/ufs/ufs: README.acls Log Message: s/isses/issues/ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/ufs/README.acls Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/ufs/README.acls diff -u src/sys/ufs/ufs/README.acls:1.1 src/sys/ufs/ufs/README.acls:1.2 --- src/sys/ufs/ufs/README.acls:1.1 Sat May 16 18:31:54 2020 +++ src/sys/ufs/ufs/README.acls Mon Jan 30 13:45:26 2023 @@ -45,7 +45,7 @@ will result in incorrect application of the kernel is not configured for ACL support, a warning will be printed by the kernel at mount-time. For reliability purposes, it is recommended that the superblock flag be used instead of the -mount-time flag, as this will avoid re-mount isses with the root file +mount-time flag, as this will avoid re-mount issues with the root file system. For reliability and performance reasons, the use of ACLs on UFS1 is discouraged; UFS2 extended attributes provide a more reliable storage mechanism for ACLs.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: andvar Date: Mon Jan 30 13:45:26 UTC 2023 Modified Files: src/sys/ufs/ufs: README.acls Log Message: s/isses/issues/ To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/ufs/README.acls 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: martin Date: Mon Jan 30 11:56:02 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #60 - #62 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 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: martin Date: Mon Jan 30 11:56:02 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #60 - #62 To generate a diff of this commit: cvs rdiff -u -r1.1.2.25 -r1.1.2.26 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.25 src/doc/CHANGES-10.0:1.1.2.26 --- src/doc/CHANGES-10.0:1.1.2.25 Mon Jan 23 14:12:59 2023 +++ src/doc/CHANGES-10.0 Mon Jan 30 11:56:02 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.25 2023/01/23 14:12:59 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.26 2023/01/30 11:56:02 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -721,3 +721,25 @@ external/mit/xorg/lib/libXpm/Makefile Apply upstream fixes for CVE-2022-46285, CVE-2022-44617, and CVE-2022-4883 [mrg, ticket #59] + +share/man/man4/aq.41.5 +sys/dev/pci/if_aq.c1.40-1.44 + + aq(4): support Aquantia (Marvell) AQC113 10G Network Adapter + and variants. Various fixes. + [ryo, ticket #60] + +share/man/man4/puc.41.44 +sys/dev/pci/pcidevs1.1477 +sys/dev/pci/pucdata.c1.114 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + PR 57202: add support for the EXAR XR17V354 PCIe UART. + [thorpej, ticket #61] + +distrib/common/bootimage/fstab.in 1.4 + + Mount /var/shm as tmpfs in install- and live-images. + [maya, ticket #62] +
CVS commit: [netbsd-10] src/distrib/common/bootimage
Module Name:src Committed By: martin Date: Mon Jan 30 11:54:25 UTC 2023 Modified Files: src/distrib/common/bootimage [netbsd-10]: fstab.in Log Message: Pull up following revision(s) (requested by maya in ticket #62): distrib/common/bootimage/fstab.in: revision 1.4 Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.10.1 src/distrib/common/bootimage/fstab.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/common/bootimage/fstab.in diff -u src/distrib/common/bootimage/fstab.in:1.3 src/distrib/common/bootimage/fstab.in:1.3.10.1 --- src/distrib/common/bootimage/fstab.in:1.3 Sat Dec 15 18:03:17 2018 +++ src/distrib/common/bootimage/fstab.in Mon Jan 30 11:54:25 2023 @@ -1,5 +1,6 @@ -ROOT.a / ffs rw 1 1 -ROOT.b none none sw 0 0 -ptyfs /dev/pts ptyfs rw 0 0 -kernfs /kern kernfs rw,noauto 0 0 -procfs /proc procfs rw,noauto 0 0 +ROOT.a / ffs rw 1 1 +ROOT.b none none sw 0 0 +ptyfs /dev/pts ptyfs rw 0 0 +kernfs /kern kernfs rw,noauto 0 0 +procfs /proc procfs rw,noauto 0 0 +tmpfs /var/shm tmpfs rw,-m1777,-sram%25 0 0
CVS commit: [netbsd-10] src/distrib/common/bootimage
Module Name:src Committed By: martin Date: Mon Jan 30 11:54:25 UTC 2023 Modified Files: src/distrib/common/bootimage [netbsd-10]: fstab.in Log Message: Pull up following revision(s) (requested by maya in ticket #62): distrib/common/bootimage/fstab.in: revision 1.4 Make sure to mount /var/shm Programs such as firefox seem to require it, and this file is used by the live image as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.10.1 src/distrib/common/bootimage/fstab.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Mon Jan 30 11:52:23 UTC 2023
Modified Files:
src/share/man/man4 [netbsd-10]: aq.4
src/sys/dev/pci [netbsd-10]: if_aq.c
Log Message:
Pull up following revision(s) (requested by ryo in ticket #60):
sys/dev/pci/if_aq.c: revision 1.40
sys/dev/pci/if_aq.c: revision 1.41
sys/dev/pci/if_aq.c: revision 1.42
sys/dev/pci/if_aq.c: revision 1.43
sys/dev/pci/if_aq.c: revision 1.44
share/man/man4/aq.4: revision 1.5
fix build error in sys/module/if_aq/
avoid error of "comparison of integer expressions of different signedness" and
-Werror=sign-compare
- avoid panic when failing during attach or detach with modload/drvctl.
- free workqueue resources when detaching.
- remove debug message.
fix indentation
Added support for the Aquantia (Marvell) AQC113 10G Network Adapter and the
variants, to aq(4)
- add AQC113 and the variants
- fix first appeared version to 9.1. it was backported.
- Don't discard a packet even if the TX descriptor is temporarily not enough,
and error messages are not output.
- The argument to aq_encap_txring() need not be an mbuf reference, pass an
entity.
pointed out by nisimura@. thanks
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.8.1 src/share/man/man4/aq.4
cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/pci/if_aq.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/aq.4
diff -u src/share/man/man4/aq.4:1.4 src/share/man/man4/aq.4:1.4.8.1
--- src/share/man/man4/aq.4:1.4 Fri Apr 24 04:37:27 2020
+++ src/share/man/man4/aq.4 Mon Jan 30 11:52:23 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: aq.4,v 1.4 2020/04/24 04:37:27 ryo Exp $
+.\" $NetBSD: aq.4,v 1.4.8.1 2023/01/30 11:52:23 martin Exp $
.\"
.\" Copyright (c) 2020 Ryo Shimizu
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd April 24, 2020
+.Dd January 14, 2023
.Dt AQ 4
.Os
.Sh NAME
@@ -64,6 +64,22 @@ AQC111S 5 Gigabit Network Adapter
.It
AQC112S 2.5 Gigabit Network Adapter
.It
+AQC113DEV 10 Gigabit Network Adapter
+.It
+AQC113 10 Gigabit Network Adapter
+.It
+AQC113C 10 Gigabit Network Adapter
+.It
+AQC113CA 10 Gigabit Network Adapter
+.It
+AQC113CS 10 Gigabit Network Adapter
+.It
+AQC114CS 5 Gigabit Network Adapter
+.It
+AQC115C 2.5 Gigabit Network Adapter
+.It
+AQC116C Gigabit Network Adapter
+.It
D100 10 Gigabit Network Adapter
.It
D107 10 Gigabit Network Adapter
@@ -83,7 +99,7 @@ D109 2.5 Gigabit Network Adapter
The
.Nm
driver first appeared in
-.Nx 10.0 ,
+.Nx 9.1 ,
and is based on the
.Fx
driver of the same name, but has been drastically rewritten by Ryo Shimizu.
Index: src/sys/dev/pci/if_aq.c
diff -u src/sys/dev/pci/if_aq.c:1.39 src/sys/dev/pci/if_aq.c:1.39.2.1
--- src/sys/dev/pci/if_aq.c:1.39 Wed Nov 2 20:38:22 2022
+++ src/sys/dev/pci/if_aq.c Mon Jan 30 11:52:22 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aq.c,v 1.39 2022/11/02 20:38:22 andvar Exp $ */
+/* $NetBSD: if_aq.c,v 1.39.2.1 2023/01/30 11:52:22 martin Exp $ */
/**
* aQuantia Corporation Network Driver
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.39 2022/11/02 20:38:22 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.39.2.1 2023/01/30 11:52:22 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_aq.h"
@@ -116,19 +116,29 @@ __KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.
#define AQ_RSS_HASHKEY_SIZE 40
#define AQ_RSS_INDIRECTION_TABLE_MAX 64
-#define AQ_JUMBO_MTU_REV_A 9000
-#define AQ_JUMBO_MTU_REV_B 16338
+#define AQ1_JUMBO_MTU_REV_A 9000
+#define AQ1_JUMBO_MTU_REV_B 16338
+#define AQ2_JUMBO_MTU 16338
/*
* TERMINOLOGY
+ * ATL (AQ1) = Atlantic. AQC100,107-109,111,112.
+ * ATL2 (AQ2) = Atlantic2. AQC113-116.
* MPI = MAC PHY INTERFACE?
* RPO = RX Protocol Offloading
* TPO = TX Protocol Offloading
* RPF = RX Packet Filter
* TPB = TX Packet buffer
* RPB = RX Packet buffer
+ * ART = Action Resolver Table
+ * TC = Traffic Class
*/
+enum aq_hwtype {
+ HWTYPE_AQ1,
+ HWTYPE_AQ2
+};
+
/* registers */
#define AQ_FW_SOFTRESET_REG 0x
#define AQ_FW_SOFTRESET_RESET __BIT(15) /* soft reset bit */
@@ -136,6 +146,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.
#define AQ_FW_VERSION_REG 0x0018
#define AQ_HW_REVISION_REG 0x001c
+#define AQ2_HW_FPGA_VERSION_REG 0x00f4 /* AQ2 */
#define AQ_GLB_NVR_INTERFACE1_REG 0x0100
#define AQ_FW_MBOX_CMD_REG 0x0200
@@ -182,7 +193,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_aq.c,v 1.
#define RBL_STATUS_HOST_BOOT 0xf1a7
#define AQ_FW_GLB_CPU_SEM_REG(i) (0x03a0 + (i) * 4)
-#define AQ_FW_SEM_RAM_REG AQ_FW_GLB_CPU_SEM_REG(2)
+#define AQ1_FW_SEM_RAM_REG AQ_FW_GLB_CPU_SEM_REG(2)
+#define AQ2_ART_SEM_REGAQ_FW_GLB_CPU_SEM_REG(3)
#define AQ_FW_GLB_CTL2_REG 0x0404
#define
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Jan 30 11:52:23 UTC 2023 Modified Files: src/share/man/man4 [netbsd-10]: aq.4 src/sys/dev/pci [netbsd-10]: if_aq.c Log Message: Pull up following revision(s) (requested by ryo in ticket #60): sys/dev/pci/if_aq.c: revision 1.40 sys/dev/pci/if_aq.c: revision 1.41 sys/dev/pci/if_aq.c: revision 1.42 sys/dev/pci/if_aq.c: revision 1.43 sys/dev/pci/if_aq.c: revision 1.44 share/man/man4/aq.4: revision 1.5 fix build error in sys/module/if_aq/ avoid error of "comparison of integer expressions of different signedness" and -Werror=sign-compare - avoid panic when failing during attach or detach with modload/drvctl. - free workqueue resources when detaching. - remove debug message. fix indentation Added support for the Aquantia (Marvell) AQC113 10G Network Adapter and the variants, to aq(4) - add AQC113 and the variants - fix first appeared version to 9.1. it was backported. - Don't discard a packet even if the TX descriptor is temporarily not enough, and error messages are not output. - The argument to aq_encap_txring() need not be an mbuf reference, pass an entity. pointed out by nisimura@. thanks To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.8.1 src/share/man/man4/aq.4 cvs rdiff -u -r1.39 -r1.39.2.1 src/sys/dev/pci/if_aq.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Mon Jan 30 11:44:39 UTC 2023
Modified Files:
src/share/man/man4 [netbsd-10]: puc.4
src/sys/dev/pci [netbsd-10]: pucdata.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #61):
share/man/man4/puc.4: revision 1.44
sys/dev/pci/pucdata.c: revision 1.114
Add and entry for the EXAR XR17V354 4-port UART.
>From Hakan Engvall.
PR kern/57202
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.43.2.1 src/share/man/man4/puc.4
cvs rdiff -u -r1.113 -r1.113.4.1 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/puc.4
diff -u src/share/man/man4/puc.4:1.43 src/share/man/man4/puc.4:1.43.2.1
--- src/share/man/man4/puc.4:1.43 Thu Dec 2 05:10:04 2021
+++ src/share/man/man4/puc.4 Mon Jan 30 11:44:39 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.43 2021/12/02 05:10:04 msaitoh Exp $
+.\" $NetBSD: puc.4,v 1.43.2.1 2023/01/30 11:44:39 martin Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou
.\" All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" <>
.\"
-.Dd December 2, 2021
+.Dd January 29, 2023
.Dt PUC 4
.Os
.Sh NAME
@@ -89,6 +89,7 @@ The driver currently supports the follow
.It Tn "EXAR XR17D152 (2 port serial)"
.It Tn "EXAR XR17D154 (4 port serial)"
.It Tn "EXAR XR17D158 (8 port serial)"
+.It Tn "EXAR XR17V354 (4 port serial)"
.It Tn "Exsys EX-41098 (4 port serial)"
.It Tn "IBM 4810 SurePOS 300 Series SCC (4 port serial)"
.It Tn "InnoSys Keyspan SX Pro (4 port serial)"
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.113 src/sys/dev/pci/pucdata.c:1.113.4.1
--- src/sys/dev/pci/pucdata.c:1.113 Sun May 1 04:24:47 2022
+++ src/sys/dev/pci/pucdata.c Mon Jan 30 11:44:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.113 2022/05/01 04:24:47 mrg Exp $ */
+/* $NetBSD: pucdata.c,v 1.113.4.1 2023/01/30 11:44:39 martin Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.113 2022/05/01 04:24:47 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.113.4.1 2023/01/30 11:44:39 martin Exp $");
#include
#include
@@ -444,6 +444,16 @@ const struct puc_device_description puc_
{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x0600, COM_FREQ * 8 },
},
},
+ { "EXAR XR17D154",
+ { PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17V354, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x, 12500 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0400, 12500 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0800, 12500 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0c00, 12500 },
+ },
+ },
/*
* Multi-Tech ISI5634PCI/4 4-port modem board.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Jan 30 11:44:39 UTC 2023 Modified Files: src/share/man/man4 [netbsd-10]: puc.4 src/sys/dev/pci [netbsd-10]: pucdata.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #61): share/man/man4/puc.4: revision 1.44 sys/dev/pci/pucdata.c: revision 1.114 Add and entry for the EXAR XR17V354 4-port UART. >From Hakan Engvall. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.43.2.1 src/share/man/man4/puc.4 cvs rdiff -u -r1.113 -r1.113.4.1 src/sys/dev/pci/pucdata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 30 11:44:23 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket #61
To generate a diff of this commit:
cvs rdiff -u -r1.1452.2.1 -r1.1452.2.2 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1451.2.1 -r1.1451.2.2 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.1452.2.1 src/sys/dev/pci/pcidevs.h:1.1452.2.2
--- src/sys/dev/pci/pcidevs.h:1.1452.2.1 Wed Jan 18 19:22:41 2023
+++ src/sys/dev/pci/pcidevs.h Mon Jan 30 11:44:18 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1452.2.1 2023/01/18 19:22:41 martin Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1452.2.2 2023/01/30 11:44:18 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1471.2.1 2023/01/18 19:21:49 martin Exp
+ * NetBSD: pcidevs,v 1.1471.2.2 2023/01/30 11:43:35 martin Exp
*/
/*
@@ -3212,6 +3212,7 @@
#define PCI_PRODUCT_EXAR_XR17D152 0x0152 /* dual-channel Universal PCI UART */
#define PCI_PRODUCT_EXAR_XR17D154 0x0154 /* quad-channel Universal PCI UART */
#define PCI_PRODUCT_EXAR_XR17D158 0x0158 /* octal-channel Universal PCI UART */
+#define PCI_PRODUCT_EXAR_XR17V354 0x0354 /* quad-channel Universal PCIe UART */
/* FORE products */
#define PCI_PRODUCT_FORE_PCA200 0x0210 /* ATM PCA-200 */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1451.2.1 src/sys/dev/pci/pcidevs_data.h:1.1451.2.2
--- src/sys/dev/pci/pcidevs_data.h:1.1451.2.1 Wed Jan 18 19:22:41 2023
+++ src/sys/dev/pci/pcidevs_data.h Mon Jan 30 11:44:18 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1451.2.1 2023/01/18 19:22:41 martin Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1451.2.2 2023/01/30 11:44:18 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1471.2.1 2023/01/18 19:21:49 martin Exp
+ * NetBSD: pcidevs,v 1.1471.2.2 2023/01/30 11:43:35 martin Exp
*/
/*
@@ -5243,6 +5243,8 @@ static const uint32_t pci_products[] = {
15140, 20295, 615, 7941, 0,
PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D158,
15153, 20295, 615, 7941, 0,
+ PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17V354,
+ 15140, 20295, 8154, 7941, 0,
PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200,
7083, 20305, 0,
PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200E,
@@ -18827,7 +18829,7 @@ static const char pci_words[] = { "."
"NVMe\0" /* 24 refs @ 7915 */
"SSD\0" /* 27 refs @ 7920 */
"16650-compatible\0" /* 1 refs @ 7924 */
- "UART\0" /* 96 refs @ 7941 */
+ "UART\0" /* 97 refs @ 7941 */
"Elastic\0" /* 1 refs @ 7946 */
"K8\0" /* 4 refs @ 7954 */
"AMD64\0" /* 14 refs @ 7957 */
@@ -18856,7 +18858,7 @@ static const char pci_words[] = { "."
"Fabric\0" /* 64 refs @ 8129 */
"17h/6xh\0" /* 20 refs @ 8136 */
"Family17h\0" /* 21 refs @ 8144 */
- "PCIe\0" /* 669 refs @ 8154 */
+ "PCIe\0" /* 670 refs @ 8154 */
"17h/Axh\0" /* 19 refs @ 8159 */
"Dummy\0" /* 6 refs @ 8167 */
"Crypto\0" /* 6 refs @ 8173 */
@@ -19902,7 +19904,7 @@ static const char pci_words[] = { "."
"single-channel\0" /* 2 refs @ 15105 */
"RS-485\0" /* 8 refs @ 15120 */
"dual-channel\0" /* 3 refs @ 15127 */
- "quad-channel\0" /* 3 refs @ 15140 */
+ "quad-channel\0" /* 4 refs @ 15140 */
"octal-channel\0" /* 3 refs @ 15153 */
"Isolated\0" /* 4 refs @ 15167 */
"PBlaze4\0" /* 1 refs @ 15176 */
@@ -20566,7 +20568,7 @@ static const char pci_words[] = { "."
"OZ711E0\0" /* 1 refs @ 20270 */
"Freedom\0" /* 1 refs @ 20278 */
"PCI-GBus\0" /* 1 refs @ 20286 */
- "Universal\0" /* 3 refs @ 20295 */
+ "Universal\0" /* 4 refs @ 20295 */
"PCA-200\0" /* 1 refs @ 20305 */
"PCA-200e\0" /* 1 refs @ 20313 */
"801\0" /* 1 refs @ 20322 */
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:44:23 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #61 To generate a diff of this commit: cvs rdiff -u -r1.1452.2.1 -r1.1452.2.2 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1451.2.1 -r1.1451.2.2 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: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:43:35 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up following revision(s) (requested by thorpej in ticket #61): sys/dev/pci/pcidevs: revision 1.1477 Add ID for the EXAR XR17V354 PCIe UART. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.1471.2.1 -r1.1471.2.2 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.1471.2.1 src/sys/dev/pci/pcidevs:1.1471.2.2 --- src/sys/dev/pci/pcidevs:1.1471.2.1 Wed Jan 18 19:21:49 2023 +++ src/sys/dev/pci/pcidevs Mon Jan 30 11:43:35 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1471.2.1 2023/01/18 19:21:49 martin Exp $ +$NetBSD: pcidevs,v 1.1471.2.2 2023/01/30 11:43:35 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3205,6 +3205,7 @@ product ES FREEDOM 0x0001 Freedom PCI-GB product EXAR XR17D152 0x0152 dual-channel Universal PCI UART product EXAR XR17D154 0x0154 quad-channel Universal PCI UART product EXAR XR17D158 0x0158 octal-channel Universal PCI UART +product EXAR XR17V354 0x0354 quad-channel Universal PCIe UART /* FORE products */ product FORE PCA200 0x0210 ATM PCA-200
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:43:35 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: pcidevs Log Message: Pull up following revision(s) (requested by thorpej in ticket #61): sys/dev/pci/pcidevs: revision 1.1477 Add ID for the EXAR XR17V354 PCIe UART. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.1471.2.1 -r1.1471.2.2 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: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Jan 30 11:42:11 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1580 To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 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.42 src/doc/CHANGES-9.4:1.1.2.43 --- src/doc/CHANGES-9.4:1.1.2.42 Mon Jan 23 14:12:08 2023 +++ src/doc/CHANGES-9.4 Mon Jan 30 11:42:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.42 2023/01/23 14:12:08 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.43 2023/01/30 11:42:11 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -705,3 +705,12 @@ sys/dev/pci/ixgbe/ixv.c 1.183 - KNF. Modify comment. Fix typo. [msaitoh, ticket #1579] +share/man/man4/puc.41.44 +sys/dev/pci/pcidevs1.1477 +sys/dev/pci/pucdata.c1.114 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + PR 57202: add support for the EXAR XR17V354 PCIe UART. + [thorpej, ticket #1580] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Jan 30 11:42:11 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1580 To generate a diff of this commit: cvs rdiff -u -r1.1.2.42 -r1.1.2.43 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
Module Name:src
Committed By: martin
Date: Mon Jan 30 11:35:16 UTC 2023
Modified Files:
src/share/man/man4 [netbsd-9]: puc.4
src/sys/dev/pci [netbsd-9]: pucdata.c
Log Message:
Pull up following revision(s) (requested by thorpej in ticket #1580):
share/man/man4/puc.4: revision 1.44
sys/dev/pci/pucdata.c: revision 1.114
Add and entry for the EXAR XR17V354 4-port UART.
>From Hakan Engvall.
PR kern/57202
To generate a diff of this commit:
cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/share/man/man4/puc.4
cvs rdiff -u -r1.104.2.2 -r1.104.2.3 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/puc.4
diff -u src/share/man/man4/puc.4:1.41.2.1 src/share/man/man4/puc.4:1.41.2.2
--- src/share/man/man4/puc.4:1.41.2.1 Fri Dec 3 18:11:41 2021
+++ src/share/man/man4/puc.4 Mon Jan 30 11:35:15 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: puc.4,v 1.41.2.1 2021/12/03 18:11:41 martin Exp $
+.\" $NetBSD: puc.4,v 1.41.2.2 2023/01/30 11:35:15 martin Exp $
.\"
.\" Copyright (c) 1998 Christopher G. Demetriou
.\" All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" <>
.\"
-.Dd December 2, 2021
+.Dd January 29, 2023
.Dt PUC 4
.Os
.Sh NAME
@@ -89,6 +89,7 @@ The driver currently supports the follow
.It Tn "EXAR XR17D152 (2 port serial)"
.It Tn "EXAR XR17D154 (4 port serial)"
.It Tn "EXAR XR17D158 (8 port serial)"
+.It Tn "EXAR XR17V354 (4 port serial)"
.It Tn "Exsys EX-41098 (4 port serial)"
.It Tn "IBM 4810 SurePOS 300 Series SCC (4 port serial)"
.It Tn "InnoSys Keyspan SX Pro (4 port serial)"
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.104.2.2 src/sys/dev/pci/pucdata.c:1.104.2.3
--- src/sys/dev/pci/pucdata.c:1.104.2.2 Fri Dec 3 18:11:41 2021
+++ src/sys/dev/pci/pucdata.c Mon Jan 30 11:35:15 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.104.2.2 2021/12/03 18:11:41 martin Exp $ */
+/* $NetBSD: pucdata.c,v 1.104.2.3 2023/01/30 11:35:15 martin Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104.2.2 2021/12/03 18:11:41 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104.2.3 2023/01/30 11:35:15 martin Exp $");
#include
#include
@@ -444,6 +444,16 @@ const struct puc_device_description puc_
{ PUC_PORT_TYPE_COM, PCI_BAR0, 0x0600, COM_FREQ * 8 },
},
},
+ { "EXAR XR17D154",
+ { PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17V354, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x, 12500 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0400, 12500 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0800, 12500 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x0c00, 12500 },
+ },
+ },
/*
* Multi-Tech ISI5634PCI/4 4-port modem board.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Jan 30 11:35:16 UTC 2023 Modified Files: src/share/man/man4 [netbsd-9]: puc.4 src/sys/dev/pci [netbsd-9]: pucdata.c Log Message: Pull up following revision(s) (requested by thorpej in ticket #1580): share/man/man4/puc.4: revision 1.44 sys/dev/pci/pucdata.c: revision 1.114 Add and entry for the EXAR XR17V354 4-port UART. >From Hakan Engvall. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/share/man/man4/puc.4 cvs rdiff -u -r1.104.2.2 -r1.104.2.3 src/sys/dev/pci/pucdata.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/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:34:21 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h Log Message: Regen for ticket #1580 To generate a diff of this commit: cvs rdiff -u -r1.1371.2.14 -r1.1371.2.15 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1370.2.14 -r1.1370.2.15 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: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Jan 30 11:34:21 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket #1580
To generate a diff of this commit:
cvs rdiff -u -r1.1371.2.14 -r1.1371.2.15 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1370.2.14 -r1.1370.2.15 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.1371.2.14 src/sys/dev/pci/pcidevs.h:1.1371.2.15
--- src/sys/dev/pci/pcidevs.h:1.1371.2.14 Wed Jan 18 19:27:18 2023
+++ src/sys/dev/pci/pcidevs.h Mon Jan 30 11:33:45 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1371.2.14 2023/01/18 19:27:18 martin Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1371.2.15 2023/01/30 11:33:45 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp
+ * NetBSD: pcidevs,v 1.1383.2.15 2023/01/30 11:32:22 martin Exp
*/
/*
@@ -3212,6 +3212,7 @@
#define PCI_PRODUCT_EXAR_XR17D152 0x0152 /* dual-channel Universal PCI UART */
#define PCI_PRODUCT_EXAR_XR17D154 0x0154 /* quad-channel Universal PCI UART */
#define PCI_PRODUCT_EXAR_XR17D158 0x0158 /* octal-channel Universal PCI UART */
+#define PCI_PRODUCT_EXAR_XR17V354 0x0354 /* quad-channel Universal PCIe UART */
/* FORE products */
#define PCI_PRODUCT_FORE_PCA200 0x0210 /* ATM PCA-200 */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1370.2.14 src/sys/dev/pci/pcidevs_data.h:1.1370.2.15
--- src/sys/dev/pci/pcidevs_data.h:1.1370.2.14 Wed Jan 18 19:27:18 2023
+++ src/sys/dev/pci/pcidevs_data.h Mon Jan 30 11:33:45 2023
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1370.2.14 2023/01/18 19:27:18 martin Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1370.2.15 2023/01/30 11:33:45 martin Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp
+ * NetBSD: pcidevs,v 1.1383.2.15 2023/01/30 11:32:22 martin Exp
*/
/*
@@ -5243,6 +5243,8 @@ static const uint16_t pci_products[] = {
15140, 20295, 615, 7941, 0,
PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17D158,
15153, 20295, 615, 7941, 0,
+ PCI_VENDOR_EXAR, PCI_PRODUCT_EXAR_XR17V354,
+ 15140, 20295, 8154, 7941, 0,
PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200,
7083, 20305, 0,
PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200E,
@@ -18827,7 +18829,7 @@ static const char pci_words[] = { "."
"NVMe\0" /* 24 refs @ 7915 */
"SSD\0" /* 27 refs @ 7920 */
"16650-compatible\0" /* 1 refs @ 7924 */
- "UART\0" /* 96 refs @ 7941 */
+ "UART\0" /* 97 refs @ 7941 */
"Elastic\0" /* 1 refs @ 7946 */
"K8\0" /* 4 refs @ 7954 */
"AMD64\0" /* 14 refs @ 7957 */
@@ -18856,7 +18858,7 @@ static const char pci_words[] = { "."
"Fabric\0" /* 64 refs @ 8129 */
"17h/6xh\0" /* 20 refs @ 8136 */
"Family17h\0" /* 21 refs @ 8144 */
- "PCIe\0" /* 669 refs @ 8154 */
+ "PCIe\0" /* 670 refs @ 8154 */
"17h/Axh\0" /* 19 refs @ 8159 */
"Dummy\0" /* 6 refs @ 8167 */
"Crypto\0" /* 6 refs @ 8173 */
@@ -19902,7 +19904,7 @@ static const char pci_words[] = { "."
"single-channel\0" /* 2 refs @ 15105 */
"RS-485\0" /* 8 refs @ 15120 */
"dual-channel\0" /* 3 refs @ 15127 */
- "quad-channel\0" /* 3 refs @ 15140 */
+ "quad-channel\0" /* 4 refs @ 15140 */
"octal-channel\0" /* 3 refs @ 15153 */
"Isolated\0" /* 4 refs @ 15167 */
"PBlaze4\0" /* 1 refs @ 15176 */
@@ -20566,7 +20568,7 @@ static const char pci_words[] = { "."
"OZ711E0\0" /* 1 refs @ 20270 */
"Freedom\0" /* 1 refs @ 20278 */
"PCI-GBus\0" /* 1 refs @ 20286 */
- "Universal\0" /* 3 refs @ 20295 */
+ "Universal\0" /* 4 refs @ 20295 */
"PCA-200\0" /* 1 refs @ 20305 */
"PCA-200e\0" /* 1 refs @ 20313 */
"801\0" /* 1 refs @ 20322 */
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:32:22 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by thorpej in ticket #1580): sys/dev/pci/pcidevs: revision 1.1477 Add ID for the EXAR XR17V354 PCIe UART. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.1383.2.14 -r1.1383.2.15 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.1383.2.14 src/sys/dev/pci/pcidevs:1.1383.2.15 --- src/sys/dev/pci/pcidevs:1.1383.2.14 Wed Jan 18 19:26:30 2023 +++ src/sys/dev/pci/pcidevs Mon Jan 30 11:32:22 2023 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1383.2.14 2023/01/18 19:26:30 martin Exp $ +$NetBSD: pcidevs,v 1.1383.2.15 2023/01/30 11:32:22 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3205,6 +3205,7 @@ product ES FREEDOM 0x0001 Freedom PCI-GB product EXAR XR17D152 0x0152 dual-channel Universal PCI UART product EXAR XR17D154 0x0154 quad-channel Universal PCI UART product EXAR XR17D158 0x0158 octal-channel Universal PCI UART +product EXAR XR17V354 0x0354 quad-channel Universal PCIe UART /* FORE products */ product FORE PCA200 0x0210 ATM PCA-200
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Jan 30 11:32:22 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: pcidevs Log Message: Pull up following revision(s) (requested by thorpej in ticket #1580): sys/dev/pci/pcidevs: revision 1.1477 Add ID for the EXAR XR17V354 PCIe UART. PR kern/57202 To generate a diff of this commit: cvs rdiff -u -r1.1383.2.14 -r1.1383.2.15 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
