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

Commit 222f20f1 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: Simple RFI macro conversions 



This commit does simple conversions of rfi/rfid to the new macros that
include the expected destination context. By simple we mean cases
where there is a single well known destination context, and it's
simply a matter of substituting the instruction for the appropriate
macro.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 50e51c13

arch/powerpc/include/asm/exception-64s.h

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	mtspr	SPRN_##h##SRR0,r12;					\

	mfspr	r12,SPRN_##h##SRR1;	/* and SRR1 */			\

	mtspr	SPRN_##h##SRR1,r10;					\

	h##rfid;							\

	h##RFI_TO_KERNEL;						\

	b	.	/* prevent speculative execution */

#define EXCEPTION_PROLOG_PSERIES_1(label, h)				\

	__EXCEPTION_PROLOG_PSERIES_1(label, h)
@@ -261,7 +261,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	mtspr	SPRN_##h##SRR0,r12;					\

	mfspr	r12,SPRN_##h##SRR1;	/* and SRR1 */			\

	mtspr	SPRN_##h##SRR1,r10;					\

	h##rfid;							\

	h##RFI_TO_KERNEL;						\

	b	.	/* prevent speculative execution */



#define EXCEPTION_PROLOG_PSERIES_1_NORI(label, h)			\

arch/powerpc/kernel/entry_64.S

+9 −5
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ 
#include <asm/tm.h>

#include <asm/ppc-opcode.h>

#include <asm/export.h>

#ifdef CONFIG_PPC_BOOK3S

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

#else

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

#endif



/*

 * System calls.
@@ -397,8 +402,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) 
	mtmsrd	r10, 1

	mtspr	SPRN_SRR0, r11

	mtspr	SPRN_SRR1, r12



	rfid

	RFI_TO_USER

	b	.	/* prevent speculative execution */

#endif

_ASM_NOKPROBE_SYMBOL(system_call_common);
@@ -1073,7 +1077,7 @@ __enter_rtas: 
	

	mtspr	SPRN_SRR0,r5

	mtspr	SPRN_SRR1,r6

	rfid

	RFI_TO_KERNEL

	b	.	/* prevent speculative execution */



rtas_return_loc:
@@ -1098,7 +1102,7 @@ rtas_return_loc: 


	mtspr	SPRN_SRR0,r3

	mtspr	SPRN_SRR1,r4

	rfid

	RFI_TO_KERNEL

	b	.	/* prevent speculative execution */

_ASM_NOKPROBE_SYMBOL(__enter_rtas)

_ASM_NOKPROBE_SYMBOL(rtas_return_loc)
@@ -1171,7 +1175,7 @@ _GLOBAL(enter_prom) 
	LOAD_REG_IMMEDIATE(r12, MSR_SF | MSR_ISF | MSR_LE)

	andc	r11,r11,r12

	mtsrr1	r11

	rfid

	RFI_TO_KERNEL

#endif /* CONFIG_PPC_BOOK3E */



1:	/* Return from OF */

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

+12 −12
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ BEGIN_FTR_SECTION 
	LOAD_HANDLER(r12, machine_check_handle_early)

1:	mtspr	SPRN_SRR0,r12

	mtspr	SPRN_SRR1,r11

	rfid

	RFI_TO_KERNEL

	b	.	/* prevent speculative execution */

2:

	/* Stack overflow. Stay on emergency stack and panic.
@@ -445,7 +445,7 @@ EXC_COMMON_BEGIN(machine_check_handle_early) 
	li	r3,MSR_ME

	andc	r10,r10,r3		/* Turn off MSR_ME */

	mtspr	SPRN_SRR1,r10

	rfid

	RFI_TO_KERNEL

	b	.

2:

	/*
@@ -463,7 +463,7 @@ EXC_COMMON_BEGIN(machine_check_handle_early) 
	 */

	bl	machine_check_queue_event

	MACHINE_CHECK_HANDLER_WINDUP

	rfid

	RFI_TO_USER_OR_KERNEL

9:

	/* Deliver the machine check to host kernel in V mode. */

	MACHINE_CHECK_HANDLER_WINDUP
@@ -651,7 +651,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) 
	mtspr	SPRN_SRR0,r10

	ld	r10,PACAKMSR(r13)

	mtspr	SPRN_SRR1,r10

	rfid

	RFI_TO_KERNEL

	b	.



8:	std     r3,PACA_EXSLB+EX_DAR(r13)
@@ -662,7 +662,7 @@ END_MMU_FTR_SECTION_IFCLR(MMU_FTR_TYPE_RADIX) 
	mtspr	SPRN_SRR0,r10

	ld	r10,PACAKMSR(r13)

	mtspr	SPRN_SRR1,r10

	rfid

	RFI_TO_KERNEL

	b	.



