s390/traps: convert pgm_check.S to C

Convert the program check table to C. Which allows to get rid of yet
another assembler file, and also enables proper type checking for the
table.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/entry-common.h b/arch/s390/include/asm/entry-common.h
index 75cebc8..9cceb26 100644 (file)
--- a/arch/s390/include/asm/entry-common.h
+++ b/arch/s390/include/asm/entry-common.h
@@ -14,10 +14,6 @@
 void do_per_trap(struct pt_regs *regs);
 void do_syscall(struct pt_regs *regs);
 
-typedef void (*pgm_check_func)(struct pt_regs *regs);
-
-extern pgm_check_func pgm_check_table[128];
-
 #ifdef CONFIG_DEBUG_ENTRY
 static __always_inline void arch_check_user_regs(struct pt_regs *regs)
 {

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index c97818a..68ca183 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -36,7 +36,7 @@ CFLAGS_unwind_bc.o    += -fno-optimize-sibling-calls
 obj-y  := traps.o time.o process.o base.o early.o setup.o idle.o vtime.o
 obj-y  += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
 obj-y  += debug.o irq.o ipl.o dis.o diag.o vdso.o
-obj-y  += sysinfo.o lgr.o os_info.o machine_kexec.o pgm_check.o
+obj-y  += sysinfo.o lgr.o os_info.o machine_kexec.o
 obj-y  += runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o
 obj-y  += entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o
 obj-y  += nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o

diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index 3d0c0ac..c7969d6 100644 (file)
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -26,29 +26,7 @@ void do_dat_exception(struct pt_regs *regs);
 void do_secure_storage_access(struct pt_regs *regs);
 void do_non_secure_storage_access(struct pt_regs *regs);
 void do_secure_storage_violation(struct pt_regs *regs);
-
-void addressing_exception(struct pt_regs *regs);
-void data_exception(struct pt_regs *regs);
 void default_trap_handler(struct pt_regs *regs);
-void divide_exception(struct pt_regs *regs);
-void execute_exception(struct pt_regs *regs);
-void hfp_divide_exception(struct pt_regs *regs);
-void hfp_overflow_exception(struct pt_regs *regs);
-void hfp_significance_exception(struct pt_regs *regs);
-void hfp_sqrt_exception(struct pt_regs *regs);
-void hfp_underflow_exception(struct pt_regs *regs);
-void illegal_op(struct pt_regs *regs);
-void operand_exception(struct pt_regs *regs);
-void overflow_exception(struct pt_regs *regs);
-void privileged_op(struct pt_regs *regs);
-void space_switch_exception(struct pt_regs *regs);
-void special_op_exception(struct pt_regs *regs);
-void specification_exception(struct pt_regs *regs);
-void transaction_exception(struct pt_regs *regs);
-void translation_exception(struct pt_regs *regs);
-void vector_exception(struct pt_regs *regs);
-void monitor_event_exception(struct pt_regs *regs);
-
 void do_report_trap(struct pt_regs *regs, int si_signo, int si_code, char *str);
 void kernel_stack_overflow(struct pt_regs * regs);
 void do_signal(struct pt_regs *regs);

diff --git a/arch/s390/kernel/pgm_check.S b/arch/s390/kernel/pgm_check.S
deleted file mode 100644 (file)
index 9a92638..0000000
--- a/arch/s390/kernel/pgm_check.S
+++ /dev/null
@@ -1,147 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *    Program check table.
- *
- *    Copyright IBM Corp. 2012
- */
-
-#include <linux/linkage.h>
-
-#define PGM_CHECK(handler)     .quad handler
-#define PGM_CHECK_DEFAULT      PGM_CHECK(default_trap_handler)
-
-/*
- * The program check table contains exactly 128 (0x00-0x7f) entries. Each
- * line defines the function to be called corresponding to the program check
- * interruption code.
- */
-.section .rodata, "a"
-ENTRY(pgm_check_table)
-PGM_CHECK_DEFAULT                      /* 00 */
-PGM_CHECK(illegal_op)                  /* 01 */
-PGM_CHECK(privileged_op)               /* 02 */
-PGM_CHECK(execute_exception)           /* 03 */
-PGM_CHECK(do_protection_exception)     /* 04 */
-PGM_CHECK(addressing_exception)                /* 05 */
-PGM_CHECK(specification_exception)     /* 06 */
-PGM_CHECK(data_exception)              /* 07 */
-PGM_CHECK(overflow_exception)          /* 08 */
-PGM_CHECK(divide_exception)            /* 09 */
-PGM_CHECK(overflow_exception)          /* 0a */
-PGM_CHECK(divide_exception)            /* 0b */
-PGM_CHECK(hfp_overflow_exception)      /* 0c */
-PGM_CHECK(hfp_underflow_exception)     /* 0d */
-PGM_CHECK(hfp_significance_exception)  /* 0e */
-PGM_CHECK(hfp_divide_exception)                /* 0f */
-PGM_CHECK(do_dat_exception)            /* 10 */
-PGM_CHECK(do_dat_exception)            /* 11 */
-PGM_CHECK(translation_exception)       /* 12 */
-PGM_CHECK(special_op_exception)                /* 13 */
-PGM_CHECK_DEFAULT                      /* 14 */
-PGM_CHECK(operand_exception)           /* 15 */
-PGM_CHECK_DEFAULT                      /* 16 */
-PGM_CHECK_DEFAULT                      /* 17 */
-PGM_CHECK(transaction_exception)       /* 18 */
-PGM_CHECK_DEFAULT                      /* 19 */
-PGM_CHECK_DEFAULT                      /* 1a */
-PGM_CHECK(vector_exception)            /* 1b */
-PGM_CHECK(space_switch_exception)      /* 1c */
-PGM_CHECK(hfp_sqrt_exception)          /* 1d */
-PGM_CHECK_DEFAULT                      /* 1e */
-PGM_CHECK_DEFAULT                      /* 1f */
-PGM_CHECK_DEFAULT                      /* 20 */
-PGM_CHECK_DEFAULT                      /* 21 */
-PGM_CHECK_DEFAULT                      /* 22 */
-PGM_CHECK_DEFAULT                      /* 23 */
-PGM_CHECK_DEFAULT                      /* 24 */
-PGM_CHECK_DEFAULT                      /* 25 */
-PGM_CHECK_DEFAULT                      /* 26 */
-PGM_CHECK_DEFAULT                      /* 27 */
-PGM_CHECK_DEFAULT                      /* 28 */
-PGM_CHECK_DEFAULT                      /* 29 */
-PGM_CHECK_DEFAULT                      /* 2a */
-PGM_CHECK_DEFAULT                      /* 2b */
-PGM_CHECK_DEFAULT                      /* 2c */
-PGM_CHECK_DEFAULT                      /* 2d */
-PGM_CHECK_DEFAULT                      /* 2e */
-PGM_CHECK_DEFAULT                      /* 2f */
-PGM_CHECK_DEFAULT                      /* 30 */
-PGM_CHECK_DEFAULT                      /* 31 */
-PGM_CHECK_DEFAULT                      /* 32 */
-PGM_CHECK_DEFAULT                      /* 33 */
-PGM_CHECK_DEFAULT                      /* 34 */
-PGM_CHECK_DEFAULT                      /* 35 */
-PGM_CHECK_DEFAULT                      /* 36 */
-PGM_CHECK_DEFAULT                      /* 37 */
-PGM_CHECK(do_dat_exception)            /* 38 */
-PGM_CHECK(do_dat_exception)            /* 39 */
-PGM_CHECK(do_dat_exception)            /* 3a */
-PGM_CHECK(do_dat_exception)            /* 3b */
-PGM_CHECK_DEFAULT                      /* 3c */
-PGM_CHECK(do_secure_storage_access)    /* 3d */
-PGM_CHECK(do_non_secure_storage_access)        /* 3e */
-PGM_CHECK(do_secure_storage_violation) /* 3f */
-PGM_CHECK(monitor_event_exception)     /* 40 */
-PGM_CHECK_DEFAULT                      /* 41 */
-PGM_CHECK_DEFAULT                      /* 42 */
-PGM_CHECK_DEFAULT                      /* 43 */
-PGM_CHECK_DEFAULT                      /* 44 */
-PGM_CHECK_DEFAULT                      /* 45 */
-PGM_CHECK_DEFAULT                      /* 46 */
-PGM_CHECK_DEFAULT                      /* 47 */
-PGM_CHECK_DEFAULT                      /* 48 */
-PGM_CHECK_DEFAULT                      /* 49 */
-PGM_CHECK_DEFAULT                      /* 4a */
-PGM_CHECK_DEFAULT                      /* 4b */
-PGM_CHECK_DEFAULT                      /* 4c */
-PGM_CHECK_DEFAULT                      /* 4d */
-PGM_CHECK_DEFAULT                      /* 4e */
-PGM_CHECK_DEFAULT                      /* 4f */
-PGM_CHECK_DEFAULT                      /* 50 */
-PGM_CHECK_DEFAULT                      /* 51 */
-PGM_CHECK_DEFAULT                      /* 52 */
-PGM_CHECK_DEFAULT                      /* 53 */
-PGM_CHECK_DEFAULT                      /* 54 */
-PGM_CHECK_DEFAULT                      /* 55 */
-PGM_CHECK_DEFAULT                      /* 56 */
-PGM_CHECK_DEFAULT                      /* 57 */
-PGM_CHECK_DEFAULT                      /* 58 */
-PGM_CHECK_DEFAULT                      /* 59 */
-PGM_CHECK_DEFAULT                      /* 5a */
-PGM_CHECK_DEFAULT                      /* 5b */
-PGM_CHECK_DEFAULT                      /* 5c */
-PGM_CHECK_DEFAULT                      /* 5d */
-PGM_CHECK_DEFAULT                      /* 5e */
-PGM_CHECK_DEFAULT                      /* 5f */
-PGM_CHECK_DEFAULT                      /* 60 */
-PGM_CHECK_DEFAULT                      /* 61 */
-PGM_CHECK_DEFAULT                      /* 62 */
-PGM_CHECK_DEFAULT                      /* 63 */
-PGM_CHECK_DEFAULT                      /* 64 */
-PGM_CHECK_DEFAULT                      /* 65 */
-PGM_CHECK_DEFAULT                      /* 66 */
-PGM_CHECK_DEFAULT                      /* 67 */
-PGM_CHECK_DEFAULT                      /* 68 */
-PGM_CHECK_DEFAULT                      /* 69 */
-PGM_CHECK_DEFAULT                      /* 6a */
-PGM_CHECK_DEFAULT                      /* 6b */
-PGM_CHECK_DEFAULT                      /* 6c */
-PGM_CHECK_DEFAULT                      /* 6d */
-PGM_CHECK_DEFAULT                      /* 6e */
-PGM_CHECK_DEFAULT                      /* 6f */
-PGM_CHECK_DEFAULT                      /* 70 */
-PGM_CHECK_DEFAULT                      /* 71 */
-PGM_CHECK_DEFAULT                      /* 72 */
-PGM_CHECK_DEFAULT                      /* 73 */
-PGM_CHECK_DEFAULT                      /* 74 */
-PGM_CHECK_DEFAULT                      /* 75 */
-PGM_CHECK_DEFAULT                      /* 76 */
-PGM_CHECK_DEFAULT                      /* 77 */
-PGM_CHECK_DEFAULT                      /* 78 */
-PGM_CHECK_DEFAULT                      /* 79 */
-PGM_CHECK_DEFAULT                      /* 7a */
-PGM_CHECK_DEFAULT                      /* 7b */
-PGM_CHECK_DEFAULT                      /* 7c */
-PGM_CHECK_DEFAULT                      /* 7d */
-PGM_CHECK_DEFAULT                      /* 7e */
-PGM_CHECK_DEFAULT                      /* 7f */

diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index db7dd59..e8b8941 100644 (file)
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -89,7 +89,7 @@ void default_trap_handler(struct pt_regs *regs)
 }
 
 #define DO_ERROR_INFO(name, signr, sicode, str) \
-void name(struct pt_regs *regs)                        \
+static void name(struct pt_regs *regs)         \
 {                                              \
        do_trap(regs, signr, sicode, str);      \
 }
@@ -141,13 +141,13 @@ static inline void do_fp_trap(struct pt_regs *regs, __u32 fpc)
        do_trap(regs, SIGFPE, si_code, "floating point exception");
 }
 
-void translation_exception(struct pt_regs *regs)
+static void translation_exception(struct pt_regs *regs)
 {
        /* May never happen. */
        panic("Translation exception");
 }
 
-void illegal_op(struct pt_regs *regs)
+static void illegal_op(struct pt_regs *regs)
 {
         __u8 opcode[6];
        __u16 __user *location;
@@ -189,7 +189,7 @@ NOKPROBE_SYMBOL(illegal_op);
 DO_ERROR_INFO(specification_exception, SIGILL, ILL_ILLOPN,
              "specification exception");
 
-void vector_exception(struct pt_regs *regs)
+static void vector_exception(struct pt_regs *regs)
 {
        int si_code, vic;
 
@@ -223,7 +223,7 @@ void vector_exception(struct pt_regs *regs)
        do_trap(regs, SIGFPE, si_code, "vector exception");
 }
 
-void data_exception(struct pt_regs *regs)
+static void data_exception(struct pt_regs *regs)
 {
        save_fpu_regs();
        if (current->thread.fpu.fpc & FPC_DXC_MASK)
@@ -232,7 +232,7 @@ void data_exception(struct pt_regs *regs)
                do_trap(regs, SIGILL, ILL_ILLOPN, "data exception");
 }
 
-void space_switch_exception(struct pt_regs *regs)
+static void space_switch_exception(struct pt_regs *regs)
 {
        /* Set user psw back to home space mode. */
        if (user_mode(regs))
@@ -241,7 +241,7 @@ void space_switch_exception(struct pt_regs *regs)
        do_trap(regs, SIGILL, ILL_PRVOPC, "space switch event");
 }
 
-void monitor_event_exception(struct pt_regs *regs)
+static void monitor_event_exception(struct pt_regs *regs)
 {
        const struct exception_table_entry *fixup;
 
@@ -293,6 +293,8 @@ void __init trap_init(void)
        test_monitor_call();
 }
 
+static void (*pgm_check_table[128])(struct pt_regs *regs);
+
 void noinstr __do_pgm_check(struct pt_regs *regs)
 {
        unsigned long last_break = S390_lowcore.breaking_event_addr;
@@ -353,3 +355,52 @@ out:
                exit_to_user_mode();
        }
 }
