Skip to content

Commit 0f76979

Browse files
committed
s390/entry: Move early program check handler to entry.S
JIRA: https://issues.redhat.com/browse/RHEL-113452 commit f2bb5b9 Author: Heiko Carstens <hca@linux.ibm.com> Date: Wed Jul 31 15:25:59 2024 +0200 s390/entry: Move early program check handler to entry.S Have all program check handlers in one file to make future changes easy. Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com> Reviewed-by: Sven Schnelle <svens@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Conflicts: arch/s390/kernel/Makefile (conflict due to missing patch "kbuild: use obj-y instead extra-y for objects placed at the head" in downstream) Signed-off-by: Thomas Huth <thuth@redhat.com>
1 parent 0da1424 commit 0f76979

File tree

3 files changed

+16
-24
lines changed

3 files changed

+16
-24
lines changed

arch/s390/kernel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ CFLAGS_stacktrace.o += -fno-optimize-sibling-calls
3636
CFLAGS_dumpstack.o += -fno-optimize-sibling-calls
3737
CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls
3838

39-
obj-y := traps.o time.o process.o earlypgm.o early.o setup.o idle.o vtime.o
39+
obj-y := traps.o time.o process.o early.o setup.o idle.o vtime.o
4040
obj-y += processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o
4141
obj-y += debug.o irq.o ipl.o dis.o vdso.o cpufeature.o
4242
obj-y += sysinfo.o lgr.o os_info.o ctlreg.o

arch/s390/kernel/earlypgm.S

Lines changed: 0 additions & 23 deletions
This file was deleted.

arch/s390/kernel/entry.S

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,21 @@ SYM_CODE_START(restart_int_handler)
583583
3: j 3b
584584
SYM_CODE_END(restart_int_handler)
585585

586+
SYM_CODE_START(early_pgm_check_handler)
587+
stmg %r8,%r15,__LC_SAVE_AREA_SYNC
588+
aghi %r15,-(STACK_FRAME_OVERHEAD+__PT_SIZE)
589+
la %r11,STACK_FRAME_OVERHEAD(%r15)
590+
xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
591+
stmg %r0,%r7,__PT_R0(%r11)
592+
mvc __PT_PSW(16,%r11),__LC_PGM_OLD_PSW
593+
mvc __PT_R8(64,%r11),__LC_SAVE_AREA_SYNC
594+
lgr %r2,%r11
595+
brasl %r14,__do_early_pgm_check
596+
mvc __LC_RETURN_PSW(16),STACK_FRAME_OVERHEAD+__PT_PSW(%r15)
597+
lmg %r0,%r15,STACK_FRAME_OVERHEAD+__PT_R0(%r15)
598+
lpswe __LC_RETURN_PSW
599+
SYM_CODE_END(early_pgm_check_handler)
600+
586601
.section .kprobes.text, "ax"
587602

588603
#if defined(CONFIG_CHECK_STACK) || defined(CONFIG_VMAP_STACK)

0 commit comments

Comments
 (0)