[src/trunk]: src/sys/arch Modify around cpu_identify() to not to break the dm...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/af624d2b84cd
branches:  trunk
changeset: 334824:af624d2b84cd
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Dec 08 15:22:47 2014 +0000

description:
Modify around cpu_identify() to not to break the dmesg of cpus with AB_VERBOSE
or AB_DEBUG.

diffstat:

 sys/arch/x86/x86/cpu.c      |  7 +++----
 sys/arch/x86/x86/identcpu.c |  8 ++++----
 sys/arch/xen/x86/cpu.c      |  9 ++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diffs (120 lines):

diff -r c44d00cd648f -r af624d2b84cd sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c    Mon Dec 08 10:48:22 2014 +0000
+++ b/sys/arch/x86/x86/cpu.c    Mon Dec 08 15:22:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.111 2014/05/12 11:56:02 joerg Exp $  */
+/*     $NetBSD: cpu.c,v 1.112 2014/12/08 15:22:47 msaitoh Exp $        */
 
 /*-
  * Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.111 2014/05/12 11:56:02 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.112 2014/12/08 15:22:47 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_mpbios.h"                /* for MPDEBUG */
@@ -357,6 +357,7 @@
        ci->ci_acpiid = caa->cpu_id;
        ci->ci_cpuid = caa->cpu_number;
        ci->ci_func = caa->cpu_func;
+       aprint_normal("\n");
 
        /* Must be before mi_cpu_attach(). */
        cpu_vm_init(ci);
@@ -366,7 +367,6 @@
 
                error = mi_cpu_attach(ci);
                if (error != 0) {
-                       aprint_normal("\n");
                        aprint_error_dev(self,
                            "mi_cpu_attach failed with %d\n", error);
                        return;
@@ -446,7 +446,6 @@
 #endif
 
        default:
-               aprint_normal("\n");
                panic("unknown processor type??\n");
        }
 
diff -r c44d00cd648f -r af624d2b84cd sys/arch/x86/x86/identcpu.c
--- a/sys/arch/x86/x86/identcpu.c       Mon Dec 08 10:48:22 2014 +0000
+++ b/sys/arch/x86/x86/identcpu.c       Mon Dec 08 15:22:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: identcpu.c,v 1.47 2014/10/28 17:44:47 riz Exp $        */
+/*     $NetBSD: identcpu.c,v 1.48 2014/12/08 15:22:47 msaitoh Exp $    */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.47 2014/10/28 17:44:47 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.48 2014/12/08 15:22:47 msaitoh Exp $");
 
 #include "opt_xen.h"
 
@@ -910,9 +910,9 @@
        cpu_setmodel("%s %d86-class",
            cpu_vendor_names[cpu_vendor], cpu_class + 3);
        if (cpu_brand_string[0] != '\0') {
-               aprint_normal(": %s", cpu_brand_string);
+               aprint_normal_dev(ci->ci_dev, "%s", cpu_brand_string);
        } else {
-               aprint_normal(": %s", cpu_getmodel());
+               aprint_normal_dev(ci->ci_dev, "%s", cpu_getmodel());
                if (ci->ci_data.cpu_cc_freq != 0)
                        aprint_normal(", %dMHz",
                            (int)(ci->ci_data.cpu_cc_freq / 1000000));
diff -r c44d00cd648f -r af624d2b84cd sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Mon Dec 08 10:48:22 2014 +0000
+++ b/sys/arch/xen/x86/cpu.c    Mon Dec 08 15:22:47 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.100 2014/11/27 16:29:44 bouyer Exp $ */
+/*     $NetBSD: cpu.c,v 1.101 2014/12/08 15:22:47 msaitoh Exp $        */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.100 2014/11/27 16:29:44 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.101 2014/12/08 15:22:47 msaitoh Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -403,6 +403,7 @@
 
        KASSERT(ci->ci_func == 0);
        ci->ci_func = caa->cpu_func;
+       aprint_normal("\n");
 
        /* Must be called before mi_cpu_attach(). */
        cpu_vm_init(ci);
@@ -414,7 +415,6 @@
 
                KASSERT(ci->ci_data.cpu_idlelwp != NULL);
                if (error != 0) {
-                       aprint_normal("\n");
                        aprint_error_dev(self,
                            "mi_cpu_attach failed with %d\n", error);
                        return;
@@ -501,12 +501,11 @@
                        tmp->ci_next = ci;
                }
 #else
-               aprint_error(": not started\n");
+               aprint_error_dev(ci->ci_dev, "not started\n");
 #endif
                break;
 
        default:
-               aprint_normal("\n");
                panic("unknown processor type??\n");
        }