From patchwork Fri Aug 1 09:48:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: keita kobayashi X-Patchwork-Id: 4661981 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DD25B9F319 for ; Fri, 1 Aug 2014 09:48:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D09B02021A for ; Fri, 1 Aug 2014 09:48:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 074E32020F for ; Fri, 1 Aug 2014 09:48:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753111AbaHAJsd (ORCPT ); Fri, 1 Aug 2014 05:48:33 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:64793 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751723AbaHAJsd (ORCPT ); Fri, 1 Aug 2014 05:48:33 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie1.idc.renesas.com with ESMTP; 01 Aug 2014 18:48:31 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 91DBB3B5D6; Fri, 1 Aug 2014 18:48:31 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 75799480A6; Fri, 1 Aug 2014 18:48:31 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 73D1E480A8; Fri, 1 Aug 2014 18:48:31 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAG15168; Fri, 1 Aug 2014 18:48:31 +0900 X-IronPort-AV: E=Sophos;i="5.01,778,1399993200"; d="scan'208";a="167018836" Received: from mail-sg1lp0093.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.93]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 01 Aug 2014 18:48:29 +0900 Received: from [10.161.20.223] (211.11.155.147) by SIXPR06MB128.apcprd06.prod.outlook.com (10.242.148.26) with Microsoft SMTP Server (TLS) id 15.0.995.14; Fri, 1 Aug 2014 09:48:26 +0000 Message-ID: <53DB6267.4030002@renesas.com> Date: Fri, 1 Aug 2014 18:48:23 +0900 From: keita kobayashi User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 MIME-Version: 1.0 To: , CC: , Magnus Damm , Subject: [PATCH 1/6] ARM: shmobile: APMU: Move the shmobile_smp_hook call X-Originating-IP: [211.11.155.147] X-ClientProxiedBy: HKXPR06CA015.apcprd06.prod.outlook.com (10.141.129.45) To SIXPR06MB128.apcprd06.prod.outlook.com (10.242.148.26) X-Microsoft-Antispam: BCL:0;PCL:0;RULEID: X-Forefront-PRVS: 029097202E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(6009001)(6049001)(199002)(189002)(105586002)(77096002)(36756003)(106356001)(83322001)(102836001)(4396001)(74502001)(86152002)(50466002)(77982001)(65806001)(76482001)(85852003)(74662001)(33656002)(85306004)(99396002)(87976001)(80022001)(42186005)(79102001)(23736002)(83072002)(101416001)(65816999)(66066001)(83506001)(19580395003)(47776003)(54356999)(64706001)(81342001)(50986999)(87266999)(59896001)(80316001)(46102001)(20776003)(229853001)(21056001)(81542001)(95666004)(19580405001)(65956001)(92726001)(107046002)(86362001); DIR:OUT; SFP:; SCL:1; SRVR:SIXPR06MB128; H:[10.161.20.223]; FPR:; MLV:sfv; PTR:InfoNoRecords; MX:1; LANG:en; X-OriginatorOrg: renesas.com Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP shmobile_smp_hook() in shmobile_smp_apmu_do_suspend() is used in case of Suspend to RAM sequence. So, This patch move shmobile_smp_hook() call to shmobile_smp_apmu_enter_suspend() for Suspend to RAM. Signed-off-by: Keita Kobayashi --- arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c index 2c06810..ad6a383 100644 --- a/arch/arm/mach-shmobile/platsmp-apmu.c +++ b/arch/arm/mach-shmobile/platsmp-apmu.c @@ -227,7 +227,6 @@ int shmobile_smp_apmu_cpu_kill(unsigned int cpu) #if defined(CONFIG_SUSPEND) static int shmobile_smp_apmu_do_suspend(unsigned long cpu) { - shmobile_smp_hook(cpu, virt_to_phys(cpu_resume), 0); shmobile_smp_apmu_cpu_shutdown(cpu); cpu_do_idle(); /* WFI selects Core Standby */ return 1; @@ -235,6 +234,7 @@ static int shmobile_smp_apmu_do_suspend(unsigned long cpu) static int shmobile_smp_apmu_enter_suspend(suspend_state_t state) { + shmobile_smp_hook(smp_processor_id(), virt_to_phys(cpu_resume), 0); cpu_suspend(smp_processor_id(), shmobile_smp_apmu_do_suspend); cpu_leave_lowpower(); return 0;