summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-tegra')
-rw-r--r--arch/arm/mach-tegra/arb_sema.c3
-rw-r--r--arch/arm/mach-tegra/include/mach/arb_sema.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/arb_sema.c b/arch/arm/mach-tegra/arb_sema.c
index 55af15e935f2..eecdee5967c8 100644
--- a/arch/arm/mach-tegra/arb_sema.c
+++ b/arch/arm/mach-tegra/arb_sema.c
@@ -36,6 +36,7 @@
#define ARB_GRANT_STATUS 0x0
#define ARB_GRANT_REQUEST 0x4
#define ARB_GRANT_RELEASE 0x8
+#define ARB_GRANT_PENDING 0xC
struct tegra_arb_dev {
void __iomem *sema_base;
@@ -117,7 +118,7 @@ int tegra_arb_mutex_lock_timeout(enum tegra_arb_module lock, int msecs)
request_arb_sem(lock);
ret = wait_for_completion_timeout(&arb->arb_gnt_complete[lock], msecs_to_jiffies(msecs));
if (ret == 0) {
- pr_err("timed out.\n");
+ pr_err("timed out. pending:0x%x\n", arb_sema_read(ARB_GRANT_PENDING));
cancel_arb_sem(lock);
mutex_unlock(&arb->mutexes[lock]);
return -ETIMEDOUT;
diff --git a/arch/arm/mach-tegra/include/mach/arb_sema.h b/arch/arm/mach-tegra/include/mach/arb_sema.h
index 374c5a913700..9283f079cf61 100644
--- a/arch/arm/mach-tegra/include/mach/arb_sema.h
+++ b/arch/arm/mach-tegra/include/mach/arb_sema.h
@@ -24,7 +24,8 @@
#define __MACH_TEGRA_ARB_SEMA_H
enum tegra_arb_module {
- TEGRA_ARB_AES = 0,
+ TEGRA_ARB_BSEV = 0,
+ TEGRA_ARB_BSEA,
};
int tegra_arb_mutex_lock_timeout(enum tegra_arb_module lock, int msecs);