From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756441AbaEEK7n (ORCPT ); Mon, 5 May 2014 06:59:43 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:36485 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756412AbaEEK7k (ORCPT ); Mon, 5 May 2014 06:59:40 -0400 X-AuditID: cbfee61a-b7f2b6d000006c4d-07-53676f1b7eb8 From: Bartlomiej Zolnierkiewicz To: Kukjin Kim Cc: Daniel Lezcano , Tomasz Figa , Sachin Kamat , Viresh Kumar , "Rafael J. Wysocki" , Kyungmin Park , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-kernel@lists.linaro.org, b.zolnierkie@samsung.com Subject: [PATCH 5/7] ARM: EXYNOS: PM: use c15resume firmware method if secure firmware is enabled Date: Mon, 05 May 2014 12:57:17 +0200 Message-id: <1399287439-31376-6-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1399287439-31376-1-git-send-email-b.zolnierkie@samsung.com> References: <1399287439-31376-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKLMWRmVeSWpSXmKPExsVy+t9jAV2Z/PRgg6sXGS02zljPajHvs6xF 74KrbBZnm96wW7w/9IzZYtPja6wWl3fNYbP43HuE0WLG+X1MFmdOX2K1OPmnl9Fi/YzXLBYb v3o48HrcubaHzWPzknqP2/8eM3tsudrO4tG3ZRWjx+dNcgFsUVw2Kak5mWWpRfp2CVwZE49t YC9Yz1GxceYStgbGf2xdjJwcEgImErvvrGWEsMUkLtxbDxTn4hASWMQo0dx5mQnC6WKSWHj1 KwtIFZuAlcTE9lVgHSICahI9i7cyghQxC+xllljavYkdJCEskCzxa/J+ZhCbRUBVYuH9TrBm XgEPiZ2rHzNBrFOU6H42AewMTgFPiaWbH4PVCwHVbHjbzjaBkXcBI8MqRtHUguSC4qT0XEO9 4sTc4tK8dL3k/NxNjODAfCa1g3Flg8UhRgEORiUe3gTm9GAh1sSy4srcQ4wSHMxKIrzZiUAh 3pTEyqrUovz4otKc1OJDjNIcLErivAdarQOFBNITS1KzU1MLUotgskwcnFINjDYXhHZf2vyL 4Ypgs2Esk0x8/9L/Uxzdyx1UP5W1H/fRn7lqnjJ/h8SWKRed16kpLzvIes5XZo1wSk6qpJ1L YI2Jg9sag6c6ORz9flIMvIr9gZE9nRNOrHgkbrvm6nTG+6qvrKV4tnRkGMbubbL/dfFUd9ni W4u4+5e91qoVEFEXEFGZ+eSTEktxRqKhFnNRcSIAqjfye0gCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use c15resume firmware method instead of accessing the registers directly in exynos_cpu_restore_register() if secure firmware is enabled. This affects both PM resume method and cpuidle AFTR mode. This patch shouldn't cause any functionality changes on boards that don't use secure firmware. Signed-off-by: Bartlomiej Zolnierkiewicz --- arch/arm/mach-exynos/pm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 1679c51..18f6bf8 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -167,6 +168,9 @@ static void exynos_cpu_restore_register(void) { unsigned long tmp; + if (call_firmware_op(c15resume, save_arm_register) == 0) + return; + /* Restore Power control register */ tmp = save_arm_register[0]; -- 1.8.2.3