Signed-off-by: Nicholas Piggin <npig...@gmail.com> --- arch/powerpc/kernel/exceptions-64s.S | 77 ++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 39 deletions(-)
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 480c28c..f517744 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -1032,6 +1032,44 @@ COMMON_HANDLER_ASYNC(performance_monitor_common, 0xf00, performance_monitor_exce __VECTOR_HANDLER_REAL_OOL(altivec_unavailable, 0xf20, 0xf40) +__TRAMP_HANDLER_REAL_OOL(altivec_unavailable, 0xf20) +__VECTOR_HANDLER_VIRT_OOL(altivec_unavailable, 0x4f20, 0x4f40) +__TRAMP_HANDLER_VIRT_OOL(altivec_unavailable, 0xf20) +TRAMP_KVM(PACA_EXGEN, 0xf20) +COMMON_HANDLER_BEGIN(altivec_unavailable_common) + EXCEPTION_PROLOG_COMMON(0xf20, PACA_EXGEN) +#ifdef CONFIG_ALTIVEC +BEGIN_FTR_SECTION + beq 1f +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM + BEGIN_FTR_SECTION_NESTED(69) + /* Test if 2 TM state bits are zero. If non-zero (ie. userspace was in + * transaction), go do TM stuff + */ + rldicl. r0, r12, (64-MSR_TS_LG), (64-2) + bne- 2f + END_FTR_SECTION_NESTED(CPU_FTR_TM, CPU_FTR_TM, 69) +#endif + bl load_up_altivec + b fast_exception_return +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM +2: /* User process was in a transaction */ + bl save_nvgprs + RECONCILE_IRQ_STATE(r10, r11) + addi r3,r1,STACK_FRAME_OVERHEAD + bl altivec_unavailable_tm + b ret_from_except +#endif +1: +END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) +#endif + bl save_nvgprs + RECONCILE_IRQ_STATE(r10, r11) + addi r3,r1,STACK_FRAME_OVERHEAD + bl altivec_unavailable_exception + b ret_from_except +COMMON_HANDLER_END(altivec_unavailable_common) + __VECTOR_HANDLER_REAL_OOL(vsx_unavailable, 0xf40, 0xf60) @@ -1167,9 +1205,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR) TRAMP_HANDLER_END(denorm_assist) /* moved from 0xf00 */ -__TRAMP_HANDLER_REAL_OOL(altivec_unavailable, 0xf20) -TRAMP_KVM(PACA_EXGEN, 0xf20) - __TRAMP_HANDLER_REAL_OOL(vsx_unavailable, 0xf40) TRAMP_KVM(PACA_EXGEN, 0xf40) @@ -1333,7 +1368,6 @@ COMMON_HANDLER(altivec_assist_common, 0x1700, unknown_exception) -__VECTOR_HANDLER_VIRT_OOL(altivec_unavailable, 0x4f20, 0x4f40) __VECTOR_HANDLER_VIRT_OOL(vsx_unavailable, 0x4f40, 0x4f60) @@ -1365,40 +1399,6 @@ TRAMP_HANDLER_BEGIN(ppc64_runlatch_on_trampoline) b __ppc64_runlatch_on TRAMP_HANDLER_END(ppc64_runlatch_on_trampoline) -COMMON_HANDLER_BEGIN(altivec_unavailable_common) - EXCEPTION_PROLOG_COMMON(0xf20, PACA_EXGEN) -#ifdef CONFIG_ALTIVEC -BEGIN_FTR_SECTION - beq 1f -#ifdef CONFIG_PPC_TRANSACTIONAL_MEM - BEGIN_FTR_SECTION_NESTED(69) - /* Test if 2 TM state bits are zero. If non-zero (ie. userspace was in - * transaction), go do TM stuff - */ - rldicl. r0, r12, (64-MSR_TS_LG), (64-2) - bne- 2f - END_FTR_SECTION_NESTED(CPU_FTR_TM, CPU_FTR_TM, 69) -#endif - bl load_up_altivec - b fast_exception_return -#ifdef CONFIG_PPC_TRANSACTIONAL_MEM -2: /* User process was in a transaction */ - bl save_nvgprs - RECONCILE_IRQ_STATE(r10, r11) - addi r3,r1,STACK_FRAME_OVERHEAD - bl altivec_unavailable_tm - b ret_from_except -#endif -1: -END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC) -#endif - bl save_nvgprs - RECONCILE_IRQ_STATE(r10, r11) - addi r3,r1,STACK_FRAME_OVERHEAD - bl altivec_unavailable_exception - b ret_from_except -COMMON_HANDLER_END(altivec_unavailable_common) - COMMON_HANDLER_BEGIN(vsx_unavailable_common) EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN) #ifdef CONFIG_VSX @@ -1433,7 +1433,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX) COMMON_HANDLER_END(vsx_unavailable_common) /* Equivalents to the above handlers for relocation-on interrupt vectors */ -__TRAMP_HANDLER_VIRT_OOL(altivec_unavailable, 0xf20) __TRAMP_HANDLER_VIRT_OOL(vsx_unavailable, 0xf40) __TRAMP_HANDLER_VIRT_OOL(facility_unavailable, 0xf60) __TRAMP_HANDLER_VIRT_OOL_HV(h_facility_unavailable, 0xf80) -- 2.9.3