lkml.org 
[lkml]   [2022]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.17 006/140] Revert "parisc: Mark sched_clock unstable only if clocks are not syncronized"
    Date
    From: Helge Deller <deller@gmx.de>

    commit 7962c0896429af2a0e00ec6bc15d992536453b2d upstream.

    This reverts commit d97180ad68bdb7ee10f327205a649bc2f558741d.

    It triggers RCU stalls at boot with a 32-bit kernel.

    Signed-off-by: Helge Deller <deller@gmx.de>
    Noticed-by: John David Anglin <dave.anglin@bell.net>
    Cc: stable@vger.kernel.org # v5.15+
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/parisc/kernel/setup.c | 2 ++
    arch/parisc/kernel/time.c | 7 ++++---
    2 files changed, 6 insertions(+), 3 deletions(-)

    --- a/arch/parisc/kernel/setup.c
    +++ b/arch/parisc/kernel/setup.c
    @@ -161,6 +161,8 @@ void __init setup_arch(char **cmdline_p)
    #ifdef CONFIG_PA11
    dma_ops_init();
    #endif
    +
    + clear_sched_clock_stable();
    }

    /*
    --- a/arch/parisc/kernel/time.c
    +++ b/arch/parisc/kernel/time.c
    @@ -265,9 +265,6 @@ static int __init init_cr16_clocksource(
    (cpu0_loc == per_cpu(cpu_data, cpu).cpu_loc))
    continue;

    - /* mark sched_clock unstable */
    - clear_sched_clock_stable();
    -
    clocksource_cr16.name = "cr16_unstable";
    clocksource_cr16.flags = CLOCK_SOURCE_UNSTABLE;
    clocksource_cr16.rating = 0;
    @@ -275,6 +272,10 @@ static int __init init_cr16_clocksource(
    }
    }

    + /* XXX: We may want to mark sched_clock stable here if cr16 clocks are
    + * in sync:
    + * (clocksource_cr16.flags == CLOCK_SOURCE_IS_CONTINUOUS) */
    +
    /* register at clocksource framework */
    clocksource_register_hz(&clocksource_cr16,
    100 * PAGE0->mem_10msec);

    \
     
     \ /
      Last update: 2022-05-10 16:17    [W:4.163 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site