CVS commit: src/sbin/fsck_msdos
Module Name:src Committed By: gutteridge Date: Sun Sep 24 20:41:52 UTC 2023 Modified Files: src/sbin/fsck_msdos: ext.h Log Message: ext.h: fix spelling and grammar in a comment To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sbin/fsck_msdos/ext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_msdos
Module Name:src Committed By: gutteridge Date: Sun Sep 24 20:41:52 UTC 2023 Modified Files: src/sbin/fsck_msdos: ext.h Log Message: ext.h: fix spelling and grammar in a comment To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sbin/fsck_msdos/ext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_msdos/ext.h diff -u src/sbin/fsck_msdos/ext.h:1.13 src/sbin/fsck_msdos/ext.h:1.14 --- src/sbin/fsck_msdos/ext.h:1.13 Sat Apr 11 07:14:50 2009 +++ src/sbin/fsck_msdos/ext.h Sun Sep 24 20:41:52 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: ext.h,v 1.13 2009/04/11 07:14:50 lukem Exp $ */ +/* $NetBSD: ext.h,v 1.14 2023/09/24 20:41:52 gutteridge Exp $ */ /* * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank @@ -69,7 +69,7 @@ int checkfilesys(const char *); #define FSFIXFAT 64 /* Fix file system FAT */ /* - * read a boot block in a machine independend fashion and translate + * Read a boot block in a machine independent fashion and translate * it into our struct bootblock. */ int readboot(int, struct bootblock *);
CVS commit: src/sys/arch/mmeye/mmeye
Module Name:src Committed By: andvar Date: Sun Sep 24 20:17:26 UTC 2023 Modified Files: src/sys/arch/mmeye/mmeye: locore.S Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mmeye/mmeye/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/mmeye/mmeye
Module Name:src Committed By: andvar Date: Sun Sep 24 20:17:26 UTC 2023 Modified Files: src/sys/arch/mmeye/mmeye: locore.S Log Message: Nix trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mmeye/mmeye/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/mmeye/mmeye/locore.S diff -u src/sys/arch/mmeye/mmeye/locore.S:1.12 src/sys/arch/mmeye/mmeye/locore.S:1.13 --- src/sys/arch/mmeye/mmeye/locore.S:1.12 Sun Sep 24 19:57:10 2023 +++ src/sys/arch/mmeye/mmeye/locore.S Sun Sep 24 20:17:26 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.12 2023/09/24 19:57:10 andvar Exp $ */ +/* $NetBSD: locore.S,v 1.13 2023/09/24 20:17:26 andvar Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -73,18 +73,18 @@ */ #include "opt_cputype.h" -#include "opt_memsize.h" +#include "opt_memsize.h" #include "assym.h" -#if defined(SH3) && defined(SH4) -#error "mmeye port don't support SH3,SH4 common kernel." +#if defined(SH3) && defined(SH4) +#error "mmeye port don't support SH3,SH4 common kernel." #endif #include #include #include #include -#include +#include #include #include @@ -106,14 +106,14 @@ ALTENTRY(kernel_text) ldc r0, sr xor r0, r0 - MOV (MMUCR, r2) + MOV (MMUCR, r2) mov.l r0, @r2 /* MMU OFF */ bra start1 nop .align 2 SR_init: .long 0x50F0 -REG_SYMBOL(MMUCR) +REG_SYMBOL(MMUCR) start1: #ifdef ROMIMAGE
CVS commit: src/sys/arch/mmeye/mmeye
Module Name:src Committed By: andvar Date: Sun Sep 24 19:57:10 UTC 2023 Modified Files: src/sys/arch/mmeye/mmeye: locore.S Log Message: unify ROMIMAGE specific assembler code between evbsh3 and mmeye. fixes mmeye ROMIMAGE enabled build and in turn MMTAROMNEW kernel config. patch checked by martin. PR port-mmeye/57627. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mmeye/mmeye/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/mmeye/mmeye/locore.S diff -u src/sys/arch/mmeye/mmeye/locore.S:1.11 src/sys/arch/mmeye/mmeye/locore.S:1.12 --- src/sys/arch/mmeye/mmeye/locore.S:1.11 Sat Feb 19 10:46:29 2011 +++ src/sys/arch/mmeye/mmeye/locore.S Sun Sep 24 19:57:10 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.11 2011/02/19 10:46:29 kiyohara Exp $ */ +/* $NetBSD: locore.S,v 1.12 2023/09/24 19:57:10 andvar Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -119,7 +119,8 @@ start1: #ifdef ROMIMAGE /* Initialize BUS State Control Regs. */ mov.l _ROM_START, r3 - mov.l _C_LABEL(ram_start), r4 + mov.l XL_ram_start, r4 + mov.l @r4, r4 sub r3, r4 /* Set Bus State Controller */ mov.l XLInitializeBsc, r0 @@ -140,7 +141,8 @@ start1: add r3, r1 /* src address */ mov.l ___start, r3 sub r2, r3 - mov.l _C_LABEL(ram_start), r4 + mov.l XL_ram_start, r4 + mov.l @r4, r4 add r4, r3 /* dest address */ 1: mov.l @r1+, r4 @@ -157,6 +159,8 @@ start1: .align 2 LXstart_in_RAM: .long start_in_RAM +XL_ram_start: + .long _C_LABEL(ram_start) #else /* ROMIMAGE */ /* Set Bus State Controller */ mov.l XLInitializeBsc, r0
CVS commit: src/sys/arch/mmeye/mmeye
Module Name:src Committed By: andvar Date: Sun Sep 24 19:57:10 UTC 2023 Modified Files: src/sys/arch/mmeye/mmeye: locore.S Log Message: unify ROMIMAGE specific assembler code between evbsh3 and mmeye. fixes mmeye ROMIMAGE enabled build and in turn MMTAROMNEW kernel config. patch checked by martin. PR port-mmeye/57627. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mmeye/mmeye/locore.S 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: gutteridge Date: Sun Sep 24 16:33:42 UTC 2023 Modified Files: src: UPDATING Log Message: UPDATING: fix a couple of spelling mistakes To generate a diff of this commit: cvs rdiff -u -r1.343 -r1.344 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/UPDATING diff -u src/UPDATING:1.343 src/UPDATING:1.344 --- src/UPDATING:1.343 Mon Aug 28 22:25:49 2023 +++ src/UPDATING Sun Sep 24 16:33:41 2023 @@ -1,4 +1,4 @@ -$NetBSD: UPDATING,v 1.343 2023/08/28 22:25:49 riastradh Exp $ +$NetBSD: UPDATING,v 1.344 2023/09/24 16:33:41 gutteridge Exp $ This file (UPDATING) is intended to be a brief reference to recent changes that might cause problems in the build process, and a guide for @@ -321,7 +321,7 @@ Recent changes: cd sys/arch/i386/stand/efiboot && make clean 20190723: - The jemalloc allocator in libc is now build without extended + The jemalloc allocator in libc is now built without extended debugging (for performance reasons). In update builds make sure to rebuild it completely, by removing all affected object files, including compat builds, something like: @@ -341,7 +341,7 @@ Recent changes: 20180713: On amd64 and i386 static binaries are now build position - independend. This requires recompilation of all object + independent. This requires recompilation of all object files used to create the crunched /rescue binary. Clean the rescue directory in your obj directory before doing an update build, otherwise linking will fail.
CVS commit: src
Module Name:src Committed By: gutteridge Date: Sun Sep 24 16:33:42 UTC 2023 Modified Files: src: UPDATING Log Message: UPDATING: fix a couple of spelling mistakes To generate a diff of this commit: cvs rdiff -u -r1.343 -r1.344 src/UPDATING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mmeye/conf
Module Name:src Committed By: andvar Date: Sun Sep 24 13:59:38 UTC 2023 Modified Files: src/sys/arch/mmeye/conf: MMTAROMNEW Log Message: disable all phy devices in config, since network is disabled in general. add SH7708R option from MMTA config, one CPU option is required. enable pseudo-terminal device, also needed for config to build. changes fix the kernel config itself, but build fails on locore.S asm code, will file a PR for that. P.S. would be good to update descriptions of kernel configs, since all copied from GENERIC and it is difficult to decipher their purpose and relevance. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mmeye/conf/MMTAROMNEW 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/mmeye/conf/MMTAROMNEW diff -u src/sys/arch/mmeye/conf/MMTAROMNEW:1.56 src/sys/arch/mmeye/conf/MMTAROMNEW:1.57 --- src/sys/arch/mmeye/conf/MMTAROMNEW:1.56 Thu Feb 9 14:09:49 2023 +++ src/sys/arch/mmeye/conf/MMTAROMNEW Sun Sep 24 13:59:38 2023 @@ -1,4 +1,4 @@ -# $NetBSD: MMTAROMNEW,v 1.56 2023/02/09 14:09:49 abs Exp $ +# $NetBSD: MMTAROMNEW,v 1.57 2023/09/24 13:59:38 andvar Exp $ # # GENERIC -- everything that's currently supported # @@ -18,6 +18,7 @@ options ROMIMAGE maxusers 32 # estimated number of users options SH3 +options SH7708R # 100MHz options PCLOCK= # 33.33MHz options MMEYE_NEW_INT=0xb00e #options MMEYE_NO_CACHE @@ -182,15 +183,15 @@ wd* at atabus? drive ? #sm* at pcmcia? function ? # Megahertz Ethernet # MII/PHY support -exphy* at mii? phy ? # 3Com internal PHYs -icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x -inphy* at mii? phy ? # Intel 82555 PHYs -lxtphy* at mii? phy ? # Level One LXT-970 PHYs -nsphy* at mii? phy ? # NS83840 PHYs -qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs -sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs +#exphy* at mii? phy ? # 3Com internal PHYs +#icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x +#inphy* at mii? phy ? # Intel 82555 PHYs +#lxtphy* at mii? phy ? # Level One LXT-970 PHYs +#nsphy* at mii? phy ? # NS83840 PHYs +#qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs +#sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs #tlphy* at mii? phy ? # ThunderLAN PHYs -ukphy* at mii? phy ? # generic unknown PHYs +#ukphy* at mii? phy ? # generic unknown PHYs # Pseudo-Devices @@ -209,7 +210,7 @@ ukphy* at mii? phy ? # generic unknown #pseudo-device tun # network tunneling over tty # miscellaneous pseudo-devices -#pseudo-device pty # pseudo-terminals +pseudo-device pty # pseudo-terminals pseudo-device clockctl # user control of clock subsystem # rnd is EXPERIMENTAL at this point.
CVS commit: src/sys/arch/mmeye/conf
Module Name:src Committed By: andvar Date: Sun Sep 24 13:59:38 UTC 2023 Modified Files: src/sys/arch/mmeye/conf: MMTAROMNEW Log Message: disable all phy devices in config, since network is disabled in general. add SH7708R option from MMTA config, one CPU option is required. enable pseudo-terminal device, also needed for config to build. changes fix the kernel config itself, but build fails on locore.S asm code, will file a PR for that. P.S. would be good to update descriptions of kernel configs, since all copied from GENERIC and it is difficult to decipher their purpose and relevance. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/mmeye/conf/MMTAROMNEW Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so/arch/sparc
Module Name:src Committed By: martin Date: Sun Sep 24 11:08:32 UTC 2023 Modified Files: src/libexec/ld.elf_so/arch/sparc: mdreloc.c Log Message: Fix debug code To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/libexec/ld.elf_so/arch/sparc/mdreloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so/arch/sparc
Module Name:src
Committed By: martin
Date: Sun Sep 24 11:08:32 UTC 2023
Modified Files:
src/libexec/ld.elf_so/arch/sparc: mdreloc.c
Log Message:
Fix debug code
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/sparc/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.57 src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.58
--- src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.57 Sun Jun 4 01:24:58 2023
+++ src/libexec/ld.elf_so/arch/sparc/mdreloc.c Sun Sep 24 11:08:32 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.57 2023/06/04 01:24:58 joerg Exp $ */
+/* $NetBSD: mdreloc.c,v 1.58 2023/09/24 11:08:32 martin Exp $ */
/*-
* Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.57 2023/06/04 01:24:58 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.58 2023/09/24 11:08:32 martin Exp $");
#endif /* not lint */
#include
@@ -384,7 +384,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry
#ifdef RTLD_DEBUG_RELOC
if (RELOC_RESOLVE_SYMBOL(type)) {
rdbg(("%s %s in %s --> %p in %s", reloc_names[type],
- obj->strtab + obj->symtab[symnum].st_name,
+ obj->strtab + obj->symtab[ELF_R_SYM(rela->r_info)].st_name,
obj->path, (void *)value, defobj->path));
} else {
rdbg(("%s in %s --> %p", reloc_names[type],
CVS commit: src/sys/arch/macppc/dev
Module Name:src Committed By: andvar Date: Sun Sep 24 10:59:24 UTC 2023 Modified Files: src/sys/arch/macppc/dev: zs.c Log Message: pass NULL to the second dbdma_alloc() expected argement. it was not adjusted after it acquired one 7 years ago. fixes ZS_TXDMA enabled build for macppc. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/macppc/dev/zs.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/macppc/dev
Module Name:src Committed By: andvar Date: Sun Sep 24 10:59:24 UTC 2023 Modified Files: src/sys/arch/macppc/dev: zs.c Log Message: pass NULL to the second dbdma_alloc() expected argement. it was not adjusted after it acquired one 7 years ago. fixes ZS_TXDMA enabled build for macppc. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/arch/macppc/dev/zs.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/macppc/dev/zs.c diff -u src/sys/arch/macppc/dev/zs.c:1.58 src/sys/arch/macppc/dev/zs.c:1.59 --- src/sys/arch/macppc/dev/zs.c:1.58 Sat Sep 23 12:48:23 2023 +++ src/sys/arch/macppc/dev/zs.c Sun Sep 24 10:59:24 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: zs.c,v 1.58 2023/09/23 12:48:23 andvar Exp $ */ +/* $NetBSD: zs.c,v 1.59 2023/09/24 10:59:24 andvar Exp $ */ /* * Copyright (c) 1996, 1998 Bill Studenmund @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.58 2023/09/23 12:48:23 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.59 2023/09/24 10:59:24 andvar Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -259,7 +259,7 @@ zsc_attach(device_t parent, device_t sel #ifdef ZS_TXDMA zsc->zsc_txdmareg[channel] = mapiodev(regs[2], regs[3], false); zsc->zsc_txdmacmd[channel] = - dbdma_alloc(sizeof(dbdma_command_t) * 3); + dbdma_alloc(sizeof(dbdma_command_t) * 3, NULL); memset(zsc->zsc_txdmacmd[channel], 0, sizeof(dbdma_command_t) * 3); dbdma_reset(zsc->zsc_txdmareg[channel]);
CVS commit: src/sys/arch/macppc/dev
Module Name:src
Committed By: andvar
Date: Sun Sep 24 10:51:28 UTC 2023
Modified Files:
src/sys/arch/macppc/dev: valkyriefb.c
Log Message:
define i variable in for loop.
valkyriefb_attach() doesn't have one defined in the function scope.
fixes VALKYRIEFB_DEBUG enabled build for macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/dev/valkyriefb.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/macppc/dev/valkyriefb.c
diff -u src/sys/arch/macppc/dev/valkyriefb.c:1.8 src/sys/arch/macppc/dev/valkyriefb.c:1.9
--- src/sys/arch/macppc/dev/valkyriefb.c:1.8 Wed Feb 16 23:49:26 2022
+++ src/sys/arch/macppc/dev/valkyriefb.c Sun Sep 24 10:51:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: valkyriefb.c,v 1.8 2022/02/16 23:49:26 riastradh Exp $ */
+/* $NetBSD: valkyriefb.c,v 1.9 2023/09/24 10:51:28 andvar Exp $ */
/*
* Copyright (c) 2012 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: valkyriefb.c,v 1.8 2022/02/16 23:49:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: valkyriefb.c,v 1.9 2023/09/24 10:51:28 andvar Exp $");
#include
#include
@@ -209,7 +209,7 @@ valkyriefb_attach(device_t parent, devic
aprint_verbose_dev(sc->sc_dev, "waiting for videopll...\n");
sc->sc_base = (uint8_t *)ca->ca_reg[0];
#ifdef VALKYRIEFB_DEBUG
- for (i = 0; i < 0x40; i += 8) {
+ for (int i = 0; i < 0x40; i += 8) {
aprint_error_dev(sc->sc_dev, "%02x: %02x\n", i,
valkyriefb_read_reg(sc, i));
}
CVS commit: src/sys/arch/macppc/dev
Module Name:src Committed By: andvar Date: Sun Sep 24 10:51:28 UTC 2023 Modified Files: src/sys/arch/macppc/dev: valkyriefb.c Log Message: define i variable in for loop. valkyriefb_attach() doesn't have one defined in the function scope. fixes VALKYRIEFB_DEBUG enabled build for macppc. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/macppc/dev/valkyriefb.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/aarch64/include
Module Name:src Committed By: skrll Date: Sun Sep 24 10:13:44 UTC 2023 Modified Files: src/sys/arch/aarch64/include: armreg.h Log Message: Add a bunch of system registers and their bit / bit field definitions. Taken from ryo's nvmm branch with updates from me. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/aarch64/include/armreg.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/aarch64/include/armreg.h diff -u src/sys/arch/aarch64/include/armreg.h:1.64 src/sys/arch/aarch64/include/armreg.h:1.65 --- src/sys/arch/aarch64/include/armreg.h:1.64 Sat May 6 21:53:26 2023 +++ src/sys/arch/aarch64/include/armreg.h Sun Sep 24 10:13:44 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: armreg.h,v 1.64 2023/05/06 21:53:26 andvar Exp $ */ +/* $NetBSD: armreg.h,v 1.65 2023/09/24 10:13:44 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -229,7 +229,13 @@ AARCH64REG_READ_INLINE(clidr_el1) #define CLIDR_TYPE_IDCACHE 3 // Separate inst and data caches #define CLIDR_TYPE_UNIFIEDCACHE 4 // Unified cache +AARCH64REG_READ_INLINE(contextidr_el1) +AARCH64REG_WRITE_INLINE(contextidr_el1) + AARCH64REG_READ_INLINE(currentel) + +#define CURRENTEL_EL __BITS(3,2) // Current exception Level + AARCH64REG_READ_INLINE(id_aa64afr0_el1) AARCH64REG_READ_INLINE(id_aa64afr1_el1) AARCH64REG_READ_INLINE(id_aa64dfr0_el1) @@ -661,6 +667,8 @@ AARCH64REG_WRITE_INLINE(esr_el1) #define ESR_EC_CP14_DT 0x06 // A32: LDC/STC access to CP14 #define ESR_EC_FP_ACCESS 0x07 // AXX: Access to SIMD/FP Registers #define ESR_EC_FPID 0x08 // A32: MCR/MRC access to CP10 !EC=7 +#define ESR_EC_PAUTH 0x09 // A64: Pointer auth trap (FEAT_PAUTH) +#define ESR_EC_LS64 0x0a // AXX: LD64B/ST64B instruction (FEAT_LS64) // XXXNH #define ESR_EC_CP14_RRT 0x0c // A32: MRRC access to CP14 #define ESR_EC_BTE_A64 0x0d // A64: Branch Target Exception (V8.5) #define ESR_EC_ILL_STATE 0x0e // AXX: Illegal Execution State @@ -671,29 +679,54 @@ AARCH64REG_WRITE_INLINE(esr_el1) #define ESR_EC_HVC_A64 0x16 // A64: HVC Instruction Execution #define ESR_EC_SMC_A64 0x17 // A64: SMC Instruction Execution #define ESR_EC_SYS_REG 0x18 // A64: MSR/MRS/SYS instruction (!EC0/1/7) -#define ESR_EC_INSN_ABT_EL0 0x20 // AXX: Instruction Abort (EL0) -#define ESR_EC_INSN_ABT_EL1 0x21 // AXX: Instruction Abort (EL1) +#define ESR_EC_SVE 0x19 // AXX: SVE Instruction Execution (FEAT_SVE) +#define ESR_EC_PAUTH_ERET 0x1a // A64: ERET/ERETAA/ERETAB (FEAT_PAUTH and FEAT_NV) +#define ESR_EC_TME 0x1b // A64: TSTART instruction (FEAT_TME) +#define ESR_EC_FRAC 0x1c // A64: Pointer auth trap (FEAT_FPAC) +#define ESR_EC_SME 0x1d // AXX: Access to SME (FEAT_SME) +#define ESR_EC_RME 0x1e // A64: Granule Protection Check (FEAT_RME) +#define ESR_EC_INSN_ABT_EL_LOW 0x20 // AXX: Instruction Abort from lower level +#define ESR_EC_INSN_ABT_EL_CUR 0x21 // AXX: Instruction Abort from current level #define ESR_EC_PC_ALIGNMENT 0x22 // AXX: Misaligned PC -#define ESR_EC_DATA_ABT_EL0 0x24 // AXX: Data Abort (EL0) -#define ESR_EC_DATA_ABT_EL1 0x25 // AXX: Data Abort (EL1) -#define ESR_EC_SP_ALIGNMENT 0x26 // AXX: Misaligned SP +#define ESR_EC_DATA_ABT_EL_LOW 0x24 // AXX: Data Abort from lower level +#define ESR_EC_DATA_ABT_EL_CUR 0x25 // AXX: Data Abort from current level +#define ESR_EC_SP_ALIGNMENT 0x26 // AXX: Misaligned SP +#define ESR_EC_MOPS 0x27 // A64: Memory Operation Exception (FEAT_MOPS) #define ESR_EC_FP_TRAP_A32 0x28 // A32: FP Exception #define ESR_EC_FP_TRAP_A64 0x2c // A64: FP Exception -#define ESR_EC_SERROR 0x2f // AXX: SError Interrupt -#define ESR_EC_BRKPNT_EL0 0x30 // AXX: Breakpoint Exception (EL0) -#define ESR_EC_BRKPNT_EL1 0x31 // AXX: Breakpoint Exception (EL1) -#define ESR_EC_SW_STEP_EL0 0x32 // AXX: Software Step (EL0) -#define ESR_EC_SW_STEP_EL1 0x33 // AXX: Software Step (EL1) -#define ESR_EC_WTCHPNT_EL0 0x34 // AXX: Watchpoint (EL0) -#define ESR_EC_WTCHPNT_EL1 0x35 // AXX: Watchpoint (EL1) +#define ESR_EC_SERROR 0x2f // AXX: SError Interrupt +#define ESR_EC_BRKPNT_EL_LOW 0x30 // AXX: Breakpoint Exception from lower level +#define ESR_EC_BRKPNT_EL_CUR 0x31 // AXX: Breakpoint Exception from current level +#define ESR_EC_SW_STEP_EL_LOW 0x32 // AXX: Software Step from lower level +#define ESR_EC_SW_STEP_EL_CUR 0x33 // AXX: Software Step from current level +#define ESR_EC_WTCHPNT_EL_LOW 0x34 // AXX: Watchpoint from lower level +#define ESR_EC_WTCHPNT_EL_CUR 0x35 // AXX: Watchpoint from current level #define ESR_EC_BKPT_INSN_A32 0x38 // A32: BKPT Instruction Execution #define ESR_EC_VECTOR_CATCH 0x3a // A32: Vector Catch Exception #define ESR_EC_BKPT_INSN_A64 0x3c // A64: BKPT Instruction Execution +/* alias for EL1 kernel */ +#define ESR_EC_INSN_ABT_EL0 ESR_EC_INSN_ABT_EL_LOW +#define
CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: skrll Date: Sun Sep 24 10:13:44 UTC 2023 Modified Files: src/sys/arch/aarch64/include: armreg.h Log Message: Add a bunch of system registers and their bit / bit field definitions. Taken from ryo's nvmm branch with updates from me. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/aarch64/include/armreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: martin
Date: Sun Sep 24 09:33:27 UTC 2023
Modified Files:
src/lib/librumpuser: rumpuser.c
src/sys/rump/include/rump: rumpuser.h
src/sys/rump/librump/rumpkern: vm.c
Log Message:
PR kern/57626: instead of an (arbitrary) FAKE_PAGE_SHIFT (and always
using 4k pages), query the hypervisor for the real page size of the host
kernel and use that for architectures that do not have compile time
constant page sizes.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/lib/librumpuser/rumpuser.c
cvs rdiff -u -r1.116 -r1.117 src/sys/rump/include/rump/rumpuser.h
cvs rdiff -u -r1.196 -r1.197 src/sys/rump/librump/rumpkern/vm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.67 src/lib/librumpuser/rumpuser.c:1.68
--- src/lib/librumpuser/rumpuser.c:1.67 Sun Aug 16 11:05:06 2015
+++ src/lib/librumpuser/rumpuser.c Sun Sep 24 09:33:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.67 2015/08/16 11:05:06 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.68 2023/09/24 09:33:26 martin Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include "rumpuser_port.h"
#if !defined(lint)
-__RCSID("$NetBSD: rumpuser.c,v 1.67 2015/08/16 11:05:06 pooka Exp $");
+__RCSID("$NetBSD: rumpuser.c,v 1.68 2023/09/24 09:33:26 martin Exp $");
#endif /* !lint */
#include
@@ -268,3 +268,9 @@ rumpuser_kill(int64_t pid, int rumpsig)
raise(sig);
return 0;
}
+
+unsigned long
+rumpuser_getpagesize(void)
+{
+ return sysconf(_SC_PAGESIZE);
+}
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.116 src/sys/rump/include/rump/rumpuser.h:1.117
--- src/sys/rump/include/rump/rumpuser.h:1.116 Sun Mar 22 13:30:10 2020
+++ src/sys/rump/include/rump/rumpuser.h Sun Sep 24 09:33:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.116 2020/03/22 13:30:10 pgoyette Exp $ */
+/* $NetBSD: rumpuser.h,v 1.117 2023/09/24 09:33:26 martin Exp $ */
/*
* Copyright (c) 2007-2013 Antti Kantee. All Rights Reserved.
@@ -168,6 +168,11 @@ void rumpuser_dprintf(const char *, ...)
int rumpuser_getrandom(void *, size_t, int, size_t *);
/*
+ * for architectures with non-constant page size
+ */
+unsigned long rumpuser_getpagesize(void);
+
+/*
* threads, scheduling (host) and synchronization
*/
int rumpuser_thread_create(void *(*f)(void *), void *, const char *, int,
Index: src/sys/rump/librump/rumpkern/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.196 src/sys/rump/librump/rumpkern/vm.c:1.197
--- src/sys/rump/librump/rumpkern/vm.c:1.196 Sat Apr 22 13:53:53 2023
+++ src/sys/rump/librump/rumpkern/vm.c Sun Sep 24 09:33:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm.c,v 1.196 2023/04/22 13:53:53 riastradh Exp $ */
+/* $NetBSD: vm.c,v 1.197 2023/09/24 09:33:26 martin Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -41,7 +41,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.196 2023/04/22 13:53:53 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm.c,v 1.197 2023/09/24 09:33:26 martin Exp $");
#include
#include
@@ -375,11 +375,9 @@ uvm_init(void)
uvmexp.pagemask = PAGE_MASK;
uvmexp.pageshift = PAGE_SHIFT;
#else
-#define FAKE_PAGE_SHIFT 12
- uvmexp.pageshift = FAKE_PAGE_SHIFT;
- uvmexp.pagesize = 1<
CVS commit: src
Module Name:src Committed By: martin Date: Sun Sep 24 09:33:27 UTC 2023 Modified Files: src/lib/librumpuser: rumpuser.c src/sys/rump/include/rump: rumpuser.h src/sys/rump/librump/rumpkern: vm.c Log Message: PR kern/57626: instead of an (arbitrary) FAKE_PAGE_SHIFT (and always using 4k pages), query the hypervisor for the real page size of the host kernel and use that for architectures that do not have compile time constant page sizes. To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/lib/librumpuser/rumpuser.c cvs rdiff -u -r1.116 -r1.117 src/sys/rump/include/rump/rumpuser.h cvs rdiff -u -r1.196 -r1.197 src/sys/rump/librump/rumpkern/vm.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/macppc/dev
Module Name:src Committed By: andvar Date: Sun Sep 24 08:20:06 UTC 2023 Modified Files: src/sys/arch/macppc/dev: mesh.c Log Message: define i variable in for loop. mesh_msgin() doesn't have one defined in the function scope. fixes MESH_DEBUG enabled build for macppc. To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/macppc/dev/mesh.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/macppc/dev
Module Name:src
Committed By: andvar
Date: Sun Sep 24 08:20:06 UTC 2023
Modified Files:
src/sys/arch/macppc/dev: mesh.c
Log Message:
define i variable in for loop.
mesh_msgin() doesn't have one defined in the function scope.
fixes MESH_DEBUG enabled build for macppc.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/macppc/dev/mesh.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/macppc/dev/mesh.c
diff -u src/sys/arch/macppc/dev/mesh.c:1.42 src/sys/arch/macppc/dev/mesh.c:1.43
--- src/sys/arch/macppc/dev/mesh.c:1.42 Sat Aug 7 16:18:57 2021
+++ src/sys/arch/macppc/dev/mesh.c Sun Sep 24 08:20:06 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.42 2021/08/07 16:18:57 thorpej Exp $ */
+/* $NetBSD: mesh.c,v 1.43 2023/09/24 08:20:06 andvar Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.42 2021/08/07 16:18:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.43 2023/09/24 08:20:06 andvar Exp $");
#include
#include
@@ -694,7 +694,7 @@ mesh_msgin(struct mesh_softc *sc, struct
gotit:
#ifdef MESH_DEBUG
printf("msgin:");
- for (i = 0; i < sc->sc_imsglen; i++)
+ for (int i = 0; i < sc->sc_imsglen; i++)
printf(" 0x%02x", sc->sc_imsg[i]);
printf("\n");
#endif
