Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1521752pxp; Thu, 10 Mar 2022 07:06:07 -0800 (PST) X-Google-Smtp-Source: ABdhPJxa+7Gi5i+lDr3qKbNF2ZWzX2alTIjq9nYnz16/ed1yLMhvBsnQgrXXJobJ8/QbJz8x9gOm X-Received: by 2002:a17:906:d554:b0:6da:8a8e:2f2 with SMTP id cr20-20020a170906d55400b006da8a8e02f2mr4638316ejc.434.1646924767590; Thu, 10 Mar 2022 07:06:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646924767; cv=none; d=google.com; s=arc-20160816; b=pXJP6XWVQWAqh0tdNrgFrf/OmYZ2LD//bUodLNIw+IKcMyrQvkyaIq7avfi1x/A1qF v5hRGa7jBHcfbEpIFKfmN/y4NjDTc1VGiWFq0ieHe9MxFVkUK82g7/Kxw4/yzUEGFuCu Bu5uxqUyig0PthSkxbjFe0b69iOuQ1qOwbvTEiLH0Tb46ttdSrDt0JScWIxFD/LS7uSi 6Dgae3NoXlBt6G2zYS9hXzPlzdIqz3Cl/p8NFIvCCXuurdhBzSLriQ2rP8NRmiiQZVbA c5YqhlKULmsq3GSw2h8xejC8H5FBho1BRV/UiPyhdGtj6vQV5GxroOeD+1m2ZsQV6NXr qM6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=YCrLJ4G0RChCE2rRxrH1YCU7/44Mv9fWfPrlryY6RTw=; b=OHd1+5QMBPP+l8FDfgcsV/6QWxZU/rBhL7IEZPNbnsydWY7mBOcR4UwQZOd5pgrnt1 4jtYrBA+P9RdykkFjEkkufYxQ9auHflrK2BKYyBgFHsTgms9sYZKl3Jqg/+ORpnGh11X +pTDrtYuf2W44Wu1ouI5RrK7M+ZTORi/IYMfLsIy6QLmB2+6d+qP8W1nIPRU8kqp33+7 GG423J1PeNC6J7DW9lAZvJkZ/y2qx5Xcnx5Vh2YQVrmAPGOhNe1SDFW+FomVP9JntYuE u9TL3SrC7jdaeXmyvS8+pU/zHDcBFYM5u4UXBhEECU/pFCJ0z9fQGOhmm0Ihmp0hETr8 cRDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bi19-20020a05640221d300b00403a4e3bd5esi3956357edb.313.2022.03.10.07.05.27; Thu, 10 Mar 2022 07:06:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240593AbiCJJCn (ORCPT + 99 others); Thu, 10 Mar 2022 04:02:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240582AbiCJJCc (ORCPT ); Thu, 10 Mar 2022 04:02:32 -0500 Received: from mout.kundenserver.de (mout.kundenserver.de [217.72.192.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D87A13758E; Thu, 10 Mar 2022 01:01:28 -0800 (PST) Received: from quad ([82.142.8.122]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MtfRp-1oI7nV3MdT-00v8gn; Thu, 10 Mar 2022 10:00:55 +0100 From: Laurent Vivier To: linux-kernel@vger.kernel.org Cc: Jiaxun Yang , Alessandro Zummo , Daniel Lezcano , linux-rtc@vger.kernel.org, Stephen Boyd , Arnd Bergmann , Alexandre Belloni , linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , Thomas Gleixner , John Stultz , Laurent Vivier Subject: [PATCH v15 4/5] clocksource/drivers: Add a goldfish-timer clocksource Date: Thu, 10 Mar 2022 10:00:47 +0100 Message-Id: <20220310090048.1933020-5-laurent@vivier.eu> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220310090048.1933020-1-laurent@vivier.eu> References: <20220310090048.1933020-1-laurent@vivier.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:tJydxKgy1kMsEs+bDA23vQSj11obVzoYyr4jxj6XXTc99C2pbhT PR8zZ8JhbaYeqDvapi5QXZsEy9MP/OjLY842oRsg0SuyMmH+ktUN8wtr5kFn2Voc2rWnmSf aiXsAnQdC/r240AZl0Mjs0FGxe78rtZPU/+ZCa49pZxSHXfmWPmqn86dS8lPIwl3Ndhbn/J Uql1fG9/wDpCtHb0xqQGg== X-UI-Out-Filterresults: notjunk:1;V03:K0:sTIwBd0dNXk=:863uxZUKvnrvAVad0uz5se XISIWMqCCDO3IOutblzIXBIbWmSjKllOVZYSW4Q8MVjb9iemIu+XDae9PxIA89XJf+lvU+mAD EEZAv7fsVmCJi0OaLHYWKwgfNa3y5gBCPEKxoM1trFoGMNzHHwCQFaYaEoZ/0P2XmlQYQJpo6 gUrXn/HxhnvCQ2KYip1tZf55fcEm3vHtN7sX8KOCXj2+nL7J/NJbkG91V8tXFtcItSO+6Uhbt saK6v0Ll65hnFqqtDRuY4ibqS6ze0SRdXcKlA+8HXhUJ59NCSNXO55a7PX9w3DusW3WOsGXmJ AFdWJioBDWoJwFEYgKElI+vzNxtkJFby/GKPaPd7V5LzIFVUl4dAUKbZpNaVZc7Hr8XNee/ih VsJ8kEYXjFpL8Z5Ykh6w9rVCYT0pS8HzZ08ag2GnDxKYzbd5PQZXMHvxZo8qdxh+UYUKx72JC pz+hKGs2vXp8j4j/UVgw5GIef7PpK6teoNXPMtGftwbqKVkm5M5ZWmclwmEOlDPbUw/sWo08R R76S6CgICjniyzR7O7L5lhi7e8xI+gnRP8ROrRSVvsQB3LNP//dTcTQdoeedIpHF+yEoLopEg FKBnZOqT/OntcDujcrgNLKFWSwmVR14pCp5R/CO4B18grbjYC7J80WgQ7M+BsfItPhE+A0GWT R8AZ5dpxVc07SHEHGT6Pvoua4Yb8CmCFpyzALYMMs/ITEobVylzgGNObufpXNv6RRde0= X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add a clocksource based on the goldfish-rtc device. Move the timer register definition to This kernel implementation is based on the QEMU upstream implementation: https://git.qemu.org/?p=qemu.git;a=blob_plain;f=hw/rtc/goldfish_rtc.c goldfish-timer is a high-precision signed 64-bit nanosecond timer. It is part of the 'goldfish' virtual hardware platform used to run some emulated Android systems under QEMU. This timer only supports oneshot event. Signed-off-by: Laurent Vivier --- drivers/clocksource/Kconfig | 7 ++ drivers/clocksource/Makefile | 1 + drivers/clocksource/timer-goldfish.c | 153 +++++++++++++++++++++++++++ drivers/rtc/rtc-goldfish.c | 13 +-- include/clocksource/timer-goldfish.h | 31 ++++++ 5 files changed, 193 insertions(+), 12 deletions(-) create mode 100644 drivers/clocksource/timer-goldfish.c create mode 100644 include/clocksource/timer-goldfish.h diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index cfb8ea0df3b1..94f00374cebb 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -721,4 +721,11 @@ config MICROCHIP_PIT64B modes and high resolution. It is used as a clocksource and a clockevent. +config GOLDFISH_TIMER + bool "Clocksource using goldfish-rtc" + depends on M68K || COMPILE_TEST + depends on RTC_DRV_GOLDFISH + help + Support for the timer/counter of goldfish-rtc + endmenu diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index fa5f624eadb6..12f5d7e8cc2d 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@ -89,3 +89,4 @@ obj-$(CONFIG_GX6605S_TIMER) += timer-gx6605s.o obj-$(CONFIG_HYPERV_TIMER) += hyperv_timer.o obj-$(CONFIG_MICROCHIP_PIT64B) += timer-microchip-pit64b.o obj-$(CONFIG_MSC313E_TIMER) += timer-msc313e.o +obj-$(CONFIG_GOLDFISH_TIMER) += timer-goldfish.o diff --git a/drivers/clocksource/timer-goldfish.c b/drivers/clocksource/timer-goldfish.c new file mode 100644 index 000000000000..0512d5eabc82 --- /dev/null +++ b/drivers/clocksource/timer-goldfish.c @@ -0,0 +1,153 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include +#include +#include +#include +#include +#include +#include + +struct goldfish_timer { + struct clocksource cs; + struct clock_event_device ced; + struct resource res; + void __iomem *base; +}; + +static struct goldfish_timer *ced_to_gf(struct clock_event_device *ced) +{ + return container_of(ced, struct goldfish_timer, ced); +} + +static struct goldfish_timer *cs_to_gf(struct clocksource *cs) +{ + return container_of(cs, struct goldfish_timer, cs); +} + +static u64 goldfish_timer_read(struct clocksource *cs) +{ + struct goldfish_timer *timerdrv = cs_to_gf(cs); + void __iomem *base = timerdrv->base; + u32 time_low, time_high; + u64 ticks; + + /* + * time_low: get low bits of current time and update time_high + * time_high: get high bits of time at last time_low read + */ + time_low = gf_ioread32(base + TIMER_TIME_LOW); + time_high = gf_ioread32(base + TIMER_TIME_HIGH); + + ticks = ((u64)time_high << 32) | time_low; + + return ticks; +} + +static int goldfish_timer_set_oneshot(struct clock_event_device *evt) +{ + struct goldfish_timer *timerdrv = ced_to_gf(evt); + void __iomem *base = timerdrv->base; + + gf_iowrite32(0, base + TIMER_ALARM_HIGH); + gf_iowrite32(0, base + TIMER_ALARM_LOW); + gf_iowrite32(1, base + TIMER_IRQ_ENABLED); + + return 0; +} + +static int goldfish_timer_shutdown(struct clock_event_device *evt) +{ + struct goldfish_timer *timerdrv = ced_to_gf(evt); + void __iomem *base = timerdrv->base; + + gf_iowrite32(0, base + TIMER_IRQ_ENABLED); + + return 0; +} + +static int goldfish_timer_next_event(unsigned long delta, + struct clock_event_device *evt) +{ + struct goldfish_timer *timerdrv = ced_to_gf(evt); + void __iomem *base = timerdrv->base; + u64 now; + + now = goldfish_timer_read(&timerdrv->cs); + + now += delta; + + gf_iowrite32(upper_32_bits(now), base + TIMER_ALARM_HIGH); + gf_iowrite32(lower_32_bits(now), base + TIMER_ALARM_LOW); + + return 0; +} + +static irqreturn_t goldfish_timer_irq(int irq, void *dev_id) +{ + struct goldfish_timer *timerdrv = dev_id; + struct clock_event_device *evt = &timerdrv->ced; + void __iomem *base = timerdrv->base; + + gf_iowrite32(1, base + TIMER_CLEAR_INTERRUPT); + + evt->event_handler(evt); + + return IRQ_HANDLED; +} + +int __init goldfish_timer_init(int irq, void __iomem *base) +{ + struct goldfish_timer *timerdrv; + int ret; + + timerdrv = kzalloc(sizeof(*timerdrv), GFP_KERNEL); + if (!timerdrv) + return -ENOMEM; + + timerdrv->base = base; + + timerdrv->ced = (struct clock_event_device){ + .name = "goldfish_timer", + .features = CLOCK_EVT_FEAT_ONESHOT, + .set_state_shutdown = goldfish_timer_shutdown, + .set_state_oneshot = goldfish_timer_set_oneshot, + .set_next_event = goldfish_timer_next_event, + }; + + timerdrv->res = (struct resource){ + .name = "goldfish_timer", + .start = (unsigned long)base, + .end = (unsigned long)base + 0xfff, + }; + + ret = request_resource(&iomem_resource, &timerdrv->res); + if (ret) { + pr_err("Cannot allocate '%s' resource\n", timerdrv->res.name); + return ret; + } + + timerdrv->cs = (struct clocksource){ + .name = "goldfish_timer", + .rating = 400, + .read = goldfish_timer_read, + .mask = CLOCKSOURCE_MASK(64), + .flags = 0, + .max_idle_ns = LONG_MAX, + }; + + clocksource_register_hz(&timerdrv->cs, NSEC_PER_SEC); + + ret = request_irq(irq, goldfish_timer_irq, IRQF_TIMER, + "goldfish_timer", timerdrv); + if (ret) { + pr_err("Couldn't register goldfish-timer interrupt\n"); + return ret; + } + + clockevents_config_and_register(&timerdrv->ced, NSEC_PER_SEC, + 1, 0xffffffff); + + return 0; +} diff --git a/drivers/rtc/rtc-goldfish.c b/drivers/rtc/rtc-goldfish.c index eb1929b0cbb6..59c0f38cc08d 100644 --- a/drivers/rtc/rtc-goldfish.c +++ b/drivers/rtc/rtc-goldfish.c @@ -11,18 +11,7 @@ #include #include #include - -#define TIMER_TIME_LOW 0x00 /* get low bits of current time */ - /* and update TIMER_TIME_HIGH */ -#define TIMER_TIME_HIGH 0x04 /* get high bits of time at last */ - /* TIMER_TIME_LOW read */ -#define TIMER_ALARM_LOW 0x08 /* set low bits of alarm and */ - /* activate it */ -#define TIMER_ALARM_HIGH 0x0c /* set high bits of next alarm */ -#define TIMER_IRQ_ENABLED 0x10 -#define TIMER_CLEAR_ALARM 0x14 -#define TIMER_ALARM_STATUS 0x18 -#define TIMER_CLEAR_INTERRUPT 0x1c +#include struct goldfish_rtc { void __iomem *base; diff --git a/include/clocksource/timer-goldfish.h b/include/clocksource/timer-goldfish.h new file mode 100644 index 000000000000..d39097729b1d --- /dev/null +++ b/include/clocksource/timer-goldfish.h @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * goldfish-timer clocksource + * Registers definition for the goldfish-timer device + */ + +#ifndef _CLOCKSOURCE_TIMER_GOLDFISH_H +#define _CLOCKSOURCE_TIMER_GOLDFISH_H + +/* + * TIMER_TIME_LOW get low bits of current time and update TIMER_TIME_HIGH + * TIMER_TIME_HIGH get high bits of time at last TIMER_TIME_LOW read + * TIMER_ALARM_LOW set low bits of alarm and activate it + * TIMER_ALARM_HIGH set high bits of next alarm + * TIMER_IRQ_ENABLED enable alarm interrupt + * TIMER_CLEAR_ALARM disarm an existin alarm + * TIMER_ALARM_STATUS alarm status (running or not) + * TIMER_CLEAR_INTERRUPT clear interrupt + */ +#define TIMER_TIME_LOW 0x00 +#define TIMER_TIME_HIGH 0x04 +#define TIMER_ALARM_LOW 0x08 +#define TIMER_ALARM_HIGH 0x0c +#define TIMER_IRQ_ENABLED 0x10 +#define TIMER_CLEAR_ALARM 0x14 +#define TIMER_ALARM_STATUS 0x18 +#define TIMER_CLEAR_INTERRUPT 0x1c + +extern int goldfish_timer_init(int irq, void __iomem *base); + +#endif /* _CLOCKSOURCE_TIMER_GOLDFISH_H */ -- 2.35.1