Module Name: src
Committed By: martin
Date: Tue Jan 21 11:36:37 UTC 2020
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: cpu.c
Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #623):
sys/arch/x86/x86/cpu.c: revision 1.181
If "application processors" were skipped/disabled at boot time (due to
RB_MD1 being set), don't try to examine the featurebus info, since it
was never retrieved. Addresses kern/54815
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.171 -r1.171.2.1 src/sys/arch/x86/x86/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/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.171 src/sys/arch/x86/x86/cpu.c:1.171.2.1
--- src/sys/arch/x86/x86/cpu.c:1.171 Wed May 29 16:54:41 2019
+++ src/sys/arch/x86/x86/cpu.c Tue Jan 21 11:36:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.171 2019/05/29 16:54:41 maxv Exp $ */
+/* $NetBSD: cpu.c,v 1.171.2.1 2020/01/21 11:36:36 martin Exp $ */
/*
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.171 2019/05/29 16:54:41 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.171.2.1 2020/01/21 11:36:36 martin Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -521,6 +521,16 @@ cpu_rescan(device_t self, const char *if
struct cpufeature_attach_args cfaa;
struct cpu_info *ci = sc->sc_info;
+ /*
+ * If we booted with RB_MD1 to disable multiprocessor, the
+ * auto-configuration data still contains the additional
+ * CPUs. But their initialization was mostly bypassed
+ * during attach, so we have to make sure we don't look at
+ * their featurebus info, since it wasn't retrieved.
+ */
+ if (ci == NULL)
+ return 0;
+
memset(&cfaa, 0, sizeof(cfaa));
cfaa.ci = ci;
