From owner-p4-projects@FreeBSD.ORG  Mon Feb 15 17:27:04 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E2EEC1065670; Mon, 15 Feb 2010 17:27:03 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A79F41065672
	for <perforce@freebsd.org>; Mon, 15 Feb 2010 17:27:03 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9664F8FC20
	for <perforce@freebsd.org>; Mon, 15 Feb 2010 17:27:03 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1FHR3ls059027
	for <perforce@freebsd.org>; Mon, 15 Feb 2010 17:27:03 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1FHR389059025
	for perforce@freebsd.org; Mon, 15 Feb 2010 17:27:03 GMT
	(envelope-from raj@freebsd.org)
Date: Mon, 15 Feb 2010 17:27:03 GMT
Message-Id: <201002151727.o1FHR389059025@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174728 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Feb 2010 17:27:04 -0000

http://p4web.freebsd.org/chv.cgi?CH=174728

Change 174728 by raj@raj_fdt on 2010/02/15 17:26:17

	Retrieve bus clock data from the DT blob and not from the [now] legacy
	bootinfo.

Affected files ...

.. //depot/projects/fdt/sys/powerpc/booke/platform_bare.c#4 edit

Differences ...

==== //depot/projects/fdt/sys/powerpc/booke/platform_bare.c#4 (text+ko) ====

@@ -45,6 +45,10 @@
 #include <machine/spr.h>
 #include <machine/vmparam.h>
 
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/openfirm.h>
+
 #include <powerpc/mpc85xx/mpc85xx.h>
 
 #include "platform_if.h"
@@ -155,12 +159,24 @@
 bare_timebase_freq(platform_t plat, struct cpuref *cpuref)
 {
 	u_long ticks = -1;
+	phandle_t cpus, child;
+	pcell_t freq;
+
+	if ((cpus = OF_finddevice("/cpus")) == 0)
+		goto out;
 
+	if ((child = OF_child(cpus)) == 0)
+		goto out;
+
+	if (OF_getprop(child, "bus-frequency", (void *)&freq,
+	    sizeof(freq)) <= 0)
+		goto out;
 	/*
 	 * Time Base and Decrementer are updated every 8 CCB bus clocks.
 	 * HID0[SEL_TBCLK] = 0
 	 */
-	ticks = bootinfo->bi_bus_clk / 8;
+	ticks = freq / 8;
+out:
 	if (ticks <= 0)
 		panic("Unable to determine timebase frequency!");