summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorSami Kiminki <skiminki@nvidia.com>2014-05-20 18:15:54 +0300
committerRiham Haidar <rhaidar@nvidia.com>2014-05-28 13:43:42 -0700
commitfdaf192b25762fb9c183e9aab527e4af7887cff1 (patch)
tree59a9ecb32dc8ffb4c3f3bd996e881793a6160542 /drivers/platform
parent589f59242f7321e8891f542ca913f53ef9e9efbf (diff)
tegra: mc: Add missing mc error description
Add MC error description for combination INVALID_SMMU_PAGE + DECERR_VPR + DECERR_EMEM. Bug 1500983 Change-Id: I37158c843ff534ab22f9ada0c66ae1d3d76bf650 Signed-off-by: Sami Kiminki <skiminki@nvidia.com> Reviewed-on: http://git-master/r/412102 (cherry picked from commit ea8e9e5251c4bc24df93c4d964f7546569647972) Reviewed-on: http://git-master/r/415240 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/tegra/mc/mcerr.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/platform/tegra/mc/mcerr.c b/drivers/platform/tegra/mc/mcerr.c
index 5aa8c4a5da5a..80aee25732f4 100644
--- a/drivers/platform/tegra/mc/mcerr.c
+++ b/drivers/platform/tegra/mc/mcerr.c
@@ -79,7 +79,7 @@ static const struct mc_error mc_errors[] = {
"EMEM address decode error",
0, MC_ERR_STATUS, MC_ERR_ADR),
MC_ERR(MC_INT_DECERR_VPR,
- "MC request violates VPR requirments",
+ "MC request violates VPR requirements",
0, MC_ERR_VPR_STATUS, MC_ERR_VPR_ADR),
MC_ERR(MC_INT_SECURITY_VIOLATION,
"non secure access to secure region",
@@ -103,6 +103,10 @@ static const struct mc_error mc_errors[] = {
MC_ERR(MC_INT_INVALID_SMMU_PAGE | MC_INT_DECERR_VPR,
"VPR SMMU address translation fault",
E_SMMU, MC_ERR_VPR_STATUS, MC_ERR_VPR_ADR),
+ MC_ERR(MC_INT_INVALID_SMMU_PAGE | MC_INT_DECERR_VPR |
+ MC_INT_DECERR_EMEM,
+ "EMEM decode error on PDE or PTE entry on VPR context",
+ E_SMMU, MC_ERR_VPR_STATUS, MC_ERR_VPR_ADR),
/*
* Baseband controller related faults.