Commit 879add77 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/64s: Replace RFI by RFI_TO_KERNEL and remove RFI 



In head_64.S, we have two places using RFI to return to
kernel. Use RFI_TO_KERNEL instead.

They are the two only places using RFI on book3s/64, so
the RFI macro can go away.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/7719261b0a0d2787772339484c33eb809723bca7.1604854583.git.christophe.leroy@csgroup.eu
parent 027717a4

arch/powerpc/include/asm/ppc_asm.h

+0 −1
Original line number Diff line number Diff line
@@ -495,7 +495,6 @@ END_FTR_SECTION_NESTED(CPU_FTR_CELL_TB_BUG, CPU_FTR_CELL_TB_BUG, 96) 
#endif



#ifdef CONFIG_PPC_BOOK3S_64

#define RFI		rfid

#define MTMSRD(r)	mtmsrd	r

#define MTMSR_EERI(reg)	mtmsrd	reg,1

#else

arch/powerpc/kernel/head_64.S

+7 −2
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ 
#include <asm/ppc-opcode.h>

#include <asm/export.h>

#include <asm/feature-fixups.h>

#ifdef CONFIG_PPC_BOOK3S

#include <asm/exception-64s.h>

#else

#include <asm/exception-64e.h>

#endif



/* The physical memory is laid out such that the secondary processor

 * spin code sits at 0x0000...0x00ff. On server, the vectors follow
@@ -829,7 +834,7 @@ __secondary_start: 


	mtspr	SPRN_SRR0,r3

	mtspr	SPRN_SRR1,r4

	RFI

	RFI_TO_KERNEL

	b	.	/* prevent speculative execution */



/*
@@ -966,7 +971,7 @@ start_here_multiplatform: 
	ld	r4,PACAKMSR(r13)

	mtspr	SPRN_SRR0,r3

	mtspr	SPRN_SRR1,r4

	RFI

	RFI_TO_KERNEL

	b	.	/* prevent speculative execution */



	/* This is where all platforms converge execution */