RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

bsps/arm: basic on core cache support changed to use l1 functions.

Browse Source 
The basic data and instruction rage functions should be compatible
for all ARMv4,5,6,7 functions. On the other hand, some functions
are not portable, for example arm_cp15_data_cache_test_and_clean()
and arm_cp15_data_cache_invalidate() for all versions and there
has to be specialized version for newer cores.
arm_cache_l1_properties_for_level uses CCSIDR which is not present
on older chips.

Actual version is only experimental, needs more changes
and problem has been found on RPi1 with dlopen so there seems
to be real problem.
This commit is contained in:
Pavel Pisa
2016-07-04 01:30:05 +02:00
parent 2b885d6084
commit 06165554b6
3 changed files with 97 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
c/src/lib/libcpu/arm/shared/include/arm-cp15.h
View File

@@ -210,6 +210,18 @@ extern "C" {
/** @} */
/**
* @name CCSIDR, Cache Size ID Register Defines
*
* @{
*/
#define ARM_CP15_CACHE_CSS_ID_DATA 0
#define ARM_CP15_CACHE_CSS_ID_INSTRUCTION 1
#define ARM_CP15_CACHE_CSS_LEVEL(level) ((level) << 1)
/** @} */
ARM_CP15_TEXT_SECTION static inline uint32_t
arm_cp15_get_id_code(void)
{
@@ -819,6 +831,21 @@ arm_cp15_set_cache_size_selection(uint32_t val)
);
}
ARM_CP15_TEXT_SECTION static inline uint32_t
arm_cp15_get_cache_size_id_for_level(uint32_t level_and_inst_dat)
{
rtems_interrupt_level irq_level;
uint32_t ccsidr;
rtems_interrupt_local_disable(irq_level);
arm_cp15_set_cache_size_selection(level_and_inst_dat);
_ARM_Instruction_synchronization_barrier();
ccsidr = arm_cp15_get_cache_size_id();
rtems_interrupt_local_enable(irq_level);
return ccsidr;
}
ARM_CP15_TEXT_SECTION static inline void
arm_cp15_cache_invalidate(void)
{
@@ -1036,10 +1063,8 @@ arm_cp15_data_cache_invalidate_all_levels(void)
uint32_t way;
uint32_t way_shift;
arm_cp15_set_cache_size_selection(level << 1);
_ARM_Instruction_synchronization_barrier();
ccsidr = arm_cp15_get_cache_size_id_for_level(level << 1);
ccsidr = arm_cp15_get_cache_size_id();
line_power = arm_ccsidr_get_line_power(ccsidr);
associativity = arm_ccsidr_get_associativity(ccsidr);
way_shift = __builtin_clz(associativity - 1);