CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: rin Date: Thu Aug 24 05:55:26 UTC 2023 Modified Files: src/tests/lib/libc/sys: t_ptrace_core_wait.h Log Message: t_ptrace_core_wait.h: Increment PC after trap, also for riscv Fix *:core_dump_procinfo tests for riscv64. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/sys/t_ptrace_core_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/sys/t_ptrace_core_wait.h diff -u src/tests/lib/libc/sys/t_ptrace_core_wait.h:1.7 src/tests/lib/libc/sys/t_ptrace_core_wait.h:1.8 --- src/tests/lib/libc/sys/t_ptrace_core_wait.h:1.7 Thu Jun 9 17:39:21 2022 +++ src/tests/lib/libc/sys/t_ptrace_core_wait.h Thu Aug 24 05:55:25 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: t_ptrace_core_wait.h,v 1.7 2022/06/09 17:39:21 skrll Exp $ */ +/* $NetBSD: t_ptrace_core_wait.h,v 1.8 2023/08/24 05:55:25 rin Exp $ */ /*- * Copyright (c) 2016, 2017, 2018, 2019, 2020 The NetBSD Foundation, Inc. @@ -209,7 +209,8 @@ ATF_TC_BODY(core_dump_procinfo, tc) "without signal to be sent\n"); #if defined(__aarch64__) || defined(__arm__) || defined(__hppa__) || \ -defined(__powerpc__) || defined(__sh3__) || defined(sparc) +defined(__powerpc__) || defined(__riscv__) || defined(__sh3__) || \ +defined(sparc) /* * For these archs, program counter is not automatically incremented * by a trap instruction. We cannot increment PC in the trap handler,
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: rin Date: Thu Aug 24 05:55:26 UTC 2023 Modified Files: src/tests/lib/libc/sys: t_ptrace_core_wait.h Log Message: t_ptrace_core_wait.h: Increment PC after trap, also for riscv Fix *:core_dump_procinfo tests for riscv64. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/sys/t_ptrace_core_wait.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/csu/arch/riscv
Module Name:src
Committed By: rin
Date: Thu Aug 24 05:51:55 UTC 2023
Modified Files:
src/tests/lib/csu/arch/riscv: h_initfini_align.S
Log Message:
riscv: tests/lib/csu: Fix typo in check_stack_alignment()
Now, all tests in tests/lib/csu successfully pass for riscv64.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/arch/riscv/h_initfini_align.S
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/csu/arch/riscv/h_initfini_align.S
diff -u src/tests/lib/csu/arch/riscv/h_initfini_align.S:1.1 src/tests/lib/csu/arch/riscv/h_initfini_align.S:1.2
--- src/tests/lib/csu/arch/riscv/h_initfini_align.S:1.1 Sun May 7 12:41:49 2023
+++ src/tests/lib/csu/arch/riscv/h_initfini_align.S Thu Aug 24 05:51:55 2023
@@ -1,15 +1,15 @@
-/* $NetBSD: h_initfini_align.S,v 1.1 2023/05/07 12:41:49 skrll Exp $ */
+/* $NetBSD: h_initfini_align.S,v 1.2 2023/08/24 05:51:55 rin Exp $ */
#include
-RCSID("$NetBSD: h_initfini_align.S,v 1.1 2023/05/07 12:41:49 skrll Exp $")
+RCSID("$NetBSD: h_initfini_align.S,v 1.2 2023/08/24 05:51:55 rin Exp $")
/*
* LINTSTUB: bool check_stack_alignment(void);
*/
ENTRY_NP(check_stack_alignment)
-andia0, a0, 15
+andia0, sp, 15
seqza0, a0
ret
END(check_stack_alignment)
CVS commit: src/tests/lib/csu/arch/riscv
Module Name:src Committed By: rin Date: Thu Aug 24 05:51:55 UTC 2023 Modified Files: src/tests/lib/csu/arch/riscv: h_initfini_align.S Log Message: riscv: tests/lib/csu: Fix typo in check_stack_alignment() Now, all tests in tests/lib/csu successfully pass for riscv64. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/lib/csu/arch/riscv/h_initfini_align.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/riscv/riscv
Module Name:src
Committed By: rin
Date: Thu Aug 24 05:46:55 UTC 2023
Modified Files:
src/sys/arch/riscv/riscv: riscv_machdep.c
Log Message:
riscv: cpu_setmcontext: Do not unconditionally update tp register
Conserve tp register for _UC_CPU and update later if _UC_TLSBASE is
specified. This is what powerpc does, which also uses a general
purpose register for TLS pointer.
Found by tests/lib/libpthread/t_swapcontext:swapcontext1, which
successfully passes now.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/riscv/riscv/riscv_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/riscv/riscv/riscv_machdep.c
diff -u src/sys/arch/riscv/riscv/riscv_machdep.c:1.32 src/sys/arch/riscv/riscv/riscv_machdep.c:1.33
--- src/sys/arch/riscv/riscv/riscv_machdep.c:1.32 Fri Aug 4 09:06:33 2023
+++ src/sys/arch/riscv/riscv/riscv_machdep.c Thu Aug 24 05:46:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: riscv_machdep.c,v 1.32 2023/08/04 09:06:33 mrg Exp $ */
+/* $NetBSD: riscv_machdep.c,v 1.33 2023/08/24 05:46:55 rin Exp $ */
/*-
* Copyright (c) 2014, 2019, 2022 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "opt_riscv_debug.h"
#include
-__RCSID("$NetBSD: riscv_machdep.c,v 1.32 2023/08/04 09:06:33 mrg Exp $");
+__RCSID("$NetBSD: riscv_machdep.c,v 1.33 2023/08/24 05:46:55 rin Exp $");
#include
@@ -302,8 +302,12 @@ cpu_setmcontext(struct lwp *l, const mco
if (error)
return error;
- /* Save register context. */
+ /*
+ * Avoid updating TLS register here.
+ */
+ const __greg_t saved_tp = tf->tf_reg[_REG_TP];
tf->tf_regs = *(const struct reg *)gr;
+ tf->tf_reg[_REG_TP] = saved_tp;
}
/* Restore the private thread context */
CVS commit: src/sys/arch/riscv/riscv
Module Name:src Committed By: rin Date: Thu Aug 24 05:46:55 UTC 2023 Modified Files: src/sys/arch/riscv/riscv: riscv_machdep.c Log Message: riscv: cpu_setmcontext: Do not unconditionally update tp register Conserve tp register for _UC_CPU and update later if _UC_TLSBASE is specified. This is what powerpc does, which also uses a general purpose register for TLS pointer. Found by tests/lib/libpthread/t_swapcontext:swapcontext1, which successfully passes now. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/riscv/riscv/riscv_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/riscv/include
Module Name:src
Committed By: rin
Date: Thu Aug 24 05:40:08 UTC 2023
Modified Files:
src/sys/arch/riscv/include: ptrace.h
Log Message:
riscv: Add PTRACE_BREAKPOINT and friends for ATF
Since its size must be determined a priori, explicitly use
c.ebreak for sure.
Now, related tests in ATF successfully pass for riscv64,
as far as I can see.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/ptrace.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/riscv/include/ptrace.h
diff -u src/sys/arch/riscv/include/ptrace.h:1.3 src/sys/arch/riscv/include/ptrace.h:1.4
--- src/sys/arch/riscv/include/ptrace.h:1.3 Tue Jun 18 21:18:12 2019
+++ src/sys/arch/riscv/include/ptrace.h Thu Aug 24 05:40:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ptrace.h,v 1.3 2019/06/18 21:18:12 kamil Exp $ */
+/* $NetBSD: ptrace.h,v 1.4 2023/08/24 05:40:08 rin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -54,4 +54,8 @@
#define PTRACE_REG_SP(r) (r)->r_reg[1]
#define PTRACE_REG_INTRV(r) (r)->r_reg[9]
+#define PTRACE_BREAKPOINT ((const uint8_t[]) { 0x02, 0x90 })
+#define PTRACE_BREAKPOINT_ASM __asm __volatile("c.ebreak" ::: "memory")
+#define PTRACE_BREAKPOINT_SIZE 2
+
#endif /* _RISCV_PTRACE_H_ */
CVS commit: src/sys/arch/riscv/include
Module Name:src Committed By: rin Date: Thu Aug 24 05:40:08 UTC 2023 Modified Files: src/sys/arch/riscv/include: ptrace.h Log Message: riscv: Add PTRACE_BREAKPOINT and friends for ATF Since its size must be determined a priori, explicitly use c.ebreak for sure. Now, related tests in ATF successfully pass for riscv64, as far as I can see. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/compat/linux
Module Name:src
Committed By: rillig
Date: Wed Aug 23 20:05:05 UTC 2023
Modified Files:
src/tests/compat/linux: h_linux.h
Log Message:
tests/compat/linux: fix typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/compat/linux/h_linux.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/compat/linux/h_linux.h
diff -u src/tests/compat/linux/h_linux.h:1.1 src/tests/compat/linux/h_linux.h:1.2
--- src/tests/compat/linux/h_linux.h:1.1 Sat Aug 19 22:56:44 2023
+++ src/tests/compat/linux/h_linux.h Wed Aug 23 20:05:05 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: h_linux.h,v 1.1 2023/08/19 22:56:44 christos Exp $ */
+/* $NetBSD: h_linux.h,v 1.2 2023/08/23 20:05:05 rillig Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#define RS(x) do { if ((x) == -1) exit(errno); } while (0)
#define REQUIRE(x) do { if (!(x)) exit(FAIL); } while (0)
-/* Convinience wrappers for common syscalls. */
+/* Convenience wrappers for common syscalls. */
#define close(fd) (int)syscall(LINUX_SYS_close, fd)
#define exit(status) (void)syscall(LINUX_SYS_exit_group, status)
#define fcntl(fd, cmd, ...) (int)syscall(LINUX_SYS_fcntl, fd, cmd, \
CVS commit: src/tests/compat/linux
Module Name:src Committed By: rillig Date: Wed Aug 23 20:05:05 UTC 2023 Modified Files: src/tests/compat/linux: h_linux.h Log Message: tests/compat/linux: fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/compat/linux/h_linux.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/bin/psim
Module Name:src
Committed By: riastradh
Date: Wed Aug 23 19:42:25 UTC 2023
Modified Files:
src/external/gpl3/gdb/bin/psim: Makefile
Log Message:
gdb/psim: Suppress typedef-redefinition errors in the clang build.
Seems clang disagrees with gcc about whether this is allowed under
-std=gnu99.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/bin/psim/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/gdb/bin/psim/Makefile
diff -u src/external/gpl3/gdb/bin/psim/Makefile:1.3 src/external/gpl3/gdb/bin/psim/Makefile:1.4
--- src/external/gpl3/gdb/bin/psim/Makefile:1.3 Fri Aug 11 15:18:29 2023
+++ src/external/gpl3/gdb/bin/psim/Makefile Wed Aug 23 19:42:25 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/08/11 15:18:29 christos Exp $
+# $NetBSD: Makefile,v 1.4 2023/08/23 19:42:25 riastradh Exp $
NOMAN= # defined
@@ -32,6 +32,16 @@ PSIM_DEFINES= -DHAVE_CONFIG_H \
CPPFLAGS+= ${HOST_CPPFLAGS} ${PSIM_DEFINES}
+# /home/source/ab/HEAD-llvm/src/external/gpl3/gdb/bin/psim/../../dist/include/sim/sim.h:37:27: error: redefinition of typedef 'SIM_DESC' is a C11 feature [-Werror,-Wtypedef-redefinition]
+# typedef struct sim_state *SIM_DESC;
+# ^
+# /home/source/ab/HEAD-llvm/src/external/gpl3/gdb/bin/psim/../../dist/sim/ppc/sim_callbacks.h:106:27: note: previous definition is here
+# typedef struct sim_state *SIM_DESC;
+# ^
+#
+# XXX remove me when we use -std=c11 or -std=gnu11 or something
+CWARNFLAGS.clang+= -Wno-error=typedef-redefinition
+
SRCS+=version.c
GDBLIBDIR= ${.CURDIR}/../../lib
@@ -51,4 +61,4 @@ CLEANFILES+= version.c
version.c: ${DIST}/gdb/version.in
echo 'const char version[] = "'$$(cat ${.ALLSRC})'";' > ${.TARGET}
-.PATH: ${DIST}/sim/ppc
+.PATH: ${DIST}/sim/ppc
CVS commit: src/external/gpl3/gdb/bin/psim
Module Name:src Committed By: riastradh Date: Wed Aug 23 19:42:25 UTC 2023 Modified Files: src/external/gpl3/gdb/bin/psim: Makefile Log Message: gdb/psim: Suppress typedef-redefinition errors in the clang build. Seems clang disagrees with gcc about whether this is allowed under -std=gnu99. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gdb/bin/psim/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: christos
Date: Wed Aug 23 19:17:59 UTC 2023
Modified Files:
src/sys/compat/linux/common: linux_inotify.c
Log Message:
put variable length structure at the end, so that clang does not complain.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/common/linux_inotify.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/compat/linux/common/linux_inotify.c
diff -u src/sys/compat/linux/common/linux_inotify.c:1.3 src/sys/compat/linux/common/linux_inotify.c:1.4
--- src/sys/compat/linux/common/linux_inotify.c:1.3 Tue Aug 22 08:02:34 2023
+++ src/sys/compat/linux/common/linux_inotify.c Wed Aug 23 15:17:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_inotify.c,v 1.3 2023/08/22 12:02:34 christos Exp $ */
+/* $NetBSD: linux_inotify.c,v 1.4 2023/08/23 19:17:59 christos Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_inotify.c,v 1.3 2023/08/22 12:02:34 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_inotify.c,v 1.4 2023/08/23 19:17:59 christos Exp $");
#include
#include
@@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: linux_inotif
struct inotify_entry {
TAILQ_ENTRY(inotify_entry) ie_entries;
+ charie_name[NAME_MAX + 1];
struct linux_inotify_event ie_event;
- charie_name[NAME_MAX+1];
};
struct inotify_dir_entries {
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Wed Aug 23 19:17:59 UTC 2023 Modified Files: src/sys/compat/linux/common: linux_inotify.c Log Message: put variable length structure at the end, so that clang does not complain. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/compat/linux/common/linux_inotify.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/base64
Module Name:src
Committed By: rillig
Date: Wed Aug 23 19:16:14 UTC 2023
Modified Files:
src/usr.bin/base64: base64.c
Log Message:
base64: getc and fputc are specified to return EOF, not -1
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/base64/base64.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/base64/base64.c
diff -u src/usr.bin/base64/base64.c:1.7 src/usr.bin/base64/base64.c:1.8
--- src/usr.bin/base64/base64.c:1.7 Fri Aug 11 02:49:28 2023
+++ src/usr.bin/base64/base64.c Wed Aug 23 19:16:14 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: base64.c,v 1.7 2023/08/11 02:49:28 rillig Exp $ */
+/* $NetBSD: base64.c,v 1.8 2023/08/23 19:16:14 rillig Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: base64.c,v 1.7 2023/08/11 02:49:28 rillig Exp $");
+__RCSID("$NetBSD: base64.c,v 1.8 2023/08/23 19:16:14 rillig Exp $");
#include
#include
@@ -67,19 +67,19 @@ putoutput(FILE *fout, uint8_t out[4], si
for (i = 0; i < len + 1; i++) {
if (out[i] >= 64)
return EINVAL;
- if (fputc(B64[out[i]], fout) == -1)
+ if (fputc(B64[out[i]], fout) == EOF)
return errno;
if (++(*pos) == wrap) {
- if (fputc('\n', fout) == -1)
+ if (fputc('\n', fout) == EOF)
return errno;
*pos = 0;
}
}
for (; i < 4; i++) {
- if (fputc('=', fout) == -1)
+ if (fputc('=', fout) == EOF)
return errno;
if (++(*pos) == wrap) {
- if (fputc('\n', fout) == -1)
+ if (fputc('\n', fout) == EOF)
return errno;
*pos = 0;
}
@@ -119,7 +119,7 @@ b64_encode(FILE *fout, FILE *fin, size_t
}
if (pos != 0 && wrap != 0) {
- if (fputc('\n', fout) == -1)
+ if (fputc('\n', fout) == EOF)
return errno;
}
return 0;
@@ -135,7 +135,7 @@ b64_decode(FILE *fout, FILE *fin, bool i
state = 0;
out = 0;
- while ((c = getc(fin)) != -1) {
+ while ((c = getc(fin)) != EOF) {
if (ignore && isspace(c))
continue;
@@ -154,19 +154,19 @@ b64_decode(FILE *fout, FILE *fin, bool i
break;
case 1:
out |= b >> 4;
- if (fputc(out, fout) == -1)
+ if (fputc(out, fout) == EOF)
return errno;
out = (uint8_t)((b & 0xf) << 4);
break;
case 2:
out |= b >> 2;
- if (fputc(out, fout) == -1)
+ if (fputc(out, fout) == EOF)
return errno;
out = (uint8_t)((b & 0x3) << 6);
break;
case 3:
out |= b;
- if (fputc(out, fout) == -1)
+ if (fputc(out, fout) == EOF)
return errno;
out = 0;
break;
@@ -182,7 +182,7 @@ b64_decode(FILE *fout, FILE *fin, bool i
case 1:
return EFTYPE;
case 2:
- while ((c = getc(fin)) != -1) {
+ while ((c = getc(fin)) != EOF) {
if (ignore && isspace(c))
continue;
break;
@@ -191,12 +191,12 @@ b64_decode(FILE *fout, FILE *fin, bool i
return EFTYPE;
/*FALLTHROUGH*/
case 3:
- while ((c = getc(fin)) != -1) {
+ while ((c = getc(fin)) != EOF) {
if (ignore && isspace(c))
continue;
break;
}
- if (c != -1)
+ if (c != EOF)
return EFTYPE;
return 0;
default:
@@ -204,7 +204,7 @@ b64_decode(FILE *fout, FILE *fin, bool i
}
}
- if (c != -1 || state != 0)
+ if (c != EOF || state != 0)
return EFTYPE;
return 0;
CVS commit: src/usr.bin/base64
Module Name:src Committed By: rillig Date: Wed Aug 23 19:16:14 UTC 2023 Modified Files: src/usr.bin/base64: base64.c Log Message: base64: getc and fputc are specified to return EOF, not -1 No binary change. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/base64/base64.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src Committed By: palle Date: Wed Aug 23 19:09:53 UTC 2023 Modified Files: src/tools/compat: README Log Message: Update build instructions for Solaris 11.3 hosts To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/tools/compat/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/README diff -u src/tools/compat/README:1.26 src/tools/compat/README:1.27 --- src/tools/compat/README:1.26 Tue Aug 15 19:13:12 2023 +++ src/tools/compat/README Wed Aug 23 19:09:53 2023 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.26 2023/08/15 19:13:12 palle Exp $ +$NetBSD: README,v 1.27 2023/08/23 19:09:53 palle Exp $ Special notes for cross-hosting a NetBSD build on certain platforms. Only those platforms which have been tested to complete a "build.sh" run @@ -126,8 +126,8 @@ Solaris 11: * Solaris 11.3 * POSIX.1-2001, SUSv3 (see standards(7)) - * Using gcc-?? - * Set PATH to /usr/xpg6/bin:/usr/xpg4/bin:/usr/bin + * Using gcc-12 from pkgsrc.org (installed in GCC12INSTALLDIR) + * Set PATH to /usr/xpg6/bin:/usr/xpg4/bin:/usr/bin:$GCC12INSTALLDIR/bin * Set HOST_CC to /usr/bin/gcc * Set HOST_SH to /usr/bin/bash
CVS commit: src/tools/compat
Module Name:src Committed By: palle Date: Wed Aug 23 19:09:53 UTC 2023 Modified Files: src/tools/compat: README Log Message: Update build instructions for Solaris 11.3 hosts To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/tools/compat/README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Aug 23 18:26:40 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1890 - #1893 To generate a diff of this commit: cvs rdiff -u -r1.1.2.193 -r1.1.2.194 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.193 src/doc/CHANGES-8.3:1.1.2.194 --- src/doc/CHANGES-8.3:1.1.2.193 Tue Aug 22 16:22:00 2023 +++ src/doc/CHANGES-8.3 Wed Aug 23 18:26:40 2023 @@ -1,4 +1,4 @@ - $NetBSD: CHANGES-8.3,v 1.1.2.193 2023/08/22 16:22:00 martin Exp $ + $NetBSD: CHANGES-8.3,v 1.1.2.194 2023/08/23 18:26:40 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -3833,3 +3833,26 @@ sys/dev/pci/sdhc_pci.c1.21 Add quirk setting for some Intel eMMC devices to make them work. [msaitoh, ticket #1889] +sys/arch/x86/pci/pci_machdep.c 1.94 + + Fix detection of MSI/MSI-X availability on some systems. + [msaitoh, ticket #1890] + +sys/dev/pci/ichsmb.c1.85 +sys/dev/pci/ismt.c1.11 + + ichsmb(4),ismt(4): add Snow Ridge support. + [msaitoh, ticket #1891] + +usr.sbin/cpuctl/cpuctl.8 1.21 +usr.sbin/cpuctl/cpuctl.c 1.33 + + cpuctl(8): do not show error messages when the microcode to be + loaded is already available in the cpu. + [msaitoh, ticket #1892] + +sys/net/npf/npf_ruleset.c 1.52 + + npf(7): PR 56990: fix handling of dynamic groups. + [kardel, ticket #1893] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Aug 23 18:26:40 UTC 2023 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Tickets #1890 - #1893 To generate a diff of this commit: cvs rdiff -u -r1.1.2.193 -r1.1.2.194 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/net/npf
Module Name:src
Committed By: martin
Date: Wed Aug 23 18:25:04 UTC 2023
Modified Files:
src/sys/net/npf [netbsd-8]: npf_ruleset.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #1893):
sys/net/npf/npf_ruleset.c: revision 1.52
The analysis documented in PR misc/56990 is correct.
Fix by not returning when encountering a ruleset rule.
The code up to now would stop at any group rule.
ruleset rules are marked as group rule and a dynamic rule.
processing is only finished when a result is present AND
we are looking at a plain group rule.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/net/npf/npf_ruleset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.45 src/sys/net/npf/npf_ruleset.c:1.45.6.1
--- src/sys/net/npf/npf_ruleset.c:1.45 Sun Jan 29 00:15:54 2017
+++ src/sys/net/npf/npf_ruleset.c Wed Aug 23 18:25:04 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ruleset.c,v 1.45 2017/01/29 00:15:54 christos Exp $ */
+/* $NetBSD: npf_ruleset.c,v 1.45.6.1 2023/08/23 18:25:04 martin Exp $ */
/*-
* Copyright (c) 2009-2015 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.45 2017/01/29 00:15:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.45.6.1 2023/08/23 18:25:04 martin Exp $");
#include
#include
@@ -944,7 +944,7 @@ npf_ruleset_inspect(npf_cache_t *npc, co
KASSERT(n < skip_to);
/* Group is a barrier: return a matching if found any. */
- if ((attr & NPF_RULE_GROUP) != 0 && final_rl) {
+ if ((attr & NPF_DYNAMIC_GROUP) == NPF_RULE_GROUP && final_rl) {
break;
}
CVS commit: [netbsd-8] src/sys/net/npf
Module Name:src Committed By: martin Date: Wed Aug 23 18:25:04 UTC 2023 Modified Files: src/sys/net/npf [netbsd-8]: npf_ruleset.c Log Message: Pull up following revision(s) (requested by kardel in ticket #1893): sys/net/npf/npf_ruleset.c: revision 1.52 The analysis documented in PR misc/56990 is correct. Fix by not returning when encountering a ruleset rule. The code up to now would stop at any group rule. ruleset rules are marked as group rule and a dynamic rule. processing is only finished when a result is present AND we are looking at a plain group rule. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/net/npf/npf_ruleset.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/doc
Module Name:src Committed By: martin Date: Wed Aug 23 18:24:12 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1722 - #1725 To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 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.94 src/doc/CHANGES-9.4:1.1.2.95 --- src/doc/CHANGES-9.4:1.1.2.94 Tue Aug 22 16:18:28 2023 +++ src/doc/CHANGES-9.4 Wed Aug 23 18:24:11 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.94 2023/08/22 16:18:28 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.95 2023/08/23 18:24:11 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -2070,3 +2070,26 @@ sys/dev/pci/sdhc_pci.c1.21 Add quirk setting for some Intel eMMC devices to make them work. [msaitoh, ticket #1721] +sys/arch/x86/pci/pci_machdep.c 1.94 + + Fix detection of MSI/MSI-X availability on some systems. + [msaitoh, ticket #1722] + +sys/dev/pci/ichsmb.c1.85 +sys/dev/pci/ismt.c1.11 + + ichsmb(4),ismt(4): add Snow Ridge support. + [msaitoh, ticket #1723] + +usr.sbin/cpuctl/cpuctl.8 1.21 +usr.sbin/cpuctl/cpuctl.c 1.33 + + cpuctl(8): do not show error messages when the microcode to be + loaded is already available in the cpu. + [msaitoh, ticket #1724] + +sys/net/npf/npf_ruleset.c 1.52 + + npf(7): PR 56990: fix handling of dynamic groups. + [kardel, ticket #1725] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Aug 23 18:24:12 UTC 2023 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1722 - #1725 To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 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/net/npf
Module Name:src Committed By: martin Date: Wed Aug 23 18:22:51 UTC 2023 Modified Files: src/sys/net/npf [netbsd-9]: npf_ruleset.c Log Message: Pull up following revision(s) (requested by kardel in ticket #1725): sys/net/npf/npf_ruleset.c: revision 1.52 The analysis documented in PR misc/56990 is correct. Fix by not returning when encountering a ruleset rule. The code up to now would stop at any group rule. ruleset rules are marked as group rule and a dynamic rule. processing is only finished when a result is present AND we are looking at a plain group rule. To generate a diff of this commit: cvs rdiff -u -r1.48.2.3 -r1.48.2.4 src/sys/net/npf/npf_ruleset.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/net/npf
Module Name:src
Committed By: martin
Date: Wed Aug 23 18:22:51 UTC 2023
Modified Files:
src/sys/net/npf [netbsd-9]: npf_ruleset.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #1725):
sys/net/npf/npf_ruleset.c: revision 1.52
The analysis documented in PR misc/56990 is correct.
Fix by not returning when encountering a ruleset rule.
The code up to now would stop at any group rule.
ruleset rules are marked as group rule and a dynamic rule.
processing is only finished when a result is present AND
we are looking at a plain group rule.
To generate a diff of this commit:
cvs rdiff -u -r1.48.2.3 -r1.48.2.4 src/sys/net/npf/npf_ruleset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.48.2.3 src/sys/net/npf/npf_ruleset.c:1.48.2.4
--- src/sys/net/npf/npf_ruleset.c:1.48.2.3 Sat Jun 20 15:46:48 2020
+++ src/sys/net/npf/npf_ruleset.c Wed Aug 23 18:22:51 2023
@@ -34,7 +34,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.48.2.3 2020/06/20 15:46:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.48.2.4 2023/08/23 18:22:51 martin Exp $");
#include
#include
@@ -891,7 +891,7 @@ npf_ruleset_inspect(npf_cache_t *npc, co
KASSERT(n < skip_to);
/* Group is a barrier: return a matching if found any. */
- if ((attr & NPF_RULE_GROUP) != 0 && final_rl) {
+ if ((attr & NPF_DYNAMIC_GROUP) == NPF_RULE_GROUP && final_rl) {
break;
}
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Aug 23 18:21:40 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #337 - #340 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 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.112 src/doc/CHANGES-10.0:1.1.2.113 --- src/doc/CHANGES-10.0:1.1.2.112 Tue Aug 22 16:16:20 2023 +++ src/doc/CHANGES-10.0 Wed Aug 23 18:21:39 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.112 2023/08/22 16:16:20 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.113 2023/08/23 18:21:39 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -11235,3 +11235,26 @@ sys/dev/pci/sdhc_pci.c1.21 Add quirk setting for some Intel eMMC devices to make them work. [msaitoh, ticket #336] +sys/arch/x86/pci/pci_machdep.c 1.94 + + Fix detection of MSI/MSI-X availability on some systems. + [msaitoh, ticket #337] + +sys/dev/pci/ichsmb.c1.85 +sys/dev/pci/ismt.c1.11 + + ichsmb(4),ismt(4): add Snow Ridge support. + [msaitoh, ticket #338] + +usr.sbin/cpuctl/cpuctl.8 1.21 +usr.sbin/cpuctl/cpuctl.c 1.33 + + cpuctl(8): do not show error messages when the microcode to be + loaded is already available in the cpu. + [msaitoh, ticket #339] + +sys/net/npf/npf_ruleset.c 1.52 + + npf(7): PR 56990: fix handling of dynamic groups. + [kardel, ticket #340] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Wed Aug 23 18:21:40 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #337 - #340 To generate a diff of this commit: cvs rdiff -u -r1.1.2.112 -r1.1.2.113 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/sys/net/npf
Module Name:src Committed By: martin Date: Wed Aug 23 18:19:32 UTC 2023 Modified Files: src/sys/net/npf [netbsd-10]: npf_ruleset.c Log Message: Pull up following revision(s) (requested by kardel in ticket #340): sys/net/npf/npf_ruleset.c: revision 1.52 The analysis documented in PR misc/56990 is correct. Fix by not returning when encountering a ruleset rule. The code up to now would stop at any group rule. ruleset rules are marked as group rule and a dynamic rule. processing is only finished when a result is present AND we are looking at a plain group rule. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.51.20.1 src/sys/net/npf/npf_ruleset.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/net/npf
Module Name:src
Committed By: martin
Date: Wed Aug 23 18:19:32 UTC 2023
Modified Files:
src/sys/net/npf [netbsd-10]: npf_ruleset.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #340):
sys/net/npf/npf_ruleset.c: revision 1.52
The analysis documented in PR misc/56990 is correct.
Fix by not returning when encountering a ruleset rule.
The code up to now would stop at any group rule.
ruleset rules are marked as group rule and a dynamic rule.
processing is only finished when a result is present AND
we are looking at a plain group rule.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.20.1 src/sys/net/npf/npf_ruleset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.51 src/sys/net/npf/npf_ruleset.c:1.51.20.1
--- src/sys/net/npf/npf_ruleset.c:1.51 Sat May 30 14:16:56 2020
+++ src/sys/net/npf/npf_ruleset.c Wed Aug 23 18:19:32 2023
@@ -34,7 +34,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.51 2020/05/30 14:16:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ruleset.c,v 1.51.20.1 2023/08/23 18:19:32 martin Exp $");
#include
#include
@@ -891,7 +891,7 @@ npf_ruleset_inspect(npf_cache_t *npc, co
KASSERT(n < skip_to);
/* Group is a barrier: return a matching if found any. */
- if ((attr & NPF_RULE_GROUP) != 0 && final_rl) {
+ if ((attr & NPF_DYNAMIC_GROUP) == NPF_RULE_GROUP && final_rl) {
break;
}
CVS commit: [netbsd-8] src/usr.sbin/cpuctl
Module Name:src Committed By: martin Date: Wed Aug 23 18:10:06 UTC 2023 Modified Files: src/usr.sbin/cpuctl [netbsd-8]: cpuctl.8 cpuctl.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1892): usr.sbin/cpuctl/cpuctl.8: revision 1.21 usr.sbin/cpuctl/cpuctl.c: revision 1.33 Unless -v is given, ignore EEXIST errors from the IOC_CPU_UCODE_APPLY ioctl() used to implement "cpuctl ucode N", which indicates that the microcode to be loaded already exists in the CPU, and as such, isn't really a very interesting "error". To generate a diff of this commit: cvs rdiff -u -r1.17.6.1 -r1.17.6.2 src/usr.sbin/cpuctl/cpuctl.8 cvs rdiff -u -r1.28.8.2 -r1.28.8.3 src/usr.sbin/cpuctl/cpuctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/usr.sbin/cpuctl
Module Name:src
Committed By: martin
Date: Wed Aug 23 18:10:06 UTC 2023
Modified Files:
src/usr.sbin/cpuctl [netbsd-8]: cpuctl.8 cpuctl.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1892):
usr.sbin/cpuctl/cpuctl.8: revision 1.21
usr.sbin/cpuctl/cpuctl.c: revision 1.33
Unless -v is given, ignore EEXIST errors from the IOC_CPU_UCODE_APPLY ioctl()
used to implement "cpuctl ucode N", which indicates that the microcode
to be loaded already exists in the CPU, and as such, isn't really a
very interesting "error".
To generate a diff of this commit:
cvs rdiff -u -r1.17.6.1 -r1.17.6.2 src/usr.sbin/cpuctl/cpuctl.8
cvs rdiff -u -r1.28.8.2 -r1.28.8.3 src/usr.sbin/cpuctl/cpuctl.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/cpuctl.8
diff -u src/usr.sbin/cpuctl/cpuctl.8:1.17.6.1 src/usr.sbin/cpuctl/cpuctl.8:1.17.6.2
--- src/usr.sbin/cpuctl/cpuctl.8:1.17.6.1 Wed Apr 11 14:38:34 2018
+++ src/usr.sbin/cpuctl/cpuctl.8 Wed Aug 23 18:10:06 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpuctl.8,v 1.17.6.1 2018/04/11 14:38:34 martin Exp $
+.\" $NetBSD: cpuctl.8,v 1.17.6.2 2023/08/23 18:10:06 martin Exp $
.\"
.\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -72,6 +72,10 @@ Set the specified CPUs on line, making i
.Op Ar file
.Xc
This applies the microcode patch to CPUs.
+Unless
+.Fl v
+was given, errors indicating that the microcode
+already exists on the CPU in question are ignored.
If
.Ar cpu
is not specified or \-1, all CPUs are updated.
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.28.8.2 src/usr.sbin/cpuctl/cpuctl.c:1.28.8.3
--- src/usr.sbin/cpuctl/cpuctl.c:1.28.8.2 Wed Aug 5 15:48:53 2020
+++ src/usr.sbin/cpuctl/cpuctl.c Wed Aug 23 18:10:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.28.8.2 2020/08/05 15:48:53 martin Exp $ */
+/* $NetBSD: cpuctl.c,v 1.28.8.3 2023/08/23 18:10:06 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: cpuctl.c,v 1.28.8.2 2020/08/05 15:48:53 martin Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.28.8.3 2023/08/23 18:10:06 martin Exp $");
#endif /* not lint */
#include
@@ -247,7 +247,7 @@ cpu_ucode(char **argv)
cpuset_destroy(cpuset);
}
error = ioctl(fd, IOC_CPU_UCODE_APPLY, );
- if (error < 0) {
+ if (error < 0 && (verbose || errno != EEXIST)) {
if (uc.fwname[0])
err(EXIT_FAILURE, "%s", uc.fwname);
else
CVS commit: [netbsd-9] src/usr.sbin/cpuctl
Module Name:src
Committed By: martin
Date: Wed Aug 23 18:08:45 UTC 2023
Modified Files:
src/usr.sbin/cpuctl [netbsd-9]: cpuctl.8 cpuctl.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1724):
usr.sbin/cpuctl/cpuctl.8: revision 1.21
usr.sbin/cpuctl/cpuctl.c: revision 1.33
Unless -v is given, ignore EEXIST errors from the IOC_CPU_UCODE_APPLY ioctl()
used to implement "cpuctl ucode N", which indicates that the microcode
to be loaded already exists in the CPU, and as such, isn't really a
very interesting "error".
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.2.1 src/usr.sbin/cpuctl/cpuctl.8
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/usr.sbin/cpuctl/cpuctl.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/cpuctl.8
diff -u src/usr.sbin/cpuctl/cpuctl.8:1.20 src/usr.sbin/cpuctl/cpuctl.8:1.20.2.1
--- src/usr.sbin/cpuctl/cpuctl.8:1.20 Fri May 17 23:51:35 2019
+++ src/usr.sbin/cpuctl/cpuctl.8 Wed Aug 23 18:08:44 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpuctl.8,v 1.20 2019/05/17 23:51:35 gutteridge Exp $
+.\" $NetBSD: cpuctl.8,v 1.20.2.1 2023/08/23 18:08:44 martin Exp $
.\"
.\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -72,6 +72,10 @@ Set the specified CPUs on line, making t
.Op Ar file
.Xc
This applies the microcode patch to CPUs.
+Unless
+.Fl v
+was given, errors indicating that the microcode
+already exists on the CPU in question are ignored.
If
.Ar cpu
is not specified or \-1, all CPUs are updated.
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.30.2.1 src/usr.sbin/cpuctl/cpuctl.c:1.30.2.2
--- src/usr.sbin/cpuctl/cpuctl.c:1.30.2.1 Fri Jul 10 11:20:29 2020
+++ src/usr.sbin/cpuctl/cpuctl.c Wed Aug 23 18:08:44 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.30.2.1 2020/07/10 11:20:29 martin Exp $ */
+/* $NetBSD: cpuctl.c,v 1.30.2.2 2023/08/23 18:08:44 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: cpuctl.c,v 1.30.2.1 2020/07/10 11:20:29 martin Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.30.2.2 2023/08/23 18:08:44 martin Exp $");
#endif /* not lint */
#include
@@ -247,7 +247,7 @@ cpu_ucode(char **argv)
cpuset_destroy(cpuset);
}
error = ioctl(fd, IOC_CPU_UCODE_APPLY, );
- if (error < 0) {
+ if (error < 0 && (verbose || errno != EEXIST)) {
if (uc.fwname[0])
err(EXIT_FAILURE, "%s", uc.fwname);
else
CVS commit: [netbsd-9] src/usr.sbin/cpuctl
Module Name:src Committed By: martin Date: Wed Aug 23 18:08:45 UTC 2023 Modified Files: src/usr.sbin/cpuctl [netbsd-9]: cpuctl.8 cpuctl.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1724): usr.sbin/cpuctl/cpuctl.8: revision 1.21 usr.sbin/cpuctl/cpuctl.c: revision 1.33 Unless -v is given, ignore EEXIST errors from the IOC_CPU_UCODE_APPLY ioctl() used to implement "cpuctl ucode N", which indicates that the microcode to be loaded already exists in the CPU, and as such, isn't really a very interesting "error". To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.2.1 src/usr.sbin/cpuctl/cpuctl.8 cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/usr.sbin/cpuctl/cpuctl.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/usr.sbin/cpuctl
Module Name:src
Committed By: martin
Date: Wed Aug 23 18:06:49 UTC 2023
Modified Files:
src/usr.sbin/cpuctl [netbsd-10]: cpuctl.8 cpuctl.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #339):
usr.sbin/cpuctl/cpuctl.8: revision 1.21
usr.sbin/cpuctl/cpuctl.c: revision 1.33
Unless -v is given, ignore EEXIST errors from the IOC_CPU_UCODE_APPLY ioctl()
used to implement "cpuctl ucode N", which indicates that the microcode
to be loaded already exists in the CPU, and as such, isn't really a
very interesting "error".
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.10.1 src/usr.sbin/cpuctl/cpuctl.8
cvs rdiff -u -r1.32 -r1.32.2.1 src/usr.sbin/cpuctl/cpuctl.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/cpuctl.8
diff -u src/usr.sbin/cpuctl/cpuctl.8:1.20 src/usr.sbin/cpuctl/cpuctl.8:1.20.10.1
--- src/usr.sbin/cpuctl/cpuctl.8:1.20 Fri May 17 23:51:35 2019
+++ src/usr.sbin/cpuctl/cpuctl.8 Wed Aug 23 18:06:49 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: cpuctl.8,v 1.20 2019/05/17 23:51:35 gutteridge Exp $
+.\" $NetBSD: cpuctl.8,v 1.20.10.1 2023/08/23 18:06:49 martin Exp $
.\"
.\" Copyright (c) 2007, 2008, 2012, 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -72,6 +72,10 @@ Set the specified CPUs on line, making t
.Op Ar file
.Xc
This applies the microcode patch to CPUs.
+Unless
+.Fl v
+was given, errors indicating that the microcode
+already exists on the CPU in question are ignored.
If
.Ar cpu
is not specified or \-1, all CPUs are updated.
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.32 src/usr.sbin/cpuctl/cpuctl.c:1.32.2.1
--- src/usr.sbin/cpuctl/cpuctl.c:1.32 Tue Feb 1 10:45:02 2022
+++ src/usr.sbin/cpuctl/cpuctl.c Wed Aug 23 18:06:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.32 2022/02/01 10:45:02 mrg Exp $ */
+/* $NetBSD: cpuctl.c,v 1.32.2.1 2023/08/23 18:06:49 martin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2012, 2015 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include
-__RCSID("$NetBSD: cpuctl.c,v 1.32 2022/02/01 10:45:02 mrg Exp $");
+__RCSID("$NetBSD: cpuctl.c,v 1.32.2.1 2023/08/23 18:06:49 martin Exp $");
#endif /* not lint */
#include
@@ -247,7 +247,7 @@ cpu_ucode(char **argv)
cpuset_destroy(cpuset);
}
error = ioctl(fd, IOC_CPU_UCODE_APPLY, );
- if (error < 0) {
+ if (error < 0 && (verbose || errno != EEXIST)) {
if (uc.fwname[0])
err(EXIT_FAILURE, "%s", uc.fwname);
else
CVS commit: [netbsd-10] src/usr.sbin/cpuctl
Module Name:src Committed By: martin Date: Wed Aug 23 18:06:49 UTC 2023 Modified Files: src/usr.sbin/cpuctl [netbsd-10]: cpuctl.8 cpuctl.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #339): usr.sbin/cpuctl/cpuctl.8: revision 1.21 usr.sbin/cpuctl/cpuctl.c: revision 1.33 Unless -v is given, ignore EEXIST errors from the IOC_CPU_UCODE_APPLY ioctl() used to implement "cpuctl ucode N", which indicates that the microcode to be loaded already exists in the CPU, and as such, isn't really a very interesting "error". To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.10.1 src/usr.sbin/cpuctl/cpuctl.8 cvs rdiff -u -r1.32 -r1.32.2.1 src/usr.sbin/cpuctl/cpuctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 23 17:16:13 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-8]: ichsmb.c ismt.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1891):
sys/dev/pci/ichsmb.c: revision 1.85
sys/dev/pci/ismt.c: revision 1.11
ichsmb(4),ismt(4): Add Snow Ridge support.
To generate a diff of this commit:
cvs rdiff -u -r1.50.6.7 -r1.50.6.8 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/dev/pci/ismt.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.50.6.7 src/sys/dev/pci/ichsmb.c:1.50.6.8
--- src/sys/dev/pci/ichsmb.c:1.50.6.7 Sat Jul 29 10:54:05 2023
+++ src/sys/dev/pci/ichsmb.c Wed Aug 23 17:16:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.50.6.7 2023/07/29 10:54:05 martin Exp $ */
+/* $NetBSD: ichsmb.c,v 1.50.6.8 2023/08/23 17:16:13 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.7 2023/07/29 10:54:05 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.50.6.8 2023/08/23 17:16:13 martin Exp $");
#include
#include
@@ -130,6 +130,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_GLK_SMB:
case PCI_PRODUCT_INTEL_EHL_SMB:
case PCI_PRODUCT_INTEL_JSL_SMB:
+ case PCI_PRODUCT_INTEL_SNR_SMB_LEGACY:
case PCI_PRODUCT_INTEL_ADL_N_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
Index: src/sys/dev/pci/ismt.c
diff -u src/sys/dev/pci/ismt.c:1.5.2.1 src/sys/dev/pci/ismt.c:1.5.2.2
--- src/sys/dev/pci/ismt.c:1.5.2.1 Mon Feb 26 00:05:04 2018
+++ src/sys/dev/pci/ismt.c Wed Aug 23 17:16:13 2023
@@ -60,7 +60,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ismt/ismt.c 266474 2014-05-20 19:55:06Z jimharris $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.5.2.1 2018/02/26 00:05:04 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.5.2.2 2023/08/23 17:16:13 martin Exp $");
#include
#include
@@ -802,6 +802,7 @@ ismt_match(device_t parent, cfdata_t mat
case PCI_PRODUCT_INTEL_S1200_SMBUS_1:
case PCI_PRODUCT_INTEL_C2000_SMBUS:
case PCI_PRODUCT_INTEL_C3K_SMBUS:
+ case PCI_PRODUCT_INTEL_SNR_SMB_HOST:
break;
default:
return 0;
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Aug 23 17:16:13 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-8]: ichsmb.c ismt.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1891): sys/dev/pci/ichsmb.c: revision 1.85 sys/dev/pci/ismt.c: revision 1.11 ichsmb(4),ismt(4): Add Snow Ridge support. To generate a diff of this commit: cvs rdiff -u -r1.50.6.7 -r1.50.6.8 src/sys/dev/pci/ichsmb.c cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/dev/pci/ismt.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: Wed Aug 23 17:14:32 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-9]: ichsmb.c ismt.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1723): sys/dev/pci/ichsmb.c: revision 1.85 sys/dev/pci/ismt.c: revision 1.11 ichsmb(4),ismt(4): Add Snow Ridge support. To generate a diff of this commit: cvs rdiff -u -r1.60.4.5 -r1.60.4.6 src/sys/dev/pci/ichsmb.c cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/dev/pci/ismt.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: Wed Aug 23 17:14:32 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-9]: ichsmb.c ismt.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1723):
sys/dev/pci/ichsmb.c: revision 1.85
sys/dev/pci/ismt.c: revision 1.11
ichsmb(4),ismt(4): Add Snow Ridge support.
To generate a diff of this commit:
cvs rdiff -u -r1.60.4.5 -r1.60.4.6 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/dev/pci/ismt.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.60.4.5 src/sys/dev/pci/ichsmb.c:1.60.4.6
--- src/sys/dev/pci/ichsmb.c:1.60.4.5 Sat Jul 29 10:52:20 2023
+++ src/sys/dev/pci/ichsmb.c Wed Aug 23 17:14:32 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.60.4.5 2023/07/29 10:52:20 martin Exp $ */
+/* $NetBSD: ichsmb.c,v 1.60.4.6 2023/08/23 17:14:32 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.5 2023/07/29 10:52:20 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60.4.6 2023/08/23 17:14:32 martin Exp $");
#include
#include
@@ -137,6 +137,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_GLK_SMB:
case PCI_PRODUCT_INTEL_EHL_SMB:
case PCI_PRODUCT_INTEL_JSL_SMB:
+ case PCI_PRODUCT_INTEL_SNR_SMB_LEGACY:
case PCI_PRODUCT_INTEL_ADL_N_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
Index: src/sys/dev/pci/ismt.c
diff -u src/sys/dev/pci/ismt.c:1.6 src/sys/dev/pci/ismt.c:1.6.12.1
--- src/sys/dev/pci/ismt.c:1.6 Thu Aug 17 01:24:09 2017
+++ src/sys/dev/pci/ismt.c Wed Aug 23 17:14:32 2023
@@ -60,7 +60,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ismt/ismt.c 266474 2014-05-20 19:55:06Z jimharris $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.6 2017/08/17 01:24:09 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.6.12.1 2023/08/23 17:14:32 martin Exp $");
#include
#include
@@ -802,6 +802,7 @@ ismt_match(device_t parent, cfdata_t mat
case PCI_PRODUCT_INTEL_S1200_SMBUS_1:
case PCI_PRODUCT_INTEL_C2000_SMBUS:
case PCI_PRODUCT_INTEL_C3K_SMBUS:
+ case PCI_PRODUCT_INTEL_SNR_SMB_HOST:
break;
default:
return 0;
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Aug 23 17:13:08 UTC 2023
Modified Files:
src/sys/dev/pci [netbsd-10]: ichsmb.c ismt.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #338):
sys/dev/pci/ichsmb.c: revision 1.85
sys/dev/pci/ismt.c: revision 1.11
ichsmb(4),ismt(4): Add Snow Ridge support.
To generate a diff of this commit:
cvs rdiff -u -r1.81.4.2 -r1.81.4.3 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.9 -r1.9.6.1 src/sys/dev/pci/ismt.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/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.81.4.2 src/sys/dev/pci/ichsmb.c:1.81.4.3
--- src/sys/dev/pci/ichsmb.c:1.81.4.2 Tue Aug 1 14:06:36 2023
+++ src/sys/dev/pci/ichsmb.c Wed Aug 23 17:13:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.81.4.2 2023/08/01 14:06:36 martin Exp $ */
+/* $NetBSD: ichsmb.c,v 1.81.4.3 2023/08/23 17:13:08 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.44 2020/10/07 11:23:05 jsg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.81.4.2 2023/08/01 14:06:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.81.4.3 2023/08/23 17:13:08 martin Exp $");
#include
#include
@@ -155,6 +155,7 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_GLK_SMB:
case PCI_PRODUCT_INTEL_EHL_SMB:
case PCI_PRODUCT_INTEL_JSL_SMB:
+ case PCI_PRODUCT_INTEL_SNR_SMB_LEGACY:
case PCI_PRODUCT_INTEL_ADL_N_SMB:
case PCI_PRODUCT_INTEL_C600_SMBUS:
case PCI_PRODUCT_INTEL_C600_SMB_0:
Index: src/sys/dev/pci/ismt.c
diff -u src/sys/dev/pci/ismt.c:1.9 src/sys/dev/pci/ismt.c:1.9.6.1
--- src/sys/dev/pci/ismt.c:1.9 Sat Aug 7 16:19:14 2021
+++ src/sys/dev/pci/ismt.c Wed Aug 23 17:13:08 2023
@@ -60,7 +60,7 @@
#if 0
__FBSDID("$FreeBSD: head/sys/dev/ismt/ismt.c 266474 2014-05-20 19:55:06Z jimharris $");
#endif
-__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.9 2021/08/07 16:19:14 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ismt.c,v 1.9.6.1 2023/08/23 17:13:08 martin Exp $");
#include
#include
@@ -778,6 +778,7 @@ ismt_match(device_t parent, cfdata_t mat
case PCI_PRODUCT_INTEL_S1200_SMBUS_1:
case PCI_PRODUCT_INTEL_C2000_SMBUS:
case PCI_PRODUCT_INTEL_C3K_SMBUS:
+ case PCI_PRODUCT_INTEL_SNR_SMB_HOST:
break;
default:
return 0;
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Aug 23 17:13:08 UTC 2023 Modified Files: src/sys/dev/pci [netbsd-10]: ichsmb.c ismt.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #338): sys/dev/pci/ichsmb.c: revision 1.85 sys/dev/pci/ismt.c: revision 1.11 ichsmb(4),ismt(4): Add Snow Ridge support. To generate a diff of this commit: cvs rdiff -u -r1.81.4.2 -r1.81.4.3 src/sys/dev/pci/ichsmb.c cvs rdiff -u -r1.9 -r1.9.6.1 src/sys/dev/pci/ismt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86/pci
Module Name:src Committed By: martin Date: Wed Aug 23 17:10:58 UTC 2023 Modified Files: src/sys/arch/x86/pci [netbsd-8]: pci_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1890): sys/arch/x86/pci/pci_machdep.c: revision 1.94 Fix detection of availability of MSI/MSI-X on some systems. Try to find all functions on bus 0, device 0 to find a PCI host bridge. Some CPU's host bridge is at 0:0.4. Tested by Intel Snow Ridge. To generate a diff of this commit: cvs rdiff -u -r1.79.2.2 -r1.79.2.3 src/sys/arch/x86/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/x86/pci
Module Name:src
Committed By: martin
Date: Wed Aug 23 17:10:58 UTC 2023
Modified Files:
src/sys/arch/x86/pci [netbsd-8]: pci_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1890):
sys/arch/x86/pci/pci_machdep.c: revision 1.94
Fix detection of availability of MSI/MSI-X on some systems.
Try to find all functions on bus 0, device 0 to find a PCI host bridge.
Some CPU's host bridge is at 0:0.4. Tested by Intel Snow Ridge.
To generate a diff of this commit:
cvs rdiff -u -r1.79.2.2 -r1.79.2.3 src/sys/arch/x86/pci/pci_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/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.79.2.2 src/sys/arch/x86/pci/pci_machdep.c:1.79.2.3
--- src/sys/arch/x86/pci/pci_machdep.c:1.79.2.2 Wed Jun 12 10:17:33 2019
+++ src/sys/arch/x86/pci/pci_machdep.c Wed Aug 23 17:10:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.79.2.2 2019/06/12 10:17:33 martin Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.79.2.3 2023/08/23 17:10:57 martin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.79.2.2 2019/06/12 10:17:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.79.2.3 2023/08/23 17:10:57 martin Exp $");
#include
#include
@@ -456,6 +456,8 @@ pci_attach_hook(device_t parent, device_
pci_chipset_tag_t pc = pba->pba_pc;
pcitag_t tag;
pcireg_t id, class;
+ int i;
+ bool havehb = false;
#endif
if (pba->pba_bus == 0)
@@ -473,19 +475,25 @@ pci_attach_hook(device_t parent, device_
#ifdef __HAVE_PCI_MSI_MSIX
/*
* In order to decide whether the system supports MSI we look
- * at the host bridge, which should be device 0 function 0 on
- * bus 0. It is better to not enable MSI on systems that
+ * at the host bridge, which should be device 0 on bus 0.
+ * It is better to not enable MSI on systems that
* support it than the other way around, so be conservative
* here. So we don't enable MSI if we don't find a host
* bridge there. We also deliberately don't enable MSI on
* chipsets from low-end manifacturers like VIA and SiS.
*/
- tag = pci_make_tag(pc, 0, 0, 0);
- id = pci_conf_read(pc, tag, PCI_ID_REG);
- class = pci_conf_read(pc, tag, PCI_CLASS_REG);
-
- if (PCI_CLASS(class) != PCI_CLASS_BRIDGE ||
- PCI_SUBCLASS(class) != PCI_SUBCLASS_BRIDGE_HOST)
+ for (i = 0; i <= 7; i++) {
+ tag = pci_make_tag(pc, 0, 0, i);
+ id = pci_conf_read(pc, tag, PCI_ID_REG);
+ class = pci_conf_read(pc, tag, PCI_CLASS_REG);
+
+ if (PCI_CLASS(class) == PCI_CLASS_BRIDGE &&
+ PCI_SUBCLASS(class) == PCI_SUBCLASS_BRIDGE_HOST) {
+ havehb = true;
+ break;
+ }
+ }
+ if (havehb == false)
return;
/* VMware and KVM use old chipset, but they can use MSI/MSI-X */
CVS commit: [netbsd-9] src/sys/arch/x86/pci
Module Name:src Committed By: martin Date: Wed Aug 23 17:09:09 UTC 2023 Modified Files: src/sys/arch/x86/pci [netbsd-9]: pci_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1722): sys/arch/x86/pci/pci_machdep.c: revision 1.94 Fix detection of availability of MSI/MSI-X on some systems. Try to find all functions on bus 0, device 0 to find a PCI host bridge. Some CPU's host bridge is at 0:0.4. Tested by Intel Snow Ridge. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.86.2.1 src/sys/arch/x86/pci/pci_machdep.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/arch/x86/pci
Module Name:src
Committed By: martin
Date: Wed Aug 23 17:09:09 UTC 2023
Modified Files:
src/sys/arch/x86/pci [netbsd-9]: pci_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1722):
sys/arch/x86/pci/pci_machdep.c: revision 1.94
Fix detection of availability of MSI/MSI-X on some systems.
Try to find all functions on bus 0, device 0 to find a PCI host bridge.
Some CPU's host bridge is at 0:0.4. Tested by Intel Snow Ridge.
To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.86.2.1 src/sys/arch/x86/pci/pci_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/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.86 src/sys/arch/x86/pci/pci_machdep.c:1.86.2.1
--- src/sys/arch/x86/pci/pci_machdep.c:1.86 Fri May 24 14:28:48 2019
+++ src/sys/arch/x86/pci/pci_machdep.c Wed Aug 23 17:09:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.86 2019/05/24 14:28:48 nonaka Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.86.2.1 2023/08/23 17:09:09 martin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.86 2019/05/24 14:28:48 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.86.2.1 2023/08/23 17:09:09 martin Exp $");
#include
#include
@@ -485,6 +485,8 @@ pci_attach_hook(device_t parent, device_
pci_chipset_tag_t pc = pba->pba_pc;
pcitag_t tag;
pcireg_t id, class;
+ int i;
+ bool havehb = false;
#endif
if (pba->pba_bus == 0)
@@ -502,19 +504,25 @@ pci_attach_hook(device_t parent, device_
#ifdef __HAVE_PCI_MSI_MSIX
/*
* In order to decide whether the system supports MSI we look
- * at the host bridge, which should be device 0 function 0 on
- * bus 0. It is better to not enable MSI on systems that
+ * at the host bridge, which should be device 0 on bus 0.
+ * It is better to not enable MSI on systems that
* support it than the other way around, so be conservative
* here. So we don't enable MSI if we don't find a host
* bridge there. We also deliberately don't enable MSI on
* chipsets from low-end manifacturers like VIA and SiS.
*/
- tag = pci_make_tag(pc, 0, 0, 0);
- id = pci_conf_read(pc, tag, PCI_ID_REG);
- class = pci_conf_read(pc, tag, PCI_CLASS_REG);
-
- if (PCI_CLASS(class) != PCI_CLASS_BRIDGE ||
- PCI_SUBCLASS(class) != PCI_SUBCLASS_BRIDGE_HOST)
+ for (i = 0; i <= 7; i++) {
+ tag = pci_make_tag(pc, 0, 0, i);
+ id = pci_conf_read(pc, tag, PCI_ID_REG);
+ class = pci_conf_read(pc, tag, PCI_CLASS_REG);
+
+ if (PCI_CLASS(class) == PCI_CLASS_BRIDGE &&
+ PCI_SUBCLASS(class) == PCI_SUBCLASS_BRIDGE_HOST) {
+ havehb = true;
+ break;
+ }
+ }
+ if (havehb == false)
return;
/* VMware and KVM use old chipset, but they can use MSI/MSI-X */
CVS commit: [netbsd-10] src/sys/arch/x86/pci
Module Name:src
Committed By: martin
Date: Wed Aug 23 17:05:39 UTC 2023
Modified Files:
src/sys/arch/x86/pci [netbsd-10]: pci_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #337):
sys/arch/x86/pci/pci_machdep.c: revision 1.94
Fix detection of availability of MSI/MSI-X on some systems.
Try to find all functions on bus 0, device 0 to find a PCI host bridge.
Some CPU's host bridge is at 0:0.4. Tested by Intel Snow Ridge.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/arch/x86/pci/pci_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/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.93 src/sys/arch/x86/pci/pci_machdep.c:1.93.4.1
--- src/sys/arch/x86/pci/pci_machdep.c:1.93 Tue Sep 6 01:44:24 2022
+++ src/sys/arch/x86/pci/pci_machdep.c Wed Aug 23 17:05:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.93 2022/09/06 01:44:24 msaitoh Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.93.4.1 2023/08/23 17:05:39 martin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.93 2022/09/06 01:44:24 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.93.4.1 2023/08/23 17:05:39 martin Exp $");
#include
#include
@@ -485,6 +485,8 @@ pci_attach_hook(device_t parent, device_
pci_chipset_tag_t pc = pba->pba_pc;
pcitag_t tag;
pcireg_t id, class;
+ int i;
+ bool havehb = false;
#endif
if (pba->pba_bus == 0)
@@ -502,19 +504,25 @@ pci_attach_hook(device_t parent, device_
#ifdef __HAVE_PCI_MSI_MSIX
/*
* In order to decide whether the system supports MSI we look
- * at the host bridge, which should be device 0 function 0 on
- * bus 0. It is better to not enable MSI on systems that
+ * at the host bridge, which should be device 0 on bus 0.
+ * It is better to not enable MSI on systems that
* support it than the other way around, so be conservative
* here. So we don't enable MSI if we don't find a host
* bridge there. We also deliberately don't enable MSI on
* chipsets from low-end manifacturers like VIA and SiS.
*/
- tag = pci_make_tag(pc, 0, 0, 0);
- id = pci_conf_read(pc, tag, PCI_ID_REG);
- class = pci_conf_read(pc, tag, PCI_CLASS_REG);
-
- if (PCI_CLASS(class) != PCI_CLASS_BRIDGE ||
- PCI_SUBCLASS(class) != PCI_SUBCLASS_BRIDGE_HOST)
+ for (i = 0; i <= 7; i++) {
+ tag = pci_make_tag(pc, 0, 0, i);
+ id = pci_conf_read(pc, tag, PCI_ID_REG);
+ class = pci_conf_read(pc, tag, PCI_CLASS_REG);
+
+ if (PCI_CLASS(class) == PCI_CLASS_BRIDGE &&
+ PCI_SUBCLASS(class) == PCI_SUBCLASS_BRIDGE_HOST) {
+ havehb = true;
+ break;
+ }
+ }
+ if (havehb == false)
return;
/* VMware and KVM use old chipset, but they can use MSI/MSI-X */
CVS commit: [netbsd-10] src/sys/arch/x86/pci
Module Name:src Committed By: martin Date: Wed Aug 23 17:05:39 UTC 2023 Modified Files: src/sys/arch/x86/pci [netbsd-10]: pci_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #337): sys/arch/x86/pci/pci_machdep.c: revision 1.94 Fix detection of availability of MSI/MSI-X on some systems. Try to find all functions on bus 0, device 0 to find a PCI host bridge. Some CPU's host bridge is at 0:0.4. Tested by Intel Snow Ridge. To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.93.4.1 src/sys/arch/x86/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libkvm
Module Name:src
Committed By: rin
Date: Wed Aug 23 14:00:12 UTC 2023
Modified Files:
src/lib/libkvm: kvm.c kvm_aarch64.c kvm_alpha.c kvm_i386pae.c
kvm_or1k.c kvm_powerpc.c kvm_powerpc64.c kvm_riscv.c kvm_sparc64.c
Log Message:
libkvm: whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/lib/libkvm/kvm.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libkvm/kvm_aarch64.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libkvm/kvm_alpha.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libkvm/kvm_i386pae.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libkvm/kvm_or1k.c src/lib/libkvm/kvm_riscv.c
cvs rdiff -u -r1.14 -r1.15 src/lib/libkvm/kvm_powerpc.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libkvm/kvm_powerpc64.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libkvm/kvm_sparc64.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libkvm/kvm.c
diff -u src/lib/libkvm/kvm.c:1.110 src/lib/libkvm/kvm.c:1.111
--- src/lib/libkvm/kvm.c:1.110 Mon Jan 10 19:51:30 2022
+++ src/lib/libkvm/kvm.c Wed Aug 23 14:00:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm.c,v 1.110 2022/01/10 19:51:30 christos Exp $ */
+/* $NetBSD: kvm.c,v 1.111 2023/08/23 14:00:11 rin Exp $ */
/*-
* Copyright (c) 1989, 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94";
#else
-__RCSID("$NetBSD: kvm.c,v 1.110 2022/01/10 19:51:30 christos Exp $");
+__RCSID("$NetBSD: kvm.c,v 1.111 2023/08/23 14:00:11 rin Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -187,9 +187,9 @@ _kvm_pread(kvm_t *kd, int fd, void *buf,
}
/* If aligned nothing to do. */
- if (((off % kd->fdalign) | (size % kd->fdalign)) == 0) {
+ if (((off % kd->fdalign) | (size % kd->fdalign)) == 0) {
return pread(fd, buf, size, off);
- }
+ }
/*
* Otherwise must buffer. We can't tolerate short reads in this
@@ -397,7 +397,7 @@ _kvm_open(kvm_t *kd, const char *uf, con
goto failed;
}
kd->dump_size = (size_t)st.st_size;
- kd->dump_mem = mmap(NULL, kd->dump_size, PROT_READ|PROT_WRITE,
+ kd->dump_mem = mmap(NULL, kd->dump_size, PROT_READ|PROT_WRITE,
MAP_FILE|MAP_PRIVATE, kd->pmfd, 0);
}
return (kd);
@@ -635,7 +635,7 @@ clear_gap(kvm_t *kd, bool (*write_buf)(v
return -1;
}
size -= len;
- }
+ }
return 0;
}
Index: src/lib/libkvm/kvm_aarch64.c
diff -u src/lib/libkvm/kvm_aarch64.c:1.11 src/lib/libkvm/kvm_aarch64.c:1.12
--- src/lib/libkvm/kvm_aarch64.c:1.11 Mon Jan 10 19:51:30 2022
+++ src/lib/libkvm/kvm_aarch64.c Wed Aug 23 14:00:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_aarch64.c,v 1.11 2022/01/10 19:51:30 christos Exp $ */
+/* $NetBSD: kvm_aarch64.c,v 1.12 2023/08/23 14:00:11 rin Exp $ */
/*-
* Copyright (c) 2014, 2018 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
#include "kvm_private.h"
-__RCSID("$NetBSD: kvm_aarch64.c,v 1.11 2022/01/10 19:51:30 christos Exp $");
+__RCSID("$NetBSD: kvm_aarch64.c,v 1.12 2023/08/23 14:00:11 rin Exp $");
/*ARGSUSED*/
void
@@ -68,10 +68,10 @@ _kvm_initvtop(kvm_t *kd)
int
_kvm_kvatop(kvm_t *kd, vaddr_t va, paddr_t *pa)
{
-if (ISALIVE(kd)) {
-_kvm_err(kd, 0, "vatop called in live kernel!");
-return(0);
-}
+ if (ISALIVE(kd)) {
+ _kvm_err(kd, 0, "vatop called in live kernel!");
+ return(0);
+ }
if ((va & AARCH64_DIRECTMAP_MASK) != AARCH64_DIRECTMAP_START) {
/*
@@ -154,7 +154,7 @@ lose:
}
if (--levels == 0) {
*pa = (pte & page_addr) | (va & page_mask);
- return page_size - (va & page_mask);
+ return page_size - (va & page_mask);
}
/*
Index: src/lib/libkvm/kvm_alpha.c
diff -u src/lib/libkvm/kvm_alpha.c:1.28 src/lib/libkvm/kvm_alpha.c:1.29
--- src/lib/libkvm/kvm_alpha.c:1.28 Mon Jan 10 19:51:30 2022
+++ src/lib/libkvm/kvm_alpha.c Wed Aug 23 14:00:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_alpha.c,v 1.28 2022/01/10 19:51:30 christos Exp $ */
+/* $NetBSD: kvm_alpha.c,v 1.29 2023/08/23 14:00:11 rin Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -50,7 +50,7 @@
#include "kvm_private.h"
-__RCSID("$NetBSD: kvm_alpha.c,v 1.28 2022/01/10 19:51:30 christos Exp $");
+__RCSID("$NetBSD: kvm_alpha.c,v 1.29 2023/08/23 14:00:11 rin Exp $");
/*ARGSUSED*/
void
@@ -74,10 +74,10 @@ _kvm_kvatop(kvm_t *kd, vaddr_t va, paddr
u_long pteoff, page_off;
int rv;
-if (ISALIVE(kd)) {
-_kvm_err(kd, 0, "vatop called in live kernel!");
-return(0);
-}
+ if (ISALIVE(kd)) {
+ _kvm_err(kd, 0, "vatop called in live kernel!");
+ return(0);
+ }
cpu_kh = kd->cpu_data;
page_off = va & (cpu_kh->page_size - 1);
Index: src/lib/libkvm/kvm_i386pae.c
diff -u src/lib/libkvm/kvm_i386pae.c:1.3 src/lib/libkvm/kvm_i386pae.c:1.4
--- src/lib/libkvm/kvm_i386pae.c:1.3 Sat Apr 25 05:17:16 2020
+++ src/lib/libkvm/kvm_i386pae.c Wed Aug 23 14:00:11 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kvm_i386pae.c,v 1.3 2020/04/25 05:17:16 maxv Exp $ */
+/* $NetBSD:
CVS commit: src/lib/libkvm
Module Name:src Committed By: rin Date: Wed Aug 23 14:00:12 UTC 2023 Modified Files: src/lib/libkvm: kvm.c kvm_aarch64.c kvm_alpha.c kvm_i386pae.c kvm_or1k.c kvm_powerpc.c kvm_powerpc64.c kvm_riscv.c kvm_sparc64.c Log Message: libkvm: whitespace To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/lib/libkvm/kvm.c cvs rdiff -u -r1.11 -r1.12 src/lib/libkvm/kvm_aarch64.c cvs rdiff -u -r1.28 -r1.29 src/lib/libkvm/kvm_alpha.c cvs rdiff -u -r1.3 -r1.4 src/lib/libkvm/kvm_i386pae.c cvs rdiff -u -r1.2 -r1.3 src/lib/libkvm/kvm_or1k.c src/lib/libkvm/kvm_riscv.c cvs rdiff -u -r1.14 -r1.15 src/lib/libkvm/kvm_powerpc.c cvs rdiff -u -r1.7 -r1.8 src/lib/libkvm/kvm_powerpc64.c cvs rdiff -u -r1.18 -r1.19 src/lib/libkvm/kvm_sparc64.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: rin Date: Wed Aug 23 13:21:17 UTC 2023 Modified Files: src/sys/net: bpf.h Log Message: bpf: Fix SIZEOF_BPF_HDR (for LP64 userland) on mips64 It cannot fit within 18 bytes, of course ;) As we had never provided working bpf(4) implementation for LP64 userland on mips, just use natural structure size here. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/net/bpf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src
Committed By: rin
Date: Wed Aug 23 13:21:17 UTC 2023
Modified Files:
src/sys/net: bpf.h
Log Message:
bpf: Fix SIZEOF_BPF_HDR (for LP64 userland) on mips64
It cannot fit within 18 bytes, of course ;)
As we had never provided working bpf(4) implementation for LP64
userland on mips, just use natural structure size here.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/net/bpf.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/net/bpf.h
diff -u src/sys/net/bpf.h:1.81 src/sys/net/bpf.h:1.82
--- src/sys/net/bpf.h:1.81 Thu Aug 17 22:10:37 2023
+++ src/sys/net/bpf.h Wed Aug 23 13:21:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.h,v 1.81 2023/08/17 22:10:37 christos Exp $ */
+/* $NetBSD: bpf.h,v 1.82 2023/08/23 13:21:17 rin Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -204,7 +204,10 @@ struct bpf_hdr32 {
* XXX fail-safe: on new machines, we just use the 'safe' sizeof.
*/
#ifdef _KERNEL
-#if defined(__arm32__) || defined(__i386__) || defined(__m68k__) || \
+#if defined(__mips64)
+#define SIZEOF_BPF_HDR sizeof(struct bpf_hdr)
+#define SIZEOF_BPF_HDR32 18
+#elif defined(__arm32__) || defined(__i386__) || defined(__m68k__) || \
defined(__mips__) || defined(__ns32k__) || defined(__vax__) || \
defined(__sh__) || (defined(__sparc__) && !defined(__sparc64__))
#define SIZEOF_BPF_HDR 18
CVS commit: src/lib/libexecinfo
Module Name:src
Committed By: rin
Date: Wed Aug 23 12:24:59 UTC 2023
Modified Files:
src/lib/libexecinfo: execinfo.h symtab.c unwind_arm_ehabi_stub.c
Log Message:
libexecinfo: whitespace, missing RCSID, no binary changes
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libexecinfo/execinfo.h
cvs rdiff -u -r1.9 -r1.10 src/lib/libexecinfo/symtab.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libexecinfo/unwind_arm_ehabi_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libexecinfo/execinfo.h
diff -u src/lib/libexecinfo/execinfo.h:1.3 src/lib/libexecinfo/execinfo.h:1.4
--- src/lib/libexecinfo/execinfo.h:1.3 Fri Jun 30 21:39:43 2017
+++ src/lib/libexecinfo/execinfo.h Wed Aug 23 12:24:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: execinfo.h,v 1.3 2017/06/30 21:39:43 christos Exp $ */
+/* $NetBSD: execinfo.h,v 1.4 2023/08/23 12:24:59 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include
#include
#include
-
+
#ifdef _BSD_SIZE_T_
typedef _BSD_SIZE_T_size_t;
#undef _BSD_SIZE_T_
Index: src/lib/libexecinfo/symtab.c
diff -u src/lib/libexecinfo/symtab.c:1.9 src/lib/libexecinfo/symtab.c:1.10
--- src/lib/libexecinfo/symtab.c:1.9 Sat Jun 25 06:51:37 2022
+++ src/lib/libexecinfo/symtab.c Wed Aug 23 12:24:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: symtab.c,v 1.9 2022/06/25 06:51:37 skrll Exp $ */
+/* $NetBSD: symtab.c,v 1.10 2023/08/23 12:24:59 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: symtab.c,v 1.9 2022/06/25 06:51:37 skrll Exp $");
+__RCSID("$NetBSD: symtab.c,v 1.10 2023/08/23 12:24:59 rin Exp $");
#include
#include
@@ -141,7 +141,7 @@ symtab_create(int fd, int bind, int type
for (size_t i = 0; i < ns; i++) {
GElf_Sym sym;
-gelf_getsym(edata, (int)i, );
+ gelf_getsym(edata, (int)i, );
DPRINTF("%s@%#jx=%d,%d",
elf_strptr(elf, shdr.sh_link, sym.st_name),
@@ -165,7 +165,7 @@ symtab_create(int fd, int bind, int type
goto out;
}
s++;
-}
+ }
st->nsymbols = s - st->symbols;
if (st->nsymbols == 0) {
warnx("No symbols found");
@@ -196,9 +196,9 @@ symtab_find(const symtab_t *st, const vo
uintptr_t sa = SYMBOL_CANONICALIZE(dli->dli_saddr);
uintptr_t ad = sa - fbase;
- DPRINTF("[fbase=%#jx, saddr=%p, sa=%#jx, me=%#jx ad=%#jx]",
+ DPRINTF("[fbase=%#jx, saddr=%p, sa=%#jx, me=%#jx ad=%#jx]",
(uintmax_t)fbase, dli->dli_saddr, (uintmax_t)sa,
- (uintmax_t)me, (uintmax_t)ad);
+ (uintmax_t)me, (uintmax_t)ad);
for (;;) {
if (s[mid].st_value < me)
Index: src/lib/libexecinfo/unwind_arm_ehabi_stub.c
diff -u src/lib/libexecinfo/unwind_arm_ehabi_stub.c:1.2 src/lib/libexecinfo/unwind_arm_ehabi_stub.c:1.3
--- src/lib/libexecinfo/unwind_arm_ehabi_stub.c:1.2 Tue May 6 16:02:10 2014
+++ src/lib/libexecinfo/unwind_arm_ehabi_stub.c Wed Aug 23 12:24:59 2023
@@ -1,3 +1,5 @@
+/* $NetBSD: unwind_arm_ehabi_stub.c,v 1.3 2023/08/23 12:24:59 rin Exp $ */
+
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
* All rights reserved.
CVS commit: src/lib/libexecinfo
Module Name:src Committed By: rin Date: Wed Aug 23 12:24:59 UTC 2023 Modified Files: src/lib/libexecinfo: execinfo.h symtab.c unwind_arm_ehabi_stub.c Log Message: libexecinfo: whitespace, missing RCSID, no binary changes To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libexecinfo/execinfo.h cvs rdiff -u -r1.9 -r1.10 src/lib/libexecinfo/symtab.c cvs rdiff -u -r1.2 -r1.3 src/lib/libexecinfo/unwind_arm_ehabi_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libunwind
Module Name:src Committed By: rin Date: Wed Aug 23 10:40:10 UTC 2023 Modified Files: src/sys/lib/libunwind: Registers.hpp Log Message: libunwind: Drop unused/wrong reg_t typedef for alpha To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/lib/libunwind/Registers.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/lib/libunwind/Registers.hpp diff -u src/sys/lib/libunwind/Registers.hpp:1.39 src/sys/lib/libunwind/Registers.hpp:1.40 --- src/sys/lib/libunwind/Registers.hpp:1.39 Mon Jun 27 06:45:14 2022 +++ src/sys/lib/libunwind/Registers.hpp Wed Aug 23 10:40:10 2023 @@ -887,7 +887,6 @@ public: RETURN_OFFSET = 0, RETURN_MASK = 0, }; - typedef uint32_t reg_t; __dso_hidden Registers_Alpha();
CVS commit: src/sys/lib/libunwind
Module Name:src Committed By: rin Date: Wed Aug 23 10:40:10 UTC 2023 Modified Files: src/sys/lib/libunwind: Registers.hpp Log Message: libunwind: Drop unused/wrong reg_t typedef for alpha To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/lib/libunwind/Registers.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: rin
Date: Wed Aug 23 10:37:46 UTC 2023
Modified Files:
src/external/gpl3/gdb/dist/gdb: mips-netbsd-tdep.c
Log Message:
gdb/mips: Supply zero register as done for other OSes
With this change, gdb/mips 13 becomes working to some extent,
at least for mips{,n}64eb.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c:1.1.1.1 src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c:1.2
--- src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c:1.1.1.1 Sun Jul 30 22:44:54 2023
+++ src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c Wed Aug 23 10:37:46 2023
@@ -95,6 +95,8 @@ mipsnbsd_supply_gregset (const struct re
len -= MIPSNBSD_NUM_GREGS * regsize;
mipsnbsd_supply_fpregset (regset, regcache, regnum, regs, len);
}
+ if (regnum == -1 || regnum == MIPS_ZERO_REGNUM)
+regcache->raw_supply_zeroed (MIPS_ZERO_REGNUM);
}
/* NetBSD/mips register sets. */
@@ -150,6 +152,8 @@ mipsnbsd_supply_reg (struct regcache *re
(i, regs + (i * mips_isa_regsize (gdbarch)));
}
}
+ if (regno == -1 || regno == MIPS_ZERO_REGNUM)
+regcache->raw_supply_zeroed (MIPS_ZERO_REGNUM);
}
void
@@ -277,8 +281,7 @@ mipsnbsd_get_longjmp_target (frame_info_
static int
mipsnbsd_cannot_fetch_register (struct gdbarch *gdbarch, int regno)
{
- return (regno == MIPS_ZERO_REGNUM
- || regno == mips_regnum (gdbarch)->fp_implementation_revision);
+ return regno == mips_regnum (gdbarch)->fp_implementation_revision;
}
static int
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: rin
Date: Wed Aug 23 10:37:46 UTC 2023
Modified Files:
src/external/gpl3/gdb/dist/gdb: mips-netbsd-tdep.c
Log Message:
gdb/mips: Supply zero register as done for other OSes
With this change, gdb/mips 13 becomes working to some extent,
at least for mips{,n}64eb.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/gdb/dist/gdb/mips-netbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
