[POWERPC] Split out iSeries specific exception macros

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

2 files changed, 66 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index b5f600616ade..e9a3435b3c18 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -30,9 +30,10 @@
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/ptrace.h>
-#include <asm/exception.h>
 #include <asm/cputable.h>
 
+#include "exception.h"
+
         .text
 
         .globl system_reset_iSeries
@@ -104,15 +105,15 @@ BEGIN_FTR_SECTION
         mtcrf   0x80,r12
         mfspr   r12,SPRN_SPRG2
 END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
-        EXCEPTION_PROLOG_ISERIES_1(PACA_EXGEN)
-        EXCEPTION_PROLOG_ISERIES_2
+        EXCEPTION_PROLOG_1(PACA_EXGEN)
+        EXCEPTION_PROLOG_ISERIES_1
         b       data_access_common
 
 .do_stab_bolted_iSeries:
         mtcrf   0x80,r12
         mfspr   r12,SPRN_SPRG2
-        EXCEPTION_PROLOG_ISERIES_1(PACA_EXSLB)
-        EXCEPTION_PROLOG_ISERIES_2
+        EXCEPTION_PROLOG_1(PACA_EXSLB)
+        EXCEPTION_PROLOG_ISERIES_1
         b       .do_stab_bolted
 
         .globl  data_access_slb_iSeries
@@ -171,7 +172,7 @@ slb_miss_user_iseries:
         std     r10,PACA_EXGEN+EX_R13(r13)
         std     r11,PACA_EXGEN+EX_R9(r13)
         std     r12,PACA_EXGEN+EX_R3(r13)
-        EXCEPTION_PROLOG_ISERIES_2
+        EXCEPTION_PROLOG_ISERIES_1
         b       slb_miss_user_common
 #endif
 
@@ -187,7 +188,7 @@ slb_miss_user_iseries:
 system_call_iSeries:
         mr      r9,r13
         mfspr   r13,SPRN_SPRG3
-        EXCEPTION_PROLOG_ISERIES_2
+        EXCEPTION_PROLOG_ISERIES_1
         b       system_call_common
 
         STD_EXCEPTION_ISERIES( 0xd00, single_step, PACA_EXGEN)
diff --git a/arch/powerpc/platforms/iseries/exception.h b/arch/powerpc/platforms/iseries/exception.h
new file mode 100644
index 000000000000..5b3f285e8168
--- /dev/null
+++ b/arch/powerpc/platforms/iseries/exception.h
@@ -0,0 +1,58 @@
+#ifndef _ASM_POWERPC_ISERIES_EXCEPTION_H
+#define _ASM_POWERPC_ISERIES_EXCEPTION_H
+/*
+ * Extracted from head_64.S
+ *
+ *  PowerPC version
+ *    Copyright (C) 1995-1996 Gary Thomas (gdt@linuxppc.org)
+ *
+ *  Rewritten by Cort Dougan (cort@cs.nmt.edu) for PReP
+ *    Copyright (C) 1996 Cort Dougan <cort@cs.nmt.edu>
+ *  Adapted for Power Macintosh by Paul Mackerras.
+ *  Low-level exception handlers and MMU support
+ *  rewritten by Paul Mackerras.
+ *    Copyright (C) 1996 Paul Mackerras.
+ *
+ *  Adapted for 64bit PowerPC by Dave Engebretsen, Peter Bergner, and
+ *    Mike Corrigan {engebret|bergner|mikejc}@us.ibm.com
+ *
+ *  This file contains the low-level support and setup for the
+ *  PowerPC-64 platform, including trap and interrupt dispatch.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+#include <asm/exception.h>
+
+#define EXCEPTION_PROLOG_ISERIES_1                                      \
+        mfmsr   r10;                                                    \
+        ld      r12,PACALPPACAPTR(r13);                                 \
+        ld      r11,LPPACASRR0(r12);                                    \
+        ld      r12,LPPACASRR1(r12);                                    \
+        ori     r10,r10,MSR_RI;                                         \
+        mtmsrd  r10,1
+
+#define STD_EXCEPTION_ISERIES(n, label, area)                           \
+        .globl label##_iSeries;                                         \
+label##_iSeries:                                                        \
+        HMT_MEDIUM;                                                     \
+        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
+        EXCEPTION_PROLOG_1(area);                                       \
+        EXCEPTION_PROLOG_ISERIES_1;                                     \
+        b       label##_common
+
+#define MASKABLE_EXCEPTION_ISERIES(n, label)                            \
+        .globl label##_iSeries;                                         \
+label##_iSeries:                                                        \
+        HMT_MEDIUM;                                                     \
+        mtspr   SPRN_SPRG1,r13;         /* save r13 */                  \
+        EXCEPTION_PROLOG_1(PACA_EXGEN);                                 \
+        lbz     r10,PACASOFTIRQEN(r13);                                 \
+        cmpwi   0,r10,0;                                                \
+        beq-    label##_iSeries_masked;                                 \
+        EXCEPTION_PROLOG_ISERIES_1;                                     \
+        b       label##_common;                                         \
+
+#endif  /* _ASM_POWERPC_ISERIES_EXCEPTION_H */