Commit 1d49112b authored by Anthony Zhou's avatar Anthony Zhou Committed by Varun Wadekar
Browse files

Tegra: sip_calls: fix defects flagged by MISRA scan



Main fixes:

* Expressions resulting from the expansion of macro parameters
  shall be enclosed in parentheses [Rule 20.7]
* Added explicit casts (e.g. 0U) to integers in order for them
  to be compatible with whatever operation they're used in [Rule
  10.1]
* Fix implicit widening of composite assignment [Rule 10.6]

Change-Id: Ia83c3ab6e4c8c03c19c950978a7936ebfc290590
Signed-off-by: default avatarAnthony Zhou <anzhou@nvidia.com>
Signed-off-by: default avatarVarun Wadekar <vwadekar@nvidia.com>
parent b495791b
...@@ -41,10 +41,20 @@ int plat_sip_handler(uint32_t smc_fid, ...@@ -41,10 +41,20 @@ int plat_sip_handler(uint32_t smc_fid,
uint64_t x2, uint64_t x2,
uint64_t x3, uint64_t x3,
uint64_t x4, uint64_t x4,
void *cookie, const void *cookie,
void *handle, void *handle,
uint64_t flags) uint64_t flags)
{ {
/* unused parameters */
(void)smc_fid;
(void)x1;
(void)x2;
(void)x3;
(void)x4;
(void)cookie;
(void)handle;
(void)flags;
return -ENOTSUP; return -ENOTSUP;
} }
...@@ -61,7 +71,7 @@ uintptr_t tegra_sip_handler(uint32_t smc_fid, ...@@ -61,7 +71,7 @@ uintptr_t tegra_sip_handler(uint32_t smc_fid,
u_register_t flags) u_register_t flags)
{ {
uint32_t regval; uint32_t regval;
int err; int32_t err;
/* Check if this is a SoC specific SiP */ /* Check if this is a SoC specific SiP */
err = plat_sip_handler(smc_fid, x1, x2, x3, x4, cookie, handle, flags); err = plat_sip_handler(smc_fid, x1, x2, x3, x4, cookie, handle, flags);
...@@ -176,9 +186,9 @@ uintptr_t tegra_sip_handler(uint32_t smc_fid, ...@@ -176,9 +186,9 @@ uintptr_t tegra_sip_handler(uint32_t smc_fid,
DECLARE_RT_SVC( DECLARE_RT_SVC(
tegra_sip_fast, tegra_sip_fast,
OEN_SIP_START, (OEN_SIP_START),
OEN_SIP_END, (OEN_SIP_END),
SMC_TYPE_FAST, (SMC_TYPE_FAST),
NULL, (NULL),
tegra_sip_handler (tegra_sip_handler)
); );
...@@ -99,4 +99,22 @@ void tegra_delay_timer_init(void); ...@@ -99,4 +99,22 @@ void tegra_delay_timer_init(void);
void tegra_secure_entrypoint(void); void tegra_secure_entrypoint(void);
void tegra186_cpu_reset_handler(void); void tegra186_cpu_reset_handler(void);
/* Declarations for tegra_sip_calls.c */
uintptr_t tegra_sip_handler(uint32_t smc_fid,
u_register_t x1,
u_register_t x2,
u_register_t x3,
u_register_t x4,
void *cookie,
void *handle,
u_register_t flags);
int plat_sip_handler(uint32_t smc_fid,
uint64_t x1,
uint64_t x2,
uint64_t x3,
uint64_t x4,
const void *cookie,
void *handle,
uint64_t flags);
#endif /* TEGRA_PRIVATE_H */ #endif /* TEGRA_PRIVATE_H */
...@@ -38,7 +38,7 @@ int plat_sip_handler(uint32_t smc_fid, ...@@ -38,7 +38,7 @@ int plat_sip_handler(uint32_t smc_fid,
uint64_t x2, uint64_t x2,
uint64_t x3, uint64_t x3,
uint64_t x4, uint64_t x4,
void *cookie, const void *cookie,
void *handle, void *handle,
uint64_t flags) uint64_t flags)
{ {
......
...@@ -60,7 +60,7 @@ int plat_sip_handler(uint32_t smc_fid, ...@@ -60,7 +60,7 @@ int plat_sip_handler(uint32_t smc_fid,
uint64_t x2, uint64_t x2,
uint64_t x3, uint64_t x3,
uint64_t x4, uint64_t x4,
void *cookie, const void *cookie,
void *handle, void *handle,
uint64_t flags) uint64_t flags)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment