|
@@ -341,10 +341,11 @@ vsx_unavailable_pSeries_1:
|
|
|
EXCEPTION_PROLOG_0(PACA_EXGEN)
|
|
|
b vsx_unavailable_pSeries
|
|
|
|
|
|
+facility_unavailable_trampoline:
|
|
|
. = 0xf60
|
|
|
SET_SCRATCH0(r13)
|
|
|
EXCEPTION_PROLOG_0(PACA_EXGEN)
|
|
|
- b tm_unavailable_pSeries
|
|
|
+ b facility_unavailable_pSeries
|
|
|
|
|
|
#ifdef CONFIG_CBE_RAS
|
|
|
STD_EXCEPTION_HV(0x1200, 0x1202, cbe_system_error)
|
|
@@ -522,7 +523,7 @@ denorm_done:
|
|
|
KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf20)
|
|
|
STD_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
|
|
|
KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf40)
|
|
|
- STD_EXCEPTION_PSERIES_OOL(0xf60, tm_unavailable)
|
|
|
+ STD_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
|
|
|
KVM_HANDLER_PR(PACA_EXGEN, EXC_STD, 0xf60)
|
|
|
|
|
|
/*
|
|
@@ -829,11 +830,11 @@ vsx_unavailable_relon_pSeries_1:
|
|
|
EXCEPTION_PROLOG_0(PACA_EXGEN)
|
|
|
b vsx_unavailable_relon_pSeries
|
|
|
|
|
|
-tm_unavailable_relon_pSeries_1:
|
|
|
+facility_unavailable_relon_trampoline:
|
|
|
. = 0x4f60
|
|
|
SET_SCRATCH0(r13)
|
|
|
EXCEPTION_PROLOG_0(PACA_EXGEN)
|
|
|
- b tm_unavailable_relon_pSeries
|
|
|
+ b facility_unavailable_relon_pSeries
|
|
|
|
|
|
STD_RELON_EXCEPTION_PSERIES(0x5300, 0x1300, instruction_breakpoint)
|
|
|
#ifdef CONFIG_PPC_DENORMALISATION
|
|
@@ -1159,15 +1160,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_VSX)
|
|
|
bl .vsx_unavailable_exception
|
|
|
b .ret_from_except
|
|
|
|
|
|
- .align 7
|
|
|
- .globl tm_unavailable_common
|
|
|
-tm_unavailable_common:
|
|
|
- EXCEPTION_PROLOG_COMMON(0xf60, PACA_EXGEN)
|
|
|
- bl .save_nvgprs
|
|
|
- DISABLE_INTS
|
|
|
- addi r3,r1,STACK_FRAME_OVERHEAD
|
|
|
- bl .tm_unavailable_exception
|
|
|
- b .ret_from_except
|
|
|
+ STD_EXCEPTION_COMMON(0xf60, facility_unavailable, .facility_unavailable_exception)
|
|
|
|
|
|
.align 7
|
|
|
.globl __end_handlers
|
|
@@ -1180,7 +1173,7 @@ __end_handlers:
|
|
|
STD_RELON_EXCEPTION_PSERIES_OOL(0xf00, performance_monitor)
|
|
|
STD_RELON_EXCEPTION_PSERIES_OOL(0xf20, altivec_unavailable)
|
|
|
STD_RELON_EXCEPTION_PSERIES_OOL(0xf40, vsx_unavailable)
|
|
|
- STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, tm_unavailable)
|
|
|
+ STD_RELON_EXCEPTION_PSERIES_OOL(0xf60, facility_unavailable)
|
|
|
|
|
|
#if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV)
|
|
|
/*
|