powerpc/64s: Add new exception vector macros

Create arch/powerpc/include/asm/head-64.h with macros that specify
an exception vector (name, type, location), which will be used to
label and lay out exceptions into the object file.

Naming is moved out of exception-64s.h, which is used to specify the
implementation of exception handlers.

objdump of generated code in exception vectors is unchanged except for
names. Alignment directives scattered around are annoying, but done
this way so that disassembly can verify identical instruction
generation before and after patch. These get cleaned up in future
patch.

We change the way KVMTEST works, explicitly passing EXC_HV or EXC_STD
rather than overloading the trap number. This removes the need to have
SOFTEN values for the overloaded trap numbers, eg. 0x502.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

2 files changed, 217 insertions, 81 deletions

diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 5032a80e8f6a..72f2b1e3f343 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -34,6 +34,7 @@
  * exception handlers (including pSeries LPAR) and iSeries LPAR
  * implementations as possible.
  */
+#include <asm/head-64.h>
 
 #define EX_R9           0
 #define EX_R10          8
@@ -191,10 +192,10 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
         EXCEPTION_PROLOG_1(area, extra, vec);                           \
         EXCEPTION_PROLOG_PSERIES_1(label, h);
 
-#define __KVMTEST(n)                                                    \
-        lbz     r10,HSTATE_IN_GUEST(r13);                       \
+#define __KVMTEST(h, n)                                                 \
+        lbz     r10,HSTATE_IN_GUEST(r13);                               \
         cmpwi   r10,0;                                                  \
-        bne     do_kvm_##n
+        bne     do_kvm_##h##n
 
 #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
 /*
@@ -207,8 +208,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 #define kvmppc_interrupt kvmppc_interrupt_pr
 #endif
 
-#define __KVM_HANDLER(area, h, n)                                       \
-do_kvm_##n:                                                             \
+#define __KVM_HANDLER_PROLOG(area, n)                                   \
         BEGIN_FTR_SECTION_NESTED(947)                                   \
         ld      r10,area+EX_CFAR(r13);                                  \
         std     r10,HSTATE_CFAR(r13);                                   \
@@ -221,21 +221,23 @@ do_kvm_##n:								\
         stw     r9,HSTATE_SCRATCH1(r13);                                \
         ld      r9,area+EX_R9(r13);                                     \
         std     r12,HSTATE_SCRATCH0(r13);                               \
+
+#define __KVM_HANDLER(area, h, n)                                       \
+        __KVM_HANDLER_PROLOG(area, n)                                   \
         li      r12,n;                                                  \
         b       kvmppc_interrupt
 
 #define __KVM_HANDLER_SKIP(area, h, n)                                  \
-do_kvm_##n:                                                             \
         cmpwi   r10,KVM_GUEST_MODE_SKIP;                                \
         ld      r10,area+EX_R10(r13);                                   \
         beq     89f;                                                    \
-        stw     r9,HSTATE_SCRATCH1(r13);                        \
+        stw     r9,HSTATE_SCRATCH1(r13);                                \
         BEGIN_FTR_SECTION_NESTED(948)                                   \
         ld      r9,area+EX_PPR(r13);                                    \
         std     r9,HSTATE_PPR(r13);                                     \
         END_FTR_SECTION_NESTED(CPU_FTR_HAS_PPR,CPU_FTR_HAS_PPR,948);    \
         ld      r9,area+EX_R9(r13);                                     \
-        std     r12,HSTATE_SCRATCH0(r13);                       \
+        std     r12,HSTATE_SCRATCH0(r13);                               \
         li      r12,n;                                                  \
         b       kvmppc_interrupt;                                       \
 89:     mtocrf  0x80,r9;                                                \
@@ -243,12 +245,12 @@ do_kvm_##n:								\
         b       kvmppc_skip_##h##interrupt
 
 #ifdef CONFIG_KVM_BOOK3S_64_HANDLER
-#define KVMTEST(n)                      __KVMTEST(n)
+#define KVMTEST(h, n)                   __KVMTEST(h, n)
 #define KVM_HANDLER(area, h, n)         __KVM_HANDLER(area, h, n)
 #define KVM_HANDLER_SKIP(area, h, n)    __KVM_HANDLER_SKIP(area, h, n)
 
 #else
-#define KVMTEST(n)
+#define KVMTEST(h, n)
 #define KVM_HANDLER(area, h, n)
 #define KVM_HANDLER_SKIP(area, h, n)
 #endif
@@ -332,94 +334,79 @@ do_kvm_##n:								\
 /*
  * Exception vectors.
  */
