Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51b052b0 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-3.14-trusted-foundations' of... 

Merge tag 'tegra-for-3.14-trusted-foundations' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

From Stephen Warren:
ARM: tegra: Trusted Foundations firmware support

Add support for the Trusted Foundations secure-mode firmware, as found
on NVIDIA SHIELD. This allows Linux to run in non-secure mode on this
board; all previous Tegra support has assumed the kernel is running in
secure mode.

(The base TF support has been discussed back and forth a lot; for now
the most logical place for it seems to be under arch/arm, so we're adding
it here. We can move it out to a common location in the future if needed).

* tag 'tegra-for-3.14-trusted-foundations' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  ARM: tegra: support Trusted Foundations by default
  ARM: tegra: set CPU reset handler using firmware
  ARM: tegra: split setting of CPU reset handler
  ARM: tegra: add support for Trusted Foundations
  of: add Trusted Foundations bindings documentation
  of: add vendor prefix for Trusted Logic Mobility
  ARM: add basic support for Trusted Foundations

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4ac63adc f47d41ac

Documentation/devicetree/bindings/arm/firmware/tlm,trusted-foundations.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
Trusted Foundations

-------------------



Boards that use the Trusted Foundations secure monitor can signal its

presence by declaring a node compatible with "tlm,trusted-foundations"

under the /firmware/ node



Required properties:

- compatible: "tlm,trusted-foundations"

- tlm,version-major: major version number of Trusted Foundations firmware

- tlm,version-minor: minor version number of Trusted Foundations firmware



Example:

	firmware {

		trusted-foundations {

			compatible = "tlm,trusted-foundations";

			tlm,version-major = <2>;

			tlm,version-minor = <8>;

		};

	};

Documentation/devicetree/bindings/arm/tegra.txt

+5 −0
Original line number Diff line number Diff line
@@ -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

"tlm,trusted-foundations" binding's documentation for more details.

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ st STMicroelectronics 
ste	ST-Ericsson

stericsson	ST-Ericsson

ti	Texas Instruments

tlm	Trusted Logic Mobility

toshiba	Toshiba Corporation

toumaz	Toumaz

v3	V3 Semiconductor

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1054,6 +1054,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
Original line number Diff line number Diff line
@@ -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/