CVS commit: src/sys/arch/arm/mainbus

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Thu Jun  5 03:46:26 UTC 2014

Modified Files:
        src/sys/arch/arm/mainbus: cpu_mainbus.c mainbus.c

Log Message:
Cleanup a few MULTIPROCESSOR issues.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/mainbus/cpu_mainbus.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/mainbus/mainbus.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/arm/mainbus/cpu_mainbus.c
diff -u src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14 src/sys/arch/arm/mainbus/cpu_mainbus.c:1.15
--- src/sys/arch/arm/mainbus/cpu_mainbus.c:1.14	Fri Mar 28 21:43:01 2014
+++ src/sys/arch/arm/mainbus/cpu_mainbus.c	Thu Jun  5 03:46:26 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $	*/
+/*	$NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $	*/
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -44,7 +44,7 @@
 #include "locators.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.14 2014/03/28 21:43:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_mainbus.c,v 1.15 2014/06/05 03:46:26 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,24 +79,31 @@ cpu_mainbus_match(device_t parent, cfdat
 	int id = mb->mb_core;
 
 	if (id != MAINBUSCF_CORE_DEFAULT) {
-		if (id >= arm_cpu_max || kcpuset_isset(kcpuset_attached, id))
+		if (id == 0)
+			return cpu_info_store.ci_dev == NULL;
+		if (id >= arm_cpu_max)
 			return 0;
-		if (id == 0 && cpu_info_store.ci_dev != NULL)
+#ifdef MULTIPROCESSOR
+		if (cpu_info[id] != NULL)
 			return 0;
+#endif
+		return 1;
+	}
+
+	if (cpu_info_store.ci_dev == NULL) {
+		mb->mb_core = 0;
 		return 1;
 	}
 
-	for (id = 0; id < arm_cpu_max; id++) {
 #ifdef MULTIPROCESSOR
-		if (cpu_info[id] != NULL && cpu_info[id]->ci_dev != NULL)
+	for (id = 1; id < arm_cpu_max; id++) {
+		if (cpu_info[id] != NULL)
 			continue;
-#else
-		if (id != 0 || cpu_info_store.ci_dev != NULL)
-			continue;
-#endif
 		mb->mb_core = id;
 		return 1;
 	}
+#endif
+
 	return 0;
 }
 

Index: src/sys/arch/arm/mainbus/mainbus.c
diff -u src/sys/arch/arm/mainbus/mainbus.c:1.20 src/sys/arch/arm/mainbus/mainbus.c:1.21
--- src/sys/arch/arm/mainbus/mainbus.c:1.20	Wed Aug 29 23:16:35 2012
+++ src/sys/arch/arm/mainbus/mainbus.c	Thu Jun  5 03:46:26 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.20 2012/08/29 23:16:35 matt Exp $ */
+/* $NetBSD: mainbus.c,v 1.21 2014/06/05 03:46:26 matt Exp $ */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.20 2012/08/29 23:16:35 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.21 2014/06/05 03:46:26 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -151,7 +151,9 @@ mainbussearch(device_t parent, cfdata_t 
 		tryagain = 0;
 		if (config_match(parent, cf, &mb) > 0) {
 			config_attach(parent, cf, &mb, mainbusprint);
-/*			tryagain = (cf->cf_fstate == FSTATE_STAR);*/
+#ifdef MULTIPROCESSOR
+			tryagain = (cf->cf_fstate == FSTATE_STAR);
+#endif
 		}
 	} while (tryagain);