Commit 75b96950 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc/64s: reconcile interrupts in C 



There is no need for this to be in asm, use the new intrrupt entry wrapper.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-37-npiggin@gmail.com
parent f821bc97

arch/powerpc/include/asm/interrupt.h

+11 −4
Original line number Diff line number Diff line
@@ -14,11 +14,14 @@ struct interrupt_state { 


static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrupt_state *state)

{

#ifdef CONFIG_PPC_BOOK3E_64

	state->ctx_state = exception_enter();

#endif



	/*

	 * Book3E reconciles irq soft mask in asm

	 */

#ifdef CONFIG_PPC_BOOK3S_64

	if (irq_soft_mask_set_return(IRQS_ALL_DISABLED) == IRQS_ENABLED)

		trace_hardirqs_off();

	local_paca->irq_happened |= PACA_IRQ_HARD_DIS;



	if (user_mode(regs)) {

		CT_WARN_ON(ct_state() != CONTEXT_USER);

		user_exit_irqoff();
@@ -31,6 +34,10 @@ static inline void interrupt_enter_prepare(struct pt_regs *regs, struct interrup 
			CT_WARN_ON(ct_state() != CONTEXT_KERNEL);

	}

#endif



#ifdef CONFIG_PPC_BOOK3E_64

	state->ctx_state = exception_enter();

#endif

}



/*

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

+0 −26
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ name: 
#define IKVM_VIRT	.L_IKVM_VIRT_\name\()	/* Virt entry tests KVM */

#define ISTACK		.L_ISTACK_\name\()	/* Set regular kernel stack */

#define __ISTACK(name)	.L_ISTACK_ ## name

#define IRECONCILE	.L_IRECONCILE_\name\()	/* Do RECONCILE_IRQ_STATE */

#define IKUAP		.L_IKUAP_\name\()	/* Do KUAP lock */



#define INT_DEFINE_BEGIN(n)						\
@@ -203,9 +202,6 @@ do_define_int n 
	.ifndef ISTACK

		ISTACK=1

	.endif

	.ifndef IRECONCILE

		IRECONCILE=1

	.endif

	.ifndef IKUAP

		IKUAP=1

	.endif
@@ -653,10 +649,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) 
	.if ISTACK

	ACCOUNT_STOLEN_TIME

	.endif



	.if IRECONCILE

	RECONCILE_IRQ_STATE(r10, r11)

	.endif

.endm



/*
@@ -935,7 +927,6 @@ INT_DEFINE_BEGIN(system_reset) 
	 */

	ISET_RI=0

	ISTACK=0

	IRECONCILE=0

	IKVM_REAL=1

INT_DEFINE_END(system_reset)
@@ -1123,7 +1114,6 @@ INT_DEFINE_BEGIN(machine_check_early) 
	ISTACK=0

	IDAR=1

	IDSISR=1

	IRECONCILE=0

	IKUAP=0 /* We don't touch AMR here, we never go to virtual mode */

INT_DEFINE_END(machine_check_early)
@@ -1483,7 +1473,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) 
INT_DEFINE_BEGIN(data_access_slb)

	IVEC=0x380

	IAREA=PACA_EXSLB

	IRECONCILE=0

	IDAR=1

	IKVM_SKIP=1

	IKVM_REAL=1
@@ -1510,7 +1499,6 @@ MMU_FTR_SECTION_ELSE 
	li	r3,-EFAULT

ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)

	std	r3,RESULT(r1)

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_bad_slb_fault

	b	interrupt_return
@@ -1568,7 +1556,6 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) 
INT_DEFINE_BEGIN(instruction_access_slb)

	IVEC=0x480

	IAREA=PACA_EXSLB

	IRECONCILE=0

	IISIDE=1

	IDAR=1

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE
@@ -1597,7 +1584,6 @@ MMU_FTR_SECTION_ELSE 
	li	r3,-EFAULT

ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX)

	std	r3,RESULT(r1)

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	do_bad_slb_fault

	b	interrupt_return
@@ -1757,7 +1743,6 @@ EXC_COMMON_BEGIN(program_check_common) 
 */

INT_DEFINE_BEGIN(fp_unavailable)

	IVEC=0x800

	IRECONCILE=0

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	IKVM_REAL=1

#endif
@@ -1772,7 +1757,6 @@ EXC_VIRT_END(fp_unavailable, 0x4800, 0x100) 
EXC_COMMON_BEGIN(fp_unavailable_common)

	GEN_COMMON fp_unavailable

	bne	1f			/* if from user, just load it up */

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	kernel_fp_unavailable_exception

0:	trap
@@ -1791,7 +1775,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_TM) 
	b	fast_interrupt_return

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

2:	/* User process was in a transaction */

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	fp_unavailable_tm

	b	interrupt_return
@@ -1856,7 +1839,6 @@ INT_DEFINE_BEGIN(hdecrementer) 
	IVEC=0x980

	IHSRR=1

	ISTACK=0

	IRECONCILE=0

	IKVM_REAL=1

	IKVM_VIRT=1

INT_DEFINE_END(hdecrementer)
@@ -2230,7 +2212,6 @@ INT_DEFINE_BEGIN(hmi_exception_early) 
	IHSRR=1

	IREALMODE_COMMON=1

	ISTACK=0

	IRECONCILE=0

	IKUAP=0 /* We don't touch AMR here, we never go to virtual mode */

	IKVM_REAL=1

INT_DEFINE_END(hmi_exception_early)
@@ -2404,7 +2385,6 @@ EXC_COMMON_BEGIN(performance_monitor_common) 
 */

INT_DEFINE_BEGIN(altivec_unavailable)

	IVEC=0xf20

	IRECONCILE=0

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	IKVM_REAL=1

#endif
@@ -2434,7 +2414,6 @@ BEGIN_FTR_SECTION 
	b	fast_interrupt_return

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

2:	/* User process was in a transaction */

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	altivec_unavailable_tm

	b	interrupt_return
@@ -2442,7 +2421,6 @@ BEGIN_FTR_SECTION 
1:

END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)

#endif

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	altivec_unavailable_exception

	b	interrupt_return
@@ -2458,7 +2436,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) 
 */

INT_DEFINE_BEGIN(vsx_unavailable)

	IVEC=0xf40

	IRECONCILE=0

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	IKVM_REAL=1

#endif
@@ -2487,7 +2464,6 @@ BEGIN_FTR_SECTION 
	b	load_up_vsx

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

2:	/* User process was in a transaction */

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	vsx_unavailable_tm

	b	interrupt_return
@@ -2495,7 +2471,6 @@ BEGIN_FTR_SECTION 
1:

END_FTR_SECTION_IFSET(CPU_FTR_VSX)

#endif

	RECONCILE_IRQ_STATE(r10, r11)

	addi	r3,r1,STACK_FRAME_OVERHEAD

	bl	vsx_unavailable_exception

	b	interrupt_return
@@ -2830,7 +2805,6 @@ EXC_VIRT_NONE(0x5800, 0x100) 
INT_DEFINE_BEGIN(soft_nmi)

	IVEC=0x900

	ISTACK=0

	IRECONCILE=0	/* Soft-NMI may fire under local_irq_disable */

INT_DEFINE_END(soft_nmi)



/*