Commit 005684e6 authored by Jason Yan's avatar Jason Yan Committed by GUO Zihua
Browse files

powerpc/fsl_booke/64: introduce reloc_kernel_entry() helper 

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8OHAZ
CVE: NA

Reference: https://patchwork.ozlabs.org/project/linuxppc-dev/patch/20200330022023.3691-3-yanaijie@huawei.com/



-------------------------------------------------

Like the 32bit code, we introduce reloc_kernel_entry() helper to prepare
for the KASLR 64bit version. And move the C declaration of this function
out of CONFIG_PPC32 and use long instead of int for the parameter 'addr'.

Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
Cc: Scott Wood <oss@buserror.net>
Cc: Diana Craciun <diana.craciun@nxp.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Christophe Leroy <christophe.leroy@c-s.fr>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarCui GaoSheng <cuigaosheng1@huawei.com>
Signed-off-by: default avatarGUO Zihua <guozihua@huawei.com>
parent 0d80ebc0

arch/powerpc/kernel/exceptions-64e.S

+13 −0
Original line number Diff line number Diff line
@@ -1554,3 +1554,16 @@ _GLOBAL(setup_ehv_ivors) 
_GLOBAL(setup_lrat_ivor)

	SET_IVOR(42, 0x340) /* LRAT Error */

	blr



/*

 * Return to the start of the relocated kernel and run again

 * r3 - virtual address of fdt

 * r4 - entry of the kernel

 */

_GLOBAL(reloc_kernel_entry)

	mfmsr	r7

	rlwinm	r7, r7, 0, ~(MSR_IS | MSR_DS)



	mtspr	SPRN_SRR0,r4

	mtspr	SPRN_SRR1,r7

	rfi

arch/powerpc/mm/mmu_decl.h

+2 −1
Original line number Diff line number Diff line
@@ -120,10 +120,11 @@ extern void adjust_total_lowmem(void); 
extern int switch_to_as1(void);

extern void restore_to_as0(int esel, int offset, void *dt_ptr, int bootcpu);

void create_kaslr_tlb_entry(int entry, unsigned long virt, phys_addr_t phys);

void reloc_kernel_entry(void *fdt, int addr);

void relocate_init(u64 dt_ptr, phys_addr_t start);

extern int is_second_reloc;

#endif



void reloc_kernel_entry(void *fdt, long addr);

extern void loadcam_entry(unsigned int index);

extern void loadcam_multi(int first_idx, int num, int tmp_idx);