CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:52:47 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: vectors.s Log Message: Remove non-applicable comments. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/virt68k/vectors.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/virt68k/virt68k/vectors.s diff -u src/sys/arch/virt68k/virt68k/vectors.s:1.1 src/sys/arch/virt68k/virt68k/vectors.s:1.2 --- src/sys/arch/virt68k/virt68k/vectors.s:1.1 Tue Jan 2 07:41:02 2024 +++ src/sys/arch/virt68k/virt68k/vectors.s Tue Jan 2 07:52:47 2024 @@ -1,4 +1,4 @@ -| $NetBSD: vectors.s,v 1.1 2024/01/02 07:41:02 thorpej Exp $ +| $NetBSD: vectors.s,v 1.2 2024/01/02 07:52:47 thorpej Exp $ | Copyright (c) 1997 Jason R. Thorpe. All rights reserved. | Copyright (c) 1988 University of Utah @@ -137,10 +137,6 @@ GLOBAL(vectab) VECTOR(badtrap) /* 62: unassigned, reserved */ VECTOR(badtrap) /* 63: unassigned, reserved */ - /* - * PCC, PCCTWO, MC, and VME vectors are installed from 64-255 - * by the *intr_extablish() functions. - */ BADTRAP16 /* 64-255: user interrupt vectors */ BADTRAP16 /* 64-255: user interrupt vectors */ BADTRAP16 /* 64-255: user interrupt vectors */
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:52:47 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: vectors.s Log Message: Remove non-applicable comments. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/virt68k/vectors.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/virt68k/conf
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:47:36 UTC 2024 Modified Files: src/sys/arch/virt68k/conf: GENERIC Log Message: Comment out LOCKDEBUG. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:48:46 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: intr.c Log Message: Bump date. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/virt68k/intr.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/virt68k/virt68k/intr.c diff -u src/sys/arch/virt68k/virt68k/intr.c:1.1 src/sys/arch/virt68k/virt68k/intr.c:1.2 --- src/sys/arch/virt68k/virt68k/intr.c:1.1 Tue Jan 2 07:41:02 2024 +++ src/sys/arch/virt68k/virt68k/intr.c Tue Jan 2 07:48:46 2024 @@ -1,7 +1,7 @@ -/* $NetBSD: intr.c,v 1.1 2024/01/02 07:41:02 thorpej Exp $ */ +/* $NetBSD: intr.c,v 1.2 2024/01/02 07:48:46 thorpej Exp $ */ /*- - * Copyright (c) 1996 The NetBSD Foundation, Inc. + * Copyright (c) 1996, 2023 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.1 2024/01/02 07:41:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.2 2024/01/02 07:48:46 thorpej Exp $"); #define _VIRT68K_INTR_PRIVATE
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:48:46 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: intr.c Log Message: Bump date. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/virt68k/intr.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/virt68k/conf
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:47:36 UTC 2024 Modified Files: src/sys/arch/virt68k/conf: GENERIC Log Message: Comment out LOCKDEBUG. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/conf/GENERIC 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/virt68k/conf/GENERIC diff -u src/sys/arch/virt68k/conf/GENERIC:1.1 src/sys/arch/virt68k/conf/GENERIC:1.2 --- src/sys/arch/virt68k/conf/GENERIC:1.1 Tue Jan 2 07:40:59 2024 +++ src/sys/arch/virt68k/conf/GENERIC Tue Jan 2 07:47:36 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1 2024/01/02 07:40:59 thorpej Exp $ +# $NetBSD: GENERIC,v 1.2 2024/01/02 07:47:36 thorpej Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/virt68k/conf/std.virt68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1 $" +#ident "GENERIC-$Revision: 1.2 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -42,7 +42,7 @@ options FPSP options DDB options DIAGNOSTIC -options LOCKDEBUG +#options LOCKDEBUG #options DEBUG #options SYSVSHM
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src
Committed By: thorpej
Date: Tue Jan 2 07:43:29 UTC 2024
Modified Files:
src/sys/arch/virt68k/virt68k: pmap_bootstrap.c
Log Message:
Collect more garbage.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/virt68k/virt68k/pmap_bootstrap.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/virt68k/virt68k/pmap_bootstrap.c
diff -u src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.2 src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.3
--- src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.2 Tue Jan 2 07:42:52 2024
+++ src/sys/arch/virt68k/virt68k/pmap_bootstrap.c Tue Jan 2 07:43:29 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.2 2024/01/02 07:42:52 thorpej Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.3 2024/01/02 07:43:29 thorpej Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.2 2024/01/02 07:42:52 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.3 2024/01/02 07:43:29 thorpej Exp $");
#include "opt_m68k_arch.h"
@@ -235,21 +235,6 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
*ste++ = protoste;
protoste += (SG4_LEV3SIZE * sizeof(st_entry_t));
}
-#if 0
- /*
- * Now initialize the final portion of that block of
- * descriptors to map Sysmap.
- */
- i = SG4_LEV1SIZE + (nl1desc * SG4_LEV2SIZE);
- ste = (st_entry_t *)kstpa;
- ste = [i + SG4_LEV2SIZE - (NPTEPG / SG4_LEV3SIZE)];
- este = [NPTEPG / SG4_LEV3SIZE];
- protoste = kptmpa | SG_U | SG_RW | SG_V;
- while (ste < este) {
- *ste++ = protoste;
- protoste += (SG4_LEV3SIZE * sizeof(st_entry_t));
- }
-#endif
/*
* Calculate the free level 2 descriptor mask
* noting that we have used:
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:46:49 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: pmap_bootstrap.c Log Message: Remove yet another remnant of debugging. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/virt68k/virt68k/pmap_bootstrap.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/virt68k/virt68k/pmap_bootstrap.c diff -u src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.3 src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.4 --- src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.3 Tue Jan 2 07:43:29 2024 +++ src/sys/arch/virt68k/virt68k/pmap_bootstrap.c Tue Jan 2 07:46:49 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.3 2024/01/02 07:43:29 thorpej Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.4 2024/01/02 07:46:49 thorpej Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.3 2024/01/02 07:43:29 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.4 2024/01/02 07:46:49 thorpej Exp $"); #include "opt_m68k_arch.h" @@ -136,7 +136,6 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f kptpa = nextpa; nptpages = RELOC(Sysptsize, int) + howmany(RELOC(physmem, int), NPTEPG); - nptpages <<= 1; nextpa += nptpages * PAGE_SIZE; /*
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:46:49 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: pmap_bootstrap.c Log Message: Remove yet another remnant of debugging. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/virt68k/virt68k/pmap_bootstrap.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/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:43:29 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: pmap_bootstrap.c Log Message: Collect more garbage. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/virt68k/virt68k/pmap_bootstrap.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/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:42:52 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: pmap_bootstrap.c Log Message: G/C some scratch-pad notes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/virt68k/pmap_bootstrap.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/virt68k/virt68k/pmap_bootstrap.c diff -u src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.1 src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.2 --- src/sys/arch/virt68k/virt68k/pmap_bootstrap.c:1.1 Tue Jan 2 07:41:02 2024 +++ src/sys/arch/virt68k/virt68k/pmap_bootstrap.c Tue Jan 2 07:42:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.1 2024/01/02 07:41:02 thorpej Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.2 2024/01/02 07:42:52 thorpej Exp $ */ /* * Copyright (c) 1991, 1993 @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.1 2024/01/02 07:41:02 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.2 2024/01/02 07:42:52 thorpej Exp $"); #include "opt_m68k_arch.h" @@ -172,16 +172,6 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f int nl1desc, nl2desc; /* - * XXX NOTES: - * SYSMAP_VA == 0xfe00 - * pte va == 0xfe000e38 - * - * L1 idx = 127 - * L2 idx = 0 - * L3 idx = - */ - - /* * First invalidate the entire "segment table" pages * (levels 1 and 2 have the same "invalid" value). */
CVS commit: src/sys/arch/virt68k/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:42:52 UTC 2024 Modified Files: src/sys/arch/virt68k/virt68k: pmap_bootstrap.c Log Message: G/C some scratch-pad notes. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/virt68k/virt68k/pmap_bootstrap.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/virt68k
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:41:02 UTC 2024 Added Files: src/sys/arch/virt68k: Makefile src/sys/arch/virt68k/compile: Makefile src/sys/arch/virt68k/conf: GENERIC Makefile.virt68k files.virt68k majors.virt68k std.virt68k src/sys/arch/virt68k/dev: gfpic_mainbus.c gfrtc_mainbus.c gftty_mainbus.c mainbus.c mainbusvar.h virtio_mainbus.c src/sys/arch/virt68k/include: Makefile ansi.h aout_machdep.h asm.h bootinfo.h bswap.h bus.h bus_dma.h bus_space.h cdefs.h clockvar.h cpu.h db_machdep.h disklabel.h elf_machdep.h endian.h endian_machdep.h fcode.h fenv.h float.h frame.h ieee.h ieeefp.h int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h intr.h kcore.h limits.h lock.h math.h mcontext.h mutex.h param.h pcb.h pmap.h proc.h profile.h psl.h pte.h ptrace.h reg.h rwlock.h setjmp.h signal.h sunos_machdep.h trap.h types.h vmparam.h wchar_limits.h src/sys/arch/virt68k/virt68k: autoconf.c bootinfo.c bus_dma.c bus_space.c clock.c disksubr.c genassym.cf intr.c locore.s machdep.c pmap_bootstrap.c trap.c vectors.s Log Message: Add a port to the Qemu m68k "virt" platform, a 68040-based virtual machine with VirtIO I/O devices. This is a work-in-progress, but "successfully mounts root file system and then complains about missing /sbin/init that is, in fact, not there" seems like a good checkpoint. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/arch/virt68k/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/virt68k/compile/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/virt68k/conf/GENERIC \ src/sys/arch/virt68k/conf/Makefile.virt68k \ src/sys/arch/virt68k/conf/files.virt68k \ src/sys/arch/virt68k/conf/majors.virt68k \ src/sys/arch/virt68k/conf/std.virt68k cvs rdiff -u -r0 -r1.1 src/sys/arch/virt68k/dev/gfpic_mainbus.c \ src/sys/arch/virt68k/dev/gfrtc_mainbus.c \ src/sys/arch/virt68k/dev/gftty_mainbus.c \ src/sys/arch/virt68k/dev/mainbus.c src/sys/arch/virt68k/dev/mainbusvar.h \ src/sys/arch/virt68k/dev/virtio_mainbus.c cvs rdiff -u -r0 -r1.1 src/sys/arch/virt68k/include/Makefile \ src/sys/arch/virt68k/include/ansi.h \ src/sys/arch/virt68k/include/aout_machdep.h \ src/sys/arch/virt68k/include/asm.h \ src/sys/arch/virt68k/include/bootinfo.h \ src/sys/arch/virt68k/include/bswap.h src/sys/arch/virt68k/include/bus.h \ src/sys/arch/virt68k/include/bus_dma.h \ src/sys/arch/virt68k/include/bus_space.h \ src/sys/arch/virt68k/include/cdefs.h \ src/sys/arch/virt68k/include/clockvar.h \ src/sys/arch/virt68k/include/cpu.h \ src/sys/arch/virt68k/include/db_machdep.h \ src/sys/arch/virt68k/include/disklabel.h \ src/sys/arch/virt68k/include/elf_machdep.h \ src/sys/arch/virt68k/include/endian.h \ src/sys/arch/virt68k/include/endian_machdep.h \ src/sys/arch/virt68k/include/fcode.h src/sys/arch/virt68k/include/fenv.h \ src/sys/arch/virt68k/include/float.h src/sys/arch/virt68k/include/frame.h \ src/sys/arch/virt68k/include/ieee.h src/sys/arch/virt68k/include/ieeefp.h \ src/sys/arch/virt68k/include/int_const.h \ src/sys/arch/virt68k/include/int_fmtio.h \ src/sys/arch/virt68k/include/int_limits.h \ src/sys/arch/virt68k/include/int_mwgwtypes.h \ src/sys/arch/virt68k/include/int_types.h \ src/sys/arch/virt68k/include/intr.h src/sys/arch/virt68k/include/kcore.h \ src/sys/arch/virt68k/include/limits.h src/sys/arch/virt68k/include/lock.h \ src/sys/arch/virt68k/include/math.h \ src/sys/arch/virt68k/include/mcontext.h \ src/sys/arch/virt68k/include/mutex.h src/sys/arch/virt68k/include/param.h \ src/sys/arch/virt68k/include/pcb.h src/sys/arch/virt68k/include/pmap.h \ src/sys/arch/virt68k/include/proc.h \ src/sys/arch/virt68k/include/profile.h src/sys/arch/virt68k/include/psl.h \ src/sys/arch/virt68k/include/pte.h src/sys/arch/virt68k/include/ptrace.h \ src/sys/arch/virt68k/include/reg.h src/sys/arch/virt68k/include/rwlock.h \ src/sys/arch/virt68k/include/setjmp.h \ src/sys/arch/virt68k/include/signal.h \ src/sys/arch/virt68k/include/sunos_machdep.h \ src/sys/arch/virt68k/include/trap.h src/sys/arch/virt68k/include/types.h \ src/sys/arch/virt68k/include/vmparam.h \ src/sys/arch/virt68k/include/wchar_limits.h cvs rdiff -u -r0 -r1.1 src/sys/arch/virt68k/virt68k/autoconf.c \ src/sys/arch/virt68k/virt68k/bootinfo.c \ src/sys/arch/virt68k/virt68k/bus_dma.c \ src/sys/arch/virt68k/virt68k/bus_space.c \ src/sys/arch/virt68k/virt68k/clock.c \ src/sys/arch/virt68k/virt68k/disksubr.c \ src/sys/arch/virt68k/virt68k/genassym.cf \ src/sys/arch/virt68k/virt68k/intr.c src/sys/arch/virt68k/virt68k/locore.s \ src/sys/arch/virt68k/virt68k/machdep.c \ src/sys/arch/virt68k/virt68k/pmap_bootstrap.c \
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:34:27 UTC 2024 Modified Files: src/sys/dev/fdt: gfrtc_fdt.c Log Message: Adapt to changes in the generic gfrtc code. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/gfrtc_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: thorpej
Date: Tue Jan 2 07:34:27 UTC 2024
Modified Files:
src/sys/dev/fdt: gfrtc_fdt.c
Log Message:
Adapt to changes in the generic gfrtc code.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/fdt/gfrtc_fdt.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/fdt/gfrtc_fdt.c
diff -u src/sys/dev/fdt/gfrtc_fdt.c:1.2 src/sys/dev/fdt/gfrtc_fdt.c:1.3
--- src/sys/dev/fdt/gfrtc_fdt.c:1.2 Fri Dec 29 23:31:44 2023
+++ src/sys/dev/fdt/gfrtc_fdt.c Tue Jan 2 07:34:27 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gfrtc_fdt.c,v 1.2 2023/12/29 23:31:44 thorpej Exp $ */
+/* $NetBSD: gfrtc_fdt.c,v 1.3 2024/01/02 07:34:27 thorpej Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gfrtc_fdt.c,v 1.2 2023/12/29 23:31:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfrtc_fdt.c,v 1.3 2024/01/02 07:34:27 thorpej Exp $");
#include
@@ -79,10 +79,7 @@ gfrtc_fdt_attach(device_t parent, device
return;
}
- aprint_naive("\n");
- aprint_normal(": Google Goldfish RTC\n");
-
- gfrtc_attach(sc);
+ gfrtc_attach(sc, true);
}
CFATTACH_DECL_NEW(gfrtc_fdt, sizeof(struct gfrtc_softc),
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:30:29 UTC 2024 Modified Files: src/sys/dev/goldfish: gftty.c Log Message: Fix file-copy-o. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gftty.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:30:29 UTC 2024 Modified Files: src/sys/dev/goldfish: gftty.c Log Message: Fix file-copy-o. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gftty.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/goldfish/gftty.c diff -u src/sys/dev/goldfish/gftty.c:1.1 src/sys/dev/goldfish/gftty.c:1.2 --- src/sys/dev/goldfish/gftty.c:1.1 Tue Jan 2 07:29:39 2024 +++ src/sys/dev/goldfish/gftty.c Tue Jan 2 07:30:29 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: gftty.c,v 1.1 2024/01/02 07:29:39 thorpej Exp $ */ +/* $NetBSD: gftty.c,v 1.2 2024/01/02 07:30:29 thorpej Exp $ */ /*- * Copyright (c) 2023 The NetBSD Foundation, Inc. @@ -30,11 +30,11 @@ */ /* - * Support for the Goldfish virtual Programmable Interrupt Controller. + * Support for the Goldfish virtual TTY. */ #include -__KERNEL_RCSID(0, "$NetBSD: gftty.c,v 1.1 2024/01/02 07:29:39 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gftty.c,v 1.2 2024/01/02 07:30:29 thorpej Exp $"); #include #include
CVS commit: src/sys/dev/goldfish
Module Name:src
Committed By: thorpej
Date: Tue Jan 2 07:29:39 UTC 2024
Modified Files:
src/sys/dev/goldfish: files.goldfish
Added Files:
src/sys/dev/goldfish: gftty.c gfttyvar.h
Log Message:
Add support for the Goldfish virtual TTY. This is only enough for
early console; the rest will come later.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/goldfish/files.goldfish
cvs rdiff -u -r0 -r1.1 src/sys/dev/goldfish/gftty.c \
src/sys/dev/goldfish/gfttyvar.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/goldfish/files.goldfish
diff -u src/sys/dev/goldfish/files.goldfish:1.2 src/sys/dev/goldfish/files.goldfish:1.3
--- src/sys/dev/goldfish/files.goldfish:1.2 Tue Jan 2 07:27:51 2024
+++ src/sys/dev/goldfish/files.goldfish Tue Jan 2 07:29:39 2024
@@ -1,9 +1,13 @@
-# $NetBSD: files.goldfish,v 1.2 2024/01/02 07:27:51 thorpej Exp $
+# $NetBSD: files.goldfish,v 1.3 2024/01/02 07:29:39 thorpej Exp $
# Goldfish programmable interrupt controller
device gfpic
file dev/goldfish/gfpic.c gfpic
+# Goldfish virtual terminal
+device gftty: tty
+file dev/goldfish/gftty.c gftty needs-flag
+
# Goldfish real-time clock / timer
device gfrtc
file dev/goldfish/gfrtc.c gfrtc
Added files:
Index: src/sys/dev/goldfish/gftty.c
diff -u /dev/null src/sys/dev/goldfish/gftty.c:1.1
--- /dev/null Tue Jan 2 07:29:39 2024
+++ src/sys/dev/goldfish/gftty.c Tue Jan 2 07:29:39 2024
@@ -0,0 +1,225 @@
+/* $NetBSD: gftty.c,v 1.1 2024/01/02 07:29:39 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2023 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Support for the Goldfish virtual Programmable Interrupt Controller.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: gftty.c,v 1.1 2024/01/02 07:29:39 thorpej Exp $");
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+
+#include
+
+/*
+ * Goldfish TTY registers.
+ */
+#define GFTTY_PUT_CHAR 0x00 /* 8 bit output value */
+#define GFTTY_BYTES_READY 0x04 /* number of input bytes available */
+#define GFTTY_CMD 0x08 /* command */
+#define GFTTY_DATA_PTR 0x10 /* DMA pointer */
+#define GFTTY_DATA_LEN 0x14 /* DMA length */
+#define GFTTY_DATA_PTR_HIGH 0x18 /* DMA pointer (64-bit) */
+#define GFTTY_VERSION 0x20 /* TTY version */
+
+#define CMD_INT_DISABLE 0x00
+#define CMD_INT_ENABLE 0x01
+#define CMD_WRITE_BUFFER 0x02
+#define CMD_READ_BUFFER 0x03
+
+#define REG_READ0(c, r) \
+ bus_space_read_4((c)->c_bst, (c)->c_bsh, (r))
+#define REG_WRITE0(c, r, v) \
+ bus_space_write_4((c)->c_bst, (c)->c_bsh, (r), (v))
+
+#define REG_READ(sc, r) REG_READ0((sc)->sc_config, (r))
+#define REG_WRITE(sc, r, v) REG_WRITE0((sc)->sc_config, (r), (v))
+
+static int gftty_cngetc(dev_t);
+static void gftty_cnputc(dev_t, int);
+static void gftty_cnpollc(dev_t, int);
+
+static struct gftty_config gftty_cnconfig;
+static struct cnm_state gftty_cnmagic_state;
+static struct consdev gftty_consdev = {
+ .cn_getc = gftty_cngetc,
+ .cn_putc = gftty_cnputc,
+ .cn_pollc = gftty_cnpollc,
+ .cn_dev = NODEV,
+ .cn_pri = CN_NORMAL,
+};
+
+/*
+ * gftty_attach --
+ * Attach a Goldfish virual TTY.
+ */
+void
+gftty_attach(struct gftty_softc *sc)
+{
+
+ aprint_naive("\n");
+ aprint_normal(": Google Goldfish TTY\n");
+
+ /* If we got here without a config, we're the console. */
+ if (sc->sc_config == NULL) {
+ KASSERT(gftty_is_console(sc));
+ sc->sc_config =
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:29:39 UTC 2024 Modified Files: src/sys/dev/goldfish: files.goldfish Added Files: src/sys/dev/goldfish: gftty.c gfttyvar.h Log Message: Add support for the Goldfish virtual TTY. This is only enough for early console; the rest will come later. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/goldfish/files.goldfish cvs rdiff -u -r0 -r1.1 src/sys/dev/goldfish/gftty.c \ src/sys/dev/goldfish/gfttyvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:27:51 UTC 2024 Modified Files: src/sys/dev/goldfish: files.goldfish Added Files: src/sys/dev/goldfish: gfpic.c gfpicvar.h Log Message: Add support for the Goldfish virtual programmable interrupt controller. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/files.goldfish cvs rdiff -u -r0 -r1.1 src/sys/dev/goldfish/gfpic.c \ src/sys/dev/goldfish/gfpicvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/goldfish
Module Name:src
Committed By: thorpej
Date: Tue Jan 2 07:26:17 UTC 2024
Modified Files:
src/sys/dev/goldfish: gfrtc.c gfrtcvar.h
Log Message:
Add support for the timer portion of the Goldfish RTC device.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/goldfish/gfrtc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gfrtcvar.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/goldfish/gfrtc.c
diff -u src/sys/dev/goldfish/gfrtc.c:1.2 src/sys/dev/goldfish/gfrtc.c:1.3
--- src/sys/dev/goldfish/gfrtc.c:1.2 Sun Dec 31 22:06:41 2023
+++ src/sys/dev/goldfish/gfrtc.c Tue Jan 2 07:26:17 2024
@@ -1,11 +1,11 @@
-/* $NetBSD: gfrtc.c,v 1.2 2023/12/31 22:06:41 thorpej Exp $ */
+/* $NetBSD: gfrtc.c,v 1.3 2024/01/02 07:26:17 thorpej Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Nick Hudson.
+ * by Nick Hudson and by Jason R. Thorpe.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gfrtc.c,v 1.2 2023/12/31 22:06:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gfrtc.c,v 1.3 2024/01/02 07:26:17 thorpej Exp $");
#include
@@ -39,8 +39,20 @@ __KERNEL_RCSID(0, "$NetBSD: gfrtc.c,v 1.
#include
+#define GOLDFISH_RTC_TIME_LOW 0x00
+#define GOLDFISH_RTC_TIME_HIGH 0x04
+#define GOLDFISH_RTC_ALARM_LOW 0x08
+#define GOLDFISH_RTC_ALARM_HIGH 0x0c
+#define GOLDFISH_RTC_IRQ_ENABLED 0x10
+#define GOLDFISH_RTC_CLEAR_ALARM 0x14
+#define GOLDFISH_RTC_ALARM_STATUS 0x18
+#define GOLDFISH_RTC_CLEAR_INTERRUPT 0x1c
+
/*
* https://android.googlesource.com/platform/external/qemu/+/master/docs/GOLDFISH-VIRTUAL-HARDWARE.TXT
+ *
+ * (Despite what the Google docs say, the Qemu goldfish-rtc implements
+ * the timer functionality.)
*/
#define GOLDFISH_RTC_READ(sc, reg) \
@@ -48,19 +60,11 @@ __KERNEL_RCSID(0, "$NetBSD: gfrtc.c,v 1.
#define GOLDFISH_RTC_WRITE(sc, reg, val) \
bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
-
-#define GOLDFISH_RTC_TIME_LOW 0x00
-#define GOLDFISH_RTC_TIME_HIGH 0x04
-
-
static int
gfrtc_gettime(struct todr_chip_handle *ch, struct timeval *tv)
{
struct gfrtc_softc *sc = ch->cookie;
- const uint64_t lo = GOLDFISH_RTC_READ(sc, GOLDFISH_RTC_TIME_LOW);
- const uint64_t hi = GOLDFISH_RTC_READ(sc, GOLDFISH_RTC_TIME_HIGH);
-
- uint64_t nsec = (hi << 32) | lo;
+ const uint64_t nsec = gfrtc_get_time(sc);
tv->tv_sec = nsec / 10;
tv->tv_usec = (nsec - tv->tv_sec) / 1000; // Always 0?
@@ -73,9 +77,9 @@ gfrtc_settime(struct todr_chip_handle *c
{
struct gfrtc_softc *sc = ch->cookie;
- uint64_t nsec = (tv->tv_sec * 100 + tv->tv_usec) * 1000;
- uint32_t hi = nsec >> 32;
- uint32_t lo = nsec;
+ const uint64_t nsec = (tv->tv_sec * 100 + tv->tv_usec) * 1000;
+ const uint32_t hi = (uint32_t)(nsec >> 32);
+ const uint32_t lo = (uint32_t)nsec;
GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_HIGH, hi);
GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_TIME_LOW, lo);
@@ -85,12 +89,90 @@ gfrtc_settime(struct todr_chip_handle *c
void
-gfrtc_attach(struct gfrtc_softc * const sc)
+gfrtc_attach(struct gfrtc_softc * const sc, bool todr)
+{
+
+ aprint_naive("\n");
+ aprint_normal(": Google Goldfish RTC + timer\n");
+
+ /* Cancel any alarms, make sure interrupt is disabled. */
+ GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_IRQ_ENABLED, 0);
+ GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_CLEAR_ALARM, 0);
+ GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_CLEAR_INTERRUPT, 0);
+
+ if (todr) {
+ aprint_normal_dev(sc->sc_dev,
+ "using as Time of Day Register.\n");
+ sc->sc_todr.cookie = sc;
+ sc->sc_todr.todr_gettime = gfrtc_gettime;
+ sc->sc_todr.todr_settime = gfrtc_settime;
+ sc->sc_todr.todr_setwen = NULL;
+ todr_attach(>sc_todr);
+ }
+}
+
+
+void
+gfrtc_delay(device_t dev, unsigned int usec)
+{
+ struct gfrtc_softc *sc = device_private(dev);
+ uint64_t start_ns, end_ns, min_ns;
+
+ /* Get the start time now while we do the setup work. */
+ start_ns = gfrtc_get_time(sc);
+
+ /* Delay for this many nsec. */
+ min_ns = (uint64_t)usec * 1000;
+
+ do {
+ end_ns = gfrtc_get_time(sc);
+ } while ((end_ns - start_ns) < min_ns);
+}
+
+
+uint64_t
+gfrtc_get_time(struct gfrtc_softc * const sc)
+{
+ const uint64_t lo = GOLDFISH_RTC_READ(sc, GOLDFISH_RTC_TIME_LOW);
+ const uint64_t hi = GOLDFISH_RTC_READ(sc, GOLDFISH_RTC_TIME_HIGH);
+
+ return (hi << 32) | lo;
+}
+
+
+void
+gfrtc_set_alarm(struct gfrtc_softc * const sc, const uint64_t nsec)
{
- sc->sc_todr.cookie = sc;
- sc->sc_todr.todr_gettime = gfrtc_gettime;
- sc->sc_todr.todr_settime = gfrtc_settime;
- sc->sc_todr.todr_setwen = NULL;
+ uint64_t next = gfrtc_get_time(sc) + nsec;
+
+ GOLDFISH_RTC_WRITE(sc, GOLDFISH_RTC_ALARM_HIGH,
CVS commit: src/sys/dev/goldfish
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:26:17 UTC 2024 Modified Files: src/sys/dev/goldfish: gfrtc.c gfrtcvar.h Log Message: Add support for the timer portion of the Goldfish RTC device. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/goldfish/gfrtc.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/goldfish/gfrtcvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/virtio
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:24:50 UTC 2024 Modified Files: src/sys/dev/virtio: virtio_mmio.c virtio_mmiovar.h Log Message: - The VirtIO 1.0 spec says that the MMIO interface uses little-endian registers. For some VMs, at least, this appears to be independent of the config/struct byte-order. Detect this and handle it. - Add support for the "v2" MMIO personality. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/virtio/virtio_mmio.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/virtio/virtio_mmiovar.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/virtio/virtio_mmio.c diff -u src/sys/dev/virtio/virtio_mmio.c:1.11 src/sys/dev/virtio/virtio_mmio.c:1.12 --- src/sys/dev/virtio/virtio_mmio.c:1.11 Fri Jul 7 07:19:36 2023 +++ src/sys/dev/virtio/virtio_mmio.c Tue Jan 2 07:24:50 2024 @@ -1,6 +1,35 @@ -/* $NetBSD: virtio_mmio.c,v 1.11 2023/07/07 07:19:36 rin Exp $ */ +/* $NetBSD: virtio_mmio.c,v 1.12 2024/01/02 07:24:50 thorpej Exp $ */ /* $OpenBSD: virtio_mmio.c,v 1.2 2017/02/24 17:12:31 patrick Exp $ */ +/*- + * Copyright (c) 2024 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Jason R. Thorpe. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + /* * Copyright (c) 2014 Patrick Wildt * Copyright (c) 2012 Stefan Fritsch. @@ -29,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.11 2023/07/07 07:19:36 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio_mmio.c,v 1.12 2024/01/02 07:24:50 thorpej Exp $"); #include #include @@ -46,20 +75,28 @@ __KERNEL_RCSID(0, "$NetBSD: virtio_mmio. #define VIRTIO_MMIO_VERSION 0x004 #define VIRTIO_MMIO_DEVICE_ID 0x008 #define VIRTIO_MMIO_VENDOR_ID 0x00c -#define VIRTIO_MMIO_HOST_FEATURES 0x010 -#define VIRTIO_MMIO_HOST_FEATURES_SEL 0x014 -#define VIRTIO_MMIO_GUEST_FEATURES 0x020 -#define VIRTIO_MMIO_GUEST_FEATURES_SEL 0x024 -#define VIRTIO_MMIO_GUEST_PAGE_SIZE 0x028 +#define VIRTIO_MMIO_DEVICE_FEATURES 0x010 /* "HostFeatures" in v1 */ +#define VIRTIO_MMIO_DEVICE_FEATURES_SEL 0x014 /* "HostFeaturesSel" in v1 */ +#define VIRTIO_MMIO_DRIVER_FEATURES 0x020 /* "GuestFeatures" in v1 */ +#define VIRTIO_MMIO_DRIVER_FEATURES_SEL 0x024 /* "GuestFeaturesSel" in v1 */ +#define VIRTIO_MMIO_V1_GUEST_PAGE_SIZE 0x028 #define VIRTIO_MMIO_QUEUE_SEL 0x030 #define VIRTIO_MMIO_QUEUE_NUM_MAX 0x034 #define VIRTIO_MMIO_QUEUE_NUM 0x038 -#define VIRTIO_MMIO_QUEUE_ALIGN 0x03c -#define VIRTIO_MMIO_QUEUE_PFN 0x040 +#define VIRTIO_MMIO_V1_QUEUE_ALIGN 0x03c +#define VIRTIO_MMIO_V1_QUEUE_PFN 0x040 +#define VIRTIO_MMIO_QUEUE_READY 0x044 #define VIRTIO_MMIO_QUEUE_NOTIFY 0x050 #define VIRTIO_MMIO_INTERRUPT_STATUS 0x060 #define VIRTIO_MMIO_INTERRUPT_ACK 0x064 #define VIRTIO_MMIO_STATUS 0x070 +#define VIRTIO_MMIO_V2_QUEUE_DESC_LOW 0x080 +#define VIRTIO_MMIO_V2_QUEUE_DESC_HIGH 0x084 +#define VIRTIO_MMIO_V2_QUEUE_AVAIL_LOW 0x090 +#define VIRTIO_MMIO_V2_QUEUE_AVAIL_HIGH 0x094 +#define VIRTIO_MMIO_V2_QUEUE_USED_LOW 0x0a0 +#define VIRTIO_MMIO_V2_QUEUE_USED_HIGH 0x0a4 +#define VIRTIO_MMIO_V2_CONFIG_GEN 0x0fc #define VIRTIO_MMIO_CONFIG 0x100 #define VIRTIO_MMIO_INT_VRING (1 << 0) @@ -85,17 +122,59 @@ __KERNEL_RCSID(0, "$NetBSD: virtio_mmio. static void virtio_mmio_kick(struct virtio_softc *, uint16_t); static uint16_t virtio_mmio_read_queue_size(struct virtio_softc *, uint16_t); -static void virtio_mmio_setup_queue(struct virtio_softc *, uint16_t, uint64_t); +static void virtio_mmio_v1_setup_queue(struct virtio_softc *, uint16_t,
CVS commit: src/sys/dev/virtio
Module Name:src Committed By: thorpej Date: Tue Jan 2 07:24:50 UTC 2024 Modified Files: src/sys/dev/virtio: virtio_mmio.c virtio_mmiovar.h Log Message: - The VirtIO 1.0 spec says that the MMIO interface uses little-endian registers. For some VMs, at least, this appears to be independent of the config/struct byte-order. Detect this and handle it. - Add support for the "v2" MMIO personality. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/virtio/virtio_mmio.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/virtio/virtio_mmiovar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/include
Module Name:src
Committed By: thorpej
Date: Mon Jan 1 22:47:58 UTC 2024
Modified Files:
src/sys/arch/m68k/include: pte_motorola.h
Log Message:
Define PTE used in the pmap module int terms of the bit definitions
in mmu_{51,40}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/include/pte_motorola.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/arch/m68k/include
Module Name:src
Committed By: thorpej
Date: Mon Jan 1 22:47:58 UTC 2024
Modified Files:
src/sys/arch/m68k/include: pte_motorola.h
Log Message:
Define PTE used in the pmap module int terms of the bit definitions
in mmu_{51,40}.h.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/m68k/include/pte_motorola.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/m68k/include/pte_motorola.h
diff -u src/sys/arch/m68k/include/pte_motorola.h:1.9 src/sys/arch/m68k/include/pte_motorola.h:1.10
--- src/sys/arch/m68k/include/pte_motorola.h:1.9 Wed Dec 27 03:03:41 2023
+++ src/sys/arch/m68k/include/pte_motorola.h Mon Jan 1 22:47:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pte_motorola.h,v 1.9 2023/12/27 03:03:41 thorpej Exp $ */
+/* $NetBSD: pte_motorola.h,v 1.10 2024/01/01 22:47:58 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -56,55 +56,63 @@ typedef u_int pt_entry_t; /* page table
#define PG_SHIFT PGSHIFT
-#define SG_V 0x0002 /* segment is valid */
-#define SG_NV 0x
-#define SG_PROT 0x0004 /* access protection mask */
-#define SG_RO 0x0004
+/*
+ * "Segment" Table Entry bits, defined in terms of the 68851 bits
+ * (compatible 68040 bits noted in comments).
+ */
+#define SG_V DT51_SHORT /* == UTE40_RESIDENT */
+#define SG_NV DT51_INVALID /* == UTE40_INVALID */
+#define SG_RO DTE51_WP /* == UTE40_W */
#define SG_RW 0x
-#define SG_U 0x0008 /* modified bit (68040) */
-#define SG_FRAME ((~0) << PG_SHIFT)
+#define SG_PROT DTE51_WP
+#define SG_U DTE51_U /* == UTE40_U */
+#define SG_FRAME ((~0U) << PG_SHIFT)
#define SG_ISHIFT ((PG_SHIFT << 1) - 2) /* 24 or 22 */
-#define SG_IMASK ((~0) << SG_ISHIFT)
+#define SG_IMASK ((~0U) << SG_ISHIFT)
#define SG_PSHIFT PG_SHIFT
-#define SG_PMASK (((~0) << SG_PSHIFT) & ~SG_IMASK)
+#define SG_PMASK (((~0U) << SG_PSHIFT) & ~SG_IMASK)
/* 68040 additions */
-#define SG4_MASK1 0xfe00
+#define SG4_MASK1 0xfe00U
#define SG4_SHIFT1 25
-#define SG4_MASK2 0x01fc
+#define SG4_MASK2 0x01fcU
#define SG4_SHIFT2 18
-#define SG4_MASK3 (((~0) << PG_SHIFT) & ~(SG4_MASK1 | SG4_MASK2))
+#define SG4_MASK3 (((~0U) << PG_SHIFT) & ~(SG4_MASK1 | SG4_MASK2))
#define SG4_SHIFT3 PG_SHIFT
#define SG4_ADDR1 0xfe00
-#define SG4_ADDR2 ((~0) << (20 - PG_SHIFT))
+#define SG4_ADDR2 ((~0U) << (20 - PG_SHIFT))
#define SG4_LEV1SIZE 128
#define SG4_LEV2SIZE 128
-#define SG4_LEV3SIZE (1 << (SG4_SHIFT2 - PG_SHIFT)) /* 64 or 32 */
+#define SG4_LEV3SIZE (1U << (SG4_SHIFT2 - PG_SHIFT)) /* 64 or 32 */
-#define PG_V 0x0001
-#define PG_NV 0x
-#define PG_PROT 0x0004
-#define PG_U 0x0008
-#define PG_M 0x0010
-#define PG_W 0x0100
-#define PG_RO 0x0004
+/*
+ * Page Table Entry bits, defined in terms of the 68851 bits
+ * (compatible 68040 bits noted in comments).
+ */
+#define PG_V DT51_PAGE /* == PTE40_RESIDENT */
+#define PG_NV DT51_INVALID /* == PTE40_INVALID */
+#define PG_RO PTE51_WP /* == PTE40_W */
#define PG_RW 0x
-#define PG_FRAME ((~0) << PG_SHIFT)
-#define PG_CI 0x0040
-#define PG_PFNUM(x) (((x) & PG_FRAME) >> PG_SHIFT)
+#define PG_PROT PG_RO
+#define PG_U PTE51_U /* == PTE40_U */
+#define PG_M PTE51_M /* == PTE40_M */
+#define PG_CI PTE51_CI
+#define PG_W __BIT(8) /* 851 unused bit XXX040 PTE40_U0 */
+#define PG_FRAME ((~0U) << PG_SHIFT)
+#define PG_PFNUM(x) (((uintptr_t)(x) & PG_FRAME) >> PG_SHIFT)
/* 68040 additions */
-#define PG_CMASK 0x0060 /* cache mode mask */
-#define PG_CWT 0x /* writethrough caching */
-#define PG_CCB 0x0020 /* copyback caching */
-#define PG_CIS 0x0040 /* cache inhibited serialized */
-#define PG_CIN 0x0060 /* cache inhibited nonserialized */
-#define PG_SO 0x0080 /* supervisor only */
+#define PG_CMASK PTE40_CM /* cache mode mask */
+#define PG_CWT PTE40_CM_WT /* writethrough caching */
+#define PG_CCB PTE40_CM_CB /* copyback caching */
+#define PG_CIS PTE40_CM_NC_SER /* cache inhibited serialized */
+#define PG_CIN PTE40_CM_NC /* cache inhibited nonserialized */
+#define PG_SO PTE40_S /* supervisor only */
#define M68K_STSIZE (MAXUL2SIZE * SG4_LEV2SIZE * sizeof(st_entry_t))
/* user process segment table size */
-#define M68K_MAX_PTSIZE (1 << (32 - PG_SHIFT + 2)) /* max size of UPT */
-#define M68K_MAX_KPTSIZE (M68K_MAX_PTSIZE >> 2) /* max memory to allocate to KPT */
+#define M68K_MAX_PTSIZE (1U << (32 - PG_SHIFT + 2)) /* max size of UPT */
+#define M68K_MAX_KPTSIZE (M68K_MAX_PTSIZE >> 2) /* max memory to allocate to KPT */
#define M68K_PTBASE 0x1000 /* UPT map base address */
#define M68K_PTMAXSIZE 0x7000 /* UPT map maximum size */
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: gutteridge Date: Mon Jan 1 22:29:49 UTC 2024 Modified Files: src/sys/dev/scsipi: if_dse.c Log Message: if_dse.c: s/addredses/addresses/ in comment To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/scsipi/if_dse.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: gutteridge Date: Mon Jan 1 22:29:49 UTC 2024 Modified Files: src/sys/dev/scsipi: if_dse.c Log Message: if_dse.c: s/addredses/addresses/ in comment To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/scsipi/if_dse.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/scsipi/if_dse.c diff -u src/sys/dev/scsipi/if_dse.c:1.4 src/sys/dev/scsipi/if_dse.c:1.5 --- src/sys/dev/scsipi/if_dse.c:1.4 Wed Dec 20 18:09:19 2023 +++ src/sys/dev/scsipi/if_dse.c Mon Jan 1 22:29:48 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: if_dse.c,v 1.4 2023/12/20 18:09:19 skrll Exp $ */ +/* $NetBSD: if_dse.c,v 1.5 2024/01/01 22:29:48 gutteridge Exp $ */ /* * Driver for DaynaPORT SCSI/Link SCSI-Ethernet @@ -300,7 +300,7 @@ static const scsi_dayna_ether_generic so #if 0 /* - * Compare two Ether/802 addredses for equality, inlined and + * Compare two Ether/802 addresses for equality, inlined and * unrolled for speed. * Note: use this like memcmp() */
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: rhialto
Date: Mon Jan 1 20:33:34 UTC 2024
Modified Files:
src/sys/lib/libkern: Makefile.libkern
Log Message:
avoid dependency on NETBSDSRCDIR being set.
(similar to an earlier commit)
due to various things, non-build.sh builds don't have it set already
and it ends up defaulting to /usr/src, so if that doesn't exist or
is the wrong version, building libkern fails.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/lib/libkern/Makefile.libkern
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/Makefile.libkern
diff -u src/sys/lib/libkern/Makefile.libkern:1.53 src/sys/lib/libkern/Makefile.libkern:1.54
--- src/sys/lib/libkern/Makefile.libkern:1.53 Wed Oct 27 03:06:59 2021
+++ src/sys/lib/libkern/Makefile.libkern Mon Jan 1 20:33:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.libkern,v 1.53 2021/10/27 03:06:59 ryo Exp $
+# $NetBSD: Makefile.libkern,v 1.54 2024/01/01 20:33:34 rhialto Exp $
#
# Variable definitions for libkern.
@@ -102,7 +102,7 @@ SRCS+= entpool.c
SRCS+= dkcksum.c
SRCS+= disklabel_swap.c
-.PATH: ${NETBSDSRCDIR}/common/lib/libc/cdb
+.PATH: ${.PARSEDIR}/../../../common/lib/libc/cdb
SRCS+= cdbr.c
SRCS+= mi_vector_hash.c
CVS commit: src/sys/lib/libkern
Module Name:src Committed By: rhialto Date: Mon Jan 1 20:33:34 UTC 2024 Modified Files: src/sys/lib/libkern: Makefile.libkern Log Message: avoid dependency on NETBSDSRCDIR being set. (similar to an earlier commit) due to various things, non-build.sh builds don't have it set already and it ends up defaulting to /usr/src, so if that doesn't exist or is the wrong version, building libkern fails. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/lib/libkern/Makefile.libkern Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: kim
Date: Mon Jan 1 18:56:54 UTC 2024
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/man: mi
src/external/ibm-public/postfix/libexec/postfix-script: Makefile
src/external/ibm-public/postfix/man/man1: Makefile
Log Message:
Install postfix-tls-script (for "postfix tls")
To generate a diff of this commit:
cvs rdiff -u -r1.1329 -r1.1330 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1767 -r1.1768 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.2 \
src/external/ibm-public/postfix/libexec/postfix-script/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/man/man1/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1329 src/distrib/sets/lists/base/mi:1.1330
--- src/distrib/sets/lists/base/mi:1.1329 Sun Sep 3 18:31:01 2023
+++ src/distrib/sets/lists/base/mi Mon Jan 1 18:56:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1329 2023/09/03 18:31:01 riastradh Exp $
+# $NetBSD: mi,v 1.1330 2024/01/01 18:56:53 kim Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1344,6 +1344,7 @@
./usr/libexec/postfix/post-install base-postfix-bin postfix
./usr/libexec/postfix/postfix-files base-postfix-bin postfix
./usr/libexec/postfix/postfix-script base-postfix-bin postfix
+./usr/libexec/postfix/postfix-tls-script base-postfix-bin postfix
./usr/libexec/postfix/postfix-wrapper base-postfix-bin postfix
./usr/libexec/postfix/postmulti-script base-postfix-bin postfix
./usr/libexec/postfix/postscreen base-postfix-bin postfix
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1767 src/distrib/sets/lists/man/mi:1.1768
--- src/distrib/sets/lists/man/mi:1.1767 Thu Nov 23 21:20:49 2023
+++ src/distrib/sets/lists/man/mi Mon Jan 1 18:56:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1767 2023/11/23 21:20:49 riastradh Exp $
+# $NetBSD: mi,v 1.1768 2024/01/01 18:56:53 kim Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -455,6 +455,7 @@
./usr/share/man/cat1/postconf.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postdrop.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postfix.0 man-postfix-catman postfix,.cat
+./usr/share/man/cat1/postfix-tls.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postkick.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postlock.0 man-postfix-catman postfix,.cat
./usr/share/man/cat1/postlog.0 man-postfix-catman postfix,.cat
@@ -3914,6 +3915,7 @@
./usr/share/man/html1/postconf.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postdrop.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postfix.html man-postfix-htmlman postfix,html
+./usr/share/man/html1/postfix-tls.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postkick.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postlock.html man-postfix-htmlman postfix,html
./usr/share/man/html1/postlog.html man-postfix-htmlman postfix,html
@@ -7019,6 +7021,7 @@
./usr/share/man/man1/postconf.1 man-postfix-man postfix,.man
./usr/share/man/man1/postdrop.1 man-postfix-man postfix,.man
./usr/share/man/man1/postfix.1 man-postfix-man postfix,.man
+./usr/share/man/man1/postfix-tls.1 man-postfix-man postfix,.man
./usr/share/man/man1/postkick.1 man-postfix-man postfix,.man
./usr/share/man/man1/postlock.1 man-postfix-man postfix,.man
./usr/share/man/man1/postlog.1 man-postfix-man postfix,.man
Index: src/external/ibm-public/postfix/libexec/postfix-script/Makefile
diff -u src/external/ibm-public/postfix/libexec/postfix-script/Makefile:1.1 src/external/ibm-public/postfix/libexec/postfix-script/Makefile:1.2
--- src/external/ibm-public/postfix/libexec/postfix-script/Makefile:1.1 Thu Jun 25 18:21:55 2009
+++ src/external/ibm-public/postfix/libexec/postfix-script/Makefile Mon Jan 1 18:56:53 2024
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:55 tron Exp $
+# $NetBSD: Makefile,v 1.2 2024/01/01 18:56:53 kim Exp $
.include
DIST= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist/conf
.PATH: ${DIST}
-SCRIPTS= post-install postfix-script postfix-wrapper postmulti-script
+SCRIPTS= post-install postfix-script postfix-tls-script \
+ postfix-wrapper postmulti-script
FILES= postfix-files
FILESDIR= ${PFIX_LIBEXECDIR}
Index: src/external/ibm-public/postfix/man/man1/Makefile
diff -u src/external/ibm-public/postfix/man/man1/Makefile:1.2 src/external/ibm-public/postfix/man/man1/Makefile:1.3
--- src/external/ibm-public/postfix/man/man1/Makefile:1.2 Sun Jul 6 20:09:26 2014
+++ src/external/ibm-public/postfix/man/man1/Makefile Mon Jan 1 18:56:54 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/07/06 20:09:26 tron
CVS commit: src
Module Name:src Committed By: kim Date: Mon Jan 1 18:56:54 UTC 2024 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/man: mi src/external/ibm-public/postfix/libexec/postfix-script: Makefile src/external/ibm-public/postfix/man/man1: Makefile Log Message: Install postfix-tls-script (for "postfix tls") To generate a diff of this commit: cvs rdiff -u -r1.1329 -r1.1330 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1767 -r1.1768 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.2 \ src/external/ibm-public/postfix/libexec/postfix-script/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/man/man1/Makefile 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
Module Name:src
Committed By: skrll
Date: Mon Jan 1 17:18:02 UTC 2024
Modified Files:
src/sys/arch/riscv/include: pmap.h
src/sys/arch/riscv/riscv: pmap_machdep.c
Log Message:
risc-v: probe the number of supported ASIDs
Flush the entire TLB if no ASIDs are supported on pmap_activate.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/include/pmap.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/riscv/riscv/pmap_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/include/pmap.h
diff -u src/sys/arch/riscv/include/pmap.h:1.22 src/sys/arch/riscv/include/pmap.h:1.23
--- src/sys/arch/riscv/include/pmap.h:1.22 Fri Oct 6 08:48:49 2023
+++ src/sys/arch/riscv/include/pmap.h Mon Jan 1 17:18:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.22 2023/10/06 08:48:49 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.23 2024/01/01 17:18:02 skrll Exp $ */
/*
* Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc.
@@ -217,7 +217,16 @@ pmap_md_vca_clean(struct vm_page_md *mdp
static inline size_t
pmap_md_tlb_asid_max(void)
{
- return PMAP_TLB_NUM_PIDS - 1;
+ const register_t satp = csr_satp_read();
+ const register_t test = satp | SATP_ASID;
+
+ csr_satp_write(test);
+
+ const register_t ret = __SHIFTOUT(csr_satp_read(), SATP_ASID);
+ csr_satp_write(satp);
+
+ KASSERT(ret < PMAP_TLB_NUM_PIDS);
+ return ret;
}
static inline pt_entry_t *
Index: src/sys/arch/riscv/riscv/pmap_machdep.c
diff -u src/sys/arch/riscv/riscv/pmap_machdep.c:1.19 src/sys/arch/riscv/riscv/pmap_machdep.c:1.20
--- src/sys/arch/riscv/riscv/pmap_machdep.c:1.19 Sun Sep 3 08:48:20 2023
+++ src/sys/arch/riscv/riscv/pmap_machdep.c Mon Jan 1 17:18:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_machdep.c,v 1.19 2023/09/03 08:48:20 skrll Exp $ */
+/* $NetBSD: pmap_machdep.c,v 1.20 2024/01/01 17:18:02 skrll Exp $ */
/*
* Copyright (c) 2014, 2019, 2021 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#define __PMAP_PRIVATE
#include
-__RCSID("$NetBSD: pmap_machdep.c,v 1.19 2023/09/03 08:48:20 skrll Exp $");
+__RCSID("$NetBSD: pmap_machdep.c,v 1.20 2024/01/01 17:18:02 skrll Exp $");
#include
#include
@@ -177,7 +177,8 @@ pmap_md_xtab_activate(struct pmap *pmap,
// UVMHIST_FUNC(__func__); UVMHIST_CALLED(maphist);
// struct cpu_info * const ci = curcpu();
- struct pmap_asid_info * const pai = PMAP_PAI(pmap, cpu_tlb_info(ci));
+ struct pmap_tlb_info * const ti = cpu_tlb_info(ci);
+ struct pmap_asid_info * const pai = PMAP_PAI(pmap, ti);
uint64_t satp =
#ifdef _LP64
@@ -189,6 +190,10 @@ pmap_md_xtab_activate(struct pmap *pmap,
__SHIFTIN(pmap->pm_md.md_ppn, SATP_PPN);
csr_satp_write(satp);
+
+ if (l && !tlbinfo_asids_p(ti)) {
+ tlb_invalidate_all();
+ }
}
void
@@ -329,6 +334,8 @@ pmap_bootstrap(vaddr_t vstart, vaddr_t v
// XXXNH per cpu?
pmap_tlb_info_init(_tlb0_info);
+ VPRINTF("ASID max %x ", pmap_tlb0_info.ti_asid_max);
+
#ifdef MULTIPROCESSOR
VPRINTF("kcpusets ");
CVS commit: src/sys/arch/riscv
Module Name:src Committed By: skrll Date: Mon Jan 1 17:18:02 UTC 2024 Modified Files: src/sys/arch/riscv/include: pmap.h src/sys/arch/riscv/riscv: pmap_machdep.c Log Message: risc-v: probe the number of supported ASIDs Flush the entire TLB if no ASIDs are supported on pmap_activate. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/riscv/include/pmap.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/riscv/riscv/pmap_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/uvm/pmap
Module Name:src Committed By: skrll Date: Mon Jan 1 16:56:30 UTC 2024 Modified Files: src/sys/uvm/pmap: pmap_tlb.c Log Message: Appease KASSERTs for zero ASID CPUs (I mean harts) To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/uvm/pmap/pmap_tlb.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/doc
Module Name:src Committed By: martin Date: Mon Jan 1 14:04:53 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #524 for additional changes (including move of RC2 tag) To generate a diff of this commit: cvs rdiff -u -r1.1.2.183 -r1.1.2.184 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.183 src/doc/CHANGES-10.0:1.1.2.184 --- src/doc/CHANGES-10.0:1.1.2.183 Mon Jan 1 11:47:38 2024 +++ src/doc/CHANGES-10.0 Mon Jan 1 14:04:52 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.183 2024/01/01 11:47:38 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.184 2024/01/01 14:04:52 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15088,3 +15088,9 @@ sys/sys/param.h (manually edited) Welcome to 10.0_RC2 +sys/stand/efiboot/efinet.c 1.9 + + MI efiboot: Revert "Stop using efi_bootdp after exclusive open for PXE" + Move RC2 tag to include this change. + [rin, ticket #524] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Jan 1 14:04:53 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #524 for additional changes (including move of RC2 tag) To generate a diff of this commit: cvs rdiff -u -r1.1.2.183 -r1.1.2.184 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/stand/efiboot
Module Name:src
Committed By: martin
Date: Mon Jan 1 14:00:17 UTC 2024
Modified Files:
src/sys/stand/efiboot [netbsd-10]: efinet.c
Log Message:
Additionally pull up following revision(s) (requested by rin in ticket #524):
sys/stand/efiboot/efinet.c: revision 1.9
MI efiboot: Revert "Stop using efi_bootdp after exclusive open for PXE"
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/stand/efiboot/efinet.c#rev1.7
Some UEFI implementations pass multiple boot options as boot device path,
and NULL-clearing it results in boot failures.
Thanks skrll@ for pointing it out.
To generate a diff of this commit:
cvs rdiff -u -r1.6.32.1 -r1.6.32.2 src/sys/stand/efiboot/efinet.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/stand/efiboot/efinet.c
diff -u src/sys/stand/efiboot/efinet.c:1.6.32.1 src/sys/stand/efiboot/efinet.c:1.6.32.2
--- src/sys/stand/efiboot/efinet.c:1.6.32.1 Sat Dec 30 19:33:25 2023
+++ src/sys/stand/efiboot/efinet.c Mon Jan 1 14:00:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efinet.c,v 1.6.32.1 2023/12/30 19:33:25 martin Exp $ */
+/* $NetBSD: efinet.c,v 1.6.32.2 2024/01/01 14:00:17 martin Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -333,7 +333,7 @@ efi_net_probe(void)
EFI_STATUS status;
UINTN i, nhandles;
int nifs, depth = -1;
- bool found, is_bootdp;
+ bool found;
status = LibLocateHandle(ByProtocol, , NULL,
, );
@@ -377,9 +377,6 @@ efi_net_probe(void)
if (!found)
continue;
- is_bootdp = depth > 0 &&
- efi_device_path_ncmp(efi_bootdp, dp0, depth) == 0;
-
status = uefi_call_wrapper(BS->OpenProtocol, 6, handles[i],
, (void **), IH, NULL,
EFI_OPEN_PROTOCOL_EXCLUSIVE);
@@ -407,21 +404,10 @@ efi_net_probe(void)
return;
}
- if (is_bootdp) {
- /*
- * This is boot device...
- */
+ if (depth > 0 && efi_device_path_ncmp(efi_bootdp, dp0, depth) == 0) {
char devname[9];
-
snprintf(devname, sizeof(devname), "net%u", nifs);
set_default_device(devname);
-
- /*
- * and now opened for us excluively. Therefore,
- * access via device path is illegal.
- */
- efi_bootdp = NULL;
- depth = -1;
}
nifs++;
CVS commit: [netbsd-10] src/sys/stand/efiboot
Module Name:src Committed By: martin Date: Mon Jan 1 14:00:17 UTC 2024 Modified Files: src/sys/stand/efiboot [netbsd-10]: efinet.c Log Message: Additionally pull up following revision(s) (requested by rin in ticket #524): sys/stand/efiboot/efinet.c: revision 1.9 MI efiboot: Revert "Stop using efi_bootdp after exclusive open for PXE" http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/stand/efiboot/efinet.c#rev1.7 Some UEFI implementations pass multiple boot options as boot device path, and NULL-clearing it results in boot failures. Thanks skrll@ for pointing it out. To generate a diff of this commit: cvs rdiff -u -r1.6.32.1 -r1.6.32.2 src/sys/stand/efiboot/efinet.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
Module Name:src
Committed By: skrll
Date: Mon Jan 1 13:51:56 UTC 2024
Modified Files:
src/sys/arch/riscv/dev: plic_fdt.c
src/sys/arch/riscv/fdt: cpu_fdt.c riscv_fdtvar.h
Log Message:
Perform more checks before establishing external interrupt handlers for
each hart. The VisionFive2 DTS list the S7 core with status = "disabled".
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/dev/plic_fdt.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/fdt/cpu_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/fdt/riscv_fdtvar.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/dev/plic_fdt.c
diff -u src/sys/arch/riscv/dev/plic_fdt.c:1.3 src/sys/arch/riscv/dev/plic_fdt.c:1.4
--- src/sys/arch/riscv/dev/plic_fdt.c:1.3 Sat Sep 2 09:58:15 2023
+++ src/sys/arch/riscv/dev/plic_fdt.c Mon Jan 1 13:51:56 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: plic_fdt.c,v 1.3 2023/09/02 09:58:15 skrll Exp $ */
+/* $NetBSD: plic_fdt.c,v 1.4 2024/01/01 13:51:56 skrll Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v 1.3 2023/09/02 09:58:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v 1.4 2024/01/01 13:51:56 skrll Exp $");
#include
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v
#include
#include
+#include
#include
#include
@@ -104,6 +105,58 @@ plic_fdt_match(device_t parent, cfdata_t
return of_compatible_match(faa->faa_phandle, compat_data);
}
+
+static void
+plic_fdt_attach_source(device_t self, int phandle, int context, int xref,
+int intr_source)
+{
+ struct plic_softc * const sc = device_private(self);
+ static const struct device_compatible_entry clint_compat_data[] = {
+ { .compat = "riscv,cpu-intc" },
+ DEVICE_COMPAT_EOL
+ };
+
+ if (!of_compatible_match(xref, clint_compat_data)) {
+ aprint_error_dev(self, "incompatiable CLINT "
+ "for PLIC for context %d\n", context);
+ return;
+ }
+
+ const int cpu_ref = OF_parent(xref);
+ if (!riscv_fdt_cpu_okay(cpu_ref)) {
+ aprint_verbose_dev(self, "inactive HART "
+ "for PLIC for context %d\n", context);
+ return;
+ }
+
+ /* What do we want to pass as arg to plic_intr */
+ void *ih = fdtbus_intr_establish_xname(phandle,
+ context, IPL_VM, FDT_INTR_MPSAFE,
+ plic_intr, sc, device_xname(self));
+ if (ih == NULL) {
+ aprint_error_dev(self, "couldn't install "
+ "interrupt handler\n");
+ } else {
+ char intrstr[128];
+ bool ok = fdtbus_intr_str(phandle, context,
+ intrstr, sizeof(intrstr));
+ aprint_verbose_dev(self, "interrupt %s handler "
+ "installed\n", ok ? intrstr : "(unk)");
+ }
+
+ if (intr_source == IRQ_SUPERVISOR_EXTERNAL) {
+ bus_addr_t hartid;
+ /* get cpuid for the parent node */
+ fdtbus_get_reg(cpu_ref, 0, , NULL);
+
+ KASSERT(context <= PLIC_MAX_CONTEXT);
+ sc->sc_context[hartid] = context;
+ aprint_verbose_dev(self, "hart %"PRId64" context %d\n",
+ hartid, context);
+ }
+}
+
+
static void
plic_fdt_attach(device_t parent, device_t self, void *aux)
{
@@ -179,49 +232,8 @@ plic_fdt_attach(device_t parent, device_
}
if (intr_source != -1) {
- /* What do we want to pass as arg to plic_intr */
- void *ih = fdtbus_intr_establish_xname(phandle,
- context, IPL_VM, FDT_INTR_MPSAFE,
- plic_intr, sc, device_xname(self));
- if (ih == NULL) {
-aprint_error_dev(self, "couldn't install "
-"interrupt handler\n");
- } else {
-char intrstr[128];
-bool ok = fdtbus_intr_str(phandle, context,
-intrstr, sizeof(intrstr));
-aprint_verbose_dev(self, "interrupt %s handler "
-"installed\n", ok ? intrstr : "(unk)");
- }
-
- if (intr_source == IRQ_SUPERVISOR_EXTERNAL) {
-/*
- * When finding context info, parent _must_ be a
- * compatbile clint device.
- */
-bus_addr_t hartid;
-int cpu_ref;
-static const struct device_compatible_entry clint_compat_data[] = {
- { .compat = "riscv,cpu-intc" },
- DEVICE_COMPAT_EOL
-};
-
-if (of_compatible_match(xref, clint_compat_data)) {
- /* get cpuid for the parent node */
- cpu_ref = OF_parent(xref);
- fdtbus_get_reg(cpu_ref, 0, , NULL);
-
- KASSERT(context <= PLIC_MAX_CONTEXT);
- sc->sc_context[hartid] = context;
- aprint_verbose_dev(self,
- "hart %"PRId64" context %d\n",
- hartid, context);
-} else {
- aprint_error_dev(self, "incompatiable CLINT "
- " for PLIC for context %d\n", context);
-}
-
- }
+ plic_fdt_attach_source(self, phandle, context, xref,
+intr_source);
}
len -= (intr_cells + 1) * 4;
data += (intr_cells + 1);
Index: src/sys/arch/riscv/fdt/cpu_fdt.c
diff -u src/sys/arch/riscv/fdt/cpu_fdt.c:1.3 src/sys/arch/riscv/fdt/cpu_fdt.c:1.4
--- src/sys/arch/riscv/fdt/cpu_fdt.c:1.3 Sun Sep 3 08:48:19 2023
+++
CVS commit: src/sys/arch/riscv
Module Name:src Committed By: skrll Date: Mon Jan 1 13:51:56 UTC 2024 Modified Files: src/sys/arch/riscv/dev: plic_fdt.c src/sys/arch/riscv/fdt: cpu_fdt.c riscv_fdtvar.h Log Message: Perform more checks before establishing external interrupt handlers for each hart. The VisionFive2 DTS list the S7 core with status = "disabled". To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/dev/plic_fdt.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/riscv/fdt/cpu_fdt.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/fdt/riscv_fdtvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: rin Date: Mon Jan 1 13:38:57 UTC 2024 Modified Files: src/sys/stand/efiboot: efinet.c Log Message: MI efiboot: Revert "Stop using efi_bootdp after exclusive open for PXE" http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/stand/efiboot/efinet.c#rev1.7 Some UEFI implementations pass multiple boot options as boot device path, and NULL-clearing it results in boot failures. Thanks skrll@ for pointing it out. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/stand/efiboot/efinet.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: rin
Date: Mon Jan 1 13:38:57 UTC 2024
Modified Files:
src/sys/stand/efiboot: efinet.c
Log Message:
MI efiboot: Revert "Stop using efi_bootdp after exclusive open for PXE"
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/stand/efiboot/efinet.c#rev1.7
Some UEFI implementations pass multiple boot options as boot device path,
and NULL-clearing it results in boot failures.
Thanks skrll@ for pointing it out.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/stand/efiboot/efinet.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/stand/efiboot/efinet.c
diff -u src/sys/stand/efiboot/efinet.c:1.8 src/sys/stand/efiboot/efinet.c:1.9
--- src/sys/stand/efiboot/efinet.c:1.8 Wed Dec 27 09:40:35 2023
+++ src/sys/stand/efiboot/efinet.c Mon Jan 1 13:38:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efinet.c,v 1.8 2023/12/27 09:40:35 rin Exp $ */
+/* $NetBSD: efinet.c,v 1.9 2024/01/01 13:38:57 rin Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
@@ -333,7 +333,7 @@ efi_net_probe(void)
EFI_STATUS status;
UINTN i, nhandles;
int nifs, depth = -1;
- bool found, is_bootdp;
+ bool found;
status = LibLocateHandle(ByProtocol, , NULL,
, );
@@ -377,9 +377,6 @@ efi_net_probe(void)
if (!found)
continue;
- is_bootdp = depth > 0 &&
- efi_device_path_ncmp(efi_bootdp, dp0, depth) == 0;
-
status = uefi_call_wrapper(BS->OpenProtocol, 6, handles[i],
, (void **), IH, NULL,
EFI_OPEN_PROTOCOL_EXCLUSIVE);
@@ -407,21 +404,10 @@ efi_net_probe(void)
return;
}
- if (is_bootdp) {
- /*
- * This is boot device...
- */
+ if (depth > 0 && efi_device_path_ncmp(efi_bootdp, dp0, depth) == 0) {
char devname[9];
-
snprintf(devname, sizeof(devname), "net%u", nifs);
set_default_device(devname);
-
- /*
- * and now opened for us excluively. Therefore,
- * access via device path is illegal.
- */
- efi_bootdp = NULL;
- depth = -1;
}
nifs++;
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Jan 1 11:47:38 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Log Message: Welcome to 10.0 RC2 To generate a diff of this commit: cvs rdiff -u -r1.1.2.182 -r1.1.2.183 src/doc/CHANGES-10.0 cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.2 -r1.722.2.3 src/sys/sys/param.h 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.182 src/doc/CHANGES-10.0:1.1.2.183 --- src/doc/CHANGES-10.0:1.1.2.182 Sun Dec 31 12:48:55 2023 +++ src/doc/CHANGES-10.0 Mon Jan 1 11:47:38 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.182 2023/12/31 12:48:55 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.183 2024/01/01 11:47:38 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15073,3 +15073,18 @@ etc/newsyslog.conf1.25 newsyslog.conf: collate npflog0.pcap properly [uwe, ticket #531] +sys/conf/copyright1.22 + + Update copyright notice for 2024. + [hgutch, ticket #532] + +external/gpl3/gcc/lib/liblto_plugin/Makefile 1.11 + + liblto_plugin: also link in libiberty's unlink-if-ordinary.c. + [mrg, ticket #533] + +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) + + Welcome to 10.0_RC2 + Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.7.6.2 src/external/gpl2/groff/tmac/mdoc.local:1.7.6.3 --- src/external/gpl2/groff/tmac/mdoc.local:1.7.6.2 Sun Nov 5 18:30:08 2023 +++ src/external/gpl2/groff/tmac/mdoc.local Mon Jan 1 11:47:38 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.7.6.2 2023/11/05 18:30:08 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.7.6.3 2024/01/01 11:47:38 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -46,7 +46,7 @@ .\" Default .Os value .ds doc-operating-system NetBSD\~10.0_BETA .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~10.0_RC1 +.ds doc-default-operating-system NetBSD\~10.0_RC2 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.722.2.2 src/sys/sys/param.h:1.722.2.3 --- src/sys/sys/param.h:1.722.2.2 Sun Nov 5 18:30:08 2023 +++ src/sys/sys/param.h Mon Jan 1 11:47:38 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.722.2.2 2023/11/05 18:30:08 martin Exp $ */ +/* $NetBSD: param.h,v 1.722.2.3 2024/01/01 11:47:38 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 10 /* NetBSD 10.0_RC1 */ +#define __NetBSD_Version__ 10 /* NetBSD 10.0_RC2 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Mon Jan 1 11:47:38 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Log Message: Welcome to 10.0 RC2 To generate a diff of this commit: cvs rdiff -u -r1.1.2.182 -r1.1.2.183 src/doc/CHANGES-10.0 cvs rdiff -u -r1.7.6.2 -r1.7.6.3 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.2 -r1.722.2.3 src/sys/sys/param.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/external/gpl3/gcc/lib/liblto_plugin
Module Name:src Committed By: martin Date: Mon Jan 1 11:43:19 UTC 2024 Modified Files: src/external/gpl3/gcc/lib/liblto_plugin [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #533): external/gpl3/gcc/lib/liblto_plugin/Makefile: revision 1.11 also link in libiberty's unlink-if-ordinary.c. should fix undef issues reported on current-users. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 \ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/gpl3/gcc/lib/liblto_plugin
Module Name:src
Committed By: martin
Date: Mon Jan 1 11:43:19 UTC 2024
Modified Files:
src/external/gpl3/gcc/lib/liblto_plugin [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #533):
external/gpl3/gcc/lib/liblto_plugin/Makefile: revision 1.11
also link in libiberty's unlink-if-ordinary.c.
should fix undef issues reported on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/external/gpl3/gcc/lib/liblto_plugin/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/gcc/lib/liblto_plugin/Makefile
diff -u src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.10 src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.10.2.1
--- src/external/gpl3/gcc/lib/liblto_plugin/Makefile:1.10 Sat Sep 18 01:47:07 2021
+++ src/external/gpl3/gcc/lib/liblto_plugin/Makefile Mon Jan 1 11:43:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2021/09/18 01:47:07 christos Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2024/01/01 11:43:19 martin Exp $
.include
.include
@@ -15,7 +15,7 @@ SRCS= lto-plugin.c hashtab.c simple-obj
# libiberty
SRCS+= xstrerror.c xasprintf.c xvasprintf.c safe-ctype.c \
- vprintf-support.c
+ vprintf-support.c unlink-if-ordinary.c
CPPFLAGS+= -I${DIST}/include -I.
CPPFLAGS+= -DHAVE_CONFIG_H
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jan 1 11:40:17 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1929 To generate a diff of this commit: cvs rdiff -u -r1.1.2.215 -r1.1.2.216 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.215 src/doc/CHANGES-8.3:1.1.2.216 --- src/doc/CHANGES-8.3:1.1.2.215 Sat Dec 30 19:19:01 2023 +++ src/doc/CHANGES-8.3 Mon Jan 1 11:40:17 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.215 2023/12/30 19:19:01 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.216 2024/01/01 11:40:17 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4180,3 +4180,9 @@ doc/3RDPARTY (apply patch) Update tzdata to tzdata2023dgtz. [kre, ticket #1928] + +sys/conf/copyright1.22 + + Update copyright notice for 2024. + [hgutch, ticket #1929] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Jan 1 11:40:17 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1929 To generate a diff of this commit: cvs rdiff -u -r1.1.2.215 -r1.1.2.216 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/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:39:25 UTC 2024 Modified Files: src/sys/conf [netbsd-8]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #1929): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.15.8.5 -r1.15.8.6 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.15.8.5 src/sys/conf/copyright:1.15.8.6 --- src/sys/conf/copyright:1.15.8.5 Tue Jan 3 16:41:52 2023 +++ src/sys/conf/copyright Mon Jan 1 11:39:25 2024 @@ -1,6 +1,6 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, -2018, 2019, 2020, 2021, 2022, 2023 +2018, 2019, 2020, 2021, 2022, 2023, 2024 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: [netbsd-8] src/sys/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:39:25 UTC 2024 Modified Files: src/sys/conf [netbsd-8]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #1929): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.15.8.5 -r1.15.8.6 src/sys/conf/copyright 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 1 11:38:06 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1785 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 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.124 src/doc/CHANGES-9.4:1.1.2.125 --- src/doc/CHANGES-9.4:1.1.2.124 Sun Dec 31 12:51:12 2023 +++ src/doc/CHANGES-9.4 Mon Jan 1 11:38:06 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.124 2023/12/31 12:51:12 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.125 2024/01/01 11:38:06 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -4038,3 +4038,8 @@ etc/newsyslog.conf1.25 newsyslog.conf: collate npflog0.pcap properly [uwe, ticket #1784] +sys/conf/copyright1.22 + + Update copyright notice for 2024. + [hgutch, ticket #1785] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Jan 1 11:38:06 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Ticket #1785 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 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/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:37:13 UTC 2024 Modified Files: src/sys/conf [netbsd-9]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #1785): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.17.4.3 -r1.17.4.4 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.17.4.3 src/sys/conf/copyright:1.17.4.4 --- src/sys/conf/copyright:1.17.4.3 Tue Jan 3 16:46:12 2023 +++ src/sys/conf/copyright Mon Jan 1 11:37:13 2024 @@ -1,6 +1,7 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, -2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 +2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, +2024 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: [netbsd-9] src/sys/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:37:13 UTC 2024 Modified Files: src/sys/conf [netbsd-9]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #1785): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.17.4.3 -r1.17.4.4 src/sys/conf/copyright 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/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:35:45 UTC 2024 Modified Files: src/sys/conf [netbsd-10]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #532): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.20.4.1 -r1.20.4.2 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/conf/copyright diff -u src/sys/conf/copyright:1.20.4.1 src/sys/conf/copyright:1.20.4.2 --- src/sys/conf/copyright:1.20.4.1 Tue Jan 3 16:48:12 2023 +++ src/sys/conf/copyright Mon Jan 1 11:35:45 2024 @@ -1,6 +1,7 @@ Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, -2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 +2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, +2024 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved.
CVS commit: [netbsd-10] src/sys/conf
Module Name:src Committed By: martin Date: Mon Jan 1 11:35:45 UTC 2024 Modified Files: src/sys/conf [netbsd-10]: copyright Log Message: Pull up following revision(s) (requested by hgutch in ticket #532): sys/conf/copyright: revision 1.22 Update copyright notice for 2024. To generate a diff of this commit: cvs rdiff -u -r1.20.4.1 -r1.20.4.2 src/sys/conf/copyright Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
