From a17acc4c8c3cbd8a0dc1add62694e67978d6388c Mon Sep 17 00:00:00 2001 From: Sabrina Ni Date: Wed, 27 Aug 2014 21:33:53 +0800 Subject: [PATCH] Create util.h to rearrange define macro --- core/arch/arm32/kernel/tee_ta_manager.c | 3 ++- core/arch/arm32/mm/tee_mmu.c | 5 +++-- core/arch/arm32/plat-cannes/main.c | 2 +- core/arch/arm32/plat-orly2/main.c | 2 +- core/arch/arm32/plat-vexpress/main.c | 2 +- core/arch/arm32/tee/arch_tee_fs.c | 2 +- core/arch/arm32/tee/tee_rpmb.c | 9 +++++---- core/include/kernel/tee_common_unpg.h | 17 ----------------- core/include/kernel/{kernel.h => util.h} | 18 +++++++++++++++--- core/kernel/tee_ta_manager_unpg.c | 1 + core/tee/tee_svc.c | 5 +++-- 11 files changed, 33 insertions(+), 33 deletions(-) rename core/include/kernel/{kernel.h => util.h} (83%) diff --git a/core/arch/arm32/kernel/tee_ta_manager.c b/core/arch/arm32/kernel/tee_ta_manager.c index 278e19c3758..27f4f15a2a0 100644 --- a/core/arch/arm32/kernel/tee_ta_manager.c +++ b/core/arch/arm32/kernel/tee_ta_manager.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -500,7 +501,7 @@ static TEE_Result tee_ta_load_user_ta(struct tee_ta_ctx *ctx, } /* Ensure proper aligment of stack */ - ctx->stack_size = TEE_ROUNDUP(sub_head->stack_size, + ctx->stack_size = ROUNDUP(sub_head->stack_size, TEE_TA_STACK_ALIGNMENT); *heap_size = sub_head->heap_size; diff --git a/core/arch/arm32/mm/tee_mmu.c b/core/arch/arm32/mm/tee_mmu.c index ab6b49b1c7b..002942462f0 100644 --- a/core/arch/arm32/mm/tee_mmu.c +++ b/core/arch/arm32/mm/tee_mmu.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -676,8 +677,8 @@ TEE_Result tee_mmu_kmap_helper(tee_paddr_t pa, size_t len, void **va) size_t n; uint32_t *l1 = (uint32_t *)TEE_MMU_UL1_KERN_BASE; uint32_t py_offset = (uint32_t) pa >> SECTION_SHIFT; - uint32_t pa_s = TEE_ROUNDDOWN(pa, SECTION_SIZE); - uint32_t pa_e = TEE_ROUNDUP(pa + len, SECTION_SIZE); + uint32_t pa_s = ROUNDDOWN(pa, SECTION_SIZE); + uint32_t pa_e = ROUNDUP(pa + len, SECTION_SIZE); uint32_t flags; mm = tee_mm_alloc(&tee_mmu_virt_kmap, pa_e - pa_s); diff --git a/core/arch/arm32/plat-cannes/main.c b/core/arch/arm32/plat-cannes/main.c index 364d9d3e709..dbef69ae39a 100644 --- a/core/arch/arm32/plat-cannes/main.c +++ b/core/arch/arm32/plat-cannes/main.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/arch/arm32/plat-orly2/main.c b/core/arch/arm32/plat-orly2/main.c index 364d9d3e709..dbef69ae39a 100644 --- a/core/arch/arm32/plat-orly2/main.c +++ b/core/arch/arm32/plat-orly2/main.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/core/arch/arm32/plat-vexpress/main.c b/core/arch/arm32/plat-vexpress/main.c index f9f768c7732..f5e0b511817 100644 --- a/core/arch/arm32/plat-vexpress/main.c +++ b/core/arch/arm32/plat-vexpress/main.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include #include diff --git a/core/arch/arm32/tee/arch_tee_fs.c b/core/arch/arm32/tee/arch_tee_fs.c index dab40f67aa1..4ab94fc7fbf 100644 --- a/core/arch/arm32/tee/arch_tee_fs.c +++ b/core/arch/arm32/tee/arch_tee_fs.c @@ -33,7 +33,7 @@ #include #include #include "tee_api_defines.h" -#include +#include #include #include diff --git a/core/arch/arm32/tee/tee_rpmb.c b/core/arch/arm32/tee/tee_rpmb.c index 61251f5f76f..f2cd6c9941a 100644 --- a/core/arch/arm32/tee/tee_rpmb.c +++ b/core/arch/arm32/tee/tee_rpmb.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -327,8 +328,8 @@ static TEE_Result tee_rpmb_alloc(size_t req_size, size_t resp_size, struct tee_rpmb_mem *mem, void **req, void **resp) { TEE_Result res = TEE_SUCCESS; - size_t req_s = TEE_ROUNDUP(req_size, sizeof(uint32_t)); - size_t resp_s = TEE_ROUNDUP(resp_size, sizeof(uint32_t)); + size_t req_s = ROUNDUP(req_size, sizeof(uint32_t)); + size_t resp_s = ROUNDUP(resp_size, sizeof(uint32_t)); if (!mem) return TEE_ERROR_BAD_PARAMETERS; @@ -983,7 +984,7 @@ TEE_Result tee_rpmb_read(uint16_t dev_id, byte_offset = addr % RPMB_DATA_SIZE; blkcnt = - TEE_ROUNDUP(len + byte_offset, RPMB_DATA_SIZE) / RPMB_DATA_SIZE; + ROUNDUP(len + byte_offset, RPMB_DATA_SIZE) / RPMB_DATA_SIZE; res = tee_rpmb_init(dev_id, false, true); if (res != TEE_SUCCESS) @@ -1166,7 +1167,7 @@ TEE_Result tee_rpmb_write(uint16_t dev_id, byte_offset = addr % RPMB_DATA_SIZE; blkcnt = - TEE_ROUNDUP(len + byte_offset, RPMB_DATA_SIZE) / RPMB_DATA_SIZE; + ROUNDUP(len + byte_offset, RPMB_DATA_SIZE) / RPMB_DATA_SIZE; if (byte_offset == 0 && (len % RPMB_DATA_SIZE) == 0) { res = tee_rpmb_write_blk(dev_id, blk_idx, data, blkcnt); diff --git a/core/include/kernel/tee_common_unpg.h b/core/include/kernel/tee_common_unpg.h index e03d9b98da9..968032e9a58 100644 --- a/core/include/kernel/tee_common_unpg.h +++ b/core/include/kernel/tee_common_unpg.h @@ -36,18 +36,6 @@ #include #include -#ifndef MAX -#define MAX(a, b) \ - (__extension__({ __typeof__(a) _a = (a); \ - __typeof__(b) _b = (b); \ - _a > _b ? _a : _b; })) - -#define MIN(a, b) \ - (__extension__({ __typeof__(a) _a = (a); \ - __typeof__(b) _b = (b); \ - _a < _b ? _a : _b; })) -#endif - #define TEE_MEMBER_SIZE(type, member) sizeof(((type *)0)->member) #define TEE_ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) @@ -60,11 +48,6 @@ typedef uintptr_t tee_vaddr_t; /* Virtual address valid in user mode */ typedef uintptr_t tee_uaddr_t; -/* Round up the even multiple of size, size has to be a multiple of 2 */ -#define TEE_ROUNDUP(v, size) (((v) + (size - 1)) & ~(size - 1)) - -/* Round down the even multiple of size, size has to be a multiple of 2 */ -#define TEE_ROUNDDOWN(v, size) ((v) & ~(size - 1)) #if (CFG_TEE_FW_DEBUG == 0) diff --git a/core/include/kernel/kernel.h b/core/include/kernel/util.h similarity index 83% rename from core/include/kernel/kernel.h rename to core/include/kernel/util.h index 7bad5b837e3..02cae37585e 100644 --- a/core/include/kernel/kernel.h +++ b/core/include/kernel/util.h @@ -24,8 +24,20 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef KERNEL_KERNEL_H -#define KERNEL_KERNEL_H +#ifndef KERNEL_UTIL_H +#define KERNEL_UTIL_H + +#ifndef MAX +#define MAX(a, b) \ + (__extension__({ __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a > _b ? _a : _b; })) + +#define MIN(a, b) \ + (__extension__({ __typeof__(a) _a = (a); \ + __typeof__(b) _b = (b); \ + _a < _b ? _a : _b; })) +#endif #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) @@ -35,4 +47,4 @@ /* Round down the even multiple of size, size has to be a multiple of 2 */ #define ROUNDDOWN(v, size) ((v) & ~(size - 1)) -#endif /*KERNEL_KERNEL_H*/ +#endif /*KERNEL_UTIL_H*/ diff --git a/core/kernel/tee_ta_manager_unpg.c b/core/kernel/tee_ta_manager_unpg.c index 0a94e6275e2..ee12add179b 100644 --- a/core/kernel/tee_ta_manager_unpg.c +++ b/core/kernel/tee_ta_manager_unpg.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include diff --git a/core/tee/tee_svc.c b/core/tee/tee_svc.c index 0d0b2d90825..1707dee55eb 100644 --- a/core/tee/tee_svc.c +++ b/core/tee/tee_svc.c @@ -24,6 +24,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include #include #include #include @@ -286,7 +287,7 @@ static TEE_Result tee_svc_copy_param(struct tee_ta_session *sess, (uintptr_t)param->params[n].memref.buffer, param->params[n].memref.size)) { - s = TEE_ROUNDUP(param->params[n].memref.size, + s = ROUNDUP(param->params[n].memref.size, sizeof(uint32_t)); /* Check overflow */ if (req_mem + s < req_mem) @@ -338,7 +339,7 @@ static TEE_Result tee_svc_copy_param(struct tee_ta_session *sess, if (ta_private_memref[n] == false) continue; - s = TEE_ROUNDUP(param->params[n].memref.size, sizeof(uint32_t)); + s = ROUNDUP(param->params[n].memref.size, sizeof(uint32_t)); switch (TEE_PARAM_TYPE_GET(param->types, n)) { case TEE_PARAM_TYPE_MEMREF_INPUT: