From owner-svn-src-all@FreeBSD.ORG Mon Jan 17 23:03:09 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B5889106566B; Mon, 17 Jan 2011 23:03:09 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8AE768FC0C; Mon, 17 Jan 2011 23:03:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0HN39AV015865; Mon, 17 Jan 2011 23:03:09 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0HN395k015863; Mon, 17 Jan 2011 23:03:09 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201101172303.p0HN395k015863@svn.freebsd.org> From: Warner Losh Date: Mon, 17 Jan 2011 23:03:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r217518 - head/sys/mips/cavium X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jan 2011 23:03:09 -0000 Author: imp Date: Mon Jan 17 23:03:09 2011 New Revision: 217518 URL: http://svn.freebsd.org/changeset/base/217518 Log: Save the CPU model, the board and the CPU clock rate so they are reported by the approrpiate sysctl. Modified: head/sys/mips/cavium/octeon_machdep.c Modified: head/sys/mips/cavium/octeon_machdep.c ============================================================================== --- head/sys/mips/cavium/octeon_machdep.c Mon Jan 17 23:00:23 2011 (r217517) +++ head/sys/mips/cavium/octeon_machdep.c Mon Jan 17 23:03:09 2011 (r217518) @@ -92,6 +92,8 @@ struct octeon_feature_description { extern int *edata; extern int *end; +extern char cpu_model[]; +extern char cpu_board[]; static const struct octeon_feature_description octeon_feature_descriptions[] = { { OCTEON_FEATURE_SAAD, "SAAD" }, @@ -384,14 +386,12 @@ platform_start(__register_t a0, __regist if (boothowto & RB_KDB) kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger"); #endif - platform_counter_freq = cvmx_sysinfo_get()->cpu_clock_hz; - - octeon_timecounter.tc_frequency = cvmx_sysinfo_get()->cpu_clock_hz; + cpu_clock = cvmx_sysinfo_get()->cpu_clock_hz; + platform_counter_freq = cpu_clock; + octeon_timecounter.tc_frequency = cpu_clock; platform_timecounter = &octeon_timecounter; - mips_timer_init_params(platform_counter_freq, 0); - - set_cputicker(octeon_get_ticks, cvmx_sysinfo_get()->cpu_clock_hz, 0); + set_cputicker(octeon_get_ticks, cpu_clock, 0); #ifdef SMP /* @@ -610,13 +610,20 @@ octeon_boot_params_init(register_t ptr) octeon_bootinfo->mac_addr_count); #if defined(OCTEON_BOARD_CAPK_0100ND) - if (cvmx_sysinfo_get()->board_type != CVMX_BOARD_TYPE_CN3010_EVB_HS5) + strcpy(cpu_board, "CAPK-0100ND"); + if (cvmx_sysinfo_get()->board_type != CVMX_BOARD_TYPE_CN3010_EVB_HS5) { printf("Compiled for CAPK-0100ND, but board type is %s\n", cvmx_board_type_to_string(cvmx_sysinfo_get()->board_type)); + strcat(cpu_board, " hardwired, but type is "); + strcat(cpu_board, + cvmx_board_type_to_string(cvmx_sysinfo_get()->board_type)); + } #else - printf("Board: %s\n", + strcpy(cpu_board, cvmx_board_type_to_string(cvmx_sysinfo_get()->board_type)); + printf("Board: %s\n", cpu_board); #endif - printf("Model: %s\n", octeon_model_get_string(cvmx_get_proc_id())); + strcpy(cpu_model, octeon_model_get_string(cvmx_get_proc_id())); + printf("Model: %s\n", cpu_model); } /* impEND: This stuff should move back into the Cavium SDK */