ARM: 9160/1: NOMMU: Reload __secondary_data after PROCINFO_INITFUNC

[ Upstream commit 7202216a6f ]

__secondary_data used to reside in r7 around call to
PROCINFO_INITFUNC. After commit 95731b8ee6 ("ARM: 9059/1: cache-v7:
get rid of mini-stack") r7 is used as a scratch register, so we have
to reload __secondary_data before we setup the stack pointer.

Fixes: 95731b8ee6 ("ARM: 9059/1: cache-v7: get rid of mini-stack")
Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Vladimir Murzin 2021-11-25 12:05:19 +01:00 коммит произвёл Greg Kroah-Hartman
Родитель afda22fea7
Коммит 8a351388b2
1 изменённых файлов: 1 добавлений и 0 удалений

Просмотреть файл

@ -114,6 +114,7 @@ ENTRY(secondary_startup)
add r12, r12, r10 add r12, r12, r10
ret r12 ret r12
1: bl __after_proc_init 1: bl __after_proc_init
ldr r7, __secondary_data @ reload r7
ldr sp, [r7, #12] @ set up the stack pointer ldr sp, [r7, #12] @ set up the stack pointer
mov fp, #0 mov fp, #0
b secondary_start_kernel b secondary_start_kernel