+
+/*
+ * The program check table contains exactly 128 (0x00-0x7f) entries. Each
+ * line defines the function to be called corresponding to the program check
+ * interruption code.
+ */
+static void (*pgm_check_table[128])(struct pt_regs *regs) = {
+       [0x00]          = default_trap_handler,
+       [0x01]          = illegal_op,
+       [0x02]          = privileged_op,
+       [0x03]          = execute_exception,
+       [0x04]          = do_protection_exception,
+       [0x05]          = addressing_exception,
+       [0x06]          = specification_exception,
+       [0x07]          = data_exception,
+       [0x08]          = overflow_exception,
+       [0x09]          = divide_exception,
+       [0x0a]          = overflow_exception,
+       [0x0b]          = divide_exception,
+       [0x0c]          = hfp_overflow_exception,
+       [0x0d]          = hfp_underflow_exception,
+       [0x0e]          = hfp_significance_exception,
+       [0x0f]          = hfp_divide_exception,
+       [0x10]          = do_dat_exception,
+       [0x11]          = do_dat_exception,
+       [0x12]          = translation_exception,
+       [0x13]          = special_op_exception,
+       [0x14]          = default_trap_handler,
+       [0x15]          = operand_exception,
+       [0x16]          = default_trap_handler,
+       [0x17]          = default_trap_handler,
+       [0x18]          = transaction_exception,
+       [0x19]          = default_trap_handler,
+       [0x1a]          = default_trap_handler,
+       [0x1b]          = vector_exception,
+       [0x1c]          = space_switch_exception,
+       [0x1d]          = hfp_sqrt_exception,
+       [0x1e ... 0x37] = default_trap_handler,
+       [0x38]          = do_dat_exception,
+       [0x39]          = do_dat_exception,
+       [0x3a]          = do_dat_exception,
+       [0x3b]          = do_dat_exception,
+       [0x3c]          = default_trap_handler,
+       [0x3d]          = do_secure_storage_access,
+       [0x3e]          = do_non_secure_storage_access,
+       [0x3f]          = do_secure_storage_violation,
+       [0x40]          = monitor_event_exception,
+       [0x41 ... 0x7f] = default_trap_handler,
+};