From: Mark Allyn <[email protected]>
Signed-off-by: Mark Allyn <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/staging/sep/sep_driver.c | 9 ++++++++-
drivers/staging/sep/sep_driver_config.h | 2 ++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 5a54f98..83475eb 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -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"
@@ -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 */
@@ -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) */
diff --git a/drivers/staging/sep/sep_driver_config.h
b/drivers/staging/sep/sep_driver_config.h
index b96045f..92338c0 100644
--- a/drivers/staging/sep/sep_driver_config.h
+++ b/drivers/staging/sep/sep_driver_config.h
@@ -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 */
--
1.7.3.2
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
