From owner-svn-src-all@FreeBSD.ORG Wed Oct 23 14:34:05 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 0587233F; Wed, 23 Oct 2013 14:34:05 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E58A02415; Wed, 23 Oct 2013 14:34:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NEY4RZ009700; Wed, 23 Oct 2013 14:34:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NEY4wn009699; Wed, 23 Oct 2013 14:34:04 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201310231434.r9NEY4wn009699@svn.freebsd.org> From: Nathan Whitehorn Date: Wed, 23 Oct 2013 14:34:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256974 - head/sys/powerpc/booke X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 23 Oct 2013 14:34:05 -0000 Author: nwhitehorn Date: Wed Oct 23 14:34:04 2013 New Revision: 256974 URL: http://svnweb.freebsd.org/changeset/base/256974 Log: A quick addendum: the standard says that timebase-frequency can be either 32 or 64 bits, so allow either. Modified: head/sys/powerpc/booke/platform_bare.c Modified: head/sys/powerpc/booke/platform_bare.c ============================================================================== --- head/sys/powerpc/booke/platform_bare.c Wed Oct 23 14:28:59 2013 (r256973) +++ head/sys/powerpc/booke/platform_bare.c Wed Oct 23 14:34:04 2013 (r256974) @@ -188,9 +188,24 @@ bare_timebase_freq(platform_t plat, stru if ((child = OF_child(cpus)) == 0) goto out; - if (OF_getprop(child, "timebase-frequency", (void *)&ticks, - sizeof(ticks)) == sizeof(ticks)) - goto out; + switch (OF_getproplen(child, "timebase-frequency")) { + case 4: + { + uint32_t tbase; + OF_getprop(child, "timebase-frequency", &tbase, sizeof(tbase)); + ticks = tbase; + return (ticks); + } + case 8: + { + uint64_t tbase; + OF_getprop(child, "timebase-frequency", &tbase, sizeof(tbase)); + ticks = tbase; + return (ticks); + } + default: + break; + } freq = 0; if (OF_getprop(child, "bus-frequency", (void *)&freq,