From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Mark Rutland <mark.rutland@arm.com>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Brian Norris <computersforpeace@gmail.com>,
Gregory Fong <gregory.0xf0@gmail.com>,
bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM
BCM7XXX ARM ARCHITECTURE), Rob Herring <robh@kernel.org>,
Doug Berger <opendmb@gmail.com>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/3] firmware/psci: Fix cpu_resume entry points with THUMB2_KERNEL
Date: Thu, 27 Sep 2018 12:27:09 -0700 [thread overview]
Message-ID: <20180927192711.26455-2-f.fainelli@gmail.com> (raw)
In-Reply-To: <20180927192711.26455-1-f.fainelli@gmail.com>
When THUMB2_KERNEL is enabled, we would be failing to resume from an
idle or system suspend call where the reentry point is set to
cpu_resume() because that function is in Thumb2. Utilize
cpu_resume_arm() for ARM 32-bit kernels which takes care of the mode
switching for us.
Fixes: 8b6f2499ac45 ("ARM: 8511/1: ARM64: kernel: PSCI: move PSCI idle management code to drivers/firmware")
Fixes: faf7ec4a92c0 ("drivers: firmware: psci: add system suspend support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/firmware/psci.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
index c80ec1d03274..f8b154384483 100644
--- a/drivers/firmware/psci.c
+++ b/drivers/firmware/psci.c
@@ -400,9 +400,14 @@ int psci_cpu_init_idle(unsigned int cpu)
static int psci_suspend_finisher(unsigned long index)
{
u32 *state = __this_cpu_read(psci_power_state);
+ unsigned long reentry;
- return psci_ops.cpu_suspend(state[index - 1],
- __pa_symbol(cpu_resume));
+#ifdef CONFIG_ARM
+ reentry = __pa_symbol(cpu_resume_arm);
+#else
+ reentry = __pa_symbol(cpu_resume);
+#endif
+ return psci_ops.cpu_suspend(state[index - 1], reentry);
}
int psci_cpu_suspend_enter(unsigned long index)
@@ -437,8 +442,15 @@ CPUIDLE_METHOD_OF_DECLARE(psci, "psci", &psci_cpuidle_ops);
static int psci_system_suspend(unsigned long unused)
{
+ unsigned long reentry;
+
+#ifdef CONFIG_ARM
+ reentry = __pa_symbol(cpu_resume_arm);
+#else
+ reentry = __pa_symbol(cpu_resume);
+#endif
return invoke_psci_fn(PSCI_FN_NATIVE(1_0, SYSTEM_SUSPEND),
- __pa_symbol(cpu_resume), 0, 0);
+ reentry, 0, 0);
}
static int psci_system_suspend_enter(suspend_state_t state)
--
2.17.1
next prev parent reply other threads:[~2018-09-27 19:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-27 19:27 [PATCH 0/3] ARM/PSCI: Fix THUMB2_KERNEL entry points Florian Fainelli
2018-09-27 19:27 ` Florian Fainelli [this message]
2018-09-28 13:47 ` [PATCH 1/3] firmware/psci: Fix cpu_resume entry points with THUMB2_KERNEL Mark Rutland
2018-09-28 17:50 ` Florian Fainelli
2018-09-27 19:27 ` [PATCH 2/3] ARM: psci: Fix secondary core boot " Florian Fainelli
2018-09-28 13:48 ` Mark Rutland
2018-09-27 19:27 ` [PATCH 3/3] soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL Florian Fainelli
2018-10-01 18:17 ` Florian Fainelli
2018-09-28 8:08 ` [PATCH 0/3] ARM/PSCI: Fix THUMB2_KERNEL entry points Robin Murphy
2018-09-28 17:51 ` Florian Fainelli
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=20180927192711.26455-2-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=computersforpeace@gmail.com \
--cc=gregory.0xf0@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=opendmb@gmail.com \
--cc=robh@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).