Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Add a meson6_timer driver and provide a timecounter
details: https://anonhg.NetBSD.org/src/rev/7fab78fc895c
branches: trunk
changeset: 458877:7fab78fc895c
user: skrll <skrll%NetBSD.org@localhost>
date: Wed Aug 14 15:08:53 2019 +0000
description:
Add a meson6_timer driver and provide a timecounter
diffstat:
sys/arch/arm/amlogic/files.meson | 7 +-
sys/arch/arm/amlogic/meson6_timer.c | 162 ++++++++++++++++++++++++++++++++++++
sys/arch/evbarm/conf/GENERIC | 3 +-
3 files changed, 170 insertions(+), 2 deletions(-)
diffs (205 lines):
diff -r 636603e86c09 -r 7fab78fc895c sys/arch/arm/amlogic/files.meson
--- a/sys/arch/arm/amlogic/files.meson Wed Aug 14 13:58:00 2019 +0000
+++ b/sys/arch/arm/amlogic/files.meson Wed Aug 14 15:08:53 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.meson,v 1.9 2019/04/21 13:51:04 jmcneill Exp $
+# $NetBSD: files.meson,v 1.10 2019/08/14 15:08:53 skrll Exp $
#
# Configuration info for Amlogic Meson family SoCs
#
@@ -114,6 +114,11 @@
attach mesongxwdt at fdt with mesongx_wdt
file arch/arm/amlogic/mesongx_wdt.c mesongx_wdt
+# Meson Timers
+device meson6timer
+attach meson6timer at fdt with meson6_timer
+file arch/arm/amlogic/meson6_timer.c meson6_timer
+
# SOC parameters
defflag opt_soc.h SOC_MESON
defflag opt_soc.h SOC_MESON8B: SOC_MESON
diff -r 636603e86c09 -r 7fab78fc895c sys/arch/arm/amlogic/meson6_timer.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/amlogic/meson6_timer.c Wed Aug 14 15:08:53 2019 +0000
@@ -0,0 +1,162 @@
+/* $NetBSD: meson6_timer.c,v 1.1 2019/08/14 15:08:53 skrll Exp $ */
+
+/*-
+ * Copyright (c) 2019 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Nick Hudson
+ *
+ * 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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: meson6_timer.c,v 1.1 2019/08/14 15:08:53 skrll Exp $");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/device.h>
+#include <sys/systm.h>
+#include <sys/timetc.h>
+
+#include <dev/fdt/fdtvar.h>
+
+static int meson6_timer_match(device_t, cfdata_t, void *);
+static void meson6_timer_attach(device_t, device_t, void *);
+
+struct meson6_timer_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+
+ struct timecounter sc_tc;
+};
+
+CFATTACH_DECL_NEW(meson6_timer, sizeof(struct meson6_timer_softc),
+ meson6_timer_match, meson6_timer_attach, NULL, NULL);
+
+#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))
+
+#define MESON_TIMER_MUX 0x00
+#define MESON_TIMER_MUX_TIMERD_EN __BIT(19)
+#define MESON_TIMER_MUX_TIMERC_EN __BIT(18)
+#define MESON_TIMER_MUX_TIMERB_EN __BIT(17)
+#define MESON_TIMER_MUX_TIMERA_EN __BIT(16)
+#define MESON_TIMER_MUX_TIMERD_MODE __BIT(15)
+#define MESON_TIMER_MUX_TIMERC_MODE __BIT(14)
+#define MESON_TIMER_MUX_TIMERB_MODE __BIT(13)
+#define MESON_TIMER_MUX_TIMERA_MODE __BIT(12)
+#define MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_MASK __BITS(10, 8)
+#define MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_SYSTEM_CLOCK 0x0
+#define MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_1US 0x1
+#define MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_10US 0x2
+#define MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_100US 0x3
+#define MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_1MS 0x4
+#define MESON_TIMER_MUX_TIMERD_INPUT_CLOCK_MASK __BITS(7, 6)
+#define MESON_TIMER_MUX_TIMERC_INPUT_CLOCK_MASK __BITS(5, 4)
+#define MESON_TIMER_MUX_TIMERB_INPUT_CLOCK_MASK __BITS(3, 2)
+#define MESON_TIMER_MUX_TIMERA_INPUT_CLOCK_MASK __BITS(1, 0)
+#define MESON_TIMER_MUX_TIMERABCD_INPUT_CLOCK_1US 0x0
+#define MESON_TIMER_MUX_TIMERABCD_INPUT_CLOCK_10US 0x1
+#define MESON_TIMER_MUX_TIMERABCD_INPUT_CLOCK_100US 0x2
+#define MESON_TIMER_MUX_TIMERABCD_INPUT_CLOCK_1MS 0x3
+
+#define MESON_TIMERA 0x04
+#define MESON_TIMERB 0x08
+#define MESON_TIMERC 0x0c
+#define MESON_TIMERD 0x10
+#define MESON_TIMERE 0x14
+
+static u_int
+meson6_timer_get_timecount(struct timecounter *tc)
+{
+ struct meson6_timer_softc * const sc = tc->tc_priv;
+
+ return TIMER_READ(sc, MESON_TIMERE);
+}
+
+
+static int
+meson6_timer_match(device_t parent, cfdata_t cf, void *aux)
+{
+ const char * const compatible[] = {
+ "amlogic,meson6-timer",
+ NULL
+ };
+ struct fdt_attach_args * const faa = aux;
+
+ return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+static void
+meson6_timer_attach(device_t parent, device_t self, void *aux)
+{
+ struct meson6_timer_softc * const sc = device_private(self);
+ struct fdt_attach_args * const faa = aux;
+ const int phandle = faa->faa_phandle;
+ bus_addr_t addr;
+ bus_size_t size;
+
+ if (fdtbus_get_reg(phandle, 0, &addr, &size) != 0) {
+ aprint_error(": couldn't get registers\n");
+ return;
+ }
+
+ sc->sc_dev = self;
+ sc->sc_bst = faa->faa_bst;
+ if (bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh) != 0) {
+ aprint_error(": couldn't map registers\n");
+ return;
+ }
+
+ /* Enable clocks */
+ struct clk *clk;
+ for (int i = 0; (clk = fdtbus_clock_get_index(phandle, i)); i++) {
+ if (clk_enable(clk) != 0) {
+ aprint_error(": failed to enable clock #%d\n", i);
+ return;
+ }
+ }
+
+ aprint_naive("\n");
+ aprint_normal(": Timers\n");
+
+ uint32_t mask = TIMER_READ(sc, MESON_TIMER_MUX);
+ mask &= ~MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_MASK;
+ mask |= __SHIFTIN(MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_1US, MESON_TIMER_MUX_TIMERE_INPUT_CLOCK_MASK);
+
+ TIMER_WRITE(sc, MESON_TIMER_MUX, mask);
+
+ /* Timecounter setup */
+ struct timecounter *tc = &sc->sc_tc;
+ tc->tc_get_timecount = meson6_timer_get_timecount;
+ tc->tc_counter_mask = ~0u;
+ tc->tc_frequency = 1000000;
+ tc->tc_name = "Timer E";
+ tc->tc_quality = 500;
+ tc->tc_priv = sc;
+ tc_init(tc);
+}
+
diff -r 636603e86c09 -r 7fab78fc895c sys/arch/evbarm/conf/GENERIC
--- a/sys/arch/evbarm/conf/GENERIC Wed Aug 14 13:58:00 2019 +0000
+++ b/sys/arch/evbarm/conf/GENERIC Wed Aug 14 15:08:53 2019 +0000
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.50 2019/08/13 09:56:09 skrll Exp $
+# $NetBSD: GENERIC,v 1.51 2019/08/14 15:08:53 skrll Exp $
#
# GENERIC ARM (aarch32) kernel
#
@@ -306,6 +306,7 @@
armgtmr0 at gtmr?
mct* at fdt? pass 2 # Exynos Multi Core Timer (MCT)
armgtmr* at mct?
+meson6timer* at fdt? # Amlogic Timer
sunxitimer* at fdt? # Allwinner async timer
sunxihstimer* at fdt? # Allwinner High-Speed timer
tegratimer* at fdt? # Timers
Home |
Main Index |
Thread Index |
Old Index