Module Name: src
Committed By: ryo
Date: Mon Sep 14 10:06:35 UTC 2020
Modified Files:
src/sys/arch/aarch64/aarch64: pmap.c
src/sys/arch/aarch64/include: cpu.h types.h
Log Message:
PID_MAX is just an initial value (soft maximum). Don't use it for CTASSERT.
defined __HAVE_CPU_MAXPROC to use function cpu_maxproc().
pointed out by mrg@, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/include/cpu.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/include/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.88 src/sys/arch/aarch64/aarch64/pmap.c:1.89
--- src/sys/arch/aarch64/aarch64/pmap.c:1.88 Sun Sep 6 17:38:10 2020
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Sep 14 10:06:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.88 2020/09/06 17:38:10 ryo Exp $ */
+/* $NetBSD: pmap.c,v 1.89 2020/09/14 10:06:35 ryo Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.88 2020/09/06 17:38:10 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.89 2020/09/14 10:06:35 ryo Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -1413,6 +1413,13 @@ pmap_protect(struct pmap *pm, vaddr_t sv
pm_unlock(pm);
}
+/* XXX: due to the current implementation of pmap depends on 16bit ASID */
+int
+cpu_maxproc(void)
+{
+ return 65535;
+}
+
void
pmap_activate(struct lwp *l)
{
@@ -1436,8 +1443,7 @@ pmap_activate(struct lwp *l)
reg_tcr_el1_write(tcr | TCR_EPD0);
__asm __volatile("isb" ::: "memory");
- /* XXX */
- CTASSERT(PID_MAX <= 65535); /* 16bit ASID */
+ /* XXX: allocate asid, and regenerate if needed */
if (pm->pm_asid == -1)
pm->pm_asid = l->l_proc->p_pid;
Index: src/sys/arch/aarch64/include/cpu.h
diff -u src/sys/arch/aarch64/include/cpu.h:1.26 src/sys/arch/aarch64/include/cpu.h:1.27
--- src/sys/arch/aarch64/include/cpu.h:1.26 Wed Aug 12 13:19:35 2020
+++ src/sys/arch/aarch64/include/cpu.h Mon Sep 14 10:06:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.26 2020/08/12 13:19:35 skrll Exp $ */
+/* $NetBSD: cpu.h,v 1.27 2020/09/14 10:06:35 ryo Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -147,6 +147,7 @@ static __inline struct cpu_info *lwp_get
#undef curlwp
#define curlwp (aarch64_curlwp())
+int cpu_maxproc(void);
void cpu_signotify(struct lwp *l);
void cpu_need_proftick(struct lwp *l);
Index: src/sys/arch/aarch64/include/types.h
diff -u src/sys/arch/aarch64/include/types.h:1.15 src/sys/arch/aarch64/include/types.h:1.16
--- src/sys/arch/aarch64/include/types.h:1.15 Mon Aug 3 06:30:00 2020
+++ src/sys/arch/aarch64/include/types.h Mon Sep 14 10:06:35 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.15 2020/08/03 06:30:00 ryo Exp $ */
+/* $NetBSD: types.h,v 1.16 2020/09/14 10:06:35 ryo Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -96,6 +96,7 @@ typedef __uint64_t __register_t;
#define __HAVE_COMMON___TLS_GET_ADDR
#define __HAVE_CPU_COUNTER
#define __HAVE_CPU_DATA_FIRST
+#define __HAVE_CPU_MAXPROC
#define __HAVE_FAST_SOFTINTS
#define __HAVE_MINIMAL_EMUL
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
