ARM: EXYNOS: Add secure firmware support

PATCH Superseded Tomasz Figa 4 participants 16 messages Sep 24, 2012 – Oct 15, 2012

Subsystems (4)

Device tree bindings Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Tomasz Figa

author

2012-09-24 14:28 UTC #0 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

Some Exynos-based boards are running with secure firmware running in TrustZone secure world, which changes the way some things have to be initialized.

This series adds support for specifying firmware operations, implements some firmware operations for Exynos secure firmware and adds a method of enabling secure firmware operations on Exynos-based boards through board file and device tree.

Changes since v1
http://thread.gmane.org/gmane.linux.kernel.samsung-soc/12583/focus=12820
- Changed return types of all operations to int
- Defined all operations to return 0 on success, -ENOSYS when not implemented or appropriate error code on error

Tomasz Figa (6):
ARM: Add interface for registering and calling firmware-specific
operations
ARM: EXYNOS: Add support for secure monitor calls
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
ARM: EXYNOS: Add support for Exynos secure firmware
ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up

 .../devicetree/bindings/arm/samsung-boards.txt     |  8 ++++
 arch/arm/common/Makefile                           |  2 +
 arch/arm/common/firmware.c                         | 18 ++++++++
 arch/arm/include/asm/firmware.h                    | 31 +++++++++++++
 arch/arm/mach-exynos/Makefile                      |  6 +++
 arch/arm/mach-exynos/common.c                      | 34 ++++++++++++++
 arch/arm/mach-exynos/common.h                      |  2 +
 arch/arm/mach-exynos/exynos-smc.S                  | 22 +++++++++
 arch/arm/mach-exynos/firmware.c                    | 54 ++++++++++++++++++++++
 arch/arm/mach-exynos/include/mach/map.h            |  3 ++
 arch/arm/mach-exynos/mach-exynos4-dt.c             |  1 +
 arch/arm/mach-exynos/platsmp.c                     | 36 ++++++++++++---
 arch/arm/mach-exynos/smc.h                         | 31 +++++++++++++
 arch/arm/plat-samsung/include/plat/map-s5p.h       |  1 +
 14 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/common/firmware.c
 create mode 100644 arch/arm/include/asm/firmware.h
 create mode 100644 arch/arm/mach-exynos/exynos-smc.S
 create mode 100644 arch/arm/mach-exynos/firmware.c
 create mode 100644 arch/arm/mach-exynos/smc.h

Signature · 1 line

1.7.12

Tomasz Figa

author

2012-09-24 14:28 UTC #1 lore raw

PATCH v2 1/6 ARM: Add interface for registering and calling firmware-specific operations

Some boards are running with secure firmware running in TrustZone secure world, which changes the way some things have to be initialized.

This patch adds an interface for platforms to specify available firmware operations and call them.

A wrapper macro, call_firmware_op(), checks if the operation is provided and calls it if so, otherwise returns -ENOSYS to allow fallback to l

By default no operations are provided.

Example of use:

In code using firmware ops:

	__raw_writel(virt_to_phys(exynos4_secondary_startup),
		CPU1_BOOT_REG);

	/* Call Exynos specific smc call */
	if (call_firmware_op(cpu_boot, cpu) == -ENOSYS)
		cpu_boot_legacy(cpu); /* Try legacy way */

	gic_raise_softirq(cpumask_of(cpu), 1);

In board-/platform-specific code:

	static int platformX_do_idle(void)
	{
		/* tell platformX firmware to enter idle */
	        return 0;
	}

	static int platformX_cpu_boot(int i)
	{
		/* tell platformX firmware to boot CPU i */
		return 0;
	}

	static const struct firmware_ops platformX_firmware_ops = {
		.do_idle	= exynos_do_idle,
		.cpu_boot	= exynos_cpu_boot,
		/* cpu_boot_reg not available on platformX */
	};

	static void __init board_init_early(void)
	{
	????????register_firmware_ops(&platformX_firmware_ops);
	}

Signed-off-by Kyungmin Park <[email protected]>

Signed-off-by Tomasz Figa <[email protected]>

---
 arch/arm/common/Makefile        |  2 ++
 arch/arm/common/firmware.c      | 18 ++++++++++++++++++
 arch/arm/include/asm/firmware.h | 31 +++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 arch/arm/common/firmware.c
 create mode 100644 arch/arm/include/asm/firmware.h

arch/arm/common/Makefile +2 -0

index e8a4e58..55d4182 100644
@@ -2,6 +2,8 @@
 # Makefile for the linux kernel.
 #
 
+obj-y += firmware.o
+
 obj-$(CONFIG_ARM_GIC)		+= gic.o
 obj-$(CONFIG_ARM_VIC)		+= vic.o
 obj-$(CONFIG_ICST)		+= icst.o

arch/arm/common/firmware.c new file +18 -0

