30232e2023
- Added the following patches for bsc#1166850 zipl: fix secure boot config handling: * s390-tools-sles15sp2-01-zipl-Add-missing-options-to-help-output.patch * s390-tools-sles15sp2-02-zipl-allow-stand-alone-secure-option-on-command-l.patch * s390-tools-sles15sp2-03-zipl-correct-secure-boot-config-handling.patch * s390-tools-sles15sp2-04-zipl-fix-zipl.conf-man-page-example-for-secure-boot.patch - Modified the spec file so that the kernel used for the SCSI dump tool is named zfcpdump-image instead of zfcpdump_part.image. This is to match the new version of zipl that expects this new file name. (bsc#1166851) - Added the following patches to implement jsc#SLE-7471, Enhanced tooling for kvm guest images (bsc#1165549): * s390-tools-sles15sp2-01-zipl-fix-Wdiscarded-qualifiers.patch * s390-tools-sles15sp2-02-zipl-fix-Waddress-of-packed-member.patch * s390-tools-sles15sp2-03-zipl-remove-some-useless-__packed___-attributes.patch * s390-tools-sles15sp2-04-zipl-Fix-entry-point-for-stand-alone-kdump.patch * s390-tools-sles15sp2-05-zipl-Fix-dependency-generation-in-zipl-boot.patch * s390-tools-sles15sp2-06-zipl-Make-use-of-__packed-macro.patch * s390-tools-sles15sp2-07-zipl-define-__section-macro-and-make-use-of-it.patch * s390-tools-sles15sp2-08-zipl-Make-use-of-__noreturn-macro.patch * s390-tools-sles15sp2-09-zipl-Define-__noinline-macro-and-make-use-of-it.patch * s390-tools-sles15sp2-10-zipl-stage3-Mark-start_kernel-__noreturn.patch * s390-tools-sles15sp2-11-zipl-sclp-Remove-duplicate-macros.patch * s390-tools-sles15sp2-12-zipl-Make-address-size-mask-macros-UL.patch * s390-tools-sles15sp2-13-zipl-libc-Use-stdint.h-instead-of-self-defined-macro.patch * s390-tools-sles15sp2-14-zipl-Consolidate-IMAGE-macros.patch * s390-tools-sles15sp2-15-zipl-Consolidate-STAGE-2-3-macros.patch * s390-tools-sles15sp2-16-zipl-stfle-use-uint64_t-instead-of-u64.patch * s390-tools-sles15sp2-17-zipl-boot-fix-comment-in-stage3.lds.patch * s390-tools-sles15sp2-18-lib-zt_common-add-STATIC_ASSERT-macro.patch * s390-tools-sles15sp2-19-zipl-use-STATIC_ASSERT-macro-for-no-padding-verifica.patch * s390-tools-sles15sp2-20-Support-lib-zt_common.h-to-be-used-in-assembler-and-.patch * s390-tools-sles15sp2-21-zipl-move-IPL-related-definitions-into-separate-head.patch * s390-tools-sles15sp2-22-zipl-move-SIGP-related-functions-and-definitions-int.patch * s390-tools-sles15sp2-23-zipl-add-SIGP_SET_ARCHITECTURE-to-sigp.h-and-use-it.patch * s390-tools-sles15sp2-24-zipl-stage3-make-IPL_DEVICE-definition-consistent-wi.patch * s390-tools-sles15sp2-25-zipl-move-Linux-layout-definitions-into-separate-hea.patch * s390-tools-sles15sp2-26-zipl-tape0-use-constants-defined-in-linux_layout.h.patch * s390-tools-sles15sp2-27-zipl-use-STAGE3_ENTRY-for-STAGE3_LOAD_ADDRESS.patch * s390-tools-sles15sp2-28-zipl-move-loaders-layout-definitions-into-separate-h.patch * s390-tools-sles15sp2-29-zipl-s390.h-rename-inline-macro-into-__always_inline.patch * s390-tools-sles15sp2-30-zipl-move-__always_inline-barrier-__pa32-pa-to-zt_co.patch * s390-tools-sles15sp2-31-zipl-make-BLK_PWRT-unsigned-int.patch * s390-tools-sles15sp2-32-Consolidate-MIN-and-MAX-macros.patch * s390-tools-sles15sp2-33-zipl-remove-libc.h-include-in-s390.h.patch * s390-tools-sles15sp2-34-zipl-move-s390.h-to-include-boot-s390.h.patch * s390-tools-sles15sp2-35-zipl-libc-include-s390.h.patch * s390-tools-sles15sp2-36-include-boot-s390.h-move-panic-and-panic_notify-to-l.patch * s390-tools-sles15sp2-37-include-boot-s390.h-fixes-for-Werror-sign-conversion.patch * s390-tools-sles15sp2-38-zipl-refactor-all-EBCDIC-code-into-separate-files.patch * s390-tools-sles15sp2-39-zipl-sclp-add-macros-for-the-control-program-masks.patch * s390-tools-sles15sp2-40-zipl-sclp-add-sclp_print_ascii.patch * s390-tools-sles15sp2-41-zipl-libc-printf-print-on-linemode-and-ASCII-console.patch * s390-tools-sles15sp2-42-Consolidate-ALIGN-__ALIGN_MASK-ARRAY_SIZE-macros.patch * s390-tools-sles15sp2-43-genprotimg-boot-initial-bootloader-support.patch * s390-tools-sles15sp2-44-genprotimg-boot-use-C-pre-processor-for-linker-scrip.patch * s390-tools-sles15sp2-45-genprotimg-add-relocator-for-stage3b.patch * s390-tools-sles15sp2-46-README.md-remove-useless-empty-line.patch * s390-tools-sles15sp2-47-include-boot-s390.h-add-guard-for-struct-__vector128.patch * s390-tools-sles15sp2-48-genprotimg-introduce-new-tool-for-the-creation-of-PV.patch - Added a BuildRequires for glib2-devel to support the new feature. - Added a %dir entry for /usr/share/s390-tools/genprotimg OBS-URL: https://build.opensuse.org/request/show/786614 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=92
118 lines
3.9 KiB
Diff
118 lines
3.9 KiB
Diff
Subject: [PATCH] [FEAT VS1804] zipl: add SIGP_SET_ARCHITECTURE to sigp.h and use it
|
|
From: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
|
|
Summary: genprotimg: Introduce new tool for the creation of PV images
|
|
Description: genprotimg takes a kernel, host-key documents, optionally an
|
|
initrd, optionally a file with the kernel command line, and it
|
|
generates a single, loadable image file. The image consists of a
|
|
concatenation of a plain text boot loader, the encrypted
|
|
components for kernel, initrd, and cmdline, and the
|
|
integrity-protected PV header, containing metadata necessary for
|
|
running the guest in PV mode. It's possible to use this image file
|
|
as a kernel for zIPL or for a direct kernel boot using QEMU.
|
|
Upstream-ID: 0e385a81caf7c266c0784613e0264c03271eb99a
|
|
Problem-ID: VS1804
|
|
|
|
Upstream-Description:
|
|
|
|
zipl: add SIGP_SET_ARCHITECTURE to sigp.h and use it
|
|
|
|
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>
|
|
|
|
|
|
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
---
|
|
include/boot/sigp.h | 1 +
|
|
zipl/boot/head.S | 6 ++++--
|
|
zipl/boot/stage3.c | 6 ++++--
|
|
zipl/boot/tape0.S | 6 ++++--
|
|
4 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
|
--- a/include/boot/sigp.h
|
|
+++ b/include/boot/sigp.h
|
|
@@ -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
|
|
|
|
--- a/zipl/boot/head.S
|
|
+++ b/zipl/boot/head.S
|
|
@@ -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
|
|
--- a/zipl/boot/stage3.c
|
|
+++ b/zipl/boot/stage3.c
|
|
@@ -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_kern
|
|
" 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);
|
|
}
|
|
|
|
--- a/zipl/boot/tape0.S
|
|
+++ b/zipl/boot/tape0.S
|
|
@@ -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
|