Commit 0a55c241 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/64s: Remove PSERIES naming from the MASKABLE macros 



Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6adc6e9c

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

+10 −14
Original line number Diff line number Diff line
@@ -623,45 +623,41 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
#define SOFTEN_NOTEST_PR(vec, bitmask)	_SOFTEN_TEST(EXC_STD, vec, bitmask)

#define SOFTEN_NOTEST_HV(vec, bitmask)	_SOFTEN_TEST(EXC_HV, vec, bitmask)



#define __MASKABLE_EXCEPTION_PSERIES(vec, label, h, extra, bitmask)	\

#define __MASKABLE_EXCEPTION(vec, label, h, extra, bitmask)		\

	SET_SCRATCH0(r13);    /* save r13 */				\

	EXCEPTION_PROLOG_0(PACA_EXGEN);					\

	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, extra, vec, bitmask);	\

	EXCEPTION_PROLOG_2(label, h);



#define MASKABLE_EXCEPTION_PSERIES(loc, vec, label, bitmask)		\

	__MASKABLE_EXCEPTION_PSERIES(vec, label,			\

				     EXC_STD, SOFTEN_TEST_PR, bitmask)

#define MASKABLE_EXCEPTION(loc, vec, label, bitmask)			\

	__MASKABLE_EXCEPTION(vec, label, EXC_STD, SOFTEN_TEST_PR, bitmask)



#define MASKABLE_EXCEPTION_PSERIES_OOL(vec, label, bitmask)		\

#define MASKABLE_EXCEPTION_OOL(vec, label, bitmask)			\

	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_PR, vec, bitmask);\

	EXCEPTION_PROLOG_2(label, EXC_STD)



#define MASKABLE_EXCEPTION_HV(loc, vec, label, bitmask)			\

	__MASKABLE_EXCEPTION_PSERIES(vec, label,			\

				     EXC_HV, SOFTEN_TEST_HV, bitmask)

	__MASKABLE_EXCEPTION(vec, label, EXC_HV, SOFTEN_TEST_HV, bitmask)



#define MASKABLE_EXCEPTION_HV_OOL(vec, label, bitmask)			\

	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec, bitmask);\

	EXCEPTION_PROLOG_2(label, EXC_HV)



#define __MASKABLE_RELON_EXCEPTION_PSERIES(vec, label, h, extra, bitmask) \

#define __MASKABLE_RELON_EXCEPTION(vec, label, h, extra, bitmask)	\

	SET_SCRATCH0(r13);    /* save r13 */				\

	EXCEPTION_PROLOG_0(PACA_EXGEN);					\

	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, extra, vec, bitmask);	\

	EXCEPTION_PROLOG_2_RELON(label, h)



#define MASKABLE_RELON_EXCEPTION_PSERIES(loc, vec, label, bitmask)	\

	__MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\

					   EXC_STD, SOFTEN_NOTEST_PR, bitmask)

#define MASKABLE_RELON_EXCEPTION(loc, vec, label, bitmask)		\

	__MASKABLE_RELON_EXCEPTION(vec, label, EXC_STD, SOFTEN_NOTEST_PR, bitmask)



#define MASKABLE_RELON_EXCEPTION_PSERIES_OOL(vec, label, bitmask)	\

#define MASKABLE_RELON_EXCEPTION_OOL(vec, label, bitmask)		\

	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_NOTEST_PR, vec, bitmask);\

	EXCEPTION_PROLOG_2(label, EXC_STD);



#define MASKABLE_RELON_EXCEPTION_HV(loc, vec, label, bitmask)		\

	__MASKABLE_RELON_EXCEPTION_PSERIES(vec, label,			\

					   EXC_HV, SOFTEN_TEST_HV, bitmask)

	__MASKABLE_RELON_EXCEPTION(vec, label, EXC_HV, SOFTEN_TEST_HV, bitmask)



#define MASKABLE_RELON_EXCEPTION_HV_OOL(vec, label, bitmask)		\

	MASKABLE_EXCEPTION_PROLOG_1(PACA_EXGEN, SOFTEN_TEST_HV, vec, bitmask);\

