Commit 436bd506 authored by Martin Schwidefsky's avatar Martin Schwidefsky Committed by Ben Hutchings

s390/sclp: clear upper register halves in _sclp_print_early

commit f9c87a6f upstream.

If the kernel is compiled with gcc 5.1 and the XZ compression option
the decompress_kernel function calls _sclp_print_early in 64-bit mode
while the content of the upper register half of %r6 is non-zero.
This causes a specification exception on the servc instruction in
_sclp_servc.

The _sclp_print_early function saves and restores the upper registers
halves but it fails to clear them for the 31-bit code of the mini sclp
driver.
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent a62b33ee
...@@ -270,6 +270,8 @@ ENTRY(_sclp_print_early) ...@@ -270,6 +270,8 @@ ENTRY(_sclp_print_early)
jno .Lesa2 jno .Lesa2
ahi %r15,-80 ahi %r15,-80
stmh %r6,%r15,96(%r15) # store upper register halves stmh %r6,%r15,96(%r15) # store upper register halves
basr %r13,0
lmh %r0,%r15,.Lzeroes-.(%r13) # clear upper register halves
.Lesa2: .Lesa2:
#endif #endif
lr %r10,%r2 # save string pointer lr %r10,%r2 # save string pointer
...@@ -293,6 +295,8 @@ ENTRY(_sclp_print_early) ...@@ -293,6 +295,8 @@ ENTRY(_sclp_print_early)
#endif #endif
lm %r6,%r15,120(%r15) # restore registers lm %r6,%r15,120(%r15) # restore registers
br %r14 br %r14
.Lzeroes:
.fill 64,4,0
.LwritedataS4: .LwritedataS4:
.long 0x00760005 # SCLP command for write data .long 0x00760005 # SCLP command for write data
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment