diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2016-09-21 07:43:38 (GMT) |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-10-04 02:07:01 (GMT) |
| commit | 11e87346b9b885f3b088efb6afda604e91233026 (patch) | |
| tree | d69ecc64a0564766d20a99657b800a93c0bf7c96 /arch | |
| parent | f9aa67142ef2697990d1f36aa3d59320820bcfae (diff) | |
| download | linux-11e87346b9b885f3b088efb6afda604e91233026.tar.xz | |
powerpc/64s: Consolidate Program 0x700 interrupt
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64s.S | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index debd024..1df0283 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -792,8 +792,16 @@ EXC_COMMON_BEGIN(alignment_common) EXC_REAL(program_check, 0x700, 0x800) - +EXC_VIRT(program_check, 0x4700, 0x4800, 0x700) TRAMP_KVM(PACA_EXGEN, 0x700) +EXC_COMMON_BEGIN(program_check_common) + EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) + bl save_nvgprs + RECONCILE_IRQ_STATE(r10, r11) + addi r3,r1,STACK_FRAME_OVERHEAD + bl program_check_exception + b ret_from_except + EXC_REAL(fp_unavailable, 0x800, 0x900) @@ -1197,7 +1205,6 @@ EXC_COMMON(altivec_assist_common, 0x1700, unknown_exception) * come here. */ -EXC_VIRT(program_check, 0x4700, 0x4800, 0x700) EXC_VIRT(fp_unavailable, 0x4800, 0x4900, 0x800) EXC_VIRT_MASKABLE(decrementer, 0x4900, 0x4980, 0x900) EXC_VIRT_HV(hdecrementer, 0x4980, 0x4a00, 0x980) @@ -1281,14 +1288,6 @@ EXC_COMMON_BEGIN(h_data_storage_common) EXC_COMMON(h_instr_storage_common, 0xe20, unknown_exception) -EXC_COMMON_BEGIN(program_check_common) - EXCEPTION_PROLOG_COMMON(0x700, PACA_EXGEN) - bl save_nvgprs - RECONCILE_IRQ_STATE(r10, r11) - addi r3,r1,STACK_FRAME_OVERHEAD - bl program_check_exception - b ret_from_except - EXC_COMMON_BEGIN(fp_unavailable_common) EXCEPTION_PROLOG_COMMON(0x800, PACA_EXGEN) bne 1f /* if from user, just load it up */ |