CVS commit: src/sys/arch/evbarm/tisdp24xx
Module Name:src
Committed By: rin
Date: Thu Nov 5 13:04:27 UTC 2020
Modified Files:
src/sys/arch/evbarm/tisdp24xx: if_sm_gpmc.c sdp24xx_start.S
Log Message:
Add missing NetBSD RCSID.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/tisdp24xx/sdp24xx_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/evbarm/tisdp24xx/if_sm_gpmc.c
diff -u src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c:1.5 src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c:1.6
--- src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c:1.5 Sat Oct 27 17:17:49 2012
+++ src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c Thu Nov 5 13:04:27 2020
@@ -1,3 +1,5 @@
+/* $NetBSD: if_sm_gpmc.c,v 1.6 2020/11/05 13:04:27 rin Exp $ */
+
/* adapted from: */
/* NetBSD: if_sm_emifs.c,v 1.1.6.1 2007/02/24 19:03:14 snj Exp */
@@ -36,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.5 2012/10/27 17:17:49 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c,v 1.6 2020/11/05 13:04:27 rin Exp $");
#include "locators.h"
Index: src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S
diff -u src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S:1.6 src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S:1.7
--- src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S:1.6 Thu Jun 30 20:09:28 2011
+++ src/sys/arch/evbarm/tisdp24xx/sdp24xx_start.S Thu Nov 5 13:04:27 2020
@@ -1,3 +1,5 @@
+/* $NetBSD: sdp24xx_start.S,v 1.7 2020/11/05 13:04:27 rin Exp $ */
+
/*
* Machine dependent startup code for SDP2430 boards.
* Based on omap_start.S
@@ -92,7 +94,7 @@
#include
#include
-RCSID("$NetBSD: sdp24xx_start.S,v 1.6 2011/06/30 20:09:28 wiz Exp $")
+RCSID("$NetBSD: sdp24xx_start.S,v 1.7 2020/11/05 13:04:27 rin Exp $")
#if 0
#define Invalidate_I_cache(reg) \
CVS commit: src/share/mk
Module Name:src Committed By: rin Date: Thu Nov 5 13:03:31 UTC 2020 Modified Files: src/share/mk: bsd.own.mk Log Message: Build dtb set for aarch64eb. To generate a diff of this commit: cvs rdiff -u -r1.1229 -r1.1230 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.1229 src/share/mk/bsd.own.mk:1.1230 --- src/share/mk/bsd.own.mk:1.1229 Sun Oct 25 09:06:24 2020 +++ src/share/mk/bsd.own.mk Thu Nov 5 13:03:31 2020 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1229 2020/10/25 09:06:24 tsutsui Exp $ +# $NetBSD: bsd.own.mk,v 1.1230 2020/11/05 13:03:31 rin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -1237,6 +1237,7 @@ MKTEGRAFIRMWARE.evbarm= yes # Only build devicetree (dtb) files on armv6, armv7, and aarch64. MKDTB.aarch64= yes +MKDTB.aarch64eb= yes MKDTB.earmv6= yes MKDTB.earmv6hf= yes MKDTB.earmv6eb= yes
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: rin Date: Thu Nov 5 13:04:05 UTC 2020 Modified Files: src/sys/arch/evbarm/conf: README.evbarm Log Message: Fix typo; i.M31 --> i.MX31 To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/README.evbarm 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/evbarm/conf/README.evbarm diff -u src/sys/arch/evbarm/conf/README.evbarm:1.31 src/sys/arch/evbarm/conf/README.evbarm:1.32 --- src/sys/arch/evbarm/conf/README.evbarm:1.31 Sun May 24 07:17:34 2020 +++ src/sys/arch/evbarm/conf/README.evbarm Thu Nov 5 13:04:05 2020 @@ -1,4 +1,4 @@ -$NetBSD: README.evbarm,v 1.31 2020/05/24 07:17:34 skrll Exp $ +$NetBSD: README.evbarm,v 1.32 2020/11/05 13:04:05 rin Exp $ config date boards --- @@ -21,7 +21,7 @@ HAWK 2013/10/02 TI OMAP-L138 based Hawk HDL_G 2006/04/16 I-O DATA HDL-G Giga LANDISK HPT5325 2012/03/31 HP t5325 Thin Client IMX23_OLINUXINO 2012/11/20 Olimex iMX233 based OLinuXino boards -IMX31LITE 2008/04/27 Freescale i.M31 DEV LITE KIT +IMX31LITE 2008/04/27 Freescale i.MX31 DEV LITE KIT INTEGRATOR 2001/10/27 ARM Integrator board INTEGRATOR_CP 2013/02/19 ARM Integrator/CP board IQ31244 2003/05/14 Intel IQ31244 reference board
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sun Nov 8 07:30:09 UTC 2020
Modified Files:
src/sys/compat/netbsd32: netbsd32_core.c
Log Message:
Fix typo; s/__LP64/_LP64/
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/compat/netbsd32/netbsd32_core.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_core.c
diff -u src/sys/compat/netbsd32/netbsd32_core.c:1.17 src/sys/compat/netbsd32/netbsd32_core.c:1.18
--- src/sys/compat/netbsd32/netbsd32_core.c:1.17 Wed Nov 4 20:54:20 2020
+++ src/sys/compat/netbsd32/netbsd32_core.c Sun Nov 8 07:30:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_core.c,v 1.17 2020/11/04 20:54:20 pgoyette Exp $ */
+/* $NetBSD: netbsd32_core.c,v 1.18 2020/11/08 07:30:09 rin Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_core.c,v 1.17 2020/11/04 20:54:20 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_core.c,v 1.18 2020/11/08 07:30:09 rin Exp $");
#include
#include
@@ -72,13 +72,13 @@ compat_netbsd32_coredump_modcmd(modcmd_t
switch (cmd) {
case MODULE_CMD_INIT:
MODULE_HOOK_SET(coredump_netbsd32_hook, real_coredump_netbsd32);
-#if defined(EXEC_ELF32) && defined(__LP64)
+#if defined(EXEC_ELF32) && defined(_LP64)
MODULE_HOOK_SET(coredump_elf32_hook, real_coredump_elf32);
#endif
return 0;
case MODULE_CMD_FINI:
MODULE_HOOK_UNSET(coredump_netbsd32_hook);
-#if defined(EXEC_ELF32) && defined(__LP64)
+#if defined(EXEC_ELF32) && defined(_LP64)
MODULE_HOOK_UNSET(coredump_elf32_hook);
#endif
return 0;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: rin
Date: Tue Nov 10 07:39:12 UTC 2020
Modified Files:
src/sys/dev/ic: nvme.c
Log Message:
One more fix for big-endian machines.
Now, ld(4) at nvme(4) works perfectly for aarch64eb!
Tested on ROCKPro64 and qemu-system-aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/ic/nvme.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/ic/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.51 src/sys/dev/ic/nvme.c:1.52
--- src/sys/dev/ic/nvme.c:1.51 Thu Sep 24 09:59:11 2020
+++ src/sys/dev/ic/nvme.c Tue Nov 10 07:39:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: nvme.c,v 1.51 2020/09/24 09:59:11 ryo Exp $ */
+/* $NetBSD: nvme.c,v 1.52 2020/11/10 07:39:12 rin Exp $ */
/* $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.51 2020/09/24 09:59:11 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.52 2020/11/10 07:39:12 rin Exp $");
#include
#include
@@ -1377,7 +1377,7 @@ nvme_q_complete(struct nvme_softc *sc, s
if ((flags & NVME_CQE_PHASE) != q->q_cq_phase)
break;
- ccb = &q->q_ccbs[cqe->cid];
+ ccb = &q->q_ccbs[lemtoh16(&cqe->cid)];
if (++q->q_cq_head >= q->q_entries) {
q->q_cq_head = 0;
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: rin Date: Tue Nov 10 08:52:36 UTC 2020 Modified Files: src/etc/etc.evbarm: MAKEDEV.conf Log Message: Add nvme(4) and raid(4). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/etc/etc.evbarm/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.evbarm/MAKEDEV.conf diff -u src/etc/etc.evbarm/MAKEDEV.conf:1.20 src/etc/etc.evbarm/MAKEDEV.conf:1.21 --- src/etc/etc.evbarm/MAKEDEV.conf:1.20 Tue Nov 27 14:55:56 2018 +++ src/etc/etc.evbarm/MAKEDEV.conf Tue Nov 10 08:52:36 2020 @@ -1,7 +1,12 @@ -# $NetBSD: MAKEDEV.conf,v 1.20 2018/11/27 14:55:56 msaitoh Exp $ +# $NetBSD: MAKEDEV.conf,v 1.21 2020/11/10 08:52:36 rin Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 + makedev nvme0 nvme0ns1 nvme0ns2 nvme0ns3 nvme0ns4 + makedev nvme1 nvme1ns1 nvme1ns2 nvme1ns3 nvme1ns4 + makedev nvme2 nvme2ns1 nvme2ns2 nvme2ns3 nvme2ns4 + makedev nvme3 nvme3ns1 nvme3ns2 nvme3ns3 nvme3ns4 + makedev raid0 raid1 raid2 raid3 makedev ld0 ld1 ld2 ld3 ld4 ld5 ld6 ld7 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7 makedev tty0 tty1 tty2 tty3 plcom0
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: rin Date: Tue Nov 10 11:19:58 UTC 2020 Modified Files: src/sys/arch/evbppc/conf: RB800 Log Message: Add nvme(4) and ahcisata(4). Both work fine via miniPCIe to M.2 adapter. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/conf/RB800 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/evbppc/conf/RB800 diff -u src/sys/arch/evbppc/conf/RB800:1.37 src/sys/arch/evbppc/conf/RB800:1.38 --- src/sys/arch/evbppc/conf/RB800:1.37 Fri Apr 26 21:40:29 2019 +++ src/sys/arch/evbppc/conf/RB800 Tue Nov 10 11:19:57 2020 @@ -1,4 +1,4 @@ -# $NetBSD: RB800,v 1.37 2019/04/26 21:40:29 sevan Exp $ +# $NetBSD: RB800,v 1.38 2020/11/10 11:19:57 rin Exp $ # # RB800 -- everything that's currently supported # @@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "RB800-$Revision: 1.37 $" +ident "RB800-$Revision: 1.38 $" maxusers 32 @@ -190,6 +190,13 @@ pci* at ppb? alc* at pci? dev ? function ? +# NVM Express controllers and devices +nvme* at pci? dev ? function ? +ld* at nvme? nsid ? + +ahcisata* at pci? dev ? function ? # AHCI SATA controllers +atabus* at ahcisata? channel ? + #ehci* at pci? dev ? function ? #ohci* at pci? dev ? function ? #uhci* at pci? dev ? function ?
CVS commit: src/etc/etc.evbppc
Module Name:src Committed By: rin Date: Tue Nov 10 11:22:23 UTC 2020 Modified Files: src/etc/etc.evbppc: MAKEDEV.conf Log Message: Add nvme(4) and raid(4). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/etc/etc.evbppc/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.evbppc/MAKEDEV.conf diff -u src/etc/etc.evbppc/MAKEDEV.conf:1.11 src/etc/etc.evbppc/MAKEDEV.conf:1.12 --- src/etc/etc.evbppc/MAKEDEV.conf:1.11 Sun Sep 23 09:20:59 2018 +++ src/etc/etc.evbppc/MAKEDEV.conf Tue Nov 10 11:22:22 2020 @@ -1,9 +1,14 @@ -# $NetBSD: MAKEDEV.conf,v 1.11 2018/09/23 09:20:59 maxv Exp $ +# $NetBSD: MAKEDEV.conf,v 1.12 2020/11/10 11:22:22 rin Exp $ all_md) makedev wscons sd0 sd1 sd2 st0 st1 cd0 cd1 wd0 wd1 makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7 makedev ss0 ch0 uk0 uk1 + makedev nvme0 nvme0ns1 nvme0ns2 nvme0ns3 nvme0ns4 + makedev nvme1 nvme1ns1 nvme1ns2 nvme1ns3 nvme1ns4 + makedev nvme2 nvme2ns1 nvme2ns2 nvme2ns3 nvme2ns4 + makedev nvme3 nvme3ns1 nvme3ns2 nvme3ns3 nvme3ns4 + makedev raid0 raid1 raid2 raid3 makedev mlx0 ld0 ld1 ld2 ld3 makedev tty00 tty01 makedev lpa0 lpa1 lpa2 lpt0 lpt1 lpt2
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: rin
Date: Tue Nov 10 21:38:03 UTC 2020
Modified Files:
src/sys/arch/arm/arm: core_machdep.c
Log Message:
Stop turning on EABI flag to core files dumped by OABI binaries.
This seems a bug introduced in rev 1.5:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/arm/core_machdep.c#rev1.5
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/arm/core_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/core_machdep.c
diff -u src/sys/arch/arm/arm/core_machdep.c:1.9 src/sys/arch/arm/arm/core_machdep.c:1.10
--- src/sys/arch/arm/arm/core_machdep.c:1.9 Wed Nov 20 19:37:51 2019
+++ src/sys/arch/arm/arm/core_machdep.c Tue Nov 10 21:38:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: core_machdep.c,v 1.9 2019/11/20 19:37:51 pgoyette Exp $ */
+/* $NetBSD: core_machdep.c,v 1.10 2020/11/10 21:38:03 rin Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -37,11 +37,10 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.9 2019/11/20 19:37:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.10 2020/11/10 21:38:03 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_execfmt.h"
-#include "opt_compat_netbsd32.h"
#else
#define EXEC_ELF32 1
#endif
@@ -61,9 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: core_machdep
#ifdef EXEC_ELF32
#include
-#ifdef COMPAT_NETBSD32
-#include
-#endif
#endif
#include
@@ -120,21 +116,16 @@ cpu_coredump(struct lwp *l, struct cored
void
arm_netbsd_elf32_coredump_setup(struct lwp *l, void *arg)
{
-#if defined(__ARMEB__) || defined(__ARM_EABI__) || defined(COMPAT_NETBSD32)
+#if defined(__ARMEB__) || defined(__ARM_EABI__)
Elf_Ehdr * const eh = arg;
-#if defined(__ARM_EABI__) || defined(COMPAT_NETBSD32)
+#endif
+#ifdef __ARM_EABI__
struct proc * const p = l->l_proc;
-#ifdef __ARM_EABI__
if (p->p_emul == &emul_netbsd) {
eh->e_flags |= EF_ARM_EABI_VER5;
}
-#elif defined(COMPAT_NETBSD32)
- if (p->p_emul == &emul_netbsd32) {
- eh->e_flags |= EF_ARM_EABI_VER5;
- }
#endif
-#endif /* __ARM_EABI__ || COMPAT_NETBSD32 */
#ifdef __ARMEB__
if (CPU_IS_ARMV7_P()
|| (CPU_IS_ARMV6_P()
@@ -142,6 +133,5 @@ arm_netbsd_elf32_coredump_setup(struct l
eh->e_flags |= EF_ARM_BE8;
}
#endif
-#endif
}
#endif
CVS commit: src/sys/arch/arm/arm
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 != &emul_netbsd) instead of (epp->ep_esch->es_emul == &emul_netbsd32) to determine whether curlwp is running on COMPAT_NETBSD32 or not. The former is possible even if COMPAT_NETBSD32 is not built in the main kernel. Now, compat_netbsd32 module can work on !COMPAT_NETBSD32 kernel. Discussed with pgoyette. XXX Apply similar fixes, i.e., drop ``#ifdef COMPAT_NETBSD32'' conditional codes from the rest parts of MD codes for aarch64 and mips64. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/arm/cpu_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/arm/arm/cpu_exec.c diff -u src/sys/arch/arm/arm/cpu_exec.c:1.10 src/sys/arch/arm/arm/cpu_exec.c:1.11 --- src/sys/arch/arm/arm/cpu_exec.c:1.10 Mon Apr 27 06:54:12 2015 +++ src/sys/arch/arm/arm/cpu_exec.c Tue Nov 10 21:40:07 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_exec.c,v 1.10 2015/04/27 06:54:12 skrll Exp $ */ +/* $NetBSD: cpu_exec.c,v 1.11 2020/11/10 21:40:07 rin Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,10 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.10 2015/04/27 06:54:12 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.11 2020/11/10 21:40:07 rin Exp $"); #include "opt_compat_netbsd.h" -#include "opt_compat_netbsd32.h" #include #include @@ -45,10 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v #include #include /* mandatory */ -#ifdef COMPAT_NETBSD32 -#include -#endif - #include #if EXEC_ELF32 @@ -60,11 +55,7 @@ arm_netbsd_elf32_probe(struct lwp *l, st const Elf_Ehdr * const eh = eh0; const bool elf_aapcs_p = (eh->e_flags & EF_ARM_EABIMASK) >= EF_ARM_EABI_VER4; -#ifdef COMPAT_NETBSD32 - const bool netbsd32_p = (epp->ep_esch->es_emul == &emul_netbsd32); -#else - const bool netbsd32_p = false; -#endif + const bool netbsd32_p = (epp->ep_esch->es_emul != &emul_netbsd); #ifdef __ARM_EABI__ const bool aapcs_p = true; #else
CVS commit: src/sys/arch/powerpc/booke/pci
Module Name:src Committed By: rin Date: Thu Nov 12 00:37:51 UTC 2020 Modified Files: src/sys/arch/powerpc/booke/pci: pq3pci.c Log Message: Oops, forget to commit local change necessary to support nvme(4) on RB800; provide pci_intr_setattr(9) (no-op). To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/booke/pci/pq3pci.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/powerpc/booke/pci/pq3pci.c diff -u src/sys/arch/powerpc/booke/pci/pq3pci.c:1.25 src/sys/arch/powerpc/booke/pci/pq3pci.c:1.26 --- src/sys/arch/powerpc/booke/pci/pq3pci.c:1.25 Tue Jul 7 03:38:48 2020 +++ src/sys/arch/powerpc/booke/pci/pq3pci.c Thu Nov 12 00:37:51 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pq3pci.c,v 1.25 2020/07/07 03:38:48 thorpej Exp $ */ +/* $NetBSD: pq3pci.c,v 1.26 2020/11/12 00:37:51 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -39,7 +39,7 @@ #define __INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.25 2020/07/07 03:38:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.26 2020/11/12 00:37:51 rin Exp $"); #include "locators.h" @@ -1753,6 +1753,7 @@ pq3pci_pci_chipset_init(struct pq3pci_so pc->pc_intr_type = pq3pci_intr_type; pc->pc_intr_alloc = pq3pci_intr_alloc; pc->pc_intr_release = pq3pci_intr_release; + pc->pc_intr_setattr = genppc_pci_intr_setattr; pc->pc_intx_alloc = genppc_pci_intx_alloc; pc->pc_msi_v = sc;
CVS commit: src/sys/arch/powerpc/booke/pci
Module Name:src Committed By: rin Date: Thu Nov 12 00:44:22 UTC 2020 Modified Files: src/sys/arch/powerpc/booke/pci: pq3pci.c Log Message: pq3pci_msi_claim(): remove KASSERT that is valid when allocating MSI vectors, while apparently invalid when freeing them. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/booke/pci/pq3pci.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/powerpc/booke/pci/pq3pci.c diff -u src/sys/arch/powerpc/booke/pci/pq3pci.c:1.26 src/sys/arch/powerpc/booke/pci/pq3pci.c:1.27 --- src/sys/arch/powerpc/booke/pci/pq3pci.c:1.26 Thu Nov 12 00:37:51 2020 +++ src/sys/arch/powerpc/booke/pci/pq3pci.c Thu Nov 12 00:44:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pq3pci.c,v 1.26 2020/11/12 00:37:51 rin Exp $ */ +/* $NetBSD: pq3pci.c,v 1.27 2020/11/12 00:44:22 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -39,7 +39,7 @@ #define __INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.26 2020/11/12 00:37:51 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3pci.c,v 1.27 2020/11/12 00:44:22 rin Exp $"); #include "locators.h" @@ -1196,7 +1196,6 @@ pq3pci_msi_claim(pci_intr_handle_t handl KASSERT(msig != NULL); struct pq3pci_msihand * const msih = &msig->msig_ihands[irq & 31]; mutex_spin_enter(&msig->msig_lock); - KASSERT(msig->msig_free_mask & irq_mask); msig->msig_free_mask ^= irq_mask; mutex_spin_exit(&msig->msig_lock); return msih;
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: rin Date: Thu Nov 12 01:03:22 UTC 2020 Modified Files: src/sys/arch/arm/arm: cpu_exec.c Log Message: If neither COMPAT_NETBSD32 nor MODULAR is defined, there's no chance for lwp to be running under COMPAT_NETBSD32. Suggested by mrg. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm/cpu_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/arm/arm/cpu_exec.c diff -u src/sys/arch/arm/arm/cpu_exec.c:1.11 src/sys/arch/arm/arm/cpu_exec.c:1.12 --- src/sys/arch/arm/arm/cpu_exec.c:1.11 Tue Nov 10 21:40:07 2020 +++ src/sys/arch/arm/arm/cpu_exec.c Thu Nov 12 01:03:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_exec.c,v 1.11 2020/11/10 21:40:07 rin Exp $ */ +/* $NetBSD: cpu_exec.c,v 1.12 2020/11/12 01:03:22 rin Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.11 2020/11/10 21:40:07 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.12 2020/11/12 01:03:22 rin Exp $"); #include "opt_compat_netbsd.h" @@ -55,7 +55,11 @@ arm_netbsd_elf32_probe(struct lwp *l, st const Elf_Ehdr * const eh = eh0; const bool elf_aapcs_p = (eh->e_flags & EF_ARM_EABIMASK) >= EF_ARM_EABI_VER4; +#if defined(COMPAT_NETBSD32) || defined(MODULAR) const bool netbsd32_p = (epp->ep_esch->es_emul != &emul_netbsd); +#else + const bool netbsd32_p = false; +#endif #ifdef __ARM_EABI__ const bool aapcs_p = true; #else
CVS commit: src/external/cddl/osnet/dev/dtrace/aarch64
Module Name:src
Committed By: rin
Date: Thu Nov 12 02:15:56 UTC 2020
Modified Files:
src/external/cddl/osnet/dev/dtrace/aarch64: dtrace_subr.c
Log Message:
One more catch up with ``aarch64 is not mips'' change.
Fix evbarm-aarch64 build.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.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/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c:1.3 src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c:1.4
--- src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c:1.3 Wed Feb 12 06:05:23 2020
+++ src/external/cddl/osnet/dev/dtrace/aarch64/dtrace_subr.c Thu Nov 12 02:15:56 2020
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dtrace_subr.c,v 1.3 2020/02/12 06:05:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dtrace_subr.c,v 1.4 2020/11/12 02:15:56 rin Exp $");
#include
#include
@@ -128,7 +128,7 @@ void
dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit))
{
- (*func)(0, (uintptr_t)AARCH64_KSEG_START);
+ (*func)(0, (uintptr_t)AARCH64_DIRECTMAP_START);
(*func)((uintptr_t)VM_KERNEL_IO_ADDRESS, ~(uintptr_t)0);
}
CVS commit: src/distrib/evbarm
Module Name:src
Committed By: rin
Date: Mon Nov 16 11:38:30 UTC 2020
Modified Files:
src/distrib/evbarm: Makefile
src/distrib/evbarm/installimage: Makefile
src/distrib/evbarm/instkernel/ramdisk: Makefile
Log Message:
Correctly support aarch64eb and earmv7hfeb in a similar manner to
their little-endian counterparts.
Fix build failures for periodic binary snapshots.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/evbarm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/distrib/evbarm/installimage/Makefile
cvs rdiff -u -r1.19 -r1.20 src/distrib/evbarm/instkernel/ramdisk/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/evbarm/Makefile
diff -u src/distrib/evbarm/Makefile:1.14 src/distrib/evbarm/Makefile:1.15
--- src/distrib/evbarm/Makefile:1.14 Thu Oct 15 08:59:57 2020
+++ src/distrib/evbarm/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2020/10/15 08:59:57 jmcneill Exp $
+# $NetBSD: Makefile,v 1.15 2020/11/16 11:38:29 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -6,10 +6,10 @@
.include
SUBDIR= gzboot instkernel
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf"
+.if !empty(MACHINE_ARCH:Maarch64*) || !empty(MACHINE_ARCH:Mearmv7hf*)
SUBDIR+= installimage
.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
SUBDIR+= isoimage
.endif
TARGETS+= release
@@ -22,7 +22,7 @@ release: check_RELEASEDIR .WAIT ${MDECBO
${RELEASE_INSTALL} ${MDECBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.endif
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
iso_image:
${MAKEDIRTARGET} isoimage iso_image
.endif
Index: src/distrib/evbarm/installimage/Makefile
diff -u src/distrib/evbarm/installimage/Makefile:1.6 src/distrib/evbarm/installimage/Makefile:1.7
--- src/distrib/evbarm/installimage/Makefile:1.6 Tue Jun 2 14:27:32 2020
+++ src/distrib/evbarm/installimage/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/06/02 14:27:32 jmcneill Exp $
+# $NetBSD: Makefile,v 1.7 2020/11/16 11:38:29 rin Exp $
.include
@@ -6,10 +6,10 @@ INSTIMGBASE= NetBSD-${DISTRIBVER}-${MACH
INSTIMAGEMB?= 1550 # for all installation binaries
-.if ${MACHINE_ARCH} == "aarch64"
+.if !empty(MACHINE_ARCH:Maarch64*)
EFIBOOT= ${WORKDIR}/usr/mdec/bootaa64.efi
KERN_SET= kern-GENERIC64
-.elif ${MACHINE_ARCH} == "earmv7hf"
+.elif !empty(MACHINE_ARCH:Mearmv7hf*)
EFIBOOT+= ${WORKDIR}/usr/mdec/bootarm.efi
KERN_SET= kern-GENERIC
.endif
Index: src/distrib/evbarm/instkernel/ramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/ramdisk/Makefile:1.19 src/distrib/evbarm/instkernel/ramdisk/Makefile:1.20
--- src/distrib/evbarm/instkernel/ramdisk/Makefile:1.19 Sun Apr 1 04:35:01 2018
+++ src/distrib/evbarm/instkernel/ramdisk/Makefile Mon Nov 16 11:38:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/04/01 04:35:01 ryo Exp $
+# $NetBSD: Makefile,v 1.20 2020/11/16 11:38:29 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,7 +28,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
-.if !empty(MACHINE_ARCH:Maarch64)
+.if !empty(MACHINE_ARCH:Maarch64*)
UBOOT_IMAGE_ARCH= arm64
.else
UBOOT_IMAGE_ARCH= arm
CVS commit: src/sys/dev/pci
Module Name:src Committed By: rin Date: Mon Nov 16 11:54:10 UTC 2020 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Fix little-endian dependence in wm_rxeof(), by which packets cannot be received by 82574 and successors on big-endian machines. Tested by aarch64eb with I210-T1 on ROCKPro64. Thanks msaitoh for discussion! XXX pullup to netbsd-9 and netbsd-8 To generate a diff of this commit: cvs rdiff -u -r1.695 -r1.696 src/sys/dev/pci/if_wm.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/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.695 src/sys/dev/pci/if_wm.c:1.696 --- src/sys/dev/pci/if_wm.c:1.695 Mon Nov 2 09:21:50 2020 +++ src/sys/dev/pci/if_wm.c Mon Nov 16 11:54:10 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.695 2020/11/02 09:21:50 knakahara Exp $ */ +/* $NetBSD: if_wm.c,v 1.696 2020/11/16 11:54:10 rin Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -82,7 +82,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.695 2020/11/02 09:21:50 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.696 2020/11/16 11:54:10 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -8905,9 +8905,11 @@ wm_rxdesc_get_status(struct wm_rxqueue * struct wm_softc *sc = rxq->rxq_sc; if (sc->sc_type == WM_T_82574) - return EXTRXC_STATUS(rxq->rxq_ext_descs[idx].erx_ctx.erxc_err_stat); + return EXTRXC_STATUS( + le32toh(rxq->rxq_ext_descs[idx].erx_ctx.erxc_err_stat)); else if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) - return NQRXC_STATUS(rxq->rxq_nq_descs[idx].nqrx_ctx.nrxc_err_stat); + return NQRXC_STATUS( + le32toh(rxq->rxq_nq_descs[idx].nqrx_ctx.nrxc_err_stat)); else return rxq->rxq_descs[idx].wrx_status; } @@ -8918,9 +8920,11 @@ wm_rxdesc_get_errors(struct wm_rxqueue * struct wm_softc *sc = rxq->rxq_sc; if (sc->sc_type == WM_T_82574) - return EXTRXC_ERROR(rxq->rxq_ext_descs[idx].erx_ctx.erxc_err_stat); + return EXTRXC_ERROR( + le32toh(rxq->rxq_ext_descs[idx].erx_ctx.erxc_err_stat)); else if ((sc->sc_flags & WM_F_NEWQUEUE) != 0) - return NQRXC_ERROR(rxq->rxq_nq_descs[idx].nqrx_ctx.nrxc_err_stat); + return NQRXC_ERROR( + le32toh(rxq->rxq_nq_descs[idx].nqrx_ctx.nrxc_err_stat)); else return rxq->rxq_descs[idx].wrx_errors; }
CVS commit: src
Module Name:src Committed By: rin Date: Tue Nov 17 10:35:16 UTC 2020 Modified Files: src/crypto/external/bsd/heimdal/dist: config.guess src/crypto/external/bsd/netpgp/dist/buildaux: config.guess src/crypto/external/cpl/tpm-tools/dist: config.guess src/crypto/external/cpl/trousers/dist: config.guess src/external/bsd/am-utils/dist: config.guess src/external/bsd/byacc/dist: config.guess src/external/bsd/file/dist: config.guess src/external/bsd/flex/dist/build-aux: config.guess src/external/bsd/iscsi/dist/buildaux: config.guess src/external/bsd/jemalloc/dist/build-aux: config.guess src/external/bsd/libbind/dist: config.guess src/external/bsd/libevent/dist: config.guess src/external/bsd/libpcap/dist: config.guess src/external/bsd/nsd/dist: config.guess src/external/bsd/ntp/dist/sntp/libevent/build-aux: config.guess src/external/bsd/openldap/dist/build: config.guess src/external/bsd/openldap/dist/contrib/ldapc++: config.guess src/external/bsd/openpam/dist: config.guess src/external/bsd/pcc/dist/pcc: config.guess src/external/bsd/tcpdump/dist: config.guess src/external/bsd/tmux/dist/etc: config.guess src/external/bsd/top/dist: config.guess src/external/bsd/unbound/dist: config.guess src/external/gpl2/diffutils/dist/config: config.guess src/external/gpl2/gettext/dist/build-aux: config.guess src/external/gpl2/gettext/dist/gettext-tools/examples/hello-c++-kde/admin: config.guess src/external/gpl2/gmake/dist/config: config.guess src/external/gpl2/grep/dist: config.guess src/external/gpl2/lvm2/dist/autoconf: config.guess src/external/gpl2/texinfo/dist: config.guess src/external/gpl2/xcvs/dist/build-aux: config.guess src/external/gpl3/autoconf/dist/build-aux: config.guess src/external/gpl3/binutils.old/dist: config.guess src/external/gpl3/binutils/dist: config.guess src/external/gpl3/gcc.old/dist: config.guess src/external/gpl3/gcc/dist: config.guess src/external/gpl3/gdb.old/dist: config.guess src/external/gpl3/gdb.old/dist/readline/support: config.guess src/external/gpl3/gdb/dist: config.guess src/external/gpl3/gdb/dist/readline/readline/support: config.guess src/external/lgpl3/gmp/dist: config.guess src/external/lgpl3/mpc/dist: config.guess src/external/lgpl3/mpc/dist/build-aux: config.guess src/external/lgpl3/mpfr/dist: config.guess src/external/mit/expat/dist/conftools: config.guess src/external/mpl/bind/dist: config.guess src/external/mpl/dhcp/dist: config.guess src/external/public-domain/xz/dist/build-aux: config.guess src/lib/librumpuser/build-aux: config.guess src/sys/external/isc/libsodium/dist: config.guess src/sys/external/isc/libsodium/dist/build-aux: config.guess Log Message: Support aarch64eb in */config.guess. Cherry-picked from upstream: https://git.savannah.gnu.org/gitweb/?p=config.git;a=commit;h=1c4398015583eb77bc043234f5734be055e64bea Everything except external/apache2/llvm/dist/llvm/cmake/config.guess is patched, which is under vendor tag and cannot be modified. I expect that this file is not actually used as we use hand-crafted version of configure script instead of cmake for building LLVM. Note that external/apache2/llvm/autoconf/autoconf/config.guess has already been committed on Oct. 20, but commit message disappeared as cvs aborted due to "permission denied" when trying to modify the file mentioned above. Sorry for confusing you. Also note that GMP uses its own config.guess Patch for external/lgpl3/gmp/dist/config.guess is provided by ryo@. Thanks! To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/heimdal/dist/config.guess cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/buildaux/config.guess cvs rdiff -u -r1.2 -r1.3 src/crypto/external/cpl/tpm-tools/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/crypto/external/cpl/trousers/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/am-utils/dist/config.guess cvs rdiff -u -r1.5 -r1.6 src/external/bsd/byacc/dist/config.guess cvs rdiff -u -r1.13 -r1.14 src/external/bsd/file/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/flex/dist/build-aux/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/iscsi/dist/buildaux/config.guess cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/bsd/jemalloc/dist/build-aux/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libbind/dist/config.guess cvs rdiff -u -r1.2 -r1.3 src/external/bsd/libevent/dist/config.guess cvs rdiff -u -r1.3 -r1.4 src/external/bsd/libpcap/dist/config.guess cvs rdiff -u -r1.1 -r1.2 src/external/bsd/nsd/dist/config.guess cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/ntp/dist/s
CVS commit: src/usr.sbin/tprof
Module Name:src
Committed By: rin
Date: Tue Nov 17 10:47:17 UTC 2020
Modified Files:
src/usr.sbin/tprof: Makefile
Log Message:
Support aarch64eb; just works fine.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/tprof/Makefile
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/tprof/Makefile
diff -u src/usr.sbin/tprof/Makefile:1.9 src/usr.sbin/tprof/Makefile:1.10
--- src/usr.sbin/tprof/Makefile:1.9 Sun Jan 27 05:12:30 2019
+++ src/usr.sbin/tprof/Makefile Tue Nov 17 10:47:17 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/01/27 05:12:30 kre Exp $
+# $NetBSD: Makefile,v 1.10 2020/11/17 10:47:17 rin Exp $
.PATH: ${.CURDIR}/arch
@@ -10,7 +10,7 @@ SRCS= tprof.c tprof_analyze.c
SRCS+= tprof_x86.c
.elif !empty(MACHINE_ARCH:M*armv7*)
SRCS+= tprof_armv7.c
-.elif ${MACHINE_ARCH} == "aarch64"
+.elif !empty(MACHINE_ARCH:Maarch64*)
SRCS+= tprof_armv8.c
.else
SRCS+= tprof_noarch.c
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Tue Nov 17 10:49:41 UTC 2020
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Set USE_XZ_SETS to yes by default for aarch64eb in the same manner as aarch64.
To generate a diff of this commit:
cvs rdiff -u -r1.1233 -r1.1234 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1233 src/share/mk/bsd.own.mk:1.1234
--- src/share/mk/bsd.own.mk:1.1233 Tue Nov 10 21:47:49 2020
+++ src/share/mk/bsd.own.mk Tue Nov 17 10:49:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1233 2020/11/10 21:47:49 kamil Exp $
+# $NetBSD: bsd.own.mk,v 1.1234 2020/11/17 10:49:41 rin Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1495,7 +1495,7 @@ ${var}?= no
.if ${USE_PIGZGZIP} == "no" && \
(${MACHINE} == "amd64" || \
${MACHINE} == "sparc64" || \
- ${MACHINE_ARCH} == "aarch64")
+ ${MACHINE_CPU} == "aarch64")
USE_XZ_SETS?= yes
.else
USE_XZ_SETS?= no
CVS commit: src/sys/external/bsd/acpica/dist
Module Name:src
Committed By: rin
Date: Wed Nov 18 06:49:14 UTC 2020
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompiler.h
src/sys/external/bsd/acpica/dist/debugger: dbinput.c
src/sys/external/bsd/acpica/dist/include: aclocal.h
src/sys/external/bsd/acpica/dist/namespace: nsxfeval.c
src/sys/external/bsd/acpica/dist/resources: rsxface.c
src/sys/external/bsd/acpica/dist/tables: tbxface.c
src/sys/external/bsd/acpica/dist/utilities: utcache.c utosi.c utprint.c
Log Message:
Adjust blank line & white space to slightly reduce diff from upstream.
No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/resources/rsxface.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/tables/tbxface.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/utilities/utcache.c \
src/sys/external/bsd/acpica/dist/utilities/utosi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/utilities/utprint.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/acpica/dist/compiler/aslcompiler.h
diff -u src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.16 src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.17
--- src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h:1.16 Sat Mar 28 19:49:26 2020
+++ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h Wed Nov 18 06:49:13 2020
@@ -1170,7 +1170,6 @@ UtEndEvent (
UINT8 Event);
void
-
UtDisplaySummary (
UINT32 FileId);
Index: src/sys/external/bsd/acpica/dist/debugger/dbinput.c
diff -u src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.21 src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.22
--- src/sys/external/bsd/acpica/dist/debugger/dbinput.c:1.21 Sat Mar 28 19:49:26 2020
+++ src/sys/external/bsd/acpica/dist/debugger/dbinput.c Wed Nov 18 06:49:13 2020
@@ -1028,6 +1028,7 @@ AcpiDbCommandDispatch (
break;
case CMD_METHODS:
+
Status = AcpiDbDisplayObjects (__UNCONST("METHOD"), AcpiGbl_DbArgs[1]);
break;
Index: src/sys/external/bsd/acpica/dist/include/aclocal.h
diff -u src/sys/external/bsd/acpica/dist/include/aclocal.h:1.21 src/sys/external/bsd/acpica/dist/include/aclocal.h:1.22
--- src/sys/external/bsd/acpica/dist/include/aclocal.h:1.21 Sat Mar 28 19:49:27 2020
+++ src/sys/external/bsd/acpica/dist/include/aclocal.h Wed Nov 18 06:49:13 2020
@@ -91,6 +91,7 @@ union acpi_parse_object;
#define ACPI_MAX_MUTEX 5
#define ACPI_NUM_MUTEX (ACPI_MAX_MUTEX+1)
+
/* Lock structure for reader/writer interfaces */
typedef struct acpi_rw_lock
Index: src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c
diff -u src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.14 src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.15
--- src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c:1.14 Sat Mar 28 19:49:27 2020
+++ src/sys/external/bsd/acpica/dist/namespace/nsxfeval.c Wed Nov 18 06:49:14 2020
@@ -94,6 +94,7 @@ AcpiEvaluateObjectTyped (
ACPI_HANDLE TargetHandle;
char*FullPathname;
+
ACPI_FUNCTION_TRACE (AcpiEvaluateObjectTyped);
Index: src/sys/external/bsd/acpica/dist/resources/rsxface.c
diff -u src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.13 src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.14
--- src/sys/external/bsd/acpica/dist/resources/rsxface.c:1.13 Sat Mar 28 19:49:28 2020
+++ src/sys/external/bsd/acpica/dist/resources/rsxface.c Wed Nov 18 06:49:14 2020
@@ -612,6 +612,7 @@ AcpiWalkResourceBuffer (
ACPI_RESOURCE *Resource;
ACPI_RESOURCE *ResourceEnd;
+
ACPI_FUNCTION_TRACE (AcpiWalkResourceBuffer);
Index: src/sys/external/bsd/acpica/dist/tables/tbxface.c
diff -u src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.15 src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.16
--- src/sys/external/bsd/acpica/dist/tables/tbxface.c:1.15 Sat Mar 28 19:49:28 2020
+++ src/sys/external/bsd/acpica/dist/tables/tbxface.c Wed Nov 18 06:49:14 2020
@@ -281,6 +281,7 @@ AcpiGetTableHeader (
UINT32 j;
ACPI_TABLE_HEADER *Header;
+
/* Parameter validation */
if (!Signature || !OutTableHeader)
@@ -372,6 +373,7 @@ AcpiGetTable (
ACPI_STATUS Status = AE_NOT_FOUND;
ACPI_TABLE_DESC *TableDesc;
+
/* Parameter validation */
if (!Signature || !OutTable)
In
CVS commit: src/sys/crypto/aes/arch/arm
Module Name:src
Committed By: rin
Date: Sat Nov 21 08:09:21 UTC 2020
Modified Files:
src/sys/crypto/aes/arch/arm: aes_neon.c
Log Message:
Fix build with clang for earmv7hf; loadroundkey() is used only for __aarch64__.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/crypto/aes/arch/arm/aes_neon.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/crypto/aes/arch/arm/aes_neon.c
diff -u src/sys/crypto/aes/arch/arm/aes_neon.c:1.5 src/sys/crypto/aes/arch/arm/aes_neon.c:1.6
--- src/sys/crypto/aes/arch/arm/aes_neon.c:1.5 Sat Aug 8 14:47:01 2020
+++ src/sys/crypto/aes/arch/arm/aes_neon.c Sat Nov 21 08:09:21 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aes_neon.c,v 1.5 2020/08/08 14:47:01 riastradh Exp $ */
+/* $NetBSD: aes_neon.c,v 1.6 2020/11/21 08:09:21 rin Exp $ */
/*-
* Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: aes_neon.c,v 1.5 2020/08/08 14:47:01 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aes_neon.c,v 1.6 2020/11/21 08:09:21 rin Exp $");
#include
@@ -196,11 +196,13 @@ inv = VQ_N_U8(0x80,0x01,0x08,0x0D,0x0F,0
inva = VQ_N_U8(0x80,0x07,0x0B,0x0F,0x06,0x0A,0x04,0x01,
0x09,0x08,0x05,0x02,0x0C,0x0E,0x0D,0x03);
+#ifdef __aarch64__
static inline uint8x16_t
loadroundkey(const void *rkp)
{
return vld1q_u8(rkp);
}
+#endif
static inline void
storeroundkey(void *rkp, uint8x16_t rk)
CVS commit: src/games/warp
Module Name:src Committed By: rin Date: Sat Nov 21 09:24:02 UTC 2020 Modified Files: src/games/warp: util.h Log Message: roundsleep(): Too many zeros; tv_nsec should be compared with 500 msec, not 5000. Raised by clang for ILP32 archs. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/games/warp/util.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/warp/util.h diff -u src/games/warp/util.h:1.6 src/games/warp/util.h:1.7 --- src/games/warp/util.h:1.6 Thu Nov 12 22:23:16 2020 +++ src/games/warp/util.h Sat Nov 21 09:24:02 2020 @@ -18,7 +18,7 @@ /* we get fractions of seconds from calling ftime on timebuf */ extern struct timespec timebuf; -#define roundsleep(x) (clock_gettime(CLOCK_REALTIME, &timebuf),sleep(timebuf.tv_nsec > 50 ?x+1:x)) +#define roundsleep(x) (clock_gettime(CLOCK_REALTIME, &timebuf),sleep(timebuf.tv_nsec > (500 * 1000 * 1000) ?x+1:x)) #define waiting 0
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Sat Nov 21 22:59:19 UTC 2020 Modified Files: src/sys/dev/wsfont: files.wsfont wsfont.c Log Message: Sort spleen by size, instead of character code. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/dev/wsfont/files.wsfont cvs rdiff -u -r1.69 -r1.70 src/sys/dev/wsfont/wsfont.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/wsfont/files.wsfont diff -u src/sys/dev/wsfont/files.wsfont:1.26 src/sys/dev/wsfont/files.wsfont:1.27 --- src/sys/dev/wsfont/files.wsfont:1.26 Fri Nov 13 01:03:39 2020 +++ src/sys/dev/wsfont/files.wsfont Sat Nov 21 22:59:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.wsfont,v 1.26 2020/11/13 01:03:39 macallan Exp $ +# $NetBSD: files.wsfont,v 1.27 2020/11/21 22:59:18 rin Exp $ defpseudo wsfont @@ -29,11 +29,11 @@ defflag opt_wsfont.h FONT_BOLD8x16 FONT_DROID_SANS_MONO9x18 FONT_DROID_SANS_MONO19x36 FONT_GO_MONO12x23 +FONT_SPLEEN5x8 +FONT_SPLEEN8x16 FONT_SPLEEN12x24 FONT_SPLEEN16x32 FONT_SPLEEN32x64 -FONT_SPLEEN5x8 -FONT_SPLEEN8x16 FONT_LIBERATION_MONO12x21 file dev/wsfont/wsfontdev.c wsfont needs-flag Index: src/sys/dev/wsfont/wsfont.c diff -u src/sys/dev/wsfont/wsfont.c:1.69 src/sys/dev/wsfont/wsfont.c:1.70 --- src/sys/dev/wsfont/wsfont.c:1.69 Fri Nov 13 01:03:39 2020 +++ src/sys/dev/wsfont/wsfont.c Sat Nov 21 22:59:18 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: wsfont.c,v 1.69 2020/11/13 01:03:39 macallan Exp $ */ +/* $NetBSD: wsfont.c,v 1.70 2020/11/21 22:59:18 rin Exp $ */ /*- * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.69 2020/11/13 01:03:39 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.70 2020/11/21 22:59:18 rin Exp $"); #include "opt_wsfont.h" @@ -150,34 +150,34 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1 #include #endif -#ifdef FONT_SPLEEN12x24 +#ifdef FONT_SPLEEN5x8 #define HAVE_FONT 1 -#include +#include #endif -#ifdef FONT_SPLEEN16x32 +#ifdef FONT_SPLEEN6x12 #define HAVE_FONT 1 -#include +#include #endif -#ifdef FONT_SPLEEN32x64 +#ifdef FONT_SPLEEN8x16 #define HAVE_FONT 1 -#include +#include #endif -#ifdef FONT_SPLEEN5x8 +#ifdef FONT_SPLEEN12x24 #define HAVE_FONT 1 -#include +#include #endif -#ifdef FONT_SPLEEN6x12 +#ifdef FONT_SPLEEN16x32 #define HAVE_FONT 1 -#include +#include #endif -#ifdef FONT_SPLEEN8x16 +#ifdef FONT_SPLEEN32x64 #define HAVE_FONT 1 -#include +#include #endif #ifdef FONT_LIBERATION_MONO12x21
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: rin Date: Sat Nov 21 23:00:02 UTC 2020 Modified Files: src/sys/dev/wsfont: files.wsfont Log Message: Add missing FONT_SPLEEN6x12 option. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/wsfont/files.wsfont 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/wsfont/files.wsfont diff -u src/sys/dev/wsfont/files.wsfont:1.27 src/sys/dev/wsfont/files.wsfont:1.28 --- src/sys/dev/wsfont/files.wsfont:1.27 Sat Nov 21 22:59:18 2020 +++ src/sys/dev/wsfont/files.wsfont Sat Nov 21 23:00:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: files.wsfont,v 1.27 2020/11/21 22:59:18 rin Exp $ +# $NetBSD: files.wsfont,v 1.28 2020/11/21 23:00:02 rin Exp $ defpseudo wsfont @@ -30,6 +30,7 @@ defflag opt_wsfont.h FONT_BOLD8x16 FONT_DROID_SANS_MONO19x36 FONT_GO_MONO12x23 FONT_SPLEEN5x8 +FONT_SPLEEN6x12 FONT_SPLEEN8x16 FONT_SPLEEN12x24 FONT_SPLEEN16x32
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: rin
Date: Mon Nov 23 06:21:07 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
Log Message:
Factor out bcm283x_aux_platform_early_putchar() from
bcm{2837,2711}_platform_early_putchar(), for which output goes to
AUX UART (aka mini UART).
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/broadcom/bcm283x_platform.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/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.41 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.42
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.41 Mon Sep 28 11:54:23 2020
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Mon Nov 23 06:21:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.41 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.42 2020/11/23 06:21:07 rin Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.41 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.42 2020/11/23 06:21:07 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -1344,6 +1344,20 @@ bcm283x_platform_early_putchar(vaddr_t v
continue;
}
+static void __noasan
+bcm283x_aux_platform_early_putchar(vaddr_t va, paddr_t pa, char c)
+{
+ volatile uint32_t *uartaddr =
+ cpu_earlydevice_va_p() ?
+ (volatile uint32_t *)va :
+ (volatile uint32_t *)pa;
+
+ while ((uartaddr[com_lsr] & LSR_TXRDY) == 0)
+ continue;
+
+ uartaddr[com_data] = c;
+}
+
void __noasan
bcm2835_platform_early_putchar(char c)
{
@@ -1365,37 +1379,19 @@ bcm2836_platform_early_putchar(char c)
void __noasan
bcm2837_platform_early_putchar(char c)
{
-#define AUCONSADDR_PA BCM2836_PERIPHERALS_BUS_TO_PHYS(BCM2835_AUX_UART_BASE)
-#define AUCONSADDR_VA BCM2835_IOPHYSTOVIRT(AUCONSADDR_PA)
- volatile uint32_t *uartaddr =
- cpu_earlydevice_va_p() ?
- (volatile uint32_t *)AUCONSADDR_VA :
- (volatile uint32_t *)AUCONSADDR_PA;
-
- while ((uartaddr[com_lsr] & LSR_TXRDY) == 0)
- ;
+ paddr_t pa = BCM2836_PERIPHERALS_BUS_TO_PHYS(BCM2835_AUX_UART_BASE);
+ vaddr_t va = BCM2835_IOPHYSTOVIRT(pa);
- uartaddr[com_data] = c;
-#undef AUCONSADDR_VA
-#undef AUCONSADDR_PA
+ bcm283x_aux_platform_early_putchar(va, pa, c);
}
void __noasan
bcm2711_platform_early_putchar(char c)
{
-#define AUCONSADDR_PA BCM2711_PERIPHERALS_BUS_TO_PHYS(BCM2835_AUX_UART_BASE)
-#define AUCONSADDR_VA BCM2711_IOPHYSTOVIRT(AUCONSADDR_PA)
- volatile uint32_t *uartaddr =
- cpu_earlydevice_va_p() ?
- (volatile uint32_t *)AUCONSADDR_VA :
- (volatile uint32_t *)AUCONSADDR_PA;
+ paddr_t pa = BCM2711_PERIPHERALS_BUS_TO_PHYS(BCM2835_AUX_UART_BASE);
+ vaddr_t va = BCM2711_IOPHYSTOVIRT(pa);
- while ((uartaddr[com_lsr] & LSR_TXRDY) == 0)
- ;
-
- uartaddr[com_data] = c;
-#undef AUCONSADDR_VA
-#undef AUCONSADDR_PA
+ bcm283x_aux_platform_early_putchar(va, pa, c);
}
#define BCM283x_REF_FREQ 1920
CVS commit: src/sys/arch
Module Name:src
Committed By: rin
Date: Mon Nov 23 06:24:35 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/evbarm/conf: RPI
Log Message:
Support EARLYCONS and VERBOSE_INIT_ARM for Raspberry Pi Zero W, for
which mini UART should be used instead of PL011 UART.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/evbarm/conf/RPI
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/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.42 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.43
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.42 Mon Nov 23 06:21:07 2020
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Mon Nov 23 06:24:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.42 2020/11/23 06:21:07 rin Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.43 2020/11/23 06:24:35 rin Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.42 2020/11/23 06:21:07 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.43 2020/11/23 06:24:35 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -112,6 +112,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm283x_plat
#define RPI_CPU_MAX 4
void bcm2835_platform_early_putchar(char c);
+void bcm2835_aux_platform_early_putchar(char c);
void bcm2836_platform_early_putchar(char c);
void bcm2837_platform_early_putchar(char c);
void bcm2711_platform_early_putchar(char c);
@@ -1368,6 +1369,15 @@ bcm2835_platform_early_putchar(char c)
}
void __noasan
+bcm2835_aux_platform_early_putchar(char c)
+{
+ paddr_t pa = BCM2835_PERIPHERALS_BUS_TO_PHYS(BCM2835_AUX_UART_BASE);
+ vaddr_t va = BCM2835_IOPHYSTOVIRT(pa);
+
+ bcm283x_aux_platform_early_putchar(va, pa, c);
+}
+
+void __noasan
bcm2836_platform_early_putchar(char c)
{
paddr_t pa = BCM2836_PERIPHERALS_BUS_TO_PHYS(BCM2835_UART0_BASE);
Index: src/sys/arch/evbarm/conf/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.93 src/sys/arch/evbarm/conf/RPI:1.94
--- src/sys/arch/evbarm/conf/RPI:1.93 Fri Oct 30 11:02:50 2020
+++ src/sys/arch/evbarm/conf/RPI Mon Nov 23 06:24:35 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: RPI,v 1.93 2020/10/30 11:02:50 rin Exp $
+# $NetBSD: RPI,v 1.94 2020/11/23 06:24:35 rin Exp $
#
# RPi -- Raspberry Pi
#
@@ -19,7 +19,8 @@ makeoptions CPUFLAGS="-march=armv6z -mt
# Development and Debugging options
#options KGDB,KGDB_PLCOMUNIT=0,KGDB_DEVRATE=115200,KGDB_CONMODE=0xB00
#options VERBOSE_INIT_ARM
-#options EARLYCONS=bcm2835,CONSADDR=0x20201000
+#options EARLYCONS=bcm2835,CONSADDR=0x20201000 # RPI1, RPI0
+#options EARLYCONS=bcm2835_aux,CONSADDR=0x20215040 # RPI0W
makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPY_SYMTAB=1
options PLCONSOLE
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: rin
Date: Mon Nov 23 06:29:32 UTC 2020
Modified Files:
src/sys/arch/evbarm/rpi: vcprop.h
Log Message:
Remove stray white space. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/rpi/vcprop.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/evbarm/rpi/vcprop.h
diff -u src/sys/arch/evbarm/rpi/vcprop.h:1.17 src/sys/arch/evbarm/rpi/vcprop.h:1.18
--- src/sys/arch/evbarm/rpi/vcprop.h:1.17 Mon Dec 30 15:58:12 2019
+++ src/sys/arch/evbarm/rpi/vcprop.h Mon Nov 23 06:29:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vcprop.h,v 1.17 2019/12/30 15:58:12 skrll Exp $ */
+/* $NetBSD: vcprop.h,v 1.18 2020/11/23 06:29:32 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -130,12 +130,12 @@ struct vcprop_tag_fwrev {
struct vcprop_tag_boardmodel {
struct vcprop_tag tag;
uint32_t model;
-} ;
+};
struct vcprop_tag_boardrev {
struct vcprop_tag tag;
uint32_t rev;
-} ;
+};
#define VCPROP_REV_PCBREV __BITS(3,0)
#define VCPROP_REV_MODEL __BITS(11,4)
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: rin Date: Mon Nov 23 06:29:54 UTC 2020 Modified Files: src/sys/arch/evbarm/rpi: rpi_vcmbox.c vcprop_subr.c Log Message: Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/rpi/rpi_vcmbox.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/rpi/vcprop_subr.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/evbarm/rpi/rpi_vcmbox.c diff -u src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.5 src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.6 --- src/sys/arch/evbarm/rpi/rpi_vcmbox.c:1.5 Sat Dec 8 06:53:11 2018 +++ src/sys/arch/evbarm/rpi/rpi_vcmbox.c Mon Nov 23 06:29:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_vcmbox.c,v 1.5 2018/12/08 06:53:11 mlelstv Exp $ */ +/* $NetBSD: rpi_vcmbox.c,v 1.6 2020/11/23 06:29:54 rin Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill @@ -31,15 +31,15 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rpi_vcmbox.c,v 1.5 2018/12/08 06:53:11 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rpi_vcmbox.c,v 1.6 2020/11/23 06:29:54 rin Exp $"); #include #include -#include -#include -#include #include +#include +#include #include +#include #include #include Index: src/sys/arch/evbarm/rpi/vcprop_subr.c diff -u src/sys/arch/evbarm/rpi/vcprop_subr.c:1.6 src/sys/arch/evbarm/rpi/vcprop_subr.c:1.7 --- src/sys/arch/evbarm/rpi/vcprop_subr.c:1.6 Sat Jul 4 15:14:56 2020 +++ src/sys/arch/evbarm/rpi/vcprop_subr.c Mon Nov 23 06:29:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vcprop_subr.c,v 1.6 2020/07/04 15:14:56 skrll Exp $ */ +/* $NetBSD: vcprop_subr.c,v 1.7 2020/11/23 06:29:54 rin Exp $ */ /* * Copyright (c) 2014 Michael Lorenz @@ -30,8 +30,8 @@ */ #include -#include #include +#include #include
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: rin Date: Mon Nov 23 06:39:54 UTC 2020 Modified Files: src/sys/arch/evbarm/rpi: vcprop_subr.c Log Message: Add missing __KERNEL_RCSID(). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/rpi/vcprop_subr.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/evbarm/rpi/vcprop_subr.c diff -u src/sys/arch/evbarm/rpi/vcprop_subr.c:1.7 src/sys/arch/evbarm/rpi/vcprop_subr.c:1.8 --- src/sys/arch/evbarm/rpi/vcprop_subr.c:1.7 Mon Nov 23 06:29:54 2020 +++ src/sys/arch/evbarm/rpi/vcprop_subr.c Mon Nov 23 06:39:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vcprop_subr.c,v 1.7 2020/11/23 06:29:54 rin Exp $ */ +/* $NetBSD: vcprop_subr.c,v 1.8 2020/11/23 06:39:54 rin Exp $ */ /* * Copyright (c) 2014 Michael Lorenz @@ -28,6 +28,8 @@ /* * Mailbox property interface wrapper functions */ +#include +__KERNEL_RCSID(0, "$NetBSD: vcprop_subr.c,v 1.8 2020/11/23 06:39:54 rin Exp $"); #include #include
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: rin Date: Mon Nov 23 06:46:38 UTC 2020 Modified Files: src/sys/arch/arm/broadcom: bcm2835_genfb.c Log Message: Sort headers. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/broadcom/bcm2835_genfb.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/broadcom/bcm2835_genfb.c diff -u src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.9 src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.10 --- src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.9 Sun Apr 1 04:35:03 2018 +++ src/sys/arch/arm/broadcom/bcm2835_genfb.c Mon Nov 23 06:46:38 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_genfb.c,v 1.9 2018/04/01 04:35:03 ryo Exp $ */ +/* $NetBSD: bcm2835_genfb.c,v 1.10 2020/11/23 06:46:38 rin Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill @@ -31,15 +31,15 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bcm2835_genfb.c,v 1.9 2018/04/01 04:35:03 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_genfb.c,v 1.10 2020/11/23 06:46:38 rin Exp $"); #include #include -#include -#include -#include #include +#include +#include #include +#include #include
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: rin
Date: Mon Nov 23 12:15:39 UTC 2020
Modified Files:
src/sys/dev/wsfont: wsfont.c
Log Message:
Sort spleen also in builtin_fonts[].
No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/wsfont/wsfont.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/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.70 src/sys/dev/wsfont/wsfont.c:1.71
--- src/sys/dev/wsfont/wsfont.c:1.70 Sat Nov 21 22:59:18 2020
+++ src/sys/dev/wsfont/wsfont.c Mon Nov 23 12:15:39 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: wsfont.c,v 1.70 2020/11/21 22:59:18 rin Exp $ */
+/* $NetBSD: wsfont.c,v 1.71 2020/11/23 12:15:39 rin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.70 2020/11/21 22:59:18 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.71 2020/11/23 12:15:39 rin Exp $");
#include "opt_wsfont.h"
@@ -288,15 +288,6 @@ static struct font builtin_fonts[] = {
#ifdef FONT_GO_MONO12x23
{ { NULL, NULL }, &Go_Mono_12x23, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
-#ifdef FONT_SPLEEN12x24
- { { NULL, NULL }, &spleen12x24, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
-#ifdef FONT_SPLEEN16x32
- { { NULL, NULL }, &spleen16x32, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
-#ifdef FONT_SPLEEN32x64
- { { NULL, NULL }, &spleen32x64, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
-#endif
#ifdef FONT_SPLEEN5x8
{ { NULL, NULL }, &spleen5x8, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
@@ -306,6 +297,15 @@ static struct font builtin_fonts[] = {
#ifdef FONT_SPLEEN8x16
{ { NULL, NULL }, &spleen8x16, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
+#ifdef FONT_SPLEEN12x24
+ { { NULL, NULL }, &spleen12x24, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
+#ifdef FONT_SPLEEN16x32
+ { { NULL, NULL }, &spleen16x32, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
+#ifdef FONT_SPLEEN32x64
+ { { NULL, NULL }, &spleen32x64, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
#ifdef FONT_LIBERATION_MONO12x21
{ { NULL, NULL }, &Liberation_Mono_12x21, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
#endif
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src
Committed By: rin
Date: Tue Dec 1 02:39:09 UTC 2020
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h
Log Message:
Switch earmv6{,hf}eb from BE32 (deprecated) to BE8 (new), which enables
- binary compatibility with earmv7{,hf}eb and later, as well as
COMPAT_NETBSD32 on aarch64eb
- unaligned memory access
whereas compatibility with earmv5{,hf}eb and prior is lost.
As we have never released kernel and userland for earmv6{,hf}eb yet,
this does not causes any compatibility problems.
Discussed on port-arm and tech-toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.15 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.16
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.15 Fri Aug 19 05:11:09 2016
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h Tue Dec 1 02:39:08 2020
@@ -34,8 +34,6 @@
#undef TARGET_LINKER_EMULATION
#if TARGET_BIG_ENDIAN_DEFAULT
#define TARGET_LINKER_EMULATION TARGET_LINKER_BIG_EMULATION
-#undef BE8_LINK_SPEC
-#define BE8_LINK_SPEC " %{!mlittle-endian:%{march=armv7-a|mcpu=cortex-a5|mcpu=cortex-a8|mcpu=cortex-a9:%{!r:--be8}}}"
#else
#define TARGET_LINKER_EMULATION TARGET_LINKER_LITTLE_EMULATION
#endif
CVS commit: src/external/gpl3/gcc.old/dist/gcc/config/arm
Module Name:src
Committed By: rin
Date: Tue Dec 1 02:39:48 UTC 2020
Modified Files:
src/external/gpl3/gcc.old/dist/gcc/config/arm: netbsd-eabi.h
Log Message:
gcc.old: Switch earmv6{,hf}eb to BE8, ported from gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/external/gpl3/gcc.old/dist/gcc/config/arm/netbsd-eabi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc.old/dist/gcc/config/arm/netbsd-eabi.h:1.7 src/external/gpl3/gcc.old/dist/gcc/config/arm/netbsd-eabi.h:1.8
--- src/external/gpl3/gcc.old/dist/gcc/config/arm/netbsd-eabi.h:1.7 Thu Sep 26 05:55:42 2019
+++ src/external/gpl3/gcc.old/dist/gcc/config/arm/netbsd-eabi.h Tue Dec 1 02:39:48 2020
@@ -34,8 +34,6 @@
#undef TARGET_LINKER_EMULATION
#if TARGET_BIG_ENDIAN_DEFAULT
#define TARGET_LINKER_EMULATION TARGET_LINKER_BIG_EMULATION
-#undef BE8_LINK_SPEC
-#define BE8_LINK_SPEC " %{!mlittle-endian:%{march=armv7-a|mcpu=cortex-a5|mcpu=cortex-a8|mcpu=cortex-a9:%{!r:--be8}}}"
#else
#define TARGET_LINKER_EMULATION TARGET_LINKER_LITTLE_EMULATION
#endif
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: rin
Date: Tue Dec 1 02:43:14 UTC 2020
Modified Files:
src/sys/arch/arm/arm: arm_machdep.c cpu_exec.c
src/sys/arch/arm/arm32: arm32_boot.c arm32_machdep.c kobj_machdep.c
src/sys/arch/arm/include: cdefs.h
Log Message:
Switch earmv6{,hf}eb to BE8 in kernel side.
My strategy here is to define _ARM_ARCH_BE8 macro in arm/cdefs.h, if
__ARMEB__ && _ARM_ARCH_6.
Use this macro to determine whether system is compiled for and running on
BE8 mode or not.
Note that, for __ARMEB__, some conditions become compile-time constants
determined by _ARM_ARCH_BE8 macro, e.g., whether BE8 or BE32 are accepted
as a userland binary, or unaligned memory access is possible or not.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/arm/arm/arm_machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/arm/cpu_exec.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/arm32/arm32_boot.c
cvs rdiff -u -r1.138 -r1.139 src/sys/arch/arm/arm32/arm32_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/arm32/kobj_machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/cdefs.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/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.64 src/sys/arch/arm/arm/arm_machdep.c:1.65
--- src/sys/arch/arm/arm/arm_machdep.c:1.64 Fri Aug 14 16:18:36 2020
+++ src/sys/arch/arm/arm/arm_machdep.c Tue Dec 1 02:43:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.64 2020/08/14 16:18:36 skrll Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.65 2020/12/01 02:43:13 rin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.64 2020/08/14 16:18:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.65 2020/12/01 02:43:13 rin Exp $");
#include
#include
@@ -176,15 +176,14 @@ setregs(struct lwp *l, struct exec_packa
tf->tf_usr_lr = pack->ep_entry;
tf->tf_svc_lr = 0x; /* Something we can see */
tf->tf_pc = pack->ep_entry;
-#if defined(__ARMEB__)
+ tf->tf_spsr = PSR_USR32_MODE;
+#ifdef _ARM_ARCH_BE8
/*
- * If we are running on ARMv7, we need to set the E bit to force
- * programs to start as big endian.
+ * If we are running on BE8 mode, we need to set the E bit to
+ * force programs to start as big endian.
*/
- tf->tf_spsr = PSR_USR32_MODE | (CPU_IS_ARMV7_P() ? PSR_E_BIT : 0);
-#else
- tf->tf_spsr = PSR_USR32_MODE;
-#endif /* __ARMEB__ */
+ tf->tf_spsr |= PSR_E_BIT;
+#endif
#ifdef THUMB_CODE
if (pack->ep_entry & 1)
Index: src/sys/arch/arm/arm/cpu_exec.c
diff -u src/sys/arch/arm/arm/cpu_exec.c:1.12 src/sys/arch/arm/arm/cpu_exec.c:1.13
--- src/sys/arch/arm/arm/cpu_exec.c:1.12 Thu Nov 12 01:03:22 2020
+++ src/sys/arch/arm/arm/cpu_exec.c Tue Dec 1 02:43:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_exec.c,v 1.12 2020/11/12 01:03:22 rin Exp $ */
+/* $NetBSD: cpu_exec.c,v 1.13 2020/12/01 02:43:13 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.12 2020/11/12 01:03:22 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.13 2020/12/01 02:43:13 rin Exp $");
#include "opt_compat_netbsd.h"
@@ -72,8 +72,11 @@ arm_netbsd_elf32_probe(struct lwp *l, st
* If the BE-8 model is supported, CPSR[7] will be clear.
* If the BE-32 model is supported, CPSR[7] will be set.
*/
- register_t ctl = armreg_sctlr_read();
- if (((ctl & CPU_CONTROL_BEND_ENABLE) != 0) == be8_p)
+#ifdef _ARM_ARCH_BE8
+ if (!be8_p)
+#else
+ if (be8_p)
+#endif
return ENOEXEC;
#endif /* __ARMEB__ */
@@ -111,7 +114,14 @@ arm_netbsd_elf32_probe(struct lwp *l, st
* If we are AAPCS (EABI) and armv6/armv7, we want alignment faults
* to be off.
*/
- if (aapcs_p && (CPU_IS_ARMV7_P() || CPU_IS_ARMV6_P())) {
+#if defined(__ARMEL__)
+ if (aapcs_p && (CPU_IS_ARMV7_P() || CPU_IS_ARMV6_P()))
+#elif defined(_ARM_ARCH_BE8)
+ if (aapcs_p)
+#else
+ if (false /* CONSTCOND */)
+#endif
+ {
l->l_md.md_flags |= MDLWP_NOALIGNFLT;
} else {
l->l_md.md_flags &= ~MDLWP_NOALIGNFLT;
Index: src/sys/arch/arm/arm32/arm32_boot.c
diff -u src/sys/arch/arm/arm32/arm32_boot.c:1.40 src/sys/arch/arm/arm32/arm32_boot.c:1.41
--- src/sys/arch/arm/arm32/arm32_boot.c:1.40 Fri Sep 11 06:40:25 2020
+++ src/sys/arch/arm/arm32/arm32_boot.c Tue Dec 1 02:43:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_boot.c,v 1.40 2020/09/11 06:40:25 skrll Exp $ */
+/* $NetBSD: arm32_boot.c,v 1.41 2020/12/01 02:43:14 rin Exp $ */
/*
* Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved.
@@ -122,7 +122,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.40 2020/09/11 06:40:25 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.41 2020/12/01 02:43:14 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_cputypes.h"
@@ -191,
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: rin
Date: Tue Dec 1 02:46:19 UTC 2020
Modified Files:
src/sys/arch/arm/arm: armv6_start.S cpufunc.c
Log Message:
Fix earmv6{,hf}eb start-up routines:
- Turn on U-bit in SCTLR before E-bit is turned on by ``setend be'',
in order to avoid undefined condition. ARM1176JZF-S, at least, halts
if only E-bit is turned on.
- Turn on EE-bit in SCTLR instead of B-bit as we've switched to BE8.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/arm/armv6_start.S
cvs rdiff -u -r1.178 -r1.179 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/armv6_start.S
diff -u src/sys/arch/arm/arm/armv6_start.S:1.30 src/sys/arch/arm/arm/armv6_start.S:1.31
--- src/sys/arch/arm/arm/armv6_start.S:1.30 Tue Oct 13 21:06:18 2020
+++ src/sys/arch/arm/arm/armv6_start.S Tue Dec 1 02:46:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: armv6_start.S,v 1.30 2020/10/13 21:06:18 skrll Exp $ */
+/* $NetBSD: armv6_start.S,v 1.31 2020/12/01 02:46:19 rin Exp $ */
/*-
* Copyright (c) 2012, 2017, 2018 The NetBSD Foundation, Inc.
@@ -95,9 +95,16 @@
ENTRY_NP(generic_start)
- // ARMv7 only?!?
#if defined(__ARMEB__)
+# if defined(_ARM_ARCH_7)
setend be /* force big endian */
+# else /* _ARM_ARCH_6 */
+ /* Make sure U bit is always set with E bit in SCTLR. */
+ mrc p15, 0, R_TMP1, c1, c0, 0
+ orr R_TMP1, R_TMP1, #CPU_CONTROL_UNAL_ENABLE
+ mcr p15, 0, R_TMP1, c1, c0, 0
+ setend be
+# endif
#endif
/* disable IRQs/FIQs. */
@@ -1086,6 +1093,11 @@ Lcontrol_set:
#else
#define CPU_CONTROL_EXTRA CPU_CONTROL_SYST_ENABLE
#endif
+#if defined(__ARMEL__)
+#define CPU_CONTROL_EX_BEND_SET 0
+#else
+#define CPU_CONTROL_EX_BEND_SET CPU_CONTROL_EX_BEND
+#endif
.word CPU_CONTROL_MMU_ENABLE | \
CPU_CONTROL_WBUF_ENABLE |/* not defined in 1176 (SBO) */ \
CPU_CONTROL_32BP_ENABLE |/* SBO */ \
@@ -1094,7 +1106,8 @@ Lcontrol_set:
(1 << 16) | /* SBO - Global enable for data tcm */ \
(1 << 18) | /* SBO - Global enable for insn tcm */ \
CPU_CONTROL_UNAL_ENABLE | \
- CPU_CONTROL_EXTRA
+ CPU_CONTROL_EXTRA | \
+ CPU_CONTROL_EX_BEND_SET
/* bits to clear in the Control Register */
Lcontrol_clr:
Index: src/sys/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.178 src/sys/arch/arm/arm/cpufunc.c:1.179
--- src/sys/arch/arm/arm/cpufunc.c:1.178 Fri Oct 30 18:54:36 2020
+++ src/sys/arch/arm/arm/cpufunc.c Tue Dec 1 02:46:19 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.178 2020/10/30 18:54:36 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.179 2020/12/01 02:46:19 rin Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.178 2020/10/30 18:54:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.179 2020/12/01 02:46:19 rin Exp $");
#include "opt_arm_start.h"
#include "opt_compat_netbsd.h"
@@ -2769,6 +2769,11 @@ arm11_setup(char *args)
#endif
| CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
/* | CPU_CONTROL_BPRD_ENABLE */;
+
+#ifdef __ARMEB__
+ cpuctrl |= CPU_CONTROL_EX_BEND;
+#endif
+
int cpuctrlmask = cpuctrl
| CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
@@ -2780,10 +2785,6 @@ arm11_setup(char *args)
cpuctrl = parse_cpu_options(args, arm11_options, cpuctrl);
-#ifdef __ARMEB__
- cpuctrl |= CPU_CONTROL_BEND_ENABLE;
-#endif
-
#ifndef ARM_HAS_VBAR
if (vector_page == ARM_VECTORS_HIGH)
cpuctrl |= CPU_CONTROL_VECRELOC;
@@ -2818,6 +2819,11 @@ arm11mpcore_setup(char *args)
| CPU_CONTROL_XP_ENABLE
#endif
| CPU_CONTROL_BPRD_ENABLE ;
+
+#ifdef __ARMEB__
+ cpuctrl |= CPU_CONTROL_EX_BEND;
+#endif
+
int cpuctrlmask = cpuctrl
| CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_VECRELOC;
@@ -3057,6 +3063,10 @@ arm11x6_setup(char *args)
#endif
CPU_CONTROL_IC_ENABLE;
+#ifdef __ARMEB__
+ cpuctrl |= CPU_CONTROL_EX_BEND;
+#endif
+
/*
* "write as existing" bits
* inverse of this is mask
@@ -3075,10 +3085,6 @@ arm11x6_setup(char *args)
cpuctrl = parse_cpu_options(args, arm11_options, cpuctrl);
-#ifdef __ARMEB__
- cpuctrl |= CPU_CONTROL_BEND_ENABLE;
-#endif
-
#ifndef ARM_HAS_VBAR
if (vector_page == ARM_VECTORS_HIGH)
cpuctrl |= CPU_CONTROL_VECRELOC;
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: rin
Date: Tue Dec 1 02:48:29 UTC 2020
Modified Files:
src/sys/arch/arm/arm: disassem.c
src/sys/arch/arm/arm32: db_interface.c
src/sys/arch/arm/include: db_machdep.h locore.h ptrace.h trap.h
Log Message:
Fix confusions related to encoding of instructions.
For __ARMEB__ in BE8 mode, instructions are encoded in little-endian.
Therefore, we need to swap bytes against these in native byte order.
In other cases, i.e., __ARMEL__ and __ARMEB__ in BE32 mode, instructions
are in native byte order, and we don't need to swap them.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/arm/arm/disassem.c
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/arm32/db_interface.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/db_machdep.h
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/include/locore.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/ptrace.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/include/trap.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/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.41 src/sys/arch/arm/arm/disassem.c:1.42
--- src/sys/arch/arm/arm/disassem.c:1.41 Thu Oct 24 18:34:22 2019
+++ src/sys/arch/arm/arm/disassem.c Tue Dec 1 02:48:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.41 2019/10/24 18:34:22 christos Exp $ */
+/* $NetBSD: disassem.c,v 1.42 2020/12/01 02:48:28 rin Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.41 2019/10/24 18:34:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.42 2020/12/01 02:48:28 rin Exp $");
#include
@@ -447,7 +447,7 @@ disasm(const disasm_interface_t *di, vad
fmt = 0;
matchp = 0;
insn = di->di_readword(loc);
-#if defined(__ARMEB__) && defined(CPU_ARMV7)
+#ifdef _ARM_ARCH_BE8
insn = bswap32(insn);
#endif
char neonfmt = 'd';
Index: src/sys/arch/arm/arm32/db_interface.c
diff -u src/sys/arch/arm/arm32/db_interface.c:1.61 src/sys/arch/arm/arm32/db_interface.c:1.62
--- src/sys/arch/arm/arm32/db_interface.c:1.61 Sat Jun 20 15:45:22 2020
+++ src/sys/arch/arm/arm32/db_interface.c Tue Dec 1 02:48:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.61 2020/06/20 15:45:22 skrll Exp $ */
+/* $NetBSD: db_interface.c,v 1.62 2020/12/01 02:48:29 rin Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.61 2020/06/20 15:45:22 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.62 2020/12/01 02:48:29 rin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -303,10 +303,10 @@ db_write_bytes(vaddr_t addr, size_t size
void
cpu_Debugger(void)
{
-#if _BYTE_ORDER == _LITTLE_ENDIAN
- __asm(".word 0xe7ff");
-#else
+#ifdef _ARM_ARCH_BE8
__asm(".word 0xffe7");
+#else
+ __asm(".word 0xe7ff");
#endif
}
Index: src/sys/arch/arm/include/db_machdep.h
diff -u src/sys/arch/arm/include/db_machdep.h:1.27 src/sys/arch/arm/include/db_machdep.h:1.28
--- src/sys/arch/arm/include/db_machdep.h:1.27 Sun Apr 1 04:35:04 2018
+++ src/sys/arch/arm/include/db_machdep.h Tue Dec 1 02:48:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.27 2018/04/01 04:35:04 ryo Exp $ */
+/* $NetBSD: db_machdep.h,v 1.28 2020/12/01 02:48:29 rin Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
#include
#include
@@ -70,7 +71,11 @@ extern db_regs_t *ddb_regp;
#define BKPT_INST (GDB5_BREAKPOINT)
#endif
#define BKPT_SIZE (INSN_SIZE) /* size of breakpoint inst */
+#ifdef __ARM_ARCH_BE8
+#define BKPT_SET(inst, addr) (bswap32(BKPT_INST))
+#else
#define BKPT_SET(inst, addr) (BKPT_INST)
+#endif
/*#define FIXUP_PC_AFTER_BREAK(regs) ((regs)->tf_pc -= BKPT_SIZE)*/
Index: src/sys/arch/arm/include/locore.h
diff -u src/sys/arch/arm/include/locore.h:1.34 src/sys/arch/arm/include/locore.h:1.35
--- src/sys/arch/arm/include/locore.h:1.34 Fri Oct 30 18:54:36 2020
+++ src/sys/arch/arm/include/locore.h Tue Dec 1 02:48:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.34 2020/10/30 18:54:36 skrll Exp $ */
+/* $NetBSD: locore.h,v 1.35 2020/12/01 02:48:29 rin Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -202,7 +202,7 @@ read_insn(vaddr_t va, bool user_p)
} else {
insn = *(const uint32_t *)va;
}
-#if defined(__ARMEB__) && defined(_ARM_ARCH_7)
+#ifdef _ARM_ARCH_BE8
insn = bswap32(insn);
#endif
return insn;
@@ -232,7 +232,7 @@ read_thumb_insn(vaddr_t va, bool user_p)
} else {
insn = *(const uint16_t *)va;
}
-#if defined(__ARMEB__) && defined(_ARM_ARCH_7)
+#ifdef _ARM_ARCH_BE8
insn = bswap16(insn);
#endif
return insn;
Index: src/sys/arch/arm/include/ptrace.h
diff -u src/sys/arch/arm/include/ptrace.h:1.15 src/sys/arch/arm/include/ptrace.h:1.16
--- src/sys/arch/arm/include/pt
CVS commit: src/doc
Module Name:src
Committed By: rin
Date: Tue Dec 1 02:55:15 UTC 2020
Modified Files:
src/doc: CHANGES
Log Message:
earmv6{,hf}eb has been switched to BE8.
Thanks for discussion in port-arm and tech-toolchain, especially
thorpej and mrg for useful comments.
To generate a diff of this commit:
cvs rdiff -u -r1.2756 -r1.2757 src/doc/CHANGES
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
diff -u src/doc/CHANGES:1.2756 src/doc/CHANGES:1.2757
--- src/doc/CHANGES:1.2756 Sat Nov 28 14:29:25 2020
+++ src/doc/CHANGES Tue Dec 1 02:55:14 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2756 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2757 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -303,3 +303,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
larger RAM [simonb 20201112]
acpi(4): Updated ACPICA to 20201113. [christos 20201127]
dhcpcd: Update to version 9.3.4 [roy 20201128]
+ arm: Switch earmv6{,hf}eb to BE8. [rin 20201201]
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src
Committed By: rin
Date: Tue Dec 1 03:28:08 UTC 2020
Modified Files:
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_netbsd_fdt.c
Log Message:
Fix style of error message.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c
diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.1 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.2
--- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.1 Tue Dec 31 01:00:23 2019
+++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c Tue Dec 1 03:28:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vchiq_netbsd_fdt.c,v 1.1 2019/12/31 01:00:23 jmcneill Exp $ */
+/* $NetBSD: vchiq_netbsd_fdt.c,v 1.2 2020/12/01 03:28:08 rin Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.1 2019/12/31 01:00:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.2 2020/12/01 03:28:08 rin Exp $");
#include
#include
@@ -93,7 +93,7 @@ vchiq_fdt_attach(device_t parent, device
bus_size_t size;
if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
- aprint_error(": couldn't get register address\n");
+ aprint_error_dev(sc->sc_dev, "couldn't get register address\n");
return;
}
CVS commit: src/sys/arch
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:14:31 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/evbarm/rpi: rpi_vcmbox.c vcprop.h vcprop_subr.c
Log Message:
Data written to and read from bcmmbox(4) should be in little-endian.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/rpi/rpi_vcmbox.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/rpi/vcprop.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/rpi/vcprop_subr.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/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.43 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.44
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.43 Mon Nov 23 06:24:35 2020
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Tue Dec 1 04:14:31 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.43 2020/11/23 06:24:35 rin Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.44 2020/12/01 04:14:31 rin Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.43 2020/11/23 06:24:35 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.44 2020/12/01 04:14:31 rin Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -53,6 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: bcm283x_plat
#include
#include
#include
+#include
#include
#include
@@ -349,27 +350,28 @@ static struct {
struct vcprop_tag end;
} vb_uart __cacheline_aligned = {
.vb_hdr = {
- .vpb_len = sizeof(vb_uart),
- .vpb_rcode = VCPROP_PROCESS_REQUEST,
+ .vpb_len = htole32(sizeof(vb_uart)),
+ .vpb_rcode = htole32(VCPROP_PROCESS_REQUEST),
},
.vbt_uartclockrate = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_CLOCKRATE,
- .vpt_len = VCPROPTAG_LEN(vb_uart.vbt_uartclockrate),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_CLOCKRATE),
+ .vpt_len =
+ htole32(VCPROPTAG_LEN(vb_uart.vbt_uartclockrate)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
- .id = VCPROP_CLK_UART
+ .id = htole32(VCPROP_CLK_UART)
},
.vbt_vpuclockrate = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_CLOCKRATE,
- .vpt_len = VCPROPTAG_LEN(vb_uart.vbt_vpuclockrate),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_CLOCKRATE),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb_uart.vbt_vpuclockrate)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
- .id = VCPROP_CLK_CORE
+ .id = htole32(VCPROP_CLK_CORE)
},
.end = {
- .vpt_tag = VCPROPTAG_NULL
+ .vpt_tag = htole32(VCPROPTAG_NULL)
}
};
@@ -390,99 +392,100 @@ static struct {
struct vcprop_tag end;
} vb __cacheline_aligned = {
.vb_hdr = {
- .vpb_len = sizeof(vb),
- .vpb_rcode = VCPROP_PROCESS_REQUEST,
+ .vpb_len = htole32(sizeof(vb)),
+ .vpb_rcode = htole32(VCPROP_PROCESS_REQUEST),
},
.vbt_fwrev = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_FIRMWAREREV,
- .vpt_len = VCPROPTAG_LEN(vb.vbt_fwrev),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_FIRMWAREREV),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb.vbt_fwrev)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
},
.vbt_boardmodel = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_BOARDMODEL,
- .vpt_len = VCPROPTAG_LEN(vb.vbt_boardmodel),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_BOARDMODEL),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb.vbt_boardmodel)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
},
.vbt_boardrev = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_BOARDREVISION,
- .vpt_len = VCPROPTAG_LEN(vb.vbt_boardrev),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_BOARDREVISION),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb.vbt_boardrev)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
},
.vbt_macaddr = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_MACADDRESS,
- .vpt_len = VCPROPTAG_LEN(vb.vbt_macaddr),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_MACADDRESS),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb.vbt_macaddr)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
},
.vbt_memory = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_ARMMEMORY,
- .vpt_len = VCPROPTAG_LEN(vb.vbt_memory),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_ARMMEMORY),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb.vbt_memory)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
},
.vbt_serial = {
.tag = {
- .vpt_tag = VCPROPTAG_GET_BOARDSERIAL,
- .vpt_len = VCPROPTAG_LEN(vb.vbt_serial),
- .vpt_rcode = VCPROPTAG_REQUEST
+ .vpt_tag = htole32(VCPROPTAG_GET_BOARDSERIAL),
+ .vpt_len = htole32(VCPROPTAG_LEN(vb.vbt_serial)),
+ .vpt_rcode = htole32(VCPROPTAG_REQUEST)
},
},
.vbt_dmachan = {
.tag = {
- .
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:15:04 UTC 2020
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_dmac.h bcm2835_emmc.c
bcm2835_sdhost.c
Log Message:
Data written to bcmdmac(4) should be in little-endian.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcm2835_dmac.h
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_sdhost.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/broadcom/bcm2835_dmac.h
diff -u src/sys/arch/arm/broadcom/bcm2835_dmac.h:1.4 src/sys/arch/arm/broadcom/bcm2835_dmac.h:1.5
--- src/sys/arch/arm/broadcom/bcm2835_dmac.h:1.4 Sun Aug 9 13:06:44 2015
+++ src/sys/arch/arm/broadcom/bcm2835_dmac.h Tue Dec 1 04:15:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dmac.h,v 1.4 2015/08/09 13:06:44 mlelstv Exp $ */
+/* $NetBSD: bcm2835_dmac.h,v 1.5 2020/12/01 04:15:04 rin Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill
@@ -29,6 +29,8 @@
#ifndef BCM2835_DMAC_H
#define BCM2835_DMAC_H
+#include
+
#define DMAC_CS(n) (0x00 + (0x100 * (n)))
#define DMAC_CS_RESET __BIT(31)
#define DMAC_CS_ABORT __BIT(30)
@@ -62,6 +64,9 @@
#define DMAC_DEBUG_FIFO_ERROR __BIT(1)
#define DMAC_DEBUG_READ_LAST_NOT_SET_ERROR __BIT(0)
+/*
+ * Byte-order is little endain.
+ */
struct bcm_dmac_conblk {
uint32_t cb_ti;
#define DMAC_TI_NO_WIDE_BURSTS __BIT(26)
@@ -108,5 +113,16 @@ void bcm_dmac_set_conblk_addr(struct bcm
int bcm_dmac_transfer(struct bcm_dmac_channel *);
void bcm_dmac_halt(struct bcm_dmac_channel *);
+static inline void
+bcm_dmac_swap_conblk(struct bcm_dmac_conblk *conblk)
+{
+
+ HTOLE32(conblk->cb_ti);
+ HTOLE32(conblk->cb_source_ad);
+ HTOLE32(conblk->cb_dest_ad);
+ HTOLE32(conblk->cb_txfr_len);
+ HTOLE32(conblk->cb_stride);
+ HTOLE32(conblk->cb_nextconbk);
+}
#endif /* !BCM2835_DMAC_H */
Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.38 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.39
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.38 Fri Aug 28 13:13:55 2020
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Tue Dec 1 04:15:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.38 2020/08/28 13:13:55 skrll Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.39 2020/12/01 04:15:04 rin Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.38 2020/08/28 13:13:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.39 2020/12/01 04:15:04 rin Exp $");
#include "bcmdmac.h"
@@ -327,6 +327,7 @@ bcmemmc_xfer_data_dma(struct sdhc_softc
sc->sc_dmamap->dm_segs[0].ds_addr +
sizeof(struct bcm_dmac_conblk) * (seg+1);
}
+ bcm_dmac_swap_conblk(&sc->sc_cblk[seg]);
sc->sc_cblk[seg].cb_padding[0] = 0;
sc->sc_cblk[seg].cb_padding[1] = 0;
}
Index: src/sys/arch/arm/broadcom/bcm2835_sdhost.c
diff -u src/sys/arch/arm/broadcom/bcm2835_sdhost.c:1.5 src/sys/arch/arm/broadcom/bcm2835_sdhost.c:1.6
--- src/sys/arch/arm/broadcom/bcm2835_sdhost.c:1.5 Sun May 31 23:52:19 2020
+++ src/sys/arch/arm/broadcom/bcm2835_sdhost.c Tue Dec 1 04:15:04 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_sdhost.c,v 1.5 2020/05/31 23:52:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_sdhost.c,v 1.6 2020/12/01 04:15:04 rin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_sdhost.c,v 1.5 2020/05/31 23:52:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_sdhost.c,v 1.6 2020/12/01 04:15:04 rin Exp $");
#include "bcmdmac.h"
@@ -397,6 +397,7 @@ sdhost_dma_transfer(struct sdhost_softc
sc->sc_dmamap->dm_segs[0].ds_addr +
sizeof(struct bcm_dmac_conblk) * (seg+1);
}
+ bcm_dmac_swap_conblk(&sc->sc_cblk[seg]);
sc->sc_cblk[seg].cb_padding[0] = 0;
sc->sc_cblk[seg].cb_padding[1] = 0;
}
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: rin Date: Tue Dec 1 04:16:18 UTC 2020 Modified Files: src/sys/arch/arm/broadcom: bcm283x_platform.c Log Message: Data written to and read from bcm283x UART registers should be in little-endian. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arm/broadcom/bcm283x_platform.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/broadcom/bcm283x_platform.c diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.44 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.45 --- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.44 Tue Dec 1 04:14:31 2020 +++ src/sys/arch/arm/broadcom/bcm283x_platform.c Tue Dec 1 04:16:18 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm283x_platform.c,v 1.44 2020/12/01 04:14:31 rin Exp $ */ +/* $NetBSD: bcm283x_platform.c,v 1.45 2020/12/01 04:16:18 rin Exp $ */ /*- * Copyright (c) 2017 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.44 2020/12/01 04:14:31 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.45 2020/12/01 04:16:18 rin Exp $"); #include "opt_arm_debug.h" #include "opt_bcm283x.h" @@ -1347,12 +1347,12 @@ bcm283x_platform_early_putchar(vaddr_t v (volatile uint32_t *)va : (volatile uint32_t *)pa; - while ((uartaddr[PL01XCOM_FR / 4] & PL01X_FR_TXFF) != 0) + while ((le32toh(uartaddr[PL01XCOM_FR / 4]) & PL01X_FR_TXFF) != 0) continue; - uartaddr[PL01XCOM_DR / 4] = c; + uartaddr[PL01XCOM_DR / 4] = htole32(c); - while ((uartaddr[PL01XCOM_FR / 4] & PL01X_FR_TXFE) == 0) + while ((le32toh(uartaddr[PL01XCOM_FR / 4]) & PL01X_FR_TXFE) == 0) continue; } @@ -1364,10 +1364,10 @@ bcm283x_aux_platform_early_putchar(vaddr (volatile uint32_t *)va : (volatile uint32_t *)pa; - while ((uartaddr[com_lsr] & LSR_TXRDY) == 0) + while ((le32toh(uartaddr[com_lsr]) & LSR_TXRDY) == 0) continue; - uartaddr[com_data] = c; + uartaddr[com_data] = htole32(c); } void __noasan
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: rin Date: Tue Dec 1 04:17:10 UTC 2020 Modified Files: src/sys/arch/arm/broadcom: bcm2835_genfb.c Log Message: bcm2835-fb seems byte-swapped to CPU when running in big-endian mode. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/broadcom/bcm2835_genfb.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/broadcom/bcm2835_genfb.c diff -u src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.10 src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.11 --- src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.10 Mon Nov 23 06:46:38 2020 +++ src/sys/arch/arm/broadcom/bcm2835_genfb.c Tue Dec 1 04:17:10 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_genfb.c,v 1.10 2020/11/23 06:46:38 rin Exp $ */ +/* $NetBSD: bcm2835_genfb.c,v 1.11 2020/12/01 04:17:10 rin Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill @@ -31,13 +31,14 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: bcm2835_genfb.c,v 1.10 2020/11/23 06:46:38 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: bcm2835_genfb.c,v 1.11 2020/12/01 04:17:10 rin Exp $"); #include #include #include #include #include +#include #include #include @@ -96,6 +97,9 @@ bcmgenfb_attach(device_t parent, device_ sc->sc_wstype = WSDISPLAY_TYPE_VC4; prop_dictionary_get_uint32(dict, "wsdisplay_type", &sc->sc_wstype); prop_dictionary_get_bool(dict, "is_console", &is_console); +#if BYTE_ORDER == BIG_ENDIAN + prop_dictionary_set_bool(dict, "is_swapped", true); +#endif genfb_init(&sc->sc_gen);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:18:27 UTC 2020
Modified Files:
src/sys/arch/evbarm/conf: mk.rpi
Log Message:
Link RPI and RPI2 kernels in BE8 format for big-endian variants.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/mk.rpi
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/evbarm/conf/mk.rpi
diff -u src/sys/arch/evbarm/conf/mk.rpi:1.8 src/sys/arch/evbarm/conf/mk.rpi:1.9
--- src/sys/arch/evbarm/conf/mk.rpi:1.8 Mon Dec 16 14:32:14 2019
+++ src/sys/arch/evbarm/conf/mk.rpi Tue Dec 1 04:18:26 2020
@@ -1,4 +1,8 @@
-# $NetBSD: mk.rpi,v 1.8 2019/12/16 14:32:14 skrll Exp $
+# $NetBSD: mk.rpi,v 1.9 2020/12/01 04:18:26 rin Exp $
+
+.if !empty(MACHINE_ARCH:M*eb)
+EXTRA_LINKFLAGS+= --be8
+.endif
SYSTEM_FIRST_OBJ= armv6_start.o
SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_start.S
CVS commit: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm
Module Name:src Committed By: rin Date: Tue Dec 1 04:19:04 UTC 2020 Modified Files: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm: vchiq_netbsd_acpi.c vchiq_netbsd_fdt.c Log Message: Do not attach vchiq(4) in big-endian mode. For big-endian mode, all data written to and read from DMA buffer must be byte-swapped. This requires heavy modifications to third party codes. Also, we will switch to vc4 drm driver, hopefully soon. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c \ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c:1.2 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c:1.3 --- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c:1.2 Sat Feb 22 19:37:31 2020 +++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_acpi.c Tue Dec 1 04:19:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vchiq_netbsd_acpi.c,v 1.2 2020/02/22 19:37:31 jmcneill Exp $ */ +/* $NetBSD: vchiq_netbsd_acpi.c,v 1.3 2020/12/01 04:19:04 rin Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_acpi.c,v 1.2 2020/02/22 19:37:31 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_acpi.c,v 1.3 2020/12/01 04:19:04 rin Exp $"); #include #include @@ -93,6 +93,11 @@ vchiq_acpi_attach(device_t parent, devic sc->sc_iot = aa->aa_memt; asc->sc_handle = aa->aa_node->ad_handle; +#if BYTE_ORDER == BIG_ENDIAN + aprint_error_dev(sc->sc_dev, "not supported yet in big-endian mode\n"); + return; +#endif + rv = acpi_resource_parse(self, aa->aa_node->ad_handle, "_CRS", &res, &acpi_resource_parse_ops_default); if (ACPI_FAILURE(rv)) Index: src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c diff -u src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.2 src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.3 --- src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c:1.2 Tue Dec 1 03:28:08 2020 +++ src/sys/external/bsd/vchiq/dist/interface/vchiq_arm/vchiq_netbsd_fdt.c Tue Dec 1 04:19:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vchiq_netbsd_fdt.c,v 1.2 2020/12/01 03:28:08 rin Exp $ */ +/* $NetBSD: vchiq_netbsd_fdt.c,v 1.3 2020/12/01 04:19:04 rin Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.2 2020/12/01 03:28:08 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vchiq_netbsd_fdt.c,v 1.3 2020/12/01 04:19:04 rin Exp $"); #include #include @@ -89,6 +89,11 @@ vchiq_fdt_attach(device_t parent, device sc->sc_iot = faa->faa_bst; fsc->sc_phandle = phandle; +#if BYTE_ORDER == BIG_ENDIAN + aprint_error_dev(sc->sc_dev, "not supported yet in big-endian mode\n"); + return; +#endif + bus_addr_t addr; bus_size_t size;
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:20:21 UTC 2020
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
Build RPI and RPI2 kernels also for earmv6{,hf}eb.
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.121 src/etc/etc.evbarm/Makefile.inc:1.122
--- src/etc/etc.evbarm/Makefile.inc:1.121 Fri Oct 2 17:27:12 2020
+++ src/etc/etc.evbarm/Makefile.inc Tue Dec 1 04:20:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.121 2020/10/02 17:27:12 jmcneill Exp $
+# $NetBSD: Makefile.inc,v 1.122 2020/12/01 04:20:21 rin Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -25,6 +25,11 @@ KERNEL_SETS.armv4+= IXM1200
EVBARM_BOARDS.xscale+= ADI_BRH
KERNEL_SETS.xscale+= NSLU2
+EVBARM_BOARDS.armv6+= RPI
+EVBARM_BOARDS.armv6hf+= RPI
+KERNEL_SETS.armv6+= RPI2
+KERNEL_SETS.armv6hf+= RPI2
+
KERNEL_SETS.armv7+= GENERIC
KERNEL_SETS.armv7hf+= GENERIC
.else
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:21:10 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi_inst.conf
Log Message:
rpi.img: Bump boot partition in a similar manner to other images.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/utils/embedded/conf/rpi_inst.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/rpi_inst.conf
diff -u src/distrib/utils/embedded/conf/rpi_inst.conf:1.16 src/distrib/utils/embedded/conf/rpi_inst.conf:1.17
--- src/distrib/utils/embedded/conf/rpi_inst.conf:1.16 Mon May 18 21:19:34 2020
+++ src/distrib/utils/embedded/conf/rpi_inst.conf Tue Dec 1 04:21:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: rpi_inst.conf,v 1.16 2020/05/18 21:19:34 jmcneill Exp $
+# $NetBSD: rpi_inst.conf,v 1.17 2020/12/01 04:21:10 rin Exp $
# Raspberry Pi customization script used by mkimage
#
@@ -12,8 +12,8 @@ image=$HOME/${board}.img
swap=8
extra=8 # spare space
-boot=112
init=8
+boot=$(( 192 - ${init} ))
size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
msdosid=14
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:21:26 UTC 2020
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
G/C unused.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/distrib/utils/embedded/conf/rpi.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.38 src/distrib/utils/embedded/conf/rpi.conf:1.39
--- src/distrib/utils/embedded/conf/rpi.conf:1.38 Wed May 27 11:02:52 2020
+++ src/distrib/utils/embedded/conf/rpi.conf Tue Dec 1 04:21:26 2020
@@ -1,11 +1,10 @@
-# $NetBSD: rpi.conf,v 1.38 2020/05/27 11:02:52 jmcneill Exp $
+# $NetBSD: rpi.conf,v 1.39 2020/12/01 04:21:26 rin Exp $
# Raspberry Pi customization script used by mkimage
#
board=rpi
kerneldir=$src/sys/arch/evbarm/compile/RPI/
kernel=$kerneldir/netbsd-RPI.bin
-kernels_rpi="RPI RPI2"
resize=true
. ${DIR}/conf/evbarm.conf
CVS commit: src/doc
Module Name:src
Committed By: rin
Date: Tue Dec 1 04:36:06 UTC 2020
Modified Files:
src/doc: CHANGES
Log Message:
Raspberry Pi [0-3] have been supported in big-endian mode.
Thanks ryo and skrll for their kind review!
To generate a diff of this commit:
cvs rdiff -u -r1.2757 -r1.2758 src/doc/CHANGES
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
diff -u src/doc/CHANGES:1.2757 src/doc/CHANGES:1.2758
--- src/doc/CHANGES:1.2757 Tue Dec 1 02:55:14 2020
+++ src/doc/CHANGES Tue Dec 1 04:36:05 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2757 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2758 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -304,3 +304,6 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
acpi(4): Updated ACPICA to 20201113. [christos 20201127]
dhcpcd: Update to version 9.3.4 [roy 20201128]
arm: Switch earmv6{,hf}eb to BE8. [rin 20201201]
+ evbarm: Support Raspberry Pi 0-3 in big-endian mode. All devices
+ except for vchiq(4) and vcaudio(4) are supported. Pi 3 is
+ capable to run both in aarch64eb and earmv7{,hf}eb modes.
CVS commit: src/doc
Module Name:src
Committed By: rin
Date: Tue Dec 1 22:09:43 UTC 2020
Modified Files:
src/doc: CHANGES
Log Message:
Add missig date for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.2758 -r1.2759 src/doc/CHANGES
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
diff -u src/doc/CHANGES:1.2758 src/doc/CHANGES:1.2759
--- src/doc/CHANGES:1.2758 Tue Dec 1 04:36:05 2020
+++ src/doc/CHANGES Tue Dec 1 22:09:43 2020
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2758 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2759 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -307,3 +307,4 @@ Changes from NetBSD 9.0 to NetBSD 10.0:
evbarm: Support Raspberry Pi 0-3 in big-endian mode. All devices
except for vchiq(4) and vcaudio(4) are supported. Pi 3 is
capable to run both in aarch64eb and earmv7{,hf}eb modes.
+ [rin 20201201]
CVS commit: src/usr.sbin/racoon
Module Name:src
Committed By: rin
Date: Wed Dec 2 02:21:43 UTC 2020
Modified Files:
src/usr.sbin/racoon: Makefile
Log Message:
Explicitly link liblber and libssl when ldap support is enabled.
Fix sun2, i.e., MKPIC=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/racoon/Makefile
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/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.37 src/usr.sbin/racoon/Makefile:1.38
--- src/usr.sbin/racoon/Makefile:1.37 Tue Dec 1 10:10:57 2020
+++ src/usr.sbin/racoon/Makefile Wed Dec 2 02:21:43 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2020/12/01 10:10:57 bouyer Exp $
+# $NetBSD: Makefile,v 1.38 2020/12/02 02:21:43 rin Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -60,8 +60,8 @@ CPPFLAGS+=-DINET6
.if (${USE_LDAP} != "no")
CPPFLAGS+=-DHAVE_LIBLDAP
-LDADD+=-lldap
-DPADD+= ${LIBLDAP}
+LDADD+=-lldap -llber -lssl
+DPADD+= ${LIBLDAP} ${LIBLBER} ${LIBSSL}
.endif
LDADD+= -lcrypto -lcrypt
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: rin
Date: Thu Dec 3 10:23:45 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: db_machdep.c
Log Message:
tlb_print_*() are used only if _ARM_ARCH_7; caught by clang -Wunused-function.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/arm/arm32/db_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/arm32/db_machdep.c
diff -u src/sys/arch/arm/arm32/db_machdep.c:1.37 src/sys/arch/arm/arm32/db_machdep.c:1.38
--- src/sys/arch/arm/arm32/db_machdep.c:1.37 Fri Oct 30 18:54:36 2020
+++ src/sys/arch/arm/arm32/db_machdep.c Thu Dec 3 10:23:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.37 2020/10/30 18:54:36 skrll Exp $ */
+/* $NetBSD: db_machdep.c,v 1.38 2020/12/03 10:23:45 rin Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -34,7 +34,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.37 2020/10/30 18:54:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_machdep.c,v 1.38 2020/12/03 10:23:45 rin Exp $");
#include
@@ -220,6 +220,7 @@ db_reset_cmd(db_expr_t addr, bool have_a
cpu_reset_address();
}
+#ifdef _ARM_ARCH_7
static void
tlb_print_common_header(const char *str)
{
@@ -405,7 +406,6 @@ tlb_lookup_tlbinfo(void)
return NULL;
}
-#ifdef _ARM_ARCH_7
void
db_show_tlb_cmd(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
CVS commit: src/external/gpl3/gdb/lib/libbfd
Module Name:src
Committed By: rin
Date: Mon Dec 7 08:24:09 UTC 2020
Modified Files:
src/external/gpl3/gdb/lib/libbfd: Makefile
Log Message:
Add elf32-aarch64.c to DPSRCS and CLEANFILES.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gdb/lib/libbfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.11 src/external/gpl3/gdb/lib/libbfd/Makefile:1.12
--- src/external/gpl3/gdb/lib/libbfd/Makefile:1.11 Sat Dec 5 21:27:06 2020
+++ src/external/gpl3/gdb/lib/libbfd/Makefile Mon Dec 7 08:24:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/12/05 21:27:06 christos Exp $
+# $NetBSD: Makefile,v 1.12 2020/12/07 08:24:09 rin Exp $
.include
.include "../Makefile.inc"
@@ -20,10 +20,10 @@ GSRCS= ${G_libbfd_la_OBJECTS:libbfd.lo=
SRCS= ${GSRCS:.lo=.c}
DPSRCS+= elf32-target.h elf64-target.h targmatch.h \
- elf32-ia64.c elf64-ia64.c elf64-aarch64.c \
+ elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
peigen.c pex64igen.c
CLEANFILES+= elf32-target.h elf64-target.h targmatch.h \
- elf32-ia64.c elf64-ia64.c elf64-aarch64.c \
+ elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
peigen.c pex64igen.c
.PATH: ${DIST}/bfd
CVS commit: src/external/gpl3/gdb/lib
Module Name:src Committed By: rin Date: Mon Dec 7 08:31:07 UTC 2020 Added Files: src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb: bfd-in3.h bfd.h bfd_stdint.h bfdver.h config.h defs.mk targmatch.h src/external/gpl3/gdb/lib/libctf/arch/aarch64eb: config.h defs.mk src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64eb: config.h defs.mk gstdint.h src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb: config.h defs.mk init.c jit-reader.h version.c xml-builtin.c src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64eb: defs.mk src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64eb/gdbsupport: config.h src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb: defs.mk src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib: config.h src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import: alloca.h ctype.h dirent.h fcntl.h fnmatch.h glob.h inttypes.h limits.h locale.h math.h signal.h stdint.h stdio.h stdlib.h string.h time.h unistd.h wchar.h wctype.h src/external/gpl3/gdb/lib/libiberty/arch/aarch64eb: config.h defs.mk src/external/gpl3/gdb/lib/libopcodes/arch/aarch64eb: config.h defs.mk src/external/gpl3/gdb/lib/libreadline/arch/aarch64eb: config.h defs.mk Log Message: mknative for aarch64eb. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/bfd-in3.h \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/bfd.h \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/bfd_stdint.h \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/bfdver.h \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/config.h \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/defs.mk \ src/external/gpl3/gdb/lib/libbfd/arch/aarch64eb/targmatch.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libctf/arch/aarch64eb/config.h \ src/external/gpl3/gdb/lib/libctf/arch/aarch64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64eb/config.h \ src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64eb/defs.mk \ src/external/gpl3/gdb/lib/libdecnumber/arch/aarch64eb/gstdint.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb/config.h \ src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb/defs.mk \ src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb/init.c \ src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb/jit-reader.h \ src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb/version.c \ src/external/gpl3/gdb/lib/libgdb/arch/aarch64eb/xml-builtin.c cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgdbsupport/arch/aarch64eb/gdbsupport/config.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/config.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/alloca.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/ctype.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/dirent.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/fcntl.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/fnmatch.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/glob.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/inttypes.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/limits.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/locale.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/math.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/signal.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/stdint.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/stdio.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/stdlib.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/string.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/time.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/unistd.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/wchar.h \ src/external/gpl3/gdb/lib/libgnulib/arch/aarch64eb/gnulib/import/wctype.h cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libiberty/arch/aarch64eb/config.h \ src/external/gpl3/gdb/lib/libiberty/arch/aarch64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libopcodes/arch/aarch64eb/config.h \ src/external/gpl3/gdb/lib/libopcodes/arch/aarch64eb/defs.mk cvs rdiff -u -r0 -r1.1 \ src/external/gpl3/gdb/lib/libreadline/arch/aarch64eb/
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: rin
Date: Thu Dec 10 07:14:58 UTC 2020
Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-nat.c
Log Message:
Fix arm, for which PT_STEP is defined but unimplemented.
XXX
Stop exposing PT_STEP to userland for arm?
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.19 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.20
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.19 Sat Dec 5 22:14:44 2020
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Thu Dec 10 07:14:58 2020
@@ -458,7 +458,7 @@ nbsd_nat_target::info_proc (const char *
return true;
}
-#ifdef PT_STEP
+#if defined(PT_STEP) && !defined(__arm__)
/* Resume execution of a specified PTID, that points to a process or a thread
within a process. If one thread is specified, all other threads are
suspended. If STEP is nonzero, single-step it. If SIGNAL is nonzero,
@@ -530,7 +530,7 @@ nbsd_resume(nbsd_nat_target *target, pti
void
nbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signal)
{
-#ifdef PT_STEP
+#if defined(PT_STEP) && !defined(__arm__)
if (minus_one_ptid != ptid)
nbsd_resume (this, ptid, step, signal);
else
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: rin
Date: Thu Dec 10 07:27:37 UTC 2020
Modified Files:
src/external/gpl3/gdb/dist/gdb: arm-nbsd-tdep.c
Log Message:
Fix armeb; CORE_ADDR is uint64_t but 2nd argument of raw_supply() is
expected to be the same size as PC. Therefore, PC was always read as
zero for big-endian.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.7 src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.8
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c:1.7 Sat Dec 5 22:14:44 2020
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-tdep.c Thu Dec 10 07:27:37 2020
@@ -72,7 +72,7 @@ arm_nbsd_supply_gregset (const struct re
if (regnum == -1 || regnum == ARM_PC_REGNUM)
{
- CORE_ADDR r_pc = gdbarch_addr_bits_remove (regcache->arch (), gregset->pc);
+ uint32_t r_pc = gdbarch_addr_bits_remove (regcache->arch (), gregset->pc);
regcache->raw_supply (ARM_PC_REGNUM, (char *) &r_pc);
}
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: rin Date: Mon Dec 14 01:58:48 UTC 2020 Modified Files: src/sys/arch/arm/include: ptrace.h Log Message: Obsolete PT_STEP and friends, that have never been implemented. PT_STEP was exposed to userland for NetBSD 1.6 to 9, and PT_SETSTEP and PT_CLEARSTEP was for 8 to 9. Therefore, they cannot be reused for other purposes. PT_STEP was introduced to arm/ptrace.h rev 1.2: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/arm/include/ptrace.h#rev1.2 This was for workaround against GDB, which assumes PT_STEP is 9 (even today!!), if it is undefined. But, this should have been dealt with differently... To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/include/ptrace.h diff -u src/sys/arch/arm/include/ptrace.h:1.16 src/sys/arch/arm/include/ptrace.h:1.17 --- src/sys/arch/arm/include/ptrace.h:1.16 Tue Dec 1 02:48:29 2020 +++ src/sys/arch/arm/include/ptrace.h Mon Dec 14 01:58:48 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.h,v 1.16 2020/12/01 02:48:29 rin Exp $ */ +/* $NetBSD: ptrace.h,v 1.17 2020/12/14 01:58:48 rin Exp $ */ /* * Copyright (c) 1995 Frank Lancaster @@ -36,7 +36,8 @@ /* * arm-dependent ptrace definitions */ -#ifndef _KERNEL +#if 0 +/* Exposed to userland for NetBSD 1.6 to 9. Do not reuse for other purpose. */ #define PT_STEP (PT_FIRSTMACH + 0) /* Not implemented */ #endif #define PT_GETREGS (PT_FIRSTMACH + 1) @@ -44,21 +45,22 @@ /* 3 and 4 are for FPE registers */ #define PT_GETFPREGS (PT_FIRSTMACH + 5) #define PT_SETFPREGS (PT_FIRSTMACH + 6) -#ifndef _KERNEL +#if 0 +/* Exposed to userland for NetBSD 8 to 9. Do not reuse for other purpose. */ #define PT_SETSTEP (PT_FIRSTMACH + 7) /* Not implemented */ #define PT_CLEARSTEP (PT_FIRSTMACH + 8) /* Not implemented */ #endif #define PT_MACHDEP_STRINGS \ - "PT_STEP", \ + "n/a PT_STEP", \ "PT_GETREGS", \ "PT_SETREGS", \ "old PT_GETFPREGS", \ "old PT_SETFPREGS", \ "PT_GETFPREGS", \ "PT_SETFPREGS", \ - "PT_SETSTEP", \ - "PT_CLEARSTEP", + "n/a PT_SETSTEP", \ + "n/a PT_CLEARSTEP", #include #define PTRACE_REG_PC(_r) (_r)->r_pc
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: rin
Date: Mon Dec 14 02:01:03 UTC 2020
Modified Files:
src/external/gpl3/gdb/dist/gdb: nbsd-nat.c
Log Message:
Revert previous as per request from kamil; now, arm/ptrace.h does not
expose unimplemented PT_STEP.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.20 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.21
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.20 Thu Dec 10 07:14:58 2020
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Mon Dec 14 02:01:03 2020
@@ -458,7 +458,7 @@ nbsd_nat_target::info_proc (const char *
return true;
}
-#if defined(PT_STEP) && !defined(__arm__)
+#ifdef PT_STEP
/* Resume execution of a specified PTID, that points to a process or a thread
within a process. If one thread is specified, all other threads are
suspended. If STEP is nonzero, single-step it. If SIGNAL is nonzero,
@@ -530,7 +530,7 @@ nbsd_resume(nbsd_nat_target *target, pti
void
nbsd_nat_target::resume (ptid_t ptid, int step, enum gdb_signal signal)
{
-#if defined(PT_STEP) && !defined(__arm__)
+#ifdef PT_STEP
if (minus_one_ptid != ptid)
nbsd_resume (this, ptid, step, signal);
else
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: rin Date: Mon Dec 14 02:05:08 UTC 2020 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: Add some precautions for platforms without PT_STEP support. "nat/gdb_ptrace.h" defines PT_STEP as 9, if it is not defined. nat-ptrace.c depends on this; inf_ptrace_target::resume() uses PT_STEP unconditionally when its ``step'' argument is non-zero. Therefore, - Add comment that nbsd-nat.c should include directly, instead of "nat/gdb_ptrace.h". - Add gdb_assert(step == 0) in nbsd_nat_target::resume() ifndef PT_STEP, before calling inf_ptrace_target::resume(). To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.21 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.22 --- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.21 Mon Dec 14 02:01:03 2020 +++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Mon Dec 14 02:05:07 2020 @@ -27,6 +27,9 @@ #include "gdbarch.h" #include +/* Use directly, instead of "nat/gdb_ptrace.h". Otherwise, + PT_STEP will be defined unintentionally, which breaks platforms without + PT_STEP support. */ #include #include #include @@ -539,6 +542,7 @@ nbsd_nat_target::resume (ptid_t ptid, in nbsd_resume (this, ptid_t (inf->pid, 0, 0), step, signal); } #else +gdb_assert(step == 0); if (ptid.pid () == -1) ptid = inferior_ptid; inf_ptrace_target::resume (ptid, step, signal);
CVS commit: src/external/bsd/jemalloc/include/jemalloc/internal
Module Name:src Committed By: rin Date: Wed Dec 16 01:20:19 UTC 2020 Modified Files: src/external/bsd/jemalloc/include/jemalloc/internal: jemalloc_internal_defs.h Log Message: Correct and extend comments on VA for alpha. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h 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/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h diff -u src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.13 src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.14 --- src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h:1.13 Thu Jun 4 00:45:32 2020 +++ src/external/bsd/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h Wed Dec 16 01:20:19 2020 @@ -48,7 +48,14 @@ #ifdef _LP64 /* XXX: I will take care of this later */ # ifdef __alpha__ -# define LG_VADDR 43 /* bit 42 indicates direct map, 42--63 are same */ +/* + * Bit 42 indicates kernel space. Bits 42--63 must be same. For user space, + * VA can be regarded to have 43 significant bits with sign-extension to + * 64 bits. ``Negative'' addresses are not used in this case. Alternatively, + * VA can also be regarded to have 42 significant bits with zero-extension. + * See rtree_leaf_elm_bits_extent_get() in rtree.h for more details. + */ +# define LG_VADDR 43 # else # define LG_VADDR 48 # endif
CVS commit: src/external/bsd/jemalloc/lib
Module Name:src
Committed By: rin
Date: Wed Dec 16 01:21:32 UTC 2020
Modified Files:
src/external/bsd/jemalloc/lib: Makefile.inc
Log Message:
For alpha, apply -O0 hack again to rtree.c for GCC9.
Otherwise, GDB11 crashes in strange ways.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/jemalloc/lib/Makefile.inc
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/jemalloc/lib/Makefile.inc
diff -u src/external/bsd/jemalloc/lib/Makefile.inc:1.12 src/external/bsd/jemalloc/lib/Makefile.inc:1.13
--- src/external/bsd/jemalloc/lib/Makefile.inc:1.12 Wed Oct 7 07:35:28 2020
+++ src/external/bsd/jemalloc/lib/Makefile.inc Wed Dec 16 01:21:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2020/10/07 07:35:28 rin Exp $
+# $NetBSD: Makefile.inc,v 1.13 2020/12/16 01:21:32 rin Exp $
JEMALLOC:=${.PARSEDIR}/..
@@ -55,7 +55,7 @@ COPTS.tcache.c+=-Wno-error=stack-protect
# These files need to be compiled with -O0, or build everything with
# -DJEMALLOC_DEBUG. Otherwise, userland binaries crash randomly, as
# reported in port-alpha/54307.
-COPTS.rtree.c+= ${${HAVE_GCC:U0} < 9:? -O0 :}
+COPTS.rtree.c+= -O0
COPTS.tcache.c+=-O0
.endif
CVS commit: src/doc
Module Name:src Committed By: rin Date: Wed Dec 16 01:35:39 UTC 2020 Modified Files: src/doc: HACKS Log Message: -O0 hack was reintroduced to jemalloc/rtree.c for GCC9 on alpha. To generate a diff of this commit: cvs rdiff -u -r1.215 -r1.216 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.215 src/doc/HACKS:1.216 --- src/doc/HACKS:1.215 Wed Dec 2 14:20:19 2020 +++ src/doc/HACKS Wed Dec 16 01:35:39 2020 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.215 2020/12/02 14:20:19 wiz Exp $ +# $NetBSD: HACKS,v 1.216 2020/12/16 01:35:39 rin Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -953,11 +953,11 @@ kcah port alpha hack GCC 7.4/8.3/9.3: userland binaries crash randomly (port-alpha/54307) cdate Fri Nov 1 20:43:35 UTC 2019 -mdate Wed Oct 7 16:00:00 JST 2020 +mdate Wed Dec 16 01:21:32 UTC 2020 who rin file src/external/bsd/jemalloc/lib/Makefile.inc: 1.11 -descr GCC miscompiles rtree.c (for 7.4 and 8.3) and tcache.c (for 7.4, 8.3, - and 9.3) with optimization levels -O[12]. Compile these files with -O0, +descr GCC miscompiles rtree.c and tcache.c (for 7.4, 8.3, and 9.3) with + optimization levels -O[12]. Compile these files with -O0, alternatively, compile whole jemalloc with -DJEMALLOC_DEBUG. kcah
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: rin
Date: Sat Dec 19 07:19:30 UTC 2020
Modified Files:
src/sys/lib/libsa: ufs.c
Log Message:
ufs_open(): Check fs->lfs_version ifdef LIBSA_*L*FS, not LIBSA_*F*FS.
This was harmless for FFS variants, that define LIBSA_FFSv[12], not LIBSA_FFS.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/lib/libsa/ufs.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/lib/libsa/ufs.c
diff -u src/sys/lib/libsa/ufs.c:1.76 src/sys/lib/libsa/ufs.c:1.77
--- src/sys/lib/libsa/ufs.c:1.76 Tue Apr 2 22:25:10 2019
+++ src/sys/lib/libsa/ufs.c Sat Dec 19 07:19:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs.c,v 1.76 2019/04/02 22:25:10 christos Exp $ */
+/* $NetBSD: ufs.c,v 1.77 2020/12/19 07:19:30 rin Exp $ */
/*-
* Copyright (c) 1993
@@ -582,7 +582,7 @@ ufs_open(const char *path, struct open_f
if (rc)
goto out;
if (buf_size != SBLOCKSIZE ||
-#ifdef LIBSA_FFS
+#ifdef LIBSA_LFS
fs->lfs_version != REQUIRED_LFS_VERSION ||
#endif
fs->fs_magic != FS_MAGIC) {
CVS commit: src/sys/lib/libsa
Module Name:src
Committed By: rin
Date: Sat Dec 19 08:51:03 UTC 2020
Modified Files:
src/sys/lib/libsa: ufs.c
Log Message:
Fix previous; define missing lfs_version.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/lib/libsa/ufs.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/lib/libsa/ufs.c
diff -u src/sys/lib/libsa/ufs.c:1.77 src/sys/lib/libsa/ufs.c:1.78
--- src/sys/lib/libsa/ufs.c:1.77 Sat Dec 19 07:19:30 2020
+++ src/sys/lib/libsa/ufs.c Sat Dec 19 08:51:03 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs.c,v 1.77 2020/12/19 07:19:30 rin Exp $ */
+/* $NetBSD: ufs.c,v 1.78 2020/12/19 08:51:03 rin Exp $ */
/*-
* Copyright (c) 1993
@@ -122,6 +122,7 @@ struct salfs {
typedef struct salfs FS;
#define fs_magic lfs_dlfs_u.u_32.dlfs_magic
#define fs_maxsymlinklen lfs_dlfs_u.u_32.dlfs_maxsymlinklen
+#define lfs_version lfs_dlfs_u.u_32.dlfs_version
#define FS_MAGIC LFS_MAGIC
#define SBLOCKSIZE LFS_SBPAD
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: rin
Date: Wed Dec 23 10:35:18 UTC 2020
Modified Files:
src/distrib/utils/embedded: mkimage
src/distrib/utils/embedded/conf: evbarm.conf evbmips.conf x86.conf
Log Message:
Fix fallout from mkimage rev 1.76.
For mkimage:
- Update "size" if auto-calculated.
- Use "dd bs=1" instead of non-portable "head -c".
- Some style nits.
For MD make_label() functions:
- Stop using "newsize" as image size in MB, use "size" instead.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/utils/embedded/mkimage
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbmips.conf
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/embedded/conf/x86.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.76 src/distrib/utils/embedded/mkimage:1.77
--- src/distrib/utils/embedded/mkimage:1.76 Mon Dec 21 16:38:02 2020
+++ src/distrib/utils/embedded/mkimage Wed Dec 23 10:35:18 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mkimage,v 1.76 2020/12/21 16:38:02 riastradh Exp $
+# $NetBSD: mkimage,v 1.77 2020/12/23 10:35:18 rin Exp $
#
# Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -259,15 +259,16 @@ if [ -z "${bootonly}" ]; then
-F "$tmp/selected_sets" ${image} "${release}" "${mnt}"
fi
-cursize="$(getsize "${image}")"
if [ "${size}" = 0 ]; then
- size="${cursize}"
+ size="$(getsize "${image}")"
# Round up to a multiple of 4m and add 1m of slop.
alignunit=$((4*1024*1024))
- alignsize=$((alignunit*((cursize + alignunit - 1)/alignunit)))
+ alignsize=$((alignunit*((size + alignunit - 1)/alignunit)))
alignsize=$((alignsize + 1024*1024))
- if [ $cursize -lt $alignsize ]; then
- head -c "$((alignsize - cursize))" < /dev/zero >> "${image}"
+ if [ "${size}" -lt "${alignsize}" ]; then
+ dd bs=1 count="$((alignsize - size))" if=/dev/zero \
+ >> "${image}" 2> /dev/null
+ size="${alignsize}"
fi
fi
Index: src/distrib/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.37 src/distrib/utils/embedded/conf/evbarm.conf:1.38
--- src/distrib/utils/embedded/conf/evbarm.conf:1.37 Fri Jul 17 15:16:34 2020
+++ src/distrib/utils/embedded/conf/evbarm.conf Wed Dec 23 10:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.37 2020/07/17 15:16:34 jmcneill Exp $
+# $NetBSD: evbarm.conf,v 1.38 2020/12/23 10:35:18 rin Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -23,7 +23,7 @@ mkdir -p ${mnt}/boot
make_label_evbarm() {
# compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+ local totalsize=$(( ${size} / 512 ))
local bootsize=$(( ${boot} * 1024 ))
Index: src/distrib/utils/embedded/conf/evbmips.conf
diff -u src/distrib/utils/embedded/conf/evbmips.conf:1.1 src/distrib/utils/embedded/conf/evbmips.conf:1.2
--- src/distrib/utils/embedded/conf/evbmips.conf:1.1 Fri Jul 17 15:16:34 2020
+++ src/distrib/utils/embedded/conf/evbmips.conf Wed Dec 23 10:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: evbmips.conf,v 1.1 2020/07/17 15:16:34 jmcneill Exp $
+# $NetBSD: evbmips.conf,v 1.2 2020/12/23 10:35:18 rin Exp $
# evbmips shared config
#
image=$HOME/${board}.img
@@ -23,7 +23,7 @@ mkdir -p ${mnt}/boot
make_label_evbmips() {
# compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+ local totalsize=$(( ${size} / 512 ))
local bootsize=$(( ${boot} * 1024 ))
Index: src/distrib/utils/embedded/conf/x86.conf
diff -u src/distrib/utils/embedded/conf/x86.conf:1.8 src/distrib/utils/embedded/conf/x86.conf:1.9
--- src/distrib/utils/embedded/conf/x86.conf:1.8 Tue Nov 28 02:56:44 2017
+++ src/distrib/utils/embedded/conf/x86.conf Wed Dec 23 10:35:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: x86.conf,v 1.8 2017/11/28 02:56:44 kre Exp $
+# $NetBSD: x86.conf,v 1.9 2020/12/23 10:35:18 rin Exp $
# x86 shared config
#
@@ -15,7 +15,7 @@ ffsoffset=${init}b
make_label() {
# compute all sizes in terms of sectors
- local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
+ local totalsize=$(( ${size} / 512 ))
local aoffset=${init}
local asize=$(( ${totalsize} - ${aoffset} ))
CVS commit: src
Module Name:src
Committed By: rin
Date: Thu Sep 10 01:53:22 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/sys/dev: Makefile
Log Message:
Unconditionally install kernel headers for iSCSI as required by
sanitizer shipped with GCC9.
Fix build release with HAVE_GCC=9 for sun2, where MKISCSI=no by default.
To generate a diff of this commit:
cvs rdiff -u -r1.1261 -r1.1262 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2349 -r1.2350 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/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.1261 src/distrib/sets/lists/base/mi:1.1262
--- src/distrib/sets/lists/base/mi:1.1261 Wed Sep 9 06:50:33 2020
+++ src/distrib/sets/lists/base/mi Thu Sep 10 01:53:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1261 2020/09/09 06:50:33 mrg Exp $
+# $NetBSD: mi,v 1.1262 2020/09/10 01:53:22 rin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1149,7 +1149,7 @@
./usr/include/dev/irbase-c-usr
./usr/include/dev/isabase-c-usr
./usr/include/dev/isapnp base-obsolete obsolete
-./usr/include/dev/iscsibase-c-usr iscsi
+./usr/include/dev/iscsibase-c-usr
./usr/include/dev/microcode base-obsolete obsolete
./usr/include/dev/microcode/aic7xxx base-obsolete obsolete
./usr/include/dev/microcode/isp base-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2349 src/distrib/sets/lists/comp/mi:1.2350
--- src/distrib/sets/lists/comp/mi:1.2349 Wed Sep 9 14:38:41 2020
+++ src/distrib/sets/lists/comp/mi Thu Sep 10 01:53:22 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2349 2020/09/09 14:38:41 kamil Exp $
+# $NetBSD: mi,v 1.2350 2020/09/10 01:53:22 rin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -619,8 +619,8 @@
./usr/include/dev/isapnp/if_levar.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpreg.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpvar.h comp-obsolete obsolete
-./usr/include/dev/iscsi/iscsi.h comp-c-include iscsi
-./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi.h comp-c-include
+./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include
./usr/include/dev/iscsi/iscsi_perf.h comp-obsolete obsolete
./usr/include/dev/iscsi/iscsi_test.h comp-obsolete obsolete
./usr/include/dev/keylock.h comp-c-include
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.44 src/sys/dev/Makefile:1.45
--- src/sys/dev/Makefile:1.44 Sun Jan 19 20:41:18 2020
+++ src/sys/dev/Makefile Thu Sep 10 01:53:22 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2020/01/19 20:41:18 riastradh Exp $
+# $NetBSD: Makefile,v 1.45 2020/09/10 01:53:22 rin Exp $
SUBDIR= apm ata bluetooth dec dm dmover dtv hdaudio hdmicec hid hpc \
- i2c i2o ic ieee1394 ir isa \
+ i2c i2o ic ieee1394 ir isa iscsi \
microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
spi sun tc usb vme wscons
@@ -11,10 +11,6 @@ SUBDIR+= nvmm
.include
-.if ${MKISCSI} != "no"
-SUBDIR+= iscsi
-.endif
-
INCSDIR= /usr/include/dev
# Only install includes which are used by userland
CVS commit: src/sys/arch
Module Name:src
Committed By: rin
Date: Thu Sep 10 02:03:44 UTC 2020
Modified Files:
src/sys/arch/sun2/sun2: promlib.c
src/sys/arch/sun3/sun3: sunmon.c
Log Message:
Fix tracedump() for sun3 and sun2 by adding __noinline attribute.
It unwinds stack frame by using address of its first argument, which
does not, of course, work if inline-expanded.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun2/sun2/promlib.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sun3/sun3/sunmon.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/promlib.c
diff -u src/sys/arch/sun2/sun2/promlib.c:1.18 src/sys/arch/sun2/sun2/promlib.c:1.19
--- src/sys/arch/sun2/sun2/promlib.c:1.18 Mon Mar 24 18:50:31 2014
+++ src/sys/arch/sun2/sun2/promlib.c Thu Sep 10 02:03:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: promlib.c,v 1.18 2014/03/24 18:50:31 christos Exp $ */
+/* $NetBSD: promlib.c,v 1.19 2020/09/10 02:03:44 rin Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.18 2014/03/24 18:50:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promlib.c,v 1.19 2020/09/10 02:03:44 rin Exp $");
#include
#include
@@ -349,7 +349,7 @@ struct funcall_frame {
int fr_arg[1];
};
/*VARARGS0*/
-static void
+static void __noinline
tracedump(int x1)
{
struct funcall_frame *fp = (struct funcall_frame *)(&x1 - 2);
Index: src/sys/arch/sun3/sun3/sunmon.c
diff -u src/sys/arch/sun3/sun3/sunmon.c:1.21 src/sys/arch/sun3/sun3/sunmon.c:1.22
--- src/sys/arch/sun3/sun3/sunmon.c:1.21 Sat Oct 18 08:33:27 2014
+++ src/sys/arch/sun3/sun3/sunmon.c Thu Sep 10 02:03:44 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: sunmon.c,v 1.21 2014/10/18 08:33:27 snj Exp $ */
+/* $NetBSD: sunmon.c,v 1.22 2020/09/10 02:03:44 rin Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunmon.c,v 1.21 2014/10/18 08:33:27 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunmon.c,v 1.22 2020/09/10 02:03:44 rin Exp $");
#include
#include
@@ -168,7 +168,7 @@ struct funcall_frame {
int fr_arg[1];
};
/*VARARGS0*/
-static void
+static void __noinline
tracedump(int x1)
{
struct funcall_frame *fp = (struct funcall_frame *)(&x1 - 2);
CVS commit: src/sys/arch/sun3/conf
Module Name:src Committed By: rin Date: Thu Sep 10 02:06:25 UTC 2020 Modified Files: src/sys/arch/sun3/conf: GENERIC Log Message: Build in debug symbols. To generate a diff of this commit: cvs rdiff -u -r1.184 -r1.185 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.184 src/sys/arch/sun3/conf/GENERIC:1.185 --- src/sys/arch/sun3/conf/GENERIC:1.184 Mon Aug 10 06:32:58 2020 +++ src/sys/arch/sun3/conf/GENERIC Thu Sep 10 02:06:25 2020 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.184 2020/08/10 06:32:58 rin Exp $ +# $NetBSD: GENERIC,v 1.185 2020/09/10 02:06:25 rin 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.184 $" +#ident "GENERIC-$Revision: 1.185 $" makeoptions COPTS="-Os -fno-unwind-tables -fno-omit-frame-pointer" # Bootloader has size limit (~2MB). -fno-omit-frame-pointer is @@ -60,7 +60,7 @@ options PIPE_SOCKETPAIR # smaller, but # Which kernel debugger? Uncomment either this: options DDB # ... or these for KGDB (gdb remote target) -#makeoptions DEBUG="-g" # debugging symbols for gdb +makeoptions DEBUG="-g" # debugging symbols for gdb #options KGDB #options KGDB_DEV=0x0C01 # ttya=0C00 ttyb=0C01
CVS commit: src/sys/uvm/pmap
Module Name:src
Committed By: rin
Date: Thu Sep 10 02:12:57 UTC 2020
Modified Files:
src/sys/uvm/pmap: pmap_segtab.c
Log Message:
Cast pointer arguments of UVMHIST_CALLARGS() into uintptr_t.
Appease GCC9 -Wpointer-to-int-cast on ILP32 environments.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/uvm/pmap/pmap_segtab.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/uvm/pmap/pmap_segtab.c
diff -u src/sys/uvm/pmap/pmap_segtab.c:1.23 src/sys/uvm/pmap/pmap_segtab.c:1.24
--- src/sys/uvm/pmap/pmap_segtab.c:1.23 Sat Aug 22 15:34:51 2020
+++ src/sys/uvm/pmap/pmap_segtab.c Thu Sep 10 02:12:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_segtab.c,v 1.23 2020/08/22 15:34:51 skrll Exp $ */
+/* $NetBSD: pmap_segtab.c,v 1.24 2020/09/10 02:12:57 rin Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.23 2020/08/22 15:34:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_segtab.c,v 1.24 2020/09/10 02:12:57 rin Exp $");
/*
* Manages physical address maps.
@@ -246,7 +246,7 @@ pmap_segtab_free(pmap_segtab_t *stp)
{
UVMHIST_FUNC(__func__);
- UVMHIST_CALLARGS(pmapsegtabhist, "stp=%#jx", stp, 0, 0, 0);
+ UVMHIST_CALLARGS(pmapsegtabhist, "stp=%#jx", (uintptr_t)stp, 0, 0, 0);
mutex_spin_enter(&pmap_segtab_lock);
stp->seg_seg[0] = pmap_segtab_info.free_segtab;
@@ -346,7 +346,8 @@ pmap_segtab_alloc(void)
stp->seg_seg[0] = NULL;
SEGTAB_ADD(nget, 1);
found_on_freelist = true;
- UVMHIST_CALLARGS(pmapsegtabhist, "freelist stp=%#jx", stp, 0, 0, 0);
+ UVMHIST_CALLARGS(pmapsegtabhist, "freelist stp=%#jx",
+ (uintptr_t)stp, 0, 0, 0);
}
mutex_spin_exit(&pmap_segtab_lock);
@@ -364,7 +365,8 @@ pmap_segtab_alloc(void)
const paddr_t stp_pa = VM_PAGE_TO_PHYS(stp_pg);
stp = (pmap_segtab_t *)PMAP_MAP_POOLPAGE(stp_pa);
- UVMHIST_CALLARGS(pmapsegtabhist, "new stp=%#jx", stp, 0, 0, 0);
+ UVMHIST_CALLARGS(pmapsegtabhist, "new stp=%#jx",
+ (uintptr_t)stp, 0, 0, 0);
const size_t n = NBPG / sizeof(*stp);
if (n > 1) {
/*
@@ -574,7 +576,7 @@ pmap_pte_reserve(pmap_t pmap, vaddr_t va
KASSERT(pte == stp->seg_tab[(va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1)]);
UVMHIST_CALLARGS(pmapsegtabhist, "pm=%#jx va=%#jx -> tab[%jd]=%jx",
(uintptr_t)pmap, (uintptr_t)va,
- (va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1), pte);
+ (va >> SEGSHIFT) & (PMAP_SEGTABSIZE - 1), (uintptr_t)pte);
pmap_check_ptes(pte, __func__);
pte += (va >> PGSHIFT) & (NPTEPG - 1);
CVS commit: src/share/mk
Module Name:src
Committed By: rin
Date: Thu Sep 10 02:34:13 UTC 2020
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Turn off -mpltseq for kernel modules on powerpc for GCC >= 9.
Otherwise, object files compiled with -mlongcall contain relocation types
referring PLT, which our in-kernel linker cannot handle.
This ends up with failure in kernel module load with
``kobj_reloc: unexpected relocation type 31'' (31 == R_PPC_PLT16_HA here).
See descriptions for -mlongcall in gcc(1) of GCC9 for more details.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.70 src/share/mk/bsd.kmodule.mk:1.71
--- src/share/mk/bsd.kmodule.mk:1.70 Sun Sep 6 07:20:28 2020
+++ src/share/mk/bsd.kmodule.mk Thu Sep 10 02:34:13 2020
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.70 2020/09/06 07:20:28 mrg Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.71 2020/09/10 02:34:13 rin Exp $
# We are not building this with PIE
MKPIE=no
@@ -51,6 +51,7 @@ CFLAGS+= -fno-common -fno-unwind-tables
CFLAGS+= -mlong-calls -mno-space-regs -mfast-indirect-calls
.elif ${MACHINE_CPU} == "powerpc"
CFLAGS+= ${${ACTIVE_CC} == "gcc":? -mlongcall :}
+CFLAGS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -mno-pltseq :}
.elif ${MACHINE_CPU} == "vax"
CFLAGS+= -fno-pic
.elif ${MACHINE_CPU} == "riscv"
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Thu Sep 10 02:45:28 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: trap.c
Log Message:
Fix build with UVMHIST; stop passing string literal to UVMHIST_LOG(),
and also cast pointer arguments into uintptr_t.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/booke/trap.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/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.34 src/sys/arch/powerpc/booke/trap.c:1.35
--- src/sys/arch/powerpc/booke/trap.c:1.34 Wed Jul 15 09:10:14 2020
+++ src/sys/arch/powerpc/booke/trap.c Thu Sep 10 02:45:28 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.34 2020/07/15 09:10:14 rin Exp $ */
+/* $NetBSD: trap.c,v 1.35 2020/09/10 02:45:28 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.34 2020/07/15 09:10:14 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.35 2020/09/10 02:45:28 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -294,12 +294,18 @@ isi_exception(struct trapframe *tf, ksig
KASSERT(pg);
struct vm_page_md * const mdpg = VM_PAGE_TO_MD(pg);
- UVMHIST_LOG(pmapexechist,
- "srr0=%#x pg=%p (pa %#"PRIxPADDR"): %s",
- tf->tf_srr0, pg, pa,
- (VM_PAGEMD_EXECPAGE_P(mdpg)
- ? "no syncicache (already execpage)"
- : "performed syncicache (now execpage)"));
+#ifdef UVMHIST
+ if (VM_PAGEMD_EXECPAGE_P(mdpg))
+ UVMHIST_LOG(pmapexechist,
+ "srr0=%#x pg=%p (pa %#"PRIxPADDR"): "
+ "no syncicache (already execpage)",
+ tf->tf_srr0, (uintptr_t)pg, pa, 0);
+ else
+ UVMHIST_LOG(pmapexechist,
+ "srr0=%#x pg=%p (pa %#"PRIxPADDR"): "
+ "performed syncicache (now execpage)",
+ tf->tf_srr0, (uintptr_t)pg, pa, 0);
+#endif
if (!VM_PAGEMD_EXECPAGE_P(mdpg)) {
ci->ci_softc->cpu_ev_exec_trap_sync.ev_count++;
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src
Committed By: rin
Date: Thu Sep 10 03:02:36 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Introduce PV_VA() macro to extract va from pv->pv_va by clearing
PV_WIRED flag, and use it where appropriate.
There should be no functional changes. Only for safety in future.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.90 src/sys/arch/powerpc/ibm4xx/pmap.c:1.91
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.90 Mon Jul 6 10:40:21 2020
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Sep 10 03:02:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.90 2020/07/06 10:40:21 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.91 2020/09/10 03:02:36 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.90 2020/07/06 10:40:21 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.91 2020/09/10 03:02:36 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -156,7 +156,8 @@ static char *pmap_attrib;
#define PV_WIRE(pv) ((pv)->pv_va |= PV_WIRED)
#define PV_UNWIRE(pv) ((pv)->pv_va &= ~PV_WIRED)
#define PV_ISWIRED(pv) ((pv)->pv_va & PV_WIRED)
-#define PV_CMPVA(va,pv) (!(((pv)->pv_va ^ (va)) & (~PV_WIRED)))
+#define PV_VA(pv) ((pv)->pv_va & ~PV_WIRED)
+#define PV_CMPVA(va,pv) (!(PV_VA(pv) ^ (va)))
struct pv_entry {
struct pv_entry *pv_next; /* Linked list of mappings */
@@ -1115,14 +1116,14 @@ pmap_page_protect(struct vm_page *pg, vm
npv = pv->pv_next;
pm = pv->pv_pm;
- va = pv->pv_va;
+ va = PV_VA(pv);
pmap_protect(pm, va, va + PAGE_SIZE, prot);
}
/* Now check the head pv */
if (pvh->pv_pm) {
pv = pvh;
pm = pv->pv_pm;
- va = pv->pv_va;
+ va = PV_VA(pv);
pmap_protect(pm, va, va + PAGE_SIZE, prot);
}
}
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: rin Date: Thu Sep 10 03:23:55 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: pmap.c Log Message: pmap_kenter_pa: Remove comment which says ``Have to remove any existing mapping first.'' Contrary to this comment, pmap_kremove(9) has never been called there since rev 1.1, and we don't for other ports also. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.91 src/sys/arch/powerpc/ibm4xx/pmap.c:1.92 --- src/sys/arch/powerpc/ibm4xx/pmap.c:1.91 Thu Sep 10 03:02:36 2020 +++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Sep 10 03:23:55 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.91 2020/09/10 03:02:36 rin Exp $ */ +/* $NetBSD: pmap.c,v 1.92 2020/09/10 03:23:55 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.91 2020/09/10 03:02:36 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.92 2020/09/10 03:23:55 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -931,10 +931,6 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v struct pmap *pm = pmap_kernel(); /* - * Have to remove any existing mapping first. - */ - - /* * Generate TTE. * *
CVS commit: src/sys/arch/powerpc
Module Name:src
Committed By: rin
Date: Thu Sep 10 03:32:46 UTC 2020
Modified Files:
src/sys/arch/powerpc/conf: files.powerpc
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Introduce PMAP_TLBDEBUG option for ibm4xx: clear only TLBHI[V] bit when
TLB entry is invalidated, instead of clearing entire TLBHI register.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/powerpc/conf/files.powerpc
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/conf/files.powerpc
diff -u src/sys/arch/powerpc/conf/files.powerpc:1.94 src/sys/arch/powerpc/conf/files.powerpc:1.95
--- src/sys/arch/powerpc/conf/files.powerpc:1.94 Tue Jun 30 16:20:01 2020
+++ src/sys/arch/powerpc/conf/files.powerpc Thu Sep 10 03:32:46 2020
@@ -1,11 +1,11 @@
-# $NetBSD: files.powerpc,v 1.94 2020/06/30 16:20:01 maxv Exp $
+# $NetBSD: files.powerpc,v 1.95 2020/09/10 03:32:46 rin Exp $
defflag opt_altivec.h ALTIVEC K_ALTIVEC PPC_HAVE_SPE
defflag opt_openpic.h OPENPIC_DISTRIBUTE
defparam opt_ppcparam.h L2CR_CONFIG L3CR_CONFIG INTSTK CLOCKBASE VERBOSE_INITPPC
defflag opt_ppcarch.h PPC_OEA PPC_OEA601 PPC_OEA64 PPC_OEA64_BRIDGE PPC_MPC8XX PPC_IBM4XX PPC_IBM403 PPC_IBM440 PPC_BOOKE
defflag opt_ppccache.h CACHE_PROTO_MEI
-defflag opt_pmap.h PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB
+defflag opt_pmap.h PMAPDEBUG PMAPCHECK PMAPCOUNTERS PMAP_MINIMALTLB PMAP_TLBDEBUG
defparam opt_pmap.h PTEGCOUNT PMAP_MEMLIMIT
file arch/powerpc/powerpc/core_machdep.c coredump
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.92 src/sys/arch/powerpc/ibm4xx/pmap.c:1.93
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.92 Thu Sep 10 03:23:55 2020
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Sep 10 03:32:46 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.92 2020/09/10 03:23:55 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.93 2020/09/10 03:32:46 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,10 +67,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.92 2020/09/10 03:23:55 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.93 2020/09/10 03:32:46 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
+#include "opt_pmap.h"
#endif
#include
@@ -193,6 +194,8 @@ static inline int pte_enter(struct pmap
static inline int pmap_enter_pv(struct pmap *, vaddr_t, paddr_t, int);
static void pmap_remove_pv(struct pmap *, vaddr_t, paddr_t);
+static inline void tlb_invalidate_entry(int);
+
static int ppc4xx_tlb_size_mask(size_t, int *, int *);
@@ -1195,6 +1198,43 @@ pmap_procwr(struct proc *p, vaddr_t va,
"K" (PSL_IR | PSL_DR));
}
+static inline void
+tlb_invalidate_entry(int i)
+{
+#ifdef PMAP_TLBDEBUG
+ /*
+ * Clear only TLBHI[V] bit so that we can track invalidated entry.
+ */
+ register_t msr, pid, hi;
+
+ KASSERT(mfspr(SPR_PID) == KERNEL_PID);
+
+ __asm volatile(
+ "mfmsr %0;"
+ "li %1,0;"
+ "mtmsr %1;"
+ "mfpid %1;"
+ "tlbre %2,%3,0;"
+ "andc %2,%2,%4;"
+ "tlbwe %2,%3,0;"
+ "mtpid %1;"
+ "mtmsr %0;"
+ "isync;"
+ : "=&r" (msr), "=&r" (pid), "=&r" (hi)
+ : "r" (i), "r" (TLB_VALID));
+#else
+ /*
+ * Just clear entire TLBHI register.
+ */
+ __asm volatile(
+ "tlbwe %0,%1,0;"
+ "isync;"
+ : : "r" (0), "r" (i));
+#endif
+
+ tlb_info[i].ti_ctx = 0;
+ tlb_info[i].ti_flags = 0;
+}
/* This has to be done in real mode !!! */
void
@@ -1228,13 +1268,7 @@ ppc4xx_tlb_flush(vaddr_t va, int pid)
: "r" (va), "r" (pid));
if (found && !TLB_LOCKED(i)) {
/* Now flush translation */
- __asm volatile(
- "tlbwe %0,%1,0;"
- "isync;"
- : : "r" (0), "r" (i));
-
- tlb_info[i].ti_ctx = 0;
- tlb_info[i].ti_flags = 0;
+ tlb_invalidate_entry(i);
tlbnext = i;
/* Successful flushes */
tlbflush_ev.ev_count++;
@@ -1247,12 +1281,8 @@ ppc4xx_tlb_flush_all(void)
u_long i;
for (i = 0; i < NTLB; i++)
- if (!TLB_LOCKED(i)) {
- __asm volatile(
-"tlbwe %0,%1,0;" : : "r" (0), "r" (i));
- tlb_info[i].ti_ctx = 0;
- tlb_info[i].ti_flags = 0;
- }
+ if (!TLB_LOCKED(i))
+ tlb_invalidate_entry(i);
__asm volatile("isync");
}
@@ -1526,10 +1556,11 @@ ctx_flush(int cnum)
if (i < tlb_nreserved)
panic("TLB entry %d not locked", i);
#endif
- /* Invalidate particular TLB entry regardless of locked status */
- __asm volatile("tlbwe %0,%1,0" : :"r"(0),"r"(i));
- tlb_info[i].ti_ctx = 0;
- tlb_info[i].ti_flags = 0;
+ /*
+ * Invalidate particular TLB entry regardless of
+ * locked status
+ */
+ tlb_invalidate_entry(i);
}
}
return (0);
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src
Committed By: rin
Date: Thu Sep 10 04:31:55 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Real fix for pmap_procwr(), attempted in revs 1.85 and 1.87:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/powerpc/ibm4xx/pmap.c#rev1.85
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/powerpc/ibm4xx/pmap.c#rev1.87
ibm4xx has VIPT icache and operations in pmap_procwr() should be done with
DMMU enabled (write back dcache into memory and invalidate icache).
When p == curproc, this is trivial. However, p != curproc needs a special
care; we cannot rely upon TLB miss handler in user context. Therefore,
extract pa and operate against it.
Note that va below VM_MIN_KERNEL_ADDRESS (== 2GB at the moment) is reserved
for direct mapping.
Tested by gdb with WIP software single stepping for ibm4xx.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.93 src/sys/arch/powerpc/ibm4xx/pmap.c:1.94
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.93 Thu Sep 10 03:32:46 2020
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Sep 10 04:31:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.93 2020/09/10 03:32:46 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.94 2020/09/10 04:31:55 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.93 2020/09/10 03:32:46 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94 2020/09/10 04:31:55 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1160,42 +1160,72 @@ pmap_deactivate(struct lwp *l)
void
pmap_procwr(struct proc *p, vaddr_t va, size_t len)
{
- struct pmap *pm = p->p_vmspace->vm_map.pmap;
- int msr, ctx, opid, step;
- step = CACHELINESIZE;
+ if (__predict_true(p == curproc)) {
+ struct pmap *pm = p->p_vmspace->vm_map.pmap;
+ int msr, ctx, opid;
- /*
- * Need to turn off IMMU and switch to user context.
- * (icbi uses DMMU).
- */
- if (!(ctx = pm->pm_ctx)) {
- /* No context -- assign it one */
- ctx_alloc(pm);
- ctx = pm->pm_ctx;
- }
- __asm volatile(
- "mfmsr %0;"
- "li %1, %7;"
- "andc %1,%0,%1;"
- "mtmsr %1;"
- "isync;"
- "mfpid %1;"
- "mtpid %2;"
- "isync;"
+ /*
+ * Take it easy! TLB miss handler takes care of us.
+ */
+
+ /*
+ * Need to turn off IMMU and switch to user context.
+ * (icbi uses DMMU).
+ */
+
+ if (!(ctx = pm->pm_ctx)) {
+ /* No context -- assign it one */
+ ctx_alloc(pm);
+ ctx = pm->pm_ctx;
+ }
+
+ __asm volatile(
+ "mfmsr %0;"
+ "li %1,0x20;" /* Turn off IMMU */
+ "andc %1,%0,%1;"
+ "ori %1,%1,0x10;" /* Turn on DMMU for sure */
+ "mtmsr %1;"
+ "isync;"
+ "mfpid %1;"
+ "mtpid %2;"
+ "isync;"
"1:"
- "dcbst 0,%3;"
- "icbi 0,%3;"
- "add %3,%3,%5;"
- "addc. %4,%4,%6;"
- "bge 1b;"
- "sync;"
- "mtpid %1;"
- "mtmsr %0;"
- "isync;"
- : "=&r" (msr), "=&r" (opid)
- : "r" (ctx), "r" (va), "r" (len), "r" (step), "r" (-step),
- "K" (PSL_IR | PSL_DR));
+ "dcbst 0,%3;"
+ "icbi 0,%3;"
+ "add %3,%3,%5;"
+ "sub. %4,%4,%5;"
+ "bge 1b;"
+ "sync;"
+ "mtpid %1;"
+ "mtmsr %0;"
+ "isync;"
+ : "=&r" (msr), "=&r" (opid)
+ : "r" (ctx), "r" (va), "r" (len), "r" (CACHELINESIZE));
+ } else {
+ struct pmap *pm = p->p_vmspace->vm_map.pmap;
+ paddr_t pa;
+ vaddr_t tva, eva;
+ int tlen;
+
+ /*
+ * For p != curproc, we cannot rely upon TLB miss handler in
+ * user context. Therefore, extract pa and operate againt it.
+ *
+ * Note that va below VM_MIN_KERNEL_ADDRESS is reserved for
+ * direct mapping.
+ */
+
+ for (tva = va; len > 0; tva = eva, len -= tlen) {
+ eva = uimin(tva + len, trunc_page(tva + PAGE_SIZE));
+ tlen = eva - tva;
+ if (!pmap_extract(pm, tva, &pa)) {
+/* XXX should be already unmapped */
+continue;
+ }
+ __syncicache((void *)pa, tlen);
+ }
+ }
}
static inline void
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src
Committed By: rin
Date: Thu Sep 10 04:36:24 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Tiny cosmetic fix for previous. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.94 src/sys/arch/powerpc/ibm4xx/pmap.c:1.95
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.94 Thu Sep 10 04:31:55 2020
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Sep 10 04:36:24 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.94 2020/09/10 04:31:55 rin Exp $ */
+/* $NetBSD: pmap.c,v 1.95 2020/09/10 04:36:24 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.94 2020/09/10 04:31:55 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.95 2020/09/10 04:36:24 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -1160,9 +1160,9 @@ pmap_deactivate(struct lwp *l)
void
pmap_procwr(struct proc *p, vaddr_t va, size_t len)
{
+ struct pmap *pm = p->p_vmspace->vm_map.pmap;
if (__predict_true(p == curproc)) {
- struct pmap *pm = p->p_vmspace->vm_map.pmap;
int msr, ctx, opid;
/*
@@ -1203,7 +1203,6 @@ pmap_procwr(struct proc *p, vaddr_t va,
: "=&r" (msr), "=&r" (opid)
: "r" (ctx), "r" (va), "r" (len), "r" (CACHELINESIZE));
} else {
- struct pmap *pm = p->p_vmspace->vm_map.pmap;
paddr_t pa;
vaddr_t tva, eva;
int tlen;
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: rin
Date: Fri Sep 11 05:24:14 UTC 2020
Modified Files:
src/external/gpl3/gcc: README.gcc9
Log Message:
Update table for alpha, m68000, m68k, and powerpc:
- alpha is running and no regression in ATF (tests in lib/libc/sys are
skipped due to port-alpha/55652).
- m68000 is successfully built and running at a same level as before.
- m68k (amiga, mac68k, sun3) is running and no regression in a tiny
subset of ATF (kernel, lib/libc/{gen,sys}).
- macppc (oea) and evbppc (booke, ibm4xx) are running and no regression
in ATF.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/README.gcc9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/README.gcc9
diff -u src/external/gpl3/gcc/README.gcc9:1.7 src/external/gpl3/gcc/README.gcc9:1.8
--- src/external/gpl3/gcc/README.gcc9:1.7 Mon Sep 7 23:47:02 2020
+++ src/external/gpl3/gcc/README.gcc9 Fri Sep 11 05:24:14 2020
@@ -1,4 +1,4 @@
-$NetBSD: README.gcc9,v 1.7 2020/09/07 23:47:02 mrg Exp $
+$NetBSD: README.gcc9,v 1.8 2020/09/11 05:24:14 rin Exp $
new stuff:
cc1objcplus
@@ -31,7 +31,7 @@ architecture tools kernels libgcc native
- --- -- -- ---
aarch64 y y y y y y y n
aarch64be y y y y ? ? ? n
-alpha y y y y y ? ? ?
+alpha y y y y y y y[10] n
earmv4 y y y y y ? ? ?
earmv4eb y n n y n ? ? ?
earm y n n y n ? ? ?
@@ -49,13 +49,13 @@ earmv7hfeb y n n y n ? ? ?
hppa y y y y y ? ? ?
i386 y y y y y y y n
ia64 y y y y y y N/A n
-m68000 y n n y n[7] n ? ?
-m68k y y y y y y ? ?
+m68000 y y y y y y ? n
+m68k y y y y y y y[11] n
mipseb y y y y y[3] n n ?
mipsel y y y y y[3] y n ?
mips64eb y y y y y[3] y y n
mips64el y y y y y[3] n n ?
-powerpc y y y y y[3] y n n
+powerpc y y y y y[3] y y n
powerpc64 y ? y y n[6] ? n ?
sh3eb y n y y n[1] n n ?
sh3el y n y y n n n ?
@@ -80,9 +80,10 @@ architecture tools kernels libgcc native
[3]: consult cpu/platform table for full data
[4]: triggers weird xorg-server issue; perhaps related to _XSERVER64 not being present
[6]: /usr/src/sys/compat/common/compat_util.c:116:1: internal compiler error: in rs6000_pltseq_template, at config/rs6000/rs6000.c:21977
-[7]: libstdc++ does not build
[8]: prep floppies overflow; need to find if they are size limited
[9]: evbarmv7-eb has dtb sets issues
+[10]: tests in lib/libc/sys are skipped; see port-alpha/55652
+[11]: at least there's no regression in kernel and lib/libc/{gen,sys}
CPU vs platform test table (for CPUs with multiple ports). this is "make release" or just kernels.
@@ -100,7 +101,7 @@ earmv7: y[9] y
earmv7hf: y y
amiga atari cesfic hp300 luna68k mac68k mvme68k news68k next68k sun3 x68k
-m68k: y y y y y y y y y y y
+m68k: r y y y y r y y y r y
evbmips emips ews4800mips mipsco newsmips sgimips
mipseb: y y y y y y
@@ -113,7 +114,7 @@ mips64eb: y
mips64el: y y y
amigappc bebox evbppc ibmnws macppc mvmeppc ofppc prep rs6000 sandpoint
-powerpc: y y y y y y y n[8] y y
+powerpc: y y r y r y y n[8] y y
evbppc macppc ofppc
powerpc64: n ? ?
CVS commit: src
Module Name:src
Committed By: rin
Date: Mon Sep 14 00:40:03 UTC 2020
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/comp: mi
src/sys/dev: Makefile
Log Message:
Revert previous to make iscsi kernel headers optional again, as
required by kamil.
Now, sanitizer in GCC9 has been fixed differently for MKISCSI=no.
To generate a diff of this commit:
cvs rdiff -u -r1.1263 -r1.1264 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.2353 -r1.2354 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/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.1263 src/distrib/sets/lists/base/mi:1.1264
--- src/distrib/sets/lists/base/mi:1.1263 Sat Sep 12 15:25:41 2020
+++ src/distrib/sets/lists/base/mi Mon Sep 14 00:40:03 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1263 2020/09/12 15:25:41 jmcneill Exp $
+# $NetBSD: mi,v 1.1264 2020/09/14 00:40:03 rin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1150,7 +1150,7 @@
./usr/include/dev/irbase-c-usr
./usr/include/dev/isabase-c-usr
./usr/include/dev/isapnp base-obsolete obsolete
-./usr/include/dev/iscsibase-c-usr
+./usr/include/dev/iscsibase-c-usr iscsi
./usr/include/dev/microcode base-obsolete obsolete
./usr/include/dev/microcode/aic7xxx base-obsolete obsolete
./usr/include/dev/microcode/isp base-obsolete obsolete
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2353 src/distrib/sets/lists/comp/mi:1.2354
--- src/distrib/sets/lists/comp/mi:1.2353 Sun Sep 13 03:43:16 2020
+++ src/distrib/sets/lists/comp/mi Mon Sep 14 00:40:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2353 2020/09/13 03:43:16 kamil Exp $
+# $NetBSD: mi,v 1.2354 2020/09/14 00:40:02 rin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -619,8 +619,8 @@
./usr/include/dev/isapnp/if_levar.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpreg.h comp-obsolete obsolete
./usr/include/dev/isapnp/isapnpvar.h comp-obsolete obsolete
-./usr/include/dev/iscsi/iscsi.h comp-c-include
-./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include
+./usr/include/dev/iscsi/iscsi.h comp-c-include iscsi
+./usr/include/dev/iscsi/iscsi_ioctl.h comp-c-include iscsi
./usr/include/dev/iscsi/iscsi_perf.h comp-obsolete obsolete
./usr/include/dev/iscsi/iscsi_test.h comp-obsolete obsolete
./usr/include/dev/keylock.h comp-c-include
Index: src/sys/dev/Makefile
diff -u src/sys/dev/Makefile:1.45 src/sys/dev/Makefile:1.46
--- src/sys/dev/Makefile:1.45 Thu Sep 10 01:53:22 2020
+++ src/sys/dev/Makefile Mon Sep 14 00:40:03 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2020/09/10 01:53:22 rin Exp $
+# $NetBSD: Makefile,v 1.46 2020/09/14 00:40:03 rin Exp $
SUBDIR= apm ata bluetooth dec dm dmover dtv hdaudio hdmicec hid hpc \
- i2c i2o ic ieee1394 ir isa iscsi \
+ i2c i2o ic ieee1394 ir isa \
microcode ofw pci pckbport pcmcia pud putter raidframe sbus scsipi \
spi sun tc usb vme wscons
@@ -11,6 +11,10 @@ SUBDIR+= nvmm
.include
+.if ${MKISCSI} != "no"
+SUBDIR+= iscsi
+.endif
+
INCSDIR= /usr/include/dev
# Only install includes which are used by userland
CVS commit: src/external/gpl3/gdb.old/dist/gdb
Module Name:src Committed By: rin Date: Mon Sep 14 06:50:31 UTC 2020 Removed Files: src/external/gpl3/gdb.old/dist/gdb: rust-exp.c x86bsd-nat.c x86bsd-nat.h Log Message: Sync with external/gpl3/gdb/dist/gdb by removing unused files: - rust-exp.c is generated file. - x86bsd-nat.[ch] were replaced by x86-bsd-nat.[ch] when 8.0.1 was merged. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/gpl3/gdb.old/dist/gdb/rust-exp.c cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl3/gdb.old/dist/gdb/x86bsd-nat.c \ src/external/gpl3/gdb.old/dist/gdb/x86bsd-nat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/if_tap
Module Name:src
Committed By: rin
Date: Thu Oct 1 13:49:18 UTC 2020
Modified Files:
src/tests/net/if_tap: Makefile
Log Message:
Link librumpclient explicitly. Fix sun2, i.e., MKPIC=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/net/if_tap/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/if_tap/Makefile
diff -u src/tests/net/if_tap/Makefile:1.5 src/tests/net/if_tap/Makefile:1.6
--- src/tests/net/if_tap/Makefile:1.5 Wed Sep 30 17:14:11 2020
+++ src/tests/net/if_tap/Makefile Thu Oct 1 13:49:18 2020
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2020/09/30 17:14:11 roy Exp $
+# $NetBSD: Makefile,v 1.6 2020/10/01 13:49:18 rin Exp $
#
.include
PROG= rump_open_tap
MAN= # empty
-DPADD= ${LIBRUMPRES}
-LDADD= -lrumpres
+DPADD= ${LIBRUMPRES} ${LIBRUMPCLIENT}
+LDADD= -lrumpres -lrumpclient
BINDIR.rump_open_tap= ${TESTSDIR}
TESTSDIR= ${TESTSBASE}/net/if_tap
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: rin
Date: Fri Oct 2 14:59:56 UTC 2020
Modified Files:
src/sys/dev/fdt: dw_apb_uart.c
Log Message:
Revert rev 1.5:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/dev/fdt/dw_apb_uart.c#rev1.5
The device is capable to recognize break signal actually.
Reset cnmagic from + to default.
Pointed out by jakllsch. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/fdt/dw_apb_uart.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/fdt/dw_apb_uart.c
diff -u src/sys/dev/fdt/dw_apb_uart.c:1.7 src/sys/dev/fdt/dw_apb_uart.c:1.8
--- src/sys/dev/fdt/dw_apb_uart.c:1.7 Mon Sep 28 11:34:47 2020
+++ src/sys/dev/fdt/dw_apb_uart.c Fri Oct 2 14:59:56 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dw_apb_uart.c,v 1.7 2020/09/28 11:34:47 jmcneill Exp $ */
+/* $NetBSD: dw_apb_uart.c,v 1.8 2020/10/02 14:59:56 rin Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.7 2020/09/28 11:34:47 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: dw_apb_uart.c,v 1.8 2020/10/02 14:59:56 rin Exp $");
#include
#include
@@ -183,8 +183,6 @@ dw_apb_uart_console_consinit(struct fdt_
if (comcnattach1(®s, speed, uart_freq, COM_TYPE_DW_APB, flags))
panic("Cannot initialize dw-apb-uart console");
-
- cn_set_magic("+");
}
static const struct fdt_console dw_apb_uart_console = {
CVS commit: src/distrib/dreamcast/ramdisk
Module Name:src Committed By: rin Date: Sun Oct 4 09:34:18 UTC 2020 Modified Files: src/distrib/dreamcast/ramdisk: list Log Message: Fix miniroot overflow by switching to x_fsck_ffs and x_newfs (drop byte-swapped and Apple UFS support). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/dreamcast/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/dreamcast/ramdisk/list diff -u src/distrib/dreamcast/ramdisk/list:1.17 src/distrib/dreamcast/ramdisk/list:1.18 --- src/distrib/dreamcast/ramdisk/list:1.17 Tue Oct 4 14:00:27 2016 +++ src/distrib/dreamcast/ramdisk/list Sun Oct 4 09:34:18 2020 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.17 2016/10/04 14:00:27 christos Exp $ +# $NetBSD: list,v 1.18 2020/10/04 09:34:18 rin Exp $ SRCDIRS bin sbin usr.bin usr.sbin @@ -51,9 +51,11 @@ ARGVLN sh -sh SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ed srcdir distrib/utils/x_ed +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig SPECIAL more srcdir distrib/utils/more +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount
CVS commit: src/distrib/sun2/miniroot
Module Name:src Committed By: rin Date: Sun Oct 4 09:42:48 UTC 2020 Modified Files: src/distrib/sun2/miniroot: list Log Message: Fix ramdisk overflow: - switch to x_disklabel (drop non-native label support) - switch to x_fsck_ffs and x_newfs (drop byte-swapped and Apple UFS support) - switch to more To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/distrib/sun2/miniroot/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sun2/miniroot/list diff -u src/distrib/sun2/miniroot/list:1.20 src/distrib/sun2/miniroot/list:1.21 --- src/distrib/sun2/miniroot/list:1.20 Sat Nov 30 08:27:18 2013 +++ src/distrib/sun2/miniroot/list Sun Oct 4 09:42:48 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.20 2013/11/30 08:27:18 nakayama Exp $ +# $NetBSD: list,v 1.21 2020/10/04 09:42:48 rin Exp $ # # The PROM provides a default kernel name of "vmunix" @@ -127,7 +127,7 @@ PROG usr/bin/chflags PROG usr/bin/cksum PROG usr/bin/cmp PROG usr/bin/ftp -PROG usr/bin/less usr/bin/more +PROG usr/bin/more usr/bin/less PROG usr/bin/rsh PROG usr/bin/sed PROG usr/bin/tip @@ -138,14 +138,18 @@ PROG usr/bin/gzip usr/bin/gzcat usr/bin/ # install.md still uses sort PROG usr/bin/sort -SPECIAL less srcdir external/bsd/less/bin/less SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi +SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ed srcdir distrib/utils/x_ed +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route + +SPECIAL more srcdir distrib/utils/more SPECIAL edlabel srcdir distrib/utils/edlabel ARGVLN sh -sh
CVS commit: src/distrib/cobalt/ramdisk
Module Name:src
Committed By: rin
Date: Sun Oct 4 09:45:44 UTC 2020
Modified Files:
src/distrib/cobalt/ramdisk: list
Log Message:
Fix ramdisk overflow:
- switch to x_disklabel (drop non-native label support)
- switch to x_fsck_ffs and x_newfs (drop byte-swapped and Apple UFS support)
- switch to more
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/cobalt/ramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cobalt/ramdisk/list
diff -u src/distrib/cobalt/ramdisk/list:1.12 src/distrib/cobalt/ramdisk/list:1.13
--- src/distrib/cobalt/ramdisk/list:1.12 Fri Mar 22 10:52:21 2013
+++ src/distrib/cobalt/ramdisk/list Sun Oct 4 09:45:44 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.12 2013/03/22 10:52:21 tsutsui Exp $
+# $NetBSD: list,v 1.13 2020/10/04 09:45:44 rin Exp $
SRCDIRS external/bsd/less/bin
SRCDIRS bin sbin usr.bin usr.sbin
@@ -53,7 +53,7 @@ PROG sbin/umount
PROG usr/bin/ftp
PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip
-PROG usr/bin/less usr/bin/more
+PROG usr/bin/more usr/bin/less
PROG usr/bin/sed
PROG usr/bin/tset
@@ -62,13 +62,18 @@ PROG usr/sbin/chroot
# init invokes the shell as -sh
ARGVLN sh -sh
+SPECIAL disklabel srcdir distrib/utils/x_disklabel
SPECIAL ed srcdir distrib/utils/x_ed
+SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs
SPECIAL gzip srcdir distrib/utils/x_gzip
SPECIAL ifconfig srcdir distrib/utils/x_ifconfig
+SPECIAL newfs srcdir distrib/utils/x_newfs
SPECIAL ping srcdir distrib/utils/x_ping
SPECIAL route srcdir distrib/utils/x_route
SPECIAL umount srcdir distrib/utils/x_umount
+SPECIAL more srcdir distrib/utils/more
+
LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -ll -lm -lz -lprop
COPY ${DESTDIR}/usr/mdec/boot usr/mdec/boot
CVS commit: src/sys/arch
Module Name:src
Committed By: rin
Date: Sun Oct 4 10:34:18 UTC 2020
Modified Files:
src/sys/arch/m68k/include: mcontext.h
src/sys/arch/powerpc/include: mcontext.h
Log Message:
Add missing __{BEGIN,END}_DECLS in order to catch up with
sanitizer_linux_libcdep.cc rev 1.17:
http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc#rev1.17
Fix build with HAVE_GCC=9.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/m68k/include/mcontext.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/mcontext.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/mcontext.h
diff -u src/sys/arch/m68k/include/mcontext.h:1.11 src/sys/arch/m68k/include/mcontext.h:1.12
--- src/sys/arch/m68k/include/mcontext.h:1.11 Mon Sep 7 00:32:00 2020
+++ src/sys/arch/m68k/include/mcontext.h Sun Oct 4 10:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.11 2020/09/07 00:32:00 mrg Exp $ */
+/* $NetBSD: mcontext.h,v 1.12 2020/10/04 10:34:18 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -119,6 +119,8 @@ typedef struct {
__CTASSERT(TLS_TP_OFFSET + sizeof(struct tls_tcb) < 0x8000);
__CTASSERT(TLS_TP_OFFSET % sizeof(struct tls_tcb) == 0);
+__BEGIN_DECLS
+
void *_lwp_getprivate(void);
void _lwp_setprivate(void *);
@@ -136,6 +138,7 @@ __lwp_settcb(struct tls_tcb *__tcb)
__tcb += TLS_TP_OFFSET / sizeof(*__tcb) + 1;
_lwp_setprivate(__tcb);
}
+__END_DECLS
#endif
#endif /* !_M68K_MCONTEXT_H_ */
Index: src/sys/arch/powerpc/include/mcontext.h
diff -u src/sys/arch/powerpc/include/mcontext.h:1.21 src/sys/arch/powerpc/include/mcontext.h:1.22
--- src/sys/arch/powerpc/include/mcontext.h:1.21 Mon Jun 22 05:34:57 2020
+++ src/sys/arch/powerpc/include/mcontext.h Sun Oct 4 10:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.21 2020/06/22 05:34:57 rin Exp $ */
+/* $NetBSD: mcontext.h,v 1.22 2020/10/04 10:34:18 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -153,6 +153,8 @@ typedef struct {
#define TLS_DTV_OFFSET 0x8000
__CTASSERT(TLS_TP_OFFSET + sizeof(struct tls_tcb) < 0x8000);
+__BEGIN_DECLS
+
static __inline void *
__lwp_gettcb_fast(void)
{
@@ -180,6 +182,7 @@ __lwp_settcb(void *__tcb)
_lwp_setprivate(__tcb);
}
+__END_DECLS
#endif /* _RTLD_SOURCE || _LIBC_SOURCE || __LIBPTHREAD_SOURCE__ */
#endif /* !_POWERPC_MCONTEXT_H_ */
CVS commit: src/distrib/sun2/miniroot
Module Name:src Committed By: rin Date: Sun Oct 4 23:42:43 UTC 2020 Modified Files: src/distrib/sun2/miniroot: list Log Message: Revert previous; ``fix'' against wrong directory... To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/sun2/miniroot/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sun2/miniroot/list diff -u src/distrib/sun2/miniroot/list:1.21 src/distrib/sun2/miniroot/list:1.22 --- src/distrib/sun2/miniroot/list:1.21 Sun Oct 4 09:42:48 2020 +++ src/distrib/sun2/miniroot/list Sun Oct 4 23:42:43 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.21 2020/10/04 09:42:48 rin Exp $ +# $NetBSD: list,v 1.22 2020/10/04 23:42:43 rin Exp $ # # The PROM provides a default kernel name of "vmunix" @@ -127,7 +127,7 @@ PROG usr/bin/chflags PROG usr/bin/cksum PROG usr/bin/cmp PROG usr/bin/ftp -PROG usr/bin/more usr/bin/less +PROG usr/bin/less usr/bin/more PROG usr/bin/rsh PROG usr/bin/sed PROG usr/bin/tip @@ -138,18 +138,14 @@ PROG usr/bin/gzip usr/bin/gzcat usr/bin/ # install.md still uses sort PROG usr/bin/sort +SPECIAL less srcdir external/bsd/less/bin/less SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi -SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ed srcdir distrib/utils/x_ed -SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig -SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route - -SPECIAL more srcdir distrib/utils/more SPECIAL edlabel srcdir distrib/utils/edlabel ARGVLN sh -sh
CVS commit: src/distrib/sun2/ramdisk
Module Name:src
Committed By: rin
Date: Sun Oct 4 23:50:59 UTC 2020
Modified Files:
src/distrib/sun2/ramdisk: list
Log Message:
Try to fix ramdisk overflow (somehow build succeeds without fix for me);
drop mount_{cd9660,nfs} as cd(4) and NFS are disabled for RAMDISK kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/sun2/ramdisk/list
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sun2/ramdisk/list
diff -u src/distrib/sun2/ramdisk/list:1.11 src/distrib/sun2/ramdisk/list:1.12
--- src/distrib/sun2/ramdisk/list:1.11 Wed Mar 10 23:13:09 2010
+++ src/distrib/sun2/ramdisk/list Sun Oct 4 23:50:59 2020
@@ -1,5 +1,5 @@
#
-# $NetBSD: list,v 1.11 2010/03/10 23:13:09 abs Exp $
+# $NetBSD: list,v 1.12 2020/10/04 23:50:59 rin Exp $
#
# ramdisk/list - packing list for the ramdisk.
#
@@ -58,9 +58,9 @@ PROG sbin/route
# From /usr/src/sbin:
PROG sbin/mknod
PROG sbin/mount
-PROG sbin/mount_cd9660
+# PROG sbin/mount_cd9660
PROG sbin/mount_ffs
-PROG sbin/mount_nfs
+# PROG sbin/mount_nfs
PROG sbin/reboot sbin/halt
PROG sbin/umount
CVS commit: src/sys/uvm
Module Name:src
Committed By: rin
Date: Mon Oct 5 04:48:24 UTC 2020
Modified Files:
src/sys/uvm: uvm_bio.c
Log Message:
PR kern/55658
ubc_fault_page(): Ignore PG_RDONLY flag and always pmap_enter() the page
with the permissions of the original access_type.
It is the file system's responsibility to allocate blocks that is being
modified by write(), before calling into UBC to fill the pages for that
range. KASSERT() is added there to confirm that no clean page is mapped
writable.
Fix infinite loop in uvm_fault_internal(), observed on 16KB-page systems,
where it continues to try to make a partially-backed page writable.
No regression in ATF and KASSERT() does not fire on several architectures,
as far as I can see.
Fix suggested by chs. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/uvm/uvm_bio.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/uvm/uvm_bio.c
diff -u src/sys/uvm/uvm_bio.c:1.121 src/sys/uvm/uvm_bio.c:1.122
--- src/sys/uvm/uvm_bio.c:1.121 Thu Jul 9 09:24:32 2020
+++ src/sys/uvm/uvm_bio.c Mon Oct 5 04:48:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_bio.c,v 1.121 2020/07/09 09:24:32 rin Exp $ */
+/* $NetBSD: uvm_bio.c,v 1.122 2020/10/05 04:48:23 rin Exp $ */
/*
* Copyright (c) 1998 Chuck Silvers.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.121 2020/07/09 09:24:32 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_bio.c,v 1.122 2020/10/05 04:48:23 rin Exp $");
#include "opt_uvmhist.h"
#include "opt_ubc.h"
@@ -235,9 +235,7 @@ static inline int
ubc_fault_page(const struct uvm_faultinfo *ufi, const struct ubc_map *umap,
struct vm_page *pg, vm_prot_t prot, vm_prot_t access_type, vaddr_t va)
{
- vm_prot_t mask;
int error;
- bool rdonly;
KASSERT(rw_write_held(pg->uobject->vmobjlock));
@@ -280,11 +278,11 @@ ubc_fault_page(const struct uvm_faultinf
pg->offset < umap->writeoff ||
pg->offset + PAGE_SIZE > umap->writeoff + umap->writelen);
- rdonly = uvm_pagereadonly_p(pg);
- mask = rdonly ? ~VM_PROT_WRITE : VM_PROT_ALL;
+ KASSERT((access_type & VM_PROT_WRITE) == 0 ||
+ uvm_pagegetdirty(pg) != UVM_PAGE_STATUS_CLEAN);
error = pmap_enter(ufi->orig_map->pmap, va, VM_PAGE_TO_PHYS(pg),
- prot & mask, PMAP_CANFAIL | (access_type & mask));
+ prot, PMAP_CANFAIL | access_type);
uvm_pagelock(pg);
uvm_pageactivate(pg);
CVS commit: src/sys/arch/sun2/conf
Module Name:src
Committed By: rin
Date: Mon Oct 5 10:42:53 UTC 2020
Modified Files:
src/sys/arch/sun2/conf: Makefile.sun2
Log Message:
Kernel without -fno-omit-frame-pointer works fine now, both for GCC8 and 9.
Not sure which commit ``fixed'' the problem although...
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sun2/conf/Makefile.sun2
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/conf/Makefile.sun2
diff -u src/sys/arch/sun2/conf/Makefile.sun2:1.26 src/sys/arch/sun2/conf/Makefile.sun2:1.27
--- src/sys/arch/sun2/conf/Makefile.sun2:1.26 Tue Sep 8 00:51:29 2020
+++ src/sys/arch/sun2/conf/Makefile.sun2 Mon Oct 5 10:42:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sun2,v 1.26 2020/09/08 00:51:29 mrg Exp $
+# $NetBSD: Makefile.sun2,v 1.27 2020/10/05 10:42:53 rin Exp $
# Makefile for NetBSD
#
@@ -36,7 +36,6 @@ CFLAGS+= -msoft-float -fno-defer-pop
AFLAGS+= -x assembler-with-cpp
# XXX
-COPTS+= ${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8:? -fno-omit-frame-pointer :}
COPTS.promlib.c+=${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 9:? -Wno-error=array-bounds :}
##
CVS commit: src/doc
Module Name:src Committed By: rin Date: Mon Oct 5 10:44:09 UTC 2020 Modified Files: src/doc: HACKS Log Message: Remove -fno-omit-frame-pointer hack for sun2 kernel. To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.209 src/doc/HACKS:1.210 --- src/doc/HACKS:1.209 Fri Sep 18 14:09:47 2020 +++ src/doc/HACKS Mon Oct 5 10:44:09 2020 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.209 2020/09/18 14:09:47 christos Exp $ +# $NetBSD: HACKS,v 1.210 2020/10/05 10:44:09 rin Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -997,15 +997,3 @@ descr GCC 8.4 miscompiles aes_ccm_tag() At the moment, it is unclear whether this is due to differences b/w 68010-20 vs 68030-60, or something wrong with TME. kcah - -port sun2 -hack compile kernel with -fno-omit-frame-pointer for GCC8 -cdate Mon Aug 10 06:28:42 UTC 2020 -who rin -file src/sys/arch/sun2/conf/Makefile.sun2: 1.25 -descr Work around for reproducible kernel freezes just after ``Starting - postfix.'', where I cannot even enter DDB nor obtain crash dump. - I still haven't figured out why. Possibly something wrong with -Os - optimization level for GCC/m68k, cf., - http://mail-index.netbsd.org/port-sun3/2020/07/19/msg000166.html -kcah
CVS commit: src/doc
Module Name:src Committed By: rin Date: Mon Oct 5 13:20:30 UTC 2020 Modified Files: src/doc: HACKS Log Message: Update aes_ccm_tag() hack for m68k. Even with ``memcmp fix'', GCC 9.4 miscompiles this function for -O[12]. But the situation was slightly changed from that with GCC 8.3: * -O0 and -O1 work but -O2 fails for 68060 and 68040 (real hardware) * -O0 and -O2 work but -O1 fails for 68020 and 68010 (TME) To generate a diff of this commit: cvs rdiff -u -r1.210 -r1.211 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.210 src/doc/HACKS:1.211 --- src/doc/HACKS:1.210 Mon Oct 5 10:44:09 2020 +++ src/doc/HACKS Mon Oct 5 13:20:30 2020 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.210 2020/10/05 10:44:09 rin Exp $ +# $NetBSD: HACKS,v 1.211 2020/10/05 13:20:30 rin Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -985,15 +985,14 @@ descr GCC 8.4 miscompiles dwarf2expr.c w kcah port m68k -hack compile aes_ccm_tag() with -O0 for GCC8 +hack compile aes_ccm_tag() with -O0 for GCC8 and GCC9 cdate Mon Aug 10 06:27:29 UTC 2020 +mdate Mon Oct 5 22:00:00 JST 2020 who rin file src/sys/crypto/aes/aes_ccm.c: 1.5 -descr GCC 8.4 miscompiles aes_ccm_tag() for m68k with optimization level - -O[12], which results in failure in aes_ccm_selftest(). - This is observed for amiga (A1200, 68060), mac68k (Quadra 840AV, - 68040), and luna68k (nono, 68030 emulator). However, it is not for - sun3 (TME, 68020 emulator) and sun2 (TME, 68010 emulator). - At the moment, it is unclear whether this is due to differences b/w - 68010-20 vs 68030-60, or something wrong with TME. +descr GCC 9.4 and 8.3 miscompile aes_ccm_tag() for m68k with optimization + level -O[12], which results in failure in aes_ccm_selftest(). + For 9.4, -O0 and -O1 work but -O2 fails for amiga (A1200, 68060) and + mac68k (Quadra 840AV, 68040). Whereas -O0 and -O2 work but -O1 fails + for sun3 (TME, 68020 emulator) and sun2 (TME, 68010 emulator). kcah
CVS commit: src/doc
Module Name:src
Committed By: rin
Date: Mon Oct 5 13:32:32 UTC 2020
Modified Files:
src/doc: HACKS
Log Message:
Update gdb/dwarf2expr.c hack for earmv7hf{,eb}; the situation does not
change even for GCC 9.3 with ``memcmp'' fix.
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/doc/HACKS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.211 src/doc/HACKS:1.212
--- src/doc/HACKS:1.211 Mon Oct 5 13:20:30 2020
+++ src/doc/HACKS Mon Oct 5 13:32:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.211 2020/10/05 13:20:30 rin Exp $
+# $NetBSD: HACKS,v 1.212 2020/10/05 13:32:31 rin Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -974,11 +974,12 @@ descr Disable optimization on tc.c, loge
kcah
port earmv7hf*
-hack compile gdb/dwarf2expr.c with -O0 for GCC8 (toolchain/54820 and 54877)
+hack compile gdb/dwarf2expr.c with -O0 for GCC[89] (toolchain/54820, 54877)
cdate Wed Apr 29 11:04:58 UTC 2020
+mdate Mon Oct 5 22:30:00 JST 2020
who rin
file src/external/gpl3/gdb/lib/libgdb/Makefile: 1.22
-descr GCC 8.4 miscompiles dwarf2expr.c with -O2 or -O1, which results in
+descr GCC 8.4 and 9.3 miscompile dwarf2expr.c with -O[21], which results in
crashes with 'gdb_exception_RETURN_MASK_ERROR'. Note that this occurs
only for earmv7hf{,eb} as far as I can see. Neither earmv6hf{,eb} nor
earmv7{,eb} (softfloat) are affected.
CVS commit: src/distrib/sun2/miniroot
Module Name:src Committed By: rin Date: Tue Oct 6 13:32:42 UTC 2020 Modified Files: src/distrib/sun2/miniroot: list Log Message: Revert the previous again; miniroot overflows this time... - switch to x_disklabel (drop non-native label support) - switch to x_fsck_ffs and x_newfs (drop byte-swapped and Apple UFS support) - switch to more To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/sun2/miniroot/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sun2/miniroot/list diff -u src/distrib/sun2/miniroot/list:1.22 src/distrib/sun2/miniroot/list:1.23 --- src/distrib/sun2/miniroot/list:1.22 Sun Oct 4 23:42:43 2020 +++ src/distrib/sun2/miniroot/list Tue Oct 6 13:32:41 2020 @@ -1,5 +1,5 @@ # -# $NetBSD: list,v 1.22 2020/10/04 23:42:43 rin Exp $ +# $NetBSD: list,v 1.23 2020/10/06 13:32:41 rin Exp $ # # The PROM provides a default kernel name of "vmunix" @@ -127,7 +127,7 @@ PROG usr/bin/chflags PROG usr/bin/cksum PROG usr/bin/cmp PROG usr/bin/ftp -PROG usr/bin/less usr/bin/more +PROG usr/bin/more usr/bin/less PROG usr/bin/rsh PROG usr/bin/sed PROG usr/bin/tip @@ -138,14 +138,18 @@ PROG usr/bin/gzip usr/bin/gzcat usr/bin/ # install.md still uses sort PROG usr/bin/sort -SPECIAL less srcdir external/bsd/less/bin/less SPECIAL vi srcdir external/bsd/nvi/usr.bin/nvi +SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ed srcdir distrib/utils/x_ed +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL ifconfig srcdir distrib/utils/x_ifconfig +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route + +SPECIAL more srcdir distrib/utils/more SPECIAL edlabel srcdir distrib/utils/edlabel ARGVLN sh -sh
CVS commit: src
Module Name:src
Committed By: rin
Date: Wed Oct 7 07:35:28 UTC 2020
Modified Files:
src/doc: HACKS
src/external/bsd/jemalloc/lib: Makefile.inc
Log Message:
PR port-alpha/54307
GCC 9.3 seems to be able to compile rtree.c with -O2:
- No new regressions in ATF.
- System survives over a night, at least, under heavy loads.
On the other hand, unfortunately, GCC 9.3 still miscompiles tcache.c
with -O2 or -O1. For example, even ``gcc -g hello.c'' fails with ICE
if tcache.c is compiled with -O[12] in libc.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/doc/HACKS
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/jemalloc/lib/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.212 src/doc/HACKS:1.213
--- src/doc/HACKS:1.212 Mon Oct 5 13:32:31 2020
+++ src/doc/HACKS Wed Oct 7 07:35:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.212 2020/10/05 13:32:31 rin Exp $
+# $NetBSD: HACKS,v 1.213 2020/10/07 07:35:28 rin Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -951,12 +951,14 @@ descr Disable optimization for rtld.c on
kcah
port alpha
-hack GCC 7.4/8.3: userland binaries crash randomly (port-alpha/54307)
+hack GCC 7.4/8.3/9.3: userland binaries crash randomly (port-alpha/54307)
cdate Fri Nov 1 20:43:35 UTC 2019
+mdate Wed Oct 7 16:00:00 JST 2020
who rin
file src/external/bsd/jemalloc/lib/Makefile.inc: 1.11
-descr rtree.c and tcache.c need to be compiled with -O0, alternatively,
- you can compile whole jemalloc with -DJEMALLOC_DEBUG.
+descr GCC miscompiles rtree.c (for 7.4 and 8.3) and tcache.c (for 7.4, 8.3,
+ and 9.3) with optimization levels -O[12]. Compile these files with -O0,
+ alternatively, compile whole jemalloc with -DJEMALLOC_DEBUG.
kcah
port powerpc
Index: src/external/bsd/jemalloc/lib/Makefile.inc
diff -u src/external/bsd/jemalloc/lib/Makefile.inc:1.11 src/external/bsd/jemalloc/lib/Makefile.inc:1.12
--- src/external/bsd/jemalloc/lib/Makefile.inc:1.11 Fri Nov 1 20:53:10 2019
+++ src/external/bsd/jemalloc/lib/Makefile.inc Wed Oct 7 07:35:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2019/11/01 20:53:10 rin Exp $
+# $NetBSD: Makefile.inc,v 1.12 2020/10/07 07:35:28 rin Exp $
JEMALLOC:=${.PARSEDIR}/..
@@ -51,11 +51,11 @@ COPTS.ctl.c+=-Wno-error=stack-protector
COPTS.stats.c+=-Wno-error=stack-protector
COPTS.tcache.c+=-Wno-error=stack-protector
-.if ${MACHINE} == "alpha"
+.if ${MACHINE} == "alpha" && ${ACTIVE_CC} == "gcc"
# These files need to be compiled with -O0, or build everything with
# -DJEMALLOC_DEBUG. Otherwise, userland binaries crash randomly, as
# reported in port-alpha/54307.
-COPTS.rtree.c+=-O0
+COPTS.rtree.c+= ${${HAVE_GCC:U0} < 9:? -O0 :}
COPTS.tcache.c+=-O0
.endif
CVS commit: src
Module Name:src
Committed By: rin
Date: Thu Oct 8 08:31:37 UTC 2020
Modified Files:
src/doc: HACKS
src/external/gpl3/gdb.old/lib/libgdb: Makefile
Log Message:
GCC 9.3 miscompiles dwarf2{expr,loc}.c with -O2 for earmv5hf{,eb}
(-O1 is fine). This is a new regression introduced in GCC9.
For everyone's safety, extend -O0 hack to dwarf2{expr,loc}.c for
all arm variants with GCC >= 8.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/doc/HACKS
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gdb.old/lib/libgdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.213 src/doc/HACKS:1.214
--- src/doc/HACKS:1.213 Wed Oct 7 07:35:28 2020
+++ src/doc/HACKS Thu Oct 8 08:31:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.213 2020/10/07 07:35:28 rin Exp $
+# $NetBSD: HACKS,v 1.214 2020/10/08 08:31:37 rin Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -975,16 +975,17 @@ descr Disable optimization on tc.c, loge
function "__int64_t llvm::MachineFrameInfo::getObjectOffset(int) const"
kcah
-port earmv7hf*
-hack compile gdb/dwarf2expr.c with -O0 for GCC[89] (toolchain/54820, 54877)
+port arm
+hack compile gdb/dwarf2{expr,loc}.c with -O0 for GCC[89] (PR/54820, 54877)
cdate Wed Apr 29 11:04:58 UTC 2020
-mdate Mon Oct 5 22:30:00 JST 2020
+mdate Thu Oct 8 17:00:00 JST 2020
who rin
file src/external/gpl3/gdb/lib/libgdb/Makefile: 1.22
-descr GCC 8.4 and 9.3 miscompile dwarf2expr.c with -O[21], which results in
- crashes with 'gdb_exception_RETURN_MASK_ERROR'. Note that this occurs
- only for earmv7hf{,eb} as far as I can see. Neither earmv6hf{,eb} nor
- earmv7{,eb} (softfloat) are affected.
+descr For earmv7hf{,eb}, GCC 8.4 and 9.3 miscompile dwarf2expr.c with -O[21].
+ For earmv5hf{,eb}, GCC 9.3 miscompiles dwarf2{expr,loc}.c with -O2
+ (GCC9 -O1 and GCC8 -O2 work fine). These result in GDB crash with
+ ``gdb_exception_RETURN_MASK_ERROR''. For everyone's safety, compile
+ these files with -O0 for all arm variants with GCC >= 8.
kcah
port m68k
Index: src/external/gpl3/gdb.old/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.10 src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.11
--- src/external/gpl3/gdb.old/lib/libgdb/Makefile:1.10 Mon Sep 14 00:40:43 2020
+++ src/external/gpl3/gdb.old/lib/libgdb/Makefile Thu Oct 8 08:31:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/09/14 00:40:43 christos Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/08 08:31:37 rin Exp $
NOCTF=
HOSTPROG_CXX= 1
@@ -54,12 +54,14 @@ CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-
ada-exp.c: ada-lex.c
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-.if !empty(MACHINE_ARCH:Mearmv7hf*)
-# GCC 8.4 miscompiles this with -O2 or -O1 for earmv7hf{,eb}.
-# Neither earmv6hf{,eb} nor earmv7{,eb} are affected.
-COPTS.dwarf2expr.c+=-O0
-.endif
+.if ${MACHINE_CPU} == "arm"
+. if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8
+# GCC 8.4/9.3 miscompile this with -O[21] for earmv7hf{,eb}.
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.dwarf2expr.c+= -O0
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.dwarf2loc.c+= -O0
+. endif
.endif
# These are generated by implicit rules and are not easy to generate
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src
Committed By: rin
Date: Thu Oct 8 08:32:57 UTC 2020
Modified Files:
src/external/gpl3/gdb/lib/libgdb: Makefile
Log Message:
Apply hack for GDB 8.3 on arm to GDB 11.
XXX
Not tested as GDB 11 does not build for arm at the moment.
Note that dist/gdb/dwarf2foo.c was renamed to dist/gdb/dwarf2/foo.c.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/external/gpl3/gdb/lib/libgdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/lib/libgdb/Makefile
diff -u src/external/gpl3/gdb/lib/libgdb/Makefile:1.27 src/external/gpl3/gdb/lib/libgdb/Makefile:1.28
--- src/external/gpl3/gdb/lib/libgdb/Makefile:1.27 Thu Sep 17 16:36:38 2020
+++ src/external/gpl3/gdb/lib/libgdb/Makefile Thu Oct 8 08:32:57 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2020/09/17 16:36:38 christos Exp $
+# $NetBSD: Makefile,v 1.28 2020/10/08 08:32:57 rin Exp $
NOCTF=
HOSTPROG_CXX= 1
@@ -59,12 +59,15 @@ CFLAGS:= ${CXXFLAGS} -std=gnu++11 -Wno-
ada-exp.c: ada-lex.c
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 8 && ${ACTIVE_CC} == "gcc"
-.if !empty(MACHINE_ARCH:Mearmv7hf*)
-# GCC 8.4 miscompiles this with -O2 or -O1 for earmv7hf{,eb}.
-# Neither earmv6hf{,eb} nor earmv7{,eb} are affected.
-COPTS.dwarf2expr.c+=-O0
-.endif
+.if ${MACHINE_CPU} == "arm"
+. if ${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 8
+# XXX taken from GDB 8.3; not tested for GDB 11:
+# GCC 8.4/9.3 miscompile this with -O[21] for earmv7hf{,eb}.
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.expr.c+= -O0
+# GCC 9.3 miscompile this with -O2 for earmv5hf{,eb}.
+COPTS.loc.c+= -O0
+. endif
.endif
# These are generated by implicit rules and are not easy to generate
CVS commit: src/sys/kern
Module Name:src
Committed By: rin
Date: Thu Oct 8 09:16:13 UTC 2020
Modified Files:
src/sys/kern: kern_cpu.c
Log Message:
PR kern/45117
Work around regression introduced in rev 1.92:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/kern_cpu.c#rev1.92
by which ``cpuctl offline n'' became broken on architectures without
__HAVE_INTR_CONTROL (i.e., everything other than alpha and x86);
cpu_setintr() always fails on these archs, and we had neglected
return value from that function until rev 1.91.
XXX
As martin pointed out in the PR, I'm not sure whether fix in rev 1.92
itself is correct or not. Insert XXX comment referring the PR there
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/kern/kern_cpu.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/kern/kern_cpu.c
diff -u src/sys/kern/kern_cpu.c:1.92 src/sys/kern/kern_cpu.c:1.93
--- src/sys/kern/kern_cpu.c:1.92 Mon Jul 13 13:16:07 2020
+++ src/sys/kern/kern_cpu.c Thu Oct 8 09:16:13 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_cpu.c,v 1.92 2020/07/13 13:16:07 jruoho Exp $ */
+/* $NetBSD: kern_cpu.c,v 1.93 2020/10/08 09:16:13 rin Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009, 2010, 2012, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.92 2020/07/13 13:16:07 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_cpu.c,v 1.93 2020/10/08 09:16:13 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_cpu_ucode.h"
@@ -212,9 +212,7 @@ cpuctl_ioctl(dev_t dev, u_long cmd, void
error = ESRCH;
break;
}
- error = cpu_setintr(ci, cs->cs_intr);
- if (error)
- break;
+ cpu_setintr(ci, cs->cs_intr); /* XXX neglect errors */
error = cpu_setstate(ci, cs->cs_online);
break;
@@ -492,7 +490,7 @@ cpu_setintr(struct cpu_info *ci, bool in
return 0;
func = (xcfunc_t)cpu_xc_intr;
} else {
- if (CPU_IS_PRIMARY(ci))
+ if (CPU_IS_PRIMARY(ci)) /* XXX kern/45117 */
return EINVAL;
if ((spc->spc_flags & SPCF_NOINTR) != 0)
return 0;
CVS commit: src/tools/gdb
Module Name:src Committed By: rin Date: Fri Oct 9 23:44:46 UTC 2020 Modified Files: src/tools/gdb: README.mknative Log Message: Nowadays, mknative-gdb puts files into external/gpl3/gdb/lib, instead of external/gpl3/gdb/bin/gdb. Also, we need to nbmake-MACHINE in external/gpl3/gdb in order to build dependent libraries correctly. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tools/gdb/README.mknative 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/README.mknative diff -u src/tools/gdb/README.mknative:1.6 src/tools/gdb/README.mknative:1.7 --- src/tools/gdb/README.mknative:1.6 Fri Jun 21 07:05:02 2019 +++ src/tools/gdb/README.mknative Fri Oct 9 23:44:46 2020 @@ -1,4 +1,4 @@ -$NetBSD: README.mknative,v 1.6 2019/06/21 07:05:02 maya Exp $ +$NetBSD: README.mknative,v 1.7 2020/10/09 23:44:46 rin Exp $ This file describes how to use the cross-compiler to generate the native files for GDB on a target platform. @@ -34,11 +34,11 @@ work. native-to-NetBSD GDB on a cross host, and mknative pulls glue data from this. - NOTE: this step writes files under src/external/gpl3/gdb/bin/gdb, so you + NOTE: this step writes files under src/external/gpl3/gdb/lib, so you need to do it in a writable src tree! 6. Try out a full build using "nbmake-MACHINE" in - src/external/gpl3/gdb/bin; the result should include a native GDB. + src/external/gpl3/gdb; the result should include a native GDB. 7. If all is well, commit the glue files and directories added to - src/external/gpl3/gdb/bin/gdb. + src/external/gpl3/gdb/lib.
CVS commit: src/tools/gdb
Module Name:src
Committed By: rin
Date: Fri Oct 9 23:48:42 UTC 2020
Modified Files:
src/tools/gdb: mknative-gdb.old
Log Message:
Correct target directory; src/external/gpl3/gdb.old not gdb.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/gdb/mknative-gdb.old
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/mknative-gdb.old
diff -u src/tools/gdb/mknative-gdb.old:1.1 src/tools/gdb/mknative-gdb.old:1.2
--- src/tools/gdb/mknative-gdb.old:1.1 Thu Sep 17 02:14:48 2020
+++ src/tools/gdb/mknative-gdb.old Fri Oct 9 23:48:42 2020
@@ -1,8 +1,8 @@
#!/bin/sh
-# $NetBSD: mknative-gdb.old,v 1.1 2020/09/17 02:14:48 christos Exp $
+# $NetBSD: mknative-gdb.old,v 1.2 2020/10/09 23:48:42 rin Exp $
#
# Shell script for generating all the constants needed for a native
-# platform build of src/external/gpl3/gdb
+# platform build of src/external/gpl3/gdb.old
#
# initialise
@@ -12,7 +12,7 @@ _TOP=$3
_PLATFORM=$4
_MACHINE_SUBDIR=$5
_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'`
-_GDB=external/gpl3/gdb
+_GDB=external/gpl3/gdb.old
. $_TOP/tools/gcc/mknative.common
CVS commit: src/external/gpl3/gdb.old/lib/libbfd
Module Name:src
Committed By: rin
Date: Fri Oct 9 23:55:48 UTC 2020
Modified Files:
src/external/gpl3/gdb.old/lib/libbfd: Makefile
Log Message:
Adjust for aarch64eb; it needs elf32-aarch64.c.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb.old/lib/libbfd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb.old/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb.old/lib/libbfd/Makefile:1.8 src/external/gpl3/gdb.old/lib/libbfd/Makefile:1.9
--- src/external/gpl3/gdb.old/lib/libbfd/Makefile:1.8 Mon Sep 14 00:40:37 2020
+++ src/external/gpl3/gdb.old/lib/libbfd/Makefile Fri Oct 9 23:55:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/09/14 00:40:37 christos Exp $
+# $NetBSD: Makefile,v 1.9 2020/10/09 23:55:48 rin Exp $
.include
.include "../Makefile.inc"
@@ -22,7 +22,7 @@ DPSRCS+= elf32-target.h elf64-target.h t
elf32-ia64.c elf64-ia64.c elf64-aarch64.c \
peigen.c pex64igen.c
CLEANFILES+= elf32-target.h elf64-target.h targmatch.h \
- elf32-ia64.c elf64-ia64.c elf64-aarch64.c \
+ elf32-ia64.c elf64-ia64.c elf64-aarch64.c elf32-aarch64.c \
peigen.c pex64igen.c
.PATH: ${DIST}/bfd
@@ -54,6 +54,10 @@ elf64-ia64.c: elfxx-ia64.c
${_MKTARGET_CREATE}
${TOOL_SED} -e s/NN/64/g < $> > $@
+elf32-aarch64.c: elfnn-aarch64.c
+ ${_MKTARGET_CREATE}
+ ${TOOL_SED} -e s/NN/32/g < $> > $@
+
elf64-aarch64.c: elfnn-aarch64.c
${_MKTARGET_CREATE}
${TOOL_SED} -e s/NN/64/g < $> > $@
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Sat Oct 10 00:03:53 UTC 2020
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen for getrandom(2)
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.153 -r1.154 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.33 -r1.34 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.152 -r1.153 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/netbsd32/netbsd32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.154 src/sys/compat/netbsd32/netbsd32_syscall.h:1.155
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.154 Sat May 16 18:31:48 2020
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Oct 10 00:03:52 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.154 2020/05/16 18:31:48 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.155 2020/10/10 00:03:52 rin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -271,6 +271,9 @@
/* syscall: "netbsd32_dup2" ret: "int" args: "int" "int" */
#define NETBSD32_SYS_netbsd32_dup2 90
+/* syscall: "netbsd32_getrandom" ret: "netbsd32_ssize_t" args: "netbsd32_voidp" "netbsd32_size_t" "unsigned int" */
+#define NETBSD32_SYS_netbsd32_getrandom 91
+
/* syscall: "netbsd32_fcntl" ret: "int" args: "int" "int" "..." */
#define NETBSD32_SYS_netbsd32_fcntl 92
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.153 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.154
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.153 Sat May 16 18:31:48 2020
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Oct 10 00:03:52 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.153 2020/05/16 18:31:48 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.154 2020/10/10 00:03:52 rin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -471,6 +471,13 @@ struct netbsd32_dup2_args {
};
check_syscall_args(netbsd32_dup2)
+struct netbsd32_getrandom_args {
+ syscallarg(netbsd32_voidp) buf;
+ syscallarg(netbsd32_size_t) buflen;
+ syscallarg(unsigned int) flags;
+};
+check_syscall_args(netbsd32_getrandom)
+
struct netbsd32_fcntl_args {
syscallarg(int) fd;
syscallarg(int) cmd;
@@ -2928,6 +2935,8 @@ int compat_43_sys_getdtablesize(struct l
int netbsd32_dup2(struct lwp *, const struct netbsd32_dup2_args *, register_t *);
+int netbsd32_getrandom(struct lwp *, const struct netbsd32_getrandom_args *, register_t *);
+
int netbsd32_fcntl(struct lwp *, const struct netbsd32_fcntl_args *, register_t *);
int compat_50_netbsd32_select(struct lwp *, const struct compat_50_netbsd32_select_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.153 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.154
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.153 Sat May 16 18:31:48 2020
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Oct 10 00:03:53 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.153 2020/05/16 18:31:48 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.154 2020/10/10 00:03:53 rin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.137 2020/04/26 19:18:36 thorpej Exp
+ * created from NetBSD: syscalls.master,v 1.139 2020/10/10 00:00:54 rin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.153 2020/05/16 18:31:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.154 2020/10/10 00:03:53 rin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -121,7 +121,7 @@ const char *const netbsd32_syscallnames[
/* 88 */ "compat_43_netbsd32_osethostname",
/* 89 */ "compat_43_ogetdtablesize",
/* 90 */ "netbsd32_dup2",
- /* 91 */ "#91 (unimplemented getdopt)",
+ /* 91 */ "netbsd32_getrandom",
/* 92 */ "netbsd32_fcntl",
/* 93 */ "compat_50_netbsd32_select",
/*
