ARM: support for Trusted Foundations secure monitor
v6 cover ARM: support for Trusted Foundations secure monitor
Sixth attempt at the support for Trusted Foundations, which allows many Tegra-based (and quite possibly other) devices sold on the market to boot and be used with an upstream kernel.
v5 did not receive many comments on the code itself, so I hope this means the patch set is converging well. Most remarks were about the lack of clarity about what Trusted Foundations is and how it fits with respect to SMC calling conventions and the PSCI standard (spoiler: it does not fit).
Change against v5:
- added a no-op of_register_trusted_foundations() for the case where neither Trusted Foundations nor device tree support are enabled
- made it clear in the commit message and source file that TF does not follow the SMC calling convention, is totally independant of PSIC and only matters to devices that come with a bootloader that enables it.
Alexandre Courbot (5):
ARM: add basic support for Trusted Foundations
ARM: tegra: add support for Trusted Foundations
ARM: tegra: split setting of CPU reset handler
ARM: tegra: set CPU reset handler with firmware op
ARM: tegra: support Trusted Foundations by default
.../arm/firmware/tl,trusted-foundations.txt | 17 +++++ Documentation/devicetree/bindings/arm/tegra.txt | 5 ++ .../devicetree/bindings/vendor-prefixes.txt | 1 + arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/configs/tegra_defconfig | 1 + arch/arm/firmware/Kconfig | 28 ++++++++ arch/arm/firmware/Makefile | 1 + arch/arm/firmware/trusted_foundations.c | 79 ++++++++++++++++++++++ arch/arm/include/asm/trusted_foundations.h | 70 +++++++++++++++++++ arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-tegra/common.c | 2 + arch/arm/mach-tegra/reset.c | 40 ++++++++--- 13 files changed, 237 insertions(+), 11 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644 arch/arm/firmware/Kconfig create mode 100644 arch/arm/firmware/Makefile create mode 100644 arch/arm/firmware/trusted_foundations.c create mode 100644 arch/arm/include/asm/trusted_foundations.h
Signature · 1 line
1.8.4
PATCH v6 1/5 ARM: add basic support for Trusted Foundations
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using the same SMC-based API on all supported platforms. This patch adds initial basic support for Trusted Foundations using the ARM firmware API. Current features are limited to the ability to boot secondary processors.
Note: The API followed by Trusted Foundations does *not* follow the SMC calling conventions. It has nothing to do with PSCI neither and is only relevant to devices that use Trusted Foundations (like most Tegra-based retail devices).
--- .../arm/firmware/tl,trusted-foundations.txt | 17 +++++ .../devicetree/bindings/vendor-prefixes.txt | 1 + arch/arm/Kconfig | 2 + arch/arm/Makefile | 1 + arch/arm/firmware/Kconfig | 28 ++++++++ arch/arm/firmware/Makefile | 1 + arch/arm/firmware/trusted_foundations.c | 79 ++++++++++++++++++++++ arch/arm/include/asm/trusted_foundations.h | 70 +++++++++++++++++++ 8 files changed, 199 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644 arch/arm/firmware/Kconfig create mode 100644 arch/arm/firmware/Makefile create mode 100644 arch/arm/firmware/trusted_foundations.c create mode 100644 arch/arm/include/asm/trusted_foundations.h
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +17 -0
@@ -0,0 +1,17 @@ +Trusted Foundations + +Boards that use the Trusted Foundations secure monitor can signal its +presence by declaring a node compatible with "tl,trusted-foundations" +under the root node. + +Required properties: +- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundations firmware +- version-minor: minor version number of Trusted Foundations firmware + +Example: + firmware { + compatible = "tl,trusted-foundations"; + version-major = <2>; + version-minor = <8>; + };
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
@@ -63,6 +63,7 @@ ste ST-Ericsson stericsson ST-Ericsson toumaz Toumaz ti Texas Instruments +tl Trusted Logic toshiba Toshiba Corporation v3 V3 Semiconductor via VIA Technologies, Inc.
arch/arm/Kconfig +2 -0
@@ -1074,6 +1074,8 @@ config ARM_TIMER_SP804 select CLKSRC_MMIO select CLKSRC_OF if OF +source "arch/arm/firmware/Kconfig" + source arch/arm/mm/Kconfig config ARM_NR_BANKS
arch/arm/Makefile +1 -0
@@ -267,6 +267,7 @@ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ core-y += arch/arm/net/ core-y += arch/arm/crypto/ +core-y += arch/arm/firmware/ core-y += $(machdirs) $(platdirs) drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/
arch/arm/firmware/Kconfig new file +28 -0
@@ -0,0 +1,28 @@ +config ARCH_SUPPORTS_FIRMWARE + bool + +config ARCH_SUPPORTS_TRUSTED_FOUNDATIONS + bool + select ARCH_SUPPORTS_FIRMWARE + +menu "Firmware options" + depends on ARCH_SUPPORTS_FIRMWARE + +config TRUSTED_FOUNDATIONS + bool "Trusted Foundations secure monitor support" + depends on ARCH_SUPPORTS_TRUSTED_FOUNDATIONS + help + Some devices (including most Tegra-based consumer devices on the + market) are booted with the Trusted Foundations secure monitor + active, requiring some core operations to be performed by the secure + monitor instead of the kernel. + + This option allows the kernel to invoke the secure monitor whenever + required on devices using Trusted Foundations. See + arch/arm/include/asm/trusted_foundations.h or the + tl,trusted-foundations device tree binding documentation for details + on how to use it. + + Say n if you don't know what this is about. + +endmenu
arch/arm/firmware/Makefile new file +1 -0
@@ -0,0 +1 @@ +obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o
arch/arm/firmware/trusted_foundations.c new file +79 -0
79 lines not on this page · raw message
arch/arm/include/asm/trusted_foundations.h new file +70 -0
70 lines not on this page · raw message
Signature · 1 line
1.8.4
Re: [PATCH v6 1/5] ARM: add basic support for Trusted Foundations
Quoted 23 lines · Alexandre Courbot
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using the same SMC-based API on all supported platforms. This patch adds initial basic support for Trusted Foundations using the ARM firmware API. Current features are limited to the ability to boot secondary processors.
Note: The API followed by Trusted Foundations does *not* follow the SMC calling conventions. It has nothing to do with PSCI neither and is only relevant to devices that use Trusted Foundations (like most Tegra-based retail devices).
arch/arm/firmware/trusted_foundations.c +10
-0+#if IS_ENABLED (CONFIG_OF ) +void of_register_trusted_foundations (void ) +{ +struct device_node *node; +struct trusted_foundations_platform_data pdata; +int err; + + node =of_find_compatible_node (NULL ,NULL ,"tl,trusted-foundations" ); +if (!node) +return ;
...
arch/arm/include/asm/trusted_foundations.h line 40
Quoted 7 lines
arch/arm/include/asm/trusted_foundations.h +5
-0+#if IS_ENABLED (CONFIG_TRUSTED_FOUNDATIONS ) +void register_trusted_foundations (struct trusted_foundations_platform_data *pd); +#if IS_ENABLED (CONFIG_OF ) +void of_register_trusted_foundations (void ); +#endif
I still don't think that's correct.
If TF support is enabled, yet DT support is not enabled, then there is no prototype, implementation, or dummy implementation for of_register_trusted_foundations(). I think there should be a dummy implementation in this case, shouldn't there?
Quoted 16 lines
arch/arm/include/asm/trusted_foundations.h +16
-0+ +#else /* CONFIG_TRUSTED_FOUNDATIONS */ + +#include <linux/printk.h> +#include <linux/of.h> +#include <asm/bug.h> + +static inline void register_trusted_foundations( + struct trusted_foundations_platform_data *pd) +{ + panic("No support for Trusted Foundations, stopping...\n"); +} + +#if IS_ENABLED(CONFIG_OF) +static inline void of_register_trusted_foundations(void) +{
arch/arm/include/asm/trusted_foundations.h line 66
Quoted 10 lines
arch/arm/include/asm/trusted_foundations.h +10
-0+/* If we find the target should enable TF but does not support it, +* fail as the system won't be able to do much anyway */ +if (of_find_compatible_node (NULL ,NULL ,"tl,trusted-foundations" )) + register_trusted_foundations(NULL); +} +#else +static inline void of_register_trusted_foundations (void ) +{ +} +#endif /* CONFIG_OF */
That's more complex than it needs to be; there is a dummy of_find_compatible_node() in the !OF case, so you don't need to ifdef the implementation of of_register_trusted_foundations(); you just need the first implementation here.
Quoted 1 line
+#endif /*
CONFIG_TRUSTED_FOUNDATIONS*/
In summary, I think you need:
If TF is enabled, always implement of_register_trusted_foundations() in the C file, and rely on of_find_compatible_node() to return NULL if !CONFIG_OF.
If TF is not enabled, implement the inline version in the header file, and again rely on of_find_compatible_node() to return NULL if !CONFIG_OF.
Unless I'm missing something!
Re: [PATCH v6 1/5] ARM: add basic support for Trusted Foundations
Quoted 75 lines · Stephen Warren
Quoted 23 lines · Alexandre Courbot
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using the same SMC-based API on all supported platforms. This patch adds initial basic support for Trusted Foundations using the ARM firmware API. Current features are limited to the ability to boot secondary processors.
Note: The API followed by Trusted Foundations does *not* follow the SMC calling conventions. It has nothing to do with PSCI neither and is only relevant to devices that use Trusted Foundations (like most Tegra-based retail devices).
arch/arm/firmware/trusted_foundations.c +10
-0+#if IS_ENABLED (CONFIG_OF ) +void of_register_trusted_foundations (void ) +{ +struct device_node *node; +struct trusted_foundations_platform_data pdata; +int err; + + node =of_find_compatible_node (NULL ,NULL ,"tl,trusted-foundations" ); +if (!node) +return ;...
arch/arm/include/asm/trusted_foundations.h line 40
Quoted 7 lines
arch/arm/include/asm/trusted_foundations.h +5
-0+#if IS_ENABLED (CONFIG_TRUSTED_FOUNDATIONS ) +void register_trusted_foundations (struct trusted_foundations_platform_data *pd); +#if IS_ENABLED (CONFIG_OF ) +void of_register_trusted_foundations (void ); +#endif I still don't think that's correct.
If TF support is enabled, yet DT support is not enabled, then there is no prototype, implementation, or dummy implementation for
of_register_trusted_foundations(). I think there should be a dummy implementation in this case, shouldn't there?Quoted 16 lines
arch/arm/include/asm/trusted_foundations.h +16
-0+ +#else /* CONFIG_TRUSTED_FOUNDATIONS */ + +#include <linux/printk.h> +#include <linux/of.h> +#include <asm/bug.h> + +static inline void register_trusted_foundations( + struct trusted_foundations_platform_data *pd) +{ + panic("No support for Trusted Foundations, stopping...\n"); +} + +#if IS_ENABLED(CONFIG_OF) +static inline void of_register_trusted_foundations(void) +{arch/arm/include/asm/trusted_foundations.h line 66
Quoted 10 lines
arch/arm/include/asm/trusted_foundations.h +10
-0+/* If we find the target should enable TF but does not support it, +* fail as the system won't be able to do much anyway */ +if (of_find_compatible_node (NULL ,NULL ,"tl,trusted-foundations" )) + register_trusted_foundations(NULL); +} +#else +static inline void of_register_trusted_foundations (void ) +{ +} +#endif /* CONFIG_OF */ That's more complex than it needs to be; there is a dummy
of_find_compatible_node()in the !OF case, so you don't need to ifdef the implementation ofof_register_trusted_foundations(); you just need the first implementation here.Quoted 1 line
+#endif /*
CONFIG_TRUSTED_FOUNDATIONS*/
Quoted 8 lines
In summary, I think you need:
If TF is enabled, always implement
of_register_trusted_foundations()in the C file, and rely onof_find_compatible_node()to return NULL if !CONFIG_OF.If TF is not enabled, implement the inline version in the header file, and again rely on
of_find_compatible_node()to return NULL if !CONFIG_OF.
Indeed, all your points are correct, and I've clearly been negligent here. Sorry about that.
Will have to submit a v7, but hopefully we can get the acks that we need (Russel?) on this version.
Alex.
Re: [PATCH v6 1/5] ARM: add basic support for Trusted Foundations
In reply to Alexandre CourbotQuoted 5 lines · Alexandre Courbot
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using the same SMC-based API on all supported platforms. This patch adds initial basic support for Trusted Foundations using the ARM firmware API. Current features are limited to the ability to boot secondary processors.
[...]
Quoted 4 lines
arch/arm/firmware/trusted_foundations.c new file +4
-0+#if IS_ENABLED (CONFIG_OF ) +void of_register_trusted_foundations (void ) +{ +struct device_node *node;
arch/arm/firmware/trusted_foundations.c line 73
Quoted 10 lines
arch/arm/firmware/trusted_foundations.c new file +10
-0+struct trusted_foundations_platform_data pdata; +int err; + + node =of_find_compatible_node (NULL ,NULL ,"tl,trusted-foundations" ); +if (!node) +return ; + + err =of_property_read_u32 (node,"version-major" , &pdata.version_major); +if (err !=0 ) +panic ("Trusted Foundation: missing version-major property\n" );
Do really need to panic() the whole kernel for a missing property? Surely this can more gracefully recover, or assume some defaults?
Same comment for the other uses of panic() in this patch.
Kevin
Re: [PATCH v6 1/5] ARM: add basic support for Trusted Foundations
Quoted 28 lines · Kevin Hilman
Quoted 5 lines · Alexandre Courbot
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using the same SMC-based API on all supported platforms. This patch adds initial basic support for Trusted Foundations using the ARM firmware API. Current features are limited to the ability to boot secondary processors.
[...]
Quoted 4 lines
arch/arm/firmware/trusted_foundations.c new file +4
-0+#if IS_ENABLED (CONFIG_OF ) +void of_register_trusted_foundations (void ) +{ +struct device_node *node;arch/arm/firmware/trusted_foundations.c line 73
Quoted 10 lines
arch/arm/firmware/trusted_foundations.c new file +10
-0+struct trusted_foundations_platform_data pdata; +int err; + + node =of_find_compatible_node (NULL ,NULL ,"tl,trusted-foundations" ); +if (!node) +return ; + + err =of_property_read_u32 (node,"version-major" , &pdata.version_major); +if (err !=0 ) +panic ("Trusted Foundation: missing version-major property\n" );Do really need to
panic()the whole kernel for a missing property? Surely this can more gracefully recover, or assume some defaults?
Quoted 1 line
Same comment for the other uses of
panic()in this patch.
For something as essential as the secure monitor (for which there cannot be "safe" defaults) it makes sense to have the version explicitly mentioned. Version is a mandatory property in the bindings, its implementors just need to follow it.
As for the other uses of panic(), that's because you just cannot reasonably continue booting the system if trusted foundations is required but not support for it is built into the kernel. Once again, I don't feel this is out of place.
Alex.
PATCH v6 2/5 ARM: tegra: add support for Trusted Foundations
In reply to Alexandre CourbotRegister the firmware operations for Trusted Foundations if the device tree indicates it is active on the device.
--- Documentation/devicetree/bindings/arm/tegra.txt | 5 +++++ arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-tegra/common.c | 2 ++ 3 files changed, 8 insertions(+)
Documentation/devicetree/bindings/arm/tegra.txt +5 -0
@@ -32,3 +32,8 @@ board-specific compatible values: nvidia,whistler toradex,colibri_t20-512 toradex,iris + +Trusted Foundations +------------------------------------------- +Tegra supports the Trusted Foundation secure monitor. See the +"tl,trusted-foundations" binding's documentation for more details.
arch/arm/mach-tegra/Kconfig +1 -0
@@ -2,6 +2,7 @@ config ARCH_TEGRA bool "NVIDIA Tegra" if ARCH_MULTI_V7 select ARCH_HAS_CPUFREQ select ARCH_REQUIRE_GPIOLIB + select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS select CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_OF
arch/arm/mach-tegra/common.c +2 -0
@@ -27,6 +27,7 @@#include <linux/clk-provider.h> #include <asm/hardware/cache-l2x0.h> +#include <asm/trusted_foundations.h> #include "board.h" #include "common.h"
@@ -99,6 +100,7 @@ static void __init tegra_init_cache(void)void __init tegra_init_early (void ) { +of_register_trusted_foundations ();tegra_cpu_reset_handler_init ();tegra_apb_io_init ();tegra_init_fuse ();
Signature · 1 line
1.8.4
PATCH v6 3/5 ARM: tegra: split setting of CPU reset handler
In reply to Alexandre CourbotNot all Tegra devices can set the CPU reset handler in the same way. In particular, devices using a TrustZone secure monitor cannot set the reset handler directly and need to do it through a firmware operation.
This patch separates the act of setting the reset handler from its preparation, so the former can be implemented in a different way.
--- arch/arm/mach-tegra/reset.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)
arch/arm/mach-tegra/reset.c +17 -10
@@ -33,26 +33,18 @@static bool is_enabled; -static void __init tegra_cpu_reset_handler_enable (void ) +static void __init tegra_cpu_reset_handler_set (const u32 reset_address) { -void __iomem *iram_base =IO_ADDRESS (TEGRA_IRAM_RESET_BASE );void __iomem *evp_cpu_reset =IO_ADDRESS (TEGRA_EXCEPTION_VECTORS_BASE +0x100 );void __iomem *sb_ctrl =IO_ADDRESS (TEGRA_SB_BASE );u32 reg; -BUG_ON (is_enabled); -BUG_ON (tegra_cpu_reset_handler_size >TEGRA_IRAM_RESET_HANDLER_SIZE ); - -memcpy (iram_base, (void *)__tegra_cpu_reset_handler_start, - tegra_cpu_reset_handler_size); -/* * NOTE: This must be the one and only write to the EVP CPU reset * vector in the entire system. */ -writel (TEGRA_IRAM_RESET_BASE + tegra_cpu_reset_handler_offset, - evp_cpu_reset); +writel (reset_address, evp_cpu_reset);wmb (); reg =readl (evp_cpu_reset);
@@ -66,6 +58,21 @@ static void __init tegra_cpu_reset_handler_enable(void)writel (reg, sb_ctrl);wmb (); } +} + +static void __init tegra_cpu_reset_handler_enable (void ) +{ +void __iomem *iram_base =IO_ADDRESS (TEGRA_IRAM_RESET_BASE ); +const u32 reset_address =TEGRA_IRAM_RESET_BASE + + tegra_cpu_reset_handler_offset; + +BUG_ON (is_enabled); +BUG_ON (tegra_cpu_reset_handler_size >TEGRA_IRAM_RESET_HANDLER_SIZE ); + +memcpy (iram_base, (void *)__tegra_cpu_reset_handler_start, + tegra_cpu_reset_handler_size); + +tegra_cpu_reset_handler_set (reset_address); is_enabled = true; }
Signature · 1 line
1.8.4
PATCH v6 4/5 ARM: tegra: set CPU reset handler with firmware op
In reply to Alexandre CourbotUse a firmware operation to set the CPU reset handler and only resort to doing it ourselves if there is none defined.
This supports the booting of secondary CPUs on devices using a TrustZone secure monitor.
--- arch/arm/mach-tegra/reset.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
arch/arm/mach-tegra/reset.c +14 -3
@@ -21,6 +21,7 @@#include <asm/cacheflush.h> #include <asm/hardware/cache-l2x0.h> +#include <asm/firmware.h> #include "iomap.h" #include "irammap.h"
@@ -65,6 +66,7 @@ static void __init tegra_cpu_reset_handler_enable(void)void __iomem *iram_base =IO_ADDRESS (TEGRA_IRAM_RESET_BASE );const u32 reset_address =TEGRA_IRAM_RESET_BASE + tegra_cpu_reset_handler_offset; +int err;BUG_ON (is_enabled);BUG_ON (tegra_cpu_reset_handler_size >TEGRA_IRAM_RESET_HANDLER_SIZE );
@@ -72,9 +74,18 @@ static void __init tegra_cpu_reset_handler_enable(void)memcpy (iram_base, (void *)__tegra_cpu_reset_handler_start, tegra_cpu_reset_handler_size); -tegra_cpu_reset_handler_set (reset_address); - - is_enabled = true; + err =call_firmware_op (set_cpu_boot_addr,0 , reset_address); +switch (err) { +case -ENOSYS : +tegra_cpu_reset_handler_set (reset_address); +/* pass-through */ +case 0 : + is_enabled = true; +break ; +default : +pr_crit ("Cannot set CPU reset handler: %d\n" , err); +BUG (); + } }void __init tegra_cpu_reset_handler_init (void )
Signature · 1 line
1.8.4
PATCH v6 5/5 ARM: tegra: support Trusted Foundations by default
In reply to Alexandre CourbotSupport for Trusted Foundations is light and allows the kernel to run on a wider range of devices, so enable it by default.
--- arch/arm/configs/tegra_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/tegra_defconfig +1 -0
@@ -28,6 +28,7 @@ CONFIG_ARCH_TEGRA_3x_SOC=y CONFIG_ARCH_TEGRA_114_SOC=y CONFIG_TEGRA_PCI=y CONFIG_TEGRA_EMC_SCALING_ENABLE=y +CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_AEABI=y
Signature · 1 line
1.8.4