CVS commit: src/sys/arch/sbmips/sbmips

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Tue Dec  5 19:19:26 UTC 2023

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c sb1250_icu.c

Log Message:
use kcpuset_isset() and pass second (NULL) argument to mips_fixup_exceptions()
to fix build for GENERIC(64).MP kernel configs.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.14 -r1.15 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/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.23 src/sys/arch/sbmips/sbmips/cpu.c:1.24
--- src/sys/arch/sbmips/sbmips/cpu.c:1.23	Thu Jul 21 17:02:15 2016
+++ src/sys/arch/sbmips/sbmips/cpu.c	Tue Dec  5 19:19:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.23 2016/07/21 17:02:15 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.24 2023/12/05 19:19:26 andvar Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.23 2016/07/21 17:02:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.24 2023/12/05 19:19:26 andvar Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -150,13 +150,12 @@ cpu_attach(device_t parent, device_t sel
 			aprint_error(": CFE call to start failed: %d\n",
 			status);
 		}
-		const u_long cpu_mask = 1L << cpu_index(ci);
 		for (size_t i = 0; i < 1; i++) {
-			if (cpus_hatched & cpu_mask)
+			if (kcpuset_isset(cpus_hatched, cpu_index(ci)))
  break;
 			DELAY(100);
 		}
-		if ((cpus_hatched & cpu_mask) == 0) {
+		if (!kcpuset_isset(cpus_hatched, cpu_index(ci))) {
 			aprint_error(": failed to hatch!\n");
 			return;
 		}

Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.55 src/sys/arch/sbmips/sbmips/machdep.c:1.56
--- src/sys/arch/sbmips/sbmips/machdep.c:1.55	Mon Nov  6 03:47:48 2017
+++ src/sys/arch/sbmips/sbmips/machdep.c	Tue Dec  5 19:19:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.55 2017/11/06 03:47:48 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.56 2023/12/05 19:19:26 andvar Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -58,7 +58,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2017/11/06 03:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2023/12/05 19:19:26 andvar Exp $");
 
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
@@ -319,7 +319,7 @@ mach_init(long fwhandle, long magic, lon
 	}
 
 #ifdef MULTIPROCESSOR
-	mips_fixup_exceptions(mips_fixup_zero_relative);
+	mips_fixup_exceptions(mips_fixup_zero_relative, NULL);
 #endif
 }
 

Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.14 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.15
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.14	Thu Jul 21 17:02:15 2016
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c	Tue Dec  5 19:19:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.14 2016/07/21 17:02:15 christos Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.15 2023/12/05 19:19:26 andvar Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.14 2016/07/21 17:02:15 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.15 2023/12/05 19:19:26 andvar Exp $");
 
 #define	__INTR_PRIVATE
 
@@ -179,7 +179,7 @@ sb1250_lsw_send_ipi(struct cpu_info *ci,
 	struct cpu_softc * const cpu = ci->ci_softc;
 	const uint64_t mbox_mask = 1LLU << tag;
 
-	if (cpus_running & (1 << cpu_index(ci)))
+	if (kcpuset_isset(cpus_running, cpu_index(ci)))
 		WRITE_REG(cpu->sb1cpu_imr_base + R_IMR_MAILBOX_SET_CPU, mbox_mask);
 
 	return 0;

CVS commit: src/sys/arch/sbmips/sbmips

[Andrius Varanavicius]

Module Name:src
Committed By:   andvar
Date:   Tue Dec  5 19:19:26 UTC 2023

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c sb1250_icu.c

Log Message:
use kcpuset_isset() and pass second (NULL) argument to mips_fixup_exceptions()
to fix build for GENERIC(64).MP kernel configs.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.14 -r1.15 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.

CVS commit: src/sys/arch/sbmips/sbmips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 21 17:02:15 UTC 2016

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c rtc.c sb1250_icu.c

Log Message:
make this compile.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.13 -r1.14 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/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.22 src/sys/arch/sbmips/sbmips/cpu.c:1.23
--- src/sys/arch/sbmips/sbmips/cpu.c:1.22	Mon Mar 24 15:13:48 2014
+++ src/sys/arch/sbmips/sbmips/cpu.c	Thu Jul 21 13:02:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $ */
+/* $NetBSD: cpu.c,v 1.23 2016/07/21 17:02:15 christos Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.23 2016/07/21 17:02:15 christos Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22
 #include 
 #include 
 
-#define	READ_REG(rp)		(mips3_ld((volatile uint64_t *)(rp)))
+#define	READ_REG(rp)		mips3_ld((register_t)(rp))
 
 static int	cpu_match(device_t, cfdata_t, void *);
 static void	cpu_attach(device_t, device_t, void *);

Index: src/sys/arch/sbmips/sbmips/rtc.c
diff -u src/sys/arch/sbmips/sbmips/rtc.c:1.20 src/sys/arch/sbmips/sbmips/rtc.c:1.21
--- src/sys/arch/sbmips/sbmips/rtc.c:1.20	Thu Nov 20 11:34:25 2014
+++ src/sys/arch/sbmips/sbmips/rtc.c	Thu Jul 21 13:02:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.20 2014/11/20 16:34:25 christos Exp $ */
+/* $NetBSD: rtc.c,v 1.21 2016/07/21 17:02:15 christos Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.20 2014/11/20 16:34:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.21 2016/07/21 17:02:15 christos Exp $");
 
 #include 
 #include 
@@ -417,8 +417,8 @@ return;	/* XXX XXX */
 #include 
 #include 
 
-#define	READ_REG(rp)		(mips3_ld((volatile uint64_t *)(MIPS_PHYS_TO_KSEG1(rp
-#define	WRITE_REG(rp, val)	(mips3_sd((volatile uint64_t *)(MIPS_PHYS_TO_KSEG1(rp)), (val)))
+#define	READ_REG(rp)		mips3_ld((register_t)(MIPS_PHYS_TO_KSEG1(rp)))
+#define	WRITE_REG(rp, val)	mips3_sd((register_t)(MIPS_PHYS_TO_KSEG1(rp)), (val))
 
 static void
 time_smbus_init(int chan)

Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.14
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13	Sat Jul  9 12:59:40 2011
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c	Thu Jul 21 13:02:15 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sb1250_icu.c,v 1.13 2011/07/09 16:59:40 matt Exp $ */
+/* $NetBSD: sb1250_icu.c,v 1.14 2016/07/21 17:02:15 christos Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.13 2011/07/09 16:59:40 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb1250_icu.c,v 1.14 2016/07/21 17:02:15 christos Exp $");
 
 #define	__INTR_PRIVATE
 
@@ -90,8 +90,8 @@ static void sb1250_ipi_intr(void *, uint
 #endif
 #define	SB1250_I_MAP(x)		(R_IMR_INTERRUPT_MAP_BASE + (x) * 8)
 
-#define	READ_REG(rp)		(mips3_ld((volatile uint64_t *)(rp)))
-#define	WRITE_REG(rp, val)	(mips3_sd((volatile uint64_t *)(rp), (val)))
+#define	READ_REG(rp)		mips3_ld((register_t)(rp))
+#define	WRITE_REG(rp, val)	mips3_sd((register_t)(rp), (val))
 
 static void	sb1250_cpu_intr(int, vaddr_t, uint32_t);
 static void	*sb1250_intr_establish(u_int, u_int,

CVS commit: src/sys/arch/sbmips/sbmips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Jul 21 17:02:15 UTC 2016

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c rtc.c sb1250_icu.c

Log Message:
make this compile.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.13 -r1.14 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.

CVS commit: src/sys/arch/sbmips/sbmips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 24 19:13:48 UTC 2014

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c

Log Message:
- fix unused
- use cpu_{g,s}etmodel


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sbmips/sbmips/machdep.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/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.21 src/sys/arch/sbmips/sbmips/cpu.c:1.22
--- src/sys/arch/sbmips/sbmips/cpu.c:1.21	Sat Jul  9 12:59:40 2011
+++ src/sys/arch/sbmips/sbmips/cpu.c	Mon Mar 24 15:13:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.22 2014/03/24 19:13:48 christos Exp $);
 
 #include opt_multiprocessor.h
 
@@ -94,6 +94,7 @@ cpu_attach(device_t parent, device_t sel
 
 	/* XXX this code must run on the target CPU */
 	config = mips3_cp0_config_read();
+	__USE(config);
 	KASSERT((config  MIPS3_CONFIG_K0_MASK) == 5);
 
 	/* Determine CPU frequency */

Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.52 src/sys/arch/sbmips/sbmips/machdep.c:1.53
--- src/sys/arch/sbmips/sbmips/machdep.c:1.52	Sat Jul 28 19:09:50 2012
+++ src/sys/arch/sbmips/sbmips/machdep.c	Mon Mar 24 15:13:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.52 2012/07/28 23:09:50 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.53 2014/03/24 19:13:48 christos Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.52 2012/07/28 23:09:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.53 2014/03/24 19:13:48 christos Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -212,7 +212,7 @@ mach_init(long fwhandle, long magic, lon
 	(u_int)fwhandle, (u_int)magic, (u_int)bootdata, (u_int)reserved);
 #endif
 
-	strcpy(cpu_model, sb1250);
+	cpu_setmodel(sb1250);
 
 	if (magic == BOOTINFO_MAGIC) {
 		int idx;

CVS commit: src/sys/arch/sbmips/sbmips

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Mar 24 19:13:48 UTC 2014

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c

Log Message:
- fix unused
- use cpu_{g,s}etmodel


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/sbmips/sbmips/machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/sbmips/sbmips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Jul  9 16:59:40 UTC 2011

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c rtc.c sb1250_icu.c
systemsw.c

Log Message:
cleanup machine includes


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sbmips/sbmips/systemsw.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/sbmips/cpu.c
diff -u src/sys/arch/sbmips/sbmips/cpu.c:1.20 src/sys/arch/sbmips/sbmips/cpu.c:1.21
--- src/sys/arch/sbmips/sbmips/cpu.c:1.20	Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/cpu.c	Sat Jul  9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.20 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,21 +33,20 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.20 2011/02/20 07:47:38 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.21 2011/07/09 16:59:40 matt Exp $);
 
 #include opt_multiprocessor.h
 
 #include sys/param.h
+#include sys/cpu.h
 #include sys/device.h
 #include sys/kernel.h
 #include sys/systm.h
-#include sys/cpu.h
 
 #include mips/locore.h
 #include mips/cache.h
 
-#include machine/cpu.h
-#include machine/cpuvar.h
+#include sbmips/cpuvar.h
 
 #include mips/sibyte/include/zbbusvar.h
 #include mips/sibyte/include/sb1250_regs.h

Index: src/sys/arch/sbmips/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.49 src/sys/arch/sbmips/sbmips/machdep.c:1.50
--- src/sys/arch/sbmips/sbmips/machdep.c:1.49	Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/machdep.c	Sat Jul  9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.49 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.50 2011/07/09 16:59:40 matt Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -58,54 +58,55 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.49 2011/02/20 07:47:38 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.50 2011/07/09 16:59:40 matt Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
 #include opt_modular.h
 
 #include sys/param.h
-#include sys/systm.h
-#include sys/kernel.h
-#include sys/proc.h
 #include sys/buf.h
-#include sys/reboot.h
 #include sys/conf.h
+#include sys/cpu.h
+#include sys/device.h
+#include sys/exec.h
 #include sys/file.h
+#include sys/intr.h
+#include sys/kcore.h
+#include sys/kernel.h
+#include sys/ksyms.h
 #include sys/malloc.h
 #include sys/mbuf.h
-#include sys/msgbuf.h
-#include sys/device.h
-#include sys/exec.h
 #include sys/mount.h
+#include sys/msgbuf.h
+#include sys/proc.h
+#include sys/reboot.h
 #include sys/syscallargs.h
-#include sys/kcore.h
-#include sys/ksyms.h
+#include sys/systm.h
 
 #include uvm/uvm_extern.h
 
-#include machine/cpu.h
-#include machine/reg.h
-#include machine/psl.h
-#include machine/pte.h
-#include machine/autoconf.h
-#include machine/intr.h
-#include machine/swarm.h
 #include mips/locore.h
+#include mips/psl.h
+#include mips/pte.h
+#include mips/reg.h
 
 #include mips/cfe/cfe_api.h
 
+#include sbmips/autoconf.h
+#include sbmips/swarm.h
+
 #if 0 /* XXXCGD */
-#include machine/nvram.h
+#include sbmips/nvram.h
 #endif /* XXXCGD */
-#include machine/leds.h
+#include sbmips/leds.h
 
 #include mips/sibyte/dev/sbbuswatchvar.h
 
 #include ksyms.h
 
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#include machine/db_machdep.h
+#include mips/db_machdep.h
 #include ddb/db_access.h
 #include ddb/db_sym.h
 #include ddb/db_extern.h

Index: src/sys/arch/sbmips/sbmips/rtc.c
diff -u src/sys/arch/sbmips/sbmips/rtc.c:1.18 src/sys/arch/sbmips/sbmips/rtc.c:1.19
--- src/sys/arch/sbmips/sbmips/rtc.c:1.18	Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/rtc.c	Sat Jul  9 16:59:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.18 2011/02/20 07:47:38 matt Exp $ */
+/* $NetBSD: rtc.c,v 1.19 2011/07/09 16:59:40 matt Exp $ */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.18 2011/02/20 07:47:38 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: rtc.c,v 1.19 2011/07/09 16:59:40 matt Exp $);
 
 #include sys/param.h
 #include sys/device.h
@@ -46,8 +46,8 @@
 
 #include dev/clock_subr.h
 
-#include machine/swarm.h
-#include machine/systemsw.h
+#include sbmips/swarm.h
+#include sbmips/systemsw.h
 
 #include mips/locore.h
 #include mips/sibyte/dev/sbsmbusvar.h

Index: src/sys/arch/sbmips/sbmips/sb1250_icu.c
diff -u src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.12 src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.13
--- src/sys/arch/sbmips/sbmips/sb1250_icu.c:1.12	Sun Feb 20 07:47:38 2011
+++ src/sys/arch/sbmips/sbmips/sb1250_icu.c	

CVS commit: src/sys/arch/sbmips/sbmips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Sat Jul  9 16:59:40 UTC 2011

Modified Files:
src/sys/arch/sbmips/sbmips: cpu.c machdep.c rtc.c sb1250_icu.c
systemsw.c

Log Message:
cleanup machine includes


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sbmips/sbmips/cpu.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/sbmips/sbmips/machdep.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sbmips/sbmips/rtc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sbmips/sbmips/sb1250_icu.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sbmips/sbmips/systemsw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/sbmips/sbmips

[Matt Thomas]

Module Name:src
Committed By:   matt
Date:   Wed Dec 16 19:02:03 UTC 2009

Modified Files:
src/sys/arch/sbmips/sbmips: machdep.c

Log Message:
Remove unneeded variables.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sbmips/sbmips/machdep.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/sbmips/machdep.c
diff -u src/sys/arch/sbmips/sbmips/machdep.c:1.45 src/sys/arch/sbmips/sbmips/machdep.c:1.46
--- src/sys/arch/sbmips/sbmips/machdep.c:1.45	Fri Nov 27 03:23:13 2009
+++ src/sys/arch/sbmips/sbmips/machdep.c	Wed Dec 16 19:02:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.45 2009/11/27 03:23:13 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.46 2009/12/16 19:02:03 matt Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -58,7 +58,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.45 2009/11/27 03:23:13 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.46 2009/12/16 19:02:03 matt Exp $);
 
 #include opt_ddb.h
 #include opt_execfmt.h
@@ -158,9 +158,7 @@
 {
 	void *kernend;
 	u_long first, last;
-	struct pcb *pcb0;
 	extern char edata[], end[];
-	vaddr_t v;
 	int i;
 	uint32_t config;
 
@@ -317,18 +315,12 @@
 	 */
 	mips_init_msgbuf();
 
+	pmap_bootstrap();
+
 	/*
 	 * Allocate uarea for lwp0 and set it.
 	 */
-	v = pmap_steal_memory(USPACE, NULL, NULL);
-	uvm_lwp_setuarea(lwp0, v);
-
-	pcb0 = lwp_getpcb(lwp0);
-	pcb0-pcb_context[11] = MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
-
-	lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
-
-	pmap_bootstrap();
+	mips_init_lwp0_uarea();
 
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.

CVS commit: src/sys/arch/sbmips/sbmips

[Simon Burge]

Module Name:src
Committed By:   simonb
Date:   Tue Aug 11 12:38:24 UTC 2009

Modified Files:
src/sys/arch/sbmips/sbmips: console.c

Log Message:
Allow console speed to be overriden with options CONSPEED=xxx.
Default to 115200 (original hard-coded value).


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sbmips/sbmips/console.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/sbmips/console.c
diff -u src/sys/arch/sbmips/sbmips/console.c:1.5 src/sys/arch/sbmips/sbmips/console.c:1.6
--- src/sys/arch/sbmips/sbmips/console.c:1.5	Sun Dec 11 12:18:51 2005
+++ src/sys/arch/sbmips/sbmips/console.c	Tue Aug 11 12:38:24 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: console.c,v 1.5 2005/12/11 12:18:51 christos Exp $ */
+/* $NetBSD: console.c,v 1.6 2009/08/11 12:38:24 simonb Exp $ */
 
 /*
  * Copyright 2000, 2001
@@ -33,7 +33,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: console.c,v 1.5 2005/12/11 12:18:51 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: console.c,v 1.6 2009/08/11 12:38:24 simonb Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -47,17 +47,20 @@
 #include mips/sibyte/dev/sbscnvar.h
 
 #define	CONMODE ((TTYDEF_CFLAG  ~(CSIZE | CSTOPB | PARENB)) | CS8) /* 8N1 */
+#ifndef CONSPEED
+#define	CONSPEED	115200
+#endif
 
 void
 consinit(void)
 {
 
 #ifdef JTAGCONSOLE
-	sbjcn_cnattach(0x1001FF80, 0, 115200, CONMODE);
+	sbjcn_cnattach(0x1001FF80, 0, CONSPEED, CONMODE);
 #else
-	sbscn_cnattach(0x10060100, 0, 115200, CONMODE);
+	sbscn_cnattach(0x10060100, 0, CONSPEED, CONMODE);
 #ifdef KGDB
-	sbscn_kgdb_attach(0x10060100, 1, 115200, CONMODE);
+	sbscn_kgdb_attach(0x10060100, 1, CONSPEED, CONMODE);
 #endif
 #endif
 }