Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 21:44:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

locks: bakery: use is_dcache_enabled() helper

Browse source 
bakery_lock_normal.c uses the raw register accessor, read_sctlr(_el3)
to check whether the dcache is enabled.

Using is_dcache_enabled() is cleaner, and a good abstraction for
the library code like this.

A problem is is_dcache_enabled() is declared in the local header,
lib/xlat_tables_v2/xlat_tables_private.h

I searched for a good place to declare this helper. Moving it to
arch_helpers.h, closed to cache operation helpers, looks good enough
to me.

I also changed the type of 'is_cached' to bool for consistency,
and to avoid MISRA warnings.

Change-Id: I9b016f67bc8eade25c316aa9c0db0fa4cd375b79
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2020-04-02 15:35:19 +09:00 • committed by Sandrine Bailleux
parent 78460ced4d
commit 115041633d
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/arch/aarch32/arch_helpers.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -8,6 +8,7 @@
#define ARCH_HELPERS_H #define ARCH_HELPERS_H
#include <cdefs.h> #include <cdefs.h>
#include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
@ -178,6 +179,7 @@ static inline void _op ## _type(u_register_t v) \
void flush_dcache_range(uintptr_t addr, size_t size); void flush_dcache_range(uintptr_t addr, size_t size);
void clean_dcache_range(uintptr_t addr, size_t size); void clean_dcache_range(uintptr_t addr, size_t size);
void inv_dcache_range(uintptr_t addr, size_t size); void inv_dcache_range(uintptr_t addr, size_t size);
bool is_dcache_enabled(void);
void dcsw_op_louis(u_register_t op_type); void dcsw_op_louis(u_register_t op_type);
void dcsw_op_all(u_register_t op_type); void dcsw_op_all(u_register_t op_type);

1
include/arch/aarch64/arch_helpers.h
View file

@ -226,6 +226,7 @@ DEFINE_SYSOP_PARAM_FUNC(xpaci)
void flush_dcache_range(uintptr_t addr, size_t size); void flush_dcache_range(uintptr_t addr, size_t size);
void clean_dcache_range(uintptr_t addr, size_t size); void clean_dcache_range(uintptr_t addr, size_t size);
void inv_dcache_range(uintptr_t addr, size_t size); void inv_dcache_range(uintptr_t addr, size_t size);
bool is_dcache_enabled(void);
void dcsw_op_louis(u_register_t op_type); void dcsw_op_louis(u_register_t op_type);
void dcsw_op_all(u_register_t op_type); void dcsw_op_all(u_register_t op_type);

21
lib/locks/bakery/bakery_lock_normal.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2020, NVIDIA Corporation. All rights reserved. * Copyright (c) 2020, NVIDIA Corporation. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
@ -84,7 +84,7 @@ static inline void read_cache_op(uintptr_t addr, bool cached)
/* Helper function to check if the lock is acquired */ /* Helper function to check if the lock is acquired */
static inline bool is_lock_acquired(const bakery_info_t *my_bakery_info, static inline bool is_lock_acquired(const bakery_info_t *my_bakery_info,
int is_cached) bool is_cached)
{ {
/* /*
* Even though lock data is updated only by the owning cpu and * Even though lock data is updated only by the owning cpu and
@ -99,7 +99,7 @@ static inline bool is_lock_acquired(const bakery_info_t *my_bakery_info,
} }
static unsigned int bakery_get_ticket(bakery_lock_t *lock, static unsigned int bakery_get_ticket(bakery_lock_t *lock,
unsigned int me, int is_cached) unsigned int me, bool is_cached)
{ {
unsigned int my_ticket, their_ticket; unsigned int my_ticket, their_ticket;
unsigned int they; unsigned int they;
@ -164,17 +164,14 @@ static unsigned int bakery_get_ticket(bakery_lock_t *lock,
void bakery_lock_get(bakery_lock_t *lock) void bakery_lock_get(bakery_lock_t *lock)
{ {
unsigned int they, me, is_cached; unsigned int they, me;
unsigned int my_ticket, my_prio, their_ticket; unsigned int my_ticket, my_prio, their_ticket;
bakery_info_t *their_bakery_info; bakery_info_t *their_bakery_info;
unsigned int their_bakery_data; unsigned int their_bakery_data;
bool is_cached;
me = plat_my_core_pos(); me = plat_my_core_pos();
#ifdef __aarch64__ is_cached = is_dcache_enabled();
is_cached = read_sctlr_el3() & SCTLR_C_BIT;
#else
is_cached = read_sctlr() & SCTLR_C_BIT;
#endif
/* Get a ticket */ /* Get a ticket */
my_ticket = bakery_get_ticket(lock, me, is_cached); my_ticket = bakery_get_ticket(lock, me, is_cached);
@ -232,11 +229,7 @@ void bakery_lock_get(bakery_lock_t *lock)
void bakery_lock_release(bakery_lock_t *lock) void bakery_lock_release(bakery_lock_t *lock)
{ {
bakery_info_t *my_bakery_info; bakery_info_t *my_bakery_info;
#ifdef __aarch64__ bool is_cached = is_dcache_enabled();
unsigned int is_cached = read_sctlr_el3() & SCTLR_C_BIT;
#else
unsigned int is_cached = read_sctlr() & SCTLR_C_BIT;
#endif
my_bakery_info = get_bakery_info(plat_my_core_pos(), lock); my_bakery_info = get_bakery_info(plat_my_core_pos(), lock);

5
lib/xlat_tables_v2/xlat_tables_private.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -99,9 +99,6 @@ unsigned long long xlat_arch_get_max_supported_pa(void);
*/ */
bool is_mmu_enabled_ctx(const xlat_ctx_t *ctx); bool is_mmu_enabled_ctx(const xlat_ctx_t *ctx);
/* Returns true if the data cache is enabled at the current EL. */
bool is_dcache_enabled(void);
/* /*
* Returns minimum virtual address space size supported by the architecture * Returns minimum virtual address space size supported by the architecture
*/ */