Skip to contentSkip to conversation

ARM: support for Trusted Foundations secure monitor

PATCH Superseded Alexandre Courbot 5 participants 12 messages Oct 11, 2013 – Oct 28, 2013

Subsystems (4)

v8 of 11 Superseded Latest is v11 →

lore
Share & tools
lore
#0 lore raw

v8 cover ARM: support for Trusted Foundations secure monitor

Hopefully this has received enough review to be merged (although a few more acks/review especially from DT people on patch 1 would be nice). Thanks everyone for all the input and comments!

Trusted Foundations is an ARM secure monitor that is used by many Tegra-based retail devices (like SHIELD and TegraNote). Adding support to it allows these devices to boot on a purely upstream kernel.

Public documentation about Trusted Foundations is scarce, but over the various versions of this patch it has been established that it does not follow the ARM SMC convention and also has no connection whatsoever with PSCI. As such, it requires an implementation of its own and the firmware interface introduced by Tomasz provides an adequate framework for it.

Changes since v7:
- explicitly request the TF DT node to be under /firmware/ in the bindings documentation
- renamed arguments of tf_generic_smc() (suggestion made by Linus W. some time ago that I overlooked).
- fixed multi-line comment style

TODO in a future patchset:
- disable TF-dependant features (SMP, cpuidle) if TF cannot be supported instead or doing an early panic
- complete TF support with idle and L2 cache handling (ongoing)

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        | 20 ++++++
 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         | 68 +++++++++++++++++++
 arch/arm/mach-tegra/Kconfig                        |  1 +
 arch/arm/mach-tegra/common.c                       |  2 +
 arch/arm/mach-tegra/reset.c                        | 40 ++++++++---
 13 files changed, 238 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
#1 lore raw

PATCH v8 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        | 20 ++++++
 .../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         | 68 +++++++++++++++++++
 8 files changed, 200 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 +20 -0
new file mode 100644
index 0000000..2ec75c9
@@ -0,0 +1,20 @@
+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 /firmware/ 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 {
+		trusted-foundations {
+			compatible = "tl,trusted-foundations";
+			version-major = <2>;
+			version-minor = <8>;
+		};
+	};
Documentation/devicetree/bindings/vendor-prefixes.txt +1 -0
index 2956800..a374eaa 100644
@@ -66,6 +66,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
index 1ad6fb6..bf14cec 100644
@@ -1076,6 +1076,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
index a37a50f..f26712c 100644
@@ -268,6 +268,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
new file mode 100644
index 0000000..bb00ccf
@@ -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
new file mode 100644
index 0000000..a71f165
@@ -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 +68 -0

68 lines not on this page · raw message

Signature · 1 line
1.8.4
#2 lore raw

Re: [PATCH v8 1/5] ARM: add basic support for Trusted Foundations

Quoted 10 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).

Russell, are you OK with this patch? Is it OK if I take it through the Tegra tree, or would you like to take it through your tree and give me a stable branch I can apply the rest on top of?

Thanks.

#3 lore raw

Re: [PATCH v8 1/5] ARM: add basic support for Trusted Foundations

In reply to Alexandre Courbot
Quoted 14 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).

Quoted 15 lines
---
 .../arm/firmware/tl,trusted-foundations.txt        | 20 ++++++
 .../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         | 68 +++++++++++++++++++
 8 files changed, 200 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

Is having this under arch/arm appropriate? What happens if the API gets re-used on ARM64 for example? Would drivers/firmware be a better cross-arch location for this?

Quoted 41 lines
arch/arm/include/asm/trusted_foundations.h new file +35 -0
new file mode 100644
index 0000000..c6f20bd
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+/*
+ * Support for the Trusted Foundations secure monitor.
+ *
+ * Trusted Foundation comes active on some ARM consumer devices (most
+ * Tegra-based devices sold on the market are concerned). Such devices can only
+ * perform some basic operations, like setting the CPU reset vector, through
+ * SMC calls to the secure monitor. The calls are completely specific to
+ * Trusted Foundations, and do *not* follow the SMC calling convention or the
+ * PSCI standard.
+ */
+
+#ifndef __ASM_ARM_TRUSTED_FOUNDATIONS_H
+#define __ASM_ARM_TRUSTED_FOUNDATIONS_H
+
+#include <linux/kconfig.h>
+
+struct trusted_foundations_platform_data {
+	unsigned int version_major;
+	unsigned int version_minor;
+};
+

