CVS commit: src/sys/arch/atari/atari
Module Name:src Committed By: thorpej Date: Mon Jan 15 03:14:31 UTC 2024 Modified Files: src/sys/arch/atari/atari: atari_init.c Log Message: Guard references to protorp with M68030. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/arch/atari/atari/atari_init.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/atari/atari
Module Name:src
Committed By: thorpej
Date: Mon Jan 15 03:14:31 UTC 2024
Modified Files:
src/sys/arch/atari/atari: atari_init.c
Log Message:
Guard references to protorp with M68030.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/atari/atari/atari_init.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/atari/atari/atari_init.c
diff -u src/sys/arch/atari/atari/atari_init.c:1.110 src/sys/arch/atari/atari/atari_init.c:1.111
--- src/sys/arch/atari/atari/atari_init.c:1.110 Tue Jan 9 07:28:25 2024
+++ src/sys/arch/atari/atari/atari_init.c Mon Jan 15 03:14:31 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: atari_init.c,v 1.110 2024/01/09 07:28:25 thorpej Exp $ */
+/* $NetBSD: atari_init.c,v 1.111 2024/01/15 03:14:31 thorpej Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.110 2024/01/09 07:28:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari_init.c,v 1.111 2024/01/15 03:14:31 thorpej Exp $");
#include "opt_ddb.h"
#include "opt_mbtype.h"
@@ -211,7 +211,7 @@ start_c(int id, u_int ttphystart, u_int
psize_t ptsize;
u_int ptextra;
vaddr_t kva;
- u_int tc, i;
+ u_int i;
pt_entry_t *pg, *epg;
pt_entry_t pg_proto;
vaddr_t end_loaded;
@@ -601,7 +601,6 @@ start_c(int id, u_int ttphystart, u_int
* Prepare to enable the MMU.
* Setup and load SRP (see pmap.h)
*/
- protorp[1] = Sysseg_pa; /* + segtable address */
cpu_init_kcorehdr(kbase, Sysseg_pa);
@@ -642,15 +641,18 @@ start_c(int id, u_int ttphystart, u_int
} else
#endif
{
+#if defined(M68030)
+ protorp[1] = Sysseg_pa; /* + segtable address */
__asm volatile ("pmove %0@,%%srp" : : "a" ([0]));
/*
* setup and load TC register.
* enable_cpr, enable_srp, pagesize=8k,
* A = 8 bits, B = 11 bits
*/
- tc = MMU51_TCR_BITS;
+ u_int tc = MMU51_TCR_BITS;
__asm volatile ("pflusha" : : );
__asm volatile ("pmove %0@,%%tc" : : "a" ());
+#endif /* M68030 */
}
/*
CVS commit: src/sys/arch/cesfic
Module Name:src Committed By: thorpej Date: Mon Jan 15 03:07:14 UTC 2024 Modified Files: src/sys/arch/cesfic/cesfic: isr.h locore.s src/sys/arch/cesfic/conf: files.cesfic src/sys/arch/cesfic/include: cpu.h intr.h vectors.h Removed Files: src/sys/arch/cesfic/cesfic: isr.c Log Message: Switch cesfic over to the common interrupt dispatch code. To generate a diff of this commit: cvs rdiff -u -r1.19 -r0 src/sys/arch/cesfic/cesfic/isr.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cesfic/cesfic/isr.h cvs rdiff -u -r1.40 -r1.41 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cesfic/conf/files.cesfic cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cesfic/include/cpu.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cesfic/include/intr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/cesfic/include/vectors.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/cesfic
Module Name:src
Committed By: thorpej
Date: Mon Jan 15 03:07:14 UTC 2024
Modified Files:
src/sys/arch/cesfic/cesfic: isr.h locore.s
src/sys/arch/cesfic/conf: files.cesfic
src/sys/arch/cesfic/include: cpu.h intr.h vectors.h
Removed Files:
src/sys/arch/cesfic/cesfic: isr.c
Log Message:
Switch cesfic over to the common interrupt dispatch code.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r0 src/sys/arch/cesfic/cesfic/isr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cesfic/cesfic/isr.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/cesfic/conf/files.cesfic
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/cesfic/include/intr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/cesfic/include/vectors.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/cesfic/cesfic/isr.h
diff -u src/sys/arch/cesfic/cesfic/isr.h:1.4 src/sys/arch/cesfic/cesfic/isr.h:1.5
--- src/sys/arch/cesfic/cesfic/isr.h:1.4 Sat Mar 14 14:45:58 2009
+++ src/sys/arch/cesfic/cesfic/isr.h Mon Jan 15 03:07:14 2024
@@ -1,7 +1,7 @@
-/* $NetBSD: isr.h,v 1.4 2009/03/14 14:45:58 dsl Exp $ */
+/* $NetBSD: isr.h,v 1.5 2024/01/15 03:07:14 thorpej Exp $ */
/*-
- * Copyright (c) 1996 The NetBSD Foundation, Inc.
+ * Copyright (c) 2024 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -29,41 +29,25 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include
+#ifndef _LUNA68K_ISR_H_
+#define _LUNA68K_ISR_H_
-/*
- * The location and size of the autovectored interrupt portion
- * of the vector table.
- */
-#define ISRLOC 0x18
-#define NISR 8
-
-struct isr {
- LIST_ENTRY(isr) isr_link;
- int (*isr_func)(void *);
- void *isr_arg;
- int isr_ipl;
- int isr_priority;
-};
+#include
/*
- * ISR priorities. These are not the same as interrupt levels.
- * These serve 2 purposes:
- * - properly order ISRs in the list
- * - compute levels for spl*() calls.
+ * Aliases for the legacy cesfic ISR routines.
*/
-#define ISRPRI_BIO 0
-#define ISRPRI_NET 1
-#define ISRPRI_TTY 2
-#define ISRPRI_TTYNOBUF 3
-/*
- * Convert PSL values to IPLs and vice-versa.
- */
-#define PSLTOIPL(x) (((x) >> 8) & 0xf)
-#define IPLTOPSL(x) x) & 0xf) << 8) | PSL_S)
+static inline void
+isrinit(void)
+{
+ m68k_intr_init(NULL);
+}
+
+static inline void *
+isrlink(int (*func)(void *), void *arg, int ipl, int isrpri)
+{
+ return m68k_intr_establish(func, arg, NULL, 0, ipl, isrpri, 0);
+}
-void isrinit(void);
-void *isrlink(int (*)(void *), void *, int, int);
-void isrunlink(void *);
-void isrdispatch(int);
+#endif /* _LUNA68K_ISR_H_ */
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.40 src/sys/arch/cesfic/cesfic/locore.s:1.41
--- src/sys/arch/cesfic/cesfic/locore.s:1.40 Mon Jan 15 02:40:52 2024
+++ src/sys/arch/cesfic/cesfic/locore.s Mon Jan 15 03:07:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.40 2024/01/15 02:40:52 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.41 2024/01/15 03:07:14 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -613,15 +613,6 @@ ENTRY_NOPROFILE(spurintr) /* level 0 */
INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-ENTRY_NOPROFILE(intrhand) /* levels 1 through 5 */
- INTERRUPT_SAVEREG
- movw %sp@(22),%sp@- | push exception vector info
- clrw %sp@-
- jbsr _C_LABEL(isrdispatch) | call dispatch routine
- addql #4,%sp
- INTERRUPT_RESTOREREG
- jra _ASM_LABEL(rei) | all done
-
ENTRY_NOPROFILE(lev6intr) /* Level 6: clock */
INTERRUPT_SAVEREG
/* XXX */
@@ -631,7 +622,7 @@ ENTRY_NOPROFILE(lev6intr) /* Level 6: cl
btst #2, %d0
jeq 1f
addql #1,_C_LABEL(intrcnt)+24
- lea %sp@(16), %a1 | a1 =
+ lea %sp@(0), %a1 | a1 =
movl %a1, %sp@-
jbsr _C_LABEL(hardclock) | hardclock()
addql #4, %sp
Index: src/sys/arch/cesfic/conf/files.cesfic
diff -u src/sys/arch/cesfic/conf/files.cesfic:1.20 src/sys/arch/cesfic/conf/files.cesfic:1.21
--- src/sys/arch/cesfic/conf/files.cesfic:1.20 Mon Jan 15 02:40:52 2024
+++ src/sys/arch/cesfic/conf/files.cesfic Mon Jan 15 03:07:14 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.cesfic,v 1.20 2024/01/15 02:40:52 thorpej Exp $
+# $NetBSD: files.cesfic,v 1.21 2024/01/15 03:07:14 thorpej Exp $
#
# cesfic-specific configuration info
@@ -52,12 +52,13 @@ file arch/cesfic/dev/if_le.c le
file arch/cesfic/cesfic/autoconf.c
file arch/cesfic/cesfic/clock.c
file arch/cesfic/cesfic/machdep.c
-file arch/cesfic/cesfic/isr.c
file arch/cesfic/cesfic/pmap_bootstrap.c
file arch/cesfic/cesfic/trap.c
file arch/m68k/m68k/cacheops.c
file arch/m68k/m68k/db_memrw.c ddb | kgdb
file arch/m68k/m68k/kgdb_machdep.c kgdb
+file arch/m68k/m68k/m68k_intr.c
+file arch/m68k/m68k/m68k_intr_stubs.s
file arch/m68k/m68k/m68k_trap.c
file arch/m68k/m68k/mmu_subr.s
file
CVS commit: src/sys/arch/cesfic
Module Name:src Committed By: thorpej Date: Mon Jan 15 02:40:52 UTC 2024 Modified Files: src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/cesfic/conf: files.cesfic Added Files: src/sys/arch/cesfic/include: vectors.h Removed Files: src/sys/arch/cesfic/cesfic: vectors.s Log Message: Switch cesfic over to the common vector table. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.4 -r0 src/sys/arch/cesfic/cesfic/vectors.s cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cesfic/conf/files.cesfic cvs rdiff -u -r0 -r1.1 src/sys/arch/cesfic/include/vectors.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/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.39 src/sys/arch/cesfic/cesfic/locore.s:1.40 --- src/sys/arch/cesfic/cesfic/locore.s:1.39 Tue Jan 9 07:28:25 2024 +++ src/sys/arch/cesfic/cesfic/locore.s Mon Jan 15 02:40:52 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.39 2024/01/09 07:28:25 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.40 2024/01/15 02:40:52 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -107,10 +107,7 @@ GLOBAL(kernel_text) .space PAGE_SIZE ASLOCAL(tmpstk) -#include - .text - /* * Macro to relocate a symbol, used before MMU is enabled. */ @@ -323,15 +320,14 @@ Lenab1: nop nop nop - movl #_C_LABEL(vectab),%d0 | set Vector Base Register - movc %d0,%vbr moveq #0,%d0 | ensure TT regs are disabled .long 0x4e7b0004 | movc d0,itt0 .long 0x4e7b0005 | movc d0,itt1 .long 0x4e7b0006 | movc d0,dtt0 .long 0x4e7b0007 | movc d0,dtt1 - lea _ASM_LABEL(tmpstk),%sp | temporary stack + lea _ASM_LABEL(tmpstk),%sp | re-load temporary stack + jbsr _C_LABEL(vec_init) | initialize vector table /* call final pmap setup */ jbsr _C_LABEL(pmap_bootstrap_finalize) /* set kernel stack, user SP */ Index: src/sys/arch/cesfic/conf/files.cesfic diff -u src/sys/arch/cesfic/conf/files.cesfic:1.19 src/sys/arch/cesfic/conf/files.cesfic:1.20 --- src/sys/arch/cesfic/conf/files.cesfic:1.19 Tue Jan 9 04:16:24 2024 +++ src/sys/arch/cesfic/conf/files.cesfic Mon Jan 15 02:40:52 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.cesfic,v 1.19 2024/01/09 04:16:24 thorpej Exp $ +# $NetBSD: files.cesfic,v 1.20 2024/01/15 02:40:52 thorpej Exp $ # # cesfic-specific configuration info @@ -63,6 +63,7 @@ file arch/m68k/m68k/mmu_subr.s file arch/m68k/m68k/pmap_motorola.c file arch/m68k/m68k/procfs_machdep.c procfs file arch/m68k/m68k/sys_machdep.c +file arch/m68k/m68k/vectors.c file arch/m68k/m68k/vm_machdep.c file dev/cons.c Added files: Index: src/sys/arch/cesfic/include/vectors.h diff -u /dev/null src/sys/arch/cesfic/include/vectors.h:1.1 --- /dev/null Mon Jan 15 02:40:52 2024 +++ src/sys/arch/cesfic/include/vectors.h Mon Jan 15 02:40:52 2024 @@ -0,0 +1,50 @@ +/* $NetBSD: vectors.h,v 1.1 2024/01/15 02:40:52 thorpej 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. + */ + +#ifndef _CESFIC_VECTORS_H_ +#define _CESFIC_VECTORS_H_ + +#ifdef _KERNEL + +#include + +#define MACHINE_AV0_HANDLER spurintr +#define MACHINE_AV1_HANDLER intrhand +#define MACHINE_AV2_HANDLER intrhand +#define MACHINE_AV3_HANDLER intrhand +#define MACHINE_AV4_HANDLER intrhand +#define MACHINE_AV5_HANDLER intrhand +#define MACHINE_AV6_HANDLER lev6intr +#define MACHINE_AV7_HANDLER lev7intr + +#endif /* _KERNEL */ + +#endif /* _CESFIC_VECTORS_H_ */
CVS commit: src/sys/arch/cesfic
Module Name:src Committed By: thorpej Date: Mon Jan 15 02:40:52 UTC 2024 Modified Files: src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/cesfic/conf: files.cesfic Added Files: src/sys/arch/cesfic/include: vectors.h Removed Files: src/sys/arch/cesfic/cesfic: vectors.s Log Message: Switch cesfic over to the common vector table. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.4 -r0 src/sys/arch/cesfic/cesfic/vectors.s cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cesfic/conf/files.cesfic cvs rdiff -u -r0 -r1.1 src/sys/arch/cesfic/include/vectors.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/luna68k
Module Name:src
Committed By: thorpej
Date: Mon Jan 15 02:16:52 UTC 2024
Modified Files:
src/sys/arch/luna68k/conf: files.luna68k
src/sys/arch/luna68k/include: cpu.h intr.h vectors.h
src/sys/arch/luna68k/luna68k: isr.h locore.s
Removed Files:
src/sys/arch/luna68k/luna68k: isr.c
Log Message:
Switch luna68k over to the common interrupt dispatch code.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/luna68k/conf/files.luna68k
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/luna68k/include/intr.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/include/vectors.h
cvs rdiff -u -r1.27 -r0 src/sys/arch/luna68k/luna68k/isr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/luna68k/isr.h
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/luna68k/luna68k/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/conf/files.luna68k
diff -u src/sys/arch/luna68k/conf/files.luna68k:1.33 src/sys/arch/luna68k/conf/files.luna68k:1.34
--- src/sys/arch/luna68k/conf/files.luna68k:1.33 Sun Jan 14 00:17:46 2024
+++ src/sys/arch/luna68k/conf/files.luna68k Mon Jan 15 02:16:52 2024
@@ -1,5 +1,5 @@
#
-# $NetBSD: files.luna68k,v 1.33 2024/01/14 00:17:46 thorpej Exp $
+# $NetBSD: files.luna68k,v 1.34 2024/01/15 02:16:52 thorpej Exp $
#
maxpartitions 8
maxusers 2 8 64
@@ -10,7 +10,6 @@ defflag PANICBUTTON
file arch/luna68k/luna68k/autoconf.c
file arch/luna68k/luna68k/clock.c
file arch/luna68k/luna68k/disksubr.c
-file arch/luna68k/luna68k/isr.c
file arch/luna68k/luna68k/machdep.c
file arch/luna68k/luna68k/pmap_bootstrap.c
file arch/luna68k/luna68k/trap.c
@@ -18,6 +17,8 @@ file arch/m68k/m68k/cacheops.c
file arch/m68k/m68k/db_memrw.c ddb | kgdb
file arch/m68k/m68k/kgdb_machdep.c kgdb
file arch/m68k/m68k/fpu.c compile-with "${M68K_KERN_FPU}"
+file arch/m68k/m68k/m68k_intr.c
+file arch/m68k/m68k/m68k_intr_stubs.s
file arch/m68k/m68k/m68k_trap.c
file arch/m68k/m68k/mmu_subr.s
file arch/m68k/m68k/pmap_motorola.c
Index: src/sys/arch/luna68k/include/cpu.h
diff -u src/sys/arch/luna68k/include/cpu.h:1.39 src/sys/arch/luna68k/include/cpu.h:1.40
--- src/sys/arch/luna68k/include/cpu.h:1.39 Tue Jan 9 04:16:25 2024
+++ src/sys/arch/luna68k/include/cpu.h Mon Jan 15 02:16:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.39 2024/01/09 04:16:25 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.40 2024/01/15 02:16:52 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -57,19 +57,20 @@
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the luna68k, we use
- * what the hardware pushes on an interrupt (frame format 0).
+ * what the locore.s glue puts on the stack before calling C-code.
*/
struct clockframe {
- u_short sr; /* sr at time of interrupt */
- u_long pc; /* pc at time of interrupt */
- u_short vo; /* vector offset (4-word frame) */
-};
+ u_int cf_regs[4]; /* d0,d1,a0,a1 */
+ u_short cf_sr; /* sr at time of interrupt */
+ u_long cf_pc; /* pc at time of interrupt */
+ u_short cf_vo; /* vector offset (4-word frame) */
+} __attribute__((packed));
-#define CLKF_USERMODE(framep) (((framep)->sr & PSL_S) == 0)
-#define CLKF_PC(framep) ((framep)->pc)
+#define CLKF_USERMODE(framep) (((framep)->cf_sr & PSL_S) == 0)
+#define CLKF_PC(framep) ((framep)->cf_pc)
#if 0
/* We would like to do it this way... */
-#define CLKF_INTR(framep) (((framep)->sr & PSL_M) == 0)
+#define CLKF_INTR(framep) (((framep)->cf_sr & PSL_M) == 0)
#else
/* but until we start using PSL_M, we have to do this instead */
#define CLKF_INTR(framep) (0) /* XXX */
Index: src/sys/arch/luna68k/include/intr.h
diff -u src/sys/arch/luna68k/include/intr.h:1.16 src/sys/arch/luna68k/include/intr.h:1.17
--- src/sys/arch/luna68k/include/intr.h:1.16 Tue Jul 11 11:06:04 2023
+++ src/sys/arch/luna68k/include/intr.h Mon Jan 15 02:16:52 2024
@@ -1,11 +1,11 @@
-/* $NetBSD: intr.h,v 1.16 2023/07/11 11:06:04 riastradh Exp $ */
+/* $NetBSD: intr.h,v 1.17 2024/01/15 02:16:52 thorpej Exp $ */
/*-
- * Copyright (c) 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 2024 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
- * by Tohru Nishimura.
+ * by Jason R. Thorpe.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,67 +29,18 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MACHINE_INTR_H
-#define _MACHINE_INTR_H
+#ifndef _LUNA68K_INTR_H_
+#define _LUNA68K_INTR_H_
-#if defined(_KERNEL) || defined(_KMEMUSER)
-typedef struct {
- uint16_t _psl;
-} ipl_cookie_t;
-#endif
+#include
-#ifdef _KERNEL
+#define MACHINE_PSL_IPL_SOFTCLOCK PSL_IPL1
+#define MACHINE_PSL_IPL_SOFTBIO PSL_IPL1
+#define
CVS commit: src/sys/arch/luna68k
Module Name:src Committed By: thorpej Date: Mon Jan 15 02:16:52 UTC 2024 Modified Files: src/sys/arch/luna68k/conf: files.luna68k src/sys/arch/luna68k/include: cpu.h intr.h vectors.h src/sys/arch/luna68k/luna68k: isr.h locore.s Removed Files: src/sys/arch/luna68k/luna68k: isr.c Log Message: Switch luna68k over to the common interrupt dispatch code. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/luna68k/conf/files.luna68k cvs rdiff -u -r1.39 -r1.40 src/sys/arch/luna68k/include/cpu.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/luna68k/include/intr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/include/vectors.h cvs rdiff -u -r1.27 -r0 src/sys/arch/luna68k/luna68k/isr.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/luna68k/isr.h cvs rdiff -u -r1.76 -r1.77 src/sys/arch/luna68k/luna68k/locore.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/m68k
Module Name:src
Committed By: thorpej
Date: Mon Jan 15 02:13:16 UTC 2024
Modified Files:
src/sys/arch/m68k/include: intr.h
src/sys/arch/m68k/m68k: m68k_intr.c
Log Message:
Add the "ISR priority" notion that's used on some m68k platforms:
/*
* Some devices are particularly sensitive to interrupt
* handling latency. Unbuffered serial ports, for example,
* can lose data if their interrupts aren't handled with
* reasonable speed. For this reason, we sort interrupt
* handlers by an abstract "ISR" priority, inserting higher-
* priority interrupts before lower-priority interrupts.
*/
(...within the same shared auto-vectored interrupt list.)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/include/intr.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/m68k/m68k_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/m68k/include/intr.h
diff -u src/sys/arch/m68k/include/intr.h:1.1 src/sys/arch/m68k/include/intr.h:1.2
--- src/sys/arch/m68k/include/intr.h:1.1 Sun Jan 14 22:32:32 2024
+++ src/sys/arch/m68k/include/intr.h Mon Jan 15 02:13:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.1 2024/01/14 22:32:32 thorpej Exp $ */
+/* $NetBSD: intr.h,v 1.2 2024/01/15 02:13:16 thorpej Exp $ */
/*-
* Copyright (c) 2023, 2024 The NetBSD Foundation, Inc.
@@ -49,6 +49,18 @@
#define IPL_HIGH 7 /* blocks all interrupts */
#define NIPL 8
+/*
+ * Abstract ISR priorities. These allow sorting of latency-sensitive
+ * devices earlier on the shared auto-vectored interrupt lists.
+ */
+#define ISRPRI_BIO 0 /* a block I/O device */
+#define ISRPRI_MISC 0 /* misc. devices */
+#define ISRPRI_NET 1 /* a network interface */
+#define ISRPRI_TTY 2 /* a serial port */
+#define ISRPRI_DISPLAY 2 /* display devices / framebuffers */
+#define ISRPRI_TTYNOBUF 3 /* a particularly bad serial port */
+#define ISRPRI_AUDIO 4 /* audio devices */
+
#if defined(_KERNEL) || defined(_KMEMUSER)
typedef struct {
uint16_t _psl; /* physical manifestation of logical IPL_* */
@@ -108,6 +120,7 @@ struct m68k_intrhand {
struct evcnt *ih_evcnt;
intih_ipl; /* m68k IPL, not IPL_* */
intih_vec;
+ intih_isrpri;
};
LIST_HEAD(m68k_intrhand_list, m68k_intrhand);
Index: src/sys/arch/m68k/m68k/m68k_intr.c
diff -u src/sys/arch/m68k/m68k/m68k_intr.c:1.3 src/sys/arch/m68k/m68k/m68k_intr.c:1.4
--- src/sys/arch/m68k/m68k/m68k_intr.c:1.3 Mon Jan 15 00:37:08 2024
+++ src/sys/arch/m68k/m68k/m68k_intr.c Mon Jan 15 02:13:16 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k_intr.c,v 1.3 2024/01/15 00:37:08 thorpej Exp $ */
+/* $NetBSD: m68k_intr.c,v 1.4 2024/01/15 02:13:16 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2023, 2024 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.3 2024/01/15 00:37:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.4 2024/01/15 02:13:16 thorpej Exp $");
#define _M68K_INTR_PRIVATE
@@ -208,7 +208,7 @@ m68k_intr_init(const struct m68k_ih_allo
*/
void *
m68k_intr_establish(int (*func)(void *), void *arg, struct evcnt *ev,
-int vec, int ipl, int isrpri __unused, int flags __unused)
+int vec, int ipl, int isrpri, int flags __unused)
{
struct m68k_intrhand *ih;
int s;
@@ -242,6 +242,7 @@ m68k_intr_establish(int (*func)(void *),
ih->ih_arg = arg;
ih->ih_vec = vec;
ih->ih_ipl = ipl;
+ ih->ih_isrpri = isrpri;
if ((ih->ih_evcnt = ev) == NULL) {
ih->ih_evcnt =
}
@@ -260,8 +261,32 @@ m68k_intr_establish(int (*func)(void *),
}
#endif
+ /*
+ * Some devices are particularly sensitive to interrupt
+ * handling latency. Unbuffered serial ports, for example,
+ * can lose data if their interrupts aren't handled with
+ * reasonable speed. For this reason, we sort interrupt
+ * handlers by an abstract "ISR" priority, inserting higher-
+ * priority interrupts before lower-priority interrupts.
+ */
+ struct m68k_intrhand_list * const list = _intrhands_autovec[ipl];
+ struct m68k_intrhand *curih;
+
s = splhigh();
- LIST_INSERT_HEAD(_intrhands_autovec[ipl], ih, ih_link);
+ if (LIST_EMPTY(list)) {
+ LIST_INSERT_HEAD(list, ih, ih_link);
+ goto done;
+ }
+ for (curih = LIST_FIRST(list);
+ LIST_NEXT(curih, ih_link) != NULL;
+ curih = LIST_NEXT(curih, ih_link)) {
+ if (ih->ih_isrpri > curih->ih_isrpri) {
+ LIST_INSERT_BEFORE(curih, ih, ih_link);
+ goto done;
+ }
+ }
+ LIST_INSERT_AFTER(curih, ih, ih_link);
+ done:
splx(s);
return ih;
CVS commit: src/sys/arch/m68k
Module Name:src Committed By: thorpej Date: Mon Jan 15 02:13:16 UTC 2024 Modified Files: src/sys/arch/m68k/include: intr.h src/sys/arch/m68k/m68k: m68k_intr.c Log Message: Add the "ISR priority" notion that's used on some m68k platforms: /* * Some devices are particularly sensitive to interrupt * handling latency. Unbuffered serial ports, for example, * can lose data if their interrupts aren't handled with * reasonable speed. For this reason, we sort interrupt * handlers by an abstract "ISR" priority, inserting higher- * priority interrupts before lower-priority interrupts. */ (...within the same shared auto-vectored interrupt list.) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/include/intr.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/m68k/m68k/m68k_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/m68k/m68k
Module Name:src
Committed By: thorpej
Date: Mon Jan 15 00:37:08 UTC 2024
Modified Files:
src/sys/arch/m68k/m68k: m68k_intr.c
Log Message:
Wrap references to intrcnt[] in __HAVE_LEGACY_INTRCNT.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/m68k/m68k_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/m68k/m68k/m68k_intr.c
diff -u src/sys/arch/m68k/m68k/m68k_intr.c:1.2 src/sys/arch/m68k/m68k/m68k_intr.c:1.3
--- src/sys/arch/m68k/m68k/m68k_intr.c:1.2 Mon Jan 15 00:25:15 2024
+++ src/sys/arch/m68k/m68k/m68k_intr.c Mon Jan 15 00:37:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: m68k_intr.c,v 1.2 2024/01/15 00:25:15 thorpej Exp $ */
+/* $NetBSD: m68k_intr.c,v 1.3 2024/01/15 00:37:08 thorpej Exp $ */
/*-
* Copyright (c) 1996, 2023, 2024 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.2 2024/01/15 00:25:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.3 2024/01/15 00:37:08 thorpej Exp $");
#define _M68K_INTR_PRIVATE
@@ -70,7 +70,9 @@ extern char intrstub_vectored[];
/* A dummy event counter where interrupt stats go to die. */
static struct evcnt bitbucket;
+#ifdef __HAVE_LEGACY_INTRCNT
extern u_int intrcnt[]; /* XXX old-style statistics */
+#endif
int idepth;
@@ -312,7 +314,9 @@ m68k_intr_autovec(struct clockframe fram
idepth++;
+#ifdef __HAVE_LEGACY_INTRCNT
intrcnt[ipl]++; /* XXX */
+#endif
curcpu()->ci_data.cpu_nintr++;
LIST_FOREACH(ih, _intrhands_autovec[ipl], ih_link) {
@@ -348,7 +352,9 @@ m68k_intr_vectored(struct clockframe fra
idepth++;
+#ifdef __HAVE_LEGACY_INTRCNT
intrcnt[ipl]++; /* XXX */
+#endif
curcpu()->ci_data.cpu_nintr++;
#ifdef DIAGNOSTIC
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Mon Jan 15 00:37:08 UTC 2024 Modified Files: src/sys/arch/m68k/m68k: m68k_intr.c Log Message: Wrap references to intrcnt[] in __HAVE_LEGACY_INTRCNT. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/m68k/m68k_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/news68k
Module Name:src Committed By: thorpej Date: Mon Jan 15 00:35:24 UTC 2024 Modified Files: src/sys/arch/news68k/conf: files.news68k src/sys/arch/news68k/dev: timer_hb.c src/sys/arch/news68k/include: cpu.h intr.h types.h vectors.h src/sys/arch/news68k/news68k: genassym.cf isr.h locore.s Removed Files: src/sys/arch/news68k/news68k: isr.c Log Message: Switch news68k over to the common interrupt dispatch code. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/news68k/conf/files.news68k cvs rdiff -u -r1.19 -r1.20 src/sys/arch/news68k/dev/timer_hb.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/news68k/include/cpu.h cvs rdiff -u -r1.28 -r1.29 src/sys/arch/news68k/include/intr.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/news68k/include/types.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/news68k/include/vectors.h cvs rdiff -u -r1.34 -r1.35 src/sys/arch/news68k/news68k/genassym.cf cvs rdiff -u -r1.25 -r0 src/sys/arch/news68k/news68k/isr.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/news68k/news68k/isr.h cvs rdiff -u -r1.79 -r1.80 src/sys/arch/news68k/news68k/locore.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/news68k
Module Name:src
Committed By: thorpej
Date: Mon Jan 15 00:35:24 UTC 2024
Modified Files:
src/sys/arch/news68k/conf: files.news68k
src/sys/arch/news68k/dev: timer_hb.c
src/sys/arch/news68k/include: cpu.h intr.h types.h vectors.h
src/sys/arch/news68k/news68k: genassym.cf isr.h locore.s
Removed Files:
src/sys/arch/news68k/news68k: isr.c
Log Message:
Switch news68k over to the common interrupt dispatch code.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/news68k/conf/files.news68k
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/news68k/dev/timer_hb.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/news68k/include/intr.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/news68k/include/types.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/news68k/include/vectors.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/news68k/news68k/genassym.cf
cvs rdiff -u -r1.25 -r0 src/sys/arch/news68k/news68k/isr.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/news68k/news68k/isr.h
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/news68k/news68k/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/news68k/conf/files.news68k
diff -u src/sys/arch/news68k/conf/files.news68k:1.38 src/sys/arch/news68k/conf/files.news68k:1.39
--- src/sys/arch/news68k/conf/files.news68k:1.38 Sat Jan 13 23:59:47 2024
+++ src/sys/arch/news68k/conf/files.news68k Mon Jan 15 00:35:23 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.news68k,v 1.38 2024/01/13 23:59:47 thorpej Exp $
+# $NetBSD: files.news68k,v 1.39 2024/01/15 00:35:23 thorpej Exp $
# NEWS68K-specific configuration info
@@ -15,7 +15,6 @@ file arch/news68k/news68k/bus_space.c
#file arch/news68k/news68k/cons_machdep.c
file arch/news68k/news68k/clock.c
file arch/news68k/news68k/disksubr.c disk
-file arch/news68k/news68k/isr.c
file arch/news68k/news68k/machdep.c
file arch/news68k/news68k/mainbus.c
file arch/news68k/news68k/pmap_bootstrap.c compile-with "${NOPROF_C}"
@@ -24,6 +23,8 @@ file arch/news68k/news68k/trap.c
file arch/m68k/m68k/cacheops.c
file arch/m68k/m68k/db_memrw.c ddb | kgdb
file arch/m68k/m68k/kgdb_machdep.c kgdb
+file arch/m68k/m68k/m68k_intr.c
+file arch/m68k/m68k/m68k_intr_stubs.s
file arch/m68k/m68k/m68k_trap.c
file arch/m68k/m68k/mmu_subr.s
file arch/m68k/m68k/pmap_motorola.c
Index: src/sys/arch/news68k/dev/timer_hb.c
diff -u src/sys/arch/news68k/dev/timer_hb.c:1.19 src/sys/arch/news68k/dev/timer_hb.c:1.20
--- src/sys/arch/news68k/dev/timer_hb.c:1.19 Tue Nov 22 14:31:02 2011
+++ src/sys/arch/news68k/dev/timer_hb.c Mon Jan 15 00:35:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_hb.c,v 1.19 2011/11/22 14:31:02 tsutsui Exp $ */
+/* $NetBSD: timer_hb.c,v 1.20 2024/01/15 00:35:23 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v 1.19 2011/11/22 14:31:02 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v 1.20 2024/01/15 00:35:23 thorpej Exp $");
#include
#include
@@ -42,6 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v
#include
#include
+#include
#include
@@ -62,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_hb.c,v
static int timer_hb_match(device_t, cfdata_t, void *);
static void timer_hb_attach(device_t, device_t, void *);
static void timer_hb_initclocks(int, int);
-void clock_intr(struct clockframe *);
+void clock_intr(struct clockframe);
static inline void leds_intr(void);
@@ -113,7 +114,7 @@ timer_hb_attach(device_t parent, device_
timer_config(timer_hb_initclocks);
#if 0 /* XXX this will be done in timer_hb_initclocks() */
- isrlink_custom(ha->ha_ipl, (void *)_isr_clock);
+ vec_set_entry(VECI_INTRAV0 + ha->ha_ipl, _isr_clock);
#endif
}
@@ -130,7 +131,7 @@ timer_hb_initclocks(int prof, int stat)
s = splhigh();
/* Install isr (in locore.s) that calls clock_intr(). */
- isrlink_custom(TIMER_LEVEL, (void *)_isr_clock);
+ vec_set_entry(VECI_INTRAV0 + TIMER_LEVEL, _isr_clock);
/* enable the clock */
*ctrl_timer = 1;
@@ -144,7 +145,7 @@ timer_hb_initclocks(int prof, int stat)
* from sun3/sun3x/clock.c -tsutsui
*/
void
-clock_intr(struct clockframe *cf)
+clock_intr(struct clockframe cf)
{
#ifdef LED_IDLE_CHECK
extern char _Idle[]; /* locore.s */
@@ -162,7 +163,7 @@ clock_intr(struct clockframe *cf)
leds_intr();
/* Call common clock interrupt handler. */
- hardclock(cf);
+ hardclock();
curcpu()->ci_data.cpu_nintr++;
}
Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.49 src/sys/arch/news68k/include/cpu.h:1.50
--- src/sys/arch/news68k/include/cpu.h:1.49 Sat Jan 13 23:59:47 2024
+++ src/sys/arch/news68k/include/cpu.h Mon Jan 15 00:35:23 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.49 2024/01/13 23:59:47 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.50 2024/01/15 00:35:23 thorpej Exp
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Mon Jan 15 00:25:16 UTC 2024 Modified Files: src/sys/arch/m68k/m68k: m68k_intr.c Log Message: Declare intrcnt as a u_int array, and add a missing m68k_ih_free() call in m68k_intr_disestablish(). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/m68k/m68k_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/m68k/m68k/m68k_intr.c diff -u src/sys/arch/m68k/m68k/m68k_intr.c:1.1 src/sys/arch/m68k/m68k/m68k_intr.c:1.2 --- src/sys/arch/m68k/m68k/m68k_intr.c:1.1 Sun Jan 14 22:32:32 2024 +++ src/sys/arch/m68k/m68k/m68k_intr.c Mon Jan 15 00:25:15 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: m68k_intr.c,v 1.1 2024/01/14 22:32:32 thorpej Exp $ */ +/* $NetBSD: m68k_intr.c,v 1.2 2024/01/15 00:25:15 thorpej Exp $ */ /*- * Copyright (c) 1996, 2023, 2024 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.1 2024/01/14 22:32:32 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: m68k_intr.c,v 1.2 2024/01/15 00:25:15 thorpej Exp $"); #define _M68K_INTR_PRIVATE @@ -70,7 +70,7 @@ extern char intrstub_vectored[]; /* A dummy event counter where interrupt stats go to die. */ static struct evcnt bitbucket; -extern int intrcnt[]; /* XXX old-style statistics */ +extern u_int intrcnt[]; /* XXX old-style statistics */ int idepth; @@ -291,6 +291,8 @@ m68k_intr_disestablish(void *v) splx(s); } + m68k_ih_free(ih); + return empty; }
CVS commit: src/sys/arch/m68k/m68k
Module Name:src Committed By: thorpej Date: Mon Jan 15 00:25:16 UTC 2024 Modified Files: src/sys/arch/m68k/m68k: m68k_intr.c Log Message: Declare intrcnt as a u_int array, and add a missing m68k_ih_free() call in m68k_intr_disestablish(). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/m68k/m68k/m68k_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/news68k/news68k
Module Name:src
Committed By: thorpej
Date: Sun Jan 14 23:01:43 UTC 2024
Modified Files:
src/sys/arch/news68k/news68k: isr.c isr.h
Log Message:
G/C isrlink_custom(); just use vec_set_entry() directly.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/news68k/news68k/isr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/news68k/news68k/isr.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/news68k/news68k/isr.c
diff -u src/sys/arch/news68k/news68k/isr.c:1.24 src/sys/arch/news68k/news68k/isr.c:1.25
--- src/sys/arch/news68k/news68k/isr.c:1.24 Sat Jan 13 23:59:47 2024
+++ src/sys/arch/news68k/news68k/isr.c Sun Jan 14 23:01:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.c,v 1.24 2024/01/13 23:59:47 thorpej Exp $ */
+/* $NetBSD: isr.c,v 1.25 2024/01/14 23:01:43 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.24 2024/01/13 23:59:47 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.25 2024/01/14 23:01:43 thorpej Exp $");
#include
#include
@@ -255,12 +255,6 @@ isrdispatch_vectored(int pc, int evec, v
printf("isrdispatch_vectored: vec 0x%x not claimed\n", vec);
}
-void
-isrlink_custom(int level, void *handler)
-{
- vec_set_entry(VECI_INTRAV0 + level, handler);
-}
-
const uint16_t ipl2psl_table[NIPL] = {
[IPL_NONE] = PSL_S | PSL_IPL0,
[IPL_SOFTCLOCK] = PSL_S | PSL_IPL2,
Index: src/sys/arch/news68k/news68k/isr.h
diff -u src/sys/arch/news68k/news68k/isr.h:1.8 src/sys/arch/news68k/news68k/isr.h:1.9
--- src/sys/arch/news68k/news68k/isr.h:1.8 Sat Jan 13 23:59:47 2024
+++ src/sys/arch/news68k/news68k/isr.h Sun Jan 14 23:01:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: isr.h,v 1.8 2024/01/13 23:59:47 thorpej Exp $ */
+/* $NetBSD: isr.h,v 1.9 2024/01/14 23:01:43 thorpej Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -61,4 +61,3 @@ void isrlink_vectored(int (*)(void *), v
void isrunlink_vectored(int);
void isrdispatch_autovec(int);
void isrdispatch_vectored(int, int, void *);
-void isrlink_custom(int, void *);
CVS commit: src/sys/arch/news68k/news68k
Module Name:src Committed By: thorpej Date: Sun Jan 14 23:01:43 UTC 2024 Modified Files: src/sys/arch/news68k/news68k: isr.c isr.h Log Message: G/C isrlink_custom(); just use vec_set_entry() directly. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/news68k/news68k/isr.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/news68k/news68k/isr.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
Module Name:src Committed By: thorpej Date: Sun Jan 14 22:34:55 UTC 2024 Modified Files: src/sys/arch/sun2/sun2: genassym.cf locore.s src/sys/arch/sun3/sun3: genassym.cf locore.s src/sys/arch/sun3/sun3x: genassym.cf locore.s src/sys/arch/sun68k/conf: files.sun68k src/sys/arch/sun68k/include: intr.h types.h vectors.h Removed Files: src/sys/arch/sun68k/sun68k: isr.c Log Message: Switch the sun68k platforms over to the common m68k interrupt dispatch code. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun2/sun2/genassym.cf cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun2/sun2/locore.s cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sun3/sun3/genassym.cf cvs rdiff -u -r1.105 -r1.106 src/sys/arch/sun3/sun3/locore.s cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun3/sun3x/genassym.cf cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sun3/sun3x/locore.s cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sun68k/conf/files.sun68k cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun68k/include/intr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sun68k/include/types.h \ src/sys/arch/sun68k/include/vectors.h cvs rdiff -u -r1.31 -r0 src/sys/arch/sun68k/sun68k/isr.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/sun2/sun2/genassym.cf diff -u src/sys/arch/sun2/sun2/genassym.cf:1.15 src/sys/arch/sun2/sun2/genassym.cf:1.16 --- src/sys/arch/sun2/sun2/genassym.cf:1.15 Wed Dec 27 17:35:36 2023 +++ src/sys/arch/sun2/sun2/genassym.cf Sun Jan 14 22:34:54 2024 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.15 2023/12/27 17:35:36 thorpej Exp $ +# $NetBSD: genassym.cf,v 1.16 2024/01/14 22:34:54 thorpej Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -93,6 +93,9 @@ include # XXX: for copy.s define M68010 1 +# for m68k_intr.c / m68k_intr_stubs.s +define __HAVE_M68K_INTR_VECTORED 1 + # bus error stuff define BUSERR_REG BUSERR_REG define BUSERR_PROTERR BUSERR_PROTERR Index: src/sys/arch/sun2/sun2/locore.s diff -u src/sys/arch/sun2/sun2/locore.s:1.33 src/sys/arch/sun2/sun2/locore.s:1.34 --- src/sys/arch/sun2/sun2/locore.s:1.33 Sat Jan 13 00:21:51 2024 +++ src/sys/arch/sun2/sun2/locore.s Sun Jan 14 22:34:54 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.33 2024/01/13 00:21:51 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.34 2024/01/14 22:34:54 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -399,22 +399,6 @@ Lbrkpt2: * %d0,%d1,%a0,%a1, sr, pc, vo */ -/* - * This is the common auto-vector interrupt handler, - * for which the CPU provides the vector=0x18+level. - * These are installed in the interrupt vector table. - */ -#ifdef __ELF__ - .align 4 -#else - .align 2 -#endif -GLOBAL(_isr_autovec) - INTERRUPT_SAVEREG - jbsr _C_LABEL(isr_autovec) - INTERRUPT_RESTOREREG - jra _ASM_LABEL(rei) - /* clock: see clock.c */ #ifdef __ELF__ .align 4 @@ -427,18 +411,6 @@ GLOBAL(_isr_clock) INTERRUPT_RESTOREREG jra _ASM_LABEL(rei) -| Handler for all vectored interrupts (i.e. VME interrupts) -#ifdef __ELF__ - .align 4 -#else - .align 2 -#endif -GLOBAL(_isr_vectored) - INTERRUPT_SAVEREG - jbsr _C_LABEL(isr_vectored) - INTERRUPT_RESTOREREG - jra _ASM_LABEL(rei) - /* interrupt counters (needed by vmstat) */ GLOBAL(intrnames) .asciz "spur" | 0 Index: src/sys/arch/sun3/sun3/genassym.cf diff -u src/sys/arch/sun3/sun3/genassym.cf:1.20 src/sys/arch/sun3/sun3/genassym.cf:1.21 --- src/sys/arch/sun3/sun3/genassym.cf:1.20 Wed Dec 27 17:35:37 2023 +++ src/sys/arch/sun3/sun3/genassym.cf Sun Jan 14 22:34:54 2024 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.20 2023/12/27 17:35:37 thorpej Exp $ +# $NetBSD: genassym.cf,v 1.21 2024/01/14 22:34:54 thorpej Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -93,6 +93,9 @@ include # XXX: for copy.s define M68020 1 +# for m68k_intr.c / m68k_intr_stubs.s +define __HAVE_M68K_INTR_VECTORED 1 + # 68k isms define PSL_LOWIPL PSL_LOWIPL define PSL_HIGHIPL PSL_HIGHIPL Index: src/sys/arch/sun3/sun3/locore.s diff -u src/sys/arch/sun3/sun3/locore.s:1.105 src/sys/arch/sun3/sun3/locore.s:1.106 --- src/sys/arch/sun3/sun3/locore.s:1.105 Sat Jan 13 00:21:51 2024 +++ src/sys/arch/sun3/sun3/locore.s Sun Jan 14 22:34:54 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.105 2024/01/13 00:21:51 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.106 2024/01/14 22:34:54 thorpej Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -445,22 +445,6 @@ Lbrkpt2: * %d0,%d1,%a0,%a1, sr, pc, vo */ -/* - * This is the common auto-vector interrupt handler, - * for which the CPU provides the vector=0x18+level. - * These are installed in the interrupt vector table. - */ -#ifdef __ELF__ - .align 4 -#else - .align 2 -#endif -GLOBAL(_isr_autovec) - INTERRUPT_SAVEREG - jbsr _C_LABEL(isr_autovec) - INTERRUPT_RESTOREREG - jra _ASM_LABEL(rei) - /* clock: see clock.c */ #ifdef __ELF__ .align 4 @@ -473,18 +457,6 @@ GLOBAL(_isr_clock) INTERRUPT_RESTOREREG jra
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Sun Jan 14 22:34:55 UTC 2024 Modified Files: src/sys/arch/sun2/sun2: genassym.cf locore.s src/sys/arch/sun3/sun3: genassym.cf locore.s src/sys/arch/sun3/sun3x: genassym.cf locore.s src/sys/arch/sun68k/conf: files.sun68k src/sys/arch/sun68k/include: intr.h types.h vectors.h Removed Files: src/sys/arch/sun68k/sun68k: isr.c Log Message: Switch the sun68k platforms over to the common m68k interrupt dispatch code. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun2/sun2/genassym.cf cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun2/sun2/locore.s cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sun3/sun3/genassym.cf cvs rdiff -u -r1.105 -r1.106 src/sys/arch/sun3/sun3/locore.s cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun3/sun3x/genassym.cf cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sun3/sun3x/locore.s cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sun68k/conf/files.sun68k cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun68k/include/intr.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sun68k/include/types.h \ src/sys/arch/sun68k/include/vectors.h cvs rdiff -u -r1.31 -r0 src/sys/arch/sun68k/sun68k/isr.c 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: thorpej Date: Sun Jan 14 22:32:32 UTC 2024 Modified Files: src/distrib/sets/lists/comp: ad.m68k src/sys/arch/m68k/include: Makefile Added Files: src/sys/arch/m68k/include: intr.h src/sys/arch/m68k/m68k: m68k_intr.c m68k_intr_stubs.s Log Message: Add a common m68k interrupt dispatch implementation. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.34 -r1.35 src/sys/arch/m68k/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/include/intr.h cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/m68k/m68k_intr.c \ src/sys/arch/m68k/m68k/m68k_intr_stubs.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/ad.m68k diff -u src/distrib/sets/lists/comp/ad.m68k:1.70 src/distrib/sets/lists/comp/ad.m68k:1.71 --- src/distrib/sets/lists/comp/ad.m68k:1.70 Wed Dec 27 19:22:11 2023 +++ src/distrib/sets/lists/comp/ad.m68k Sun Jan 14 22:32:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ad.m68k,v 1.70 2023/12/27 19:22:11 thorpej Exp $ +# $NetBSD: ad.m68k,v 1.71 2024/01/14 22:32:32 thorpej Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/gcc-4.5/math-68881.h comp-obsolete obsolete ./usr/include/gcc-4.5/tgmath.h comp-obsolete obsolete @@ -48,6 +48,7 @@ ./usr/include/m68k/int_limits.h comp-c-include ./usr/include/m68k/int_mwgwtypes.h comp-c-include ./usr/include/m68k/int_types.h comp-c-include +./usr/include/m68k/intr.h comp-c-include ./usr/include/m68k/kcore.h comp-c-include ./usr/include/m68k/limits.h comp-c-include ./usr/include/m68k/lock.h comp-c-include Index: src/sys/arch/m68k/include/Makefile diff -u src/sys/arch/m68k/include/Makefile:1.34 src/sys/arch/m68k/include/Makefile:1.35 --- src/sys/arch/m68k/include/Makefile:1.34 Wed Dec 27 19:22:10 2023 +++ src/sys/arch/m68k/include/Makefile Sun Jan 14 22:32:32 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2023/12/27 19:22:10 thorpej Exp $ +# $NetBSD: Makefile,v 1.35 2024/01/14 22:32:32 thorpej Exp $ INCSDIR= /usr/include/m68k @@ -10,6 +10,7 @@ INCS= ansi.h aout_machdep.h asm.h asm_si fenv.h float.h fpreg.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 \ m68k.h math.h mcontext.h mmu_30.h mmu_40.h mmu_51.h mutex.h \ Added files: Index: src/sys/arch/m68k/include/intr.h diff -u /dev/null src/sys/arch/m68k/include/intr.h:1.1 --- /dev/null Sun Jan 14 22:32:32 2024 +++ src/sys/arch/m68k/include/intr.h Sun Jan 14 22:32:32 2024 @@ -0,0 +1,168 @@ +/* $NetBSD: intr.h,v 1.1 2024/01/14 22:32:32 thorpej Exp $ */ + +/*- + * Copyright (c) 2023, 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. + */ + +#ifndef _M68k_INTR_H_ +#define _M68k_INTR_H_ + +#include +#include + +/* + * Logical interrupt priority levels -- these are distinct from + * the hardware interrupt priority levels of the m68k. + */ +#define IPL_NONE 0 +#define IPL_SOFTCLOCK 1 /* clock software interrupts */ +#define IPL_SOFTBIO 2 /* block device software interrupts */ +#define IPL_SOFTNET 3 /* network software interrupts */ +#define IPL_SOFTSERIAL 4 /* serial device software interrupts */ +#define IPL_VM 5 /* all interrupts that can allocate memory */ +#define IPL_SCHED 6 /* scheduler / hard clock interrupts */ +#define IPL_HIGH 7 /* blocks all interrupts */ +#define NIPL 8 + +#if defined(_KERNEL) || defined(_KMEMUSER)
CVS commit: src
Module Name:src Committed By: thorpej Date: Sun Jan 14 22:32:32 UTC 2024 Modified Files: src/distrib/sets/lists/comp: ad.m68k src/sys/arch/m68k/include: Makefile Added Files: src/sys/arch/m68k/include: intr.h src/sys/arch/m68k/m68k: m68k_intr.c m68k_intr_stubs.s Log Message: Add a common m68k interrupt dispatch implementation. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.34 -r1.35 src/sys/arch/m68k/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/include/intr.h cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/m68k/m68k_intr.c \ src/sys/arch/m68k/m68k/m68k_intr_stubs.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Sun Jan 14 22:15:15 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_pci.c
Log Message:
i915: Backport change to downgrade gen7/vlv to aliasing-ppggtt.
PR kern/57268
XXX pullup-10
commit 4fbe112a569526e46fa2accb5763c069f78cb431
Author: Chris Wilson
Date: Mon Feb 24 10:11:20 2020 +
drm/i915/gtt: Downgrade gen7 (ivb, byt, hsw) back to aliasing-ppgtt
Full-ppgtt on gen7 is proving to be highly unstable and not robust.
Closes: https://gitlab.freedesktop.org/drm/intel/issues/694
Fixes: 3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt for ivb & hsw")
Signed-off-by: Chris Wilson
Cc: Joonas Lahtinen
Cc: Rodrigo Vivi
Cc: Jani Nikula
Cc: Dave Airlie
Acked-by: Rodrigo Vivi
Link:
https://patchwork.freedesktop.org/patch/msgid/20200224101120.4024481-1-ch...@chris-wilson.co.uk
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.4 src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c:1.4 Sun Dec 19 01:44:49 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.c Sun Jan 14 22:15:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_pci.c,v 1.4 2021/12/19 01:44:49 riastradh Exp $ */
+/* $NetBSD: i915_pci.c,v 1.5 2024/01/14 22:15:15 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.4 2021/12/19 01:44:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_pci.c,v 1.5 2024/01/14 22:15:15 riastradh Exp $");
#include
#include
@@ -442,7 +442,7 @@ static const struct intel_device_info sn
.has_rc6 = 1, \
.has_rc6p = 1, \
.has_rps = true, \
- .ppgtt_type = INTEL_PPGTT_FULL, \
+ .ppgtt_type = INTEL_PPGTT_ALIASING, \
.ppgtt_size = 31, \
IVB_PIPE_OFFSETS, \
IVB_CURSOR_OFFSETS, \
@@ -499,7 +499,7 @@ static const struct intel_device_info vl
.has_rps = true,
.display.has_gmch = 1,
.display.has_hotplug = 1,
- .ppgtt_type = INTEL_PPGTT_FULL,
+ .ppgtt_type = INTEL_PPGTT_ALIASING,
.ppgtt_size = 31,
.has_snoop = true,
.has_coherent_ggtt = false,
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Sun Jan 14 22:15:15 UTC 2024
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_pci.c
Log Message:
i915: Backport change to downgrade gen7/vlv to aliasing-ppggtt.
PR kern/57268
XXX pullup-10
commit 4fbe112a569526e46fa2accb5763c069f78cb431
Author: Chris Wilson
Date: Mon Feb 24 10:11:20 2020 +
drm/i915/gtt: Downgrade gen7 (ivb, byt, hsw) back to aliasing-ppgtt
Full-ppgtt on gen7 is proving to be highly unstable and not robust.
Closes: https://gitlab.freedesktop.org/drm/intel/issues/694
Fixes: 3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt for ivb & hsw")
Signed-off-by: Chris Wilson
Cc: Joonas Lahtinen
Cc: Rodrigo Vivi
Cc: Jani Nikula
Cc: Dave Airlie
Acked-by: Rodrigo Vivi
Link:
https://patchwork.freedesktop.org/patch/msgid/20200224101120.4024481-1-ch...@chris-wilson.co.uk
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_pci.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/m68k/include
Module Name:src Committed By: thorpej Date: Sun Jan 14 22:06:03 UTC 2024 Modified Files: src/sys/arch/m68k/include: psl.h Log Message: Provide a _splx() inline. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/m68k/include/psl.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: Sun Jan 14 22:06:03 UTC 2024
Modified Files:
src/sys/arch/m68k/include: psl.h
Log Message:
Provide a _splx() inline.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/m68k/include/psl.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/psl.h
diff -u src/sys/arch/m68k/include/psl.h:1.17 src/sys/arch/m68k/include/psl.h:1.18
--- src/sys/arch/m68k/include/psl.h:1.17 Fri Jan 12 23:36:29 2024
+++ src/sys/arch/m68k/include/psl.h Sun Jan 14 22:06:03 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.17 2024/01/12 23:36:29 thorpej Exp $ */
+/* $NetBSD: psl.h,v 1.18 2024/01/14 22:06:03 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -85,7 +85,7 @@ getsr(void)
return sr;
}
-static __inline int
+static inline int
_spl(int s)
{
int sr;
@@ -96,7 +96,13 @@ _spl(int s)
return sr;
}
-static __inline int
+static inline void
+_splx(int s)
+{
+ __asm volatile("movew %0,%%sr" : : "di" (s) : "memory");
+}
+
+static inline int
_splraise(int level)
{
int sr;
CVS commit: src
Module Name:src Committed By: thorpej Date: Sun Jan 14 18:22:02 UTC 2024 Modified Files: src/distrib/sets/lists/comp: md.sun2 md.sun3 src/sys/arch/sun2/include: types.h src/sys/arch/sun3/include: types.h src/sys/arch/sun68k/include: Makefile Added Files: src/sys/arch/sun68k/include: types.h Log Message: Merge common sun68k types defns into . To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/md.sun2 cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/comp/md.sun3 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sun2/include/types.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun3/include/types.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun68k/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/sun68k/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/md.sun2 diff -u src/distrib/sets/lists/comp/md.sun2:1.22 src/distrib/sets/lists/comp/md.sun2:1.23 --- src/distrib/sets/lists/comp/md.sun2:1.22 Thu Jul 12 10:46:40 2018 +++ src/distrib/sets/lists/comp/md.sun2 Sun Jan 14 18:22:02 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.sun2,v 1.22 2018/07/12 10:46:40 maxv Exp $ +# $NetBSD: md.sun2,v 1.23 2024/01/14 18:22:02 thorpej Exp $ ./usr/include/ieeefp.hcomp-c-include ./usr/include/sun2comp-c-include ./usr/include/sun2/_G_config.h comp-obsolete obsolete @@ -70,3 +70,4 @@ ./usr/include/sun68k/intr.h comp-c-include ./usr/include/sun68k/mon.h comp-c-include ./usr/include/sun68k/psl.h comp-c-include +./usr/include/sun68k/types.h comp-c-include Index: src/distrib/sets/lists/comp/md.sun3 diff -u src/distrib/sets/lists/comp/md.sun3:1.64 src/distrib/sets/lists/comp/md.sun3:1.65 --- src/distrib/sets/lists/comp/md.sun3:1.64 Thu Jul 12 10:46:40 2018 +++ src/distrib/sets/lists/comp/md.sun3 Sun Jan 14 18:22:02 2024 @@ -1,4 +1,4 @@ -# $NetBSD: md.sun3,v 1.64 2018/07/12 10:46:40 maxv Exp $ +# $NetBSD: md.sun3,v 1.65 2024/01/14 18:22:02 thorpej Exp $ ./usr/include/ieeefp.hcomp-c-include ./usr/include/sun3comp-c-include ./usr/include/sun3/_G_config.h comp-obsolete obsolete @@ -81,3 +81,4 @@ ./usr/include/sun68k/intr.h comp-c-include ./usr/include/sun68k/mon.h comp-c-include ./usr/include/sun68k/psl.h comp-c-include +./usr/include/sun68k/types.h comp-c-include Index: src/sys/arch/sun2/include/types.h diff -u src/sys/arch/sun2/include/types.h:1.14 src/sys/arch/sun2/include/types.h:1.15 --- src/sys/arch/sun2/include/types.h:1.14 Thu Apr 1 04:43:01 2021 +++ src/sys/arch/sun2/include/types.h Sun Jan 14 18:22:02 2024 @@ -1,11 +1,5 @@ -/* $NetBSD: types.h,v 1.14 2021/04/01 04:43:01 simonb Exp $ */ +/* $NetBSD: types.h,v 1.15 2024/01/14 18:22:02 thorpej Exp $ */ -#include +#include -#define __HAVE_LEGACY_INTRCNT -#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS -#define __HAVE_MM_MD_KERNACC -#define __HAVE_MM_MD_MMAP -#define __HAVE_MM_MD_READWRITE #define __HAVE_NO___THREAD -#define __HAVE_NO_PMAP_STATS Index: src/sys/arch/sun3/include/types.h diff -u src/sys/arch/sun3/include/types.h:1.22 src/sys/arch/sun3/include/types.h:1.23 --- src/sys/arch/sun3/include/types.h:1.22 Thu Apr 1 04:43:01 2021 +++ src/sys/arch/sun3/include/types.h Sun Jan 14 18:22:02 2024 @@ -1,10 +1,3 @@ -/* $NetBSD: types.h,v 1.22 2021/04/01 04:43:01 simonb Exp $ */ +/* $NetBSD: types.h,v 1.23 2024/01/14 18:22:02 thorpej Exp $ */ -#include - -#define __HAVE_LEGACY_INTRCNT -#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS -#define __HAVE_MM_MD_KERNACC -#define __HAVE_MM_MD_MMAP -#define __HAVE_MM_MD_READWRITE -#define __HAVE_NO_PMAP_STATS +#include Index: src/sys/arch/sun68k/include/Makefile diff -u src/sys/arch/sun68k/include/Makefile:1.2 src/sys/arch/sun68k/include/Makefile:1.3 --- src/sys/arch/sun68k/include/Makefile:1.2 Tue Nov 26 23:30:29 2002 +++ src/sys/arch/sun68k/include/Makefile Sun Jan 14 18:22:02 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/11/26 23:30:29 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2024/01/14 18:22:02 thorpej Exp $ INCSDIR= /usr/include/sun68k @@ -9,6 +9,7 @@ INCS= \ idprom.h \ intr.h \ mon.h \ - psl.h + psl.h \ + types.h .include Added files: Index: src/sys/arch/sun68k/include/types.h diff -u /dev/null src/sys/arch/sun68k/include/types.h:1.1 --- /dev/null Sun Jan 14 18:22:02 2024 +++ src/sys/arch/sun68k/include/types.h Sun Jan 14 18:22:02 2024 @@ -0,0 +1,10 @@ +/* $NetBSD: types.h,v 1.1 2024/01/14 18:22:02 thorpej Exp $ */ + +#include + +#define __HAVE_LEGACY_INTRCNT +#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS +#define __HAVE_MM_MD_KERNACC +#define __HAVE_MM_MD_MMAP +#define __HAVE_MM_MD_READWRITE +#define __HAVE_NO_PMAP_STATS
CVS commit: src
Module Name:src Committed By: thorpej Date: Sun Jan 14 18:22:02 UTC 2024 Modified Files: src/distrib/sets/lists/comp: md.sun2 md.sun3 src/sys/arch/sun2/include: types.h src/sys/arch/sun3/include: types.h src/sys/arch/sun68k/include: Makefile Added Files: src/sys/arch/sun68k/include: types.h Log Message: Merge common sun68k types defns into . To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/comp/md.sun2 cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/comp/md.sun3 cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sun2/include/types.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun3/include/types.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sun68k/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/sun68k/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/gzip
Module Name:src
Committed By: mrg
Date: Sun Jan 14 18:12:59 UTC 2024
Modified Files:
src/usr.bin/gzip: gzip.c
Log Message:
set file flags after setting other modes
otherwise permission to set modes may be revoked by the flags.
from PR#57855. thanks!
XXX: pullup-all
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/usr.bin/gzip/gzip.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/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.119 src/usr.bin/gzip/gzip.c:1.120
--- src/usr.bin/gzip/gzip.c:1.119 Sat Jun 10 04:45:25 2023
+++ src/usr.bin/gzip/gzip.c Sun Jan 14 18:12:59 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: gzip.c,v 1.119 2023/06/10 04:45:25 simonb Exp $ */
+/* $NetBSD: gzip.c,v 1.120 2024/01/14 18:12:59 mrg Exp $ */
/*
* Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2015, 2017
@@ -31,7 +31,7 @@
#ifndef lint
__COPYRIGHT("@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006, 2008,\
2009, 2010, 2011, 2015, 2017 Matthew R. Green. All rights reserved.");
-__RCSID("$NetBSD: gzip.c,v 1.119 2023/06/10 04:45:25 simonb Exp $");
+__RCSID("$NetBSD: gzip.c,v 1.120 2024/01/14 18:12:59 mrg Exp $");
#endif /* not lint */
/*
@@ -1114,14 +1114,14 @@ copymodes(int fd, const struct stat *sbp
if (fchmod(fd, sb.st_mode) < 0)
maybe_warn("couldn't fchmod: %s", file);
- /* only try flags if they exist already */
-if (sb.st_flags != 0 && fchflags(fd, sb.st_flags) < 0)
- maybe_warn("couldn't fchflags: %s", file);
-
TIMESPEC_TO_TIMEVAL([0], _atimespec);
TIMESPEC_TO_TIMEVAL([1], _mtimespec);
if (futimes(fd, times) < 0)
maybe_warn("couldn't utimes: %s", file);
+
+ /* finally, only try flags if they exist already */
+if (sb.st_flags != 0 && fchflags(fd, sb.st_flags) < 0)
+ maybe_warn("couldn't fchflags: %s", file);
}
#endif
CVS commit: src/usr.bin/gzip
Module Name:src Committed By: mrg Date: Sun Jan 14 18:12:59 UTC 2024 Modified Files: src/usr.bin/gzip: gzip.c Log Message: set file flags after setting other modes otherwise permission to set modes may be revoked by the flags. from PR#57855. thanks! XXX: pullup-all To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/usr.bin/gzip/gzip.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: Sun Jan 14 18:06:46 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #552 To generate a diff of this commit: cvs rdiff -u -r1.1.2.185 -r1.1.2.186 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.185 src/doc/CHANGES-10.0:1.1.2.186 --- src/doc/CHANGES-10.0:1.1.2.185 Sun Jan 14 16:01:50 2024 +++ src/doc/CHANGES-10.0 Sun Jan 14 18:06:46 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.185 2024/01/14 16:01:50 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.186 2024/01/14 18:06:46 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15206,3 +15206,8 @@ distrib/notes/hp300/hardware 1.27 Add three button trackballs (M1309A) to a supported HP-HIL device list. [tsutsui, ticket #551] +sys/arch/vax/vax/machdep.c 1.198 + + vax: set default RLIMIT_AS to the same as MAXDSIZ. + [mrg, ticket #552] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Jan 14 18:06:46 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #552 To generate a diff of this commit: cvs rdiff -u -r1.1.2.185 -r1.1.2.186 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/arch/vax/vax
Module Name:src Committed By: martin Date: Sun Jan 14 18:05:57 UTC 2024 Modified Files: src/sys/arch/vax/vax [netbsd-10]: machdep.c Log Message: Pull up following revision(s) (requested by mrg in ticket #552): sys/arch/vax/vax/machdep.c: revision 1.198 vax: set default RLIMIT_AS to the same as MAXDSIZ this allows modern GCC to run without returning to the issues that reported in PR#28379, and avoids a strange sort-of-invariant violation where the rlimit for data equaled the rlimit for all address space, so there is no room for text or stack etc. ok ragge@ To generate a diff of this commit: cvs rdiff -u -r1.196 -r1.196.20.1 src/sys/arch/vax/vax/machdep.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/arch/vax/vax
Module Name:src
Committed By: martin
Date: Sun Jan 14 18:05:57 UTC 2024
Modified Files:
src/sys/arch/vax/vax [netbsd-10]: machdep.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #552):
sys/arch/vax/vax/machdep.c: revision 1.198
vax: set default RLIMIT_AS to the same as MAXDSIZ
this allows modern GCC to run without returning to the issues that
reported in PR#28379, and avoids a strange sort-of-invariant violation
where the rlimit for data equaled the rlimit for all address space, so
there is no room for text or stack etc.
ok ragge@
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.196.20.1 src/sys/arch/vax/vax/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/vax/vax/machdep.c
diff -u src/sys/arch/vax/vax/machdep.c:1.196 src/sys/arch/vax/vax/machdep.c:1.196.20.1
--- src/sys/arch/vax/vax/machdep.c:1.196 Thu Jun 11 19:20:46 2020
+++ src/sys/arch/vax/vax/machdep.c Sun Jan 14 18:05:57 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.196 2020/06/11 19:20:46 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.196.20.1 2024/01/14 18:05:57 martin Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -83,7 +83,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196 2020/06/11 19:20:46 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.196.20.1 2024/01/14 18:05:57 martin Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -772,6 +772,6 @@ mm_md_readwrite(dev_t dev, struct uio *u
void
machdep_init(void)
{
- proc0.p_rlimit[RLIMIT_AS].rlim_cur = DFLDSIZ;
+ proc0.p_rlimit[RLIMIT_AS].rlim_cur = MAXDSIZ;
proc0.p_rlimit[RLIMIT_AS].rlim_max = MAXDSIZ;
}
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Sun Jan 14 17:51:16 UTC 2024 Modified Files: src/sys/arch/sun2/sun2: clock.c src/sys/arch/sun3/sun3: clock.c src/sys/arch/sun3/sun3x: clock.c src/sys/arch/sun68k/include: intr.h src/sys/arch/sun68k/sun68k: isr.c Log Message: Don't bother with isr_add_custom(). It's just a thin wrapper around vec_set_entry(), so just use vec_set_entry() directly. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun2/sun2/clock.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sun3/sun3/clock.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sun3/sun3x/clock.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun68k/include/intr.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sun68k/sun68k/isr.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/sun2/sun2/clock.c diff -u src/sys/arch/sun2/sun2/clock.c:1.16 src/sys/arch/sun2/sun2/clock.c:1.17 --- src/sys/arch/sun2/sun2/clock.c:1.16 Thu Jan 28 14:10:54 2010 +++ src/sys/arch/sun2/sun2/clock.c Sun Jan 14 17:51:16 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.16 2010/01/28 14:10:54 mbalmer Exp $ */ +/* $NetBSD: clock.c,v 1.17 2024/01/14 17:51:16 thorpej Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -85,7 +85,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.16 2010/01/28 14:10:54 mbalmer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.17 2024/01/14 17:51:16 thorpej Exp $"); #include #include @@ -97,6 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1. #include #include #include +#include #include #include @@ -268,7 +269,7 @@ cpu_initclocks(void) s = splhigh(); /* Install isr (in locore.s) that calls clock_intr(). */ - isr_add_custom(5, (void*)_isr_clock); + vec_set_entry(VECI_INTRAV0 + 5, _isr_clock); /* Now enable the clock at level 5 in the interrupt reg. */ set_clk_mode(0, 1); Index: src/sys/arch/sun3/sun3/clock.c diff -u src/sys/arch/sun3/sun3/clock.c:1.65 src/sys/arch/sun3/sun3/clock.c:1.66 --- src/sys/arch/sun3/sun3/clock.c:1.65 Fri Apr 2 12:11:41 2021 +++ src/sys/arch/sun3/sun3/clock.c Sun Jan 14 17:51:16 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.65 2021/04/02 12:11:41 rin Exp $ */ +/* $NetBSD: clock.c,v 1.66 2024/01/14 17:51:16 thorpej Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.65 2021/04/02 12:11:41 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.66 2024/01/14 17:51:16 thorpej Exp $"); #include #include @@ -99,6 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1. #include #include #include +#include #include #include @@ -274,7 +275,7 @@ cpu_initclocks(void) s = splhigh(); /* Install isr (in locore.s) that calls clock_intr(). */ - isr_add_custom(CLOCK_PRI, (void *)_isr_clock); + vec_set_entry(VECI_INTRAV0 + CLOCK_PRI, (void *)_isr_clock); /* Now enable the clock at level 5 in the interrupt reg. */ set_clk_mode(IREG_CLOCK_ENAB_5, 0, 1); Index: src/sys/arch/sun3/sun3x/clock.c diff -u src/sys/arch/sun3/sun3x/clock.c:1.41 src/sys/arch/sun3/sun3x/clock.c:1.42 --- src/sys/arch/sun3/sun3x/clock.c:1.41 Fri Apr 2 12:11:41 2021 +++ src/sys/arch/sun3/sun3x/clock.c Sun Jan 14 17:51:16 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.41 2021/04/02 12:11:41 rin Exp $ */ +/* $NetBSD: clock.c,v 1.42 2024/01/14 17:51:16 thorpej Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -95,7 +95,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41 2021/04/02 12:11:41 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.42 2024/01/14 17:51:16 thorpej Exp $"); #include #include @@ -112,6 +112,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1. #include #include #include +#include #include #include @@ -387,7 +388,7 @@ cpu_initclocks(void) s = splhigh(); /* Install isr (in locore.s) that calls clock_intr(). */ - isr_add_custom(CLOCK_PRI, (void *)_isr_clock); + vec_set_entry(VECI_INTRAV0 + CLOCK_PRI, (void *)_isr_clock); /* Now enable the clock at level 5 in the interrupt reg. */ set_clk_mode(IREG_CLOCK_ENAB_5, 0, 1); Index: src/sys/arch/sun68k/include/intr.h diff -u src/sys/arch/sun68k/include/intr.h:1.22 src/sys/arch/sun68k/include/intr.h:1.23 --- src/sys/arch/sun68k/include/intr.h:1.22 Fri Jan 12 23:36:30 2024 +++ src/sys/arch/sun68k/include/intr.h Sun Jan 14 17:51:16 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.22 2024/01/12 23:36:30 thorpej Exp $ */ +/* $NetBSD: intr.h,v 1.23 2024/01/14 17:51:16 thorpej Exp $ */ /* * Copyright (c) 2001 Matt Fredette. @@ -94,7 +94,6 @@ splraiseipl(ipl_cookie_t icookie) typedef int (*isr_func_t)(void *); void isr_add_autovect(isr_func_t, void *, int); void isr_add_vectored(isr_func_t, void *, int, int); -void isr_add_custom(int, void *); /* * Define inline functions for PSL manipulation. Index: src/sys/arch/sun68k/sun68k/isr.c diff -u
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Sun Jan 14 17:51:16 UTC 2024 Modified Files: src/sys/arch/sun2/sun2: clock.c src/sys/arch/sun3/sun3: clock.c src/sys/arch/sun3/sun3x: clock.c src/sys/arch/sun68k/include: intr.h src/sys/arch/sun68k/sun68k: isr.c Log Message: Don't bother with isr_add_custom(). It's just a thin wrapper around vec_set_entry(), so just use vec_set_entry() directly. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sun2/sun2/clock.c cvs rdiff -u -r1.65 -r1.66 src/sys/arch/sun3/sun3/clock.c cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sun3/sun3x/clock.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun68k/include/intr.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sun68k/sun68k/isr.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/hexdump
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:40:17 UTC 2024
Modified Files:
src/usr.bin/hexdump: display.c
Log Message:
better check st_size == 0, than st_dev == -1
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/usr.bin/hexdump/display.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/hexdump/display.c
diff -u src/usr.bin/hexdump/display.c:1.26 src/usr.bin/hexdump/display.c:1.27
--- src/usr.bin/hexdump/display.c:1.26 Sun Jan 14 11:42:58 2024
+++ src/usr.bin/hexdump/display.c Sun Jan 14 12:40:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $ */
+/* $NetBSD: display.c,v 1.27 2024/01/14 17:40:17 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $");
+__RCSID("$NetBSD: display.c,v 1.27 2024/01/14 17:40:17 christos Exp $");
#endif
#endif /* not lint */
@@ -365,8 +365,7 @@ doskip(const char *fname, int statok)
if (statok) {
if (fstat(fileno(stdin), ))
err(EXIT_FAILURE, "fstat %s", fname);
- /* kernfs/procfs files have dev_t == -1 */
- if (sb.st_dev != (dev_t)-1 &&
+ if (sb.st_size != 0 &&
S_ISREG(sb.st_mode) && skip >= sb.st_size) {
address += sb.st_size;
skip -= sb.st_size;
CVS commit: src/usr.bin/hexdump
Module Name:src Committed By: christos Date: Sun Jan 14 17:40:17 UTC 2024 Modified Files: src/usr.bin/hexdump: display.c Log Message: better check st_size == 0, than st_dev == -1 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/usr.bin/hexdump/display.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/wc
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:39:19 UTC 2024
Modified Files:
src/usr.bin/wc: wc.c
Log Message:
Better check against st_size == 0 instead of st_dev == -1
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/usr.bin/wc/wc.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/wc/wc.c
diff -u src/usr.bin/wc/wc.c:1.36 src/usr.bin/wc/wc.c:1.37
--- src/usr.bin/wc/wc.c:1.36 Sun Jan 14 12:16:10 2024
+++ src/usr.bin/wc/wc.c Sun Jan 14 12:39:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $ */
+/* $NetBSD: wc.c,v 1.37 2024/01/14 17:39:19 christos Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $");
+__RCSID("$NetBSD: wc.c,v 1.37 2024/01/14 17:39:19 christos Exp $");
#endif
#endif /* not lint */
@@ -239,8 +239,7 @@ cnt(const char *file)
warn("%s", name);
rval = 1;
} else {
-/* st_dev == -1 for kernfs/procfs files */
-if (sb.st_dev != (dev_t)-1 &&
+if (sb.st_size != 0 &&
(S_ISREG(sb.st_mode) ||
S_ISLNK(sb.st_mode) ||
S_ISDIR(sb.st_mode))) {
CVS commit: src/usr.bin/wc
Module Name:src Committed By: christos Date: Sun Jan 14 17:39:19 UTC 2024 Modified Files: src/usr.bin/wc: wc.c Log Message: Better check against st_size == 0 instead of st_dev == -1 To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/usr.bin/wc/wc.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/tail
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:37:32 UTC 2024
Modified Files:
src/usr.bin/tail: forward.c
Log Message:
PR/57850: Ricardo Branco: tail does not work in some pseudo-filesystems
>From FreeBSD: https://github.com/NetBSD/src/pull/20
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/usr.bin/tail/forward.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/tail/forward.c
diff -u src/usr.bin/tail/forward.c:1.33 src/usr.bin/tail/forward.c:1.34
--- src/usr.bin/tail/forward.c:1.33 Fri Oct 9 13:51:26 2015
+++ src/usr.bin/tail/forward.c Sun Jan 14 12:37:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: forward.c,v 1.33 2015/10/09 17:51:26 christos Exp $ */
+/* $NetBSD: forward.c,v 1.34 2024/01/14 17:37:32 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93";
#endif
-__RCSID("$NetBSD: forward.c,v 1.33 2015/10/09 17:51:26 christos Exp $");
+__RCSID("$NetBSD: forward.c,v 1.34 2024/01/14 17:37:32 christos Exp $");
#endif /* not lint */
#include
@@ -96,7 +96,7 @@ forward(FILE *fp, enum STYLE style, off_
case FBYTES:
if (off == 0)
break;
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (sbp->st_size < off)
off = sbp->st_size;
if (fseeko(fp, off, SEEK_SET) == -1) {
@@ -128,7 +128,7 @@ forward(FILE *fp, enum STYLE style, off_
}
break;
case RBYTES:
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (sbp->st_size >= off &&
fseeko(fp, -off, SEEK_END) == -1) {
ierr();
@@ -146,7 +146,7 @@ forward(FILE *fp, enum STYLE style, off_
}
break;
case RLINES:
- if (S_ISREG(sbp->st_mode)) {
+ if (S_ISREG(sbp->st_mode) && sbp->st_size > 0) {
if (!off) {
if (fseek(fp, 0L, SEEK_END) == -1) {
ierr();
CVS commit: src/usr.bin/tail
Module Name:src Committed By: christos Date: Sun Jan 14 17:37:32 UTC 2024 Modified Files: src/usr.bin/tail: forward.c Log Message: PR/57850: Ricardo Branco: tail does not work in some pseudo-filesystems >From FreeBSD: https://github.com/NetBSD/src/pull/20 To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/usr.bin/tail/forward.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/wc
Module Name:src Committed By: christos Date: Sun Jan 14 17:16:10 UTC 2024 Modified Files: src/usr.bin/wc: wc.c Log Message: PR/57854: Richardo Branco: wc -c does not work on procfs/kernfs To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.bin/wc/wc.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/wc
Module Name:src
Committed By: christos
Date: Sun Jan 14 17:16:10 UTC 2024
Modified Files:
src/usr.bin/wc: wc.c
Log Message:
PR/57854: Richardo Branco: wc -c does not work on procfs/kernfs
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.bin/wc/wc.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/wc/wc.c
diff -u src/usr.bin/wc/wc.c:1.35 src/usr.bin/wc/wc.c:1.36
--- src/usr.bin/wc/wc.c:1.35 Fri Sep 16 11:39:30 2011
+++ src/usr.bin/wc/wc.c Sun Jan 14 12:16:10 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wc.c,v 1.35 2011/09/16 15:39:30 joerg Exp $ */
+/* $NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $ */
/*
* Copyright (c) 1980, 1987, 1991, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)wc.c 8.2 (Berkeley) 5/2/95";
#else
-__RCSID("$NetBSD: wc.c,v 1.35 2011/09/16 15:39:30 joerg Exp $");
+__RCSID("$NetBSD: wc.c,v 1.36 2024/01/14 17:16:10 christos Exp $");
#endif
#endif /* not lint */
@@ -239,9 +239,11 @@ cnt(const char *file)
warn("%s", name);
rval = 1;
} else {
-if (S_ISREG(sb.st_mode) ||
+/* st_dev == -1 for kernfs/procfs files */
+if (sb.st_dev != (dev_t)-1 &&
+(S_ISREG(sb.st_mode) ||
S_ISLNK(sb.st_mode) ||
-S_ISDIR(sb.st_mode)) {
+S_ISDIR(sb.st_mode))) {
charct = sb.st_size;
} else {
while ((len =
CVS commit: src/usr.bin/hexdump
Module Name:src
Committed By: christos
Date: Sun Jan 14 16:42:58 UTC 2024
Modified Files:
src/usr.bin/hexdump: display.c
Log Message:
PR/57851: Ricardo Branco: stat(2) does not return correct size information
for kernfs/procfs files. Minor KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/hexdump/display.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/hexdump/display.c
diff -u src/usr.bin/hexdump/display.c:1.25 src/usr.bin/hexdump/display.c:1.26
--- src/usr.bin/hexdump/display.c:1.25 Thu Mar 3 22:02:52 2016
+++ src/usr.bin/hexdump/display.c Sun Jan 14 11:42:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: display.c,v 1.25 2016/03/04 03:02:52 dholland Exp $ */
+/* $NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93";
#else
-__RCSID("$NetBSD: display.c,v 1.25 2016/03/04 03:02:52 dholland Exp $");
+__RCSID("$NetBSD: display.c,v 1.26 2024/01/14 16:42:58 christos Exp $");
#endif
#endif /* not lint */
@@ -256,16 +256,16 @@ get(void)
*/
if (!length || (ateof && !next())) {
if (need == blocksize)
-return(NULL);
+return NULL ;
if (!need && vflag != ALL &&
!memcmp(curp, savp, nread)) {
if (vflag != DUP)
(void)printf("*\n");
-return(NULL);
+return NULL ;
}
memset((char *)curp + nread, 0, need);
eaddress = address + nread;
- return(curp);
+ return curp ;
}
n = fread((char *)curp + nread, sizeof(u_char),
length == -1 ? need : MIN(length, need), stdin);
@@ -283,7 +283,7 @@ get(void)
memcmp(curp, savp, blocksize)) {
if (vflag == DUP || vflag == FIRST)
vflag = WAIT;
-return(curp);
+return curp ;
}
if (vflag == WAIT)
(void)printf("*\n");
@@ -313,9 +313,11 @@ stashargv(char **argv)
* The "done" flag doesn't mean "we are done", it means "we are done
* once we run out of filenames".
*
- * XXX: is there any reason not to remove the logic that inhibits
+ * Is there any reason not to remove the logic that inhibits
* calling fstat if using stdin and not a filename? It should be safe
- * to call fstat on any fd.
+ * to call fstat on any fd. Yes, because on stdin it st_size will not
+ * convey useful information. In addition on kernfs/procfs stat might
+ * not return proper size info.
*
* Note: I have ruled that if there is one file on the command line
* and it doesn't open, we should exit after complaining about it and
@@ -341,7 +343,7 @@ next(void)
statok = 1;
} else {
if (done++)
-return(0);
+return 0 ;
statok = 0;
}
if (skip)
@@ -349,7 +351,7 @@ next(void)
if (*_argv)
++_argv;
if (!skip)
- return(1);
+ return 1 ;
}
/* NOTREACHED */
}
@@ -362,8 +364,10 @@ doskip(const char *fname, int statok)
if (statok) {
if (fstat(fileno(stdin), ))
- err(1, "fstat %s", fname);
- if (S_ISREG(sb.st_mode) && skip >= sb.st_size) {
+ err(EXIT_FAILURE, "fstat %s", fname);
+ /* kernfs/procfs files have dev_t == -1 */
+ if (sb.st_dev != (dev_t)-1 &&
+ S_ISREG(sb.st_mode) && skip >= sb.st_size) {
address += sb.st_size;
skip -= sb.st_size;
return;
CVS commit: src/usr.bin/hexdump
Module Name:src Committed By: christos Date: Sun Jan 14 16:42:58 UTC 2024 Modified Files: src/usr.bin/hexdump: display.c Log Message: PR/57851: Ricardo Branco: stat(2) does not return correct size information for kernfs/procfs files. Minor KNF. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/usr.bin/hexdump/display.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: Sun Jan 14 16:01:51 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #534 - #551 To generate a diff of this commit: cvs rdiff -u -r1.1.2.184 -r1.1.2.185 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.184 src/doc/CHANGES-10.0:1.1.2.185 --- src/doc/CHANGES-10.0:1.1.2.184 Mon Jan 1 14:04:52 2024 +++ src/doc/CHANGES-10.0 Sun Jan 14 16:01:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.184 2024/01/01 14:04:52 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.185 2024/01/14 16:01:50 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15094,3 +15094,115 @@ sys/stand/efiboot/efinet.c 1.9 Move RC2 tag to include this change. [rin, ticket #524] +distrib/sets/lists/base/mi 1.1330 +distrib/sets/lists/man/mi 1.1768 +external/ibm-public/postfix/libexec/postfix-script/Makefile 1.2 +external/ibm-public/postfix/man/man1/Makefile 1.3 + + postfix: install postfix-tls-script (for "postfix tls") + [kim, ticket #534] + +bin/sh/eval.c 1.191 +bin/sh/expand.c 1.144 + + sh(1): PR 57773: fix /bin/sh - expansions involving some + bytes in the range '\201'->'\213' were performed incorrectly. + [kre, ticket #535] + +external/bsd/fetch/dist/libfetch/common.c 1.6 + + fetch(3): enable HTTPS certificate validation, as in pkgsrc + net/libfetch 2.40. + [riastradh, ticket #536] + +usr.sbin/sysinst/arch/atari/md.c 1.11 + + sysinst: fix a typo of a kernel name on detecting a running + machine type. + [tsutsui, ticket #537] + +usr.bin/mklocale/mklocale.1 1.18,1.19 +usr.bin/mklocale/yacc.y1.35,1.36 + + mklocale(1): PR 57798: fix corruption in Rune attributes for + `numerical` characters like U+5146. + [rin, ticket #538] + +distrib/sets/lists/comp/mi 1.2452 +share/man/man9/Makefile1.469 + + Install securelevel.9 as an alias of secmodel_securelevel.9. + [pgoyette, ticket #539] + +sys/net/if_tun.c1.174 + + tun(4): add missing kpreempt_enable() if pktq_enqueue() fails. + [chs, ticket #540] + +sys/dev/pci/ips.c1.7 + + ips(4): fix a couple of device_t/softc split bugs. + [chs, ticket #541] + +sys/dev/pci/cmpci.c1.61 +sys/dev/pci/fms.c1.50 +sys/dev/pci/sv.c1.62 +sys/dev/pci/yds.c1.69 + + mpu / opl: fix attachement of midi child devices. + [chs, ticket #542] + +sys/arch/xen/xen/if_xennet_xenbus.c 1.130 + + xennet(4): PR 57743: disable TX checksum optimization. + [jdolecek, ticket #543] + +lib/libc/inet/inet.31.7 + + inet(3): Fix typo in description of size argument. + [riastradh, ticket #544] + +external/bsd/iscsi/dist/src/lib/protocol.c 1.5 + + libiscsi: PR 57784: fix types of Time2Wait and Time2Retain in + logout decap. + [riastradh, ticket #545] + +tools/gdb/Makefile(apply patch) + + gdb: PR 57841: fix MKCROSSGDB=yes build on gcc>=11. + (this change does not affect -current due to a different gdb version) + [riastradh, ticket #546] + +lib/libm/Makefile1.221 (patch) + + libm: Add fma(3) and friends to m68k + [riastradh, ticket #547] + +sys/arch/i386/stand/efiboot/efidisk.c 1.11 +sys/arch/i386/stand/efiboot/efidisk.h 1.4 +sys/arch/i386/stand/lib/biosdisk.c 1.61 +sys/arch/i386/stand/lib/exec.c 1.80 + + efiboot: fix boot from cd. + [mlelstv, ticket #548] + +sys/dev/usb/ums.c1.105 +sys/dev/usb/usbdevs1.813 +sys/dev/usb/usbdevs.h(regen) +sys/dev/usb/usbdevs_data.h (regen) + + ums(4): PR 57845: add workaround for Microsoft Sculpt Wireless + keyboard/mouse. + [hgutch, ticket #549] + +sys/arch/sun3/conf/GENERIC 1.191,1.192 (patch) + + sun3: fix GENERIC, remove several pseudo-devices to shrink binary size. + [tsutsui, ticket #550] + +distrib/notes/hp300/hardware 1.27 + + Add three button trackballs (M1309A) to a supported HP-HIL device list. + [tsutsui, ticket #551] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Sun Jan 14 16:01:51 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #534 - #551 To generate a diff of this commit: cvs rdiff -u -r1.1.2.184 -r1.1.2.185 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/distrib/notes/hp300
Module Name:src Committed By: martin Date: Sun Jan 14 16:00:09 UTC 2024 Modified Files: src/distrib/notes/hp300 [netbsd-10]: hardware Log Message: Pull up following revision(s) (requested by tsutsui in ticket #551): distrib/notes/hp300/hardware: revision 1.27 Add three button trackballs (M1309A) to a supported HP-HIL device list. Asked by Jonathan Stone on port-hp300@, and tested by me: https://mail-index.netbsd.org/port-hp300/2024/01/14/msg000238.html To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/distrib/notes/hp300/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.26 src/distrib/notes/hp300/hardware:1.26.2.1 --- src/distrib/notes/hp300/hardware:1.26 Sun Jul 11 14:17:48 2021 +++ src/distrib/notes/hp300/hardware Sun Jan 14 16:00:09 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.26 2021/07/11 14:17:48 tsutsui Exp $ +.\" $NetBSD: hardware,v 1.26.2.1 2024/01/14 16:00:09 martin Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -202,6 +202,8 @@ Keyboards .It Two and three button mice .It +Three button trackballs (M1309A) +.It 46094 Quadrature Port (supports normal serial mice) .It Graphics tablets
CVS commit: [netbsd-10] src/distrib/notes/hp300
Module Name:src Committed By: martin Date: Sun Jan 14 16:00:09 UTC 2024 Modified Files: src/distrib/notes/hp300 [netbsd-10]: hardware Log Message: Pull up following revision(s) (requested by tsutsui in ticket #551): distrib/notes/hp300/hardware: revision 1.27 Add three button trackballs (M1309A) to a supported HP-HIL device list. Asked by Jonathan Stone on port-hp300@, and tested by me: https://mail-index.netbsd.org/port-hp300/2024/01/14/msg000238.html To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/distrib/notes/hp300/hardware 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/arch/sun3/conf
Module Name:src Committed By: martin Date: Sun Jan 14 15:58:31 UTC 2024 Modified Files: src/sys/arch/sun3/conf [netbsd-10]: GENERIC Log Message: Pull up following revision(s) (requested by tsutsui in ticket #550): sys/arch/sun3/conf/GENERIC: revision 1.191 sys/arch/sun3/conf/GENERIC: revision 1.192 Revert mistaken "no obmem0" that I added when enabling UFS_DIRHASH. Thanks tsutsui@ for pointing this out. Disable more several pseudo-devices to shrink binary size. My 3/60 fails to boot from a SCSI disk without this change. https://mail-index.netbsd.org/port-sun3/2024/01/13/msg000207.html To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.189.4.1 src/sys/arch/sun3/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/sun3/conf/GENERIC diff -u src/sys/arch/sun3/conf/GENERIC:1.189 src/sys/arch/sun3/conf/GENERIC:1.189.4.1 --- src/sys/arch/sun3/conf/GENERIC:1.189 Thu Sep 29 10:10:10 2022 +++ src/sys/arch/sun3/conf/GENERIC Sun Jan 14 15:58:31 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.189 2022/09/29 10:10:10 riastradh Exp $ +# $NetBSD: GENERIC,v 1.189.4.1 2024/01/14 15:58:31 martin Exp $ # # GENERIC machine description file # @@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.189 $" +#ident "GENERIC-$Revision: 1.189.4.1 $" makeoptions COPTS="-Os -fno-unwind-tables -fno-omit-frame-pointer" # Bootloader has size limit (~2MB). -fno-omit-frame-pointer is @@ -258,7 +258,7 @@ pseudo-device loop # network loopback pseudo-device bpfilter # packet filter #pseudo-device carp # Common Address Redundancy Protocol pseudo-device sl # CSLIP -pseudo-device ppp # PPP +#pseudo-device ppp # PPP #pseudo-device pppoe # PPP over Ethernet (RFC 2516) #pseudo-device tun # network tunneling over tty #pseudo-device tap # virtual Ethernet @@ -267,13 +267,13 @@ pseudo-device ppp # PPP #pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith # IPv[46] tcp relay translation i/f #pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation -pseudo-device vlan # IEEE 802.1q encapsulation +#pseudo-device vlan # IEEE 802.1q encapsulation #pseudo-device bridge # simple inter-network bridging #pseudo-device vether # Virtual Ethernet for bridge #pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device pty # pseudo-terminals -pseudo-device vnd # paging to files +#pseudo-device vnd # paging to files #options VND_COMPRESSION # compressed vnd(4) #pseudo-device ccd # concatenated disks #pseudo-device cgd # cryptographic disk devices @@ -290,9 +290,7 @@ pseudo-device vnd # paging to files #pseudo-device fss # file system snapshot device pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms -pseudo-device swwdog # software watchdog timer -- swwdog(4) +#pseudo-device swwdog # software watchdog timer -- swwdog(4) # Veriexec # include "dev/veriexec.config" - -no obmem0 at mainbus? # XX
CVS commit: [netbsd-10] src/sys/arch/sun3/conf
Module Name:src Committed By: martin Date: Sun Jan 14 15:58:31 UTC 2024 Modified Files: src/sys/arch/sun3/conf [netbsd-10]: GENERIC Log Message: Pull up following revision(s) (requested by tsutsui in ticket #550): sys/arch/sun3/conf/GENERIC: revision 1.191 sys/arch/sun3/conf/GENERIC: revision 1.192 Revert mistaken "no obmem0" that I added when enabling UFS_DIRHASH. Thanks tsutsui@ for pointing this out. Disable more several pseudo-devices to shrink binary size. My 3/60 fails to boot from a SCSI disk without this change. https://mail-index.netbsd.org/port-sun3/2024/01/13/msg000207.html To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.189.4.1 src/sys/arch/sun3/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Jan 14 15:52:26 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: ums.c Log Message: Pull up following revision(s) (requested by hgutch in ticket #549): sys/dev/usb/ums.c: revision 1.105 Add Microsoft Sculpt Wireless keyboard/mouse. >From M. Boerschig in PR 57845. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.103.4.1 src/sys/dev/usb/ums.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/ums.c diff -u src/sys/dev/usb/ums.c:1.103 src/sys/dev/usb/ums.c:1.103.4.1 --- src/sys/dev/usb/ums.c:1.103 Mon Mar 28 12:44:17 2022 +++ src/sys/dev/usb/ums.c Sun Jan 14 15:52:26 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: ums.c,v 1.103 2022/03/28 12:44:17 riastradh Exp $ */ +/* $NetBSD: ums.c,v 1.103.4.1 2024/01/14 15:52:26 martin Exp $ */ /* * Copyright (c) 1998, 2017 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.103 2022/03/28 12:44:17 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.103.4.1 2024/01/14 15:52:26 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -181,6 +181,7 @@ ums_attach(device_t parent, device_t sel fixpos = 24; break; case USB_PRODUCT_MICROSOFT_24GHZ_XCVR80: + case USB_PRODUCT_MICROSOFT_24GHZ_XCVR90: fixpos = 40; woffset = sc->sc_ms.hidms_loc_z.size; break;
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Jan 14 15:52:26 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: ums.c Log Message: Pull up following revision(s) (requested by hgutch in ticket #549): sys/dev/usb/ums.c: revision 1.105 Add Microsoft Sculpt Wireless keyboard/mouse. >From M. Boerschig in PR 57845. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.103.4.1 src/sys/dev/usb/ums.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Jan 14 15:52:12 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: usbdevs.h usbdevs_data.h Log Message: Regen (ticket #549) To generate a diff of this commit: cvs rdiff -u -r1.798.4.1 -r1.798.4.2 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Jan 14 15:51:05 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: usbdevs Log Message: Pull up following revision(s) (requested by hgutch in ticket #549): sys/dev/usb/usbdevs: revision 1.813 Add Microsoft Sculpt Wireless keyboard/mouse. >From M. Boerschig in PR 57845. To generate a diff of this commit: cvs rdiff -u -r1.806.4.1 -r1.806.4.2 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.806.4.1 src/sys/dev/usb/usbdevs:1.806.4.2 --- src/sys/dev/usb/usbdevs:1.806.4.1 Fri Feb 17 17:35:26 2023 +++ src/sys/dev/usb/usbdevs Sun Jan 14 15:51:05 2024 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.806.4.1 2023/02/17 17:35:26 martin Exp $ +$NetBSD: usbdevs,v 1.806.4.2 2024/01/14 15:51:05 martin Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2363,6 +2363,7 @@ product MICROSOFT 24GHZ_XCVR10 0x071d 2 product MICROSOFT 24GHZ_XCVR20 0x071f 2.4GHz Transceiver V2.0 product MICROSOFT 24GHZ_XCVR70 0x0745 2.4GHz Transceiver V7.0 product MICROSOFT 24GHZ_XCVR80 0x07b2 2.4GHz Transceiver V8.0 +product MICROSOFT 24GHZ_XCVR90 0x07a5 2.4GHz Transceiver V9.0 product MICROSOFT CM6000 0x077d Comfort Mouse 6000
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Sun Jan 14 15:51:05 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: usbdevs Log Message: Pull up following revision(s) (requested by hgutch in ticket #549): sys/dev/usb/usbdevs: revision 1.813 Add Microsoft Sculpt Wireless keyboard/mouse. >From M. Boerschig in PR 57845. To generate a diff of this commit: cvs rdiff -u -r1.806.4.1 -r1.806.4.2 src/sys/dev/usb/usbdevs 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/arch/i386/stand
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:46:00 UTC 2024
Modified Files:
src/sys/arch/i386/stand/efiboot [netbsd-10]: efidisk.c efidisk.h
src/sys/arch/i386/stand/lib [netbsd-10]: biosdisk.c exec.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #548):
sys/arch/i386/stand/efiboot/efidisk.h: revision 1.4
sys/arch/i386/stand/lib/exec.c: revision 1.80
sys/arch/i386/stand/efiboot/efidisk.c: revision 1.11
sys/arch/i386/stand/lib/biosdisk.c: revision 1.61
In efiboot
- create bootinfo information only once.
- add fake biosgeom entries so that the kernel can distinguish between
hard drives (with geom) and CD-ROM (without).
To generate a diff of this commit:
cvs rdiff -u -r1.9.26.1 -r1.9.26.2 src/sys/arch/i386/stand/efiboot/efidisk.c
cvs rdiff -u -r1.3 -r1.3.32.1 src/sys/arch/i386/stand/efiboot/efidisk.h
cvs rdiff -u -r1.58.4.1 -r1.58.4.2 src/sys/arch/i386/stand/lib/biosdisk.c
cvs rdiff -u -r1.78.4.1 -r1.78.4.2 src/sys/arch/i386/stand/lib/exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/efiboot/efidisk.c
diff -u src/sys/arch/i386/stand/efiboot/efidisk.c:1.9.26.1 src/sys/arch/i386/stand/efiboot/efidisk.c:1.9.26.2
--- src/sys/arch/i386/stand/efiboot/efidisk.c:1.9.26.1 Fri Nov 3 10:01:13 2023
+++ src/sys/arch/i386/stand/efiboot/efidisk.c Sun Jan 14 15:46:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.c,v 1.9.26.1 2023/11/03 10:01:13 martin Exp $ */
+/* $NetBSD: efidisk.c,v 1.9.26.2 2024/01/14 15:46:00 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -38,9 +38,12 @@
#include "biosdisk_ll.h"
#include "devopen.h"
#include "efidisk.h"
+#include "bootinfo.h"
static struct efidiskinfo_lh efi_disklist;
static int nefidisks;
+static struct btinfo_biosgeom *bibg;
+static size_t bibg_len;
#define MAXDEVNAME 39 /* "NAME=" + 34 char part_name */
@@ -158,6 +161,23 @@ next:
if (edi->bootdev)
boot_biosdev = edi->dev;
}
+
+ bibg_len = sizeof(*bibg) + nefidisks * sizeof(struct bi_biosgeom_entry);
+ bibg = alloc(bibg_len);
+ if (bibg == NULL)
+ return;
+
+ bibg->num = nefidisks;
+
+ i = 0;
+ TAILQ_FOREACH(edi, _disklist, list) {
+ if (edi->type == BIOSDISK_TYPE_HD) {
+ memset(>disk[i], 0, sizeof(bibg->disk[i]));
+ bibg->disk[i].dev = edi->dev;
+ bibg->disk[i].flags = BI_GEOM_INVALID;
+ }
+ ++i;
+ }
}
static void
@@ -383,3 +403,10 @@ efidisk_get_efi_system_partition(int dev
*partition = i;
return 0;
}
+
+void
+efidisk_getbiosgeom()
+{
+ BI_ADD(bibg, BTINFO_BIOSGEOM, bibg_len);
+}
+
Index: src/sys/arch/i386/stand/efiboot/efidisk.h
diff -u src/sys/arch/i386/stand/efiboot/efidisk.h:1.3 src/sys/arch/i386/stand/efiboot/efidisk.h:1.3.32.1
--- src/sys/arch/i386/stand/efiboot/efidisk.h:1.3 Mon Apr 2 09:44:18 2018
+++ src/sys/arch/i386/stand/efiboot/efidisk.h Sun Jan 14 15:46:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: efidisk.h,v 1.3 2018/04/02 09:44:18 nonaka Exp $ */
+/* $NetBSD: efidisk.h,v 1.3.32.1 2024/01/14 15:46:00 martin Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -41,3 +41,4 @@ TAILQ_HEAD(efidiskinfo_lh, efidiskinfo);
const struct efidiskinfo *efidisk_getinfo(int);
int efidisk_get_efi_system_partition(int, int *);
+void efidisk_getbiosgeom(void);
Index: src/sys/arch/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.58.4.1 src/sys/arch/i386/stand/lib/biosdisk.c:1.58.4.2
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.58.4.1 Wed Oct 18 11:44:22 2023
+++ src/sys/arch/i386/stand/lib/biosdisk.c Sun Jan 14 15:46:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.58.4.1 2023/10/18 11:44:22 martin Exp $ */
+/* $NetBSD: biosdisk.c,v 1.58.4.2 2024/01/14 15:46:00 martin Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -1198,11 +1198,13 @@ out:
static void
add_biosdisk_bootinfo(void)
{
+#ifndef EFIBOOT
if (bootinfo == NULL) {
return;
}
BI_ADD(_disk, BTINFO_BOOTDISK, sizeof(bi_disk));
BI_ADD(_wedge, BTINFO_BOOTWEDGE, sizeof(bi_wedge));
+#endif
return;
}
#endif
Index: src/sys/arch/i386/stand/lib/exec.c
diff -u src/sys/arch/i386/stand/lib/exec.c:1.78.4.1 src/sys/arch/i386/stand/lib/exec.c:1.78.4.2
--- src/sys/arch/i386/stand/lib/exec.c:1.78.4.1 Sat May 13 13:26:57 2023
+++ src/sys/arch/i386/stand/lib/exec.c Sun Jan 14 15:46:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.78.4.1 2023/05/13 13:26:57 martin Exp $ */
+/* $NetBSD: exec.c,v 1.78.4.2 2024/01/14 15:46:00 martin Exp $ */
/*
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -108,6 +108,8 @@
#endif
#ifdef EFIBOOT
#include "efiboot.h"
+#include "biosdisk.h"
+#include "efidisk.h"
#undef DEBUG /* XXX */
#endif
@@ -498,6 +500,10 @@ exec_netbsd(const char *file, physaddr_t
goto out;
}
#ifdef EFIBOOT
+ BI_ADD(_disk, BTINFO_BOOTDISK, sizeof(bi_disk));
+ BI_ADD(_wedge, BTINFO_BOOTWEDGE, sizeof(bi_wedge));
+ efidisk_getbiosgeom();
+
CVS commit: [netbsd-10] src/sys/arch/i386/stand
Module Name:src Committed By: martin Date: Sun Jan 14 15:46:00 UTC 2024 Modified Files: src/sys/arch/i386/stand/efiboot [netbsd-10]: efidisk.c efidisk.h src/sys/arch/i386/stand/lib [netbsd-10]: biosdisk.c exec.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #548): sys/arch/i386/stand/efiboot/efidisk.h: revision 1.4 sys/arch/i386/stand/lib/exec.c: revision 1.80 sys/arch/i386/stand/efiboot/efidisk.c: revision 1.11 sys/arch/i386/stand/lib/biosdisk.c: revision 1.61 In efiboot - create bootinfo information only once. - add fake biosgeom entries so that the kernel can distinguish between hard drives (with geom) and CD-ROM (without). To generate a diff of this commit: cvs rdiff -u -r1.9.26.1 -r1.9.26.2 src/sys/arch/i386/stand/efiboot/efidisk.c cvs rdiff -u -r1.3 -r1.3.32.1 src/sys/arch/i386/stand/efiboot/efidisk.h cvs rdiff -u -r1.58.4.1 -r1.58.4.2 src/sys/arch/i386/stand/lib/biosdisk.c cvs rdiff -u -r1.78.4.1 -r1.78.4.2 src/sys/arch/i386/stand/lib/exec.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/lib/libm
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:43:45 UTC 2024
Modified Files:
src/lib/libm [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #547):
lib/libm/Makefile: revision 1.221 (patch)
libm: Add fma(3) and friends to m68k
To generate a diff of this commit:
cvs rdiff -u -r1.218.2.3 -r1.218.2.4 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.218.2.3 src/lib/libm/Makefile:1.218.2.4
--- src/lib/libm/Makefile:1.218.2.3 Sun Dec 31 12:41:02 2023
+++ src/lib/libm/Makefile Sun Jan 14 15:43:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218.2.3 2023/12/31 12:41:02 martin Exp $
+# $NetBSD: Makefile,v 1.218.2.4 2024/01/14 15:43:45 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -160,6 +160,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S
s_log1p.S s_logb.S s_rint.S s_scalbn.S s_sin.S s_tan.S s_tanh.S
COMMON_SRCS += fenv.c s_nexttoward.c s_rintl.c
.endif
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
# end of m68k
.elif (${LIBC_MACHINE_ARCH} == "vax")
CVS commit: [netbsd-10] src/lib/libm
Module Name:src Committed By: martin Date: Sun Jan 14 15:43:45 UTC 2024 Modified Files: src/lib/libm [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by riastradh in ticket #547): lib/libm/Makefile: revision 1.221 (patch) libm: Add fma(3) and friends to m68k To generate a diff of this commit: cvs rdiff -u -r1.218.2.3 -r1.218.2.4 src/lib/libm/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/tools/gdb
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:39:08 UTC 2024
Modified Files:
src/tools/gdb [netbsd-10]: Makefile
Log Message:
Apply patch, requested by riastradh in ticket #546:
tools/gdb/Makefile (apply patch)
gdb: Fix MKCROSSGDB=yes build on gcc>=11, which raises several
warnings that are fatal because the development snapshot of gdb
that netbsd-10 is about to ship with sets -Werror. This addresses
PR misc/57841.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.6.1 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.40 src/tools/gdb/Makefile:1.40.6.1
--- src/tools/gdb/Makefile:1.40 Thu Sep 24 14:53:17 2020
+++ src/tools/gdb/Makefile Sun Jan 14 15:39:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/09/24 14:53:17 christos Exp $
+# $NetBSD: Makefile,v 1.40.6.1 2024/01/14 15:39:08 martin Exp $
.include
@@ -10,7 +10,7 @@ FIND_ARGS= \! \( -type d -name sim -prun
CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} --disable-nls \
--program-transform-name="s,^,${MACHINE_GNU_PLATFORM}-," \
- --without-mpfr
+ --without-mpfr --disable-werror
MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q}
CVS commit: [netbsd-10] src/tools/gdb
Module Name:src Committed By: martin Date: Sun Jan 14 15:39:08 UTC 2024 Modified Files: src/tools/gdb [netbsd-10]: Makefile Log Message: Apply patch, requested by riastradh in ticket #546: tools/gdb/Makefile (apply patch) gdb: Fix MKCROSSGDB=yes build on gcc>=11, which raises several warnings that are fatal because the development snapshot of gdb that netbsd-10 is about to ship with sets -Werror. This addresses PR misc/57841. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.6.1 src/tools/gdb/Makefile 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: Sun Jan 14 15:36:10 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1930 To generate a diff of this commit: cvs rdiff -u -r1.1.2.216 -r1.1.2.217 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.216 src/doc/CHANGES-8.3:1.1.2.217 --- src/doc/CHANGES-8.3:1.1.2.216 Mon Jan 1 11:40:17 2024 +++ src/doc/CHANGES-8.3 Sun Jan 14 15:36:10 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-8.3,v 1.1.2.216 2024/01/01 11:40:17 martin Exp $ +$NetBSD: CHANGES-8.3,v 1.1.2.217 2024/01/14 15:36:10 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -4186,3 +4186,9 @@ sys/conf/copyright1.22 Update copyright notice for 2024. [hgutch, ticket #1929] +external/bsd/iscsi/dist/src/lib/protocol.c 1.5 + + libiscsi: PR 57784: fix types of Time2Wait and Time2Retain in + logout decap. + [riastradh, ticket #1930] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Sun Jan 14 15:36:10 UTC 2024 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1930 To generate a diff of this commit: cvs rdiff -u -r1.1.2.216 -r1.1.2.217 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/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:34:58 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-8]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1930): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.24.1 src/external/bsd/iscsi/dist/src/lib/protocol.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/bsd/iscsi/dist/src/lib/protocol.c diff -u src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4.24.1 --- src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 Sat Sep 29 07:18:21 2012 +++ src/external/bsd/iscsi/dist/src/lib/protocol.c Sun Jan 14 15:34:58 2024 @@ -920,8 +920,8 @@ iscsi_logout_rsp_decap(uint8_t *header, rsp->StatSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 24))); /* StatSN */ rsp->ExpCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 28))); /* ExpCmdSN */ rsp->MaxCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 32))); /* MaxCmdSN */ - rsp->Time2Wait = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 40))); /* Time2Wait */ - rsp->Time2Retain = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 42))); /* Time2Retain */ + rsp->Time2Wait = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 40))); /* Time2Wait */ + rsp->Time2Retain = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 42))); /* Time2Retain */ errmsg = NULL; (void) memset(zeros, 0x0, sizeof(zeros));
CVS commit: [netbsd-8] src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:34:58 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-8]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1930): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.24.1 src/external/bsd/iscsi/dist/src/lib/protocol.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: Sun Jan 14 15:34:17 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1786 - #1789 To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 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.125 src/doc/CHANGES-9.4:1.1.2.126 --- src/doc/CHANGES-9.4:1.1.2.125 Mon Jan 1 11:38:06 2024 +++ src/doc/CHANGES-9.4 Sun Jan 14 15:34:17 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.4,v 1.1.2.125 2024/01/01 11:38:06 martin Exp $ +# $NetBSD: CHANGES-9.4,v 1.1.2.126 2024/01/14 15:34:17 martin Exp $ A complete list of changes from the NetBSD 9.3 release to the NetBSD 9.4 release: @@ -4043,3 +4043,29 @@ sys/conf/copyright1.22 Update copyright notice for 2024. [hgutch, ticket #1785] +distrib/sets/lists/base/mi 1.1330 +distrib/sets/lists/man/mi 1.1768 +external/ibm-public/postfix/libexec/postfix-script/Makefile 1.2 +external/ibm-public/postfix/man/man1/Makefile 1.3 + + postfix: install postfix-tls-script (for "postfix tls") + [kim, ticket #1786] + +bin/sh/eval.c 1.191 +bin/sh/expand.c 1.144 + + sh(1): PR 57773: fix /bin/sh - expansions involving some + bytes in the range '\201'->'\213' were performed incorrectly. + [kre, ticket #1787] + +lib/libc/inet/inet.31.7 + + inet(3): Fix typo in description of size argument. + [riastradh, ticket #1788] + +external/bsd/iscsi/dist/src/lib/protocol.c 1.5 + + libiscsi: PR 57784: fix types of Time2Wait and Time2Retain in + logout decap. + [riastradh, ticket #1789] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Jan 14 15:34:17 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.4 Log Message: Tickets #1786 - #1789 To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 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/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:31:53 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-9]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1789): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.34.1 src/external/bsd/iscsi/dist/src/lib/protocol.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/bsd/iscsi/dist/src/lib/protocol.c diff -u src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4.34.1 --- src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 Sat Sep 29 07:18:21 2012 +++ src/external/bsd/iscsi/dist/src/lib/protocol.c Sun Jan 14 15:31:53 2024 @@ -920,8 +920,8 @@ iscsi_logout_rsp_decap(uint8_t *header, rsp->StatSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 24))); /* StatSN */ rsp->ExpCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 28))); /* ExpCmdSN */ rsp->MaxCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 32))); /* MaxCmdSN */ - rsp->Time2Wait = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 40))); /* Time2Wait */ - rsp->Time2Retain = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 42))); /* Time2Retain */ + rsp->Time2Wait = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 40))); /* Time2Wait */ + rsp->Time2Retain = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 42))); /* Time2Retain */ errmsg = NULL; (void) memset(zeros, 0x0, sizeof(zeros));
CVS commit: [netbsd-9] src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:31:53 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-9]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #1789): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.34.1 src/external/bsd/iscsi/dist/src/lib/protocol.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/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:30:45 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-10]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #545): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.42.1 src/external/bsd/iscsi/dist/src/lib/protocol.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/bsd/iscsi/dist/src/lib/protocol.c diff -u src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4.42.1 --- src/external/bsd/iscsi/dist/src/lib/protocol.c:1.4 Sat Sep 29 07:18:21 2012 +++ src/external/bsd/iscsi/dist/src/lib/protocol.c Sun Jan 14 15:30:45 2024 @@ -920,8 +920,8 @@ iscsi_logout_rsp_decap(uint8_t *header, rsp->StatSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 24))); /* StatSN */ rsp->ExpCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 28))); /* ExpCmdSN */ rsp->MaxCmdSN = ISCSI_NTOHL(*((uint32_t *) (void *) (header + 32))); /* MaxCmdSN */ - rsp->Time2Wait = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 40))); /* Time2Wait */ - rsp->Time2Retain = ISCSI_NTOHS(*((uint32_t *) (void *) (header + 42))); /* Time2Retain */ + rsp->Time2Wait = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 40))); /* Time2Wait */ + rsp->Time2Retain = ISCSI_NTOHS(*((uint16_t *) (void *) (header + 42))); /* Time2Retain */ errmsg = NULL; (void) memset(zeros, 0x0, sizeof(zeros));
CVS commit: [netbsd-10] src/external/bsd/iscsi/dist/src/lib
Module Name:src Committed By: martin Date: Sun Jan 14 15:30:45 UTC 2024 Modified Files: src/external/bsd/iscsi/dist/src/lib [netbsd-10]: protocol.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #545): external/bsd/iscsi/dist/src/lib/protocol.c: revision 1.5 libiscsi: Fix types of Time2Wait and Time2Retain in logout decap. According to https://www.rfc-editor.org/rfc/rfc7143#section-11.15, these are both 2-byte quantities. Loading 4-byte quantities and passing them through ISCSI_NTOHS might have worked by accident on x86, but it's not gonna fly on big-endian. (Fortunately sparc64 is not just big-endian but also strict-alignment so it caught this problem!) XXX Is there an upstream for this code? doc/3RDPARTY doesn't cite any easily-followed references. PR port-sparc64/57784 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.42.1 src/external/bsd/iscsi/dist/src/lib/protocol.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/lib/libc/inet
Module Name:src Committed By: martin Date: Sun Jan 14 15:28:27 UTC 2024 Modified Files: src/lib/libc/inet [netbsd-9]: inet.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #1788): lib/libc/inet/inet.3: revision 1.7 inet(3): Fix typo in description of size argument. This is the size of dst, not of src. The size of src is determined by the address family. Fix markup while here: .Fa for function arguments, not .Ar which is for command arguments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.34.1 src/lib/libc/inet/inet.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet.3 diff -u src/lib/libc/inet/inet.3:1.5 src/lib/libc/inet/inet.3:1.5.34.1 --- src/lib/libc/inet/inet.3:1.5 Wed Jul 25 14:51:15 2012 +++ src/lib/libc/inet/inet.3 Sun Jan 14 15:28:27 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: inet.3,v 1.5 2012/07/25 14:51:15 ginsbach Exp $ +.\" $NetBSD: inet.3,v 1.5.34.1 2024/01/14 15:28:27 martin Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -120,10 +120,19 @@ It returns NULL if a system error occurs .Va errno will have been set), or it returns a pointer to the destination string. The -.Ar size +.Fa size parameter is the size of the -.Ar buf -argument. +.Fa dst +buffer. +For +.Dv AF_INET , +this must have space for +.Dv INET_ADDRSTRLEN Pq 16 +bytes; for +.Dv AF_INET6 , +this must have space for +.Dv INET6_ADDRSTRLEN Pq 46 +bytes. .Pp The routine .Fn inet_ntoa
CVS commit: [netbsd-9] src/lib/libc/inet
Module Name:src Committed By: martin Date: Sun Jan 14 15:28:27 UTC 2024 Modified Files: src/lib/libc/inet [netbsd-9]: inet.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #1788): lib/libc/inet/inet.3: revision 1.7 inet(3): Fix typo in description of size argument. This is the size of dst, not of src. The size of src is determined by the address family. Fix markup while here: .Fa for function arguments, not .Ar which is for command arguments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.5.34.1 src/lib/libc/inet/inet.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/lib/libc/inet
Module Name:src Committed By: martin Date: Sun Jan 14 15:27:23 UTC 2024 Modified Files: src/lib/libc/inet [netbsd-10]: inet.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #544): lib/libc/inet/inet.3: revision 1.7 inet(3): Fix typo in description of size argument. This is the size of dst, not of src. The size of src is determined by the address family. Fix markup while here: .Fa for function arguments, not .Ar which is for command arguments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.2.1 src/lib/libc/inet/inet.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/inet/inet.3 diff -u src/lib/libc/inet/inet.3:1.6 src/lib/libc/inet/inet.3:1.6.2.1 --- src/lib/libc/inet/inet.3:1.6 Sun Dec 4 01:29:32 2022 +++ src/lib/libc/inet/inet.3 Sun Jan 14 15:27:23 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: inet.3,v 1.6 2022/12/04 01:29:32 uwe Exp $ +.\" $NetBSD: inet.3,v 1.6.2.1 2024/01/14 15:27:23 martin Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -120,10 +120,19 @@ It returns NULL if a system error occurs .Va errno will have been set), or it returns a pointer to the destination string. The -.Ar size +.Fa size parameter is the size of the -.Ar buf -argument. +.Fa dst +buffer. +For +.Dv AF_INET , +this must have space for +.Dv INET_ADDRSTRLEN Pq 16 +bytes; for +.Dv AF_INET6 , +this must have space for +.Dv INET6_ADDRSTRLEN Pq 46 +bytes. .Pp The routine .Fn inet_ntoa
CVS commit: [netbsd-10] src/lib/libc/inet
Module Name:src Committed By: martin Date: Sun Jan 14 15:27:23 UTC 2024 Modified Files: src/lib/libc/inet [netbsd-10]: inet.3 Log Message: Pull up following revision(s) (requested by riastradh in ticket #544): lib/libc/inet/inet.3: revision 1.7 inet(3): Fix typo in description of size argument. This is the size of dst, not of src. The size of src is determined by the address family. Fix markup while here: .Fa for function arguments, not .Ar which is for command arguments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.2.1 src/lib/libc/inet/inet.3 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/arch/xen/xen
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:25:54 UTC 2024
Modified Files:
src/sys/arch/xen/xen [netbsd-10]: if_xennet_xenbus.c
Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #543):
sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.130
disable TX checksum optimization, it's causing ARP lossage in some
configurations using Linux dom0
PR port-xen/57743 by Brian Marcotte, thanks for the patch
To generate a diff of this commit:
cvs rdiff -u -r1.128.20.1 -r1.128.20.2 \
src/sys/arch/xen/xen/if_xennet_xenbus.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/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.128.20.1 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.128.20.2
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.128.20.1 Mon Jul 31 15:23:02 2023
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Sun Jan 14 15:25:54 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.128.20.1 2023/07/31 15:23:02 martin Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.128.20.2 2024/01/14 15:25:54 martin Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.128.20.1 2023/07/31 15:23:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.128.20.2 2024/01/14 15:25:54 martin Exp $");
#include "opt_xen.h"
#include "opt_nfs_boot.h"
@@ -1122,7 +1122,13 @@ xennet_submit_tx_request(struct xennet_x
if (m->m_pkthdr.csum_flags & XN_M_CSUM_SUPPORTED) {
txreq->flags |= NETTXF_csum_blank;
} else {
+#if 0
+/*
+ * XXX Checksum optimization disabled
+ * to avoid port-xen/57743.
+ */
txreq->flags |= NETTXF_data_validated;
+#endif
}
}
if (multiseg && i < lastseg)
CVS commit: [netbsd-10] src/sys/arch/xen/xen
Module Name:src Committed By: martin Date: Sun Jan 14 15:25:54 UTC 2024 Modified Files: src/sys/arch/xen/xen [netbsd-10]: if_xennet_xenbus.c Log Message: Pull up following revision(s) (requested by jdolecek in ticket #543): sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.130 disable TX checksum optimization, it's causing ARP lossage in some configurations using Linux dom0 PR port-xen/57743 by Brian Marcotte, thanks for the patch To generate a diff of this commit: cvs rdiff -u -r1.128.20.1 -r1.128.20.2 \ src/sys/arch/xen/xen/if_xennet_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Jan 14 15:24:06 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: cmpci.c fms.c sv.c yds.c Log Message: Pull up following revision(s) (requested by chs in ticket #542): sys/dev/pci/yds.c: revision 1.69 sys/dev/pci/cmpci.c: revision 1.61 sys/dev/pci/sv.c: revision 1.62 sys/dev/pci/fms.c: revision 1.50 mpu / opl: add an interface attribute to config_found() calls for these specify an interface attribute when attaching mpu and opl devices. the PCI devices that are the parents of these midi devices (cmpci, eso, fms, sv, yds) have two interface attributes: "audiobus", and also one named the same as the parent device, eg. "cmpci" has an interface attribute named "cmpci". we must specify the latter one to attach these children. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/dev/pci/cmpci.c cvs rdiff -u -r1.49 -r1.49.6.1 src/sys/dev/pci/fms.c cvs rdiff -u -r1.61 -r1.61.6.1 src/sys/dev/pci/sv.c cvs rdiff -u -r1.68 -r1.68.6.1 src/sys/dev/pci/yds.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Jan 14 15:24:06 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: cmpci.c fms.c sv.c yds.c Log Message: Pull up following revision(s) (requested by chs in ticket #542): sys/dev/pci/yds.c: revision 1.69 sys/dev/pci/cmpci.c: revision 1.61 sys/dev/pci/sv.c: revision 1.62 sys/dev/pci/fms.c: revision 1.50 mpu / opl: add an interface attribute to config_found() calls for these specify an interface attribute when attaching mpu and opl devices. the PCI devices that are the parents of these midi devices (cmpci, eso, fms, sv, yds) have two interface attributes: "audiobus", and also one named the same as the parent device, eg. "cmpci" has an interface attribute named "cmpci". we must specify the latter one to attach these children. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.60.4.1 src/sys/dev/pci/cmpci.c cvs rdiff -u -r1.49 -r1.49.6.1 src/sys/dev/pci/fms.c cvs rdiff -u -r1.61 -r1.61.6.1 src/sys/dev/pci/sv.c cvs rdiff -u -r1.68 -r1.68.6.1 src/sys/dev/pci/yds.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/cmpci.c diff -u src/sys/dev/pci/cmpci.c:1.60 src/sys/dev/pci/cmpci.c:1.60.4.1 --- src/sys/dev/pci/cmpci.c:1.60 Tue May 31 08:43:15 2022 +++ src/sys/dev/pci/cmpci.c Sun Jan 14 15:24:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cmpci.c,v 1.60 2022/05/31 08:43:15 andvar Exp $ */ +/* $NetBSD: cmpci.c,v 1.60.4.1 2024/01/14 15:24:06 martin Exp $ */ /* * Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.60 2022/05/31 08:43:15 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.60.4.1 2024/01/14 15:24:06 martin Exp $"); #if defined(AUDIO_DEBUG) || defined(DEBUG) #define DPRINTF(x) if (cmpcidebug) printf x @@ -419,7 +419,7 @@ cmpci_attach(device_t parent, device_t s aa.type = AUDIODEV_TYPE_OPL; aa.hwif = NULL; aa.hdl = NULL; - (void)config_found(sc->sc_dev, , audioprint, CFARGS_NONE); + (void)config_found(sc->sc_dev, , audioprint, CFARGS(.iattr = "cmpci")); /* attach MPU-401 device */ aa.type = AUDIODEV_TYPE_MPU; @@ -428,7 +428,7 @@ cmpci_attach(device_t parent, device_t s if (bus_space_subregion(sc->sc_iot, sc->sc_ioh, CMPCI_REG_MPU_BASE, CMPCI_REG_MPU_SIZE, >sc_mpu_ioh) == 0) sc->sc_mpudev = config_found(sc->sc_dev, , audioprint, - CFARGS_NONE); + CFARGS(.iattr = "cmpci")); /* get initial value (this is 0 and may be omitted but just in case) */ sc->sc_reg_misc = bus_space_read_4(sc->sc_iot, sc->sc_ioh, Index: src/sys/dev/pci/fms.c diff -u src/sys/dev/pci/fms.c:1.49 src/sys/dev/pci/fms.c:1.49.6.1 --- src/sys/dev/pci/fms.c:1.49 Sat Aug 7 16:19:14 2021 +++ src/sys/dev/pci/fms.c Sun Jan 14 15:24:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: fms.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $ */ +/* $NetBSD: fms.c,v 1.49.6.1 2024/01/14 15:24:06 martin Exp $ */ /*- * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.49 2021/08/07 16:19:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.49.6.1 2024/01/14 15:24:06 martin Exp $"); #include "mpu.h" @@ -325,12 +325,13 @@ fms_attach(device_t parent, device_t sel aa.type = AUDIODEV_TYPE_OPL; aa.hwif = NULL; aa.hdl = NULL; - config_found(sc->sc_dev, , audioprint, CFARGS_NONE); + config_found(sc->sc_dev, , audioprint, CFARGS(.iattr = "fms")); aa.type = AUDIODEV_TYPE_MPU; aa.hwif = NULL; aa.hdl = NULL; - sc->sc_mpu_dev = config_found(sc->sc_dev, , audioprint, CFARGS_NONE); + sc->sc_mpu_dev = config_found(sc->sc_dev, , audioprint, + CFARGS(.iattr = "fms")); } /* Index: src/sys/dev/pci/sv.c diff -u src/sys/dev/pci/sv.c:1.61 src/sys/dev/pci/sv.c:1.61.6.1 --- src/sys/dev/pci/sv.c:1.61 Sat Aug 7 16:19:14 2021 +++ src/sys/dev/pci/sv.c Sun Jan 14 15:24:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sv.c,v 1.61 2021/08/07 16:19:14 thorpej Exp $ */ +/* $NetBSD: sv.c,v 1.61.6.1 2024/01/14 15:24:06 martin Exp $ */ /* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */ /* @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.61 2021/08/07 16:19:14 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.61.6.1 2024/01/14 15:24:06 martin Exp $"); #include #include @@ -449,7 +449,7 @@ sv_attach(device_t parent, device_t self arg.type = AUDIODEV_TYPE_OPL; arg.hwif = 0; arg.hdl = 0; - (void)config_found(self, , audioprint, CFARGS_NONE); + (void)config_found(self, , audioprint, CFARGS(.iattr = "sv")); sc->sc_pa = *pa; /* for deferred setup */ config_defer(self, sv_defer); Index: src/sys/dev/pci/yds.c diff -u src/sys/dev/pci/yds.c:1.68 src/sys/dev/pci/yds.c:1.68.6.1 --- src/sys/dev/pci/yds.c:1.68 Sat Aug 7 16:19:14 2021 +++ src/sys/dev/pci/yds.c Sun Jan 14 15:24:06 2024 @@ -1,4 +1,4 @@
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:20:19 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-10]: ips.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #541):
sys/dev/pci/ips.c: revision 1.7
ips: fix a couple more device_t/softc split bugs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/pci/ips.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/ips.c
diff -u src/sys/dev/pci/ips.c:1.6 src/sys/dev/pci/ips.c:1.6.4.1
--- src/sys/dev/pci/ips.c:1.6 Sat Feb 12 02:58:50 2022
+++ src/sys/dev/pci/ips.c Sun Jan 14 15:20:19 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ips.c,v 1.6 2022/02/12 02:58:50 riastradh Exp $ */
+/* $NetBSD: ips.c,v 1.6.4.1 2024/01/14 15:20:19 martin Exp $ */
/* $OpenBSD: ips.c,v 1.113 2016/08/14 04:08:03 dlg Exp $ */
/*-
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ips.c,v 1.6 2022/02/12 02:58:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ips.c,v 1.6.4.1 2024/01/14 15:20:19 martin Exp $");
#include "bio.h"
@@ -458,7 +458,7 @@ struct ips_softc {
};
int ips_match(device_t, cfdata_t, void *);
-void ips_attach(struct device *, struct device *, void *);
+void ips_attach(device_t, device_t, void *);
void ips_scsi_cmd(struct ips_ccb *);
void ips_scsi_pt_cmd(struct scsipi_xfer *);
@@ -617,9 +617,9 @@ ips_match(device_t parent, cfdata_t cfda
}
void
-ips_attach(struct device *parent, struct device *self, void *aux)
+ips_attach(device_t parent, device_t self, void *aux)
{
- struct ips_softc *sc = (struct ips_softc *)self;
+ struct ips_softc *sc = device_private(self);
struct pci_attach_args *pa = aux;
struct ips_ccb ccb0;
struct ips_adapterinfo *ai;
@@ -1042,7 +1042,7 @@ ips_scsi_ioctl(struct scsipi_channel *ch
int
ips_ioctl(device_t dev, u_long cmd, void *data)
{
- struct ips_softc *sc = (struct ips_softc *)dev;
+ struct ips_softc *sc = device_private(dev);
DPRINTF(IPS_D_INFO, ("%s: ips_ioctl: cmd %lu\n",
device_xname(sc->sc_dev), cmd));
@@ -1086,7 +1086,7 @@ ips_ioctl_vol(struct ips_softc *sc, stru
struct ips_rblstat *rblstat = >sc_info->rblstat;
struct ips_ld *ld;
int vid = bv->bv_volid;
- struct device *dv;
+ device_t dv;
int error, rebuild = 0;
u_int32_t total = 0, done = 0;
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sun Jan 14 15:20:19 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: ips.c Log Message: Pull up following revision(s) (requested by chs in ticket #541): sys/dev/pci/ips.c: revision 1.7 ips: fix a couple more device_t/softc split bugs To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/pci/ips.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
Module Name:src Committed By: martin Date: Sun Jan 14 15:18:37 UTC 2024 Modified Files: src/sys/net [netbsd-10]: if_tun.c Log Message: Pull up following revision(s) (requested by chs in ticket #540): sys/net/if_tun.c: revision 1.174 tun: add missing kpreempt_enable() if pktq_enqueue() fails To generate a diff of this commit: cvs rdiff -u -r1.173 -r1.173.4.1 src/sys/net/if_tun.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
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:18:37 UTC 2024
Modified Files:
src/sys/net [netbsd-10]: if_tun.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #540):
sys/net/if_tun.c: revision 1.174
tun: add missing kpreempt_enable() if pktq_enqueue() fails
To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.173.4.1 src/sys/net/if_tun.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/if_tun.c
diff -u src/sys/net/if_tun.c:1.173 src/sys/net/if_tun.c:1.173.4.1
--- src/sys/net/if_tun.c:1.173 Mon Mar 28 12:33:22 2022
+++ src/sys/net/if_tun.c Sun Jan 14 15:18:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tun.c,v 1.173 2022/03/28 12:33:22 riastradh Exp $ */
+/* $NetBSD: if_tun.c,v 1.173.4.1 2024/01/14 15:18:37 martin Exp $ */
/*
* Copyright (c) 1988, Julian Onions
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.173 2022/03/28 12:33:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tun.c,v 1.173.4.1 2024/01/14 15:18:37 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -982,6 +982,7 @@ tunwrite(dev_t dev, struct uio *uio, int
}
kpreempt_disable();
if (__predict_false(!pktq_enqueue(pktq, top, 0))) {
+ kpreempt_enable();
if_statinc(ifp, if_collisions);
mutex_exit(>tun_lock);
error = ENOBUFS;
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Jan 14 15:17:12 UTC 2024 Modified Files: src/distrib/sets/lists/comp [netbsd-10]: mi src/share/man/man9 [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by pgoyette in ticket #539): distrib/sets/lists/comp/mi: revision 1.2452 share/man/man9/Makefile: revision 1.469 Install securelevel.9 as an alias of secmodel_securelevel.9 According to submitter, this should be sufficient to address misc/57824. To generate a diff of this commit: cvs rdiff -u -r1.2425.2.2 -r1.2425.2.3 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.465 -r1.465.2.1 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2425.2.2 src/distrib/sets/lists/comp/mi:1.2425.2.3 --- src/distrib/sets/lists/comp/mi:1.2425.2.2 Tue Sep 5 17:11:34 2023 +++ src/distrib/sets/lists/comp/mi Sun Jan 14 15:17:11 2024 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2425.2.2 2023/09/05 17:11:34 martin Exp $ +# $NetBSD: mi,v 1.2425.2.3 2024/01/14 15:17:11 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -12600,6 +12600,7 @@ ./usr/share/man/cat9/secmodel_register.0 comp-sys-catman .cat ./usr/share/man/cat9/secmodel_securelevel.0 comp-sys-catman .cat ./usr/share/man/cat9/secmodel_suser.0 comp-sys-catman .cat +./usr/share/man/cat9/securelevel.0 comp-sys-catman .cat ./usr/share/man/cat9/seldestroy.0 comp-sys-catman .cat ./usr/share/man/cat9/select.0 comp-sys-catman .cat ./usr/share/man/cat9/selinit.0 comp-sys-catman .cat @@ -20926,6 +20927,7 @@ ./usr/share/man/html9/secmodel_register.html comp-sys-htmlman html ./usr/share/man/html9/secmodel_securelevel.html comp-sys-htmlman html ./usr/share/man/html9/secmodel_suser.html comp-sys-htmlman html +./usr/share/man/html9/securelevel.html comp-sys-htmlman html ./usr/share/man/html9/seldestroy.html comp-sys-htmlman html ./usr/share/man/html9/select.html comp-sys-htmlman html ./usr/share/man/html9/selinit.html comp-sys-htmlman html @@ -29441,6 +29443,7 @@ ./usr/share/man/man9/secmodel_register.9 comp-sys-man .man ./usr/share/man/man9/secmodel_securelevel.9 comp-sys-man .man ./usr/share/man/man9/secmodel_suser.9 comp-sys-man .man +./usr/share/man/man9/securelevel.9 comp-sys-man .man ./usr/share/man/man9/seldestroy.9 comp-sys-man .man ./usr/share/man/man9/select.9 comp-sys-man .man ./usr/share/man/man9/selinit.9 comp-sys-man .man Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.465 src/share/man/man9/Makefile:1.465.2.1 --- src/share/man/man9/Makefile:1.465 Sun Sep 4 21:37:50 2022 +++ src/share/man/man9/Makefile Sun Jan 14 15:17:12 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.465 2022/09/04 21:37:50 thorpej Exp $ +# $NetBSD: Makefile,v 1.465.2.1 2024/01/14 15:17:12 martin Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -51,7 +51,10 @@ MAN= accept_filter.9 accf_data.9 accf_ht scanc.9 \ sched_4bsd.9 sched_m2.9 scsipi.9 \ secmodel_bsd44.9 secmodel_extensions.9 \ - secmodel_overlay.9 secmodel_securelevel.9 secmodel_suser.9 \ + secmodel_overlay.9 +MAN+= secmodel_securelevel.9 +MLINKS+=secmodel_securelevel.9 securelevel.9 +MAN+= secmodel_suser.9 \ SET.9 setbit.9 setjmp.9 shutdownhook_establish.9 \ signal.9 skpc.9 sockopt.9 softintr.9 spl.9 specificdata.9 \ spi.9 splraiseipl.9 \
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Sun Jan 14 15:17:12 UTC 2024 Modified Files: src/distrib/sets/lists/comp [netbsd-10]: mi src/share/man/man9 [netbsd-10]: Makefile Log Message: Pull up following revision(s) (requested by pgoyette in ticket #539): distrib/sets/lists/comp/mi: revision 1.2452 share/man/man9/Makefile: revision 1.469 Install securelevel.9 as an alias of secmodel_securelevel.9 According to submitter, this should be sufficient to address misc/57824. To generate a diff of this commit: cvs rdiff -u -r1.2425.2.2 -r1.2425.2.3 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.465 -r1.465.2.1 src/share/man/man9/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/usr.bin/mklocale
Module Name:src Committed By: martin Date: Sun Jan 14 15:15:00 UTC 2024 Modified Files: src/usr.bin/mklocale [netbsd-10]: mklocale.1 yacc.y Log Message: Pull up following revision(s) (requested by rin in ticket #538): usr.bin/mklocale/yacc.y: revision 1.35 usr.bin/mklocale/yacc.y: revision 1.36 usr.bin/mklocale/mklocale.1: revision 1.18 usr.bin/mklocale/mklocale.1: revision 1.19 mklocale: XXX: Neglect TODIGIT at the moment PR lib/57798 It was implemented with an assumption that all digit characters can be mapped to numerical values <= 255. This is no longer true for Unicode, and results in, e.g., wrong return values of wcwidth(3) for U+5146 or U+16B60. As a workaround, neglect TODIGIT for now, as done for OpenBSD: https://github.com/OpenBSD/src/commit/4efe9bdeb34 XXX At least netbsd-10 should be fixed, but it requires some tests. mklocale(1): Add range check for TODIGIT, rather than disabling it PR lib/57798 Digit value specified by TODIGIT is storaged as lowest 8 bits of _RuneType, see lib/libc/locale/runetype_file.h: https://nxr.netbsd.org/xref/src/lib/libc/locale/runetype_file.h#56 The symptom reported in the PR is due to missing range check for this value; values of 256 and above were mistakenly treated as other flag bits in _RuneType. For example, U+5146 has numerical value 1000,000,000,000 == 0xe8d4a51000 where __BITS(30, 31) == _RUNETYPE_SW3 are turned on. This is why wcwidth(3) returned 3 for this character. This apparently affected not only character width, but also other attributes storaged in _RuneType. IIUC, digit value attributes in _RuneType have never been utilized until now, but preserve these if digit fits within (0, 256). This should be safer for pulling this up into netbsd-10. Also, these attributes may be useful to implement some I18N features as suggested by uwe@ in the PR. netbsd-[98] is not affected as these use old UTF-8 ctype definitions. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.17.16.1 src/usr.bin/mklocale/mklocale.1 cvs rdiff -u -r1.34 -r1.34.8.1 src/usr.bin/mklocale/yacc.y 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.bin/mklocale
Module Name:src
Committed By: martin
Date: Sun Jan 14 15:15:00 UTC 2024
Modified Files:
src/usr.bin/mklocale [netbsd-10]: mklocale.1 yacc.y
Log Message:
Pull up following revision(s) (requested by rin in ticket #538):
usr.bin/mklocale/yacc.y: revision 1.35
usr.bin/mklocale/yacc.y: revision 1.36
usr.bin/mklocale/mklocale.1: revision 1.18
usr.bin/mklocale/mklocale.1: revision 1.19
mklocale: XXX: Neglect TODIGIT at the moment
PR lib/57798
It was implemented with an assumption that all digit characters
can be mapped to numerical values <= 255.
This is no longer true for Unicode, and results in, e.g., wrong
return values of wcwidth(3) for U+5146 or U+16B60.
As a workaround, neglect TODIGIT for now, as done for OpenBSD:
https://github.com/OpenBSD/src/commit/4efe9bdeb34
XXX
At least netbsd-10 should be fixed, but it requires some tests.
mklocale(1): Add range check for TODIGIT, rather than disabling it
PR lib/57798
Digit value specified by TODIGIT is storaged as lowest 8 bits of
_RuneType, see lib/libc/locale/runetype_file.h:
https://nxr.netbsd.org/xref/src/lib/libc/locale/runetype_file.h#56
The symptom reported in the PR is due to missing range check for
this value; values of 256 and above were mistakenly treated as
other flag bits in _RuneType.
For example, U+5146 has numerical value 1000,000,000,000 ==
0xe8d4a51000 where __BITS(30, 31) == _RUNETYPE_SW3 are turned on.
This is why wcwidth(3) returned 3 for this character.
This apparently affected not only character width, but also other
attributes storaged in _RuneType.
IIUC, digit value attributes in _RuneType have never been utilized
until now, but preserve these if digit fits within (0, 256). This
should be safer for pulling this up into netbsd-10. Also, these
attributes may be useful to implement some I18N features as
suggested by uwe@ in the PR.
netbsd-[98] is not affected as these use old UTF-8 ctype definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.16.1 src/usr.bin/mklocale/mklocale.1
cvs rdiff -u -r1.34 -r1.34.8.1 src/usr.bin/mklocale/yacc.y
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/mklocale/mklocale.1
diff -u src/usr.bin/mklocale/mklocale.1:1.17 src/usr.bin/mklocale/mklocale.1:1.17.16.1
--- src/usr.bin/mklocale/mklocale.1:1.17 Mon Jul 3 21:34:20 2017
+++ src/usr.bin/mklocale/mklocale.1 Sun Jan 14 15:15:00 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mklocale.1,v 1.17 2017/07/03 21:34:20 wiz Exp $
+.\" $NetBSD: mklocale.1,v 1.17.16.1 2024/01/14 15:15:00 martin Exp $
.\" FreeBSD: src/usr.bin/mklocale/mklocale.1,v 1.6 1999/09/20 09:15:21 phantom Exp
.\"
.\" Copyright (c) 1993, 1994
@@ -33,7 +33,7 @@
.\"
.\" @(#)mklocale.1 8.2 (Berkeley) 4/18/94
.\"
-.Dd July 15, 2013
+.Dd January 5, 2024
.Dt MKLOCALE 1
.Os
.Sh NAME
@@ -210,7 +210,11 @@ is the integer value represented by
For example, the ASCII character
.Sq 0
would map to the decimal value 0.
-Only values up to 255 are allowed.
+On
+.Nx ,
+this information has never been used until now.
+Only values up to 255 are allowed, and mapping to 256 and above is
+silently ignored.
.El
.Pp
The following keywords may appear multiple times and have the following
Index: src/usr.bin/mklocale/yacc.y
diff -u src/usr.bin/mklocale/yacc.y:1.34 src/usr.bin/mklocale/yacc.y:1.34.8.1
--- src/usr.bin/mklocale/yacc.y:1.34 Sun Oct 13 21:12:32 2019
+++ src/usr.bin/mklocale/yacc.y Sun Jan 14 15:15:00 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: yacc.y,v 1.34 2019/10/13 21:12:32 christos Exp $ */
+/* $NetBSD: yacc.y,v 1.34.8.1 2024/01/14 15:15:00 martin Exp $ */
%{
/*-
@@ -43,7 +43,7 @@
static char sccsid[] = "@(#)yacc.y 8.1 (Berkeley) 6/6/93";
static char rcsid[] = "$FreeBSD$";
#else
-__RCSID("$NetBSD: yacc.y,v 1.34 2019/10/13 21:12:32 christos Exp $");
+__RCSID("$NetBSD: yacc.y,v 1.34.8.1 2024/01/14 15:15:00 martin Exp $");
#endif
#endif /* not lint */
@@ -390,11 +390,18 @@ set_digitmap(rune_map *map, rune_list *l
while (list) {
rune_list *nlist = list->next;
for (i = list->min; i <= list->max; ++i) {
- if (list->map + (i - list->min)) {
+ /*
+ * XXX PR lib/57798
+ * Currently, we support mapping up to 255. Attempts to map
+ * 256 (== _RUNETYPE_A) and above are silently ignored.
+ */
+ _RuneType digit = list->map + (i - list->min);
+ if (digit > 0 && digit <= 0xff) {
rune_list *tmp = (rune_list *)xmalloc(sizeof(rune_list));
+ memset(tmp, 0, sizeof(*tmp));
tmp->min = i;
tmp->max = i;
- add_map(map, tmp, list->map + (i - list->min));
+ add_map(map, tmp, digit);
}
}
free(list);
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/atari
Module Name:src Committed By: martin Date: Sun Jan 14 13:22:15 UTC 2024 Modified Files: src/usr.sbin/sysinst/arch/atari [netbsd-10]: md.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #537): usr.sbin/sysinst/arch/atari/md.c: revision 1.11 Fix a typo of a kernel name on detecting a running machine type. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/atari/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/arch/atari/md.c diff -u src/usr.sbin/sysinst/arch/atari/md.c:1.10 src/usr.sbin/sysinst/arch/atari/md.c:1.10.2.1 --- src/usr.sbin/sysinst/arch/atari/md.c:1.10 Fri Dec 9 17:02:13 2022 +++ src/usr.sbin/sysinst/arch/atari/md.c Sun Jan 14 13:22:15 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: md.c,v 1.10 2022/12/09 17:02:13 martin Exp $ */ +/* $NetBSD: md.c,v 1.10.2.1 2024/01/14 13:22:15 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -73,7 +73,7 @@ md_init_set_status(int flags) set_kernel_set(SET_KERNEL_4); else if (strstr(instsys.version, "(MILAN-ISAIDE")) set_kernel_set(SET_KERNEL_5); - else if (strstr(instsys.version, "(MILAN_PCIIDE")) + else if (strstr(instsys.version, "(MILAN-PCIIDE")) set_kernel_set(SET_KERNEL_6); }
CVS commit: [netbsd-10] src/usr.sbin/sysinst/arch/atari
Module Name:src Committed By: martin Date: Sun Jan 14 13:22:15 UTC 2024 Modified Files: src/usr.sbin/sysinst/arch/atari [netbsd-10]: md.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #537): usr.sbin/sysinst/arch/atari/md.c: revision 1.11 Fix a typo of a kernel name on detecting a running machine type. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.2.1 src/usr.sbin/sysinst/arch/atari/md.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/external/bsd/fetch/dist/libfetch
Module Name:src Committed By: martin Date: Sun Jan 14 13:19:39 UTC 2024 Modified Files: src/external/bsd/fetch/dist/libfetch [netbsd-10]: common.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #536): external/bsd/fetch/dist/libfetch/common.c: revision 1.6 fetch(3): Backport SSL validation from pkgsrc libfetch 2.40. We should really sync with pkgsrc libfetch to avoid divergence, but this is a low-risk, high-priority change for NetBSD 10: https://mail-index.netbsd.org/pkgsrc-changes/2024/01/03/msg290052.html To generate a diff of this commit: cvs rdiff -u -r1.2.54.1 -r1.2.54.2 \ src/external/bsd/fetch/dist/libfetch/common.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/external/bsd/fetch/dist/libfetch
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:19:39 UTC 2024
Modified Files:
src/external/bsd/fetch/dist/libfetch [netbsd-10]: common.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #536):
external/bsd/fetch/dist/libfetch/common.c: revision 1.6
fetch(3): Backport SSL validation from pkgsrc libfetch 2.40.
We should really sync with pkgsrc libfetch to avoid divergence, but
this is a low-risk, high-priority change for NetBSD 10:
https://mail-index.netbsd.org/pkgsrc-changes/2024/01/03/msg290052.html
To generate a diff of this commit:
cvs rdiff -u -r1.2.54.1 -r1.2.54.2 \
src/external/bsd/fetch/dist/libfetch/common.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/bsd/fetch/dist/libfetch/common.c
diff -u src/external/bsd/fetch/dist/libfetch/common.c:1.2.54.1 src/external/bsd/fetch/dist/libfetch/common.c:1.2.54.2
--- src/external/bsd/fetch/dist/libfetch/common.c:1.2.54.1 Wed Feb 22 13:24:05 2023
+++ src/external/bsd/fetch/dist/libfetch/common.c Sun Jan 14 13:19:39 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: common.c,v 1.2.54.1 2023/02/22 13:24:05 martin Exp $ */
+/* $NetBSD: common.c,v 1.2.54.2 2024/01/14 13:19:39 martin Exp $ */
/*-
* Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
* Copyright (c) 2008, 2010 Joerg Sonnenberger
@@ -445,6 +445,10 @@ fetch_ssl(conn_t *conn, int verbose)
conn->ssl_meth = SSLv23_client_method();
conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);
+ if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
+ SSL_CTX_set_default_verify_paths(conn->ssl_ctx);
+ SSL_CTX_set_verify(conn->ssl_ctx, SSL_VERIFY_PEER, NULL);
+ }
conn->ssl = SSL_new(conn->ssl_ctx);
if (conn->ssl == NULL){
CVS commit: [netbsd-9] src/bin/sh
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:16:51 UTC 2024
Modified Files:
src/bin/sh [netbsd-9]: eval.c expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1787):
bin/sh/eval.c: revision 1.191
bin/sh/expand.c: revision 1.144
PR bin/57773
Fix a bug reported by Jarle Fredrik Greipsland in PR bin/57773,
where a substring expansion where the substring to be removed from
a variable expansion is itself a var expansion where the value
contains one (or more) of sh's CTLxxx chars - the pattern had
CTLESC inserted, the string to be matched against did not. Fail.
We fix that by always inserting CTLESC in var assign expansions.
See the PR for all the gory details.
Thanks for the PR.
PR bin/57773
Fix another bug reported by Jarle Fredrik Greipsland and added
to PR bin/57773, which relates to calculating the length of a
positional parameter which contains CTL chars -- yes, this one
really is that specific, though it would also affect the special
param $0 if it were to contain CTL chars, and its length was
requested - that is fixed with the same change. And note: $0
is not affected because it looks like a positional param (it
isn't, ${00} would be, but is always unset, ${0} isn't) all
special parame would be affected the same way, but the only one
that can ever contain a CTL char is $0 I believe. ($@ and $*
were affected, but just because they're expanding the positional
params ... ${#@} and ${#*} are both technically unspecified
expansions - and different shells produce different results.
See the PR for the details of this one (and the previous).
Thanks for the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.175.2.3 -r1.175.2.4 src/bin/sh/eval.c
cvs rdiff -u -r1.132.2.2 -r1.132.2.3 src/bin/sh/expand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.175.2.3 src/bin/sh/eval.c:1.175.2.4
--- src/bin/sh/eval.c:1.175.2.3 Wed Apr 28 09:58:42 2021
+++ src/bin/sh/eval.c Sun Jan 14 13:16:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.175.2.3 2021/04/28 09:58:42 martin Exp $ */
+/* $NetBSD: eval.c,v 1.175.2.4 2024/01/14 13:16:51 martin Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.175.2.3 2021/04/28 09:58:42 martin Exp $");
+__RCSID("$NetBSD: eval.c,v 1.175.2.4 2024/01/14 13:16:51 martin Exp $");
#endif
#endif /* not lint */
@@ -908,7 +908,8 @@ evalcommand(union node *cmd, int flgs, s
line_number = argp->narg.lineno;
if (!isassignment(argp->narg.text))
break;
- expandarg(argp, , EXP_VARTILDE);
+ /* EXP_CASE handles CTL* chars in expansions properly */
+ expandarg(argp, , EXP_VARTILDE | EXP_CASE);
}
*varlist.lastp = NULL;
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.132.2.2 src/bin/sh/expand.c:1.132.2.3
--- src/bin/sh/expand.c:1.132.2.2 Sun Jun 7 12:50:17 2020
+++ src/bin/sh/expand.c Sun Jan 14 13:16:51 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.132.2.2 2020/06/07 12:50:17 martin Exp $ */
+/* $NetBSD: expand.c,v 1.132.2.3 2024/01/14 13:16:51 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.132.2.2 2020/06/07 12:50:17 martin Exp $");
+__RCSID("$NetBSD: expand.c,v 1.132.2.3 2024/01/14 13:16:51 martin Exp $");
#endif
#endif /* not lint */
@@ -1182,7 +1182,7 @@ varvalue(const char *name, int quoted, i
quoted ? ", quoted" : "", subtype, flag));
if (subtype == VSLENGTH) /* no magic required ... */
- flag &= ~EXP_FULL;
+ flag &= ~(EXP_FULL | EXP_QNEEDED);
#define STRTODEST(p) \
do {\
@@ -1194,7 +1194,7 @@ varvalue(const char *name, int quoted, i
} \
} else \
while (*p) { \
-if (ISCTL(*p)) \
+if ((flag & EXP_QNEEDED) && ISCTL(*p)) \
STPUTC(CTLESC, expdest); \
STPUTC(*p++, expdest); \
} \
CVS commit: [netbsd-9] src/bin/sh
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:16:51 UTC 2024
Modified Files:
src/bin/sh [netbsd-9]: eval.c expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1787):
bin/sh/eval.c: revision 1.191
bin/sh/expand.c: revision 1.144
PR bin/57773
Fix a bug reported by Jarle Fredrik Greipsland in PR bin/57773,
where a substring expansion where the substring to be removed from
a variable expansion is itself a var expansion where the value
contains one (or more) of sh's CTLxxx chars - the pattern had
CTLESC inserted, the string to be matched against did not. Fail.
We fix that by always inserting CTLESC in var assign expansions.
See the PR for all the gory details.
Thanks for the PR.
PR bin/57773
Fix another bug reported by Jarle Fredrik Greipsland and added
to PR bin/57773, which relates to calculating the length of a
positional parameter which contains CTL chars -- yes, this one
really is that specific, though it would also affect the special
param $0 if it were to contain CTL chars, and its length was
requested - that is fixed with the same change. And note: $0
is not affected because it looks like a positional param (it
isn't, ${00} would be, but is always unset, ${0} isn't) all
special parame would be affected the same way, but the only one
that can ever contain a CTL char is $0 I believe. ($@ and $*
were affected, but just because they're expanding the positional
params ... ${#@} and ${#*} are both technically unspecified
expansions - and different shells produce different results.
See the PR for the details of this one (and the previous).
Thanks for the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.175.2.3 -r1.175.2.4 src/bin/sh/eval.c
cvs rdiff -u -r1.132.2.2 -r1.132.2.3 src/bin/sh/expand.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/bin/sh
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:15:05 UTC 2024
Modified Files:
src/bin/sh [netbsd-10]: eval.c expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #535):
bin/sh/eval.c: revision 1.191
bin/sh/expand.c: revision 1.144
PR bin/57773
Fix a bug reported by Jarle Fredrik Greipsland in PR bin/57773,
where a substring expansion where the substring to be removed from
a variable expansion is itself a var expansion where the value
contains one (or more) of sh's CTLxxx chars - the pattern had
CTLESC inserted, the string to be matched against did not. Fail.
We fix that by always inserting CTLESC in var assign expansions.
See the PR for all the gory details.
Thanks for the PR.
PR bin/57773
Fix another bug reported by Jarle Fredrik Greipsland and added
to PR bin/57773, which relates to calculating the length of a
positional parameter which contains CTL chars -- yes, this one
really is that specific, though it would also affect the special
param $0 if it were to contain CTL chars, and its length was
requested - that is fixed with the same change. And note: $0
is not affected because it looks like a positional param (it
isn't, ${00} would be, but is always unset, ${0} isn't) all
special parame would be affected the same way, but the only one
that can ever contain a CTL char is $0 I believe. ($@ and $*
were affected, but just because they're expanding the positional
params ... ${#@} and ${#*} are both technically unspecified
expansions - and different shells produce different results.
See the PR for the details of this one (and the previous).
Thanks for the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.188.2.1 src/bin/sh/eval.c
cvs rdiff -u -r1.141 -r1.141.2.1 src/bin/sh/expand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.188 src/bin/sh/eval.c:1.188.2.1
--- src/bin/sh/eval.c:1.188 Wed Jan 5 15:25:44 2022
+++ src/bin/sh/eval.c Sun Jan 14 13:15:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.188 2022/01/05 15:25:44 kre Exp $ */
+/* $NetBSD: eval.c,v 1.188.2.1 2024/01/14 13:15:05 martin Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.188 2022/01/05 15:25:44 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.188.2.1 2024/01/14 13:15:05 martin Exp $");
#endif
#endif /* not lint */
@@ -932,7 +932,8 @@ evalcommand(union node *cmd, int flgs, s
line_number = argp->narg.lineno;
if (!isassignment(argp->narg.text))
break;
- expandarg(argp, , EXP_VARTILDE);
+ /* EXP_CASE handles CTL* chars in expansions properly */
+ expandarg(argp, , EXP_VARTILDE | EXP_CASE);
}
*varlist.lastp = NULL;
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.141 src/bin/sh/expand.c:1.141.2.1
--- src/bin/sh/expand.c:1.141 Mon Nov 22 05:17:43 2021
+++ src/bin/sh/expand.c Sun Jan 14 13:15:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.141 2021/11/22 05:17:43 kre Exp $ */
+/* $NetBSD: expand.c,v 1.141.2.1 2024/01/14 13:15:05 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.141 2021/11/22 05:17:43 kre Exp $");
+__RCSID("$NetBSD: expand.c,v 1.141.2.1 2024/01/14 13:15:05 martin Exp $");
#endif
#endif /* not lint */
@@ -1185,7 +1185,7 @@ varvalue(const char *name, int quoted, i
quoted ? ", quoted" : "", subtype, flag));
if (subtype == VSLENGTH) /* no magic required ... */
- flag &= ~EXP_FULL;
+ flag &= ~(EXP_FULL | EXP_QNEEDED);
#define STRTODEST(p) \
do {\
@@ -1197,7 +1197,7 @@ varvalue(const char *name, int quoted, i
} \
} else \
while (*p) { \
-if (ISCTL(*p)) \
+if ((flag & EXP_QNEEDED) && ISCTL(*p)) \
STPUTC(CTLESC, expdest); \
STPUTC(*p++, expdest); \
} \
CVS commit: [netbsd-10] src/bin/sh
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:15:05 UTC 2024
Modified Files:
src/bin/sh [netbsd-10]: eval.c expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #535):
bin/sh/eval.c: revision 1.191
bin/sh/expand.c: revision 1.144
PR bin/57773
Fix a bug reported by Jarle Fredrik Greipsland in PR bin/57773,
where a substring expansion where the substring to be removed from
a variable expansion is itself a var expansion where the value
contains one (or more) of sh's CTLxxx chars - the pattern had
CTLESC inserted, the string to be matched against did not. Fail.
We fix that by always inserting CTLESC in var assign expansions.
See the PR for all the gory details.
Thanks for the PR.
PR bin/57773
Fix another bug reported by Jarle Fredrik Greipsland and added
to PR bin/57773, which relates to calculating the length of a
positional parameter which contains CTL chars -- yes, this one
really is that specific, though it would also affect the special
param $0 if it were to contain CTL chars, and its length was
requested - that is fixed with the same change. And note: $0
is not affected because it looks like a positional param (it
isn't, ${00} would be, but is always unset, ${0} isn't) all
special parame would be affected the same way, but the only one
that can ever contain a CTL char is $0 I believe. ($@ and $*
were affected, but just because they're expanding the positional
params ... ${#@} and ${#*} are both technically unspecified
expansions - and different shells produce different results.
See the PR for the details of this one (and the previous).
Thanks for the PR.
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.188.2.1 src/bin/sh/eval.c
cvs rdiff -u -r1.141 -r1.141.2.1 src/bin/sh/expand.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
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:10:56 UTC 2024
Modified Files:
src/distrib/sets/lists/base [netbsd-9]: mi
src/distrib/sets/lists/man [netbsd-9]: mi
src/external/ibm-public/postfix/libexec/postfix-script [netbsd-9]:
Makefile
src/external/ibm-public/postfix/man/man1 [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by kim in ticket #1786):
external/ibm-public/postfix/libexec/postfix-script/Makefile: revision
1.2
distrib/sets/lists/man/mi: revision 1.1768
external/ibm-public/postfix/man/man1/Makefile: revision 1.3
distrib/sets/lists/base/mi: revision 1.1330
Install postfix-tls-script (for "postfix tls")
To generate a diff of this commit:
cvs rdiff -u -r1.1209.2.9 -r1.1209.2.10 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1649.2.10 -r1.1649.2.11 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.1.52.1 \
src/external/ibm-public/postfix/libexec/postfix-script/Makefile
cvs rdiff -u -r1.2 -r1.2.26.1 \
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.1209.2.9 src/distrib/sets/lists/base/mi:1.1209.2.10
--- src/distrib/sets/lists/base/mi:1.1209.2.9 Sat Dec 30 18:35:30 2023
+++ src/distrib/sets/lists/base/mi Sun Jan 14 13:10:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1209.2.9 2023/12/30 18:35:30 martin Exp $
+# $NetBSD: mi,v 1.1209.2.10 2024/01/14 13:10:56 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1567,6 +1567,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.1649.2.10 src/distrib/sets/lists/man/mi:1.1649.2.11
--- src/distrib/sets/lists/man/mi:1.1649.2.10 Sat May 14 11:37:06 2022
+++ src/distrib/sets/lists/man/mi Sun Jan 14 13:10:56 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1649.2.10 2022/05/14 11:37:06 martin Exp $
+# $NetBSD: mi,v 1.1649.2.11 2024/01/14 13:10:56 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -444,6 +444,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
@@ -3687,6 +3688,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
@@ -6576,6 +6578,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.1.52.1
--- 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 Sun Jan 14 13:10:55 2024
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:55 tron Exp $
+# $NetBSD: Makefile,v 1.1.52.1 2024/01/14 13:10:55 martin 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
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Jan 14 13:10:56 UTC 2024 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi src/distrib/sets/lists/man [netbsd-9]: mi src/external/ibm-public/postfix/libexec/postfix-script [netbsd-9]: Makefile src/external/ibm-public/postfix/man/man1 [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by kim in ticket #1786): external/ibm-public/postfix/libexec/postfix-script/Makefile: revision 1.2 distrib/sets/lists/man/mi: revision 1.1768 external/ibm-public/postfix/man/man1/Makefile: revision 1.3 distrib/sets/lists/base/mi: revision 1.1330 Install postfix-tls-script (for "postfix tls") To generate a diff of this commit: cvs rdiff -u -r1.1209.2.9 -r1.1209.2.10 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1649.2.10 -r1.1649.2.11 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.1.52.1 \ src/external/ibm-public/postfix/libexec/postfix-script/Makefile cvs rdiff -u -r1.2 -r1.2.26.1 \ 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: [netbsd-10] src
Module Name:src
Committed By: martin
Date: Sun Jan 14 13:02:27 UTC 2024
Modified Files:
src/distrib/sets/lists/base [netbsd-10]: mi
src/distrib/sets/lists/man [netbsd-10]: mi
src/external/ibm-public/postfix/libexec/postfix-script [netbsd-10]:
Makefile
src/external/ibm-public/postfix/man/man1 [netbsd-10]: Makefile
Log Message:
Pull up following revision(s) (requested by kim in ticket #534):
external/ibm-public/postfix/libexec/postfix-script/Makefile: revision
1.2
distrib/sets/lists/man/mi: revision 1.1768
external/ibm-public/postfix/man/man1/Makefile: revision 1.3
distrib/sets/lists/base/mi: revision 1.1330
Install postfix-tls-script (for "postfix tls")
To generate a diff of this commit:
cvs rdiff -u -r1.1314.2.3 -r1.1314.2.4 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1757.2.6 -r1.1757.2.7 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.1.60.1 \
src/external/ibm-public/postfix/libexec/postfix-script/Makefile
cvs rdiff -u -r1.2 -r1.2.34.1 \
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.1314.2.3 src/distrib/sets/lists/base/mi:1.1314.2.4
--- src/distrib/sets/lists/base/mi:1.1314.2.3 Mon Sep 4 17:33:29 2023
+++ src/distrib/sets/lists/base/mi Sun Jan 14 13:02:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1314.2.3 2023/09/04 17:33:29 martin Exp $
+# $NetBSD: mi,v 1.1314.2.4 2024/01/14 13:02:26 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1342,6 +1342,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.1757.2.6 src/distrib/sets/lists/man/mi:1.1757.2.7
--- src/distrib/sets/lists/man/mi:1.1757.2.6 Sat Dec 9 13:13:48 2023
+++ src/distrib/sets/lists/man/mi Sun Jan 14 13:02:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1757.2.6 2023/12/09 13:13:48 martin Exp $
+# $NetBSD: mi,v 1.1757.2.7 2024/01/14 13:02:26 martin 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
@@ -3911,6 +3912,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
@@ -7013,6 +7015,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.1.60.1
--- 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 Sun Jan 14 13:02:26 2024
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.1 2009/06/25 18:21:55 tron Exp $
+# $NetBSD: Makefile,v 1.1.60.1 2024/01/14 13:02:26 martin 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
