openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipmi: reduce polling 

We can reasonably alter the poll rate depending on whether we're
performing a transaction or merely waiting for an event.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Garrett 2010-05-26 14:43:49 -07:00 committed by Linus Torvalds
parent ea4078ca1a
commit 3326f4f227
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/char/ipmi/ipmi_si_intf.c
View File

@ -893,6 +893,9 @@ static void sender(void *send_info,
mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES); mod_timer(&smi_info->si_timer, jiffies + SI_TIMEOUT_JIFFIES);
if (smi_info->thread)
wake_up_process(smi_info->thread);
if (smi_info->run_to_completion) { if (smi_info->run_to_completion) {
/* /*
* If we are running to completion, then throw it in * If we are running to completion, then throw it in
@ -1013,6 +1016,8 @@ static int ipmi_thread(void *data)
; /* do nothing */ ; /* do nothing */
else if (smi_result == SI_SM_CALL_WITH_DELAY && busy_wait) else if (smi_result == SI_SM_CALL_WITH_DELAY && busy_wait)
schedule(); schedule();
else if (smi_result == SI_SM_IDLE)
schedule_timeout_interruptible(100);
else else
schedule_timeout_interruptible(0); schedule_timeout_interruptible(0);
} }
@ -1055,6 +1060,7 @@ static void smi_timeout(unsigned long data)
unsigned long flags; unsigned long flags;
unsigned long jiffies_now; unsigned long jiffies_now;
long time_diff; long time_diff;
long timeout;
#ifdef DEBUG_TIMING #ifdef DEBUG_TIMING
struct timeval t; struct timeval t;
#endif #endif
@ -1075,9 +1081,9 @@ static void smi_timeout(unsigned long data)
if ((smi_info->irq) && (!smi_info->interrupt_disabled)) { if ((smi_info->irq) && (!smi_info->interrupt_disabled)) {
/* Running with interrupts, only do long timeouts. */ /* Running with interrupts, only do long timeouts. */
smi_info->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES; timeout = jiffies + SI_TIMEOUT_JIFFIES;
smi_inc_stat(smi_info, long_timeouts); smi_inc_stat(smi_info, long_timeouts);
goto do_add_timer; goto do_mod_timer;
} }
/* /*
@ -1086,15 +1092,15 @@ static void smi_timeout(unsigned long data)
*/ */
if (smi_result == SI_SM_CALL_WITH_DELAY) { if (smi_result == SI_SM_CALL_WITH_DELAY) {
smi_inc_stat(smi_info, short_timeouts); smi_inc_stat(smi_info, short_timeouts);
smi_info->si_timer.expires = jiffies + 1; timeout = jiffies + 1;
} else { } else {
smi_inc_stat(smi_info, long_timeouts); smi_inc_stat(smi_info, long_timeouts);
smi_info->si_timer.expires = jiffies + SI_TIMEOUT_JIFFIES; timeout = jiffies + SI_TIMEOUT_JIFFIES;
} }
do_add_timer: do_mod_timer:
if ((smi_result != SI_SM_IDLE) || smi_info->interrupt_disabled) if (smi_result != SI_SM_IDLE)
add_timer(&(smi_info->si_timer)); mod_timer(&(smi_info->si_timer), timeout);
} }
static irqreturn_t si_irq_handler(int irq, void *data) static irqreturn_t si_irq_handler(int irq, void *data)