arch/arm/include/asm/trusted_foundations.h line 45

Quoted 10 lines
arch/arm/include/asm/trusted_foundations.h new file +10 -0
+#if IS_ENABLED(CONFIG_TRUSTED_FOUNDATIONS)
+
+void register_trusted_foundations(struct trusted_foundations_platform_data *pd);
+void of_register_trusted_foundations(void);
+
+#else /* CONFIG_TRUSTED_FOUNDATIONS */
+
+#include <linux/printk.h>
+#include <linux/of.h>
+#include <asm/bug.h>

Please move these up along side the other #include - having includes depend on config symbols is an additional unnecessary source of fragility.

Secondly, please use linux/*.h includes in preference to asm/*.h where the linux/*.h include picks up the corresponding asm/*.h include. In this case, that should be linux/bug.h, not asm/bug.h.

#4 lore raw

Re: [PATCH v8 1/5] ARM: add basic support for Trusted Foundations

Quoted 31 lines · Russell King - ARM Linux
Quoted 14 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).

Quoted 15 lines
---
 .../arm/firmware/tl,trusted-foundations.txt        | 20 ++++++
 .../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         | 68 +++++++++++++++++++
 8 files changed, 200 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
Quoted 3 lines

Is having this under arch/arm appropriate? What happens if the API gets re-used on ARM64 for example? Would drivers/firmware be a better cross-arch location for this?

That's probably a better location, yes.

BTW, drivers/firmware/ doesn't seem to have an overall maintainer. Who should Alex send the patch to, or should I just take this patch throught the Tegra tree once the files are moved?

#5 lore raw

Re: [PATCH v8 1/5] ARM: add basic support for Trusted Foundations

In reply to Russell King - ARM Linux
Quoted 31 lines · Russell King - ARM Linux
Quoted 24 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).

---
  .../arm/firmware/tl,trusted-foundations.txt        | 20 ++++++
  .../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         | 68 +++++++++++++++++++
  8 files changed, 200 insertions(+)
Quoted 5 lines

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

Quoted 3 lines

Is having this under arch/arm appropriate? What happens if the API gets re-used on ARM64 for example? Would drivers/firmware be a better cross-arch location for this?

The reason why this has been put into arch/arm is that the firmware_ops feature this patch depends also resides there (arch/arm/include/asm/firmware.h).

On the other hand it might also make sense to move firmware_ops out of ARM since I don't see anything ARM-specific with it. Tomasz, could we have your thoughts on this?

Quoted 55 lines
Quoted 41 lines
arch/arm/include/asm/trusted_foundations.h new file +35 -0
new file mode 100644
index 0000000..c6f20bd
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+/*
+ * Support for the Trusted Foundations secure monitor.
+ *
+ * Trusted Foundation comes active on some ARM consumer devices (most
+ * Tegra-based devices sold on the market are concerned). Such devices can only
+ * perform some basic operations, like setting the CPU reset vector, through
+ * SMC calls to the secure monitor. The calls are completely specific to
+ * Trusted Foundations, and do *not* follow the SMC calling convention or the
+ * PSCI standard.
+ */
+
+#ifndef __ASM_ARM_TRUSTED_FOUNDATIONS_H
+#define __ASM_ARM_TRUSTED_FOUNDATIONS_H
+
+#include <linux/kconfig.h>
+
+struct trusted_foundations_platform_data {
+	unsigned int version_major;
+	unsigned int version_minor;
+};
+

arch/arm/include/asm/trusted_foundations.h line 45

Quoted 10 lines
arch/arm/include/asm/trusted_foundations.h new file +10 -0
+#if IS_ENABLED(CONFIG_TRUSTED_FOUNDATIONS)
+
+void register_trusted_foundations(struct trusted_foundations_platform_data *pd);
+void of_register_trusted_foundations(void);
+
+#else /* CONFIG_TRUSTED_FOUNDATIONS */
+
+#include <linux/printk.h>
+#include <linux/of.h>
+#include <asm/bug.h>

