ARM: at91: add support for L2 cache write_sec() callback
cover ARM: at91: add support for L2 cache write_sec() callback
When running under OP-TEE the L2 cache is configured by OP-TEE and can't be modified for the moment. Add necessary function to get the current execution world of Linux and add early_setup() callback that will set the .write_sec() callback for the outer cache.
Clément Léger (2):
ARM: at91: add sam_linux_is_in_normal_world() function
ARM: at91: setup outer cache .write_sec() callback if needed
arch/arm/mach-at91/sam_secure.c | 6 ++++++ arch/arm/mach-at91/sam_secure.h | 1 + arch/arm/mach-at91/sama5.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+)
Signature · 1 line
2.36.1
PATCH 1/2 ARM: at91: add sam_linux_is_in_normal_world() function
Add sam_linux_is_in_normal_world() which allows to know if Linux is running in the normal world or not. This function is used by code which needs to differentiate the world in which Linux is running.
--- arch/arm/mach-at91/sam_secure.c | 6 ++++++ arch/arm/mach-at91/sam_secure.h | 1 + 2 files changed, 7 insertions(+)
arch/arm/mach-at91/sam_secure.c +6 -0
@@ -27,6 +27,12 @@ struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1)return res; } +bool sam_linux_is_in_normal_world (void ) +{ +/* If optee has been detected, then we are running in normal world */ +return optee_available; +} +void __init sam_secure_init (void ) {struct device_node *np;
arch/arm/mach-at91/sam_secure.h +1 -0
@@ -14,5 +14,6 @@void __init sam_secure_init (void );struct arm_smccc_res sam_smccc_call (u32 fn,u32 arg0,u32 arg1); +bool sam_linux_is_in_normal_world (void );#endif /* SAM_SECURE_H */
Signature · 1 line
2.36.1
Re: [PATCH 1/2] ARM: at91: add sam_linux_is_in_normal_world() function
Hi, Clement,
Quoted 17 lines · Clément Léger
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Add
sam_linux_is_in_normal_world()which allows to know if Linux is running in the normal world or not. This function is used by code which needs to differentiate the world in which Linux is running.Signed-off-by Clément Léger <[email protected]>--- arch/arm/mach-at91/sam_secure.c | 6 ++++++ arch/arm/mach-at91/sam_secure.h | 1 + 2 files changed, 7 insertions(+)arch/arm/mach-at91/sam_secure.c +0
-0
arch/arm/mach-at91/sam_secure.c struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1) · line 32
Quoted 6 lines
arch/arm/mach-at91/sam_secure.c +3
-0@@ -27,6 +27,12 @@ struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1)return res; } +bool sam_linux_is_in_normal_world (void ) +{ +/* If optee has been detected, then we are running in normal world */
In case optee hasn't been detected don't we run also in normal world? What I want to say is that maybe you can change the function name to something like sam_linux_is_optee_available().
Thank you,
Claudiu Beznea
Quoted 20 lines
arch/arm/mach-at91/sam_secure.c +3
-0+return optee_available; +} +void __init sam_secure_init (void ) {struct device_node *np;arch/arm/mach-at91/sam_secure.h +1
-1@@ -14,5 +14,6 @@void __init sam_secure_init (void );struct arm_smccc_res sam_smccc_call (u32 fn,u32 arg0,u32 arg1); +bool sam_linux_is_in_normal_world (void );#endif /* SAM_SECURE_H */ --2.36.1
Re: [PATCH 1/2] ARM: at91: add sam_linux_is_in_normal_world() function
Le 2022-07-04 08:19, [email protected] a écrit :
Quoted 24 lines
Hi, Clement,
Quoted 21 lines · Clément Léger
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Add
sam_linux_is_in_normal_world()which allows to know if Linux is running in the normal world or not. This function is used by code which needs to differentiate the world in which Linux is running.Signed-off-by Clément Léger <[email protected]>--- arch/arm/mach-at91/sam_secure.c | 6 ++++++ arch/arm/mach-at91/sam_secure.h | 1 + 2 files changed, 7 insertions(+)arch/arm/mach-at91/sam_secure.c +0
-0@@ -27,6 +27,12 @@ struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1)return res; }
Quoted 8 lines
Quoted 4 lines
arch/arm/mach-at91/sam_secure.c +3
-0+bool sam_linux_is_in_normal_world (void ) +{ +/* If optee has been detected, then we are running in normal world */
In case optee hasn't been detected don't we run also in normal world? What I want to say is that maybe you can change the function name to something like
sam_linux_is_optee_available().
I would say it depends on the bootloader configuration, but Linux can run in secure world also. It would not change a lot of thing though. However, you are right sam_linux_optee_is_available() seems easier to understand ;)
Clément
Re: [PATCH 1/2] ARM: at91: add sam_linux_is_in_normal_world() function
Quoted 39 lines · On 04.07.2022 20:34, [email protected] wrote:
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 26 lines · Le 2022-07-04 08:19, [email protected] a écrit :
Hi, Clement,
Quoted 23 lines · Clément Léger
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Add
sam_linux_is_in_normal_world()which allows to know if Linux is running in the normal world or not. This function is used by code which needs to differentiate the world in which Linux is running.Signed-off-by Clément Léger <[email protected]>---
arch/arm/mach-at91/sam_secure.c | 6 ++++++
arch/arm/mach-at91/sam_secure.h | 1 +2 files changed, 7 insertions(+)arch/arm/mach-at91/sam_secure.c +0
-0@@ -27,6 +27,12 @@ struct arm_smccc_res sam_smccc_call(u32 fn, u32 arg0, u32 arg1) return res; }Quoted 8 lines
Quoted 4 lines
arch/arm/mach-at91/sam_secure.c +3
-0+bool sam_linux_is_in_normal_world (void ) +{ + /* If optee has been detected, then we are running in normalworld */
In case optee hasn't been detected don't we run also in normal world? What I want to say is that maybe you can change the function name to something like
sam_linux_is_optee_available().
Quoted 5 lines
I would say it depends on the bootloader configuration, but Linux can run
in secure world also. It would not change a lot of thing though. However, you are rightsam_linux_optee_is_available()seems easier to understand ;)
Changed the name and applied it to at91-soc, thanks!
Quoted 2 lines
Clément
PATCH 2/2 ARM: at91: setup outer cache .write_sec() callback if needed
In reply to Clément LégerWhen running under OP-TEE, the L2 cache is configured by OP-TEE and the sam platform code does not allow any modification yet. Setup a dummy .write_sec() callback to avoid triggering exceptions when Linux tries to modify the L2 cache configuration.
--- arch/arm/mach-at91/sama5.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
arch/arm/mach-at91/sama5.c +17 -0
@@ -9,13 +9,27 @@#include <linux/of.h> #include <linux/of_platform.h> +#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include <asm/outercache.h> #include <asm/system_misc.h> #include "generic.h" #include "sam_secure.h" +static void sama5_l2c310_write_sec (unsigned long val,unsigned reg) +{ +/* OP-TEE configures the L2 cache and does not allow modifying it yet */ +} + +static void __init sama5_secure_cache_init (void ) +{ +sam_secure_init (); +if (sam_linux_is_in_normal_world ()) + outer_cache.write_sec = sama5_l2c310_write_sec; +} +static void __init sama5_dt_device_init (void ) {of_platform_default_populate (NULL ,NULL ,NULL );
@@ -30,6 +44,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {DT_MACHINE_START (sama5_dt,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5_dt_device_init, + .init_early = sama5_secure_cache_init, .dt_compat = sama5_dt_board_compat,MACHINE_END
@@ -41,6 +56,7 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {DT_MACHINE_START (sama5_alt_dt,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5_dt_device_init, + .init_early = sama5_secure_cache_init, .dt_compat = sama5_alt_dt_board_compat, .l2c_aux_mask = ~0UL ,MACHINE_END
@@ -60,6 +76,7 @@ static const char *const sama5d2_compat[] __initconst = {DT_MACHINE_START (sama5d2,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5d2_init, + .init_early = sama5_secure_cache_init, .dt_compat = sama5d2_compat, .l2c_aux_mask = ~0UL ,MACHINE_END
Signature · 1 line
2.36.1
Re: [PATCH 2/2] ARM: at91: setup outer cache .write_sec() callback if needed
Quoted 27 lines · Clément Léger
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
When running under OP-TEE, the L2 cache is configured by OP-TEE and the sam platform code does not allow any modification yet. Setup a dummy .write_sec() callback to avoid triggering exceptions when Linux tries to modify the L2 cache configuration.
Signed-off-by Clément Léger <[email protected]>--- arch/arm/mach-at91/sama5.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)arch/arm/mach-at91/sama5.c +2
-0@@ -9,13 +9,27 @@#include <linux/of.h> #include <linux/of_platform.h> +#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include <asm/outercache.h> #include <asm/system_misc.h> #include "generic.h"
arch/arm/mach-at91/sama5.c line 28
Quoted 10 lines
arch/arm/mach-at91/sama5.c +8
-0#include "sam_secure.h" +static void sama5_l2c310_write_sec (unsigned long val,unsigned reg) +{ +/* OP-TEE configures the L2 cache and does not allow modifying it yet */ +} + +static void __init sama5_secure_cache_init (void ) +{ +sam_secure_init ();
With this, could the sam_secure_init() in sama5d2_init() (not listed in this diff) be removed?
arch/arm/mach-at91/sama5.c static const char *const sama5_dt_board_compat[] __initconst = { · line 47
Quoted 12 lines
arch/arm/mach-at91/sama5.c +5
-0+if (sam_linux_is_in_normal_world ()) + outer_cache.write_sec = sama5_l2c310_write_sec; +} +static void __init sama5_dt_device_init (void ) {of_platform_default_populate (NULL ,NULL ,NULL );@@ -30,6 +44,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {DT_MACHINE_START (sama5_dt,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5_dt_device_init, + .init_early = sama5_secure_cache_init,
This is for the generic "atmel,sama5" which can apply also to sama5d3 or sama5d4. I know this is harmless for functionality (except maybe when optee is in DT) but do we want it here?
arch/arm/mach-at91/sama5.c static const char *const sama5_alt_dt_board_compat[] __initconst = { · line 59
Quoted 8 lines
arch/arm/mach-at91/sama5.c +1
-0.dt_compat = sama5_dt_board_compat,MACHINE_END @@ -41,6 +56,7 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {DT_MACHINE_START (sama5_alt_dt,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5_dt_device_init, + .init_early = sama5_secure_cache_init,
Same here except it applies to sama5d4 only.
Quoted 14 lines
arch/arm/mach-at91/sama5.c +1
-1.dt_compat = sama5_alt_dt_board_compat, .l2c_aux_mask = ~0UL ,MACHINE_END @@ -60,6 +76,7 @@ static const char *const sama5d2_compat[] __initconst = {DT_MACHINE_START (sama5d2,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5d2_init, + .init_early = sama5_secure_cache_init, .dt_compat = sama5d2_compat, .l2c_aux_mask = ~0UL ,MACHINE_END --2.36.1
[email protected]
AppliedRe: [PATCH 2/2] ARM: at91: setup outer cache .write_sec() callback if needed
Quoted 9 lines · On 04.07.2022 09:39, Claudiu Beznea - M18063 wrote:
Quoted 8 lines · Clément Léger
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
When running under OP-TEE, the L2 cache is configured by OP-TEE and the sam platform code does not allow any modification yet. Setup a dummy .write_sec() callback to avoid triggering exceptions when Linux tries to modify the L2 cache configuration.
Signed-off-by Clément Léger <[email protected]>
Applied it to at91-soc with adjustments described in previous reply, thanks!
Quoted 76 lines
Quoted 19 lines
--- arch/arm/mach-at91/sama5.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)arch/arm/mach-at91/sama5.c +2
-0@@ -9,13 +9,27 @@#include <linux/of.h> #include <linux/of_platform.h> +#include <asm/hardware/cache-l2x0.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> +#include <asm/outercache.h> #include <asm/system_misc.h> #include "generic.h" arch/arm/mach-at91/sama5.c line 28
Quoted 10 lines
arch/arm/mach-at91/sama5.c +8
-0#include "sam_secure.h" +static void sama5_l2c310_write_sec (unsigned long val,unsigned reg) +{ +/* OP-TEE configures the L2 cache and does not allow modifying it yet */ +} + +static void __init sama5_secure_cache_init (void ) +{ +sam_secure_init ();With this, could the
sam_secure_init()insama5d2_init()(not listed in this diff) be removed?arch/arm/mach-at91/sama5.c static const char *const sama5_dt_board_compat[] __initconst = { · line 47
Quoted 12 lines
arch/arm/mach-at91/sama5.c +5
-0+if (sam_linux_is_in_normal_world ()) + outer_cache.write_sec = sama5_l2c310_write_sec; +} +static void __init sama5_dt_device_init (void ) {of_platform_default_populate (NULL ,NULL ,NULL );@@ -30,6 +44,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {DT_MACHINE_START (sama5_dt,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5_dt_device_init, + .init_early = sama5_secure_cache_init,This is for the generic "atmel,sama5" which can apply also to sama5d3 or sama5d4. I know this is harmless for functionality (except maybe when optee is in DT) but do we want it here?
arch/arm/mach-at91/sama5.c static const char *const sama5_alt_dt_board_compat[] __initconst = { · line 59
Quoted 8 lines
arch/arm/mach-at91/sama5.c +1
-0.dt_compat = sama5_dt_board_compat,MACHINE_END @@ -41,6 +56,7 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {DT_MACHINE_START (sama5_alt_dt,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5_dt_device_init, + .init_early = sama5_secure_cache_init,Same here except it applies to sama5d4 only.
Quoted 14 lines
arch/arm/mach-at91/sama5.c +1
-1.dt_compat = sama5_alt_dt_board_compat, .l2c_aux_mask = ~0UL ,MACHINE_END @@ -60,6 +76,7 @@ static const char *const sama5d2_compat[] __initconst = {DT_MACHINE_START (sama5d2,"Atmel SAMA5" )/* Maintainer: Atmel */ .init_machine = sama5d2_init, + .init_early = sama5_secure_cache_init, .dt_compat = sama5d2_compat, .l2c_aux_mask = ~0UL ,MACHINE_END --2.36.1