arch/powerpc/include/asm/head-64.h

+4 −4
Original line number Diff line number Diff line
@@ -270,12 +270,12 @@ end_##sname: 


#define EXC_REAL_MASKABLE(name, start, size, bitmask)			\

	EXC_REAL_BEGIN(name, start, size);				\

	MASKABLE_EXCEPTION_PSERIES(start, start, name##_common, bitmask);\

	MASKABLE_EXCEPTION(start, start, name##_common, bitmask);	\

	EXC_REAL_END(name, start, size);



#define EXC_VIRT_MASKABLE(name, start, size, realvec, bitmask)		\

	EXC_VIRT_BEGIN(name, start, size);				\

	MASKABLE_RELON_EXCEPTION_PSERIES(start, realvec, name##_common, bitmask);\

	MASKABLE_RELON_EXCEPTION(start, realvec, name##_common, bitmask);\

	EXC_VIRT_END(name, start, size);



#define EXC_REAL_HV(name, start, size)					\
@@ -306,7 +306,7 @@ end_##sname: 


#define __TRAMP_REAL_OOL_MASKABLE(name, vec, bitmask)			\

	TRAMP_REAL_BEGIN(tramp_real_##name);				\

	MASKABLE_EXCEPTION_PSERIES_OOL(vec, name##_common, bitmask);	\

	MASKABLE_EXCEPTION_OOL(vec, name##_common, bitmask);



#define EXC_REAL_OOL_MASKABLE(name, start, size, bitmask)		\

	__EXC_REAL_OOL_MASKABLE(name, start, size);			\
@@ -357,7 +357,7 @@ end_##sname: 


#define __TRAMP_VIRT_OOL_MASKABLE(name, realvec, bitmask)		\

	TRAMP_VIRT_BEGIN(tramp_virt_##name);				\

	MASKABLE_RELON_EXCEPTION_PSERIES_OOL(realvec, name##_common, bitmask);\

	MASKABLE_RELON_EXCEPTION_OOL(realvec, name##_common, bitmask);



#define EXC_VIRT_OOL_MASKABLE(name, start, size, realvec, bitmask)	\

	__EXC_VIRT_OOL_MASKABLE(name, start, size);			\

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

+4 −4
Original line number Diff line number Diff line
@@ -768,11 +768,11 @@ EXC_REAL_BEGIN(hardware_interrupt, 0x500, 0x100) 
	.globl hardware_interrupt_hv;

hardware_interrupt_hv:

	BEGIN_FTR_SECTION

		__MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

		__MASKABLE_EXCEPTION(0x500, hardware_interrupt_common,

					    EXC_HV, SOFTEN_TEST_HV,

					    IRQS_DISABLED)

	FTR_SECTION_ELSE

		__MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

		__MASKABLE_EXCEPTION(0x500, hardware_interrupt_common,

					    EXC_STD, SOFTEN_TEST_PR,

					    IRQS_DISABLED)

	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE | CPU_FTR_ARCH_206)
@@ -782,11 +782,11 @@ EXC_VIRT_BEGIN(hardware_interrupt, 0x4500, 0x100) 
	.globl hardware_interrupt_relon_hv;

hardware_interrupt_relon_hv:

	BEGIN_FTR_SECTION

		__MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

		__MASKABLE_RELON_EXCEPTION(0x500, hardware_interrupt_common,

						  EXC_HV, SOFTEN_TEST_HV,

						  IRQS_DISABLED)

	FTR_SECTION_ELSE

		__MASKABLE_RELON_EXCEPTION_PSERIES(0x500, hardware_interrupt_common,

		__MASKABLE_RELON_EXCEPTION(0x500, hardware_interrupt_common,

						  EXC_STD, SOFTEN_TEST_PR,

						  IRQS_DISABLED)

	ALT_FTR_SECTION_END_IFSET(CPU_FTR_HVMODE)