Commit fb14ada1 authored by Florian Fainelli's avatar Florian Fainelli

soc: bcm: brcmstb: Fix re-entry point with a THUMB2_KERNEL

When the kernel is built with CONFIG_THUMB2_KERNEL we would set the
kernel's resume entry point to be a function that is already built as
Thumb-2 code while the boot agent doing the resume is in ARM mode, so
this does not work. There is a header label defined: cpu_resume_arm
which we can use to do the switching for us.

Fixes: 0b741b82 ("soc: bcm: brcmstb: Add support for S2/S3/S5 suspend states (ARM)")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parent 65102238
...@@ -404,7 +404,7 @@ noinline int brcmstb_pm_s3_finish(void) ...@@ -404,7 +404,7 @@ noinline int brcmstb_pm_s3_finish(void)
{ {
struct brcmstb_s3_params *params = ctrl.s3_params; struct brcmstb_s3_params *params = ctrl.s3_params;
dma_addr_t params_pa = ctrl.s3_params_pa; dma_addr_t params_pa = ctrl.s3_params_pa;
phys_addr_t reentry = virt_to_phys(&cpu_resume); phys_addr_t reentry = virt_to_phys(&cpu_resume_arm);
enum bsp_initiate_command cmd; enum bsp_initiate_command cmd;
u32 flags; u32 flags;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment