Module Name: src
Committed By: matt
Date: Wed Sep 1 00:59:43 UTC 2010
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: cpu.h
src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpu.c
Log Message:
Fill cpu_data cpu_{node,core,smt}_id for RMI.
To generate a diff of this commit:
cvs rdiff -u -r1.90.16.31 -r1.90.16.32 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/arch/mips/rmi/rmixl_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/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.90.16.31 src/sys/arch/mips/include/cpu.h:1.90.16.32
--- src/sys/arch/mips/include/cpu.h:1.90.16.31 Wed Aug 18 17:01:20 2010
+++ src/sys/arch/mips/include/cpu.h Wed Sep 1 00:59:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.90.16.31 2010/08/18 17:01:20 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.90.16.32 2010/09/01 00:59:42 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -86,6 +86,7 @@
* Per-cpu pmap information
*/
int ci_tlb_slot; /* reserved tlb entry for cpu_info */
+ u_int ci_pmap_asid_cur; /* current ASID */
struct pmap_tlb_info *ci_tlb_info; /* tlb information for this cpu */
union segtab *ci_pmap_seg0tab;
#ifdef _LP64
@@ -433,7 +434,8 @@
#endif
struct cpu_info *
- cpu_info_alloc(struct pmap_tlb_info *, u_int);
+ cpu_info_alloc(struct pmap_tlb_info *, cpuid_t, cpuid_t, cpuid_t,
+ cpuid_t);
void cpu_attach_common(device_t, struct cpu_info *);
void cpu_startup_common(void);
#ifdef _LP64
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.1.2.11 src/sys/arch/mips/mips/cpu_subr.c:1.1.2.12
--- src/sys/arch/mips/mips/cpu_subr.c:1.1.2.11 Thu Aug 19 07:20:19 2010
+++ src/sys/arch/mips/mips/cpu_subr.c Wed Sep 1 00:59:42 2010
@@ -32,7 +32,7 @@
#include "opt_multiprocessor.h"
#include "opt_sa.h"
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.1.2.11 2010/08/19 07:20:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.1.2.12 2010/09/01 00:59:42 matt Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -89,7 +89,8 @@
static struct cpu_info *cpu_info_last = &cpu_info_store;
struct cpu_info *
-cpu_info_alloc(struct pmap_tlb_info *ti, u_int cpu_id)
+cpu_info_alloc(struct pmap_tlb_info *ti, cpuid_t cpu_id, cpuid_t cpu_node_id,
+ cpuid_t cpu_core_id, cpuid_t cpu_smt_id)
{
vaddr_t cpu_info_offset = (vaddr_t)&cpu_info_store & PAGE_MASK;
struct pglist pglist;
@@ -126,6 +127,9 @@
}
ci->ci_cpuid = cpu_id;
+ ci->ci_data.cpu_node_id = cpu_node_id;
+ ci->ci_data.cpu_core_id = cpu_core_id;
+ ci->ci_data.cpu_smt_id = cpu_smt_id;
ci->ci_cpu_freq = cpu_info_store.ci_cpu_freq;
ci->ci_cctr_freq = cpu_info_store.ci_cctr_freq;
ci->ci_cycles_per_hz = cpu_info_store.ci_cycles_per_hz;
Index: src/sys/arch/mips/rmi/rmixl_cpu.c
diff -u src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.13 src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.14
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.13 Mon Aug 16 18:01:13 2010
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Wed Sep 1 00:59:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.1.2.13 2010/08/16 18:01:13 matt Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.1.2.14 2010/09/01 00:59:43 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.13 2010/08/16 18:01:13 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.14 2010/09/01 00:59:43 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -168,7 +168,8 @@
KASSERT(ca->ca_core < 8);
KASSERT(ca->ca_thread < 4);
cpuid = (ca->ca_core << 2) | ca->ca_thread;
- ci = cpu_info_alloc(ccsc->sc_tlbinfo, cpuid);
+ ci = cpu_info_alloc(ccsc->sc_tlbinfo, cpuid,
+ /* XXX */ 0, ca->ca_core, ca->ca_thread);
KASSERT(ci != NULL);
sc->sc_dev = self;
sc->sc_ci = ci;