-#define STD_EXCEPTION_PSERIES(vec, label)               \
-        . = vec;                                        \
-        .globl label##_pSeries;                         \
-label##_pSeries:                                        \
+#define STD_EXCEPTION_PSERIES(vec, label)                       \
         SET_SCRATCH0(r13);              /* save r13 */          \
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common,    \
-                                 EXC_STD, KVMTEST, vec)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label,             \
+                                 EXC_STD, KVMTEST_PR, vec);     \
 
 /* Version of above for when we have to branch out-of-line */
+#define __OOL_EXCEPTION(vec, label, hdlr)                       \
+        SET_SCRATCH0(r13)                                       \
+        EXCEPTION_PROLOG_0(PACA_EXGEN)                          \
+        b hdlr;
+
 #define STD_EXCEPTION_PSERIES_OOL(vec, label)                   \
-        .globl label##_pSeries;                                 \
-label##_pSeries:                                                \
-        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST, vec);   \
-        EXCEPTION_PROLOG_PSERIES_1(label##_common, EXC_STD)
-
-#define STD_EXCEPTION_HV(loc, vec, label)               \
-        . = loc;                                        \
-        .globl label##_hv;                              \
-label##_hv:                                             \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_PR, vec);        \
+        EXCEPTION_PROLOG_PSERIES_1(label, EXC_STD)
+
+#define STD_EXCEPTION_HV(loc, vec, label)                       \
         SET_SCRATCH0(r13);      /* save r13 */                  \
-        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label##_common,    \
-                                 EXC_HV, KVMTEST, vec)
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, label,             \
+                                 EXC_HV, KVMTEST_HV, vec);
 
-/* Version of above for when we have to branch out-of-line */
-#define STD_EXCEPTION_HV_OOL(vec, label)                \
-        .globl label##_hv;                              \
-label##_hv:                                             \
-        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST, vec);   \
-        EXCEPTION_PROLOG_PSERIES_1(label##_common, EXC_HV)
+#define STD_EXCEPTION_HV_OOL(vec, label)                        \
+        EXCEPTION_PROLOG_1(PACA_EXGEN, KVMTEST_HV, vec);        \
+        EXCEPTION_PROLOG_PSERIES_1(label, EXC_HV)
 
 #define STD_RELON_EXCEPTION_PSERIES(loc, vec, label)    \
-        . = loc;                                        \
-        .globl label##_relon_pSeries;                   \
-label##_relon_pSeries:                                  \
         /* No guest interrupts come through here */     \
         SET_SCRATCH0(r13);              /* save r13 */  \
-        EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label##_common, \
-                                       EXC_STD, NOTEST, vec)
+        EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label, EXC_STD, NOTEST, vec);
 
 #define STD_RELON_EXCEPTION_PSERIES_OOL(vec, label)             \
-        .globl label##_relon_pSeries;                           \
-label##_relon_pSeries:                                          \
         EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, vec);            \
-        EXCEPTION_RELON_PROLOG_PSERIES_1(label##_common, EXC_STD)
+        EXCEPTION_RELON_PROLOG_PSERIES_1(label, EXC_STD)
 
 #define STD_RELON_EXCEPTION_HV(loc, vec, label)         \
-        . = loc;                                        \
-        .globl label##_relon_hv;                        \
-label##_relon_hv:                                       \
         /* No guest interrupts come through here */     \
         SET_SCRATCH0(r13);      /* save r13 */          \
-        EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label##_common, \
-                                       EXC_HV, NOTEST, vec)
+        EXCEPTION_RELON_PROLOG_PSERIES(PACA_EXGEN, label, EXC_HV, NOTEST, vec);
 
 #define STD_RELON_EXCEPTION_HV_OOL(vec, label)                  \