Sun Apr 13 02:22:21 2014 UTC ()
Make sure freq is not 0.


(matt)
diff -r1.6 -r1.7 src/sys/arch/arm/cortex/gtmr.c
cvs diff -r1.6 -r1.7 src/sys/arch/arm/cortex/gtmr.c (expand / switch to unified diff)

--- src/sys/arch/arm/cortex/gtmr.c 2014/03/28 21:41:46 1.6
+++ src/sys/arch/arm/cortex/gtmr.c 2014/04/13 02:22:21 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gtmr.c,v 1.6 2014/03/28 21:41:46 matt Exp $ */ 1/* $NetBSD: gtmr.c,v 1.7 2014/04/13 02:22:21 matt Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2012 The NetBSD Foundation, Inc. 4 * Copyright (c) 2012 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Matt Thomas 8 * by Matt Thomas
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.6 2014/03/28 21:41:46 matt Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.7 2014/04/13 02:22:21 matt Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36#include <sys/bus.h> 36#include <sys/bus.h>
37#include <sys/device.h> 37#include <sys/device.h>
38#include <sys/intr.h> 38#include <sys/intr.h>
39#include <sys/kernel.h> 39#include <sys/kernel.h>
40#include <sys/percpu.h> 40#include <sys/percpu.h>
41#include <sys/proc.h> 41#include <sys/proc.h>
42#include <sys/systm.h> 42#include <sys/systm.h>
43#include <sys/timetc.h> 43#include <sys/timetc.h>
44 44
45#include <prop/proplib.h> 45#include <prop/proplib.h>
46 46
@@ -93,26 +93,27 @@ gtmr_match(device_t parent, cfdata_t cf, @@ -93,26 +93,27 @@ gtmr_match(device_t parent, cfdata_t cf,
93} 93}
94 94
95static void 95static void
96gtmr_attach(device_t parent, device_t self, void *aux) 96gtmr_attach(device_t parent, device_t self, void *aux)
97{ 97{
98 struct gtmr_softc *sc = &gtmr_sc; 98 struct gtmr_softc *sc = &gtmr_sc;
99 prop_dictionary_t dict = device_properties(self); 99 prop_dictionary_t dict = device_properties(self);
100 char freqbuf[sizeof("X.XXX SHz")]; 100 char freqbuf[sizeof("X.XXX SHz")];
101 101
102 /* 102 /*
103 * This runs at a fixed frequency of 1 to 50MHz. 103 * This runs at a fixed frequency of 1 to 50MHz.
104 */ 104 */
105 prop_dictionary_get_uint32(dict, "frequency", &sc->sc_freq);  105 prop_dictionary_get_uint32(dict, "frequency", &sc->sc_freq);
 106 KASSERT(sc->sc_freq != 0);
106 107
107 humanize_number(freqbuf, sizeof(freqbuf), sc->sc_freq, "Hz", 1000); 108 humanize_number(freqbuf, sizeof(freqbuf), sc->sc_freq, "Hz", 1000);
108 109
109 aprint_naive("\n"); 110 aprint_naive("\n");
110 aprint_normal(": ARMv7 Generic 64-bit Timer (%s)\n", freqbuf); 111 aprint_normal(": ARMv7 Generic 64-bit Timer (%s)\n", freqbuf);
111 112
112 /* 113 /*
113 * Enable the virtual counter to be accessed from usermode. 114 * Enable the virtual counter to be accessed from usermode.
114 */ 115 */
115 armreg_cntk_ctl_write(armreg_cntk_ctl_read() | ARM_CNTKCTL_PL0VCTEN); 116 armreg_cntk_ctl_write(armreg_cntk_ctl_read() | ARM_CNTKCTL_PL0VCTEN);
116 117
117 self->dv_private = sc; 118 self->dv_private = sc;
118 sc->sc_dev = self; 119 sc->sc_dev = self;