Module Name: src
Committed By: matt
Date: Thu Mar 11 22:26:57 UTC 2010
Modified Files:
src/sys/arch/sbmips/include [matt-nb5-mips64]: cpu.h
src/sys/arch/sbmips/sbmips [matt-nb5-mips64]: cpu.c sb1250_icu.c
Added Files:
src/sys/arch/sbmips/include [matt-nb5-mips64]: cpuvar.h
Log Message:
Move cpu_softc to <machine/cpuvar.h>
#include <machine/cpuvar.h> appropriately
Change cpu_softc prefix from cpu_ to sb1cpu_
To generate a diff of this commit:
cvs rdiff -u -r1.1.142.1 -r1.1.142.2 src/sys/arch/sbmips/include/cpu.h
cvs rdiff -u -r0 -r1.1.2.1 src/sys/arch/sbmips/include/cpuvar.h
cvs rdiff -u -r1.18.16.6 -r1.18.16.7 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.9.36.7 -r1.9.36.8 src/sys/arch/sbmips/sbmips/sb1250_icu.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/sbmips/include/cpu.h
diff -u src/sys/arch/sbmips/include/cpu.h:1.1.142.1 src/sys/arch/sbmips/include/cpu.h:1.1.142.2
--- src/sys/arch/sbmips/include/cpu.h:1.1.142.1 Thu Mar 11 08:20:59 2010
+++ src/sys/arch/sbmips/include/cpu.h Thu Mar 11 22:26:56 2010
@@ -1,18 +1,3 @@
-/* $NetBSD: cpu.h,v 1.1.142.1 2010/03/11 08:20:59 matt Exp $ */
-
-#ifndef _SBMIPS_CPU_H_
-#define _SBMIPS_CPU_H_
+/* $NetBSD: cpu.h,v 1.1.142.2 2010/03/11 22:26:56 matt Exp $ */
#include <mips/cpu.h>
-
-#ifndef _LOCORE
-struct cpu_softc {
- device_t cpu_dev;
- struct cpu_info *cpu_ci;
- vaddr_t cpu_imr_base;
- uint64_t cpu_imr_all;
- struct evcnt cpu_intr_evcnts[64];
-};
-#endif /* _LOCORE */
-
-#endif /* !_SBMIPS_CPU_H_ */
Index: src/sys/arch/sbmips/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.6 src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.7
--- src/sys/arch/sbmips/sbmips/cpu.c:1.18.16.6 Thu Mar 11 08:20:59 2010
+++ src/sys/arch/sbmips/sbmips/cpu.c Thu Mar 11 22:26:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.18.16.6 2010/03/11 08:20:59 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.18.16.7 2010/03/11 22:26:56 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18.16.6 2010/03/11 08:20:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.18.16.7 2010/03/11 22:26:56 matt Exp $");
#include "opt_multiprocessor.h"
@@ -47,6 +47,7 @@
#include <mips/cache.h>
#include <machine/cpu.h>
+#include <machine/cpuvar.h>
#include <mips/sibyte/include/zbbusvar.h>
#include <mips/sibyte/include/sb1250_regs.h>
@@ -125,8 +126,8 @@
KASSERT(ci->ci_cpuid == 0);
- cpu->cpu_dev = self;
- cpu->cpu_ci = ci;
+ cpu->sb1cpu_dev = self;
+ cpu->sb1cpu_ci = ci;
ci->ci_softc = cpu;
sb1250_cpu_init(cpu);
@@ -136,8 +137,8 @@
ci = cpu_info_alloc(NULL, found - 1);
KASSERT(ci);
- cpu->cpu_dev = self;
- cpu->cpu_ci = ci;
+ cpu->sb1cpu_dev = self;
+ cpu->sb1cpu_ci = ci;
ci->ci_softc = cpu;
sb1250_cpu_init(cpu);
Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.7 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.8
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.9.36.7 Thu Mar 11 08:20:59 2010
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c Thu Mar 11 22:26:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.9.36.7 2010/03/11 08:20:59 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.9.36.8 2010/03/11 22:26:56 matt Exp $ */
/*
* Copyright 2000, 2001
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.7 2010/03/11 08:20:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.9.36.8 2010/03/11 22:26:56 matt Exp $");
#define __INTR_PRIVATE
@@ -46,6 +46,7 @@
/* XXX for uvmexp */
#include <uvm/uvm_extern.h>
+#include <machine/cpuvar.h>
#include <machine/systemsw.h>
#include <mips/locore.h>
@@ -167,7 +168,7 @@
{
struct cpu_softc * const cpu = ci->ci_softc;
- WRITE_REG(cpu->cpu_imr_base + R_IMR_INTERRUPT_MASK, cpu->cpu_imr_all);
+ WRITE_REG(cpu->sb1cpu_imr_base + R_IMR_INTERRUPT_MASK, cpu->sb1cpu_imr_all);
}
static int
@@ -177,7 +178,7 @@
const uint64_t mbox_mask = 1LLU << tag;
if (cpus_running & (1 << cpu_index(ci)))
- WRITE_REG(cpu->cpu_imr_base + R_IMR_MAILBOX_SET_CPU, mbox_mask);
+ WRITE_REG(cpu->sb1cpu_imr_base + R_IMR_MAILBOX_SET_CPU, mbox_mask);
return 0;
}
@@ -189,8 +190,8 @@
struct cpu_softc * const cpu = ci->ci_softc;
uint64_t mbox_mask;
- mbox_mask = READ_REG(cpu->cpu_imr_base + R_IMR_MAILBOX_CPU);
- WRITE_REG(cpu->cpu_imr_base + R_IMR_MAILBOX_CLR_CPU, mbox_mask);
+ mbox_mask = READ_REG(cpu->sb1cpu_imr_base + R_IMR_MAILBOX_CPU);
+ WRITE_REG(cpu->sb1cpu_imr_base + R_IMR_MAILBOX_CLR_CPU, mbox_mask);
ipi_process(ci, mbox_mask);
}
@@ -199,25 +200,25 @@
void
sb1250_cpu_init(struct cpu_softc *cpu)
{
- const char * const xname = device_xname(cpu->cpu_ci->ci_dev);
- struct evcnt * evcnts = cpu->cpu_intr_evcnts;
+ const char * const xname = device_xname(cpu->sb1cpu_dev);
+ struct evcnt * evcnts = cpu->sb1cpu_intr_evcnts;
- cpu->cpu_imr_base =
- MIPS_PHYS_TO_KSEG1(A_IMR_MAPPER(cpu->cpu_ci->ci_cpuid));
+ cpu->sb1cpu_imr_base =
+ MIPS_PHYS_TO_KSEG1(A_IMR_MAPPER(cpu->sb1cpu_ci->ci_cpuid));
#ifdef MULTIPROCESSOR
- cpu->cpu_imr_all =
+ cpu->sb1cpu_imr_all =
~(M_INT_MBOX_0|M_INT_MBOX_1|M_INT_MBOX_2|M_INT_MBOX_3);
#else
- cpu->cpu_imr_all = ~0ULL;
+ cpu->sb1cpu_imr_all = ~0ULL;
#endif
for (u_int i = 0; i < K_INT_SOURCES; i++, evcnts++) {
- WRITE_REG(cpu->cpu_imr_base + SB1250_I_MAP(i), K_INT_MAP_I0);
+ WRITE_REG(cpu->sb1cpu_imr_base + SB1250_I_MAP(i), K_INT_MAP_I0);
evcnt_attach_dynamic(evcnts, EVCNT_TYPE_INTR, NULL,
xname, sb1250_intr_names[i]);
}
- WRITE_REG(cpu->cpu_imr_base + R_IMR_INTERRUPT_MASK, cpu->cpu_imr_all);
+ WRITE_REG(cpu->sb1cpu_imr_base + R_IMR_INTERRUPT_MASK, cpu->sb1cpu_imr_all);
}
void
@@ -273,8 +274,8 @@
{
struct cpu_info * const ci = curcpu();
struct cpu_softc * const cpu = ci->ci_softc;
- const vaddr_t imr_base = cpu->cpu_imr_base;
- struct evcnt * const evcnts = cpu->cpu_intr_evcnts;
+ const vaddr_t imr_base = cpu->sb1cpu_imr_base;
+ struct evcnt * const evcnts = cpu->sb1cpu_intr_evcnts;
uint32_t pending;
int ipl;
@@ -321,16 +322,16 @@
panic("%s: cannot share sb1250 interrupts", __func__);
ints_for_ipl[ipl] |= (1ULL << num);
- cpu->cpu_imr_all &= ~(1ULL << num);
+ cpu->sb1cpu_imr_all &= ~(1ULL << num);
ih->ih_fun = fun;
ih->ih_arg = arg;
ih->ih_ipl = ipl;
if (ipl > IPL_VM)
- WRITE_REG(cpu->cpu_imr_base + SB1250_I_MAP(num), K_INT_MAP_I1);
+ WRITE_REG(cpu->sb1cpu_imr_base + SB1250_I_MAP(num), K_INT_MAP_I1);
- WRITE_REG(cpu->cpu_imr_base + R_IMR_INTERRUPT_MASK, cpu->cpu_imr_all);
+ WRITE_REG(cpu->sb1cpu_imr_base + R_IMR_INTERRUPT_MASK, cpu->sb1cpu_imr_all);
splx(s);
Added files:
Index: src/sys/arch/sbmips/include/cpuvar.h
diff -u /dev/null src/sys/arch/sbmips/include/cpuvar.h:1.1.2.1
--- /dev/null Thu Mar 11 22:26:57 2010
+++ src/sys/arch/sbmips/include/cpuvar.h Thu Mar 11 22:26:56 2010
@@ -0,0 +1,18 @@
+/* $NetBSD: cpuvar.h,v 1.1.2.1 2010/03/11 22:26:56 matt Exp $ */
+
+#ifndef _SBMIPS_CPUVAR_H_
+#define _SBMIPS_CPUVAR_H_
+
+#include <mips/cpu.h>
+
+#ifndef _LOCORE
+struct cpu_softc {
+ device_t sb1cpu_dev;
+ struct cpu_info *sb1cpu_ci;
+ vaddr_t sb1cpu_imr_base;
+ uint64_t sb1cpu_imr_all;
+ struct evcnt sb1cpu_intr_evcnts[64];
+};
+#endif /* _LOCORE */
+
+#endif /* !_SBMIPS_CPUVAR_H_ */
