From patchwork Tue Aug 1 00:59:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 9873513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 737506038F for ; Tue, 1 Aug 2017 01:04:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67A442851E for ; Tue, 1 Aug 2017 01:04:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C2B628524; Tue, 1 Aug 2017 01:04:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4AD52851E for ; Tue, 1 Aug 2017 01:04:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751868AbdHABAu (ORCPT ); Mon, 31 Jul 2017 21:00:50 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33263 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751655AbdHABAr (ORCPT ); Mon, 31 Jul 2017 21:00:47 -0400 Received: by mail-pf0-f196.google.com with SMTP id c65so73978pfl.0 for ; Mon, 31 Jul 2017 18:00:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=w+mTt24CHGTFqYXleMgsZZv9RCi9yQIlzZzBlb+2/q4=; b=rPHDxcSzFlYz+6cTqjU6l+nsvYX56T9xPgVs6ga+nF9l0bTJJ0ucG0WVPrMzE7EHtq crhu6l/mf0WLPpti4juRutk0Aqi86jWZTT2oh1cmra0+WpqZripuLoXfOEc2OzNCxbZC nHZJeKz61G9HaoCTHXwCrlyA5nuqL2IUH3n0Hb9jb37XMdfGQPfuhYVZAM5xDv6Xz2sx Sx881tZKL++mfiXlzqMMZk3+kdj+1O4e8G9hh15mzPtWBdCXos1HKf81HOfBvPEnX6nn 3VGm0q3G5KgkCKkbEFj+NqIrzpeWPZhHrtyuomptYR/p3kAp8EaxJoMPCEoGOHmMjetv 6cjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=w+mTt24CHGTFqYXleMgsZZv9RCi9yQIlzZzBlb+2/q4=; b=SXrGOFmEbCSYIpUpHS1COSIlnnI2djoyXFPazNwlFkONAaS6xhflf4QfDXItBLMrdn DzVezEQVRdkdHDdL/sGeRoIF9GHl+cnJofRfrIQoXtrgmHUeVQAn6jI4SLNBFZxgL8d2 7yX+1yWXJ9iD33/y0l3f2gerptAc3mdJWYJohsO22rkLDahxHJPBpUXlHEdUnhs3hLp1 z11vdAIpWHxPMgTdGPXv2hAdREqvkQzru9aiYwl2bJqu66nzfFMWEaSn5yeVivVvGXVs 2ixGtB7ucsErD5m8ZYx+Jcltf3yh0ejZ3Rjq+JfN/bidgAHZ1W2Ui2VbFkeXUGqd5rEQ 1Pxg== X-Gm-Message-State: AIVw110HFFKFn5+2OmVICsDraJOV1zpyrWQzDcwRuy9YM60uc69R841J sQD/K2NbyYa6MNFg X-Received: by 10.98.93.87 with SMTP id r84mr17142693pfb.292.1501549246401; Mon, 31 Jul 2017 18:00:46 -0700 (PDT) Received: from localhost (c-24-5-193-41.hsd1.ca.comcast.net. [24.5.193.41]) by smtp.gmail.com with ESMTPSA id r87sm5191737pfb.112.2017.07.31.18.00.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 18:00:45 -0700 (PDT) Subject: [PATCH v7 03/15] clocksource: New RISC-V SBI timer driver Date: Mon, 31 Jul 2017 17:59:57 -0700 Message-Id: <20170801010009.3302-4-palmer@dabbelt.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170801010009.3302-1-palmer@dabbelt.com> References: <20170801010009.3302-1-palmer@dabbelt.com> Cc: yamada.masahiro@socionext.com, mmarek@suse.com, albert@sifive.com, will.deacon@arm.com, boqun.feng@gmail.com, oleg@redhat.com, mingo@redhat.com, daniel.lezcano@linaro.org, gregkh@linuxfoundation.org, jslaby@suse.com, davem@davemloft.net, mchehab@kernel.org, hverkuil@xs4all.nl, rdunlap@infradead.org, viro@zeniv.linux.org.uk, mhiramat@kernel.org, fweisbec@gmail.com, mcgrof@kernel.org, dledford@redhat.com, bart.vanassche@sandisk.com, sstabellini@kernel.org, mpe@ellerman.id.au, rmk+kernel@armlinux.org.uk, paul.gortmaker@windriver.com, nicolas.dichtel@6wind.com, linux@roeck-us.net, heiko.carstens@de.ibm.com, schwidefsky@de.ibm.com, geert@linux-m68k.org, akpm@linux-foundation.org, andriy.shevchenko@linux.intel.com, jiri@mellanox.com, vgupta@synopsys.com, airlied@redhat.com, jk@ozlabs.org, chris@chris-wilson.co.uk, Jason@zx2c4.com, paulmck@linux.vnet.ibm.com, ncardwell@google.com, linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, patches@groups.riscv.org, Palmer Dabbelt From: Palmer Dabbelt To: peterz@infradead.org, tglx@linutronix.de, jason@lakedaemon.net, marc.zyngier@arm.com, Arnd Bergmann Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The RISC-V ISA defines a per-hart real-time clock and timer, which is present on all systems. The clock is accessed via the 'rdtime' pseudo-instruction (which reads a CSR), and the timer is set via an SBI call. This driver attempts to split out the RISC-V ISA specific mechanisms of accessing the hardware from the clocksource driver by taking a pair of function pointers to issue the actual RISC-V specific instructions. Signed-off-by: Palmer Dabbelt --- drivers/clocksource/Kconfig | 8 +++++ drivers/clocksource/Makefile | 1 + drivers/clocksource/riscv_timer.c | 64 +++++++++++++++++++++++++++++++++++++++ include/linux/timer_riscv.h | 41 +++++++++++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 drivers/clocksource/riscv_timer.c create mode 100644 include/linux/timer_riscv.h diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index fcae5ca6ac92..a5829c0b3ae4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -607,4 +607,12 @@ config CLKSRC_ST_LPC Enable this option to use the Low Power controller timer as clocksource. +config RISCV_TIMER + bool "Timer for the RISC-V platform" if COMPILE_TEST + depends on RISCV + help + This enables the per-hart timer built into all RISC-V systems, which + is accessed via both the SBI and the rdcycle instruction. This is + required for all RISC-V systems. + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 6df949402dfc..20d75b3f22e4 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -73,3 +73,4 @@ obj-$(CONFIG_H8300_TMR16) += h8300_timer16.o obj-$(CONFIG_H8300_TPU) += h8300_tpu.o obj-$(CONFIG_CLKSRC_ST_LPC) += clksrc_st_lpc.o obj-$(CONFIG_X86_NUMACHIP) += numachip.o +obj-$(CONFIG_RISCV_TIMER) += riscv_timer.o diff --git a/drivers/clocksource/riscv_timer.c b/drivers/clocksource/riscv_timer.c new file mode 100644 index 000000000000..6063c7abe21c --- /dev/null +++ b/drivers/clocksource/riscv_timer.c @@ -0,0 +1,64 @@ +/* + * Copyright (C) 2012 Regents of the University of California + * Copyright (C) 2017 SiFive + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +/* + * See for the rationale behind pre-allocating per-cpu + * timers on RISC-V systems. + */ +static DEFINE_PER_CPU(struct clocksource, clock_source); +static DEFINE_PER_CPU(struct clock_event_device, clock_event); + +struct clock_event_device *timer_riscv_device(int cpu) +{ + return &per_cpu(clock_event, cpu); +} + +struct clocksource *timer_riscv_source(int cpu) +{ + return &per_cpu(clock_source, cpu); +} + +void timer_riscv_init(int cpu_id, + unsigned long riscv_timebase, + unsigned long long (*rdtime)(struct clocksource *), + int (*next)(unsigned long, struct clock_event_device*)) +{ + struct clocksource *cs = &per_cpu(clock_source, cpu_id); + struct clock_event_device *ce = &per_cpu(clock_event, cpu_id); + + *cs = (struct clocksource) { + .name = "riscv_clocksource", + .rating = 300, + .read = rdtime, + .mask = CLOCKSOURCE_MASK(BITS_PER_LONG), + .flags = CLOCK_SOURCE_IS_CONTINUOUS, + }; + clocksource_register_hz(cs, riscv_timebase); + + *ce = (struct clock_event_device){ + .name = "riscv_timer_clockevent", + .features = CLOCK_EVT_FEAT_ONESHOT, + .rating = 300, + .cpumask = cpumask_of(cpu_id), + .set_next_event = next, + .set_state_oneshot = NULL, + .set_state_shutdown = NULL, + }; + clockevents_config_and_register(ce, riscv_timebase, 100, 0x7fffffff); +} diff --git a/include/linux/timer_riscv.h b/include/linux/timer_riscv.h new file mode 100644 index 000000000000..f2f91fe46979 --- /dev/null +++ b/include/linux/timer_riscv.h @@ -0,0 +1,41 @@ +/* + * Copyright (C) 2017 SiFive + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _LINUX_TIMER_RISCV_H +#define _LINUX_TIMER_RISCV_H + +/* + * All RISC-V systems have a timer attached to every hart. These timers can be + * read by the 'rdcycle' pseudo instruction, and can use the SBI to setup + * events. In order to abstract the architecture-specific timer reading and + * setting functions away from the clock event insertion code, we provide + * function pointers to the clockevent subsystem that perform two basic operations: + * rdtime() reads the timer on the current CPU, and next_event(delta) sets the + * next timer event to 'delta' cycles in the future. As the timers are + * inherently a per-cpu resource, these callbacks perform operations on the + * current hart. There is guaranteed to be exactly one timer per hart on all + * RISC-V systems. + */ +void timer_riscv_init(int cpu_id, + unsigned long riscv_timebase, + unsigned long long (*rdtime)(struct clocksource *), + int (*next_event)(unsigned long, struct clock_event_device *)); + +/* + * Looks up the clocksource or clock_even_device that cooresponds the given + * hart. + */ +struct clocksource *timer_riscv_source(int cpuid); +struct clock_event_device *timer_riscv_device(int cpu_id); + +#endif