From: Stephen Boyd <sboyd@codeaurora.org>
To: Russell King <linux@arm.linux.org.uk>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Lina Iyer <lina.iyer@linaro.org>
Subject: [PATCH] ARM: Enter CPU in ARM state for cpu_resume
Date: Mon, 1 Jun 2015 13:22:00 -0700 [thread overview]
Message-ID: <1433190120-27798-1-git-send-email-sboyd@codeaurora.org> (raw)
The standard boot protocol on ARM requires CPUs to be entered in
the ARM state, unless they don't support the ARM instruction set
(see Documentation/arm/Booting). On THUMB2 kernels, we assume
the firmware can determine what state to enter the kernel in, but
some firmwares don't honor the thumb bit. Make the cpu_resume
symbol an ARM symbol, so that firmwares that honor the thumb bit
will enter the kernel in ARM state and firmwares that don't honor
the thumb bit will be able to enter the kernel in ARM state
without more changes.
This fixes a problem reported by Kevin Hilman where the ifc6410
fails to boot for THUMB2 kernels because the platform's firmware
always enters the kernel in ARM mode from deep idle states.
Reported-by: Kevin Hilman <khilman@linaro.org>
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Lina Iyer <lina.iyer@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/kernel/sleep.S | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S
index 76bb3128e135..7c289ebb0b45 100644
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
@@ -118,7 +118,12 @@ ENDPROC(cpu_resume_after_mmu)
.text
.align
+ .arm
ENTRY(cpu_resume)
+ THUMB( badr r9, 1f ) @ Kernel is entered in ARM.
+ THUMB( bx r9 ) @ If this is a Thumb-2 kernel,
+ THUMB( .thumb ) @ switch to Thumb now.
+ THUMB(1: )
ARM_BE8(setend be) @ ensure we are in BE mode
#ifdef CONFIG_ARM_VIRT_EXT
bl __hyp_stub_install_secondary
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next reply other threads:[~2015-06-01 20:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 20:22 Stephen Boyd [this message]
2015-06-01 21:45 ` [PATCH] ARM: Enter CPU in ARM state for cpu_resume Russell King - ARM Linux
2015-06-02 6:18 ` Ard Biesheuvel
2015-06-02 8:34 ` Russell King - ARM Linux
2015-06-02 10:34 ` Ard Biesheuvel
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=1433190120-27798-1-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=lina.iyer@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
/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).