powerpc/booke64: Fix exception numbers

altivec_unavailable was commented as 0xf20 but the code uses 0x200.
Note that 0xf20 is also used by ap_unavailable.

altivec_assist was commented as 0x1700 but the code uses 0x220.

critical_input was commented as 0x580 but the code uses 0x100.

machine_check was commented and implemented as 0x200, which conflicts
with altivec_assist (it only builds because MC_EXCEPTION_PROLOG is
commented out).  Changed to the fixed IVOR value of 0x000.

Signed-off-by: Scott Wood <scottwood@freescale.com>

diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 6772512bd0bd34f43bdc29ee760ce49b12e12d12..41380a424108895918b1e2e8d8581046bf6ec0e8 100644 (file)
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -299,8 +299,8 @@ exception_marker:
        .balign 0x1000
        .globl interrupt_base_book3e
 interrupt_base_book3e:                                 /* fake trap */
-       EXCEPTION_STUB(0x000, machine_check)            /* 0x0200 */
-       EXCEPTION_STUB(0x020, critical_input)           /* 0x0580 */
+       EXCEPTION_STUB(0x000, machine_check)
+       EXCEPTION_STUB(0x020, critical_input)           /* 0x0100 */
        EXCEPTION_STUB(0x040, debug_crit)               /* 0x0d00 */
        EXCEPTION_STUB(0x060, data_storage)             /* 0x0300 */
        EXCEPTION_STUB(0x080, instruction_storage)      /* 0x0400 */
@@ -315,8 +315,8 @@ interrupt_base_book3e:                                      /* fake trap */
        EXCEPTION_STUB(0x1a0, watchdog)                 /* 0x09f0 */
        EXCEPTION_STUB(0x1c0, data_tlb_miss)
        EXCEPTION_STUB(0x1e0, instruction_tlb_miss)
-       EXCEPTION_STUB(0x200, altivec_unavailable)      /* 0x0f20 */
-       EXCEPTION_STUB(0x220, altivec_assist)           /* 0x1700 */
+       EXCEPTION_STUB(0x200, altivec_unavailable)
+       EXCEPTION_STUB(0x220, altivec_assist)
        EXCEPTION_STUB(0x260, perfmon)
        EXCEPTION_STUB(0x280, doorbell)
        EXCEPTION_STUB(0x2a0, doorbell_crit)
@@ -343,9 +343,9 @@ interrupt_end_book3e:
 
 /* Machine Check Interrupt */
        START_EXCEPTION(machine_check);
-       MC_EXCEPTION_PROLOG(0x200, BOOKE_INTERRUPT_MACHINE_CHECK,
+       MC_EXCEPTION_PROLOG(0x000, BOOKE_INTERRUPT_MACHINE_CHECK,
                            PROLOG_ADDITION_NONE)
-//     EXCEPTION_COMMON(0x200, PACA_EXMC, INTS_DISABLE)
+//     EXCEPTION_COMMON(0x000, PACA_EXMC, INTS_DISABLE)
 //     bl      special_reg_save_mc
 //     addi    r3,r1,STACK_FRAME_OVERHEAD
 //     CHECK_NAPPING();