x86/apic change for v5.2
Linus,
Please pull the latest x86-apic-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-apic-for-linus
# HEAD: 6eb4f08293e971cb1b7b867c7fe994c244b91460 x86/apic: Unify duplicated local apic timer clockevent initialization
Contains a single commit which unifies the unnecessarily diverged implementations of APIC timer initialization. As a result the max_delta parameter is now consistently taken into account.
Thanks,
Ingo
------------------>
Jacob Pan (1):
x86/apic: Unify duplicated local apic timer clockevent initialization
arch/x86/kernel/apic/apic.c | 57 ++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 26 deletions(-)
arch/x86/kernel/apic/apic.c +31 -26
@@ -802,6 +802,24 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)return 0 ; } +static int __init lapic_init_clockevent (void ) +{ +if (!lapic_timer_frequency) +return -1 ; + +/* Calculate the scaled math multiplication factor */ + lapic_clockevent.mult =div_sc (lapic_timer_frequency/APIC_DIVISOR , +TICK_NSEC , lapic_clockevent.shift); + lapic_clockevent.max_delta_ns = +clockevent_delta2ns (0x7FFFFFFF , &lapic_clockevent); + lapic_clockevent.max_delta_ticks =0x7FFFFFFF ; + lapic_clockevent.min_delta_ns = +clockevent_delta2ns (0xF , &lapic_clockevent); + lapic_clockevent.min_delta_ticks =0xF ; + +return 0 ; +} +static int __init calibrate_APIC_clock (void ) {struct clock_event_device *levt =this_cpu_ptr (&lapic_events);
@@ -810,25 +828,21 @@ static int __init calibrate_APIC_clock(void)long delta, deltatsc;int pm_referenced =0 ; -/** -* check if lapic timer has already been calibrated by platform -* specific routine, such as tsc calibration code. if so, we just fill +if (boot_cpu_has (X86_FEATURE_TSC_DEADLINE_TIMER )) +return 0 ; + +/* +* Check if lapic timer has already been calibrated by platform +* specific routine, such as tsc calibration code. If so just fill * in the clockevent structure and return. */ - -if (boot_cpu_has (X86_FEATURE_TSC_DEADLINE_TIMER )) { -return 0 ; - }else if (lapic_timer_frequency) { +if (!lapic_init_clockevent ()) {apic_printk (APIC_VERBOSE ,"lapic timer already calibrated %d\n" , - lapic_timer_frequency); - lapic_clockevent.mult =div_sc (lapic_timer_frequency/APIC_DIVISOR , -TICK_NSEC , lapic_clockevent.shift); - lapic_clockevent.max_delta_ns = -clockevent_delta2ns (0x7FFFFF , &lapic_clockevent); - lapic_clockevent.max_delta_ticks =0x7FFFFF ; - lapic_clockevent.min_delta_ns = -clockevent_delta2ns (0xF , &lapic_clockevent); - lapic_clockevent.min_delta_ticks =0xF ; + lapic_timer_frequency); +/* +* Direct calibration methods must have an always running +* local APIC timer, no need for broadcast timer. +*/ lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY ;return 0 ; }
@@ -869,17 +883,8 @@ static int __init calibrate_APIC_clock(void) pm_referenced = !calibrate_by_pmtimer (lapic_cal_pm2 - lapic_cal_pm1, &delta, &deltatsc); -/* Calculate the scaled math multiplication factor */ - lapic_clockevent.mult =div_sc (delta,TICK_NSEC *LAPIC_CAL_LOOPS , - lapic_clockevent.shift); - lapic_clockevent.max_delta_ns = -clockevent_delta2ns (0x7FFFFFFF , &lapic_clockevent); - lapic_clockevent.max_delta_ticks =0x7FFFFFFF ; - lapic_clockevent.min_delta_ns = -clockevent_delta2ns (0xF , &lapic_clockevent); - lapic_clockevent.min_delta_ticks =0xF ; - lapic_timer_frequency = (delta *APIC_DIVISOR ) /LAPIC_CAL_LOOPS ; +lapic_init_clockevent ();apic_printk (APIC_VERBOSE ,"..... delta %ld\n" , delta);apic_printk (APIC_VERBOSE ,"..... mult: %u\n" , lapic_clockevent.mult);
The pull request you sent on Mon, 6 May 2019 11:31:15 +0200:
The pull request you sent on Mon, 6 May 2019 11:31:15 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-apic-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/80e77644efcc1ec1064edd4c66a989cdf2e7ec7e
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker