From owner-p4-projects@FreeBSD.ORG Wed Mar 1 08:06:03 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F2F316A423; Wed, 1 Mar 2006 08:06:03 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A579416A420 for ; Wed, 1 Mar 2006 08:06:02 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7044243D48 for ; Wed, 1 Mar 2006 08:06:02 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k21862Mg008501 for ; Wed, 1 Mar 2006 08:06:02 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k21862MR008495 for perforce@freebsd.org; Wed, 1 Mar 2006 08:06:02 GMT (envelope-from kmacy@freebsd.org) Date: Wed, 1 Mar 2006 08:06:02 GMT Message-Id: <200603010806.k21862MR008495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 92586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Mar 2006 08:06:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=92586 Change 92586 by kmacy@kmacy_storage:sun4v_work on 2006/03/01 08:05:52 move tick_init to after console initialization Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#8 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#8 (text+ko) ==== @@ -108,6 +108,7 @@ #include #include #include +#include typedef int ofw_vec_t(void *); @@ -215,7 +216,11 @@ if (bootverbose) printf("machine: %s\n", sparc64_model); +#ifdef notyet cpu_identify(rdpr(ver), tick_freq, PCPU_GET(cpuid)); +#else + printf("\tUltraSparc T1\n"); +#endif } void @@ -285,7 +290,6 @@ * Initialize Open Firmware (needed for console). */ OF_init(vec); - /* * Parse metadata if present and fetch parameters. Must be before the * console is inited so cninit gets the right value of boothowto. @@ -314,13 +318,16 @@ } OF_getprop(child, "clock-frequency", &clock, sizeof(clock)); - tick_init(clock); + + + /* * Initialize the console before printing anything. */ cninit(); + tick_init(clock); /* * Panic is there is no metadata. Most likely the kernel was booted * directly, instead of through loader(8). @@ -409,15 +416,13 @@ /* * Initialize the message buffer (after setting trap table). */ +#if 0 + printf("msgbuf_init\n"); msgbufinit(msgbufp, MSGBUF_SIZE); +#endif mutex_init(); - /* - * Finish pmap initialization now that we're ready for mutexes. - */ - PMAP_LOCK_INIT(kernel_pmap); - OF_getprop(root, "name", sparc64_model, sizeof(sparc64_model) - 1); kdb_init();