Module Name: src
Committed By: jmcneill
Date: Sat Jan 17 15:04:47 UTC 2015
Modified Files:
src/sys/conf: files
Added Files:
src/sys/dev/ic: dwc_tmr.c dwc_tmr_reg.h dwc_tmr_var.h
Log Message:
Add driver for DesignWare 32-bit timer as found in Rockchip RK3066/PX2,
from FUKAUMI Naoki <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.1125 -r1.1126 src/sys/conf/files
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/dwc_tmr.c src/sys/dev/ic/dwc_tmr_reg.h \
src/sys/dev/ic/dwc_tmr_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1125 src/sys/conf/files:1.1126
--- src/sys/conf/files:1.1125 Fri Jan 16 10:36:14 2015
+++ src/sys/conf/files Sat Jan 17 15:04:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1125 2015/01/16 10:36:14 ozaki-r Exp $
+# $NetBSD: files,v 1.1126 2015/01/17 15:04:47 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20141030
@@ -1098,6 +1098,10 @@ file dev/ic/acpipmtimer.c acpipmtimer
device hpet
file dev/ic/hpet.c hpet needs-flag
+# DesignWare timer
+device dwctmr
+file dev/ic/dwc_tmr.c dwctmr
+
# SMSC LAN9118 Family Ethernet Controller
#
device smsh: arp, ether, ifnet, mii
Added files:
Index: src/sys/dev/ic/dwc_tmr.c
diff -u /dev/null src/sys/dev/ic/dwc_tmr.c:1.1
--- /dev/null Sat Jan 17 15:04:47 2015
+++ src/sys/dev/ic/dwc_tmr.c Sat Jan 17 15:04:47 2015
@@ -0,0 +1,75 @@
+/* $NetBSD: dwc_tmr.c,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: dwc_tmr.c,v 1.1 2015/01/17 15:04:47 jmcneill Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/intr.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/timetc.h>
+
+#include <dev/ic/dwc_tmr_reg.h>
+#include <dev/ic/dwc_tmr_var.h>
+
+#define TIMER_READ(sc, reg) \
+ bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
+#define TIMER_WRITE(sc, reg, val) \
+ bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
+
+static u_int dwc_tmr_get_timecount(struct timecounter *);
+
+void
+dwc_tmr_attach_subr(struct dwc_tmr_softc *sc, u_int64_t freq)
+{
+
+ TIMER_WRITE(sc, DWC_TMR_CONTROL_REG, 0);
+ TIMER_WRITE(sc, DWC_TMR_LOAD_COUNT_REG, ~0);
+ TIMER_WRITE(sc, DWC_TMR_CONTROL_REG, DWC_TMR_CONTROL_ENABLE);
+
+ sc->sc_tc.tc_get_timecount = dwc_tmr_get_timecount;
+ sc->sc_tc.tc_poll_pps = NULL;
+ sc->sc_tc.tc_counter_mask = ~0;
+ sc->sc_tc.tc_frequency = freq;
+ sc->sc_tc.tc_name = device_xname(sc->sc_dev);
+ sc->sc_tc.tc_priv = sc;
+ sc->sc_tc.tc_quality = 900;
+
+ tc_init(&sc->sc_tc);
+}
+
+static u_int
+dwc_tmr_get_timecount(struct timecounter *tc)
+{
+ struct dwc_tmr_softc *sc = tc->tc_priv;
+
+ return ~TIMER_READ(sc, DWC_TMR_CURRENT_VALUE_REG);
+}
Index: src/sys/dev/ic/dwc_tmr_reg.h
diff -u /dev/null src/sys/dev/ic/dwc_tmr_reg.h:1.1
--- /dev/null Sat Jan 17 15:04:47 2015
+++ src/sys/dev/ic/dwc_tmr_reg.h Sat Jan 17 15:04:47 2015
@@ -0,0 +1,41 @@
+/* $NetBSD: dwc_tmr_reg.h,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _DWC_TMR_REG_H
+#define _DWC_TMR_REG_H
+
+#define DWC_TMR_LOAD_COUNT_REG 0x0000
+#define DWC_TMR_CURRENT_VALUE_REG 0x0004
+#define DWC_TMR_CONTROL_REG 0x0008
+#define DWC_TMR_INTSTATUS_REG 0x0010
+
+#define DWC_TMR_CONTROL_INTERRUPT_MASK __BIT(2)
+#define DWC_TMR_CONTROL_MODE __BIT(1)
+#define DWC_TMR_CONTROL_ENABLE __BIT(0)
+
+#endif /* !_DWC_TMR_REG_H */
Index: src/sys/dev/ic/dwc_tmr_var.h
diff -u /dev/null src/sys/dev/ic/dwc_tmr_var.h:1.1
--- /dev/null Sat Jan 17 15:04:47 2015
+++ src/sys/dev/ic/dwc_tmr_var.h Sat Jan 17 15:04:47 2015
@@ -0,0 +1,45 @@
+/* $NetBSD: dwc_tmr_var.h,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill <[email protected]>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _DWC_TMR_VAR_H
+#define _DWC_TMR_VAR_H
+
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/timetc.h>
+
+struct dwc_tmr_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+ struct timecounter sc_tc;
+};
+
+void dwc_tmr_attach_subr(struct dwc_tmr_softc *, u_int64_t);
+
+#endif /* !_DWC_TMR_VAR_H */
