| Message ID | 1376360992-1508-3-git-send-email-acourbot@nvidia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/12/2013 08:29 PM, Alexandre Courbot wrote: > Register the firmware operations for Trusted Foundations if the device > tree indicates it is active on the device. > diff --git a/arch/arm/mach-tegra/firmware.c b/arch/arm/mach-tegra/firmware.c > +void __init tegra_init_firmware(void) > +{ > + struct device_node *node; > + > + if (!of_have_populated_dt()) > + return; That's never false on Tegra, at least upstream. > + node = of_find_compatible_node(NULL, NULL, "tl,trusted-foundations"); > + if (node) { > + const char *tf_version; > + int err; > + > + err = of_property_read_string(node, "version", &tf_version); > + if (err != 0) { > + pr_crit("Cannot read Trusted Foundation version: %d\n", > + err); > + BUG(); > + } else { > + register_trusted_foundations(tf_version); > + } > + } > +} I think most/all of that function will be common across all SoCs that support the TF monitor. I think you want to move the code into register_trusted_foundations() (or a function that calls that) in patch 1?
On Thu, Aug 15, 2013 at 6:38 AM, Stephen Warren <swarren@wwwdotorg.org> wrote: > On 08/12/2013 08:29 PM, Alexandre Courbot wrote: >> Register the firmware operations for Trusted Foundations if the device >> tree indicates it is active on the device. > >> diff --git a/arch/arm/mach-tegra/firmware.c b/arch/arm/mach-tegra/firmware.c > >> +void __init tegra_init_firmware(void) >> +{ >> + struct device_node *node; >> + >> + if (!of_have_populated_dt()) >> + return; > > That's never false on Tegra, at least upstream. Will remove, thanks. >> + node = of_find_compatible_node(NULL, NULL, "tl,trusted-foundations"); >> + if (node) { >> + const char *tf_version; >> + int err; >> + >> + err = of_property_read_string(node, "version", &tf_version); >> + if (err != 0) { >> + pr_crit("Cannot read Trusted Foundation version: %d\n", >> + err); >> + BUG(); >> + } else { >> + register_trusted_foundations(tf_version); >> + } >> + } >> +} > > I think most/all of that function will be common across all SoCs that > support the TF monitor. I think you want to move the code into > register_trusted_foundations() (or a function that calls that) in patch 1? Agreed. If we push the logic a bit further, we should also have some platform parameters for non-DT users, along with an of_register_trusted_foundations() for those who prefer DT. Thanks, Alex.
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt index ed9c853..5423f51 100644 --- a/Documentation/devicetree/bindings/arm/tegra.txt +++ b/Documentation/devicetree/bindings/arm/tegra.txt @@ -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 for more details. diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index ef3a8da..b6b7c44 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -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 CLKDEV_LOOKUP select CLKSRC_MMIO select CLKSRC_OF diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 98b184e..5ae9afb 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -12,6 +12,7 @@ obj-y += pm.o obj-y += reset.o obj-y += reset-handler.o obj-y += sleep.o +obj-y += firmware.o obj-y += tegra.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_speedo.o diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 94a119a..6794536 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -39,6 +39,7 @@ #include "sleep.h" #include "pm.h" #include "reset.h" +#include "firmware.h" /* * Storage for debug-macro.S's state. @@ -99,6 +100,7 @@ static void __init tegra_init_cache(void) void __init tegra_init_early(void) { + tegra_init_firmware(); tegra_cpu_reset_handler_init(); tegra_apb_io_init(); tegra_init_fuse(); diff --git a/arch/arm/mach-tegra/firmware.c b/arch/arm/mach-tegra/firmware.c new file mode 100644 index 0000000..4ad9af6 --- /dev/null +++ b/arch/arm/mach-tegra/firmware.c @@ -0,0 +1,41 @@ +/* + * Firmware/Secure monitor support for Tegra 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/of.h> +#include <asm/trusted_foundations.h> + +void __init tegra_init_firmware(void) +{ + struct device_node *node; + + if (!of_have_populated_dt()) + return; + + node = of_find_compatible_node(NULL, NULL, "tl,trusted-foundations"); + if (node) { + const char *tf_version; + int err; + + err = of_property_read_string(node, "version", &tf_version); + if (err != 0) { + pr_crit("Cannot read Trusted Foundation version: %d\n", + err); + BUG(); + } else { + register_trusted_foundations(tf_version); + } + } +} diff --git a/arch/arm/mach-tegra/firmware.h b/arch/arm/mach-tegra/firmware.h new file mode 100644 index 0000000..77c62fb --- /dev/null +++ b/arch/arm/mach-tegra/firmware.h @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2013, NVIDIA Corporation. All rights reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms and conditions of the GNU General Public License, + * version 2, as published by the Free Software Foundation. + * + * This program is distributed in the hope 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. + */ + +#ifndef __TEGRA_FIRMWARE_H +#define __TEGRA_FIRMWARE_H + +void tegra_init_firmware(void); + +#endif
Register the firmware operations for Trusted Foundations if the device tree indicates it is active on the device. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> --- Documentation/devicetree/bindings/arm/tegra.txt | 5 +++ arch/arm/mach-tegra/Kconfig | 1 + arch/arm/mach-tegra/Makefile | 1 + arch/arm/mach-tegra/common.c | 2 ++ arch/arm/mach-tegra/firmware.c | 41 +++++++++++++++++++++++++ arch/arm/mach-tegra/firmware.h | 19 ++++++++++++ 6 files changed, 69 insertions(+) create mode 100644 arch/arm/mach-tegra/firmware.c create mode 100644 arch/arm/mach-tegra/firmware.h