Module Name: src
Committed By: simonb
Date: Mon Jul 20 03:26:07 UTC 2020
Modified Files:
src/sys/arch/mips/mips: cpu_subr.c
Log Message:
Less magic numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/mips/mips/cpu_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/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.50 src/sys/arch/mips/mips/cpu_subr.c:1.51
--- src/sys/arch/mips/mips/cpu_subr.c:1.50 Sun Jul 19 09:30:08 2020
+++ src/sys/arch/mips/mips/cpu_subr.c Mon Jul 20 03:26:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_subr.c,v 1.50 2020/07/19 09:30:08 simonb Exp $ */
+/* $NetBSD: cpu_subr.c,v 1.51 2020/07/20 03:26:07 simonb Exp $ */
/*-
* Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.50 2020/07/19 09:30:08 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.51 2020/07/20 03:26:07 simonb Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -122,14 +122,16 @@ struct cpu_info *
cpu_info_alloc(struct pmap_tlb_info *ti, cpuid_t cpu_id, cpuid_t cpu_package_id,
cpuid_t cpu_core_id, cpuid_t cpu_smt_id)
{
+ const int exc_step = 1 << MIPS_EBASE_EXC_BASE_SHIFT;
KASSERT(cpu_id < MAXCPUS);
#ifdef MIPS64_OCTEON
- vaddr_t exc_page = MIPS_UTLB_MISS_EXC_VEC + 0x1000*cpu_id;
- __CTASSERT(sizeof(struct cpu_info) + sizeof(struct pmap_tlb_info) <= 0x1000 - 0x280);
+ vaddr_t exc_page = MIPS_UTLB_MISS_EXC_VEC + exc_step * cpu_id;
+ __CTASSERT(sizeof(struct cpu_info) + sizeof(struct pmap_tlb_info)
+ <= exc_step - 0x280);
- struct cpu_info * const ci = ((struct cpu_info *)(exc_page + 0x1000)) - 1;
+ struct cpu_info * const ci = ((struct cpu_info *)(exc_page + exc_step)) - 1;
memset((void *)exc_page, 0, PAGE_SIZE);
if (ti == NULL) {
