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

Commit de021bb7 authored by Tiejun Chen's avatar Tiejun Chen Committed by Benjamin Herrenschmidt
Browse files

powerpc/ppc64: Rename SOFT_DISABLE_INTS with RECONCILE_IRQ_STATE 



The SOFT_DISABLE_INTS seems an odd name for something that updates the
software state to be consistent with interrupts being hard disabled, so
rename SOFT_DISABLE_INTS with RECONCILE_IRQ_STATE to avoid this confusion.

Signed-off-by: default avatarTiejun Chen <tiejun.chen@windriver.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7033b64b

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

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ label##_relon_hv: \ 
 */



/* Exception addition: Hard disable interrupts */

#define DISABLE_INTS	SOFT_DISABLE_INTS(r10,r11)

#define DISABLE_INTS	RECONCILE_IRQ_STATE(r10,r11)



#define ADD_NVGPRS				\

	bl	.save_nvgprs

arch/powerpc/include/asm/irqflags.h

+4 −3
Original line number Diff line number Diff line
@@ -40,9 +40,10 @@ 
#define TRACE_DISABLE_INTS	TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_off)



/*

 * This is used by assembly code to soft-disable interrupts

 * This is used by assembly code to soft-disable interrupts first and

 * reconcile irq state.

 */

#define SOFT_DISABLE_INTS(__rA, __rB)		\

#define RECONCILE_IRQ_STATE(__rA, __rB)		\

	lbz	__rA,PACASOFTIRQEN(r13);	\

	lbz	__rB,PACAIRQHAPPENED(r13);	\

	cmpwi	cr0,__rA,0;			\
@@ -58,7 +59,7 @@ 
#define TRACE_ENABLE_INTS

#define TRACE_DISABLE_INTS



#define SOFT_DISABLE_INTS(__rA, __rB)		\

#define RECONCILE_IRQ_STATE(__rA, __rB)		\

	lbz	__rA,PACAIRQHAPPENED(r13);	\

	li	__rB,0;				\

	ori	__rA,__rA,PACA_IRQ_HARD_DIS;	\

arch/powerpc/kernel/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -721,9 +721,9 @@ resume_kernel: 


	/*

	 * Here we are preempting the current task. We want to make

	 * sure we are soft-disabled first

	 * sure we are soft-disabled first and reconcile irq state.

	 */

	SOFT_DISABLE_INTS(r3,r4)

	RECONCILE_IRQ_STATE(r3,r4)

1:	bl	.preempt_schedule_irq



	/* Re-test flags and eventually loop */

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

+2 −2
Original line number Diff line number Diff line
@@ -198,9 +198,9 @@ exc_##n##_common: \ 
/* This second version is meant for exceptions that don't immediately

 * hard-enable. We set a bit in paca->irq_happened to ensure that

 * a subsequent call to arch_local_irq_restore() will properly

 * hard-enable and avoid the fast-path

 * hard-enable and avoid the fast-path, and then reconcile irq state.

 */

#define INTS_DISABLE	SOFT_DISABLE_INTS(r3,r4)

#define INTS_DISABLE	RECONCILE_IRQ_STATE(r3,r4)



/* This is called by exceptions that used INTS_KEEP (that did not touch

 * irq indicators in the PACA). This will restore MSR:EE to it's previous