EXC_COMMON_BEGIN(unrecov_slb)
@@ -901,7 +901,7 @@ EXC_COMMON(trap_0b_common, 0xb00, unknown_exception) 
	mtspr	SPRN_SRR0,r10 ; 				\

	ld	r10,PACAKMSR(r13) ;				\

	mtspr	SPRN_SRR1,r10 ; 				\

	rfid ; 							\

	RFI_TO_KERNEL ;						\

	b	. ;	/* prevent speculative execution */



#ifdef CONFIG_PPC_FAST_ENDIAN_SWITCH
@@ -917,7 +917,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE) \ 
	xori	r12,r12,MSR_LE ;				\

	mtspr	SPRN_SRR1,r12 ;					\

	mr	r13,r9 ;					\

	rfid ;		/* return to userspace */		\

	RFI_TO_USER ;	/* return to userspace */		\

	b	. ;	/* prevent speculative execution */

#else

#define SYSCALL_FASTENDIAN_TEST
@@ -1063,7 +1063,7 @@ TRAMP_REAL_BEGIN(hmi_exception_early) 
	mtcr	r11

	REST_GPR(11, r1)

	ld	r1,GPR1(r1)

	hrfid

	HRFI_TO_USER_OR_KERNEL



1:	mtcr	r11

	REST_GPR(11, r1)
@@ -1314,7 +1314,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) 
	ld	r11,PACA_EXGEN+EX_R11(r13)

	ld	r12,PACA_EXGEN+EX_R12(r13)

	ld	r13,PACA_EXGEN+EX_R13(r13)

	HRFID

	HRFI_TO_UNKNOWN

	b	.

#endif
@@ -1418,7 +1418,7 @@ masked_##_H##interrupt: \ 
	ld	r10,PACA_EXGEN+EX_R10(r13);		\

	ld	r11,PACA_EXGEN+EX_R11(r13);		\

	/* returns to kernel where r13 must be set up, so don't restore it */ \

	##_H##rfid;					\

	##_H##RFI_TO_KERNEL;				\

	b	.;					\

	MASKED_DEC_HANDLER(_H)
@@ -1441,7 +1441,7 @@ TRAMP_REAL_BEGIN(kvmppc_skip_interrupt) 
	addi	r13, r13, 4

	mtspr	SPRN_SRR0, r13

	GET_SCRATCH0(r13)

	rfid

	RFI_TO_KERNEL

	b	.



TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt)
@@ -1453,7 +1453,7 @@ TRAMP_REAL_BEGIN(kvmppc_skip_Hinterrupt) 
	addi	r13, r13, 4

	mtspr	SPRN_HSRR0, r13

	GET_SCRATCH0(r13)

	hrfid

	HRFI_TO_KERNEL

	b	.

#endif

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+4 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ _GLOBAL_TOC(kvmppc_hv_entry_trampoline) 
	mtmsrd	r0,1		/* clear RI in MSR */

	mtsrr0	r5

	mtsrr1	r6

	RFI

	RFI_TO_KERNEL



kvmppc_call_hv_entry:

BEGIN_FTR_SECTION
@@ -199,7 +199,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) 
	mtmsrd	r6, 1			/* Clear RI in MSR */

	mtsrr0	r8

	mtsrr1	r7

	RFI

	RFI_TO_KERNEL



	/* Virtual-mode return */

.Lvirt_return:
@@ -1167,8 +1167,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) 


	ld	r0, VCPU_GPR(R0)(r4)

	ld	r4, VCPU_GPR(R4)(r4)



	hrfid

	HRFI_TO_GUEST

	b	.



secondary_too_late:
@@ -3320,7 +3319,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_TYPE_RADIX) 
	ld	r4, PACAKMSR(r13)

	mtspr	SPRN_SRR0, r3

	mtspr	SPRN_SRR1, r4

	rfid

	RFI_TO_KERNEL

9:	addi	r3, r1, STACK_FRAME_OVERHEAD

	bl	kvmppc_bad_interrupt

	b	9b

arch/powerpc/kvm/book3s_rmhandlers.S

+5 −2
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ 


#define FUNC(name)		name



#define RFI_TO_KERNEL	RFI

#define RFI_TO_GUEST	RFI



.macro INTERRUPT_TRAMPOLINE intno



.global kvmppc_trampoline_\intno
@@ -141,7 +144,7 @@ kvmppc_handler_skip_ins: 
	GET_SCRATCH0(r13)



	/* And get back into the code */

	RFI

	RFI_TO_KERNEL

#endif



/*
@@ -164,6 +167,6 @@ _GLOBAL_TOC(kvmppc_entry_trampoline) 
	ori	r5, r5, MSR_EE

	mtsrr0	r7

	mtsrr1	r6

	RFI

	RFI_TO_KERNEL



#include "book3s_segment.S"