Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC platform updates from Olof Johansson:
"SoC updates, mostly refactorings and cleanups of old legacy platforms.
Major themes this release:
- Conversion of ixp4xx to a modern platform (drivers, DT, bindings)
- Moving some of the ep93xx headers around to get it closer to
multiplatform enabled.
- Cleanups of Davinci
This also contains a few patches that were queued up as fixes before
5.1 but I didn't get sent in before release"
* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (123 commits)
ARM: debug-ll: add default address for digicolor
ARM: u300: regulator: add MODULE_LICENSE()
ARM: ep93xx: move private headers out of mach/*
ARM: ep93xx: move pinctrl interfaces into include/linux/soc
ARM: ep93xx: keypad: stop using mach/platform.h
ARM: ep93xx: move network platform data to separate header
ARM: stm32: add AMBA support for stm32 family
MAINTAINERS: update arch/arm/mach-davinci
ARM: rockchip: add missing of_node_put in rockchip_smp_prepare_pmu
ARM: dts: Add queue manager and NPE to the IXP4xx DTSI
soc: ixp4xx: qmgr: Add DT probe code
soc: ixp4xx: qmgr: Add DT bindings for IXP4xx qmgr
soc: ixp4xx: npe: Add DT probe code
soc: ixp4xx: Add DT bindings for IXP4xx NPE
soc: ixp4xx: qmgr: Pass resources
soc: ixp4xx: Remove unused functions
soc: ixp4xx: Uninline several functions
soc: ixp4xx: npe: Pass addresses as resources
ARM: ixp4xx: Turn the QMGR into a platform device
ARM: ixp4xx: Turn the NPE into a platform device
...
This commit is contained in:
Linus Torvalds
@@ -253,6 +253,22 @@ config TI_SCI_PROTOCOL
|
||||
This protocol library is used by client drivers to use the features
|
||||
provided by the system controller.
|
||||
|
||||
config TRUSTED_FOUNDATIONS
|
||||
bool "Trusted Foundations secure monitor support"
|
||||
depends on ARM
|
||||
help
|
||||
Some devices (including most early 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 the functions and
|
||||
comments in linux/firmware/trusted_foundations.h or the device tree
|
||||
bindings for "tlm,trusted-foundations" for details on how to use it.
|
||||
|
||||
Choose N if you don't know what this is about.
|
||||
|
||||
config HAVE_ARM_SMCCC
|
||||
bool
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ obj-$(CONFIG_QCOM_SCM_64) += qcom_scm-64.o
|
||||
obj-$(CONFIG_QCOM_SCM_32) += qcom_scm-32.o
|
||||
CFLAGS_qcom_scm-32.o :=$(call as-instr,.arch armv7-a\n.arch_extension sec,-DREQUIRES_SEC=1) -march=armv7-a
|
||||
obj-$(CONFIG_TI_SCI_PROTOCOL) += ti_sci.o
|
||||
obj-$(CONFIG_TRUSTED_FOUNDATIONS) += trusted_foundations.o
|
||||
|
||||
obj-$(CONFIG_ARM_SCMI_PROTOCOL) += arm_scmi/
|
||||
obj-y += psci/
|
||||
|
||||
176
drivers/firmware/trusted_foundations.c
Normal file
176
drivers/firmware/trusted_foundations.c
Normal file
@@ -0,0 +1,176 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/of.h>
|
||||
|
||||
#include <linux/firmware/trusted_foundations.h>
|
||||
|
||||
#include <asm/firmware.h>
|
||||
#include <asm/hardware/cache-l2x0.h>
|
||||
#include <asm/outercache.h>
|
||||
|
||||
#define TF_CACHE_MAINT 0xfffff100
|
||||
|
||||
#define TF_CACHE_ENABLE 1
|
||||
#define TF_CACHE_DISABLE 2
|
||||
|
||||
#define TF_SET_CPU_BOOT_ADDR_SMC 0xfffff200
|
||||
|
||||
#define TF_CPU_PM 0xfffffffc
|
||||
#define TF_CPU_PM_S3 0xffffffe3
|
||||
#define TF_CPU_PM_S2 0xffffffe6
|
||||
#define TF_CPU_PM_S2_NO_MC_CLK 0xffffffe5
|
||||
#define TF_CPU_PM_S1 0xffffffe4
|
||||
#define TF_CPU_PM_S1_NOFLUSH_L2 0xffffffe7
|
||||
|
||||
static unsigned long cpu_boot_addr;
|
||||
|
||||
static void tf_generic_smc(u32 type, u32 arg1, u32 arg2)
|
||||
{
|
||||
register u32 r0 asm("r0") = type;
|
||||
register u32 r1 asm("r1") = arg1;
|
||||
register u32 r2 asm("r2") = arg2;
|
||||
|
||||
asm volatile(
|
||||
".arch_extension sec\n\t"
|
||||
"stmfd sp!, {r4 - r11}\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}\n\t"
|
||||
:
|
||||
: "r" (r0), "r" (r1), "r" (r2)
|
||||
: "memory", "r3", "r12", "lr");
|
||||
}
|
||||
|
||||
static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr)
|
||||
{
|
||||
cpu_boot_addr = boot_addr;
|
||||
tf_generic_smc(TF_SET_CPU_BOOT_ADDR_SMC, cpu_boot_addr, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tf_prepare_idle(unsigned long mode)
|
||||
{
|
||||
switch (mode) {
|
||||
case TF_PM_MODE_LP0:
|
||||
tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S3, cpu_boot_addr);
|
||||
break;
|
||||
|
||||
case TF_PM_MODE_LP1:
|
||||
tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S2, cpu_boot_addr);
|
||||
break;
|
||||
|
||||
case TF_PM_MODE_LP1_NO_MC_CLK:
|
||||
tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S2_NO_MC_CLK,
|
||||
cpu_boot_addr);
|
||||
break;
|
||||
|
||||
case TF_PM_MODE_LP2:
|
||||
tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1, cpu_boot_addr);
|
||||
break;
|
||||
|
||||
case TF_PM_MODE_LP2_NOFLUSH_L2:
|
||||
tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1_NOFLUSH_L2,
|
||||
cpu_boot_addr);
|
||||
break;
|
||||
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_CACHE_L2X0
|
||||
static void tf_cache_write_sec(unsigned long val, unsigned int reg)
|
||||
{
|
||||
u32 l2x0_way_mask = 0xff;
|
||||
|
||||
switch (reg) {
|
||||
case L2X0_CTRL:
|
||||
if (l2x0_saved_regs.aux_ctrl & L310_AUX_CTRL_ASSOCIATIVITY_16)
|
||||
l2x0_way_mask = 0xffff;
|
||||
|
||||
if (val == L2X0_CTRL_EN)
|
||||
tf_generic_smc(TF_CACHE_MAINT, TF_CACHE_ENABLE,
|
||||
l2x0_saved_regs.aux_ctrl);
|
||||
else
|
||||
tf_generic_smc(TF_CACHE_MAINT, TF_CACHE_DISABLE,
|
||||
l2x0_way_mask);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static int tf_init_cache(void)
|
||||
{
|
||||
outer_cache.write_sec = tf_cache_write_sec;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_CACHE_L2X0 */
|
||||
|
||||
static const struct firmware_ops trusted_foundations_ops = {
|
||||
.set_cpu_boot_addr = tf_set_cpu_boot_addr,
|
||||
.prepare_idle = tf_prepare_idle,
|
||||
#ifdef CONFIG_CACHE_L2X0
|
||||
.l2x0_init = tf_init_cache,
|
||||
#endif
|
||||
};
|
||||
|
||||
void register_trusted_foundations(struct trusted_foundations_platform_data *pd)
|
||||
{
|
||||
/*
|
||||
* 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;
|
||||
struct trusted_foundations_platform_data pdata;
|
||||
int err;
|
||||
|
||||
node = of_find_compatible_node(NULL, NULL, "tlm,trusted-foundations");
|
||||
if (!node)
|
||||
return;
|
||||
|
||||
err = of_property_read_u32(node, "tlm,version-major",
|
||||
&pdata.version_major);
|
||||
if (err != 0)
|
||||
panic("Trusted Foundation: missing version-major property\n");
|
||||
err = of_property_read_u32(node, "tlm,version-minor",
|
||||
&pdata.version_minor);
|
||||
if (err != 0)
|
||||
panic("Trusted Foundation: missing version-minor property\n");
|
||||
register_trusted_foundations(&pdata);
|
||||
}
|
||||
|
||||
bool trusted_foundations_registered(void)
|
||||
{
|
||||
return firmware_ops == &trusted_foundations_ops;
|
||||
}
|
||||
Reference in New Issue
Block a user