From patchwork Mon Sep 30 17:41:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 279203 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8B8132C00E9 for ; Tue, 1 Oct 2013 03:48:50 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQhaM-0004LW-1t; Mon, 30 Sep 2013 17:48:42 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQhaI-0003Bw-My; Mon, 30 Sep 2013 17:48:38 +0000 Received: from mail-we0-f175.google.com ([74.125.82.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VQhaF-0003Bb-54 for linux-arm-kernel@lists.infradead.org; Mon, 30 Sep 2013 17:48:36 +0000 Received: by mail-we0-f175.google.com with SMTP id q59so6095079wes.34 for ; Mon, 30 Sep 2013 10:48:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding; bh=4ZqKdHwEwEBnTs5ZruRKacM+8oTgtkmBfv1mG0cgclk=; b=kAmYa8XVaCrUXm6HYGalFbeu5pMBjHD+Jyn3ThEOyXFtHJX9SPlYlb2CKPLZOR0Ohx VQnyJPlHtnf2YWg2AK+FijcQFJ1kHTrib8ZgsxKnGUi46396XLYMb5RWQWZjj1IeWRk0 e+NdhYkxnGAho/rzhdUf8kuCUYjgS6/vX2U2B9BCpA6CeyoZ7fHS5TrovyTzr+9UA7PZ NXG1MNjlTjhpgsONJph/GpQojGN/ZRhM9jpowTjhMw2hQ2gI6K0jFezyDis+hAj1qR6m Wvt/0TGX1g/Azs0SQlgSjph3ekF6qTwnEpMWW9MxncDILXwS6CIDyhq6a2C9nAnDUYtU iNJw== X-Gm-Message-State: ALoCoQkeOV8jkhVO1yAL0fqh5waTy31JJ/WLru2rhqO9Qn8y84nIueMBvnrb6KeWHDqMIxhd9/sB X-Received: by 10.194.158.67 with SMTP id ws3mr18693736wjb.5.1380562917021; Mon, 30 Sep 2013 10:41:57 -0700 (PDT) Received: from [192.168.1.150] (AToulouse-654-1-326-179.w86-199.abo.wanadoo.fr. [86.199.213.179]) by mx.google.com with ESMTPSA id ey4sm3142404wic.11.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Sep 2013 10:41:56 -0700 (PDT) Message-ID: <5249B7E2.5060201@linaro.org> Date: Mon, 30 Sep 2013 19:41:54 +0200 From: Daniel Lezcano User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Thomas Gleixner Subject: [GIT PULL]: clocksource: new material for 3.13 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130930_134835_457083_247796C6 X-CRM114-Status: GOOD ( 21.00 ) X-Spam-Score: 0.8 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.175 listed in list.dnswl.org] 3.4 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: prarit@redhat.com, Sudeep KarkadaNagesha , Will Deacon , Stephen Boyd , Linux Kernel Mailing List , zoran markovic , mlichvar@redhat.com, John Stultz , "linux-arm-kernel@lists.infradead.org" , Ingo Molnar , Soren Brinkmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Thomas, this pull request is based on 3.12-rc3 with the following content: - Miroslav improved the RTC update by increasing the interval acceptable for an update in the sync_cmos_clock workqueue callback - Prarit added a missing function declaration to fix a compilation issue on x86. Please *note*, this patch is coming from a pull from John's tree, it would make sense to cherry-pick this fix into timers/urgent - Soren added FEAT_PERCPU to a clock device when it is local per cpu. This feature prevents the clock framework to choose a per cpu timer as a broadcast timer. This problem arised when the ARM global timer is used which is the case now on Xillinx. - Stephen extended the generic sched_clock code to support 64bit counters and removes the setup_sched_clock deprecation, as that causes lots of warnings since there's still users in the arch/arm tree. - Will and Sudeep implemented the event stream for architected timer. The event streams can be used to impose a timeout on a wfe, to safeguard against any programming error in case an expected event is not generated or even to implement wfe-based timeouts for userspace locking implementations. - Zoran prevents to enter suspend mode if there are pending RTC timers to be handled, avoiding these ones to be delayed as well as the subsequent possible time critical code tied with them. Thanks -- Daniel The following changes since commit 15c03dd4859ab16f9212238f29dd315654aa94f6: Linux 3.12-rc3 (2013-09-29 15:02:38 -0700) are available in the git repository at: git://git.linaro.org/people/dlezcano/linux.git clockevents/3.13 for you to fetch changes up to 7267c876a4784f9b9a75d057bc487b6a5e01ced9: Merge branch 'clockevents/3-13.arch-timer' into clockevents/3.13 (2013-09-30 16:37:56 +0200) ---------------------------------------------------------------- Daniel Lezcano (3): Merge branch 'fordlezcano/3.13/sched-clock64-conversion' of git://git.linaro.org/people/jstultz/linux into clockevents/3.13 Merge branch 'clockevents/3-13.global-timer' into clockevents/3.13 Merge branch 'clockevents/3-13.arch-timer' into clockevents/3.13 John Stultz (3): Merge branch 'fortglx/3.12/sched-clock64-base' into fortglx/3.13/time Merge branch 'fortglx/3.12/time' into fortglx/3.13/time Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64-conversion Miroslav Lichvar (1): ntp: Make periodic RTC update more reliable Prarit Bhargava (1): clocksource: Fix !CONFIG_CLOCKSOURCE_WATCHDOG compile Soren Brinkmann (4): clockchips: Add FEAT_PERCPU clockevent flag clocksource/arm_global_timer: Set FEAT_PERCPU flag tick: broadcast: Deny per-cpu clockevents from being broadcast sources arm: zynq: Enable arm_global_timer Stephen Boyd (14): clocksource: Extract max nsec calculation into separate function sched_clock: Use seqcount instead of rolling our own sched_clock: Use an hrtimer instead of timer sched_clock: Add support for >32 bit sched_clock clocksource: bcm2835: Switch to sched_clock_register() clocksource: dbx500-prcmu: Switch to sched_clock_register() clocksource: dw_apb_timer_of: Switch to sched_clock_register() clocksource: mxs_timer: Switch to sched_clock_register() clocksource: nomadik: Switch to sched_clock_register() clocksource: samsung_pwm_timer: Switch to sched_clock_register() clocksource: tegra: Switch to sched_clock_register() clocksource: time-armada-370-xp: Switch to sched_clock_register() clocksource: sirf: Switch to sched_clock_register() and use 64 bits clocksource: vf_pit_timer: Switch to sched_clock_register() Sudeep KarkadaNagesha (4): ARM/ARM64: arch_timer: add macros for bits in control register ARM: arch_timer: add support to configure and enable event stream ARM64: arch_timer: add support to configure and enable event stream drivers: clocksource: add CPU PM notifier for ARM architected timer Will Deacon (1): drivers: clocksource: add support for ARM architected timer event stream Zoran Markovic (1): rtc: Keep system awake until all expired RTC timers are handled arch/arm/boot/dts/zynq-7000.dtsi | 8 +++ arch/arm/include/asm/arch_timer.h | 36 ++++++++-- arch/arm/include/uapi/asm/hwcap.h | 1 + arch/arm/kernel/setup.c | 1 + arch/arm/mach-zynq/Kconfig | 1 + arch/arm64/include/asm/arch_timer.h | 42 +++++++++-- arch/arm64/include/asm/hwcap.h | 11 +-- arch/arm64/include/uapi/asm/hwcap.h | 1 + arch/arm64/kernel/setup.c | 11 +++ drivers/clocksource/Kconfig | 15 ++++ drivers/clocksource/arm_arch_timer.c | 49 +++++++++++++ drivers/clocksource/arm_global_timer.c | 3 +- drivers/clocksource/bcm2835_timer.c | 4 +- drivers/clocksource/clksrc-dbx500-prcmu.c | 5 +- drivers/clocksource/dw_apb_timer_of.c | 4 +- drivers/clocksource/mxs_timer.c | 4 +- drivers/clocksource/nomadik-mtu.c | 4 +- drivers/clocksource/samsung_pwm_timer.c | 4 +- drivers/clocksource/tegra20_timer.c | 4 +- drivers/clocksource/time-armada-370-xp.c | 4 +- drivers/clocksource/timer-prima2.c | 6 +- drivers/clocksource/vf_pit_timer.c | 4 +- drivers/rtc/interface.c | 13 ++-- include/clocksource/arm_arch_timer.h | 10 +++ include/linux/clockchips.h | 1 + include/linux/clocksource.h | 2 + include/linux/sched_clock.h | 2 + kernel/time/clocksource.c | 46 ++++++++---- kernel/time/ntp.c | 3 +- kernel/time/sched_clock.c | 111 ++++++++++++++++------------- kernel/time/tick-broadcast.c | 1 + 31 files changed, 302 insertions(+), 109 deletions(-)