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

Merge "fix(intel): fix CCU for cache maintenance" into integration

Browse source
This commit is contained in:
Mark Dykes 2024-10-22 17:33:08 +02:00 • committed by TrustedFirmware Code Review
commit 1b9795244e
5 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
plat/intel/soc/agilex5/include/agilex5_cache.h
View file

@ -8,5 +8,6 @@
#define AGX5_CACHE_H #define AGX5_CACHE_H
void invalidate_dcache_all(void); void invalidate_dcache_all(void);
void invalidate_cache_low_el(void);
#endif /* AGX5_CACHE_H */ #endif /* AGX5_CACHE_H */

15
plat/intel/soc/agilex5/soc/agilex5_cache.S
View file

@ -9,6 +9,21 @@
#include <plat_macros.S> #include <plat_macros.S>
.globl invalidate_dcache_all .globl invalidate_dcache_all
.globl invalidate_cache_low_el
/* --------------------------------------------------------
* Invalidate for NS EL2 and EL1
* --------------------------------------------------------
*/
func invalidate_cache_low_el
mrs x0,SCR_EL3
orr x1,x0,#SCR_NS_BIT
msr SCR_EL3, x1
isb
tlbi ALLE2
dsb sy
tlbi ALLE1
dsb sy
endfunc invalidate_cache_low_el
.pushsection .text.asm_dcache_level, "ax" .pushsection .text.asm_dcache_level, "ax"
func asm_dcache_level func asm_dcache_level

16
plat/intel/soc/common/aarch64/plat_helpers.S
View file

@ -21,7 +21,6 @@
.globl plat_crash_console_flush .globl plat_crash_console_flush
.globl platform_mem_init .globl platform_mem_init
.globl plat_secondary_cpus_bl31_entry .globl plat_secondary_cpus_bl31_entry
.globl invalidate_cache_low_el
.globl plat_get_my_entrypoint .globl plat_get_my_entrypoint
@ -216,18 +215,3 @@ func plat_secondary_cpus_bl31_entry
_exception_vectors=runtime_exceptions \ _exception_vectors=runtime_exceptions \
_pie_fixup_size=BL31_LIMIT - BL31_BASE _pie_fixup_size=BL31_LIMIT - BL31_BASE
endfunc plat_secondary_cpus_bl31_entry endfunc plat_secondary_cpus_bl31_entry
/* --------------------------------------------------------
* Invalidate for NS EL2 and EL1
* --------------------------------------------------------
*/
func invalidate_cache_low_el
mrs x0,SCR_EL3
orr x1,x0,#SCR_NS_BIT
msr SCR_EL3, x1
isb
tlbi ALLE2
dsb sy
tlbi ALLE1
dsb sy
endfunc invalidate_cache_low_el

2
plat/intel/soc/common/include/socfpga_private.h
View file

@ -65,6 +65,4 @@ unsigned long socfpga_get_ns_image_entrypoint(void);
void plat_secondary_cpus_bl31_entry(void); void plat_secondary_cpus_bl31_entry(void);
void invalidate_cache_low_el(void);
#endif /* SOCFPGA_PRIVATE_H */ #endif /* SOCFPGA_PRIVATE_H */

3
plat/intel/soc/common/socfpga_psci.c
View file

@ -17,6 +17,9 @@
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/psci/psci.h> #include <lib/psci/psci.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#if PLATFORM_MODEL == PLAT_SOCFPGA_AGILEX5
#include "agilex5_cache.h"
#endif
#include "ccu/ncore_ccu.h" #include "ccu/ncore_ccu.h"
#include "socfpga_mailbox.h" #include "socfpga_mailbox.h"
#include "socfpga_plat_def.h" #include "socfpga_plat_def.h"