From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx48cOac18HzX/eCk3UIc6EUcZOfcoba/PRP2kNrA4VputhJxIPf5PDyfg1RXaPdbuEuuH40X ARC-Seal: i=1; a=rsa-sha256; t=1524505593; cv=none; d=google.com; s=arc-20160816; b=0nwQATYZIWO0w1yv4XEArc5wEPdWlJwTxLIF7knR1SIiQbVKBTehLcLJYNAVi4lSW4 rGvIWcUNezXtM8bC3rAXlF8ygqCsWUIrJNDCLXcCK8S31IvGd0onZM2Odh6mnkxCGov7 DLWcFasDY8MoOQ1gPvJNLehiEFL+52xHG1a+3MD+jnF6HQoPExoRFiidnZ8IdsuUdae1 Y63z0rAC7EWvEb9GKU60tMeKjPPlroitdKQH8rknfhmEOLhs6F4KQrvoss8X0RsszyQN RFtf25n4HFJ1ngsj/MKk0OTDxQo325fvrH/KZAHJ8kZcpbr0LZKMfde6xYOcvowo+WWs OiCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=X1T6JsaWF2jeyUZaw2PqTV66HAbmMm8QiPFmTXlblH4=; b=TRynP/v25JiqfS62uXB4sLFNqJRfYgZWYgNGZIa7r13vShxjTeKqXvWSEvJxPRLnGy 1kUBDA3Jeag0mZv18w5gnbx1HRZJtD/BYiRhFvf2Job7GSXAtq/+0UkojQ23ll4Mkh/I uDLR8g6rewPKUpt0IhyZ/yPen2yZD42vMH3HPi7cE3QW5omfYXm5MbMYiDg/QS1X/5Ba GeOAvQHAqHfPsS+h54IMf5p0xTq4ug3asv4Zcv0Ha+xljnzqwcbkTYyML1fw7CgQTjRZ fx8ooauyM0SktlstPHFRRzzDSJ3iHNCVXFDnAjrJIvIuGKU4AGPqJtYglEVCo833/HCg Ft4g== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 72.249.23.125 is neither permitted nor denied by best guess record for domain of tony@atomide.com) smtp.mailfrom=tony@atomide.com Authentication-Results: mx.google.com; spf=neutral (google.com: 72.249.23.125 is neither permitted nor denied by best guess record for domain of tony@atomide.com) smtp.mailfrom=tony@atomide.com From: Tony Lindgren To: linux-omap@vger.kernel.org Cc: Dave Gerlach , Greg Kroah-Hartman , Nishanth Menon , Suman Anna , Tero Kristo , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/16] bus: ti-sysc: Improve suspend and resume handling Date: Mon, 23 Apr 2018 10:45:44 -0700 Message-Id: <20180423174549.57412-12-tony@atomide.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180423174549.57412-1-tony@atomide.com> References: <20180423174549.57412-1-tony@atomide.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1598559976776953995?= X-GMAIL-MSGID: =?utf-8?q?1598559976776953995?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Based on testing with more devices I noticed that some devices don't suspend or resume properly. We need to PM runtime suspend and resume devices if we have ddata->needs_resume set. Let's also improve the error handling and add few debug statements to make it easier to notice suspend and resume related issues if DEBUG is set. Signed-off-by: Tony Lindgren --- drivers/bus/ti-sysc.c | 54 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -662,6 +662,7 @@ static int __maybe_unused sysc_runtime_resume(struct device *dev) static int sysc_suspend(struct device *dev) { struct sysc *ddata; + int error; ddata = dev_get_drvdata(dev); @@ -672,14 +673,27 @@ static int sysc_suspend(struct device *dev) if (!ddata->enabled) return 0; + dev_dbg(ddata->dev, "%s %s\n", __func__, + ddata->name ? ddata->name : ""); + + error = pm_runtime_put_sync_suspend(dev); + if (error < 0) { + dev_warn(ddata->dev, "%s not idle %i %s\n", + __func__, error, + ddata->name ? ddata->name : ""); + + return 0; + } + ddata->needs_resume = true; - return sysc_runtime_suspend(dev); + return 0; } static int sysc_resume(struct device *dev) { struct sysc *ddata; + int error; ddata = dev_get_drvdata(dev); @@ -691,9 +705,16 @@ static int sysc_resume(struct device *dev) dev_dbg(ddata->dev, "%s %s\n", __func__, ddata->name ? ddata->name : ""); - ddata->needs_resume = false; + error = pm_runtime_get_sync(dev); + if (error < 0) { + dev_err(ddata->dev, "%s error %i %s\n", + __func__, error, + ddata->name ? ddata->name : ""); - return sysc_runtime_resume(dev); + return error; + } + + ddata->needs_resume = false; } return 0; @@ -735,6 +756,9 @@ static int sysc_noirq_resume(struct device *dev) return 0; if (ddata->needs_resume) { + dev_dbg(ddata->dev, "%s %s\n", __func__, + ddata->name ? ddata->name : ""); + ddata->needs_resume = false; return sysc_runtime_resume(dev); @@ -1069,18 +1093,33 @@ static int sysc_child_suspend_noirq(struct device *dev) ddata = sysc_child_to_parent(dev); + dev_dbg(ddata->dev, "%s %s\n", __func__, + ddata->name ? ddata->name : ""); + error = pm_generic_suspend_noirq(dev); - if (error) + if (error) { + dev_err(dev, "%s error at %i: %i\n", + __func__, __LINE__, error); + return error; + } if (!pm_runtime_status_suspended(dev)) { error = pm_generic_runtime_suspend(dev); - if (error) + if (error) { + dev_err(dev, "%s error at %i: %i\n", + __func__, __LINE__, error); + return error; + } error = sysc_runtime_suspend(ddata->dev); - if (error) + if (error) { + dev_err(dev, "%s error at %i: %i\n", + __func__, __LINE__, error); + return error; + } ddata->child_needs_resume = true; } @@ -1095,6 +1134,9 @@ static int sysc_child_resume_noirq(struct device *dev) ddata = sysc_child_to_parent(dev); + dev_dbg(ddata->dev, "%s %s\n", __func__, + ddata->name ? ddata->name : ""); + if (ddata->child_needs_resume) { ddata->child_needs_resume = false; -- 2.17.0