Sat Jun 9 01:17:35 2018 UTC ()
Avoid unnecessarily touching CNTP_CTL.

We may not have the privilege of accessing CNTP_CTL if running as a
virtualized guest, and we're not using the Physical Timer for interupt
generation anyway.


(jakllsch)
diff -r1.28 -r1.29 src/sys/arch/arm/cortex/gtmr.c
cvs diff -r1.28 -r1.29 src/sys/arch/arm/cortex/gtmr.c (expand / switch to unified diff)

--- src/sys/arch/arm/cortex/gtmr.c 2018/05/21 10:28:13 1.28
+++ src/sys/arch/arm/cortex/gtmr.c 2018/06/09 01:17:35 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gtmr.c,v 1.28 2018/05/21 10:28:13 jmcneill Exp $ */ 1/* $NetBSD: gtmr.c,v 1.29 2018/06/09 01:17:35 jakllsch 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.28 2018/05/21 10:28:13 jmcneill Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.29 2018/06/09 01:17:35 jakllsch 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
@@ -196,43 +196,41 @@ gtmr_attach(device_t parent, device_t se @@ -196,43 +196,41 @@ gtmr_attach(device_t parent, device_t se
196 aprint_verbose_dev(self, 196 aprint_verbose_dev(self,
197 "cp15 CNT_FRQ (%u) differs from supplied frequency\n", 197 "cp15 CNT_FRQ (%u) differs from supplied frequency\n",
198 cnt_frq); 198 cnt_frq);
199 } 199 }
200 200
201 gtmr_timecounter.tc_name = device_xname(sc->sc_dev); 201 gtmr_timecounter.tc_name = device_xname(sc->sc_dev);
202 gtmr_timecounter.tc_frequency = sc->sc_freq; 202 gtmr_timecounter.tc_frequency = sc->sc_freq;
203 gtmr_timecounter.tc_priv = sc; 203 gtmr_timecounter.tc_priv = sc;
204 204
205 tc_init(&gtmr_timecounter); 205 tc_init(&gtmr_timecounter);
206 206
207 /* Disable the timer until we are ready */ 207 /* Disable the timer until we are ready */
208 gtmr_cntv_ctl_write(0); 208 gtmr_cntv_ctl_write(0);
209 gtmr_cntp_ctl_write(0); 
210} 209}
211 210
212void 211void
213gtmr_init_cpu_clock(struct cpu_info *ci) 212gtmr_init_cpu_clock(struct cpu_info *ci)
214{ 213{
215 struct gtmr_softc * const sc = &gtmr_sc; 214 struct gtmr_softc * const sc = &gtmr_sc;
216 215
217 KASSERT(ci == curcpu()); 216 KASSERT(ci == curcpu());
218 217
219 int s = splsched(); 218 int s = splsched();
220 219
221 /* 220 /*
222 * enable timer and stop masking the timer. 221 * enable timer and stop masking the timer.
223 */ 222 */
224 gtmr_cntv_ctl_write(CNTCTL_ENABLE); 223 gtmr_cntv_ctl_write(CNTCTL_ENABLE);
225 gtmr_cntp_ctl_write(CNTCTL_ENABLE); 
226 224
227 /* 225 /*
228 * Get now and update the compare timer. 226 * Get now and update the compare timer.
229 */ 227 */
230 arm_isb(); 228 arm_isb();
231 ci->ci_lastintr = gtmr_cntvct_stable_read(sc); 229 ci->ci_lastintr = gtmr_cntvct_stable_read(sc);
232 gtmr_cntv_tval_stable_write(sc, sc->sc_autoinc); 230 gtmr_cntv_tval_stable_write(sc, sc->sc_autoinc);
233 splx(s); 231 splx(s);
234 KASSERT(gtmr_cntvct_read() != 0); 232 KASSERT(gtmr_cntvct_read() != 0);
235} 233}
236 234
237void 235void
238gtmr_cpu_initclocks(void) 236gtmr_cpu_initclocks(void)