From patchwork Thu Feb 5 14:37:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Grygorii.Strashko@linaro.org" X-Patchwork-Id: 5784831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 611C19F30C for ; Thu, 5 Feb 2015 14:39:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8D2632022D for ; Thu, 5 Feb 2015 14:39:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BACDA20268 for ; Thu, 5 Feb 2015 14:39:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YJNYp-0004Ov-K4; Thu, 05 Feb 2015 14:37:39 +0000 Received: from mail-lb0-f173.google.com ([209.85.217.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YJNYm-0004KC-Ep for linux-arm-kernel@lists.infradead.org; Thu, 05 Feb 2015 14:37:37 +0000 Received: by mail-lb0-f173.google.com with SMTP id p9so7823360lbv.4 for ; Thu, 05 Feb 2015 06:37:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=1dS1nKVGbFkfvFRs92Qe5ue2Xd2uw9iFwMiRlpiWnAE=; b=FiUS+27kVfU+J+P4JJuiXQ0lxbejSpBy5g9ixCXReZ0rri4nPE0wniYB+RdG98xWbW rXlXRDDdT7/5j5wR0itTjkkZqQ9e0obRApKxKXOJWIpEtU2pbV9tL/bUHDo5vVWsySkc Jf7bQLaWUrstLzNlCbYM7zQbfp3n2NNkaxGgYwGBY3mwKkCxCO0OQwlpPGdxhHPPMZKQ bD8DD9vcJTNnuAeD41tZQuqElsCua6NuHq3GOUMWL+UZ1tN/3HbpDXZvjet1dIFp32XR rig3m0iw0rz4bM8sR2vNW8nu6I5TUYLWJ8GvWalwMSEvil866jfJXODEoPe7BNQUktaI dRuA== X-Gm-Message-State: ALoCoQnNrkKaPzwIcDqogB3IQpym6YVY1ptJDRmIyKGiIsTRbGExRU4Aa2Y43RuVi9Qmo418Rhl7 X-Received: by 10.152.2.41 with SMTP id 9mr3844563lar.59.1423147033145; Thu, 05 Feb 2015 06:37:13 -0800 (PST) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id cb5sm999577lad.3.2015.02.05.06.37.12 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 05 Feb 2015 06:37:12 -0800 (PST) From: To: Bryan Wu , Richard Purdie , linux-leds@vger.kernel.org Subject: [PATCH v2] leds: fix hibernation on arm when gpio-led used with CPU led trigger Date: Thu, 5 Feb 2015 16:37:04 +0200 Message-Id: <1423147024-4744-1-git-send-email-grygorii.strashko@linaro.org> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150205_063736_678279_30144DF6 X-CRM114-Status: GOOD ( 11.75 ) X-Spam-Score: -0.7 (/) Cc: linux-pm@vger.kernel.org, Grygorii Strashko , sumit.semwal@linaro.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 From: Grygorii Strashko Setting a dev_pm_ops suspend/resume pair of callbacks but not a set of hibernation callbacks means those pm functions will not be called upon hibernation - that leads to system crash on ARM during freezing if gpio-led is used in combination with CPU led trigger. It may happen after freeze_noirq stage (GPIO is suspended) and before syscore_suspend stage (CPU led trigger is suspended) - usually when disable_nonboot_cpus() is called. Log: PM: noirq freeze of devices complete after 1.425 msecs Disabling non-boot CPUs ... ^ system may crash or stuck here with message (TI AM572x) WARNING: CPU: 0 PID: 3100 at drivers/bus/omap_l3_noc.c:148 l3_interrupt_handler+0x22c/0x370() 44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4_PER1_P3 (Idle): Data Access in Supervisor mode during Functional access CPU1: shutdown ^ or here Fix this by using SIMPLE_DEV_PM_OPS, which appropriately assigns the suspend and hibernation callbacks and move led_suspend/led_resume under CONFIG_PM_SLEEP to avoid build warnings. Signed-off-by: Grygorii Strashko --- This patch actually fixes commit: 73e1ab4 "leds: Convert led class driver from legacy pm ops to dev_pm_ops" Changes in v2: - fixed compile time warnings when !CONFIG_PM_SLEEP - updated commit message v1: - https://lkml.org/lkml/2015/2/2/476 drivers/leds/led-class.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index dbeebac..5033e0d 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -183,6 +183,7 @@ void led_classdev_resume(struct led_classdev *led_cdev) } EXPORT_SYMBOL_GPL(led_classdev_resume); +#ifdef CONFIG_PM_SLEEP static int led_suspend(struct device *dev) { struct led_classdev *led_cdev = dev_get_drvdata(dev); @@ -202,11 +203,9 @@ static int led_resume(struct device *dev) return 0; } +#endif -static const struct dev_pm_ops leds_class_dev_pm_ops = { - .suspend = led_suspend, - .resume = led_resume, -}; +static SIMPLE_DEV_PM_OPS(leds_class_dev_pm_ops, led_suspend, led_resume); /** * led_classdev_register - register a new object of led_classdev class.