ARM: tegra: support for Trusted Foundations
v4 cover ARM: tegra: support for Trusted Foundations
New version revised according to comments received for v3. Hopefully it will be good enough to be merged.
Changes since v3:
- Added of_register_trusted_foundations() function to avoid duplicate device tree parsing code in arch files
- Added ability to initialize Trusted Foundations through platform data
- Changed TF version number to integers
- Refactored Kconfig menu for more clarity
A few requests could not reasonably be implemented:
TF version probing at runtime (requested by Dave) seems impossible unfortunately. TF just does not provide an interface that allows such queries. In the downstream Tegra kernel the TF version is even hardcoded into the kernel.
Use of a firmware_op instance for non-firmware behavior (requested by Stephen) would make it necessary to have a dedicated non-firmware registration function that takes implementations from various different files and would require these implementations to be exported. Checking the return code of call_firmware_op() at call sites seems to be easier to handle and is how current users of firmware_ops do.
Alexandre Courbot (5):
ARM: add basic Trusted Foundations support
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 | 26 +++++++ arch/arm/firmware/Makefile | 1 + arch/arm/firmware/trusted_foundations.c | 83 ++++++++++++++++++++++ arch/arm/include/asm/trusted_foundations.h | 48 +++++++++++++ arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-tegra/common.c | 2 + arch/arm/mach-tegra/reset.c | 40 ++++++++--- 13 files changed, 217 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 v4 1/5 ARM: add basic Trusted Foundations support
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using a consistent 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.
--- .../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 | 26 +++++++ arch/arm/firmware/Makefile | 1 + arch/arm/firmware/trusted_foundations.c | 83 ++++++++++++++++++++++ arch/arm/include/asm/trusted_foundations.h | 48 +++++++++++++ 8 files changed, 179 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 +26 -0
@@ -0,0 +1,26 @@ +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 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. + + Devices using Trusted Foundations should pass a device tree containing + a node compatible with "tl,trusted-foundations" to signal the presence + of the secure monitor. + +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 +83 -0
83 lines not on this page · raw message
arch/arm/include/asm/trusted_foundations.h new file +48 -0
48 lines not on this page · raw message
Signature · 1 line
1.8.4
Re: [PATCH v4 1/5] ARM: add basic Trusted Foundations support
Hi Alexandre,
Overall this looks good to me, but I have some minor comments.
Quoted 34 lines · On Thursday 29 of August 2013 18:57:44 Alexandre Courbot wrote:
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using a consistent 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.
Signed-off-by Alexandre Courbot <[email protected]>--- .../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 | 26 +++++++ arch/arm/firmware/Makefile | 1 + arch/arm/firmware/trusted_foundations.c | 83 ++++++++++++++++++++++ arch/arm/include/asm/trusted_foundations.h | 48 +++++++++++++ 8 files changed, 179 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.t xt 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.hdiff --git a/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations .txt b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations .txt new file mode 100644
index 0000000..3954bbd
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations .txt @@ -0,0 +1,17 @@
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt line 10
Quoted 10 lines
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +10
-0+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
Hmm, maybe you could simply define a single version property that could have multiple cells? Like:
firmware {
compatible = "tl,trusted-foundations";
version = <2 8>;
};Quoted 37 lines
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +6
-0+Example: + firmware { + compatible = "tl,trusted-foundations"; + version-major = <2>; + version-minor = <8>; + };(quoted diff) +0
-0
b/Documentation/devicetree/bindings/vendor-prefixes.txtindex 366ce9b..20d61f3 100644Documentation/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_BANKSarch/arm/Makefile +0
-0
arch/arm/Makefile core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ · line 267
Quoted 1 line
arch/arm/Makefile +0
-0@@ -267,6 +267,7 @@ core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ core-y += arch/arm/kernel/ arch/arm/mm/
arch/arm/common/
Quoted 17 lines
arch/arm/Makefile +1
-0core-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 +5
-0@@ -0,0 +1,26 @@ +config ARCH_SUPPORTS_FIRMWARE + bool + +config ARCH_SUPPORTS_TRUSTED_FOUNDATIONS + bool
arch/arm/firmware/Kconfig line 15
Quoted 10 lines
arch/arm/firmware/Kconfig new file +10
-0+ 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 are booted with the Trusted Foundations secure
monitor
arch/arm/firmware/Kconfig line 16
Quoted 1 line
arch/arm/firmware/Kconfig new file +1
-0+ active, requiring some core operations to be performed by the
secure
arch/arm/firmware/Kconfig
Quoted 3 lines
arch/arm/firmware/Kconfig new file +3
-0+ monitor instead of the kernel. + + This option allows the kernel to invoke the secure monitor
whenever
Quoted 5 lines
arch/arm/firmware/Kconfig new file +3
-0+ required on devices using Trusted Foundations. + + Devices using Trusted Foundations should pass a device treecontaining + a node compatible with "tl,trusted-foundations" to
signal the presence + of the secure monitor.
What about pointing to the documentation file instead?
Quoted 69 lines
arch/arm/firmware/Kconfig new file +2
-0+ +endmenuarch/arm/firmware/Makefile new file +1
-0@@ -0,0 +1 @@ +obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o(quoted diff) +0
-0
b/arch/arm/firmware/trusted_foundations.cnew file mode 100644 index 0000000..181f348arch/arm/firmware/trusted_foundations.c new file +7
-0@@ -0,0 +1,83 @@ +/* +* Trusted Foundations support for ARM CPUs +* +* Copyright (c) 2013, NVIDIA Corporation. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details.
+ */arch/arm/firmware/trusted_foundations.c new file +38
-0+ +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/of.h> +#include <asm/firmware.h> +#include <asm/trusted_foundations.h> + +#define TF_SET_CPU_BOOT_ADDR_SMC 0xfffff200 + +static void __naked tf_generic_smc (u32 type,u32 subtype,u32 arg) +{ + asmvolatile ( +".arch_extension sec\n\t" +"stmfd sp!, {r4 - r11, lr}\n\t" + __asmeq("%0", "r0") + __asmeq("%1", "r1") + __asmeq("%2", "r2") + "mov r3, #0\n\t" + "mov r4, #0\n\t" + "smc #0\n\t" + "ldmfd sp!, {r4 - r11, pc}" + : + : "r" (type), "r" (subtype), "r" (arg) + : "memory"); +} + +static int tf_set_cpu_boot_addr (int cpu,unsigned long boot_addr) +{ +tf_generic_smc (TF_SET_CPU_BOOT_ADDR_SMC , boot_addr,0 ); + +return 0 ; +} + +static const struct firmware_ops trusted_foundations_ops = { + .set_cpu_boot_addr = tf_set_cpu_boot_addr, +}; + +void register_trusted_foundations(struct
trusted_foundations_platform_data*pd) +{
arch/arm/firmware/trusted_foundations.c
Quoted 10 lines
arch/arm/firmware/trusted_foundations.c new file +10
-0+/* we are not using version information for now since currently +* supported SMCs are compatible with all TF releases */ +register_firmware_ops (&trusted_foundations_ops); +} + +void of_register_trusted_foundations (void ) +{ +struct device_node *node; + + node = of_find_compatible_node(NULL, NULL, "tl,trusted-
foundations");
nit:
if (!node) return;
arch/arm/firmware/trusted_foundations.c
Quoted 8 lines
arch/arm/firmware/trusted_foundations.c new file +8
-0+if (node) { +struct trusted_foundations_platform_data pdata; +int err; + + err =of_property_read_u32 (node,"version-major" , + &pdata.version_major); +if (err !=0 ) { + pr_crit("Trusted Foundation: missing version-
major\n");
arch/arm/firmware/trusted_foundations.c
Quoted 6 lines
arch/arm/firmware/trusted_foundations.c new file +6
-0+BUG (); + } + err =of_property_read_u32 (node,"version-minor" , + &pdata.version_minor); +if (err !=0 ) { + pr_crit("Trusted Foundation: missing version-
minor\n");
arch/arm/firmware/trusted_foundations.c
Quoted 2 lines
arch/arm/firmware/trusted_foundations.c new file +2
-0+BUG (); + }
If version was stored in multiple cells of a single property, then it would be parsed by just one call to of_property_read_u32_array().
Quoted 40 lines
arch/arm/firmware/trusted_foundations.c new file +3
-0+register_trusted_foundations (&pdata); + } +}(quoted diff) +0
-0
b/arch/arm/include/asm/trusted_foundations.hnew file mode 100644 index 0000000..77a4961arch/arm/include/asm/trusted_foundations.h new file +5
-0@@ -0,0 +1,48 @@ +/* +* Copyright (c) 2013, NVIDIA Corporation. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details.
+ */arch/arm/include/asm/trusted_foundations.h new file +16
-0+ +#ifndef __ASM_ARM_TRUSTED_FOUNDATIONS_H +#define __ASM_ARM_TRUSTED_FOUNDATIONS_H + +#include <linux/kconfig.h> +#include <linux/printk.h> +#include <asm/bug.h> + +struct trusted_foundations_platform_data { +unsigned int version_major; +unsigned int version_minor; +}; + +#if IS_ENABLED (CONFIG_TRUSTED_FOUNDATIONS ) + +void register_trusted_foundations(struct
trusted_foundations_platform_data*pd); +voidof_register_trusted_foundations(void);
arch/arm/include/asm/trusted_foundations.h
Quoted 5 lines
arch/arm/include/asm/trusted_foundations.h new file +5
-0+ +#else + +static inline void register_trusted_foundations( + struct
trusted_foundations_platform_data *pd)
arch/arm/include/asm/trusted_foundations.h line 38
Quoted 3 lines
arch/arm/include/asm/trusted_foundations.h new file +3
-0+{ +pr_crit ("No support for Trusted Foundations, stopping...\n" ); +BUG ();
Hmm, why not simply panic()?
Best regards,
Tomasz
Re: [PATCH v4 1/5] ARM: add basic Trusted Foundations support
Hi Tomasz!
Quoted 5 lines · Tomasz Figa
Quoted 4 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundations firmware +- version-minor: minor version number of Trusted Foundations firmware
Quoted 7 lines
Hmm, maybe you could simply define a single version property that could have multiple cells? Like:
firmware { compatible = "tl,trusted-foundations"; version = <2 8>; };
I'm fine this way too, but do we have other bindings that use the same scheme? What is the general convention for version number bindings?
Quoted 9 lines
Quoted 1 line
+ This option allows the kernel to invoke the secure monitor
whenever
Quoted 5 lines
arch/arm/firmware/Kconfig new file +3
-0+ required on devices using Trusted Foundations. + + Devices using Trusted Foundations should pass a device treecontaining + a node compatible with "tl,trusted-foundations" to
signal the presence + of the secure monitor.What about pointing to the documentation file instead?
Yes, that would make more sense.
Quoted 10 lines
arch/arm/firmware/trusted_foundations.c
Quoted 5 lines
arch/arm/firmware/trusted_foundations.c new file +5
-0+void of_register_trusted_foundations (void ) +{ +struct device_node *node; + + node = of_find_compatible_node(NULL, NULL, "tl,trusted-foundations");
nit:
if (!node) return;
Fixed, thanks.
Quoted 8 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+static inline void register_trusted_foundations( + struct
trusted_foundations_platform_data*pd)arch/arm/include/asm/trusted_foundations.h line 38
Quoted 3 lines
arch/arm/include/asm/trusted_foundations.h new file +3
-0+{ +pr_crit ("No support for Trusted Foundations, stopping...\n" ); +BUG ();Hmm, why not simply
panic()?
Fixed that too.
Thanks for the review!
Alex.
Re: [PATCH v4 1/5] ARM: add basic Trusted Foundations support
Quoted 11 lines · Alexandre Courbot
Hi Tomasz!
Quoted 8 lines · Tomasz Figa
Quoted 4 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundations firmware +- version-minor: minor version number of Trusted Foundations firmwareHmm, maybe you could simply define a single version property that could have multiple cells? Like:
Quoted 7 lines
Quoted 4 lines
firmware { compatible = "tl,trusted-foundations"; version = <2 8>; };I'm fine this way too, but do we have other bindings that use the same scheme? What is the general convention for version number bindings?
I don't know if there are enough cases of this for there to be a convention. A 2-cell property seems fine to me.
Quoted 10 lines
Quoted 8 lines
Quoted 6 lines
arch/arm/firmware/Kconfig new file +4
-0+ This option allows the kernel to invoke the secure monitor whenever + required on devices using Trusted Foundations. + + Devices using Trusted Foundations should pass a device treecontaining + a node compatible with "tl,trusted-foundations" to
signal the presence + of the secure monitor.What about pointing to the documentation file instead?
Yes, that would make more sense.
Possibly. What about when the binding document is no longer part of the kernel though? Perhaps we could reference the documentation in some way other than by the pathname within the kernel source tree though, e.g. 'see the device tree binding documentation for compatible="tl,trusted-foundations"'?
Re: [PATCH v4 1/5] ARM: add basic Trusted Foundations support
In reply to Alexandre CourbotQuoted 2 lines · Alexandre Courbot
Trusted Foundations is a TrustZone-based secure monitor for ARM that can be invoked using a consistent smc-based API on all supported
Nit: s/smc/SMC/?
Quoted 9 lines
arch/arm/include/asm/trusted_foundations.h +7
-0+#if IS_ENABLED (CONFIG_TRUSTED_FOUNDATIONS ) + +void register_trusted_foundations (struct trusted_foundations_platform_data *pd); +void of_register_trusted_foundations (void ); + +#else +
arch/arm/include/asm/trusted_foundations.h line 43
Quoted 10 lines
arch/arm/include/asm/trusted_foundations.h +10
-0+static inline void register_trusted_foundations ( +struct trusted_foundations_platform_data *pd) +{ +pr_crit ("No support for Trusted Foundations, stopping...\n" ); +BUG (); +} + +static inline void of_register_trusted_foundations (void ) +{ +register_trusted_foundations (NULL );
That will cause a hard-fail. I assume that should only happen if the TL DT node is present; if there's no DT node, it's fine for a kernel without any TL support to run.
Quoted 3 lines
arch/arm/include/asm/trusted_foundations.h +3
-0+} + +#endif /* IS_ENABLED(CONFIG_TRUSTED_FOUNDATIONS) */
PATCH v4 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 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 v4 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 v4 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 v4 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
Hi Alexandre,
Quoted 9 lines · On Thursday 29 of August 2013 18:57:43 Alexandre Courbot wrote:
New version revised according to comments received for v3. Hopefully it will be good enough to be merged.
Changes since v3:
- Addedof_register_trusted_foundations()function to avoid duplicate device tree parsing code in arch files
- Added ability to initialize Trusted Foundations through platform data
- Changed TF version number to integers
- RefactoredKconfigmenu for more clarity
Except some minor comments to patch 1/5, the series looks good to me.
Best regards,
Tomasz
Quoted 2 lines · Alexandre Courbot
New version revised according to comments received for v3. Hopefully it will be good enough to be merged.
Aside from the small issue in patch 1/5, the series,
Quoted 6 lines · Stephen Warren
Quoted 2 lines · Alexandre Courbot
New version revised according to comments received for v3. Hopefully it will be good enough to be merged.
Aside from the small issue in patch 1/5, the series,
Reviewed-by Stephen Warren <[email protected]>
Thanks! I have adressed the issues you mentioned and will submit v5 soon. Despite the fact this adds some non-Tegra stuff, will you be able to take it into your tree, or should I ask someone else?
Quoted 11 lines · Alex Courbot
Quoted 6 lines · Stephen Warren
Quoted 2 lines · Alexandre Courbot
New version revised according to comments received for v3. Hopefully it will be good enough to be merged.
Aside from the small issue in patch 1/5, the series,
Reviewed-by Stephen Warren <[email protected]>Thanks! I have adressed the issues you mentioned and will submit v5 soon. Despite the fact this adds some non-Tegra stuff, will you be able to take it into your tree, or should I ask someone else?
I would like to see an ack from the core ARM maintainer (Russell) on patch 1/5 (also CC'ing arm-soc maintainers for their opinion).
If I get that, I think it makes sense to take the series through the Tegra tree. I can always create a stable branch for patch 1/5 if needed to resolve conflicts elsewhere (e.g. Russell's trees or arm-soc) and/or allow other people to build on top of that patch.