Skip to content

Commit

Permalink
Staging: sep: limit time to wait for reconfig shared area complete
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Allyn <mark.a.allyn@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mark Allyn authored and Greg Kroah-Hartman committed Dec 10, 2010
1 parent 8f9346a commit be38efe
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 8 additions & 1 deletion drivers/staging/sep/sep_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include <asm/cacheflush.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/jiffies.h>
#include <linux/rar_register.h>

#include "../memrar/memrar.h"
Expand Down Expand Up @@ -3244,6 +3245,9 @@ static int sep_reconfig_shared_area(struct sep_device *sep)
{
int ret_val;

/* use to limit waiting for SEP */
unsigned long end_time;

dev_dbg(&sep->pdev->dev, "reconfig shared area start\n");

/* Send the new SHARED MESSAGE AREA to the SEP */
Expand All @@ -3255,7 +3259,10 @@ static int sep_reconfig_shared_area(struct sep_device *sep)
/* Poll for SEP response */
ret_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR1_REG_ADDR);

while (ret_val != 0xffffffff && ret_val != sep->shared_bus)
end_time = jiffies + (WAIT_TIME * HZ);

while ((time_before(jiffies, end_time)) && (ret_val != 0xffffffff) &&
(ret_val != sep->shared_bus))
ret_val = sep_read_reg(sep, HW_HOST_SEP_HOST_GPR1_REG_ADDR);

/* Check the return value (register) */
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/sep/sep_driver_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -230,5 +230,7 @@ held by the proccess (struct file) */
/* the token that defines the data pool pointers address */
#define SEP_EXT_CACHE_ADDR_VAL_TOKEN 0xBABABABA

/* Time limit for SEP to finish */
#define WAIT_TIME 10

#endif /* SEP DRIVER CONFIG */

0 comments on commit be38efe

Please sign in to comment.