lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 003/100] ARM: 7653/2: do not scale loops_per_jiffy when using a constant delay clock
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Nicolas Pitre <nicolas.pitre@linaro.org>

    commit 70264367a243a68b1d5636ffb570183449803cbe upstream.

    When udelay() is implemented using an architected timer, it is wrong
    to scale loops_per_jiffy when changing the CPU clock frequency since
    the timer clock remains constant.

    The lpj should probably become an implementation detail relevant to
    the CPU loop based delay routine only and more confined to it. In the
    mean time this is the minimal fix needed to have expected delays with
    the timer based implementation when cpufreq is also in use.

    Reported-by: Viresh Kumar <viresh.kumar@linaro.org>
    Signed-off-by: Nicolas Pitre <nico@linaro.org>
    Tested-by: Viresh Kumar <viresh.kumar@linaro.org>
    Acked-by: Liviu Dudau <Liviu.Dudau@arm.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/arm/include/asm/delay.h | 1 +
    arch/arm/kernel/smp.c | 3 +++
    arch/arm/lib/delay.c | 1 +
    3 files changed, 5 insertions(+)

    --- a/arch/arm/include/asm/delay.h
    +++ b/arch/arm/include/asm/delay.h
    @@ -24,6 +24,7 @@ extern struct arm_delay_ops {
    void (*delay)(unsigned long);
    void (*const_udelay)(unsigned long);
    void (*udelay)(unsigned long);
    + bool const_clock;
    } arm_delay_ops;

    #define __delay(n) arm_delay_ops.delay(n)
    --- a/arch/arm/kernel/smp.c
    +++ b/arch/arm/kernel/smp.c
    @@ -693,6 +693,9 @@ static int cpufreq_callback(struct notif
    if (freq->flags & CPUFREQ_CONST_LOOPS)
    return NOTIFY_OK;

    + if (arm_delay_ops.const_clock)
    + return NOTIFY_OK;
    +
    if (!per_cpu(l_p_j_ref, cpu)) {
    per_cpu(l_p_j_ref, cpu) =
    per_cpu(cpu_data, cpu).loops_per_jiffy;
    --- a/arch/arm/lib/delay.c
    +++ b/arch/arm/lib/delay.c
    @@ -77,6 +77,7 @@ void __init register_current_timer_delay
    arm_delay_ops.delay = __timer_delay;
    arm_delay_ops.const_udelay = __timer_const_udelay;
    arm_delay_ops.udelay = __timer_udelay;
    + arm_delay_ops.const_clock = true;
    delay_calibrated = true;
    } else {
    pr_info("Ignoring duplicate/late registration of read_current_timer delay\n");



    \
     
     \ /
      Last update: 2013-03-13 11:43    [W:6.509 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site