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

bsps/aarch64: Align MVAs consistently

Browse Source 
This fixes a bug where addresses were not being aligned correctly.
Addresses used in cache functions are now aligned consistently using
RTEMS_ALIGN_DOWN.
This commit is contained in:
Kinsey Moore
2021-05-18 07:56:54 -05:00
committed by Joel Sherrill
parent 25ca2ec4cb
commit 12ec459f4a
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bsps/aarch64/shared/cache/cache.c vendored
View File

@@ -39,11 +39,9 @@
#include <bsp/utility.h> #include <bsp/utility.h>
#include <rtems/score/aarch64-system-registers.h> #include <rtems/score/aarch64-system-registers.h>
#define AARCH64_CACHE_L1_CPU_DATA_ALIGNMENT ((size_t)64) #define AARCH64_CACHE_L1_CPU_DATA_ALIGNMENT ( (size_t) 64 )
#define AARCH64_CACHE_L1_DATA_LINE_MASK \ #define AARCH64_CACHE_PREPARE_MVA(mva) (const void *) \
( AARCH64_CACHE_L1_CPU_DATA_ALIGNMENT - 1 ) RTEMS_ALIGN_DOWN ( (size_t) mva, AARCH64_CACHE_L1_CPU_DATA_ALIGNMENT )
#define AARCH64_CACHE_PREPARE_MVA(mva) \
((const void *) (((size_t) (mva)) & AARCH64_CACHE_L1_DATA_LINE_MASK))
static inline static inline
void AArch64_data_cache_clean_and_invalidate_line(const void *d_addr) void AArch64_data_cache_clean_and_invalidate_line(const void *d_addr)
@@ -75,7 +73,7 @@ _CPU_cache_flush_data_range(
{ {
_AARCH64_Data_synchronization_barrier(); _AARCH64_Data_synchronization_barrier();
if ( n_bytes != 0 ) { if ( n_bytes != 0 ) {
size_t adx = (size_t) d_addr & ~AARCH64_CACHE_L1_DATA_LINE_MASK; size_t adx = (size_t) AARCH64_CACHE_PREPARE_MVA ( d_addr );
const size_t ADDR_LAST = (size_t) d_addr + n_bytes - 1; const size_t ADDR_LAST = (size_t) d_addr + n_bytes - 1;
for (; adx <= ADDR_LAST; adx += AARCH64_CACHE_L1_CPU_DATA_ALIGNMENT ) { for (; adx <= ADDR_LAST; adx += AARCH64_CACHE_L1_CPU_DATA_ALIGNMENT ) {
@@ -116,8 +114,7 @@ _CPU_cache_invalidate_data_range(
) )
{ {
if ( n_bytes != 0 ) { if ( n_bytes != 0 ) {
size_t adx = (size_t) d_addr size_t adx = (size_t) AARCH64_CACHE_PREPARE_MVA ( d_addr );
& ~AARCH64_CACHE_L1_DATA_LINE_MASK;
const size_t end = (size_t)d_addr + n_bytes -1; const size_t end = (size_t)d_addr + n_bytes -1;
/* Back starting address up to start of a line and invalidate until end */ /* Back starting address up to start of a line and invalidate until end */