From patchwork Thu Oct 8 15:46:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11823417 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A61CD1580 for ; Thu, 8 Oct 2020 15:50:21 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5F6DE20578 for ; Thu, 8 Oct 2020 15:50:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="egwXPkiP" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5F6DE20578 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arndb.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wsP69LHt95Bbr48JLHA9y7KMgwEtco6TR2lYteRmlRk=; b=egwXPkiP0ciMTLhFXzOX0HeIS m2vj+qYAG7MHcjE3DfUJG6mcPApvzw7XF61A2uXqsiIhICPHU068uNZY+4sgVtQVndT8wz9sJ5KbY j8/JnfTW1vtM4jYvgj/pt3Nq5AgRqBtW04ebyQUHsjSIMJVDycHfs7f1o2Dqx8fkxo/IVWYRJ7nXQ 7iGq9SR827lDGBokmsPfAzspwEhVgkUIJDjOGam8UdUzSPTlMzfYEB+nRN3U4OmjTX33m4L+deXO+ MiF0whIRgbpXKpuKJJJFgulMZQzJ89ANNC8xNETIExAEoJ9j3veDCTERZ1aXTLIwY5SaGnvoS6vyV FBxZFD4Cw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQY9Q-0002Vs-Ud; Thu, 08 Oct 2020 15:48:17 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kQY9D-0002RO-7F for linux-arm-kernel@lists.infradead.org; Thu, 08 Oct 2020 15:48:10 +0000 Received: from localhost.localdomain ([192.30.34.233]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.145]) with ESMTPA (Nemesis) id 1MQMdz-1k4KSW1S3l-00MNpC; Thu, 08 Oct 2020 17:47:22 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Subject: [PATCH 01/13] timekeeping: add CONFIG_LEGACY_TIMER_TICK Date: Thu, 8 Oct 2020 17:46:39 +0200 Message-Id: <20201008154651.1901126-2-arnd@arndb.de> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201008154651.1901126-1-arnd@arndb.de> References: <20201008154651.1901126-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:lJJKtGZAxWt7DMFVnzZRB47PnCLatINXoORTSIFhtBK1TMTdNiv RG4yLsnkyOAV7i7CY4P6/yTTsoYlGUtq5FolW0zFQmapsMzTrePJNwmGfm6BWP+Zj/wddj3 L1sjseIS105PzF6aN9WPsUH3h0CWoHEvfIlgpVpv9Loi24x65wMHlFaPhAQ/Zd5HCND4YC8 a5Apn6ItpnEokOcusQ+YQ== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:LRXNx4Y7rGM=:W7aq/8a9yjrM8EkUU5AZjb KRhqGA4PFyX2G6oCIIIvLpEOsxxfnokV1+U4lVGw+713pi22Z2jAYx2+OLR3eo4/G8+4vgK3p pX2TbMknPaniCvgONqCrrNhqSqsm7b4l3qnYaXNCRKbqUOty/aF753t5ZwdhlByx5YN14cPfQ QwFuNJRQRPQVIqhJS3YEXx6RVGw6fT+KxGpyZdnfjjmD16ZMQx3Mb+rN/nTQNugTsbrwc3eFW pGWl/GE0s1czW1DB4UqH6MJy5sgdQBmJU36SJx6gzyXQVNN7sDHpOMCuuGsAbpkXCbzIPPVM1 sqn1+jNvH7zxTQ3puVsYymfmUFP4QCs0LXHwH2qML7YU7sJLMMx8jOv5SkoR985WFCY8VZ37b VMIkdIP0uMWMQxhJKHI/nc3f6WdynC7AHHnrUuoX1FjeGj+U2u0ajNtUFIJtQLIDuSMg0IXma KYyj9fO3pmII6+ghqSiR7HejGK3Jr/GPJYuEL9ikQibsqRmEBmYxgDGmJzZdiIRPgkU8E0exT C7t+0L8ll3T2CBZDBaFlbImApYvroGjmFe0p/Kuhq8bowvKZdls/mB2aN3Eu6VVFHPvo/zPhN qp1WHrOO9otDZxX3Xt1CcrhDCsVNVDcg9jOE3Kpp9IgLSLNXmRCDCxldZD4FU0HOsibcmeUm7 9RIqwNBNoNAfE5/aurdG2zdES2SbuCh0cLP0LojJnWxHQ48vMaUQknug6iwTayNUe7q+kVxfY bBetwKQnt/NYaDZvViPfyq3HOJl8WcN0mmpp9rztNyaPUH/tlh0ohxjLIQt0NJZvycMnBTsoa xGiKuBJaEO4MO7ukG8X4jYD+RlsFPm1cbW2v3nNqzfV1ixvBzsHSWtW1ratVBDFK3kLJGAi X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201008_114803_470204_6299A31F X-CRM114-Status: GOOD ( 21.87 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.72.192.75 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.75 listed in wl.mailspike.net] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Creasey , Fenghua Yu , Linus Walleij , Tony Luck , Thomas Gleixner , linux-parisc@vger.kernel.org, Arnd Bergmann , linux-ia64@vger.kernel.org, Stephen Boyd , Helge Deller , Daniel Lezcano , Russell King , Finn Thain , "James E.J. Bottomley" , linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org, John Stultz , Philip Blundell , Greg Ungerer , Joshua Thompson Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org All platforms that currently do not use generic clockevents roughly call the same set of functions in their timer interrupts: xtime_update(), update_process_times() and profile_tick(), sometimes in a different sequence. Add a helper function that performs all three of them, to make the callers more uniform and simplify the interface. Signed-off-by: Arnd Bergmann Reviewed-by: Geert Uytterhoeven --- include/linux/timekeeping.h | 1 + kernel/time/Kconfig | 7 +++++++ kernel/time/Makefile | 1 + kernel/time/tick-legacy.c | 19 +++++++++++++++++++ 4 files changed, 28 insertions(+) create mode 100644 kernel/time/tick-legacy.c diff --git a/include/linux/timekeeping.h b/include/linux/timekeeping.h index 7f7e4a3f4394..3670cb1670ff 100644 --- a/include/linux/timekeeping.h +++ b/include/linux/timekeeping.h @@ -12,6 +12,7 @@ extern int timekeeping_suspended; /* Architecture timer tick functions: */ extern void update_process_times(int user); extern void xtime_update(unsigned long ticks); +extern void legacy_timer_tick(unsigned long ticks); /* * Get and set timeofday diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig index a09b1d61df6a..f2b0cfeade47 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -61,6 +61,13 @@ config POSIX_CPU_TIMERS_TASK_WORK bool default y if POSIX_TIMERS && HAVE_POSIX_CPU_TIMERS_TASK_WORK +config LEGACY_TIMER_TICK + bool + help + The legacy timer tick helper is used by platforms that + lack support for the generic clockevent framework. + New platforms should use generic clockevents instead. + if GENERIC_CLOCKEVENTS menu "Timers subsystem" diff --git a/kernel/time/Makefile b/kernel/time/Makefile index c8f00168afe8..1fb1c1ef6a19 100644 --- a/kernel/time/Makefile +++ b/kernel/time/Makefile @@ -16,6 +16,7 @@ ifeq ($(CONFIG_GENERIC_CLOCKEVENTS_BROADCAST),y) endif obj-$(CONFIG_GENERIC_SCHED_CLOCK) += sched_clock.o obj-$(CONFIG_TICK_ONESHOT) += tick-oneshot.o tick-sched.o +obj-$(CONFIG_LEGACY_TIMER_TICK) += tick-legacy.o obj-$(CONFIG_HAVE_GENERIC_VDSO) += vsyscall.o obj-$(CONFIG_DEBUG_FS) += timekeeping_debug.o obj-$(CONFIG_TEST_UDELAY) += test_udelay.o diff --git a/kernel/time/tick-legacy.c b/kernel/time/tick-legacy.c new file mode 100644 index 000000000000..73c5a0af4743 --- /dev/null +++ b/kernel/time/tick-legacy.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Timer tick function for architectures that lack generic clockevents, + * consolidated here from m68k/ia64/parisc/arm. + */ + +#include +#include +#include + +#include "tick-internal.h" + +void legacy_timer_tick(unsigned long ticks) +{ + if (ticks) + xtime_update(ticks); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); +}