From patchwork Fri Dec 20 18:47:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 3390851 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 844809F314 for ; Fri, 20 Dec 2013 18:50:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7E98E206F6 for ; Fri, 20 Dec 2013 18:50:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A4E2206F2 for ; Fri, 20 Dec 2013 18:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752636Ab3LTSsE (ORCPT ); Fri, 20 Dec 2013 13:48:04 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:52447 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752575Ab3LTSr7 (ORCPT ); Fri, 20 Dec 2013 13:47:59 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MY4005LQC7YTH00@mailout2.samsung.com>; Sat, 21 Dec 2013 03:47:58 +0900 (KST) X-AuditID: cbfee61b-b7f456d000006dfd-90-52b490de3217 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 55.C2.28157.ED094B25; Sat, 21 Dec 2013 03:47:58 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MY400450C7IZ6A0@mmp2.samsung.com>; Sat, 21 Dec 2013 03:47:58 +0900 (KST) From: Bartlomiej Zolnierkiewicz To: rjw@rjwysocki.net Cc: daniel.lezcano@linaro.org, lenb@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kyungmin.park@samsung.com, b.zolnierkie@samsung.com, Kukjin Kim Subject: [PATCH v2 1/9] ARM: EXYNOS: cpuidle: fix AFTR mode check Date: Fri, 20 Dec 2013 19:47:23 +0100 Message-id: <1387565251-7051-2-git-send-email-b.zolnierkie@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1387565251-7051-1-git-send-email-b.zolnierkie@samsung.com> References: <1387565251-7051-1-git-send-email-b.zolnierkie@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMLMWRmVeSWpSXmKPExsVy+t9jQd17E7YEGTz+xGexccZ6Vot5n2Ut ehdcZbM42/SG3WLnw7dsFpd3zWGz+Nx7hNFixvl9TBa/v/9jtThz+hKrA5fHplWdbB53ru1h 8zg/YyGjx5ar7SwefVtWMXp83iQXwBbFZZOSmpNZllqkb5fAlbFwanHBVr6K9xOnsDcwfuPu YuTgkBAwkXjSXtjFyAlkiklcuLeeDcQWEpjOKPHoknkXIxeQ3cUkcebQVFaQBJuAlcTE9lWM ILaIgKjE5d0TWECKmAXamSRuzutgBkkICzhKTJu5gRlkAYuAqkTPvkQQk1fAXaKlxQJil6JE 97MJYLs4BTwkZr9azgSx113iRNdv5gmMvAsYGVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525i BAfdM+kdjKsaLA4xCnAwKvHwSkRuCRJiTSwrrsw9xCjBwawkwnuzDSjEm5JYWZValB9fVJqT WnyIUZqDRUmc92CrdaCQQHpiSWp2ampBahFMlomDU6qBcdKtA9y3Lsh/NOj64HvovGBre3dm pPqdVUmbfyU2RbSYh/k0Rqa7V3mXfFc6zb3r1Tv5yjn+n3csE2W7u7Rh+Y9zqpUOOzLk5cRt 66WZe1a+8Q24f2Cfae7pqaFTbd3nOAR++HYz4nfzuyOBt0XD5ydzNwjFhpqa3zWdJ8tVfDxy 3p+sU5+MlViKMxINtZiLihMBl0zlczYCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The EXYNOS cpuidle driver code assumes that cpuidle core will handle dev->state_count smaller than drv->state_count but currently this is untrue (dev->state_count is used only for handling cpuidle state sysfs entries and drv->state_count is used for all other cases) and will not be fixed in the future as dev->state_count is planned to be removed. Fix the issue by checking for the max supported idle state in AFTR state's ->enter handler (exynos4_enter_lowpower()) and entering AFTR mode only when cores other than CPU0 are offline. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Kyungmin Park Acked-by: Daniel Lezcano Cc: Kukjin Kim Acked-by: Kukjin Kim --- arch/arm/mach-exynos/cpuidle.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c index da65b03..f57cb91 100644 --- a/arch/arm/mach-exynos/cpuidle.c +++ b/arch/arm/mach-exynos/cpuidle.c @@ -172,8 +172,8 @@ static int exynos4_enter_lowpower(struct cpuidle_device *dev, { int new_index = index; - /* This mode only can be entered when other core's are offline */ - if (num_online_cpus() > 1) + /* AFTR can only be entered when cores other than CPU0 are offline */ + if (num_online_cpus() > 1 || dev->cpu != 0) new_index = drv->safe_state_index; if (new_index == 0) @@ -235,10 +235,6 @@ static int exynos_cpuidle_probe(struct platform_device *pdev) device = &per_cpu(exynos4_cpuidle_device, cpu_id); device->cpu = cpu_id; - /* Support IDLE only */ - if (cpu_id != 0) - device->state_count = 1; - ret = cpuidle_register_device(device); if (ret) { dev_err(&pdev->dev, "failed to register cpuidle device\n");