powerpc/64s: Consolidate VSX Unavailable 0xf40 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>hifive-unleashed-5.1
parent
d1a0ca9c8b
commit
792cbddd62
|
@ -1074,6 +1074,42 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
|
||||||
|
|
||||||
|
|
||||||
__EXC_REAL_OOL(vsx_unavailable, 0xf40, 0xf60)
|
__EXC_REAL_OOL(vsx_unavailable, 0xf40, 0xf60)
|
||||||
|
__TRAMP_REAL_REAL_OOL(vsx_unavailable, 0xf40)
|
||||||
|
__EXC_VIRT_OOL(vsx_unavailable, 0x4f40, 0x4f60)
|
||||||
|
__TRAMP_REAL_VIRT_OOL(vsx_unavailable, 0xf40)
|
||||||
|
TRAMP_KVM(PACA_EXGEN, 0xf40)
|
||||||
|
EXC_COMMON_BEGIN(vsx_unavailable_common)
|
||||||
|
EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
|
||||||
|
#ifdef CONFIG_VSX
|
||||||
|
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
|
||||||
|
b load_up_vsx
|
||||||
|
#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 vsx_unavailable_tm
|
||||||
|
b ret_from_except
|
||||||
|
#endif
|
||||||
|
1:
|
||||||
|
END_FTR_SECTION_IFSET(CPU_FTR_VSX)
|
||||||
|
#endif
|
||||||
|
bl save_nvgprs
|
||||||
|
RECONCILE_IRQ_STATE(r10, r11)
|
||||||
|
addi r3,r1,STACK_FRAME_OVERHEAD
|
||||||
|
bl vsx_unavailable_exception
|
||||||
|
b ret_from_except
|
||||||
|
|
||||||
|
|
||||||
__EXC_REAL_OOL(facility_unavailable, 0xf60, 0xf80)
|
__EXC_REAL_OOL(facility_unavailable, 0xf60, 0xf80)
|
||||||
|
|
||||||
|
@ -1205,9 +1241,6 @@ END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* moved from 0xf00 */
|
/* moved from 0xf00 */
|
||||||
__TRAMP_REAL_REAL_OOL(vsx_unavailable, 0xf40)
|
|
||||||
TRAMP_KVM(PACA_EXGEN, 0xf40)
|
|
||||||
|
|
||||||
__TRAMP_REAL_REAL_OOL(facility_unavailable, 0xf60)
|
__TRAMP_REAL_REAL_OOL(facility_unavailable, 0xf60)
|
||||||
TRAMP_KVM(PACA_EXGEN, 0xf60)
|
TRAMP_KVM(PACA_EXGEN, 0xf60)
|
||||||
|
|
||||||
|
@ -1358,8 +1391,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception)
|
||||||
* come here.
|
* come here.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
__EXC_VIRT_OOL(vsx_unavailable, 0x4f40, 0x4f60)
|
|
||||||
|
|
||||||
__EXC_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80)
|
__EXC_VIRT_OOL(facility_unavailable, 0x4f60, 0x4f80)
|
||||||
|
|
||||||
__EXC_VIRT_OOL_HV(h_facility_unavailable, 0x4f80, 0x4fa0)
|
__EXC_VIRT_OOL_HV(h_facility_unavailable, 0x4f80, 0x4fa0)
|
||||||
|
@ -1387,40 +1418,7 @@ EXC_VIRT_NONE(0x5800, 0x5900)
|
||||||
EXC_COMMON_BEGIN(ppc64_runlatch_on_trampoline)
|
EXC_COMMON_BEGIN(ppc64_runlatch_on_trampoline)
|
||||||
b __ppc64_runlatch_on
|
b __ppc64_runlatch_on
|
||||||
|
|
||||||
EXC_COMMON_BEGIN(vsx_unavailable_common)
|
|
||||||
EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
|
|
||||||
#ifdef CONFIG_VSX
|
|
||||||
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
|
|
||||||
b load_up_vsx
|
|
||||||
#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 vsx_unavailable_tm
|
|
||||||
b ret_from_except
|
|
||||||
#endif
|
|
||||||
1:
|
|
||||||
END_FTR_SECTION_IFSET(CPU_FTR_VSX)
|
|
||||||
#endif
|
|
||||||
bl save_nvgprs
|
|
||||||
RECONCILE_IRQ_STATE(r10, r11)
|
|
||||||
addi r3,r1,STACK_FRAME_OVERHEAD
|
|
||||||
bl vsx_unavailable_exception
|
|
||||||
b ret_from_except
|
|
||||||
|
|
||||||
/* Equivalents to the above handlers for relocation-on interrupt vectors */
|
/* Equivalents to the above handlers for relocation-on interrupt vectors */
|
||||||
__TRAMP_REAL_VIRT_OOL(vsx_unavailable, 0xf40)
|
|
||||||
__TRAMP_REAL_VIRT_OOL(facility_unavailable, 0xf60)
|
__TRAMP_REAL_VIRT_OOL(facility_unavailable, 0xf60)
|
||||||
__TRAMP_REAL_VIRT_OOL_HV(h_facility_unavailable, 0xf80)
|
__TRAMP_REAL_VIRT_OOL_HV(h_facility_unavailable, 0xf80)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue