lkml.org 
[lkml]   [2016]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 7/9] x86 tsc_msr: Remove irqoff around MSR-based TSC enumeration
    Date
    From: Len Brown <len.brown@intel.com>

    Remove the irqoff/irqon around MSR-based TSC enumeration,
    as it is not necessary.

    Also rename: try_msr_calibrate_tsc() to cpu_khz_from_msr(),
    as that better describes what the routine does.

    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    arch/x86/include/asm/tsc.h | 3 +--
    arch/x86/kernel/tsc.c | 5 +----
    arch/x86/kernel/tsc_msr.c | 2 +-
    3 files changed, 3 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
    index 174c421..d634f2a 100644
    --- a/arch/x86/include/asm/tsc.h
    +++ b/arch/x86/include/asm/tsc.h
    @@ -52,7 +52,6 @@ extern int notsc_setup(char *);
    extern void tsc_save_sched_clock_state(void);
    extern void tsc_restore_sched_clock_state(void);

    -/* MSR based TSC calibration for Intel Atom SoC platforms */
    -unsigned long try_msr_calibrate_tsc(void);
    +unsigned long cpu_khz_from_msr(void);

    #endif /* _ASM_X86_TSC_H */
    diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
    index c9c4c7c..0ffb57f 100644
    --- a/arch/x86/kernel/tsc.c
    +++ b/arch/x86/kernel/tsc.c
    @@ -674,10 +674,7 @@ unsigned long native_calibrate_tsc(void)
    unsigned long flags, latch, ms, fast_calibrate;
    int hpet = is_hpet_enabled(), i, loopmin;

    - /* Calibrate TSC using MSR for Intel Atom SoCs */
    - local_irq_save(flags);
    - fast_calibrate = try_msr_calibrate_tsc();
    - local_irq_restore(flags);
    + fast_calibrate = cpu_khz_from_msr();
    if (fast_calibrate)
    return fast_calibrate;

    diff --git a/arch/x86/kernel/tsc_msr.c b/arch/x86/kernel/tsc_msr.c
    index c8ea977..b0839c5 100644
    --- a/arch/x86/kernel/tsc_msr.c
    +++ b/arch/x86/kernel/tsc_msr.c
    @@ -68,7 +68,7 @@ static int match_cpu(u8 family, u8 model)
    * Set global "lapic_timer_frequency" to bus_clock_cycles/jiffy
    * Return processor base frequency in KHz, or 0 on failure.
    */
    -unsigned long try_msr_calibrate_tsc(void)
    +unsigned long cpu_khz_from_msr(void)
    {
    u32 lo, hi, ratio, freq_id, freq;
    unsigned long res;
    --
    2.8.0.rc4.16.g56331f8
    \
     
     \ /
      Last update: 2016-03-31 07:01    [W:3.274 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site