Module Name: src Committed By: jakllsch Date: Sat Jun 9 01:17:35 UTC 2018
Modified Files: src/sys/arch/arm/cortex: gtmr.c Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/cortex/gtmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/cortex/gtmr.c diff -u src/sys/arch/arm/cortex/gtmr.c:1.28 src/sys/arch/arm/cortex/gtmr.c:1.29 --- src/sys/arch/arm/cortex/gtmr.c:1.28 Mon May 21 10:28:13 2018 +++ src/sys/arch/arm/cortex/gtmr.c Sat Jun 9 01:17:35 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: gtmr.c,v 1.28 2018/05/21 10:28:13 jmcneill Exp $ */ +/* $NetBSD: gtmr.c,v 1.29 2018/06/09 01:17:35 jakllsch Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.28 2018/05/21 10:28:13 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.29 2018/06/09 01:17:35 jakllsch Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -206,7 +206,6 @@ gtmr_attach(device_t parent, device_t se /* Disable the timer until we are ready */ gtmr_cntv_ctl_write(0); - gtmr_cntp_ctl_write(0); } void @@ -222,7 +221,6 @@ gtmr_init_cpu_clock(struct cpu_info *ci) * enable timer and stop masking the timer. */ gtmr_cntv_ctl_write(CNTCTL_ENABLE); - gtmr_cntp_ctl_write(CNTCTL_ENABLE); /* * Get now and update the compare timer.