ARM: support for Trusted Foundations secure monitor
v9 cover ARM: support for Trusted Foundations secure monitor
New attempt to get this merged. ;)
The last open discussion topic for this series is whether to move this into drivers/ instead of having it depend on ARM. The problem is that the firmware framework this series is built upon resides in arch/arm/. It would possibly make sense to move it out of there as well, but doing so requires Tomasz opinion on the matter and unfortunately I haven't been able to get feedback from him, even after trying to contact him privately.
At the current state of things, this should be of little concern anyway. Trusted Foundations is for the moment indeed ARM-only, and both the Trusted Foundations driver and firmware framework can be moved out of arch/arm/ at any time without introducing any incompatibility.
Also I have some inprovements to this driver waiting to be submitted, but would like to get this generally-accepted part merged first instead of adding new code that will probably need several new rounds of revisions.
Changelog from v8:
- moved includes that depended on config symbols to the top of the file
- use linux/*.h instead of asm/*.h
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 | 67 ++++++++++++++++++ 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.1
PATCH v9 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 | 67 ++++++++++++++++++ 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 +20 -0
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 +67 -0
67 lines not on this page · raw message
Signature · 1 line
1.8.4.1
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
Quoted 37 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).
Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txtcreate mode 100644arch/arm/firmware/Kconfig
create mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.c
create mode 100644arch/arm/include/asm/trusted_foundations.hDocumentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +1
-0@@ -0,0 +1,20 @@ +Trusted Foundations
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +10
-0+------------------- + +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
vendor prefix version.
Quoted 14 lines
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +9
-0+ +Example: + firmware { + trusted-foundations { + compatible = "tl,trusted-foundations"; + version-major = <2>; + version-minor = <8>; + }; + };Documentation/devicetree/bindings/vendor-prefixes.txt +0
-0@@ -66,6 +66,7 @@ ste ST-Ericsson
Quoted 4 lines
stericsson ST-Ericsson
toumaz Toumaz
ti Texas Instruments
+tl Trusted Logic
Should this be Trusted Logic Mobility (tlm)?
Quoted 3 lines
toshiba Toshiba Corporation
v3 V3 Semiconductor
via VIA Technologies, Inc.
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
Quoted 44 lines · Kumar Gala
Quoted 41 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).
Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txtcreate mode 100644arch/arm/firmware/Kconfig
create mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.c
create mode 100644arch/arm/include/asm/trusted_foundations.hDocumentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +5
-0@@ -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"
Quoted 8 lines
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt line 11
Quoted 6 lines
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +6
-0+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 firmwarevendor prefix version.
Are you saying he should use tl,version-major tl,version-minor? For bindings that are already vendor-specific we haven't (on ARM) asked for vendor prefix on properties. It doesn't mean that we should keep going down that route though, so I'm just asking for clarification for my own edification. :)
-Olof
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
Quoted 64 lines · On Monday 28 of October 2013 14:56:49 Olof Johansson wrote:
Quoted 54 lines · Kumar Gala
Quoted 53 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).Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644arch/arm/firmware/Kconfigcreate mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.ccreate mode 100644arch/arm/include/asm/trusted_foundations.hdiff --git a/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt new file mode 100644
index 0000000..2ec75c9
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt @@ -0,0 +1,20 @@Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +4
-0+Trusted Foundations +------------------- + +Boards that use the Trusted Foundations secure monitor can signalits
+presence by declaring a node compatible with
"tl,trusted-foundations"(quoted diff) +2
-0+under the /firmware/ node +Quoted 8 lines
Quoted 6 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundationsfirmware
+- version-minor: minor version number of Trusted Foundations firmwarevendor prefix version.
Quoted 5 lines
Are you saying he should use tl,version-major tl,version-minor? For bindings that are already vendor-specific we haven't (on ARM) asked for vendor prefix on properties. It doesn't mean that we should keep going down that route though, so I'm just asking for clarification for my own edification. :)
This is a good question. We should decide what the right thing (TM) is and write it down. I, on the contrary, was convinced that it's the way Kumar says.
Best regards,
Tomasz
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
Quoted 71 lines · Tomasz Figa
Quoted 64 lines · On Monday 28 of October 2013 14:56:49 Olof Johansson wrote:
Quoted 54 lines · Kumar Gala
Quoted 53 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).Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644arch/arm/firmware/Kconfigcreate mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.ccreate mode 100644arch/arm/include/asm/trusted_foundations.hdiff --git a/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt new file mode 100644
index 0000000..2ec75c9
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt @@ -0,0 +1,20 @@Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +4
-0+Trusted Foundations +------------------- + +Boards that use the Trusted Foundations secure monitor can signalits
+presence by declaring a node compatible with
"tl,trusted-foundations"(quoted diff) +2
-0+under the /firmware/ node +Quoted 8 lines
Quoted 6 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundationsfirmware
+- version-minor: minor version number of Trusted Foundations firmwarevendor prefix version.
Quoted 5 lines
Are you saying he should use tl,version-major tl,version-minor? For bindings that are already vendor-specific we haven't (on ARM) asked for vendor prefix on properties. It doesn't mean that we should keep going down that route though, so I'm just asking for clarification for my own edification. :)
Quoted 3 lines
This is a good question. We should decide what the right thing (TM) is and write it down. I, on the contrary, was convinced that it's the way Kumar says.
The impression I got was that properties should be prefixed when they're extremely vendor-specific and could clash with a more generic property. I'm not sure that firmware will ever have a generic binding given the variation even in the set of implemented functionality.
I would imagine that there are many ways different firmwares might be versioned, and I can't see version-major or version-minor clashing with a generic property we might add later. However prefixing would not be harmful, so I'm not opposed to it if others want that.
Another option would be to support a fallback compatible list (e.g. "tl,trusted-foundations-${MAJOR}-${MINOR}", "tl,trusted-foundations"), and get versioning information from there. Given that could be painful to handle I don't want to force it if not required.
Thanks,
Mark.
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
Quoted 86 lines · Mark Rutland
Quoted 71 lines · Tomasz Figa
Quoted 64 lines · On Monday 28 of October 2013 14:56:49 Olof Johansson wrote:
Quoted 54 lines · Kumar Gala
Quoted 53 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).Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644arch/arm/firmware/Kconfigcreate mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.ccreate mode 100644arch/arm/include/asm/trusted_foundations.hdiff --git a/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt new file mode 100644
index 0000000..2ec75c9
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt @@ -0,0 +1,20 @@Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +4
-0+Trusted Foundations +------------------- + +Boards that use the Trusted Foundations secure monitor can signalits
+presence by declaring a node compatible with
"tl,trusted-foundations"(quoted diff) +2
-0+under the /firmware/ node +Quoted 8 lines
Quoted 6 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundationsfirmware
+- version-minor: minor version number of Trusted Foundations firmwarevendor prefix version.
Quoted 5 lines
Are you saying he should use tl,version-major tl,version-minor? For bindings that are already vendor-specific we haven't (on ARM) asked for vendor prefix on properties. It doesn't mean that we should keep going down that route though, so I'm just asking for clarification for my own edification. :)
Quoted 3 lines
This is a good question. We should decide what the right thing (TM) is and write it down. I, on the contrary, was convinced that it's the way Kumar says.
The impression I got was that properties should be prefixed when they're extremely vendor-specific and could clash with a more generic property. I'm not sure that firmware will ever have a generic binding given the variation even in the set of implemented functionality.
I would imagine that there are many ways different firmwares might be versioned, and I can't see version-major or version-minor clashing with a generic property we might add later. However prefixing would not be harmful, so I'm not opposed to it if others want that.
Quoted 7 lines
Another option would be to support a fallback compatible list (e.g. "tl,trusted-foundations-${MAJOR}-${MINOR}", "tl,trusted-foundations"), and get versioning information from there. Given that could be painful to handle I don't want to force it if not required.
Thanks,
Mark.
I'm of the opinion that making all vendor specific properties vendor prefixed is the easiest rule of thumb and leaves no gray area to have to argue about.
- k
Signature · 2 lines
Employee of Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
Quoted 94 lines · Kumar Gala
Quoted 91 lines · Mark Rutland
Quoted 71 lines · Tomasz Figa
Quoted 64 lines · On Monday 28 of October 2013 14:56:49 Olof Johansson wrote:
Quoted 54 lines · Kumar Gala
Quoted 53 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).Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644arch/arm/firmware/Kconfigcreate mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.ccreate mode 100644arch/arm/include/asm/trusted_foundations.hdiff --git a/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt new file mode 100644
index 0000000..2ec75c9
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt @@ -0,0 +1,20 @@Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +4
-0+Trusted Foundations +------------------- + +Boards that use the Trusted Foundations secure monitor can signalits
+presence by declaring a node compatible with
"tl,trusted-foundations"(quoted diff) +2
-0+under the /firmware/ node +Quoted 8 lines
Quoted 6 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundationsfirmware
+- version-minor: minor version number of Trusted Foundations firmwarevendor prefix version.
Quoted 5 lines
Are you saying he should use tl,version-major tl,version-minor? For bindings that are already vendor-specific we haven't (on ARM) asked for vendor prefix on properties. It doesn't mean that we should keep going down that route though, so I'm just asking for clarification for my own edification. :)
Quoted 3 lines
This is a good question. We should decide what the right thing (TM) is and write it down. I, on the contrary, was convinced that it's the way Kumar says.
The impression I got was that properties should be prefixed when they're extremely vendor-specific and could clash with a more generic property. I'm not sure that firmware will ever have a generic binding given the variation even in the set of implemented functionality.
I would imagine that there are many ways different firmwares might be versioned, and I can't see version-major or version-minor clashing with a generic property we might add later. However prefixing would not be harmful, so I'm not opposed to it if others want that.
Another option would be to support a fallback compatible list (e.g. "tl,trusted-foundations-${MAJOR}-${MINOR}", "tl,trusted-foundations"), and get versioning information from there. Given that could be painful to handle I don't want to force it if not required.
Quoted 4 lines
Quoted 2 lines
Thanks,
Mark.I'm of the opinion that making all vendor specific properties vendor prefixed is the easiest rule of thumb and leaves no gray area to have to argue about.
That would really help all of us to self-police our submissions and reduce the burden on the DT maintainer team.
-Matt
Re: [PATCH v9 1/5] ARM: add basic support for Trusted Foundations
In reply to Kumar GalaQuoted 94 lines · Kumar Gala
Quoted 91 lines · Mark Rutland
Quoted 71 lines · Tomasz Figa
Quoted 64 lines · On Monday 28 of October 2013 14:56:49 Olof Johansson wrote:
Quoted 54 lines · Kumar Gala
Quoted 53 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).Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>---
.../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 | 67 ++++++++++++++++++ 8 files changed, 199 insertions(+)create mode 100644
Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt create mode 100644arch/arm/firmware/Kconfigcreate mode 100644arch/arm/firmware/Makefile
create mode 100644arch/arm/firmware/trusted_foundations.ccreate mode 100644arch/arm/include/asm/trusted_foundations.hdiff --git a/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt new file mode 100644
index 0000000..2ec75c9
---/dev/null
+++
b/Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundat ions.txt @@ -0,0 +1,20 @@Documentation/devicetree/bindings/arm/firmware/tl,trusted-foundations.txt new file +4
-0+Trusted Foundations +------------------- + +Boards that use the Trusted Foundations secure monitor can signalits
+presence by declaring a node compatible with
"tl,trusted-foundations"(quoted diff) +2
-0+under the /firmware/ node +Quoted 8 lines
Quoted 6 lines
+Required properties:
+- compatible : "tl,trusted-foundations" +- version-major : major version number of Trusted Foundationsfirmware
+- version-minor: minor version number of Trusted Foundations firmwarevendor prefix version.
Quoted 5 lines
Are you saying he should use tl,version-major tl,version-minor? For bindings that are already vendor-specific we haven't (on ARM) asked for vendor prefix on properties. It doesn't mean that we should keep going down that route though, so I'm just asking for clarification for my own edification. :)
Quoted 3 lines
This is a good question. We should decide what the right thing (TM) is and write it down. I, on the contrary, was convinced that it's the way Kumar says.
The impression I got was that properties should be prefixed when they're extremely vendor-specific and could clash with a more generic property. I'm not sure that firmware will ever have a generic binding given the variation even in the set of implemented functionality.
I would imagine that there are many ways different firmwares might be versioned, and I can't see version-major or version-minor clashing with a generic property we might add later. However prefixing would not be harmful, so I'm not opposed to it if others want that.
Another option would be to support a fallback compatible list (e.g. "tl,trusted-foundations-${MAJOR}-${MINOR}", "tl,trusted-foundations"), and get versioning information from there. Given that could be painful to handle I don't want to force it if not required.
Quoted 4 lines
Quoted 2 lines
Thanks,
Mark.I'm of the opinion that making all vendor specific properties vendor prefixed is the easiest rule of thumb and leaves no gray area to have to argue about.
All good points, I will vendor-prefix these properties.
Thanks,
Alex.
PATCH v9 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 ARM_GIC select CLKDEV_LOOKUP select CLKSRC_MMIO
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.1
PATCH v9 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.1
Re: [PATCH v9 3/5] ARM: tegra: split setting of CPU reset handler
Quoted 54 lines · 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.
Signed-off-by Alexandre Courbot <[email protected]>Reviewed-by Tomasz Figa <[email protected]>Reviewed-by Stephen Warren <[email protected]>--- arch/arm/mach-tegra/reset.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-)arch/arm/mach-tegra/reset.c +5
-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 )
arch/arm/mach-tegra/reset.c static void __init tegra_cpu_reset_handler_enable(void) · line 73
Quoted 10 lines
arch/arm/mach-tegra/reset.c +10
-0+{ +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);
A memcpy to iomem seems suspect. Should this be memcpy_toio, or is the __iomem annotation misleading?
Thanks,
Mark.
PATCH v9 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.1
PATCH v9 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
@@ -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.1