mei: stop the stall timer worker if not needed
The stall timer worker checks periodically if there is a stalled i/o transaction. The issue with the current implementation is that the timer is ticking also when there is no pending i/o transaction. This patch provides a simple change that prevents rescheduling of the delayed work when there is no pending i/o. Cc: Andy Lutomirski <luto@kernel.org> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
6eb1c9496b
commit
1892fc2ee4
@@ -459,6 +459,19 @@ static void mei_connect_timeout(struct mei_cl *cl)
|
||||
mei_reset(dev);
|
||||
}
|
||||
|
||||
#define MEI_STALL_TIMER_FREQ (2 * HZ)
|
||||
/**
|
||||
* mei_schedule_stall_timer - re-arm stall_timer work
|
||||
*
|
||||
* Schedule stall timer
|
||||
*
|
||||
* @dev: the device structure
|
||||
*/
|
||||
void mei_schedule_stall_timer(struct mei_device *dev)
|
||||
{
|
||||
schedule_delayed_work(&dev->timer_work, MEI_STALL_TIMER_FREQ);
|
||||
}
|
||||
|
||||
/**
|
||||
* mei_timer - timer function.
|
||||
*
|
||||
@@ -468,10 +481,9 @@ static void mei_connect_timeout(struct mei_cl *cl)
|
||||
void mei_timer(struct work_struct *work)
|
||||
{
|
||||
struct mei_cl *cl;
|
||||
|
||||
struct mei_device *dev = container_of(work,
|
||||
struct mei_device, timer_work.work);
|
||||
|
||||
bool reschedule_timer = false;
|
||||
|
||||
mutex_lock(&dev->device_lock);
|
||||
|
||||
@@ -486,6 +498,7 @@ void mei_timer(struct work_struct *work)
|
||||
mei_reset(dev);
|
||||
goto out;
|
||||
}
|
||||
reschedule_timer = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -500,6 +513,7 @@ void mei_timer(struct work_struct *work)
|
||||
mei_connect_timeout(cl);
|
||||
goto out;
|
||||
}
|
||||
reschedule_timer = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -512,11 +526,14 @@ void mei_timer(struct work_struct *work)
|
||||
mei_reset(dev);
|
||||
|
||||
mei_amthif_run_next_cmd(dev);
|
||||
goto out;
|
||||
}
|
||||
reschedule_timer = true;
|
||||
}
|
||||
|
||||
out:
|
||||
if (dev->dev_state != MEI_DEV_DISABLED)
|
||||
schedule_delayed_work(&dev->timer_work, 2 * HZ);
|
||||
if (dev->dev_state != MEI_DEV_DISABLED && reschedule_timer)
|
||||
mei_schedule_stall_timer(dev);
|
||||
|
||||
mutex_unlock(&dev->device_lock);
|
||||
}
|
||||
|
Reference in New Issue
Block a user