From patchwork Fri Apr 11 10:40:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 28273 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f197.google.com (mail-ob0-f197.google.com [209.85.214.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CBA462100C for ; Fri, 11 Apr 2014 10:40:52 +0000 (UTC) Received: by mail-ob0-f197.google.com with SMTP id wp18sf23906781obc.0 for ; Fri, 11 Apr 2014 03:40:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=NsVWr/sV9pfW2d2a9kNSbzVf2yjMYagyiqXpcqFLHjY=; b=EVRcgb9rr+YRo5QbECXFs848lXZibVHcnSwpjJy4+dLow+EmLVRZXCbRuCMAXxt5yW AhZGmlpxWIQdxl25L2KZCZZ9hejpTGWUd93gmuW4m/7J/H3S6XetqCh75W/blTEZIGfD dtKnaRHoueilI8B06lFv+NXroFip/x2mUQTEfv5hGTNELWA4fQtLj6vFh+4xnaK427NO l7o0Q9ftKHaUqU7JZbt+NdNIOTid2IFsqADs6CbzIx5oq8VhhSewQJN2r55nmp6hYraz WecMIvlUEejLAodb8lxKFDMjiSesoaQA3lTeZZxOqMVxyNxFFHhXlW1J9MaZQqUy+vDp wqTQ== X-Gm-Message-State: ALoCoQnX/z2a14IP7qdVPw17yF6LhzYEFcj08DLQIlpBRgEed35aFpZIW4FPOCqEx4p2vVudg0cl X-Received: by 10.182.33.161 with SMTP id s1mr11301759obi.12.1397212852331; Fri, 11 Apr 2014 03:40:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.163 with SMTP id b32ls1583673qge.22.gmail; Fri, 11 Apr 2014 03:40:52 -0700 (PDT) X-Received: by 10.58.31.136 with SMTP id a8mr19983771vei.20.1397212852215; Fri, 11 Apr 2014 03:40:52 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id m3si1230461vcr.23.2014.04.11.03.40.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 03:40:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id ib6so4712671vcb.13 for ; Fri, 11 Apr 2014 03:40:52 -0700 (PDT) X-Received: by 10.220.163.3 with SMTP id y3mr3311940vcx.7.1397212852086; Fri, 11 Apr 2014 03:40:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp46160vcb; Fri, 11 Apr 2014 03:40:51 -0700 (PDT) X-Received: by 10.68.248.7 with SMTP id yi7mr26568802pbc.31.1397212851303; Fri, 11 Apr 2014 03:40:51 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iw3si3967193pac.14.2014.04.11.03.40.50; Fri, 11 Apr 2014 03:40:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-samsung-soc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757265AbaDKKkj (ORCPT + 8 others); Fri, 11 Apr 2014 06:40:39 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:40430 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934488AbaDKKkE (ORCPT ); Fri, 11 Apr 2014 06:40:04 -0400 Received: by mail-wg0-f49.google.com with SMTP id a1so5303736wgh.32 for ; Fri, 11 Apr 2014 03:40:03 -0700 (PDT) X-Received: by 10.194.236.232 with SMTP id ux8mr20091316wjc.46.1397212803144; Fri, 11 Apr 2014 03:40:03 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-377-242.w86-199.abo.wanadoo.fr. [86.199.232.242]) by mx.google.com with ESMTPSA id eq8sm3683033wib.16.2014.04.11.03.40.01 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Apr 2014 03:40:02 -0700 (PDT) From: Daniel Lezcano To: kgene.kim@samsung.com Cc: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, t.figa@samsung.com, linaro-kernel@lists.linaro.org, rjw@rjwysocki.net Subject: [PATCH V5 05/20] ARM: exynos: cpuidle: Encapsulate register access inside a function Date: Fri, 11 Apr 2014 12:40:00 +0200 Message-Id: <1397212815-16068-6-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1397212815-16068-1-git-send-email-daniel.lezcano@linaro.org> References: <1397212815-16068-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , That makes the code cleaner and encapsulted. The function will be reused in the next patch. Signed-off-by: Daniel Lezcano Reviewed-by: Viresh Kumar Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Tomasz Figa --- arch/arm/mach-exynos/pm.c | 65 ++++++++++++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-exynos/pm.c b/arch/arm/mach-exynos/pm.c index 15af0ce..adfdf4b 100644 --- a/arch/arm/mach-exynos/pm.c +++ b/arch/arm/mach-exynos/pm.c @@ -103,6 +103,42 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state) /* For Cortex-A9 Diagnostic and Power control register */ static unsigned int save_arm_register[2]; +static void exynos_cpu_save_register(void) +{ + unsigned long tmp; + + /* Save Power control register */ + asm ("mrc p15, 0, %0, c15, c0, 0" + : "=r" (tmp) : : "cc"); + + save_arm_register[0] = tmp; + + /* Save Diagnostic register */ + asm ("mrc p15, 0, %0, c15, c0, 1" + : "=r" (tmp) : : "cc"); + + save_arm_register[1] = tmp; +} + +static void exynos_cpu_restore_register(void) +{ + unsigned long tmp; + + /* Restore Power control register */ + tmp = save_arm_register[0]; + + asm volatile ("mcr p15, 0, %0, c15, c0, 0" + : : "r" (tmp) + : "cc"); + + /* Restore Diagnostic register */ + tmp = save_arm_register[1]; + + asm volatile ("mcr p15, 0, %0, c15, c0, 1" + : : "r" (tmp) + : "cc"); +} + static int exynos_cpu_suspend(unsigned long arg) { #ifdef CONFIG_CACHE_L2X0 @@ -162,17 +198,8 @@ static int exynos_pm_suspend(void) tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0); __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION); - if (!soc_is_exynos5250()) { - /* Save Power control register */ - asm ("mrc p15, 0, %0, c15, c0, 0" - : "=r" (tmp) : : "cc"); - save_arm_register[0] = tmp; - - /* Save Diagnostic register */ - asm ("mrc p15, 0, %0, c15, c0, 1" - : "=r" (tmp) : : "cc"); - save_arm_register[1] = tmp; - } + if (!soc_is_exynos5250()) + exynos_cpu_save_register(); return 0; } @@ -196,19 +223,9 @@ static void exynos_pm_resume(void) /* No need to perform below restore code */ goto early_wakeup; } - if (!soc_is_exynos5250()) { - /* Restore Power control register */ - tmp = save_arm_register[0]; - asm volatile ("mcr p15, 0, %0, c15, c0, 0" - : : "r" (tmp) - : "cc"); - - /* Restore Diagnostic register */ - tmp = save_arm_register[1]; - asm volatile ("mcr p15, 0, %0, c15, c0, 1" - : : "r" (tmp) - : "cc"); - } + + if (!soc_is_exynos5250()) + exynos_cpu_restore_register(); /* For release retention */