new file mode 100644
index 0000000..27ddccb
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics.
+ * Kyungmin Park <[email protected]>
+ * Tomasz Figa <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/suspend.h>
+
+#include <asm/firmware.h>
+
+static const struct firmware_ops default_firmware_ops;
+
+const struct firmware_ops *firmware_ops = &default_firmware_ops;

arch/arm/include/asm/firmware.h new file +31 -0

new file mode 100644
index 0000000..5d87d8e
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics.
+ * Kyungmin Park <[email protected]>
+ * Tomasz Figa <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_ARM_FIRMWARE_H
+#define __ASM_ARM_FIRMWARE_H
+
+struct firmware_ops {
+	int (*do_idle)(void);
+	int (*cpu_boot)(int cpu);
+	int (*cpu_boot_reg)(int cpu, void __iomem **ptr);
+	int (*l2x0_init)(void);
+};
+
+extern const struct firmware_ops *firmware_ops;
+
+#define call_firmware_op(op, ...)					\
+	((firmware_ops->op) ? firmware_ops->op(__VA_ARGS__) : (-ENOSYS))
+
+static inline void register_firmware_ops(const struct firmware_ops *ops)
+{
+	firmware_ops = ops;
+}
+
+#endif

Signature · 1 line

1.7.12

Tomasz Figa

author

2012-09-24 14:28 UTC #2 lore raw

PATCH v2 2/6 ARM: EXYNOS: Add support for secure monitor calls

In reply to Tomasz Figa

Some boards use secure monitor calls to communicate with secure firmware.

This patch adds exynos_smc function which uses smc assembly instruction to do secure monitor calls.

Signed-off-by Kyungmin Park <[email protected]>

Signed-off-by Tomasz Figa <[email protected]>

---
 arch/arm/mach-exynos/Makefile     |  5 +++++
 arch/arm/mach-exynos/exynos-smc.S | 22 ++++++++++++++++++++++
 arch/arm/mach-exynos/smc.h        | 31 +++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 arch/arm/mach-exynos/exynos-smc.S
 create mode 100644 arch/arm/mach-exynos/smc.h

arch/arm/mach-exynos/Makefile +5 -0

index 9b58024..5c1de47 100644
@@ -30,6 +30,11 @@ obj-$(CONFIG_EXYNOS4_MCT)	+= mct.o
 
 obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
 
+obj-$(CONFIG_ARCH_EXYNOS)	+= exynos-smc.o
+
+plus_sec := $(call as-instr,.arch_extension sec,+sec)
+AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)
+
 # machine support
 
 obj-$(CONFIG_MACH_SMDKC210)		+= mach-smdkv310.o

arch/arm/mach-exynos/exynos-smc.S new file +22 -0

new file mode 100644
index 0000000..2e27aa3
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics.
+ *
+ * Copied from omap-smc.S Copyright (C) 2010 Texas Instruments, Inc.
+ *
+ * This program is free software,you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/linkage.h>
+
+/*
+ * Function signature: void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3)
+ */
+
+ENTRY(exynos_smc)
+	stmfd	sp!, {r4-r11, lr}
+	dsb
+	smc	#0
+	ldmfd	sp!, {r4-r11, pc}
+ENDPROC(exynos_smc)

arch/arm/mach-exynos/smc.h new file +31 -0

new file mode 100644
index 0000000..e972390
@@ -0,0 +1,31 @@
+/*
+ *  Copyright (c) 2012 Samsung Electronics.
+ *
+ * EXYNOS - SMC Call
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_ARCH_EXYNOS_SMC_H
+#define __ASM_ARCH_EXYNOS_SMC_H
+
+#define SMC_CMD_INIT            (-1)
+#define SMC_CMD_INFO            (-2)
+/* For Power Management */
+#define SMC_CMD_SLEEP           (-3)
+#define SMC_CMD_CPU1BOOT        (-4)
+#define SMC_CMD_CPU0AFTR        (-5)
+/* For CP15 Access */
+#define SMC_CMD_C15RESUME       (-11)
+/* For L2 Cache Access */
+#define SMC_CMD_L2X0CTRL        (-21)
+#define SMC_CMD_L2X0SETUP1      (-22)
+#define SMC_CMD_L2X0SETUP2      (-23)
+#define SMC_CMD_L2X0INVALL      (-24)
+#define SMC_CMD_L2X0DEBUG       (-25)
+
+extern void exynos_smc(u32 cmd, u32 arg1, u32 arg2, u32 arg3);
+
+#endif

Signature · 1 line

1.7.12

Tomasz Figa

author

2012-09-24 14:28 UTC #3 lore raw

PATCH v2 3/6 ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412

In reply to Tomasz Figa

Exynos4412 uses different information register for each core. This patch adjusts the bring-up code to take that into account.

Signed-off-by Tomasz Figa <[email protected]>

