CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sun Apr 14 07:56:13 UTC 2024 Modified Files: src/sys/arch/arm/arm: sig_machdep.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/sig_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/arm/arm/sig_machdep.c diff -u src/sys/arch/arm/arm/sig_machdep.c:1.52 src/sys/arch/arm/arm/sig_machdep.c:1.53 --- src/sys/arch/arm/arm/sig_machdep.c:1.52 Mon Feb 1 19:31:34 2021 +++ src/sys/arch/arm/arm/sig_machdep.c Sun Apr 14 07:56:13 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sig_machdep.c,v 1.52 2021/02/01 19:31:34 skrll Exp $ */ +/* $NetBSD: sig_machdep.c,v 1.53 2024/04/14 07:56:13 skrll Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -44,7 +44,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.52 2021/02/01 19:31:34 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.53 2024/04/14 07:56:13 skrll Exp $"); #include /* XXX only needed by syscallargs.h */ #include @@ -97,10 +97,10 @@ sendsig_siginfo(const ksiginfo_t *ksi, c sig_t catcher = SIGACTION(p, sig).sa_handler; fp = getframe(l, sig, ); - + /* make room on the stack */ fp--; - + /* make the stack aligned */ fp = (struct sigframe_siginfo *)STACK_ALIGN(fp, STACK_ALIGNBYTES); @@ -134,7 +134,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c * trampoline version numbers are coordinated with machine- * dependent code in libc. */ - + tf->tf_r0 = sig; tf->tf_r1 = (int)>sf_si; tf->tf_r2 = (int)>sf_uc;
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sun Apr 14 07:56:13 UTC 2024 Modified Files: src/sys/arch/arm/arm: sig_machdep.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/sig_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: andvar
Date: Mon Jan 15 19:34:13 UTC 2024
Modified Files:
src/sys/arch/arm/arm: disksubr_acorn.c
Log Message:
Replace format specifier from %08x to PRId64 for bp->blkno.
Exchange incorrectly placed printf() __func__ and loop arguments.
Fixes DEBUG_LABEL enabled build for acorn32.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm/disksubr_acorn.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/arm/arm/disksubr_acorn.c
diff -u src/sys/arch/arm/arm/disksubr_acorn.c:1.13 src/sys/arch/arm/arm/disksubr_acorn.c:1.14
--- src/sys/arch/arm/arm/disksubr_acorn.c:1.13 Tue Sep 29 02:58:52 2020
+++ src/sys/arch/arm/arm/disksubr_acorn.c Mon Jan 15 19:34:13 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: disksubr_acorn.c,v 1.13 2020/09/29 02:58:52 msaitoh Exp $ */
+/* $NetBSD: disksubr_acorn.c,v 1.14 2024/01/15 19:34:13 andvar Exp $ */
/*
* Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
@@ -97,7 +97,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: disksubr_acorn.c,v 1.13 2020/09/29 02:58:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disksubr_acorn.c,v 1.14 2024/01/15 19:34:13 andvar Exp $");
#include
#include
@@ -255,7 +255,7 @@ filecore_label_read(dev_t dev, void (*st
bp->b_blkno = cyl * heads * sectors;
#ifdef DEBUG_LABEL
- printf("%s: Found RiscIX partition table @ %08x\n",
+ printf("%s: Found RiscIX partition table @ %" PRId64 "\n",
__func__, bp->b_blkno);
#endif
bp->b_cylinder = bp->b_blkno / lp->d_secpercyl;
@@ -277,8 +277,8 @@ filecore_label_read(dev_t dev, void (*st
rpt = (struct riscix_partition_table *)bp->b_data;
#ifdef DEBUG_LABEL
for (loop = 0; loop < NRISCIX_PARTITIONS; ++loop)
- printf("%s: p%d: %16s %08x %08x %08x\n", loop,
- __func__, rpt->partitions[loop].rp_name,
+ printf("%s: p%d: %16s %08x %08x %08x\n", __func__,
+ loop, rpt->partitions[loop].rp_name,
rpt->partitions[loop].rp_start,
rpt->partitions[loop].rp_length,
rpt->partitions[loop].rp_type);
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: andvar Date: Mon Jan 15 19:34:13 UTC 2024 Modified Files: src/sys/arch/arm/arm: disksubr_acorn.c Log Message: Replace format specifier from %08x to PRId64 for bp->blkno. Exchange incorrectly placed printf() __func__ and loop arguments. Fixes DEBUG_LABEL enabled build for acorn32. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm/disksubr_acorn.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/arm/arm
Module Name:src
Committed By: rin
Date: Tue Nov 7 13:31:26 UTC 2023
Modified Files:
src/sys/arch/arm/arm: smccc.c
Log Message:
smccc: Adjust SMCCC_ARCH_ATTRIBUTE for clang/arm
Conditionally use
(1) __attribute__ ((target("arch=armv7ve")))
(2) __attribute__ ((target("armv7ve")))
for gcc and clang, respectively.
While gcc does not accept (2), clang accepts (1) but silently ignores it :(
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/smccc.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/arm/arm/smccc.c
diff -u src/sys/arch/arm/arm/smccc.c:1.3 src/sys/arch/arm/arm/smccc.c:1.4
--- src/sys/arch/arm/arm/smccc.c:1.3 Sun Aug 8 13:43:09 2021
+++ src/sys/arch/arm/arm/smccc.c Tue Nov 7 13:31:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $ */
+/* $NetBSD: smccc.c,v 1.4 2023/11/07 13:31:26 rin Exp $ */
/*-
* Copyright (c) 2021 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.3 2021/08/08 13:43:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.4 2023/11/07 13:31:26 rin Exp $");
#include
#include
@@ -36,7 +36,11 @@ __KERNEL_RCSID(0, "$NetBSD: smccc.c,v 1.
#include
#if defined(__arm__)
+# if defined(__clang__)
+#define SMCCC_ARCH_ATTRIBUTE __attribute__ ((target("armv7ve")))
+# else /* gcc */
#define SMCCC_ARCH_ATTRIBUTE __attribute__ ((target("arch=armv7ve")))
+# endif
#else
#define SMCCC_ARCH_ATTRIBUTE
#endif
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: rin
Date: Tue Nov 7 13:31:26 UTC 2023
Modified Files:
src/sys/arch/arm/arm: smccc.c
Log Message:
smccc: Adjust SMCCC_ARCH_ATTRIBUTE for clang/arm
Conditionally use
(1) __attribute__ ((target("arch=armv7ve")))
(2) __attribute__ ((target("armv7ve")))
for gcc and clang, respectively.
While gcc does not accept (2), clang accepts (1) but silently ignores it :(
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/smccc.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Mar 4 08:52:20 UTC 2023 Modified Files: src/sys/arch/arm/arm: compat_16_machdep.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm/compat_16_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Mar 4 08:52:20 UTC 2023
Modified Files:
src/sys/arch/arm/arm: compat_16_machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm/compat_16_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/arm/arm/compat_16_machdep.c
diff -u src/sys/arch/arm/arm/compat_16_machdep.c:1.20 src/sys/arch/arm/arm/compat_16_machdep.c:1.21
--- src/sys/arch/arm/arm/compat_16_machdep.c:1.20 Wed Oct 27 04:14:59 2021
+++ src/sys/arch/arm/arm/compat_16_machdep.c Sat Mar 4 08:52:19 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.20 2021/10/27 04:14:59 thorpej Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.21 2023/03/04 08:52:19 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.20 2021/10/27 04:14:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.21 2023/03/04 08:52:19 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -172,7 +172,7 @@ sendsig_sigcontext(const ksiginfo_t *ksi
tf->tf_spsr &= ~PSR_T_bit;
#endif
tf->tf_usr_sp = (int)fp;
-
+
switch (ps->sa_sigdesc[sig].sd_vers) {
case __SIGTRAMP_SIGCODE_VERSION: /* legacy on-stack sigtramp */
tf->tf_usr_lr = (int)p->p_sigctx.ps_sigcode;
@@ -219,7 +219,7 @@ compat_16_sys___sigreturn14(struct lwp *
*/
if (uap == NULL)
return (EFAULT);
-
+
/*
* The trampoline code hands us the context.
* It is unsafe to keep track of it ourselves, in the event that a
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Thu Oct 20 06:58:38 UTC 2022
Modified Files:
src/sys/arch/arm/arm: bcopyinout.S bcopyinout_xscale.S blockio.S
copystr.S cpu_in_cksum.S cpufunc_asm_arm10.S cpufunc_asm_arm67.S
cpufunc_asm_arm7tdmi.S cpufunc_asm_arm8.S cpufunc_asm_arm9.S
cpufunc_asm_armv4.S cpufunc_asm_armv5.S cpufunc_asm_fa526.S
cpufunc_asm_pj4b.S cpufunc_asm_sa1.S cpufunc_asm_xscale.S vectors.S
Log Message:
Trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm/bcopyinout.S
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm/bcopyinout_xscale.S \
src/sys/arch/arm/arm/cpufunc_asm_arm10.S \
src/sys/arch/arm/arm/cpufunc_asm_arm9.S
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/blockio.S \
src/sys/arch/arm/arm/cpufunc_asm_armv5.S
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm/copystr.S \
src/sys/arch/arm/arm/cpufunc_asm_pj4b.S
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm/cpu_in_cksum.S
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/cpufunc_asm_arm67.S \
src/sys/arch/arm/arm/cpufunc_asm_arm7tdmi.S \
src/sys/arch/arm/arm/cpufunc_asm_fa526.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/cpufunc_asm_arm8.S \
src/sys/arch/arm/arm/vectors.S
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm/cpufunc_asm_armv4.S
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/arm/cpufunc_asm_sa1.S
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm/cpufunc_asm_xscale.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/arm/arm/bcopyinout.S
diff -u src/sys/arch/arm/arm/bcopyinout.S:1.22 src/sys/arch/arm/arm/bcopyinout.S:1.23
--- src/sys/arch/arm/arm/bcopyinout.S:1.22 Fri Dec 11 09:14:19 2020
+++ src/sys/arch/arm/arm/bcopyinout.S Thu Oct 20 06:58:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout.S,v 1.22 2020/12/11 09:14:19 dholland Exp $ */
+/* $NetBSD: bcopyinout.S,v 1.23 2022/10/20 06:58:38 skrll Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -52,14 +52,14 @@
#include "bcopyinout_xscale.S"
#else
-RCSID("$NetBSD: bcopyinout.S,v 1.22 2020/12/11 09:14:19 dholland Exp $")
+RCSID("$NetBSD: bcopyinout.S,v 1.23 2022/10/20 06:58:38 skrll Exp $")
.text
.align 0
#define SAVE_REGS stmfd sp!, {r4-r11}
#define RESTORE_REGS ldmfd sp!, {r4-r11}
-
+
#if defined(__XSCALE__) || defined(_ARM_ARCH_6)
#define HELLOCPP #
#define PREFETCH(rx,o) pld [ rx , HELLOCPP (o) ]
@@ -78,7 +78,7 @@ RCSID("$NetBSD: bcopyinout.S,v 1.22 2020
* r4-r11 are scratch
*/
ENTRY(copyin)
- /* Quick exit if length is zero */
+ /* Quick exit if length is zero */
teq r2, #0
moveq r0, #0
RETc(eq)
@@ -291,7 +291,7 @@ END(copyin)
*/
ENTRY(copyout)
- /* Quick exit if length is zero */
+ /* Quick exit if length is zero */
teq r2, #0
moveq r0, #0
moveq pc, lr
@@ -494,7 +494,7 @@ END(copyout)
*/
ENTRY(kcopy)
- /* Quick exit if length is zero */
+ /* Quick exit if length is zero */
teq r2, #0
moveq r0, #0
moveq pc, lr
Index: src/sys/arch/arm/arm/bcopyinout_xscale.S
diff -u src/sys/arch/arm/arm/bcopyinout_xscale.S:1.11 src/sys/arch/arm/arm/bcopyinout_xscale.S:1.12
--- src/sys/arch/arm/arm/bcopyinout_xscale.S:1.11 Sun Dec 1 02:54:33 2013
+++ src/sys/arch/arm/arm/bcopyinout_xscale.S Thu Oct 20 06:58:38 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout_xscale.S,v 1.11 2013/12/01 02:54:33 joerg Exp $ */
+/* $NetBSD: bcopyinout_xscale.S,v 1.12 2022/10/20 06:58:38 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-RCSID("$NetBSD: bcopyinout_xscale.S,v 1.11 2013/12/01 02:54:33 joerg Exp $")
+RCSID("$NetBSD: bcopyinout_xscale.S,v 1.12 2022/10/20 06:58:38 skrll Exp $")
.text
.align 0
@@ -292,10 +292,10 @@ ENTRY(copyin)
str r6, [r1], #0x04
str r7, [r1], #0x04
.Lcopyin_bad1:
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lcopyin_bad1_loop16
- adds r2, r2, #0x10
+ adds r2, r2, #0x10
popeq {r4-r7}
RETc(eq) /* Return now if done */
subs r2, r2, #0x04
@@ -353,10 +353,10 @@ ENTRY(copyin)
str r6, [r1], #0x04
str r7, [r1], #0x04
.Lcopyin_bad2:
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lcopyin_bad2_loop16
- adds r2, r2, #0x10
+ adds r2, r2, #0x10
popeq {r4-r7}
RETc(eq) /* Return now if done */
subs r2, r2, #0x04
@@ -414,10 +414,10 @@ ENTRY(copyin)
str r6, [r1], #0x04
str r7, [r1], #0x04
.Lcopyin_bad3:
- subs r2, r2, #0x10
+ subs r2, r2, #0x10
bge .Lcopyin_bad3_loop16
- adds r2, r2, #0x10
+ adds r2, r2, #0x10
popeq {r4-r7}
RETc(eq) /* Return now if done */
subs r2, r2, #0x04
@@ -445,7 +445,7 @@ ENTRY(copyin)
pop {r4-r7}
mov r3, #0x00
adds r2, r2, #0x04
- RETc(eq)
+ RETc(eq)
.Lcopyin_l4_2:
rsbs r2, r2, #0x03
addne pc, pc, r2, lsl #3
@@ -732,10 +732,10 @@ ENTRY(copyout)
strt r6, [r1], #0x04
strt r7, [r1],
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Thu Oct 20 06:58:38 UTC 2022 Modified Files: src/sys/arch/arm/arm: bcopyinout.S bcopyinout_xscale.S blockio.S copystr.S cpu_in_cksum.S cpufunc_asm_arm10.S cpufunc_asm_arm67.S cpufunc_asm_arm7tdmi.S cpufunc_asm_arm8.S cpufunc_asm_arm9.S cpufunc_asm_armv4.S cpufunc_asm_armv5.S cpufunc_asm_fa526.S cpufunc_asm_pj4b.S cpufunc_asm_sa1.S cpufunc_asm_xscale.S vectors.S Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/arm/bcopyinout.S cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm/bcopyinout_xscale.S \ src/sys/arch/arm/arm/cpufunc_asm_arm10.S \ src/sys/arch/arm/arm/cpufunc_asm_arm9.S cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/blockio.S \ src/sys/arch/arm/arm/cpufunc_asm_armv5.S cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm/copystr.S \ src/sys/arch/arm/arm/cpufunc_asm_pj4b.S cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm/cpu_in_cksum.S cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/cpufunc_asm_arm67.S \ src/sys/arch/arm/arm/cpufunc_asm_arm7tdmi.S \ src/sys/arch/arm/arm/cpufunc_asm_fa526.S cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/cpufunc_asm_arm8.S \ src/sys/arch/arm/arm/vectors.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm/cpufunc_asm_armv4.S cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/arm/cpufunc_asm_sa1.S cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm/cpufunc_asm_xscale.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/arm/arm
Module Name:src
Committed By: jmcneill
Date: Sat Oct 15 11:19:23 UTC 2022
Modified Files:
src/sys/arch/arm/arm: efi_runtime.c
Log Message:
Add a boot option to disable EFI runtime services.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm/efi_runtime.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/arm/arm/efi_runtime.c
diff -u src/sys/arch/arm/arm/efi_runtime.c:1.9 src/sys/arch/arm/arm/efi_runtime.c:1.10
--- src/sys/arch/arm/arm/efi_runtime.c:1.9 Sat Jun 18 08:13:44 2022
+++ src/sys/arch/arm/arm/efi_runtime.c Sat Oct 15 11:19:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.c,v 1.9 2022/06/18 08:13:44 skrll Exp $ */
+/* $NetBSD: efi_runtime.c,v 1.10 2022/10/15 11:19:23 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "efi.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.9 2022/06/18 08:13:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.10 2022/10/15 11:19:23 jmcneill Exp $");
#include
#include
@@ -43,6 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: efi_runtime.
#include
#include
+#include
#ifdef _LP64
#define EFIERR(x) (0x8000 | x)
@@ -77,6 +78,12 @@ arm_efirt_init(paddr_t efi_system_table)
const size_t sz = PAGE_SIZE * 2;
vaddr_t va, cva;
paddr_t cpa;
+ int val;
+
+ if (get_bootconf_option(boot_args, "noefirt",
+BOOTOPT_TYPE_BOOLEAN, ) && val) {
+ return ENXIO;
+ }
va = uvm_km_alloc(kernel_map, sz, 0, UVM_KMF_VAONLY);
if (va == 0) {
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: jmcneill Date: Sat Oct 15 11:19:23 UTC 2022 Modified Files: src/sys/arch/arm/arm: efi_runtime.c Log Message: Add a boot option to disable EFI runtime services. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm/efi_runtime.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Jun 18 08:13:44 UTC 2022 Modified Files: src/sys/arch/arm/arm: efi_runtime.c Log Message: Simplify (imo) #ifdefs a little. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/efi_runtime.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/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Jun 18 08:13:44 UTC 2022
Modified Files:
src/sys/arch/arm/arm: efi_runtime.c
Log Message:
Simplify (imo) #ifdefs a little.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/efi_runtime.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/arm/arm/efi_runtime.c
diff -u src/sys/arch/arm/arm/efi_runtime.c:1.8 src/sys/arch/arm/arm/efi_runtime.c:1.9
--- src/sys/arch/arm/arm/efi_runtime.c:1.8 Sun Apr 3 09:49:36 2022
+++ src/sys/arch/arm/arm/efi_runtime.c Sat Jun 18 08:13:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.c,v 1.8 2022/04/03 09:49:36 martin Exp $ */
+/* $NetBSD: efi_runtime.c,v 1.9 2022/06/18 08:13:44 skrll Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "efi.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.8 2022/04/03 09:49:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.9 2022/06/18 08:13:44 skrll Exp $");
#include
#include
@@ -57,9 +57,8 @@ static kmutex_t efi_lock;
static struct efi_rt *RT;
#if BYTE_ORDER == LITTLE_ENDIAN
static struct efi_rt efi_rtcopy;
-#endif
-#if NEFI > 0 && BYTE_ORDER == LITTLE_ENDIAN
+#if NEFI > 0
static struct efi_ops arm_efi_ops = {
.efi_gettime = arm_efirt_gettime,
.efi_settime = arm_efirt_settime,
@@ -68,6 +67,7 @@ static struct efi_ops arm_efi_ops = {
.efi_nextvar = arm_efirt_nextvar,
};
#endif
+#endif
int
arm_efirt_init(paddr_t efi_system_table)
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Mon May 16 07:07:17 UTC 2022 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: port-arm/50635: arm11_setup() cpuctrlmask value causes CPU_CONTROL_VECRELOC bit to toggle Fix slightly differently to as suggested in the PR. Annotate arm10_setup while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/sys/arch/arm/arm/cpufunc.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/arm/arm/cpufunc.c diff -u src/sys/arch/arm/arm/cpufunc.c:1.183 src/sys/arch/arm/arm/cpufunc.c:1.184 --- src/sys/arch/arm/arm/cpufunc.c:1.183 Sat Nov 27 08:51:01 2021 +++ src/sys/arch/arm/arm/cpufunc.c Mon May 16 07:07:17 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.c,v 1.183 2021/11/27 08:51:01 skrll Exp $ */ +/* $NetBSD: cpufunc.c,v 1.184 2022/05/16 07:07:17 skrll Exp $ */ /* * arm7tdmi support code Copyright (c) 2001 John Fremlin @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.183 2021/11/27 08:51:01 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.184 2022/05/16 07:07:17 skrll Exp $"); #include "opt_arm_start.h" #include "opt_compat_netbsd.h" @@ -2713,7 +2713,7 @@ arm10_setup(char *args) | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE - | CPU_CONTROL_BPRD_ENABLE + | CPU_CONTROL_BPRD_ENABLE | CPU_CONTROL_VECRELOC | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK; #endif @@ -2776,7 +2776,8 @@ arm11_setup(char *args) int cpuctrlmask = cpuctrl | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE - | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK; + | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK + | CPU_CONTROL_VECRELOC; #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Mon May 16 07:07:17 UTC 2022 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: port-arm/50635: arm11_setup() cpuctrlmask value causes CPU_CONTROL_VECRELOC bit to toggle Fix slightly differently to as suggested in the PR. Annotate arm10_setup while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.183 -r1.184 src/sys/arch/arm/arm/cpufunc.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/arm/arm
Module Name:src
Committed By: martin
Date: Sun Apr 3 09:49:37 UTC 2022
Modified Files:
src/sys/arch/arm/arm: efi_runtime.c
Log Message:
efi_rtcopy is only used on little endian kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/efi_runtime.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/arm/arm/efi_runtime.c
diff -u src/sys/arch/arm/arm/efi_runtime.c:1.7 src/sys/arch/arm/arm/efi_runtime.c:1.8
--- src/sys/arch/arm/arm/efi_runtime.c:1.7 Sat Apr 2 11:16:06 2022
+++ src/sys/arch/arm/arm/efi_runtime.c Sun Apr 3 09:49:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.c,v 1.7 2022/04/02 11:16:06 skrll Exp $ */
+/* $NetBSD: efi_runtime.c,v 1.8 2022/04/03 09:49:36 martin Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "efi.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.7 2022/04/02 11:16:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.8 2022/04/03 09:49:36 martin Exp $");
#include
#include
@@ -55,7 +55,9 @@ __KERNEL_RCSID(0, "$NetBSD: efi_runtime.
static kmutex_t efi_lock;
static struct efi_rt *RT;
+#if BYTE_ORDER == LITTLE_ENDIAN
static struct efi_rt efi_rtcopy;
+#endif
#if NEFI > 0 && BYTE_ORDER == LITTLE_ENDIAN
static struct efi_ops arm_efi_ops = {
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: martin Date: Sun Apr 3 09:49:37 UTC 2022 Modified Files: src/sys/arch/arm/arm: efi_runtime.c Log Message: efi_rtcopy is only used on little endian kernels. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/efi_runtime.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Jan 8 09:01:00 UTC 2022 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c diff -u src/sys/arch/arm/arm/undefined.c:1.73 src/sys/arch/arm/arm/undefined.c:1.74 --- src/sys/arch/arm/arm/undefined.c:1.73 Sat Jan 8 09:00:23 2022 +++ src/sys/arch/arm/arm/undefined.c Sat Jan 8 09:01:00 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: undefined.c,v 1.73 2022/01/08 09:00:23 skrll Exp $ */ +/* $NetBSD: undefined.c,v 1.74 2022/01/08 09:01:00 skrll Exp $ */ /* * Copyright (c) 2001 Ben Harris. @@ -50,14 +50,14 @@ #include "opt_kgdb.h" #include -__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.73 2022/01/08 09:00:23 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.74 2022/01/08 09:01:00 skrll Exp $"); #include #include -#include #ifdef KGDB #include #endif +#include #include #include #include
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Jan 8 09:01:00 UTC 2022 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/arch/arm/arm/undefined.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Jan 8 09:00:23 UTC 2022 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: Make VERBOSE_ARM32 compile again and reduce #ifdefs while I'm here To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/arch/arm/arm/undefined.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/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Jan 8 09:00:23 UTC 2022
Modified Files:
src/sys/arch/arm/arm: undefined.c
Log Message:
Make VERBOSE_ARM32 compile again and reduce #ifdefs while I'm here
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.72 src/sys/arch/arm/arm/undefined.c:1.73
--- src/sys/arch/arm/arm/undefined.c:1.72 Sun Oct 31 16:23:47 2021
+++ src/sys/arch/arm/arm/undefined.c Sat Jan 8 09:00:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.72 2021/10/31 16:23:47 skrll Exp $ */
+/* $NetBSD: undefined.c,v 1.73 2022/01/08 09:00:23 skrll Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -50,7 +50,7 @@
#include "opt_kgdb.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.72 2021/10/31 16:23:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.73 2022/01/08 09:00:23 skrll Exp $");
#include
#include
@@ -71,7 +71,9 @@ __KERNEL_RCSID(0, "$NetBSD: undefined.c,
#include
#include
+#ifdef VERBOSE_ARM32
#include
+#endif
#ifdef DDB
#include
@@ -307,9 +309,6 @@ undefinedinstruction(trapframe_t *tf)
int coprocessor;
int user;
struct undefined_handler *uh;
-#ifdef VERBOSE_ARM32
- int s;
-#endif
curcpu()->ci_und_ev.ev_count++;
@@ -441,7 +440,7 @@ undefinedinstruction(trapframe_t *tf)
ksiginfo_t ksi;
#ifdef VERBOSE_ARM32
- s = spltty();
+ int s = spltty();
if ((fault_instruction & 0x0f10) == 0x0e00) {
printf("CDP\n");
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Nov 27 08:51:01 UTC 2021
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
Apply some errata workarounds for Cortex A17
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/arm/arm/cpufunc.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/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.182 src/sys/arch/arm/arm/cpufunc.c:1.183
--- src/sys/arch/arm/arm/cpufunc.c:1.182 Sat Nov 13 01:48:12 2021
+++ src/sys/arch/arm/arm/cpufunc.c Sat Nov 27 08:51:01 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.182 2021/11/13 01:48:12 jmcneill Exp $ */
+/* $NetBSD: cpufunc.c,v 1.183 2021/11/27 08:51:01 skrll Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.182 2021/11/13 01:48:12 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.183 2021/11/27 08:51:01 skrll Exp $");
#include "opt_arm_start.h"
#include "opt_compat_netbsd.h"
@@ -3008,6 +3008,24 @@ armv7_setup(char *args)
} else if (CPU_ID_CORTEX_A12_P(lcputype) ||
CPU_ID_CORTEX_A17_P(lcputype)) {
actlr_set = CORTEXA17_ACTLR_SMP;
+ uint32_t diagset = 0;
+ const uint16_t varrev =
+ __SHIFTIN(__SHIFTOUT(lcputype, CPU_ID_VARIANT_MASK), __BITS(7,4)) |
+ __SHIFTIN(__SHIFTOUT(lcputype, CPU_ID_REVISION_MASK), __BITS(3,0)) |
+ 0;
+ /* Errata 852421 exists upto r1p2 */
+ if (varrev < 0x12) {
+ diagset |= __BIT(24);
+ }
+ /* Errata 852423 exists upto r1p2 */
+ if (varrev < 0x12) {
+ diagset |= __BIT(12);
+ }
+ /* Errata 857272 */
+ diagset |= __BITS(11,10);
+
+ const uint32_t dgnctlr1 = armreg_dgnctlr1_read();
+ armreg_dgnctlr1_write(dgnctlr1 | diagset);
} else if (CPU_ID_CORTEX_A53_P(lcputype)) {
} else if (CPU_ID_CORTEX_A57_P(lcputype)) {
} else if (CPU_ID_CORTEX_A72_P(lcputype)) {
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Nov 27 08:51:01 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Apply some errata workarounds for Cortex A17 To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 src/sys/arch/arm/arm/cpufunc.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/arm/arm
Module Name:src Committed By: skrll Date: Thu Nov 11 07:26:41 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm.S Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/arm/cpufunc_asm.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/arm/arm/cpufunc_asm.S diff -u src/sys/arch/arm/arm/cpufunc_asm.S:1.16 src/sys/arch/arm/arm/cpufunc_asm.S:1.17 --- src/sys/arch/arm/arm/cpufunc_asm.S:1.16 Sun Aug 18 06:28:18 2013 +++ src/sys/arch/arm/arm/cpufunc_asm.S Thu Nov 11 07:26:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm.S,v 1.16 2013/08/18 06:28:18 matt Exp $ */ +/* $NetBSD: cpufunc_asm.S,v 1.17 2021/11/11 07:26:41 skrll Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -34,13 +34,13 @@ * * RiscBSD kernel project * - * cpufunc.S + * cpufunc.S * * Assembly functions for CPU / MMU / TLB specific operations * * Created : 30/01/97 */ - + #include #include @@ -91,13 +91,13 @@ END(cpufunc_faultaddress) * Generic functions to write the internal coprocessor registers * * - * Currently these registers are + * Currently these registers are * c1 - CPU Control * c3 - Domain Access Control * * All other registers are CPU architecture specific */ - + #if 0 /* See below. */ ENTRY(cpufunc_control) mcr p15, 0, r0, c1, c0, 0 @@ -113,12 +113,12 @@ END(cpufunc_domains) * Generic functions to read/modify/write the internal coprocessor registers * * - * Currently these registers are + * Currently these registers are * c1 - CPU Control * * All other registers are CPU architecture specific */ - + ENTRY(cpufunc_control) mrc p15, 0, r3, c1, c0, 0 /* Read the control register */ bics r2, r3, r0 /* Clear bits */
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Thu Nov 11 07:26:41 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm.S Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/arm/cpufunc_asm.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Oct 30 09:23:10 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: Remove stale comment To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c diff -u src/sys/arch/arm/arm/undefined.c:1.70 src/sys/arch/arm/arm/undefined.c:1.71 --- src/sys/arch/arm/arm/undefined.c:1.70 Sat Oct 30 08:20:35 2021 +++ src/sys/arch/arm/arm/undefined.c Sat Oct 30 09:23:10 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: undefined.c,v 1.70 2021/10/30 08:20:35 skrll Exp $ */ +/* $NetBSD: undefined.c,v 1.71 2021/10/30 09:23:10 skrll Exp $ */ /* * Copyright (c) 2001 Ben Harris. @@ -49,7 +49,7 @@ #include "opt_kgdb.h" #include -__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.70 2021/10/30 08:20:35 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.71 2021/10/30 09:23:10 skrll Exp $"); #include #include @@ -347,7 +347,6 @@ undefinedinstruction(trapframe_t *tf) fault_instruction = read_insn(fault_pc, user); } - /* Update vmmeter statistics */ curcpu()->ci_data.cpu_ntrap++; #ifdef THUMB_CODE
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Oct 30 09:23:10 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: Remove stale comment To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/arm/undefined.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Oct 30 08:20:35 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: KNF and remove (some) unnecessary #includes To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c diff -u src/sys/arch/arm/arm/undefined.c:1.69 src/sys/arch/arm/arm/undefined.c:1.70 --- src/sys/arch/arm/arm/undefined.c:1.69 Sat Oct 30 08:10:48 2021 +++ src/sys/arch/arm/arm/undefined.c Sat Oct 30 08:20:35 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: undefined.c,v 1.69 2021/10/30 08:10:48 skrll Exp $ */ +/* $NetBSD: undefined.c,v 1.70 2021/10/30 08:20:35 skrll Exp $ */ /* * Copyright (c) 2001 Ben Harris. @@ -48,22 +48,19 @@ #include "opt_dtrace.h" #include "opt_kgdb.h" +#include +__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.70 2021/10/30 08:20:35 skrll Exp $"); + #include +#include +#include #ifdef KGDB #include #endif - -__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.69 2021/10/30 08:10:48 skrll Exp $"); - -#include +#include #include #include #include -#include -#include -#include -#include -#include #include
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Oct 30 08:20:35 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: KNF and remove (some) unnecessary #includes To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/arm/arm/undefined.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/arm/arm
Module Name:src Committed By: skrll Date: Sat Oct 30 08:10:49 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: Use designated initialisers for static handlers and reduce the kernel size a little. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/arm/arm/undefined.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/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Oct 30 08:10:49 UTC 2021
Modified Files:
src/sys/arch/arm/arm: undefined.c
Log Message:
Use designated initialisers for static handlers and reduce the kernel size
a little.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.68 src/sys/arch/arm/arm/undefined.c:1.69
--- src/sys/arch/arm/arm/undefined.c:1.68 Tue Oct 26 06:34:02 2021
+++ src/sys/arch/arm/arm/undefined.c Sat Oct 30 08:10:48 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.68 2021/10/26 06:34:02 skrll Exp $ */
+/* $NetBSD: undefined.c,v 1.69 2021/10/30 08:10:48 skrll Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -53,7 +53,7 @@
#include
#endif
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.68 2021/10/26 06:34:02 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.69 2021/10/30 08:10:48 skrll Exp $");
#include
#include
@@ -202,10 +202,16 @@ gdb_trapper(u_int addr, u_int insn, stru
return 1;
}
-static struct undefined_handler cp15_uh;
-static struct undefined_handler gdb_uh;
+static struct undefined_handler cp15_uh = {
+ .uh_handler = cp15_trapper,
+};
+static struct undefined_handler gdb_uh = {
+ .uh_handler = gdb_trapper,
+};
#ifdef THUMB_CODE
-static struct undefined_handler gdb_uh_thumb;
+static struct undefined_handler gdb_uh_thumb = {
+ .uh_handler = gdb_trapper,
+};
#endif
#ifdef KDTRACE_HOOKS
@@ -249,14 +255,11 @@ undefined_init(void)
LIST_INIT(_handlers[loop]);
/* Install handler for CP15 emulation */
- cp15_uh.uh_handler = cp15_trapper;
install_coproc_handler_static(SYSTEM_COPROC, _uh);
/* Install handler for GDB breakpoints */
- gdb_uh.uh_handler = gdb_trapper;
install_coproc_handler_static(CORE_UNKNOWN_HANDLER, _uh);
#ifdef THUMB_CODE
- gdb_uh_thumb.uh_handler = gdb_trapper;
install_coproc_handler_static(THUMB_UNKNOWN_HANDLER, _uh_thumb);
#endif
}
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Tue Oct 26 06:34:03 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: G/C FAST_FPE To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/arm/arm/undefined.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/arm/arm/undefined.c diff -u src/sys/arch/arm/arm/undefined.c:1.67 src/sys/arch/arm/arm/undefined.c:1.68 --- src/sys/arch/arm/arm/undefined.c:1.67 Mon Sep 21 10:35:12 2020 +++ src/sys/arch/arm/arm/undefined.c Tue Oct 26 06:34:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: undefined.c,v 1.67 2020/09/21 10:35:12 skrll Exp $ */ +/* $NetBSD: undefined.c,v 1.68 2021/10/26 06:34:02 skrll Exp $ */ /* * Copyright (c) 2001 Ben Harris. @@ -44,8 +44,6 @@ * Created : 06/01/95 */ -#define FAST_FPE - #include "opt_ddb.h" #include "opt_dtrace.h" #include "opt_kgdb.h" @@ -55,7 +53,7 @@ #include #endif -__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.67 2020/09/21 10:35:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.68 2021/10/26 06:34:02 skrll Exp $"); #include #include @@ -65,9 +63,6 @@ __KERNEL_RCSID(0, "$NetBSD: undefined.c, #include #include #include -#ifdef FAST_FPE -#include -#endif #include #include
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Tue Oct 26 06:34:03 UTC 2021 Modified Files: src/sys/arch/arm/arm: undefined.c Log Message: G/C FAST_FPE To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.68 src/sys/arch/arm/arm/undefined.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/arm/arm
Oops, forgot to mention: No binary changes. On 2021/10/07 18:58, Rin Okuyama wrote: Module Name:src Committed By: rin Date: Thu Oct 7 09:58:27 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv5_ec.S Log Message: Reduce diff with cpufunc_asm_armv5.S, from which this file was derived. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.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/arm/arm
Module Name:src Committed By: rin Date: Thu Oct 7 09:58:27 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv5_ec.S Log Message: Reduce diff with cpufunc_asm_armv5.S, from which this file was derived. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.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/arm/arm/cpufunc_asm_armv5_ec.S diff -u src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.6 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.7 --- src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S:1.6 Sun Mar 30 01:15:03 2014 +++ src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.S Thu Oct 7 09:58:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm_armv5_ec.S,v 1.6 2014/03/30 01:15:03 matt Exp $ */ +/* $NetBSD: cpufunc_asm_armv5_ec.S,v 1.7 2021/10/07 09:58:27 rin Exp $ */ /* * Copyright (c) 2002, 2005 ARM Limited @@ -58,16 +58,16 @@ ENTRY(armv5_ec_setttb) * For armv5_ec_settb, the idcache_wbinv_all is simple enough, I just * do it directly and entirely avoid the problem. */ - cmp r1, #0 @ need to flush cache / TLB? - beq 2f @ nope, so don't + cmp r1, #0 + beq 1f mcr p15, 0, r0, c7, c5, 0 /* Invalidate ICache */ -1: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */ - bne 1b /* More to do? */ +2: mrc p15, 0, APSR_nzcv, c7, c14, 3 /* Test, clean and invalidate DCache */ + bne 2b /* More to do? */ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ cmp r0, #1 -2: mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ +1: mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ mcrne p15, 0, r0, c8, c7, 0 /* invalidate I+D TLBs */ RET @@ -199,7 +199,7 @@ ENTRY_NP(armv5_ec_idcache_wbinv_all) * dcache, so that we can safely flush the Icache and fall through * into the Dcache purging code. */ - mcr p15, 0, r0, c7, c5, 0 /* Invalidate ICache */ + mcr p15, 0, r0, c7, c5, 0 /* Flush I cache */ /* Fall through to purge Dcache. */ ENTRY(armv5_ec_dcache_wbinv_all)
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: rin Date: Thu Oct 7 09:58:27 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv5_ec.S Log Message: Reduce diff with cpufunc_asm_armv5.S, from which this file was derived. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/cpufunc_asm_armv5_ec.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/arm/arm
Module Name:src Committed By: rin Date: Thu Oct 7 09:57:27 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv5.S Log Message: trailing whitespace/tab To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/cpufunc_asm_armv5.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/arm/arm/cpufunc_asm_armv5.S diff -u src/sys/arch/arm/arm/cpufunc_asm_armv5.S:1.7 src/sys/arch/arm/arm/cpufunc_asm_armv5.S:1.8 --- src/sys/arch/arm/arm/cpufunc_asm_armv5.S:1.7 Sun Mar 30 01:15:03 2014 +++ src/sys/arch/arm/arm/cpufunc_asm_armv5.S Thu Oct 7 09:57:27 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm_armv5.S,v 1.7 2014/03/30 01:15:03 matt Exp $ */ +/* $NetBSD: cpufunc_asm_armv5.S,v 1.8 2021/10/07 09:57:27 rin Exp $ */ /* * Copyright (c) 2002, 2005 ARM Limited @@ -32,7 +32,7 @@ * These routines can be used by any core that supports the set/index * operations. */ - + #include "assym.h" #include #include @@ -130,7 +130,7 @@ ENTRY(armv5_dcache_wb_range) bpl 1b mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET - + ENTRY(armv5_dcache_wbinv_range) ldr ip, .Larmv5_line_size cmp r1, #0x4000 @@ -148,7 +148,7 @@ ENTRY(armv5_dcache_wbinv_range) bpl 1b mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET - + /* * Note, we must not invalidate everything. If the range is too big we * must use wb-inv of the entire cache.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: rin Date: Thu Oct 7 09:57:27 UTC 2021 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv5.S Log Message: trailing whitespace/tab To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/cpufunc_asm_armv5.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/arm/arm
Module Name:src
Committed By: jmcneill
Date: Sat Sep 18 09:49:57 UTC 2021
Modified Files:
src/sys/arch/arm/arm: bus_stubs.c
Log Message:
bus_space_is_equal: fix crash when called with NULL tag
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/arm/bus_stubs.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/arm/arm/bus_stubs.c
diff -u src/sys/arch/arm/arm/bus_stubs.c:1.2 src/sys/arch/arm/arm/bus_stubs.c:1.3
--- src/sys/arch/arm/arm/bus_stubs.c:1.2 Wed Sep 8 11:02:05 2021
+++ src/sys/arch/arm/arm/bus_stubs.c Sat Sep 18 09:49:57 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_stubs.c,v 1.2 2021/09/08 11:02:05 jmcneill Exp $ */
+/* $NetBSD: bus_stubs.c,v 1.3 2021/09/18 09:49:57 jmcneill Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_stubs.c,v 1.2 2021/09/08 11:02:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_stubs.c,v 1.3 2021/09/18 09:49:57 jmcneill Exp $");
#include
#include
@@ -40,7 +40,11 @@ __KERNEL_RCSID(0, "$NetBSD: bus_stubs.c,
bool
bus_space_is_equal(bus_space_tag_t t1, bus_space_tag_t t2)
{
- return t1->bs_cookie == t2->bs_cookie;
+ if (t1 == t2) {
+ return true;
+ }
+
+ return t1 != NULL && t2 != NULL && t1->bs_cookie == t2->bs_cookie;
}
int
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: jmcneill Date: Sat Sep 18 09:49:57 UTC 2021 Modified Files: src/sys/arch/arm/arm: bus_stubs.c Log Message: bus_space_is_equal: fix crash when called with NULL tag To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/arm/bus_stubs.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/arm/arm
Module Name:src
Committed By: skrll
Date: Sun Sep 12 07:14:50 UTC 2021
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
Log Message:
More debug.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/arm/armv6_start.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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.35 src/sys/arch/arm/arm/armv6_start.S:1.36
--- src/sys/arch/arm/arm/armv6_start.S:1.35 Mon Aug 2 12:56:22 2021
+++ src/sys/arch/arm/arm/armv6_start.S Sun Sep 12 07:14:50 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.35 2021/08/02 12:56:22 andvar Exp $ */
+/* $NetBSD: armv6_start.S,v 1.36 2021/09/12 07:14:50 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -473,6 +473,14 @@ generic_vstartv7:
VPRINTF("virtual\n\r")
+ VPRINTF("prrr : ")
+ mrc p15, 0, r0, c10, c2, 0 // Primary Region Remap Register (PRRR)
+ VPRINTX(r0)
+ VPRINTF("\n\rnmrr : ")
+ mrc p15, 0, r0, c10, c2, 1 // Normal Memory Remap Register (NMRR)
+ VPRINTX(r0)
+ VPRINTF("\n\r")
+
#if defined(KASAN)
ldr r0, =start_stacks_bottom
bl _C_LABEL(kasan_early_init)
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sun Sep 12 07:14:50 UTC 2021 Modified Files: src/sys/arch/arm/arm: armv6_start.S Log Message: More debug. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/arm/armv6_start.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/arm/arm
Module Name:src
Committed By: jmcneill
Date: Wed Sep 8 11:02:05 UTC 2021
Modified Files:
src/sys/arch/arm/arm: bus_stubs.c
Log Message:
Consider two tags equal if they share the same cookie. For fdtbus,
we may have different tags to deal with mapping attributes and CPU vs bus
address translation, but otherwise represent the same bus space.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/bus_stubs.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/arm/arm/bus_stubs.c
diff -u src/sys/arch/arm/arm/bus_stubs.c:1.1 src/sys/arch/arm/arm/bus_stubs.c:1.2
--- src/sys/arch/arm/arm/bus_stubs.c:1.1 Mon Apr 13 07:09:51 2020
+++ src/sys/arch/arm/arm/bus_stubs.c Wed Sep 8 11:02:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_stubs.c,v 1.1 2020/04/13 07:09:51 maxv Exp $ */
+/* $NetBSD: bus_stubs.c,v 1.2 2021/09/08 11:02:05 jmcneill Exp $ */
/*
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -30,13 +30,18 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_stubs.c,v 1.1 2020/04/13 07:09:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_stubs.c,v 1.2 2021/09/08 11:02:05 jmcneill Exp $");
#include
#include
+#include
+#include
-#include
-#include
+bool
+bus_space_is_equal(bus_space_tag_t t1, bus_space_tag_t t2)
+{
+ return t1->bs_cookie == t2->bs_cookie;
+}
int
bus_dmamap_create(bus_dma_tag_t t, bus_size_t size, int nsegments,
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: jmcneill Date: Wed Sep 8 11:02:05 UTC 2021 Modified Files: src/sys/arch/arm/arm: bus_stubs.c Log Message: Consider two tags equal if they share the same cookie. For fdtbus, we may have different tags to deal with mapping attributes and CPU vs bus address translation, but otherwise represent the same bus space. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/bus_stubs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/arch/arm/arm
On 2020/11/12 6:52, matthew green wrote: "Rin Okuyama" writes: Module Name:src Committed By: rin Date: Tue Nov 10 21:40:07 UTC 2020 Modified Files: src/sys/arch/arm/arm: cpu_exec.c Log Message: Test (epp->ep_esch->es_emul != _netbsd) instead of nice, this is a step forward. an optimisation on it could be to remove this test entirely if neither MODULAR or COMAPT_NETBSD32 are set, as it will always be false there. Ah, yes. I will commit after some test. Thanks! rin
re: CVS commit: src/sys/arch/arm/arm
"Rin Okuyama" writes: > Module Name: src > Committed By: rin > Date: Tue Nov 10 21:40:07 UTC 2020 > > Modified Files: > src/sys/arch/arm/arm: cpu_exec.c > > Log Message: > Test (epp->ep_esch->es_emul != _netbsd) instead of nice, this is a step forward. an optimisation on it could be to remove this test entirely if neither MODULAR or COMAPT_NETBSD32 are set, as it will always be false there. thanks. .mrg.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: joerg Date: Mon Oct 28 18:14:38 UTC 2019 Modified Files: src/sys/arch/arm/arm: fusu.S Log Message: Add operand that GNU as considers optional, but LLVM doesn't. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/fusu.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/arm/arm
Module Name:src Committed By: joerg Date: Mon Oct 28 18:14:38 UTC 2019 Modified Files: src/sys/arch/arm/arm: fusu.S Log Message: Add operand that GNU as considers optional, but LLVM doesn't. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/fusu.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/arm/arm/fusu.S diff -u src/sys/arch/arm/arm/fusu.S:1.7 src/sys/arch/arm/arm/fusu.S:1.8 --- src/sys/arch/arm/arm/fusu.S:1.7 Sun Apr 7 14:14:03 2019 +++ src/sys/arch/arm/arm/fusu.S Mon Oct 28 18:14:38 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: fusu.S,v 1.7 2019/04/07 14:14:03 thorpej Exp $ */ +/* $NetBSD: fusu.S,v 1.8 2019/10/28 18:14:38 joerg Exp $ */ /*- * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -127,7 +127,7 @@ STRONG_ALIAS(_ufetch_16,_ufetch_16_no_ld ENTRY(_ufetch_16_ldrht) UFETCHSTORE_PROLOGUE - ldrht r3, [r0] + ldrht r3, [r0], #0 strh r3, [r1] UFETCHSTORE_EPILOGUE @@ -186,7 +186,7 @@ STRONG_ALIAS(_ustore_16,_ustore_16_no_st ENTRY(_ustore_16_strht) UFETCHSTORE_PROLOGUE - strht r1, [r0] + strht r1, [r0], #0 UFETCHSTORE_EPILOGUE RETURN_SUCCESS
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: christos Date: Thu Oct 24 18:34:22 UTC 2019 Modified Files: src/sys/arch/arm/arm: disassem.c Log Message: Add a function cast To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/arm/disassem.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/arm/arm
Module Name:src
Committed By: christos
Date: Thu Oct 24 18:34:22 UTC 2019
Modified Files:
src/sys/arch/arm/arm: disassem.c
Log Message:
Add a function cast
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/arm/disassem.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/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.40 src/sys/arch/arm/arm/disassem.c:1.41
--- src/sys/arch/arm/arm/disassem.c:1.40 Tue Oct 30 05:05:51 2018
+++ src/sys/arch/arm/arm/disassem.c Thu Oct 24 14:34:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.40 2018/10/30 09:05:51 skrll Exp $ */
+/* $NetBSD: disassem.c,v 1.41 2019/10/24 18:34:22 christos Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.40 2018/10/30 09:05:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.41 2019/10/24 18:34:22 christos Exp $");
#include
@@ -951,7 +951,7 @@ disassemble_printaddr(u_int address)
static const disasm_interface_t disassemble_di = {
disassemble_readword, disassemble_printaddr,
- (void (*)(const char *, ...))printf
+ __FPTRCAST(void (*)(const char *, ...), printf)
};
void
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: jmcneill Date: Thu Jul 25 02:00:40 UTC 2019 Modified Files: src/sys/arch/arm/arm: efi_runtime.c Log Message: Only try to call EFI RT's reset once. If it faults for some reason, just return an error so the kernel will try to PSCI reset instead. Otherwise we get stuck in an endless loop.. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/efi_runtime.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/arm/arm
Module Name:src
Committed By: jmcneill
Date: Thu Jul 25 02:00:40 UTC 2019
Modified Files:
src/sys/arch/arm/arm: efi_runtime.c
Log Message:
Only try to call EFI RT's reset once. If it faults for some reason, just
return an error so the kernel will try to PSCI reset instead. Otherwise
we get stuck in an endless loop..
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/efi_runtime.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/arm/arm/efi_runtime.c
diff -u src/sys/arch/arm/arm/efi_runtime.c:1.1 src/sys/arch/arm/arm/efi_runtime.c:1.2
--- src/sys/arch/arm/arm/efi_runtime.c:1.1 Sun Oct 28 10:21:42 2018
+++ src/sys/arch/arm/arm/efi_runtime.c Thu Jul 25 02:00:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: efi_runtime.c,v 1.1 2018/10/28 10:21:42 jmcneill Exp $ */
+/* $NetBSD: efi_runtime.c,v 1.2 2019/07/25 02:00:40 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.1 2018/10/28 10:21:42 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.2 2019/07/25 02:00:40 jmcneill Exp $");
#include
#include
@@ -113,13 +113,19 @@ arm_efirt_settime(struct efi_tm *tm)
int
arm_efirt_reset(enum efi_reset type)
{
+ static int reset_called = false;
efi_status status;
if (RT == NULL || RT->rt_reset == NULL)
return ENXIO;
mutex_enter(_lock);
- status = RT->rt_reset(type, 0, 0, NULL);
+ if (reset_called == false) {
+ reset_called = true;
+ status = RT->rt_reset(type, 0, 0, NULL);
+ } else {
+ status = 1;
+ }
mutex_exit(_lock);
if (status)
return EIO;
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Wed Jun 12 06:53:21 UTC 2019 Modified Files: src/sys/arch/arm/arm: armv6_start.S Log Message: Comment fix To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm/armv6_start.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/arm/arm
Module Name:src
Committed By: skrll
Date: Wed Jun 12 06:53:21 UTC 2019
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
Log Message:
Comment fix
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/arm/armv6_start.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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.13 src/sys/arch/arm/arm/armv6_start.S:1.14
--- src/sys/arch/arm/arm/armv6_start.S:1.13 Wed Jun 12 06:51:31 2019
+++ src/sys/arch/arm/arm/armv6_start.S Wed Jun 12 06:53:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.13 2019/06/12 06:51:31 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.14 2019/06/12 06:53:21 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -1012,7 +1012,7 @@ armv6_mmuinit:
VPRINTF(" ")
.align 5
- @ turn mmu on!
+ /* turn mmu on! */
mov r0, r6
mcr p15, 0, r0, c1, c0, 0
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Wed Jun 12 06:51:32 UTC 2019 Modified Files: src/sys/arch/arm/arm: armv6_start.S Log Message: Debug output improvement To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm/armv6_start.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/arm/arm
Module Name:src
Committed By: skrll
Date: Wed Jun 12 06:51:32 UTC 2019
Modified Files:
src/sys/arch/arm/arm: armv6_start.S
Log Message:
Debug output improvement
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm/armv6_start.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/arm/arm/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.12 src/sys/arch/arm/arm/armv6_start.S:1.13
--- src/sys/arch/arm/arm/armv6_start.S:1.12 Mon Apr 8 07:35:32 2019
+++ src/sys/arch/arm/arm/armv6_start.S Wed Jun 12 06:51:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.12 2019/04/08 07:35:32 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.13 2019/06/12 06:51:31 skrll Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -209,7 +209,7 @@ generic_savevars:
ldr R_TMP2, =uboot_args
sub R_TMP2, R_VTOPDIFF
- VPRINTF("\n\ruboot : @")
+ VPRINTF("\n\ruboot : ")
VPRINTX(R_TMP2)
str r4, [R_TMP2, #(4*0)]
str r5, [R_TMP2, #(4*1)]
Re: CVS commit: src/sys/arch/arm/arm
On Sat, Mar 09, 2013 at 10:10:45AM +, Michael van Elst wrote: Module Name: src Committed By: mlelstv Date: Sat Mar 9 10:10:45 UTC 2013 Modified Files: src/sys/arch/arm/arm: disksubr_acorn.c Log Message: Errors are supposed to be negative errno numbers, not -1 which is interpreted as EPERM. Hmmm... NetBSD usually uses +ve errno values. David -- David Laight: da...@l8s.co.uk
Re: CVS commit: src/sys/arch/arm/arm
On Dec 27, 2012, at 7:48 PM, SAITOH Masanobu wrote: Module Name: src Committed By: msaitoh Date: Fri Dec 28 03:48:00 UTC 2012 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Enable DCache Streaming Switch and Write Allocate. This change improve system performance significantly. How does this affect L2 and DMA?
Re: CVS commit: src/sys/arch/arm/arm
Hi, matt. (2012/12/28 14:10), Matt Thomas wrote: On Dec 27, 2012, at 7:48 PM, SAITOH Masanobu wrote: Module Name:src Committed By: msaitoh Date: Fri Dec 28 03:48:00 UTC 2012 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Enable DCache Streaming Switch and Write Allocate. This change improve system performance significantly. How does this affect L2 and DMA? Both are not affected. -- --- SAITOH Masanobu (msai...@execsw.org msai...@netbsd.org)
Re: CVS commit: src/sys/arch/arm/arm
On Sun, Dec 23, 2012 at 01:26:21PM +, Matt Thomas wrote: Module Name: src Committed By: matt Date: Sun Dec 23 13:26:21 UTC 2012 Modified Files: src/sys/arch/arm/arm: cpu_in_cksum_fold.S Log Message: Conditional execution still takes one cycle per skipped instruction. branch to unlikely cases instead of conditionally skipping them. Or more for 'ldm' and 'stm' - esp. I think on strongarm! Conditional execution might also be a full pipeline stall, rather than a branch which is likely (hopefully) to be predicted correctly. David -- David Laight: da...@l8s.co.uk
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: uebayasi Date: Sun Jan 3 04:25:16 UTC 2010 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_arm10.S cpufunc_asm_arm11.S cpufunc_asm_arm67.S cpufunc_asm_arm7tdmi.S cpufunc_asm_arm8.S cpufunc_asm_arm9.S cpufunc_asm_sa1.S cpufunc_asm_xscale.S Log Message: s/These is/These are/ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/cpufunc_asm_arm10.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/arm/cpufunc_asm_arm11.S \ src/sys/arch/arm/arm/cpufunc_asm_arm8.S cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/cpufunc_asm_arm67.S \ src/sys/arch/arm/arm/cpufunc_asm_arm7tdmi.S cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/cpufunc_asm_arm9.S cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/cpufunc_asm_sa1.S cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/arm/cpufunc_asm_xscale.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
