From: Stephen Boyd <sboyd@codeaurora.org> To: Rob Herring <robherring2@gmail.com> Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King <linux@arm.linux.org.uk>, arm@kernel.org, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, John Stultz <john.stultz@linaro.org>, Thomas Gleixner <tglx@linutronix.de> Subject: [PATCH 6/4] arm64: Move to generic sched_clock infrastructure Date: Tue, 30 Apr 2013 17:54:35 -0700 [thread overview] Message-ID: <1367369675-13535-2-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1367369675-13535-1-git-send-email-sboyd@codeaurora.org> Use the generic sched_clock infrastructure instead of rolling our own. This has the added benefit of fixing suspend/resume as outlined in 6a4dae5 (ARM: 7565/1: sched: stop sched_clock() during suspend, 2012-10-23) and correcting the timestamps when the hardware returns a value instead of 0 upon the first read. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/time.c | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4f4c418..b941cca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -13,6 +13,7 @@ config ARM64 select GENERIC_IOMAP select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW + select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select HARDIRQS_SW_RESEND diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index a551f88..fd07ef9 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -33,6 +33,7 @@ #include <linux/irq.h> #include <linux/delay.h> #include <linux/clocksource.h> +#include <linux/sched_clock.h> #include <clocksource/arm_arch_timer.h> @@ -61,13 +62,6 @@ unsigned long profile_pc(struct pt_regs *regs) EXPORT_SYMBOL(profile_pc); #endif -static u64 sched_clock_mult __read_mostly; - -unsigned long long notrace sched_clock(void) -{ - return arch_timer_read_counter() * sched_clock_mult; -} - int read_current_timer(unsigned long *timer_value) { *timer_value = arch_timer_read_counter(); @@ -84,8 +78,7 @@ void __init time_init(void) if (!arch_timer_rate) panic("Unable to initialise architected timer.\n"); - /* Cache the sched_clock multiplier to save a divide in the hot path. */ - sched_clock_mult = NSEC_PER_SEC / arch_timer_rate; + setup_sched_clock_64(arch_timer_read_counter, 56, arch_timer_rate); /* Calibrate the delay loop directly */ lpj_fine = arch_timer_rate / HZ; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/4] arm64: Move to generic sched_clock infrastructure Date: Tue, 30 Apr 2013 17:54:35 -0700 [thread overview] Message-ID: <1367369675-13535-2-git-send-email-sboyd@codeaurora.org> (raw) In-Reply-To: <1367369675-13535-1-git-send-email-sboyd@codeaurora.org> Use the generic sched_clock infrastructure instead of rolling our own. This has the added benefit of fixing suspend/resume as outlined in 6a4dae5 (ARM: 7565/1: sched: stop sched_clock() during suspend, 2012-10-23) and correcting the timestamps when the hardware returns a value instead of 0 upon the first read. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- arch/arm64/Kconfig | 1 + arch/arm64/kernel/time.c | 11 ++--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 4f4c418..b941cca 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -13,6 +13,7 @@ config ARM64 select GENERIC_IOMAP select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW + select GENERIC_SCHED_CLOCK select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select HARDIRQS_SW_RESEND diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c index a551f88..fd07ef9 100644 --- a/arch/arm64/kernel/time.c +++ b/arch/arm64/kernel/time.c @@ -33,6 +33,7 @@ #include <linux/irq.h> #include <linux/delay.h> #include <linux/clocksource.h> +#include <linux/sched_clock.h> #include <clocksource/arm_arch_timer.h> @@ -61,13 +62,6 @@ unsigned long profile_pc(struct pt_regs *regs) EXPORT_SYMBOL(profile_pc); #endif -static u64 sched_clock_mult __read_mostly; - -unsigned long long notrace sched_clock(void) -{ - return arch_timer_read_counter() * sched_clock_mult; -} - int read_current_timer(unsigned long *timer_value) { *timer_value = arch_timer_read_counter(); @@ -84,8 +78,7 @@ void __init time_init(void) if (!arch_timer_rate) panic("Unable to initialise architected timer.\n"); - /* Cache the sched_clock multiplier to save a divide in the hot path. */ - sched_clock_mult = NSEC_PER_SEC / arch_timer_rate; + setup_sched_clock_64(arch_timer_read_counter, 56, arch_timer_rate); /* Calibrate the delay loop directly */ lpj_fine = arch_timer_rate / HZ; -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2013-05-01 0:54 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-04-18 19:30 [PATCH 1/2] clocksource: arm_arch_timer: unify sched_clock init Rob Herring 2013-04-18 19:30 ` Rob Herring 2013-04-18 19:30 ` [PATCH 2/2] clocksource: arm_arch_timer: add boot and suspend sched_clock offset Rob Herring 2013-04-18 19:30 ` Rob Herring 2013-04-19 14:46 ` Catalin Marinas 2013-04-19 14:46 ` Catalin Marinas 2013-04-19 0:00 ` [PATCH 1/2] clocksource: arm_arch_timer: unify sched_clock init Stephen Boyd 2013-04-19 0:00 ` Stephen Boyd 2013-04-19 1:37 ` Rob Herring 2013-04-19 1:37 ` Rob Herring 2013-04-19 17:34 ` Stephen Boyd 2013-04-19 17:34 ` Stephen Boyd 2013-04-20 0:29 ` [PATCH 0/4] ARM 64 bit sched_clock take #2 Stephen Boyd 2013-04-20 0:29 ` Stephen Boyd 2013-04-20 0:29 ` [PATCH 1/4] ARM: sched_clock: Remove unused needs_suspend member Stephen Boyd 2013-04-20 0:29 ` Stephen Boyd 2013-04-20 0:29 ` [PATCH 2/4] ARM: sched_clock: Return suspended count earlier Stephen Boyd 2013-04-20 0:29 ` Stephen Boyd 2013-04-20 0:29 ` [PATCH 3/4] ARM: sched_clock: Add support for >32 bit sched_clock Stephen Boyd 2013-04-20 0:29 ` Stephen Boyd 2013-04-20 0:29 ` Stephen Boyd 2013-04-22 10:48 ` Will Deacon 2013-04-22 10:48 ` Will Deacon 2013-04-22 10:48 ` Will Deacon 2013-04-22 15:35 ` Stephen Boyd 2013-04-22 15:35 ` Stephen Boyd 2013-04-22 15:35 ` Stephen Boyd 2013-04-20 0:29 ` [PATCH 4/4] ARM: arch_timer: Move to setup_sched_clock_64() Stephen Boyd 2013-04-20 0:29 ` Stephen Boyd 2013-04-22 15:16 ` [PATCH 0/4] ARM 64 bit sched_clock take #2 Arnd Bergmann 2013-04-22 15:16 ` Arnd Bergmann 2013-04-22 15:34 ` Mark Rutland 2013-04-22 15:34 ` Mark Rutland 2013-04-22 15:34 ` Mark Rutland 2013-04-22 15:36 ` Stephen Boyd 2013-04-22 15:36 ` Stephen Boyd 2013-04-22 15:36 ` Stephen Boyd 2013-04-22 15:51 ` Mark Rutland 2013-04-22 15:51 ` Mark Rutland 2013-04-22 15:51 ` Mark Rutland 2013-04-22 17:00 ` John Stultz 2013-04-22 17:00 ` John Stultz 2013-04-22 20:46 ` Rob Herring 2013-04-22 20:46 ` Rob Herring 2013-04-22 20:46 ` Rob Herring 2013-04-23 16:34 ` Stephen Boyd 2013-04-23 16:34 ` Stephen Boyd 2013-05-01 0:54 ` [PATCH 5/4] sched: Make ARM's sched_clock generic for all architectures Stephen Boyd 2013-05-01 0:54 ` Stephen Boyd 2013-05-01 0:54 ` Stephen Boyd [this message] 2013-05-01 0:54 ` [PATCH 6/4] arm64: Move to generic sched_clock infrastructure Stephen Boyd 2013-05-01 9:11 ` Catalin Marinas 2013-05-01 9:11 ` Catalin Marinas 2013-05-01 9:11 ` Catalin Marinas 2013-05-01 14:44 ` Christopher Covington 2013-05-01 14:44 ` Christopher Covington 2013-05-01 14:44 ` Christopher Covington 2013-05-31 20:40 ` [PATCH 5/4] sched: Make ARM's sched_clock generic for all architectures John Stultz 2013-05-31 20:40 ` John Stultz 2013-05-31 22:13 ` Stephen Boyd 2013-05-31 22:13 ` Stephen Boyd 2013-05-31 23:50 ` John Stultz 2013-05-31 23:50 ` John Stultz 2013-04-19 14:45 ` [PATCH 1/2] clocksource: arm_arch_timer: unify sched_clock init Catalin Marinas 2013-04-19 14:45 ` Catalin Marinas
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1367369675-13535-2-git-send-email-sboyd@codeaurora.org \ --to=sboyd@codeaurora.org \ --cc=arm@kernel.org \ --cc=catalin.marinas@arm.com \ --cc=john.stultz@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=robherring2@gmail.com \ --cc=tglx@linutronix.de \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.