---
 arch/arm/mach-exynos/platsmp.c | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

arch/arm/mach-exynos/platsmp.c +23 -6

index 36c3984..a7f4031 100644
@@ -34,8 +34,21 @@
 
 extern void exynos4_secondary_startup(void);
 
-#define CPU1_BOOT_REG		(samsung_rev() == EXYNOS4210_REV_1_1 ? \
-				S5P_INFORM5 : S5P_VA_SYSRAM)
+static inline void __iomem *cpu_boot_reg_base(void)
+{
+	if (soc_is_exynos4210() && samsung_rev() == EXYNOS4210_REV_1_1)
+		return S5P_INFORM5;
+	return S5P_VA_SYSRAM;
+}
+
+static inline void __iomem *cpu_boot_reg(int cpu)
+{
+	void __iomem *boot_reg;
+	boot_reg = cpu_boot_reg_base();
+	if (soc_is_exynos4412())
+		boot_reg += 4*cpu;
+	return boot_reg;
+}
 
 /*
  * control for which core is the next to come out of the secondary

@@ -89,6 +102,7 @@ void __cpuinit platform_secondary_init(unsigned int cpu)
 int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
 	unsigned long timeout;
+	unsigned long phys_cpu = cpu_logical_map(cpu);
 
 	/*
 	 * Set synchronisation state between this boot processor

@@ -104,7 +118,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 	 * Note that "pen_release" is the hardware CPU ID, whereas
 	 * "cpu" is Linux's internal ID.
 	 */
-	write_pen_release(cpu_logical_map(cpu));
+	write_pen_release(phys_cpu);
 
 	if (!(__raw_readl(S5P_ARM_CORE1_STATUS) & S5P_CORE_LOCAL_PWR_EN)) {
 		__raw_writel(S5P_CORE_LOCAL_PWR_EN,

@@ -138,7 +152,7 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 		smp_rmb();
 
 		__raw_writel(virt_to_phys(exynos4_secondary_startup),
-			CPU1_BOOT_REG);
+							cpu_boot_reg(phys_cpu));
 		gic_raise_softirq(cpumask_of(cpu), 1);
 
 		if (pen_release == -1)

@@ -186,6 +200,8 @@ void __init smp_init_cpus(void)
 
 void __init platform_smp_prepare_cpus(unsigned int max_cpus)
 {
+	int i;
+
 	if (!soc_is_exynos5250())
 		scu_enable(scu_base_addr());

@@ -195,6 +211,7 @@ void __init platform_smp_prepare_cpus(unsigned int max_cpus)
 	 * until it receives a soft interrupt, and then the
 	 * secondary CPU branches to this address.
 	 */
-	__raw_writel(virt_to_phys(exynos4_secondary_startup),
-			CPU1_BOOT_REG);
+	for (i = 1; i < max_cpus; ++i)
+		__raw_writel(virt_to_phys(exynos4_secondary_startup),
+					cpu_boot_reg(cpu_logical_map(i)));
 }

Signature · 1 line

1.7.12

Tomasz Figa

author

2012-09-24 14:28 UTC #4 lore raw

PATCH v2 4/6 ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.

In reply to Tomasz Figa

On TrustZone-enabled boards the non-secure SYSRAM is used for secondary CPU bring-up, so add a mapping for it.

Signed-off-by Tomasz Figa <[email protected]>

---
 arch/arm/mach-exynos/common.c                | 34 ++++++++++++++++++++++++++++
 arch/arm/mach-exynos/include/mach/map.h      |  3 +++
 arch/arm/plat-samsung/include/plat/map-s5p.h |  1 +
 3 files changed, 38 insertions(+)

arch/arm/mach-exynos/common.c +34 -0

index 4eb39cd..ddec3d5 100644
@@ -214,6 +214,33 @@ static struct map_desc exynos4_iodesc1[] __initdata = {
 	},
 };
 
+static struct map_desc exynos4210_iodesc[] __initdata = {
+	{
+		.virtual	= (unsigned long)S5P_VA_SYSRAM_NS,
+		.pfn		= __phys_to_pfn(EXYNOS4210_PA_SYSRAM_NS),
+		.length		= SZ_4K,
+		.type		= MT_DEVICE,
+	},
+};
+
+static struct map_desc exynos4x12_iodesc[] __initdata = {
+	{
+		.virtual	= (unsigned long)S5P_VA_SYSRAM_NS,
+		.pfn		= __phys_to_pfn(EXYNOS4x12_PA_SYSRAM_NS),
+		.length		= SZ_4K,
+		.type		= MT_DEVICE,
+	},
+};
+
+static struct map_desc exynos5250_iodesc[] __initdata = {
+	{
+		.virtual	= (unsigned long)S5P_VA_SYSRAM_NS,
+		.pfn		= __phys_to_pfn(EXYNOS5250_PA_SYSRAM_NS),
+		.length		= SZ_4K,
+		.type		= MT_DEVICE,
+	},
+};
+
 static struct map_desc exynos5_iodesc[] __initdata = {
 	{
 		.virtual	= (unsigned long)S3C_VA_SYS,

@@ -321,6 +348,13 @@ static void __init exynos4_map_io(void)
 	else
 		iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));
 
+	if (soc_is_exynos4210())
+		iotable_init(exynos4210_iodesc, ARRAY_SIZE(exynos4210_iodesc));
+	if (soc_is_exynos4212() || soc_is_exynos4412())
+		iotable_init(exynos4x12_iodesc, ARRAY_SIZE(exynos4x12_iodesc));
+	if (soc_is_exynos5250())
+		iotable_init(exynos5250_iodesc, ARRAY_SIZE(exynos5250_iodesc));
+
 	/* initialize device information early */
 	exynos4_default_sdhci0();
 	exynos4_default_sdhci1();

arch/arm/mach-exynos/include/mach/map.h +3 -0

index c72b675..f4a8ac3 100644
@@ -26,6 +26,9 @@
 #define EXYNOS4_PA_SYSRAM0		0x02025000
 #define EXYNOS4_PA_SYSRAM1		0x02020000
 #define EXYNOS5_PA_SYSRAM		0x02020000
+#define EXYNOS4210_PA_SYSRAM_NS		0x0203F000
+#define EXYNOS4x12_PA_SYSRAM_NS		0x0204F000
+#define EXYNOS5250_PA_SYSRAM_NS		0x0204F000
 
 #define EXYNOS4_PA_FIMC0		0x11800000
 #define EXYNOS4_PA_FIMC1		0x11810000

arch/arm/plat-samsung/include/plat/map-s5p.h +1 -0

index c2d7bda..c186786 100644
@@ -22,6 +22,7 @@
 #define S5P_VA_GPIO3		S3C_ADDR(0x02280000)
 
 #define S5P_VA_SYSRAM		S3C_ADDR(0x02400000)
+#define S5P_VA_SYSRAM_NS	S3C_ADDR(0x02410000)
 #define S5P_VA_DMC0		S3C_ADDR(0x02440000)
 #define S5P_VA_DMC1		S3C_ADDR(0x02480000)
 #define S5P_VA_SROMC		S3C_ADDR(0x024C0000)

Signature · 1 line

1.7.12

Tomasz Figa

author

2012-09-24 14:28 UTC #5 lore raw

PATCH v2 5/6 ARM: EXYNOS: Add support for Exynos secure firmware

In reply to Tomasz Figa

Some Exynos-based boards contain secure firmware and must use firmware operations to set up some hardware.

This patch adds firmware operations for Exynos secure firmware and a way for board code and device tree to specify that they must be used.

Example of use:

In board code:

	...MACHINE_START(...)
		/* ... */
		.init_early	= exynos_firmware_init,
		/* ... */
	MACHINE_END

In device tree:

	/ {
		/* ... */

		firmware {
			compatible = "samsung,secure-firmware";
		};

		/* ... */
	};

Signed-off-by Kyungmin Park <[email protected]>

Signed-off-by Tomasz Figa <[email protected]>

---
 .../devicetree/bindings/arm/samsung-boards.txt     |  8 ++++
 arch/arm/mach-exynos/Makefile                      |  1 +
 arch/arm/mach-exynos/common.h                      |  2 +
 arch/arm/mach-exynos/firmware.c                    | 54 ++++++++++++++++++++++
 arch/arm/mach-exynos/mach-exynos4-dt.c             |  1 +
 5 files changed, 66 insertions(+)
 create mode 100644 arch/arm/mach-exynos/firmware.c

Documentation/devicetree/bindings/arm/samsung-boards.txt +8 -0

index 0bf68be..f447059 100644
@@ -6,3 +6,11 @@ Required root node properties:
     - compatible = should be one or more of the following.
         (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
         (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.
+
+Optional:
+    - firmware node, specifying presence and type of secure firmware, currently
+        supported value of compatible property is "samsung,secure-firmware":
+
+	firmware {
+		compatible = "samsung,secure-firmware";
+	};

arch/arm/mach-exynos/Makefile +1 -0

index 5c1de47..b464333 100644
@@ -31,6 +31,7 @@ obj-$(CONFIG_EXYNOS4_MCT)	+= mct.o
 obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
 
 obj-$(CONFIG_ARCH_EXYNOS)	+= exynos-smc.o
+obj-$(CONFIG_ARCH_EXYNOS)	+= firmware.o
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_exynos-smc.o		:=-Wa,-march=armv7-a$(plus_sec)

arch/arm/mach-exynos/common.h +2 -0

index aed2eeb..540918f 100644
@@ -21,6 +21,8 @@ void exynos4_restart(char mode, const char *cmd);
 void exynos5_restart(char mode, const char *cmd);
 void exynos_init_late(void);
 
+void exynos_firmware_init(void);
+
 #ifdef CONFIG_PM_GENERIC_DOMAINS
 int exynos_pm_late_initcall(void);
 #else

arch/arm/mach-exynos/firmware.c new file +54 -0

54 lines not on this page · raw message

arch/arm/mach-exynos/mach-exynos4-dt.c +1 -0

index b2b5d5f..a244e4a 100644
@@ -88,6 +88,7 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
 	.init_irq	= exynos4_init_irq,
 	.map_io		= exynos4210_dt_map_io,
 	.handle_irq	= gic_handle_irq,
+	.init_early	= exynos_firmware_init,
 	.init_machine	= exynos4210_dt_machine_init,
 	.init_late	= exynos_init_late,
 	.timer		= &exynos4_timer,

Signature · 1 line

1.7.12

Olof Johansson

2012-10-10 16:00 UTC #6 lore raw

PATCH v2 5/6 ARM: EXYNOS: Add support for Exynos secure firmware

Hi,

Quoted 45 lines · Tomasz Figa

Some Exynos-based boards contain secure firmware and must use firmware operations to set up some hardware.
This patch adds firmware operations for Exynos secure firmware and a way for board code and device tree to specify that they must be used.
Example of use:
In board code:
	...MACHINE_START(...)
		/* ... */
		.init_early	= exynos_firmware_init,
		/* ... */
	MACHINE_END
In device tree:
	/ {
		/* ... */

		firmware {
			compatible = "samsung,secure-firmware";
		};

		/* ... */
	};
Signed-off-by Kyungmin Park <[email protected]>
Signed-off-by Tomasz Figa <[email protected]>
---
 .../devicetree/bindings/arm/samsung-boards.txt     |  8 ++++
 arch/arm/mach-exynos/Makefile                      |  1 +
 arch/arm/mach-exynos/common.h                      |  2 +
 arch/arm/mach-exynos/firmware.c                    | 54 ++++++++++++++++++++++
 arch/arm/mach-exynos/mach-exynos4-dt.c             |  1 +
 5 files changed, 66 insertions(+)
 create mode 100644 arch/arm/mach-exynos/firmware.c
Documentation/devicetree/bindings/arm/samsung-boards.txt +0 -0
index 0bf68be..f447059 100644
@@ -6,3 +6,11 @@ Required root node properties:
     - compatible = should be one or more of the following.

Documentation/devicetree/bindings/arm/samsung-boards.txt Required root node properties: · line 16

Quoted 10 lines

Documentation/devicetree/bindings/arm/samsung-boards.txt +8 -0

         (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
         (b) "samsung,exynos4210"  - for boards based on Exynos4210 SoC.
+
+Optional:
+    - firmware node, specifying presence and type of secure firmware, currently
+        supported value of compatible property is "samsung,secure-firmware":
+
+	firmware {
+		compatible = "samsung,secure-firmware";
+	};

If you require the binding to specify the memory area, then you at least allow for future work to move to a dynamic mapping without updating the binding and all device trees. So, please do that even if the code is hardcoded to the static address today.

For extra credit, make sure that the reg property is matching the static mapping when you setup your firmware interface on your platform.

[...]

Documentation/devicetree/bindings/arm/samsung-boards.txt

Quoted 5 lines

Documentation/devicetree/bindings/arm/samsung-boards.txt +5 -0
+static int exynos_cpu_boot_reg(int cpu, void __iomem **ptr)
+{
+	*ptr = S5P_VA_SYSRAM_NS + 0x1c + 4*cpu;
+	return 0;
+}

It would be nice to get a memory map for the SMC area in documentation somewhere, but that can be done separately later.

-Olof

Tomasz Figa

author

2012-10-11 13:18 UTC #7 lore raw

PATCH v2 5/6 ARM: EXYNOS: Add support for Exynos secure firmware

Hi Olof,

Quoted 62 lines · On Wednesday 10 of October 2012 09:00:27 Olof Johansson wrote:

Hi,
Quoted 59 lines · Tomasz Figa
Some Exynos-based boards contain secure firmware and must use firmware operations to set up some hardware.
This patch adds firmware operations for Exynos secure firmware and a way
for board code and device tree to specify that they must be used.
Example of use:
In board code:
	...MACHINE_START(...)
	
		/* ... */
		.init_early	= exynos_firmware_init,
		/* ... */
	
	MACHINE_END
In device tree:
	/ {
	
		/* ... */
		
		firmware {
		
			compatible = "samsung,secure-firmware";
		
		};
		
		/* ... */
	
	};
Signed-off-by Kyungmin Park <[email protected]>
Signed-off-by Tomasz Figa <[email protected]>
---
 .../devicetree/bindings/arm/samsung-boards.txt     |  8 ++++
 arch/arm/mach-exynos/Makefile                      |  1 +
 arch/arm/mach-exynos/common.h                      |  2 +
 arch/arm/mach-exynos/firmware.c                    | 54
 ++++++++++++++++++++++ arch/arm/mach-exynos/mach-exynos4-dt.c        
     |  1 +
 5 files changed, 66 insertions(+)
 create mode 100644 arch/arm/mach-exynos/firmware.c
(quoted diff) +0 -0
b/Documentation/devicetree/bindings/arm/samsung-boards.txt index 0bf68be..f447059 100644
Documentation/devicetree/bindings/arm/samsung-boards.txt +0 -0
@@ -6,3 +6,11 @@ Required root node properties:
     - compatible = should be one or more of the following.
 
         (a) "samsung,smdkv310" - for Samsung's SMDKV310 eval board.
         (b) "samsung,exynos4210"  - for boards based on Exynos4210
         SoC.

Quoted 13 lines

Documentation/devicetree/bindings/arm/samsung-boards.txt Required root node properties: · line 16
Quoted 8 lines
Documentation/devicetree/bindings/arm/samsung-boards.txt +3 -0
+
+Optional:
+    - firmware node, specifying presence and type of secure firmware,
currently + supported value of compatible property is
"samsung,secure-firmware": +
Documentation/devicetree/bindings/arm/samsung-boards.txt +3 -0
+	firmware {
+		compatible = "samsung,secure-firmware";
+	};
If you require the binding to specify the memory area, then you at least allow for future work to move to a dynamic mapping without updating the binding and all device trees. So, please do that even if the code is hardcoded to the static address today.

All right.

Quoted 2 lines

For extra credit, make sure that the reg property is matching the static mapping when you setup your firmware interface on your platform.

Hmm, do you know a way to look up physical address of such static mapping, given only the virtual address? Additional problem is that the code is executed very early (in init_early callback), before most of VM initialization code.

I could do something like

	if (soc_is_exynos4210())
		paddr = EXYNOS4210_PA_SYSRAM_NS;
	else if (soc_is_exynos4212() || soc_is_exynos4412())
		paddr = EXYNOS4x12_PA_SYSRAM_NS;
	...

and compare paddr with address received from device tree, but I don't really like this construct.

Quoted 8 lines

Documentation/devicetree/bindings/arm/samsung-boards.txt
Quoted 5 lines
Documentation/devicetree/bindings/arm/samsung-boards.txt +5 -0
+static int exynos_cpu_boot_reg(int cpu, void __iomem **ptr)
+{
+	*ptr = S5P_VA_SYSRAM_NS + 0x1c + 4*cpu;
+	return 0;
+}
It would be nice to get a memory map for the SMC area in documentation somewhere, but that can be done separately later.

OK.

Best regards,

Signature · 2 lines

Tomasz Figa
Samsung Poland R&D Center

Tomasz Figa

author

2012-09-24 14:28 UTC #8 lore raw

PATCH v2 6/6 ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up

In reply to Tomasz Figa

Boards using secure firmware must use different CPU boot registers and call secure firmware to boot the CPU.

Signed-off-by Kyungmin Park <[email protected]>

Signed-off-by Tomasz Figa <[email protected]>

---
 arch/arm/mach-exynos/platsmp.c | 7 +++++++
 1 file changed, 7 insertions(+)

arch/arm/mach-exynos/platsmp.c +7 -0

index a7f4031..4a18250 100644
@@ -25,6 +25,7 @@
 #include <asm/hardware/gic.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
+#include <asm/firmware.h>
 
 #include <mach/hardware.h>
 #include <mach/regs-clock.h>

@@ -44,6 +45,8 @@ static inline void __iomem *cpu_boot_reg_base(void)
 static inline void __iomem *cpu_boot_reg(int cpu)
 {
 	void __iomem *boot_reg;
+	if (!call_firmware_op(cpu_boot_reg, cpu, &boot_reg))
+		return boot_reg;
 	boot_reg = cpu_boot_reg_base();
 	if (soc_is_exynos4412())
 		boot_reg += 4*cpu;

@@ -153,6 +156,10 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle)
 
 		__raw_writel(virt_to_phys(exynos4_secondary_startup),
 							cpu_boot_reg(phys_cpu));
+
+		/* Call Exynos specific smc call */
+		call_firmware_op(cpu_boot, phys_cpu);
+
 		gic_raise_softirq(cpumask_of(cpu), 1);
 
 		if (pen_release == -1)

Signature · 1 line

1.7.12

Olof Johansson

2012-10-10 16:08 UTC #9 lore raw

PATCH v2 6/6 ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up

Quoted 22 lines · Tomasz Figa

Boards using secure firmware must use different CPU boot registers and call secure firmware to boot the CPU.
Signed-off-by Kyungmin Park <[email protected]>
Signed-off-by Tomasz Figa <[email protected]>
---
 arch/arm/mach-exynos/platsmp.c | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/mach-exynos/platsmp.c +1 -0
index a7f4031..4a18250 100644
@@ -25,6 +25,7 @@
 #include <asm/hardware/gic.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
+#include <asm/firmware.h>
 
 #include <mach/hardware.h>
 #include <mach/regs-clock.h>

arch/arm/mach-exynos/platsmp.c static inline void __iomem *cpu_boot_reg_base(void) · line 49

Quoted 5 lines

arch/arm/mach-exynos/platsmp.c +2 -0

@@ -44,6 +45,8 @@ static inline void __iomem *cpu_boot_reg_base(void)
 static inline void __iomem *cpu_boot_reg(int cpu)
 {
 	void __iomem *boot_reg;
+	if (!call_firmware_op(cpu_boot_reg, cpu, &boot_reg))
+		return boot_reg;

Nit: new lines between variable declaration and code.

-Olof

Tomasz Figa

author

2012-10-02 09:13 UTC #10 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

In reply to Tomasz Figa

Hi,

Quoted 37 lines · On Monday 24 of September 2012 16:28:27 Tomasz Figa wrote:

Some Exynos-based boards are running with secure firmware running in TrustZone secure world, which changes the way some things have to be initialized.
This series adds support for specifying firmware operations, implements some firmware operations for Exynos secure firmware and adds a method of enabling secure firmware operations on Exynos-based boards through board file and device tree.
Changes since v1
http://thread.gmane.org/gmane.linux.kernel.samsung-soc/12583/focus=12820
- Changed return types of all operations to int
- Defined all operations to return 0 on success, -ENOSYS when not implemented or appropriate error code on error
Tomasz Figa (6):
ARM: Add interface for registering and calling firmware-specific
operations
ARM: EXYNOS: Add support for secure monitor calls
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
ARM: EXYNOS: Add support for Exynos secure firmware
ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up
 .../devicetree/bindings/arm/samsung-boards.txt     |  8 ++++
 arch/arm/common/Makefile                           |  2 +
 arch/arm/common/firmware.c                         | 18 ++++++++
 arch/arm/include/asm/firmware.h                    | 31 +++++++++++++
 arch/arm/mach-exynos/Makefile                      |  6 +++
 arch/arm/mach-exynos/common.c                      | 34 ++++++++++++++
 arch/arm/mach-exynos/common.h                      |  2 +
 arch/arm/mach-exynos/exynos-smc.S                  | 22 +++++++++
 arch/arm/mach-exynos/firmware.c                    | 54
++++++++++++++++++++++ arch/arm/mach-exynos/include/mach/map.h          
 |  3 ++
 arch/arm/mach-exynos/mach-exynos4-dt.c             |  1 +
 arch/arm/mach-exynos/platsmp.c                     | 36 ++++++++++++---

Quoted 8 lines

 arch/arm/mach-exynos/smc.h                         | 31 +++++++++++++
 arch/arm/plat-samsung/include/plat/map-s5p.h       |  1 +
 14 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/common/firmware.c
 create mode 100644 arch/arm/include/asm/firmware.h
 create mode 100644 arch/arm/mach-exynos/exynos-smc.S
 create mode 100644 arch/arm/mach-exynos/firmware.c
 create mode 100644 arch/arm/mach-exynos/smc.h

Any comments, nitpicks or acks on this patchset?

Best regards,

Signature · 2 lines

Tomasz Figa
Samsung Poland R&D Center

Kyungmin Park

2012-10-10 15:35 UTC #11 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

Hi Arnd or Olof,

Can you pick up for v3.7?

To Tomasz,
Can you rebase it on the latest arm-soc tree?

Thank you,
Kyungmin Park

Quoted 60 lines · Tomasz Figa

Hi,
Quoted 37 lines · On Monday 24 of September 2012 16:28:27 Tomasz Figa wrote:
Some Exynos-based boards are running with secure firmware running in TrustZone secure world, which changes the way some things have to be initialized.
This series adds support for specifying firmware operations, implements some firmware operations for Exynos secure firmware and adds a method of enabling secure firmware operations on Exynos-based boards through board file and device tree.
Changes since v1
http://thread.gmane.org/gmane.linux.kernel.samsung-soc/12583/focus=12820
- Changed return types of all operations to int
- Defined all operations to return 0 on success, -ENOSYS when not implemented or appropriate error code on error
Tomasz Figa (6):
ARM: Add interface for registering and calling firmware-specific
operations
ARM: EXYNOS: Add support for secure monitor calls
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
ARM: EXYNOS: Add support for Exynos secure firmware
ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up
 .../devicetree/bindings/arm/samsung-boards.txt     |  8 ++++
 arch/arm/common/Makefile                           |  2 +
 arch/arm/common/firmware.c                         | 18 ++++++++
 arch/arm/include/asm/firmware.h                    | 31 +++++++++++++
 arch/arm/mach-exynos/Makefile                      |  6 +++
 arch/arm/mach-exynos/common.c                      | 34 ++++++++++++++
 arch/arm/mach-exynos/common.h                      |  2 +
 arch/arm/mach-exynos/exynos-smc.S                  | 22 +++++++++
 arch/arm/mach-exynos/firmware.c                    | 54
++++++++++++++++++++++ arch/arm/mach-exynos/include/mach/map.h
 |  3 ++
 arch/arm/mach-exynos/mach-exynos4-dt.c             |  1 +
 arch/arm/mach-exynos/platsmp.c                     | 36 ++++++++++++---
Quoted 8 lines
 arch/arm/mach-exynos/smc.h                         | 31 +++++++++++++
 arch/arm/plat-samsung/include/plat/map-s5p.h       |  1 +
 14 files changed, 243 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm/common/firmware.c
 create mode 100644 arch/arm/include/asm/firmware.h
 create mode 100644 arch/arm/mach-exynos/exynos-smc.S
 create mode 100644 arch/arm/mach-exynos/firmware.c
 create mode 100644 arch/arm/mach-exynos/smc.h
Any comments, nitpicks or acks on this patchset?
Best regards,
--
Tomasz Figa
Samsung Poland R&D Center
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Olof Johansson

2012-10-10 16:11 UTC #12 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

Hi,

Quoted 6 lines · Kyungmin Park

Hi Arnd or Olof,
Can you pick up for v3.7?
To Tomasz,
Can you rebase it on the latest arm-soc tree?

This code should have been in arm-soc by the beginning of the merge window (and in linux-next) to be merged for 3.7, but we will be happy to queue it up for 3.8 once 3.7-rc1 is out. I have one outstanding comment on the DT binding but the rest looks OK to me.

Tomasz, please rebase and send this to Kukjin so he can queue it up with other Samsung code.

Thanks!

-Olof

Tomasz Figa

author

2012-10-11 13:19 UTC #13 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

Hi Olof,

Quoted 10 lines · On Wednesday 10 of October 2012 09:11:36 Olof Johansson wrote:

Hi,
Quoted 6 lines · Kyungmin Park
Hi Arnd or Olof,
Can you pick up for v3.7?
To Tomasz,
Can you rebase it on the latest arm-soc tree?

Quoted 7 lines

This code should have been in arm-soc by the beginning of the merge window (and in linux-next) to be merged for 3.7, but we will be happy to queue it up for 3.8 once 3.7-rc1 is out. I have one outstanding comment on the DT binding but the rest looks OK to me.
Tomasz, please rebase and send this to Kukjin so he can queue it up with other Samsung code.

OK.

Best regards,

Signature · 2 lines

Tomasz Figa
Samsung Poland R&D Center

Kukjin Kim

2012-10-15 13:59 UTC #14 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

In reply to Olof Johansson

Quoted 8 lines · Olof Johansson

Hi,
Quoted 4 lines · Kyungmin Park
Hi Arnd or Olof,
Can you pick up for v3.7?

Quoted 8 lines

Quoted 2 lines
To Tomasz,
Can you rebase it on the latest arm-soc tree?
This code should have been in arm-soc by the beginning of the merge window (and in linux-next) to be merged for 3.7, but we will be happy to queue it up for 3.8 once 3.7-rc1 is out. I have one outstanding comment on the DT binding but the rest looks OK to me.

Yeah, I agree.

Olof, thanks for your review.

Quoted 4 lines

Tomasz, please rebase and send this to Kukjin so he can queue it up with other
Samsung code.

OK, let me apply this series in Samsung tree when Tomasz's rebased code against on v3.7-rc1 is available.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Olof Johansson

2012-10-10 16:09 UTC #15 lore raw

v2 cover ARM: EXYNOS: Add secure firmware support

In reply to Tomasz Figa

Quoted 15 lines · Tomasz Figa

Some Exynos-based boards are running with secure firmware running in TrustZone secure world, which changes the way some things have to be initialized.
This series adds support for specifying firmware operations, implements some firmware operations for Exynos secure firmware and adds a method of enabling secure firmware operations on Exynos-based boards through board file and device tree.
Changes since v1
http://thread.gmane.org/gmane.linux.kernel.samsung-soc/12583/focus=12820
- Changed return types of all operations to int
- Defined all operations to return 0 on success, -ENOSYS when not implemented or appropriate error code on error

Quoted 8 lines

Tomasz Figa (6):
ARM: Add interface for registering and calling firmware-specific
operations
ARM: EXYNOS: Add support for secure monitor calls
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
ARM: EXYNOS: Add support for Exynos secure firmware
ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up

Besides the open comment on the device-tree binding, the other patches are:

Reviewed-by Olof Johansson <[email protected]>