From patchwork Mon Jul 16 02:29:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyungmin Park X-Patchwork-Id: 1199741 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 2FDDC3FC8F for ; Mon, 16 Jul 2012 02:33:59 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sqb5g-0008WO-JU; Mon, 16 Jul 2012 02:31:16 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sqb5P-0008W6-H3 for linux-arm-kernel@lists.infradead.org; Mon, 16 Jul 2012 02:31:01 +0000 Received: from epcpsbgm1.samsung.com (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0M7800FRJEXNOU50@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 16 Jul 2012 11:29:52 +0900 (KST) X-AuditID: cbfee61a-b7f616d000004b7e-2f-50037c9f0f01 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 79.A6.19326.F9C73005; Mon, 16 Jul 2012 11:29:52 +0900 (KST) Received: from july ([165.213.74.254]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0M78000FTEXQPR20@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 16 Jul 2012 11:29:51 +0900 (KST) Received: by july (sSMTP sendmail emulation); Mon, 16 Jul 2012 11:29:56 +0900 Date: Mon, 16 Jul 2012 11:29:56 +0900 From: Kyungmin Park To: Russell King , Arnd Bergmann Subject: [RFC PATCH v2] ARM: Make a compile firmware conditionally Message-id: <20120716022956.GA619@july> MIME-version: 1.0 Content-disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLLMWRmVeSWpSXmKPExsVy+t9jAd0FNcwBBvNWsFtsenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6MN2tzC97aVLxb+Z6tgfGUYRcjJ4eEgInEjXv/2CFsMYkL99az dTFycQgJLGKUeLX3EJQzn0li+o4HzCBVQgK+Ej+v/mMEsVkEVCVW3QUp4uRgE9CSuPJhD9gk EQEPic6O62D1zAKNjBK7ZvuB2MICThLT2m+zgti8AuoS869MYoawBSV+TL7HAlGvJbF+53Em CFta4tHfGWAzRQVUJKac3MY2gZF/FpKWWUhaZiFpWcDIvIpRNLUguaA4KT3XUK84Mbe4NC9d Lzk/dxMjONCeSe1gXNlgcYhRgINRiYc3oIo5QIg1say4MvcQowQHs5II7+VQoBBvSmJlVWpR fnxRaU5q8SFGaQ4WJXFeY++v/kIC6YklqdmpqQWpRTBZJg5OqQZG3clP95corIiPjl724Kmi 5hbLRYJ3WgPKg59OkhRqa3xtNS2zdM7nW8/XLsv+XnNd4SyLTujmeA2Jtyd6G7WXFDzg4C9v 2GVhd+7/AfMLSjLbXl/Oe6qk2fxtp4/fZ2PhR54Mvu/NCzTX64cprln2/oHGthfNqpMib31e 4PWoas/2lIwts/TclViKMxINtZiLihMB4kVCMzACAAA= X-TM-AS-MML: No X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 4.0 HDRS_LCASE Odd capitalization of message header 1.0 MANY_HDRS_LCASE Odd capitalization of multiple message headers Cc: olof@lixom.net, dave.martin@linaro.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Kyungmin Park Some boards can use the firmware at trustzone but others can't use this. However we need to build it simultaneously. To address this issue, introduce arm firmware support and use it at each board files. e.g., In boot_secondary at mach-exynos/platsmp.c __raw_writel(virt_to_phys(exynos4_secondary_startup), CPU1_BOOT_REG); if (IS_ENABLED(CONFIG_ARM_FIRMWARE)) { /* Call Exynos specific smc call */ firmware_ops.cpu_boot(cpu); } gic_raise_softirq(cpumask_of(cpu), 1); if (pen_release == -1) Now smp_ops is not yet merged, now just call the firmware_init at init_early at board file e.g., exynos4412 based board static void __init board_init_early(void) { exynos_firmware_init(); } TODO 1. DT support. 2. call firmware init by smp_ops. Signed-off-by: Kyungmin Park diff --git a/arch/arm/common/firmware.c b/arch/arm/common/firmware.c new file mode 100644 index 0000000..ffb6822 --- /dev/null +++ b/arch/arm/common/firmware.c @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2012 Samsung Electronics. + * Kyungmin Park + * + * 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 +#include + +#include + +static void cpu_boot(int cpu) +{ + /* Do nothing */ +} + +struct firmware_ops firmware_ops = { + .do_idle = cpu_do_idle, + .cpu_boot = cpu_boot, +}; diff --git a/arch/arm/include/asm/firmware.h b/arch/arm/include/asm/firmware.h new file mode 100644 index 0000000..c8c28bf --- /dev/null +++ b/arch/arm/include/asm/firmware.h @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2012 Samsung Electronics. + * Kyungmin Park + * + * 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); + void (*cpu_boot)(int cpu); +}; + +extern struct firmware_ops firmware_ops; + +#endif diff --git a/arch/arm/mach-exynos/exynos-smc.S b/arch/arm/mach-exynos/exynos-smc.S new file mode 100644 index 0000000..2e27aa3 --- /dev/null +++ b/arch/arm/mach-exynos/exynos-smc.S @@ -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 + +/* + * 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) diff --git a/arch/arm/mach-exynos/firmware.c b/arch/arm/mach-exynos/firmware.c new file mode 100644 index 0000000..6aa423b --- /dev/null +++ b/arch/arm/mach-exynos/firmware.c @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2012 Samsung Electronics. + * Kyungmin Park + * + * 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 +#include + +#include + +#include "smc.h" + +static int exynos_do_idle(void) +{ + exynos_smc(SMC_CMD_SLEEP, 0, 0, 0); + return 0; +} + +static void exynos_cpu_boot(int cpu) +{ + exynos_smc(SMC_CMD_CPU1BOOT, cpu, 0, 0); +} + +int __init exynos_firmware_init(void) +{ + firmware_ops.do_idle = exynos_do_idle; + firmware_ops.cpu_boot = exynos_cpu_boot; + return 0; +} diff --git a/arch/arm/mach-exynos/smc.h b/arch/arm/mach-exynos/smc.h new file mode 100644 index 0000000..e972390 --- /dev/null +++ b/arch/arm/mach-exynos/smc.h @@ -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 diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig index 283fa1d..5b097ca 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -21,6 +21,9 @@ config ARM_VIC_NR The maximum number of VICs available in the system, for power management. +config ARM_FIRMWARE + bool + config ICST bool diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile index e8a4e58..4af6568 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_GIC) += gic.o obj-$(CONFIG_ARM_VIC) += vic.o +obj-$(CONFIG_ARM_FIRMWARE) += firmware.o obj-$(CONFIG_ICST) += icst.o obj-$(CONFIG_SA1111) += sa1111.o obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 9b58024..8ee779c 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -30,6 +30,11 @@ obj-$(CONFIG_EXYNOS4_MCT) += mct.o obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o +obj-$(CONFIG_ARM_FIRMWARE) += exynos-smc.o firmware.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 diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h index aed2eeb..540918f 100644 --- a/arch/arm/mach-exynos/common.h +++ b/arch/arm/mach-exynos/common.h @@ -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 diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c index 36c3984..3cec589 100644 --- a/arch/arm/mach-exynos/platsmp.c +++ b/arch/arm/mach-exynos/platsmp.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -139,6 +140,12 @@ int __cpuinit boot_secondary(unsigned int cpu, struct task_struct *idle) __raw_writel(virt_to_phys(exynos4_secondary_startup), CPU1_BOOT_REG); + + if (IS_ENABLED(CONFIG_ARM_FIRMWARE)) { + /* Call Exynos specific smc call */ + firmware_ops.cpu_boot(cpu); + } + gic_raise_softirq(cpumask_of(cpu), 1); if (pen_release == -1)