Please move these up along side the other #include - having includes depend on config symbols is an additional unnecessary source of fragility.

Quoted 3 lines

Secondly, please use linux/*.h includes in preference to asm/*.h where the linux/*.h include picks up the corresponding asm/*.h include. In this case, that should be linux/bug.h, not asm/bug.h.

Will do, thanks!

Alex.

#6 lore raw

Re: [PATCH v8 1/5] ARM: add basic support for Trusted Foundations

Hi,

2013/10/15 Alex Courbot <[email protected]>:

Quoted 43 lines · Russell King - ARM Linux
Quoted 37 lines · Alexandre Courbot
Quoted 27 lines

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        | 20 ++++++
  .../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         | 68
+++++++++++++++++++
  8 files changed, 200 insertions(+)
Quoted 6 lines

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

Quoted 3 lines

Is having this under arch/arm appropriate? What happens if the API gets re-used on ARM64 for example? Would drivers/firmware be a better cross-arch location for this?

Quoted 7 lines

The reason why this has been put into arch/arm is that the firmware_ops feature this patch depends also resides there (arch/arm/include/asm/firmware.h).

On the other hand it might also make sense to move firmware_ops out of ARM since I don't see anything ARM-specific with it. Tomasz, could we have your thoughts on this?

I don't see anything wrong in moving this out of arch/arm, feel free to do so.

However I guess that some (or all) of the names will have to be put into a more separate namespace, as the term "firmware" is a bit too generic IMHO. Possibly something like platform_firmware could be better.

What do you think?

Best regards,
Tomasz

#7 lore raw

Re: [PATCH v8 1/5] ARM: add basic support for Trusted Foundations

Quoted 57 lines · Tomasz Figa

Hi,

2013/10/15 Alex Courbot <[email protected]>:

Quoted 43 lines · Russell King - ARM Linux
Quoted 37 lines · Alexandre Courbot
Quoted 27 lines

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        | 20 ++++++
  .../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         | 68
+++++++++++++++++++
  8 files changed, 200 insertions(+)
Quoted 6 lines

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

Quoted 3 lines

Is having this under arch/arm appropriate? What happens if the API gets re-used on ARM64 for example? Would drivers/firmware be a better cross-arch location for this?

Quoted 7 lines

The reason why this has been put into arch/arm is that the firmware_ops feature this patch depends also resides there (arch/arm/include/asm/firmware.h).

On the other hand it might also make sense to move firmware_ops out of ARM since I don't see anything ARM-specific with it. Tomasz, could we have your thoughts on this?

I don't see anything wrong in moving this out of arch/arm, feel free to do so.

Quoted 6 lines

However I guess that some (or all) of the names will have to be put into a more separate namespace, as the term "firmware" is a bit too generic IMHO. Possibly something like platform_firmware could be better.

What do you think?

I think we can probably merge this under arch/arm now, and when we figure out what needs to be common with ARM64 we can move it out to a good location. It might be that mostly just a header file with ABI conventions needs to be shared, not actual implementation, for example.

-Olof

#8 lore raw

PATCH v8 2/5 ARM: tegra: add support for Trusted Foundations

In reply to Alexandre Courbot

Register 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
index ed9c853..8e51884 100644
@@ -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
index 67a76f2..4e51278 100644
@@ -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 ARM_GIC
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
arch/arm/mach-tegra/common.c +2 -0
index 94a119a..b405e45 100644
@@ -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
#9 lore raw

PATCH v8 3/5 ARM: tegra: split setting of CPU reset handler

In reply to Alexandre Courbot

Not 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
index fd0bbf8..e282395 100644
@@ -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
#10 lore raw

PATCH v8 4/5 ARM: tegra: set CPU reset handler with firmware op

In reply to Alexandre Courbot

Use 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
index e282395..368af0a 100644
@@ -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
#11 lore raw

PATCH v8 5/5 ARM: tegra: support Trusted Foundations by default

In reply to Alexandre Courbot

Support 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
index ea042e8..dddb97b 100644
@@ -32,6 +32,7 @@ CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_TEGRA=y
 CONFIG_PCIEPORTBUS=y
+CONFIG_TRUSTED_FOUNDATIONS=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
Signature · 1 line
1.8.4