diff options
| author | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-25 17:38:23 +0100 |
|---|---|---|
| committer | Antonio Nino Diaz <antonio.ninodiaz@arm.com> | 2018-10-29 14:42:39 +0000 |
| commit | 195e363f84c080bc0e8f3799391164fff1aece70 (patch) | |
| tree | af09ceaec13069597257c1b5f06b518806b8a0bc /lib/pmf | |
| parent | 435349977cad43f4635ca39e0171d7a0d3092a57 (diff) | |
Fix MISRA defects in PMF
No functional changes.
Change-Id: I64abd72026082218a40b1a4b8f7dc26ff2478ba6
Signed-off-by: Antonio Nino Diaz <antonio.ninodiaz@arm.com>
Diffstat (limited to 'lib/pmf')
| -rw-r--r-- | lib/pmf/pmf_main.c | 14 | ||||
| -rw-r--r-- | lib/pmf/pmf_smc.c | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/pmf/pmf_main.c b/lib/pmf/pmf_main.c index 25513c19..fe7bb742 100644 --- a/lib/pmf/pmf_main.c +++ b/lib/pmf/pmf_main.c @@ -26,7 +26,7 @@ IMPORT_SYM(uintptr_t, __PMF_SVC_DESCS_START__, PMF_SVC_DESCS_START); IMPORT_SYM(uintptr_t, __PMF_SVC_DESCS_END__, PMF_SVC_DESCS_END); IMPORT_SYM(uintptr_t, __PMF_PERCPU_TIMESTAMP_END__, PMF_PERCPU_TIMESTAMP_END); -IMPORT_SYM(intptr_t, __PMF_TIMESTAMP_START__, PMF_TIMESTAMP_ARRAY_START); +IMPORT_SYM(uintptr_t, __PMF_TIMESTAMP_START__, PMF_TIMESTAMP_ARRAY_START); #define PMF_PERCPU_TIMESTAMP_SIZE (PMF_PERCPU_TIMESTAMP_END - PMF_TIMESTAMP_ARRAY_START) @@ -67,15 +67,15 @@ int pmf_setup(void) pmf_svc_descs = (pmf_svc_desc_t *) PMF_SVC_DESCS_START; for (ii = 0; ii < pmf_svc_descs_num; ii++) { - assert(pmf_svc_descs[ii].get_ts); + assert(pmf_svc_descs[ii].get_ts != NULL); /* * Call the initialization routine for this * PMF service, if it is defined. */ - if (pmf_svc_descs[ii].init) { + if (pmf_svc_descs[ii].init != NULL) { rc = pmf_svc_descs[ii].init(); - if (rc) { + if (rc != 0) { WARN("Could not initialize PMF" "service %s - skipping \n", pmf_svc_descs[ii].name); @@ -125,7 +125,7 @@ static pmf_svc_desc_t *get_service(unsigned int tid) if (pmf_num_services == 0) return NULL; - assert(pmf_svc_descs); + assert(pmf_svc_descs != NULL); do { mid = (low + high) / 2; @@ -158,7 +158,7 @@ int pmf_get_timestamp_smc(unsigned int tid, unsigned long long *ts_value) { pmf_svc_desc_t *svc_desc; - assert(ts_value); + assert(ts_value != NULL); /* Search for registered service. */ svc_desc = get_service(tid); @@ -247,7 +247,7 @@ unsigned long long __pmf_get_timestamp(uintptr_t base_addr, unsigned long long *ts_addr = (unsigned long long *)calc_ts_addr(base_addr, tid, cpuid); - if (flags & PMF_CACHE_MAINT) + if ((flags & PMF_CACHE_MAINT) != 0U) inv_dcache_range((uintptr_t)ts_addr, sizeof(unsigned long long)); return *ts_addr; diff --git a/lib/pmf/pmf_smc.c b/lib/pmf/pmf_smc.c index e8661180..4c5b14f9 100644 --- a/lib/pmf/pmf_smc.c +++ b/lib/pmf/pmf_smc.c @@ -37,7 +37,8 @@ uintptr_t pmf_smc_handler(unsigned int smc_fid, * x0 --> error code. * x1 - x2 --> time-stamp value. */ - rc = pmf_get_timestamp_smc(x1, x2, x3, &ts_value); + rc = pmf_get_timestamp_smc((unsigned int)x1, x2, + (unsigned int)x3, &ts_value); SMC_RET3(handle, rc, (uint32_t)ts_value, (uint32_t)(ts_value >> 32)); } @@ -49,7 +50,8 @@ uintptr_t pmf_smc_handler(unsigned int smc_fid, * x0 --> error code. * x1 --> time-stamp value. */ - rc = pmf_get_timestamp_smc(x1, x2, x3, &ts_value); + rc = pmf_get_timestamp_smc((unsigned int)x1, x2, + (unsigned int)x3, &ts_value); SMC_RET2(handle, rc, ts_value); } } |