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 v4 1/5] cpu_pm: add syscore_suspend error handling
Date: Fri, 2 Feb 2018 17:24:46 -0800 [thread overview]
Message-ID: <20180203012450.18378-2-dbasehore@chromium.org> (raw)
In-Reply-To: <20180203012450.18378-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
next prev parent reply other threads:[~2018-02-03 1:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-03 1:24 [PATCH v4 0/5] GICv3 Save and Restore Derek Basehore
2018-02-03 1:24 ` Derek Basehore [this message]
2018-02-03 1:24 ` [PATCH v4 2/5] irqchip/gic-v3-its: add ability to save/restore ITS state Derek Basehore
2018-02-05 15:56 ` Marc Zyngier
2018-02-05 21:33 ` dbasehore .
2018-02-06 16:23 ` Marc Zyngier
2018-02-06 22:25 ` dbasehore .
2018-02-06 0:33 ` dbasehore .
2018-02-06 1:01 ` dbasehore .
2018-02-06 1:02 ` dbasehore .
2018-02-03 1:24 ` [PATCH v4 3/5] DT/arm,gic-v3-its: add reset-on-suspend property Derek Basehore
2018-02-03 1:24 ` [PATCH v4 4/5] irqchip/gic-v3-its: add ability to resend MAPC on resume Derek Basehore
2018-02-06 16:40 ` Marc Zyngier
2018-02-06 22:10 ` dbasehore .
2018-02-03 1:24 ` [PATCH v4 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=20180203012450.18378-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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox