p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

powerpc/64s: Remove PSERIES from the NORI macros 

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Michael Ellerman 2018-07-26 23:07:09 +10:00
parent cb58a4a4b3
commit 94f3cc8e36
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/exception-64s.h
View File

@ -330,7 +330,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
__EXCEPTION_PROLOG_2(label, h) __EXCEPTION_PROLOG_2(label, h)
/* _NORI variant keeps MSR_RI clear */ /* _NORI variant keeps MSR_RI clear */
#define __EXCEPTION_PROLOG_PSERIES_1_NORI(label, h) \ #define __EXCEPTION_PROLOG_2_NORI(label, h) \
ld r10,PACAKMSR(r13); /* get MSR value for kernel */ \ ld r10,PACAKMSR(r13); /* get MSR value for kernel */ \
xori r10,r10,MSR_RI; /* Clear MSR_RI */ \ xori r10,r10,MSR_RI; /* Clear MSR_RI */ \
mfspr r11,SPRN_##h##SRR0; /* save SRR0 */ \ mfspr r11,SPRN_##h##SRR0; /* save SRR0 */ \
@ -341,8 +341,8 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
h##RFI_TO_KERNEL; \ h##RFI_TO_KERNEL; \
b . /* prevent speculative execution */ b . /* prevent speculative execution */
#define EXCEPTION_PROLOG_PSERIES_1_NORI(label, h) \ #define EXCEPTION_PROLOG_2_NORI(label, h) \
__EXCEPTION_PROLOG_PSERIES_1_NORI(label, h) __EXCEPTION_PROLOG_2_NORI(label, h)
#define EXCEPTION_PROLOG_PSERIES(area, label, h, extra, vec) \ #define EXCEPTION_PROLOG_PSERIES(area, label, h, extra, vec) \
SET_SCRATCH0(r13); /* save r13 */ \ SET_SCRATCH0(r13); /* save r13 */ \
@ -419,10 +419,10 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
#endif #endif
/* Do not enable RI */ /* Do not enable RI */
#define EXCEPTION_PROLOG_PSERIES_NORI(area, label, h, extra, vec) \ #define EXCEPTION_PROLOG_NORI(area, label, h, extra, vec) \
EXCEPTION_PROLOG_0(area); \ EXCEPTION_PROLOG_0(area); \
EXCEPTION_PROLOG_1(area, extra, vec); \ EXCEPTION_PROLOG_1(area, extra, vec); \
EXCEPTION_PROLOG_PSERIES_1_NORI(label, h); EXCEPTION_PROLOG_2_NORI(label, h);
#define __KVM_HANDLER(area, h, n) \ #define __KVM_HANDLER(area, h, n) \

8
arch/powerpc/kernel/exceptions-64s.S
View File

@ -127,7 +127,7 @@ EXC_REAL_BEGIN(system_reset, 0x100, 0x100)
* MSR_RI is not enabled, because PACA_EXNMI and nmi stack is * MSR_RI is not enabled, because PACA_EXNMI and nmi stack is
* being used, so a nested NMI exception would corrupt it. * being used, so a nested NMI exception would corrupt it.
*/ */
EXCEPTION_PROLOG_PSERIES_NORI(PACA_EXNMI, system_reset_common, EXC_STD, EXCEPTION_PROLOG_NORI(PACA_EXNMI, system_reset_common, EXC_STD,
IDLETEST, 0x100) IDLETEST, 0x100)
EXC_REAL_END(system_reset, 0x100, 0x100) EXC_REAL_END(system_reset, 0x100, 0x100)
@ -231,8 +231,8 @@ EXC_COMMON_BEGIN(system_reset_common)
TRAMP_REAL_BEGIN(system_reset_fwnmi) TRAMP_REAL_BEGIN(system_reset_fwnmi)
SET_SCRATCH0(r13) /* save r13 */ SET_SCRATCH0(r13) /* save r13 */
/* See comment at system_reset exception */ /* See comment at system_reset exception */
EXCEPTION_PROLOG_PSERIES_NORI(PACA_EXNMI, system_reset_common, EXCEPTION_PROLOG_NORI(PACA_EXNMI, system_reset_common, EXC_STD,
EXC_STD, NOTEST, 0x100) NOTEST, 0x100)
#endif /* CONFIG_PPC_PSERIES */ #endif /* CONFIG_PPC_PSERIES */
@ -338,7 +338,7 @@ machine_check_pSeries_0:
* nested machine check corrupts it. machine_check_common enables * nested machine check corrupts it. machine_check_common enables
* MSR_RI. * MSR_RI.
*/ */
EXCEPTION_PROLOG_PSERIES_1_NORI(machine_check_common, EXC_STD) EXCEPTION_PROLOG_2_NORI(machine_check_common, EXC_STD)
TRAMP_KVM_SKIP(PACA_EXMC, 0x200) TRAMP_KVM_SKIP(PACA_EXMC, 0x200)