devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Derek Basehore <dbasehore@chromium.org>
To: linux-kernel@vger.kernel.org
Cc: Soby.Mathew@arm.com, sudeep.holla@arm.com,
	devicetree@vger.kernel.org, robh+dt@kernel.org,
	mark.rutland@arm.com, linux-pm@vger.kernel.org,
	rafael.j.wysocki@intel.com, tglx@linutronix.de,
	briannorris@chromium.org, marc.zyngier@arm.com,
	Derek Basehore <dbasehore@chromium.org>
Subject: [PATCH v2 1/5] cpu_pm: add syscore_suspend error handling
Date: Thu, 25 Jan 2018 23:38:31 -0800	[thread overview]
Message-ID: <20180126073835.16575-2-dbasehore@chromium.org> (raw)
In-Reply-To: <20180126073835.16575-1-dbasehore@chromium.org>

If cpu_cluster_pm_enter() fails, cpu_pm_exit() should be called. This
will put the CPU in the correct state to resume from the failure.

Signed-off-by: Derek Basehore <dbasehore@chromium.org>
---
 kernel/cpu_pm.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/cpu_pm.c b/kernel/cpu_pm.c
index 67b02e138a47..03bcc0751a51 100644
--- a/kernel/cpu_pm.c
+++ b/kernel/cpu_pm.c
@@ -186,6 +186,9 @@ static int cpu_pm_suspend(void)
 		return ret;
 
 	ret = cpu_cluster_pm_enter();
+	if (ret)
+		cpu_pm_exit();
+
 	return ret;
 }
 
-- 
2.16.0.rc1.238.g530d649a79-goog

  reply	other threads:[~2018-01-26  7:38 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-26  7:38 [PATCH v2 0/5] GICv3 Save and Restore Derek Basehore
2018-01-26  7:38 ` Derek Basehore [this message]
     [not found] ` <20180126073835.16575-1-dbasehore-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-01-26  7:38   ` [PATCH v2 2/5] irqchip/gic-v3-its: add ability to save/restore ITS state Derek Basehore
     [not found]     ` <20180126073835.16575-3-dbasehore-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>
2018-01-26 20:59       ` Brian Norris
     [not found]         ` <20180126205954.cikwitw7sgdt2yn3-1WoqFLEneaORBCj4nEdE8WJtCfot02Oa@public.gmane.org>
2018-01-26 21:13           ` dbasehore .
2018-01-26  7:38 ` [PATCH v2 3/5] DT/arm,gic-v3-its: add reset-on-suspend property Derek Basehore
2018-01-26  7:38 ` [PATCH v2 4/5] irqchip/gic-v3-its: add ability to resend MAPC on resume Derek Basehore
2018-01-26  7:38 ` [PATCH v2 5/5] DT/arm,gic-v3: add collections-reset-on-suspend property Derek Basehore

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180126073835.16575-2-dbasehore@chromium.org \
    --to=dbasehore@chromium.org \
    --cc=Soby.Mathew@arm.com \
    --cc=briannorris@chromium.org \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=rafael.j.wysocki@intel.com \
    --cc=robh+dt@kernel.org \
    --cc=sudeep.holla@arm.com \
    --cc=tglx@linutronix.de \
    --subject='Re: [PATCH v2 1/5] cpu_pm: add syscore_suspend error handling' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).