Commit abfcba1c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'tegra-for-5.2-firmware' of... 

Merge tag 'tegra-for-5.2-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/soc

firmware: tegra: Changes for v5.2-rc1

This set of changes includes improvements for Trusted Foundations and
also moves the source files for this support into the standard location
under drivers/firmware.

* tag 'tegra-for-5.2-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  firmware: Move Trusted Foundations support
  ARM: tegra: Sort dependencies alphabetically
  ARM: tegra: Add firmware calls required for suspend-resume on Tegra30
  ARM: tegra: Always boot CPU in ARM-mode
  ARM: tegra: Don't apply CPU erratas in insecure mode
  ARM: tegra: Set up L2 cache using Trusted Foundations firmware
  ARM: trusted_foundations: Provide information about whether firmware is registered
  ARM: trusted_foundations: Make prepare_idle call to take mode argument
  ARM: trusted_foundations: Support L2 cache maintenance

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 876e645f 4cb5d9ec

arch/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -900,8 +900,6 @@ config PLAT_PXA 
config PLAT_VERSATILE

	bool



source "arch/arm/firmware/Kconfig"



source "arch/arm/mm/Kconfig"



config IWMMXT

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -290,7 +290,6 @@ core-y += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/ 
core-y				+= arch/arm/probes/

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

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
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

	default y

	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

	  tlm,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

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
obj-$(CONFIG_TRUSTED_FOUNDATIONS)	+= trusted_foundations.o



# tf_generic_smc() fails to build with -fsanitize-coverage=trace-pc

KCOV_INSTRUMENT                := n

arch/arm/include/asm/firmware.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct firmware_ops { 
	/*

	 * Inform the firmware we intend to enter CPU idle mode

	 */

	int (*prepare_idle)(void);

	int (*prepare_idle)(unsigned long mode);

	/*

	 * Enters CPU idle mode

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE