mirror of https://gitee.com/openkylin/linux.git
x86/apic: Drop local_irq_save/restore in timer callbacks
These callbacks are called with interrupts disabled from the core code. Fixup the local caller to disable interrupts. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
parent
b23d8e5278
commit
c948c26048
arch/x86/kernel/apic
|
@ -464,40 +464,27 @@ static int lapic_next_deadline(unsigned long delta,
|
||||||
|
|
||||||
static int lapic_timer_shutdown(struct clock_event_device *evt)
|
static int lapic_timer_shutdown(struct clock_event_device *evt)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
|
||||||
unsigned int v;
|
unsigned int v;
|
||||||
|
|
||||||
/* Lapic used as dummy for broadcast ? */
|
/* Lapic used as dummy for broadcast ? */
|
||||||
if (evt->features & CLOCK_EVT_FEAT_DUMMY)
|
if (evt->features & CLOCK_EVT_FEAT_DUMMY)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
local_irq_save(flags);
|
|
||||||
|
|
||||||
v = apic_read(APIC_LVTT);
|
v = apic_read(APIC_LVTT);
|
||||||
v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
|
v |= (APIC_LVT_MASKED | LOCAL_TIMER_VECTOR);
|
||||||
apic_write(APIC_LVTT, v);
|
apic_write(APIC_LVTT, v);
|
||||||
apic_write(APIC_TMICT, 0);
|
apic_write(APIC_TMICT, 0);
|
||||||
|
|
||||||
local_irq_restore(flags);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int
|
static inline int
|
||||||
lapic_timer_set_periodic_oneshot(struct clock_event_device *evt, bool oneshot)
|
lapic_timer_set_periodic_oneshot(struct clock_event_device *evt, bool oneshot)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
|
||||||
|
|
||||||
/* Lapic used as dummy for broadcast ? */
|
/* Lapic used as dummy for broadcast ? */
|
||||||
if (evt->features & CLOCK_EVT_FEAT_DUMMY)
|
if (evt->features & CLOCK_EVT_FEAT_DUMMY)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
local_irq_save(flags);
|
|
||||||
|
|
||||||
__setup_APIC_LVTT(lapic_timer_frequency, oneshot, 1);
|
__setup_APIC_LVTT(lapic_timer_frequency, oneshot, 1);
|
||||||
|
|
||||||
local_irq_restore(flags);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -804,6 +791,7 @@ static int __init calibrate_APIC_clock(void)
|
||||||
cpu_relax();
|
cpu_relax();
|
||||||
|
|
||||||
/* Stop the lapic timer */
|
/* Stop the lapic timer */
|
||||||
|
local_irq_disable();
|
||||||
lapic_timer_shutdown(levt);
|
lapic_timer_shutdown(levt);
|
||||||
|
|
||||||
/* Jiffies delta */
|
/* Jiffies delta */
|
||||||
|
@ -815,8 +803,8 @@ static int __init calibrate_APIC_clock(void)
|
||||||
apic_printk(APIC_VERBOSE, "... jiffies result ok\n");
|
apic_printk(APIC_VERBOSE, "... jiffies result ok\n");
|
||||||
else
|
else
|
||||||
levt->features |= CLOCK_EVT_FEAT_DUMMY;
|
levt->features |= CLOCK_EVT_FEAT_DUMMY;
|
||||||
} else
|
}
|
||||||
local_irq_enable();
|
local_irq_enable();
|
||||||
|
|
||||||
if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
|
if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
|
||||||
pr_warning("APIC timer disabled due to verification failure\n");
|
pr_warning("APIC timer disabled due to verification failure\n");
|
||||||
|
|
Loading…
Reference in New Issue