From owner-svn-src-head@FreeBSD.ORG  Mon Jan 19 11:06:57 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 31499BEE;
 Mon, 19 Jan 2015 11:06:57 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1DAACA99;
 Mon, 19 Jan 2015 11:06:57 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0JB6uOD054008;
 Mon, 19 Jan 2015 11:06:56 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0JB6u4L054007;
 Mon, 19 Jan 2015 11:06:56 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201501191106.t0JB6u4L054007@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 19 Jan 2015 11:06:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277378 - head/sys/dev/ofw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2015 11:06:57 -0000

Author: andrew
Date: Mon Jan 19 11:06:56 2015
New Revision: 277378
URL: https://svnweb.freebsd.org/changeset/base/277378

Log:
  Make the clock-frequency property optional as it may not be present on FDT
  systems.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/ofw/ofw_cpu.c

Modified: head/sys/dev/ofw/ofw_cpu.c
==============================================================================
--- head/sys/dev/ofw/ofw_cpu.c	Mon Jan 19 11:02:23 2015	(r277377)
+++ head/sys/dev/ofw/ofw_cpu.c	Mon Jan 19 11:06:56 2015	(r277378)
@@ -1,7 +1,11 @@
 /*-
  * Copyright (C) 2009 Nathan Whitehorn
+ * Copyright (C) 2015 The FreeBSD Foundation
  * All rights reserved.
  *
+ * Portions of this software were developed by Andrew Turner
+ * under sponsorship from the FreeBSD Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -193,10 +197,11 @@ ofw_cpu_attach(device_t dev)
 	}
 	sc->sc_cpu_pcpu = pcpu_find(cell);
 	if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) < 0) {
-		device_printf(dev, "missing 'clock-frequency' property\n");
-		return (ENXIO);
-	}
-	sc->sc_nominal_mhz = cell / 1000000; /* convert to MHz */
+		if (bootverbose)
+			device_printf(dev,
+			    "missing 'clock-frequency' property\n");
+	} else
+		sc->sc_nominal_mhz = cell / 1000000; /* convert to MHz */
 
 	bus_generic_probe(dev);
 	return (bus_generic_attach(dev));
@@ -214,8 +219,11 @@ ofw_cpu_read_ivar(device_t dev, device_t
 		*result = (uintptr_t)sc->sc_cpu_pcpu;
 		return (0);
 	case CPU_IVAR_NOMINAL_MHZ:
-		*result = (uintptr_t)sc->sc_nominal_mhz;
-		return (0);
+		if (sc->sc_nominal_mhz > 0) {
+			*result = (uintptr_t)sc->sc_nominal_mhz;
+			return (0);
+		}
+		break;
 	}
 
 	return (ENOENT);