Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc441fb authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit fb14ada11d62fb849fc357a25ef8016ba438ba10 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9cdfff0a

drivers/soc/bcm/brcmstb/pm/pm-arm.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ noinline int brcmstb_pm_s3_finish(void) 
{

	struct brcmstb_s3_params *params = ctrl.s3_params;

	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;

	u32 flags;