Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize ci_divisor_delay by temporary cpufreq for early delay(9) calls.

Browse Source 
This is actually required for Indigo R3k.
Reported by Naruaki Etomi in PR port-sgimips/53520.
This commit is contained in:
tsutsui 2018-09-08 02:33:33 +00:00
parent e61885907b
commit bef9bbdd17
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/arch/sgimips/sgimips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.146 2018/09/02 09:57:33 tsutsui Exp $ */
/* $NetBSD: machdep.c,v 1.147 2018/09/08 02:33:33 tsutsui Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.146 2018/09/02 09:57:33 tsutsui Exp $");
__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.147 2018/09/08 02:33:33 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@ -333,6 +333,25 @@ mach_init(int argc, int32_t argv32[], uintptr_t magic, int32_t bip32)
*/
curcpu()->ci_cpu_freq = strtoul(cpufreq, NULL, 10) * 1000000;
/*
* Also initialize ci members for delay and clock by the temporary
* ci_cpu_freq value for early use of delay(9).
* These values will be calibrated later in MD code:
* - int_attach() in dev/int.c for IP6/10/12/20/22
* - crime_attach() in dev/crime.c for IP32
*
* XXX: ci_divisor_delay is for mips3_delay() in mips/mips3_clock.c
* but sgimips abuse it as "instructions per microsecond"
* for traditional delay(9) implementation derived from
* 4.4BSD/mips (also used in pmax and news3400).
* (see sys/arch/mips/mips/mips_mcclock.c etc.)
*
* Note ci_cycles_per_hz is for mips3_clockintr.c for MIPS3 so
* there is no early use, but initialize it as a sane default.
*/
curcpu()->ci_cycles_per_hz = curcpu()->ci_cpu_freq / (2 * hz);
curcpu()->ci_divisor_delay = curcpu()->ci_cpu_freq / (2 * 1000000);
/*
* Check machine (IPn) type.
*