75248cc7a1
in question, whereas the ARM code was using it to hold the model identification. To fix this, rename: ci_cpuid -> ci_arm_cpuid ci_cputype -> ci_arm_cputype (for consistency) ci_cpurev -> ci_arm_cpurev (ditto) ci_cpunum -> ci_cpuid This makes top(1) give correct CPU numbers in its "STATE" column (all 0 for now).
62 lines
2.3 KiB
C
62 lines
2.3 KiB
C
/* $NetBSD: cpu.h,v 1.6 2002/10/13 12:24:57 bjh21 Exp $ */
|
|
|
|
/*-
|
|
* Copyright (c) 2002 Ben Harris
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#if defined(_KERNEL) && defined(_KERNEL_OPT) && !defined(_LOCORE)
|
|
#include "opt_multiprocessor.h"
|
|
|
|
#ifdef MULTIPROCESSOR
|
|
void cpu_boot_secondary_processors(void);
|
|
|
|
#define MP_CPU_INFO_MEMBERS \
|
|
cpuid_t ci_cpuid; \
|
|
struct proc *ci_curproc; \
|
|
struct pcb *ci_curpcb; \
|
|
struct pcb *ci_idlepcb;
|
|
|
|
#define CPU_MAXNUM 8
|
|
|
|
extern struct cpu_info *cpu_info[];
|
|
|
|
#define CPU_IS_PRIMARY(ci) ((ci)->ci_cpuid == 0)
|
|
extern cpuid_t cpu_number(void);
|
|
#define curcpu() (cpu_info[cpu_number()])
|
|
|
|
extern cpuid_t cpu_next(cpuid_t);
|
|
|
|
#define CPU_INFO_ITERATOR cpuid_t
|
|
#define CPU_INFO_FOREACH(cii, ci) \
|
|
cii = 0, ci = cpu_info[0]; \
|
|
cii < CPU_MAXNUM; \
|
|
cii = cpu_next(cii), ci = cpu_info[cii]
|
|
|
|
#endif /* MULTIPROCESSOR */
|
|
#endif /* _KERNEL && _KERNEL_OPT && !_LOCORE */
|
|
|
|
#include <arm/cpu.h>
|