Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1370047pxx; Fri, 30 Oct 2020 08:28:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx8WbFRSqikn9LC04O31LgTML8Db2CKhebcwKLLaXzKWTEYg7hXuZMuYS35Qf5W4CFgUdj9 X-Received: by 2002:a17:906:2895:: with SMTP id o21mr3172042ejd.332.1604071737749; Fri, 30 Oct 2020 08:28:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604071737; cv=none; d=google.com; s=arc-20160816; b=yq8kMxy21/s5fJd/va+uRA8FwJL3rFyaDJFV3hU7lclqUYgYbj3maVtBukryDP5HJ+ TU7lgLmSiZBx7gWi5F7zWNB1tPs0jIQl+FOO6RRsjGzVDi9jEb8kKRqVfgrDnX8H8LOq BmGU4rHpqCyR1gigJeDzq7VJa9aZxisx3YUkZBaZx7RFvO2ymDRJL6kiFX0QnYmU7Oqu a15qnIj2sB0VNBSwScql1Ap0fNwvXCDWh/L1EHKAZWefBj+Yw65ns3wbUcoQVlbs5M+f cgIh+Apn/N/73/u2+aLvqnZRCFvswTsxogxKAcDEdtYFoXA69ulLCCcAB/2mtF+EhArE A2oA== 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 :dkim-signature; bh=QC4fKiTamHkPBdtSEHJG3z0bUs8AV7RM5NvU6wCV2go=; b=AZJlAlXrkHIp8gCskRcEsfvWdy0TNnwf8bMBFmMxa3Or1Rg7y78CBQkQBIMINaWppV hGhl4Vwd4iuECaoHf77xo3W/XfllhrKQZzo7hkt6cf1Qx3lTnfuzjOzKZGzI5lxJ13vl tDGrYiAg0S3PaS4QgbNqOoNiRB+kmHHzK8XODfg+XJPAS7+1jpJBWrfpc1QPRqM/SaML tQI4dU/Tns2ewNIUXsEut0MrEjaMDEgD4SQqHu4yNqbm3Wu1trtCO8MjEkMF3jpiC+sd fBWg5o4TKf0SGQlTkv6b5L6ojz/ru4xYy2Cau1HkXt5xghkto8hpYSqktA5sx3ybmyww v3hw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rMVyyoFB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e7si4748136edu.247.2020.10.30.08.28.35; Fri, 30 Oct 2020 08:28:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rMVyyoFB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727087AbgJ3P1K (ORCPT + 99 others); Fri, 30 Oct 2020 11:27:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:59388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726948AbgJ3P1K (ORCPT ); Fri, 30 Oct 2020 11:27:10 -0400 Received: from localhost.localdomain (HSI-KBW-46-223-126-90.hsi.kabel-badenwuerttemberg.de [46.223.126.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 428DA22243; Fri, 30 Oct 2020 15:18:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604071117; bh=tl4gqglTgRfuyFB/3HlKwXAdiYKP+Knbyg2nIPTrjfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rMVyyoFBNv/IaQlogPnv06ORVbW06T2gsRtjtVIGIZoUJaMuCYQDSLMzcD6bQRXfj jZIWQ7YtTDvsJxfveHhaAvbvWQLkzyxEH4k0tVE0FrBON1/ofkJ3xYBusmV1tRegMQ ETja3alfiWS69OfshaX7Q9nM0n3UwZeTyroeNR84= From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Arnd Bergmann , Russell King , Tony Luck , Fenghua Yu , Greg Ungerer , Finn Thain , Philip Blundell , Joshua Thompson , Sam Creasey , "James E.J. Bottomley" , Helge Deller , Daniel Lezcano , John Stultz , Stephen Boyd , Linus Walleij , linux-ia64@vger.kernel.org, Parisc List , linux-m68k , Linux ARM , Geert Uytterhoeven Subject: [PATCH v2 04/15] timekeeping: add CONFIG_LEGACY_TIMER_TICK Date: Fri, 30 Oct 2020 16:17:47 +0100 Message-Id: <20201030151758.1241164-5-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201030151758.1241164-1-arnd@kernel.org> References: <20201030151758.1241164-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann 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. Reviewed-by: Geert Uytterhoeven Reviewed-by: Linus Walleij Signed-off-by: Arnd Bergmann --- 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 51d298ccbe05..c6867f29d279 100644 --- a/kernel/time/Kconfig +++ b/kernel/time/Kconfig @@ -57,6 +57,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); +} -- 2.27.0