mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-28 08:08:45 +00:00
d7b5f40823
Usually, C has no problem up-converting types to larger bit sizes. MISRA
rule 10.7 requires that you not do this, or be very explicit about this.
This resolves the following required rule:
bl1/aarch64/bl1_context_mgmt.c:81:[MISRA C-2012 Rule 10.7 (required)]<None>
The width of the composite expression "0U | ((mode & 3U) << 2U) | 1U |
0x3c0U" (32 bits) is less that the right hand operand
"18446744073709547519ULL" (64 bits).
This also resolves MISRA defects such as:
bl2/aarch64/bl2arch_setup.c:18:[MISRA C-2012 Rule 12.2 (required)]
In the expression "3U << 20", shifting more than 7 bits, the number
of bits in the essential type of the left expression, "3U", is
not allowed.
Further, MISRA requires that all shifts don't overflow. The definition of
PAGE_SIZE was (1U << 12), and 1U is 8 bits. This caused about 50 issues.
This fixes the violation by changing the definition to 1UL << 12. Since
this uses 32bits, it should not create any issues for aarch32.
This patch also contains a fix for a build failure in the sun50i_a64
platform. Specifically, these misra fixes removed a single and
instruction,
92407e73 and x19, x19, #0xffffffff
from the cm_setup_context function caused a relocation in
psci_cpus_on_start to require a linker-generated stub. This increased the
size of the .text section and caused an alignment later on to go over a
page boundary and round up to the end of RAM before placing the .data
section. This sectionn is of non-zero size and therefore causes a link
error.
The fix included in this reorders the functions during link time
without changing their ording with respect to alignment.
Change-Id: I76b4b662c3d262296728a8b9aab7a33b02087f16
Signed-off-by: Jimmy Brisson <jimmy.brisson@arm.com>
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#ifndef PMF_H
|
|
#define PMF_H
|
|
|
|
#include <lib/cassert.h>
|
|
#include <lib/pmf/pmf_helpers.h>
|
|
#include <lib/utils_def.h>
|
|
|
|
/*
|
|
* Constants used for/by PMF services.
|
|
*/
|
|
#define PMF_ARM_TIF_IMPL_ID UL(0x41)
|
|
#define PMF_TID_SHIFT 0
|
|
#define PMF_TID_MASK (UL(0xFF) << PMF_TID_SHIFT)
|
|
#define PMF_SVC_ID_SHIFT 10
|
|
#define PMF_SVC_ID_MASK (UL(0x3F) << PMF_SVC_ID_SHIFT)
|
|
#define PMF_IMPL_ID_SHIFT 24
|
|
#define PMF_IMPL_ID_MASK (UL(0xFF) << PMF_IMPL_ID_SHIFT)
|
|
|
|
/*
|
|
* Flags passed to PMF_REGISTER_SERVICE
|
|
*/
|
|
#define PMF_STORE_ENABLE (1 << 0)
|
|
#define PMF_DUMP_ENABLE (1 << 1)
|
|
|
|
/*
|
|
* Flags passed to PMF_GET_TIMESTAMP_XXX
|
|
* and PMF_CAPTURE_TIMESTAMP
|
|
*/
|
|
#define PMF_CACHE_MAINT (U(1) << 0)
|
|
#define PMF_NO_CACHE_MAINT U(0)
|
|
|
|
/*
|
|
* Defines for PMF SMC function ids.
|
|
*/
|
|
#define PMF_SMC_GET_TIMESTAMP_32 U(0x82000010)
|
|
#define PMF_SMC_GET_TIMESTAMP_64 U(0xC2000010)
|
|
#define PMF_NUM_SMC_CALLS 2
|
|
|
|
/*
|
|
* The macros below are used to identify
|
|
* PMF calls from the SMC function ID.
|
|
*/
|
|
#define PMF_FID_MASK U(0xffe0)
|
|
#define PMF_FID_VALUE U(0)
|
|
#define is_pmf_fid(_fid) (((_fid) & PMF_FID_MASK) == PMF_FID_VALUE)
|
|
|
|
/* Following are the supported PMF service IDs */
|
|
#define PMF_PSCI_STAT_SVC_ID 0
|
|
#define PMF_RT_INSTR_SVC_ID 1
|
|
|
|
/*******************************************************************************
|
|
* Function & variable prototypes
|
|
******************************************************************************/
|
|
/* PMF common functions */
|
|
int pmf_get_timestamp_smc(unsigned int tid,
|
|
u_register_t mpidr,
|
|
unsigned int flags,
|
|
unsigned long long *ts_value);
|
|
int pmf_setup(void);
|
|
uintptr_t pmf_smc_handler(unsigned int 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);
|
|
|
|
#endif /* PMF_H */
|