[rtems commit] bsps/fdt: Make sure data is cache aligned

[Christian Mauderer]

Module:    rtems
Branch:    master
Commit:    02c9eb8567eac4bc3b5531204cb14d9c8513ccbe
Changeset: http://git.rtems.org/rtems/commit/?id=02c9eb8567eac4bc3b5531204cb14d9c8513ccbe

Author:    Christian Mauderer <christian.mauderer at embedded-brains.de>
Date:      Mon Jul 20 07:46:53 2020 +0200

bsps/fdt: Make sure data is cache aligned

The cache of the fdt blob is flushed after copy. Therefore it should be
aligned.

---

 bsps/shared/start/bsp-fdt.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/bsps/shared/start/bsp-fdt.c b/bsps/shared/start/bsp-fdt.c
index 7e8d892..50a485e 100644
--- a/bsps/shared/start/bsp-fdt.c
+++ b/bsps/shared/start/bsp-fdt.c
@@ -29,10 +29,11 @@
 
 #ifdef BSP_FDT_BLOB_READ_ONLY
 static const uint32_t
-bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)] = { 0xdeadbeef };
+bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)] CPU_STRUCTURE_ALIGNMENT =
+  { 0xdeadbeef };
 #else
 static uint32_t
-bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)];
+bsp_fdt_blob[BSP_FDT_BLOB_SIZE_MAX / sizeof(uint32_t)] CPU_STRUCTURE_ALIGNMENT;
 #endif
 
 void bsp_fdt_copy(const void *src)
@@ -48,6 +49,7 @@ void bsp_fdt_copy(const void *src)
 
   if (s != d) {
     size_t m = MIN(sizeof(bsp_fdt_blob), fdt_totalsize(src));
+    size_t aligned_size = roundup2(m, CPU_CACHE_LINE_BYTES);
     size_t n = (m + sizeof(*d) - 1) / sizeof(*d);
     size_t i;
 
@@ -55,7 +57,7 @@ void bsp_fdt_copy(const void *src)
       d[i] = s[i];
     }
 
-    rtems_cache_flush_multiple_data_lines(d, m);
+    rtems_cache_flush_multiple_data_lines(d, aligned_size);
   }
 }