From patchwork Fri Apr 24 11:57:10 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: 6269351 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@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 4B7609F1C4 for ; Fri, 24 Apr 2015 11:57:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5236C20268 for ; Fri, 24 Apr 2015 11:57:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E2BA20263 for ; Fri, 24 Apr 2015 11:57:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751209AbbDXL5T (ORCPT ); Fri, 24 Apr 2015 07:57:19 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:35017 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750835AbbDXL5S (ORCPT ); Fri, 24 Apr 2015 07:57:18 -0400 Received: by lbbuc2 with SMTP id uc2so34564110lbb.2 for ; Fri, 24 Apr 2015 04:57:17 -0700 (PDT) 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=0BJAE3xTSob9bGwnYtlv1/ecf+K519PzKoKwBFrCDgY=; b=euBZRQ/Gc3HO7nQxCUIic8hvAxR3UBq/r5DOOvRdjHrfDj4E8AVBofv87XkBHVfgD/ eJXbPITzm33xO9DFH5mJ18b5m3Sty9C+E1kf3CZDSYN7eC2kexppnBKADmTuT7POQLyS z8tmKmapkOlsZowe5Brmj4+8682xLJTfh835BsQHozkgUBTJQSoLVJfU3zzMwMV9PgSw nzi8/Y5jkeM0Vd8WLr6JRemnyEaTsffwxRkSF3LwYI17DuM1hErXJidS6nAsrn0XprSK c2nMkMmGGJqw+bTevW38RSiiFY31zp9g55NfXyhT+8N2gf5GRDpY66CiKG2taQ+MaVQ6 hpEg== X-Gm-Message-State: ALoCoQkQLPJd12uGt1aL2Z3348nKL7HEqTSFaPul739ziIjsxtX1S1cx8rfJE1urEiuHVzmR+G6a X-Received: by 10.152.87.164 with SMTP id az4mr6666131lab.123.1429876636949; Fri, 24 Apr 2015 04:57:16 -0700 (PDT) Received: from localhost ([195.238.92.128]) by mx.google.com with ESMTPSA id xg4sm2573902lac.0.2015.04.24.04.57.16 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 24 Apr 2015 04:57:16 -0700 (PDT) From: To: Bryan Wu , Richard Purdie , Kevin Hilman , Cc: , , rjw@rjwysocki.net, , Greg Kroah-Hartman , Grygorii Strashko Subject: [PATCH RESEND v2] leds: fix hibernation on arm when gpio-led used with CPU led trigger Date: Fri, 24 Apr 2015 14:57:10 +0300 Message-Id: <1429876630-15952-1-git-send-email-grygorii.strashko@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 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. Fixes: 73e1ab41a80d (leds: Convert led class driver from legacy pm ops to dev_pm_ops) Signed-off-by: Grygorii Strashko Acked-by: Jacek Anaszewski --- Hi All, Could you pls pay attention on this patch? This trivial patch was posted at Feb 2015 and it's missed two merge windows already ((. Rebased on top of next (4.1). Changes in v2: - fixed compile time warnings when !CONFIG_PM_SLEEP - updated commit message v2: https://lkml.org/lkml/2015/2/5/323 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 728681d..7fb2a19 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -187,6 +187,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); @@ -206,11 +207,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); static int match_name(struct device *dev, const void *data) {