From da468442a086845539fd5cebcf3f831aec69cd3a Mon Sep 17 00:00:00 2001
From: Anthony Zhou <anzhou@nvidia.com>
Date: Mon, 4 Jul 2016 16:31:30 +0800
Subject: trusty: Add return check for IPA to PA

Check the return value of hyp_ipa_translate, if it is not 0,
report error and return.

Bug 200044390

Change-Id: Ic28a18164e162d5a399b4227f42f04cc97cedbce
Signed-off-by: Anthony Zhou <anzhou@nvidia.com>
Reviewed-on: http://git-master/r/1241638
(cherry picked from commit 4e06cd93edec2d67c62d6fc9408e2690afbfc9fd)
Reviewed-on: https://git-master.nvidia.com/r/1488435
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Tested-by: Stephen Wolfe <swolfe@nvidia.com>
Reviewed-by: Timo Alho <talho@nvidia.com>
---
 include/linux/trusty/trusty.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include/linux')

diff --git a/include/linux/trusty/trusty.h b/include/linux/trusty/trusty.h
index a203e6943..41623faa9 100644
--- a/include/linux/trusty/trusty.h
+++ b/include/linux/trusty/trusty.h
@@ -19,6 +19,7 @@
 #include <linux/trusty/sm_err.h>
 #include <linux/device.h>
 #include <linux/pagemap.h>
+#include <linux/tegra-soc.h>
 
 enum {
 	TRUSTY_DEV_UNINIT = -1,
@@ -33,9 +34,7 @@ s32 trusty_fast_call32(struct device *dev, u32 smcnr, u32 a0, u32 a1, u32 a2);
 #ifdef CONFIG_64BIT
 s64 trusty_fast_call64(struct device *dev, u64 smcnr, u64 a0, u64 a1, u64 a2);
 #endif
-#ifdef CONFIG_TEGRA_VIRTUALIZATION
 int hyp_ipa_translate(uint64_t *ipa);
-#endif
 #else
 static inline s32 trusty_std_call32(struct device *dev, u32 smcnr,
 				    u32 a0, u32 a1, u32 a2)
-- 
cgit v1.2.2