kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl: add SIGP_SET_ARCHITECTURE to sigp.h and use it

Browse Source 
This makes the code easier to read.

Reviewed-by: Philipp Rudo <prudo@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Marc Hartmayer
2019-11-18 12:43:57 +01:00
committed by Jan Höppner
parent 675c854fa3
commit 0e385a81ca
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/boot/sigp.h
View File

@@ -12,6 +12,7 @@
/* Signal Processor Order Codes */
#define SIGP_STOP_AND_STORE_STATUS 9
#define SIGP_SET_ARCHITECTURE 18
#define SIGP_SET_MULTI_THREADING 22
#define SIGP_STORE_ASTATUS_AT_ADDRESS 23

6
zipl/boot/head.S
View File

@@ -9,16 +9,18 @@
* it under the terms of the MIT license. See LICENSE for details.
*/
#include "boot/sigp.h"
.section .text.start
.globl _start
_start:
basr %r13,0
0: la %r7,2 /* First try code 2: */
la %r6,0 /* 64 bit psws are restored */
sigp %r7,%r6,0x12 /* Switch to 64 bit */
sigp %r7,%r6,SIGP_SET_ARCHITECTURE /* Switch to 64 bit */
bc 8,.Lswitched_64-0b(%r13) /* Accepted ? */
la %r7,1 /* Failed - try code 1 */
sigp %r7,%r6,0x12 /* Switch to 64 bit */
sigp %r7,%r6,SIGP_SET_ARCHITECTURE /* Switch to 64 bit */
.Lswitched_64:
sam64 /* Switch to 64 bit addr mode */
basr %r13,0

6
zipl/boot/stage3.c
View File

@@ -10,6 +10,7 @@
*/
#include "libc.h"
#include "boot/sigp.h"
#include "s390.h"
#include "stage3.h"
#include "error.h"
@@ -194,11 +195,12 @@ static inline void __noreturn start_kernel(void)
" sam31\n"
" sr %r1,%r1\n"
" sr %r2,%r2\n"
" sigp %r1,%r2,0x12\n"
" sigp %r1,%r2,%[order]\n"
" lpsw 0\n"
: [addr] "=&d" (addr),
[code] "+&d" (code)
: [psw] "a" (psw) );
: [psw] "a" (psw),
[order] "L" (SIGP_SET_ARCHITECTURE));
while (1);
}

6
zipl/boot/tape0.S
View File

@@ -7,6 +7,8 @@
# it under the terms of the MIT license. See LICENSE for details.
#
#include "boot/sigp.h"
IPL_BS = 1024 # block size for tape access
IPL_OFF = 0x4000 # temporary kernel load addr
COMMAND_LINE_SIZE = 896 # max command line length
@@ -184,10 +186,10 @@ iplstart:
0:
la %r7,2 #/* First try code 2: */
la %r6,0 #/* 64 bit psws are restored */
sigp %r7,%r6,0x12 #/* Switch to 64 bit */
sigp %r7,%r6,SIGP_SET_ARCHITECTURE #/* Switch to 64 bit */
bc 8,.Lswitched_64-0b(%r13) #/* Accepted ? */
la %r7,1 #/* Failed - try code 1 */
sigp %r7,%r6,0x12 #/* Switch to 64 bit */
sigp %r7,%r6,SIGP_SET_ARCHITECTURE #/* Switch to 64 bit */
.Lswitched_64:
sam64 #/* Switch to 64 bit addr mode */
basr %r13,0