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
117 lines
4.1 KiB
Diff
117 lines
4.1 KiB
Diff
Subject: [PATCH] [FEAT VS1804] zipl: Make address/size/mask macros UL
|
|
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: ea14f5471c6fbc9a8a407aa33324db39082b4689
|
|
Problem-ID: VS1804
|
|
|
|
Upstream-Description:
|
|
|
|
zipl: Make address/size/mask macros UL
|
|
|
|
While at it also fix some white space damages.
|
|
|
|
Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
|
|
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
|
|
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
|
|
|
|
|
|
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
|
---
|
|
zipl/boot/stage3.h | 18 +++++++++---------
|
|
zipl/include/zipl.h | 36 ++++++++++++++++++------------------
|
|
2 files changed, 27 insertions(+), 27 deletions(-)
|
|
|
|
--- a/zipl/boot/stage3.h
|
|
+++ b/zipl/boot/stage3.h
|
|
@@ -15,12 +15,12 @@
|
|
#include "libc.h"
|
|
#include "s390.h"
|
|
|
|
-#define IPL_DEVICE 0x10404
|
|
-#define INITRD_START 0x10408
|
|
-#define INITRD_SIZE 0x10410
|
|
-#define OLDMEM_BASE 0x10418
|
|
-#define OLDMEM_SIZE 0x10420
|
|
-#define COMMAND_LINE 0x10480
|
|
+#define IPL_DEVICE 0x10404UL
|
|
+#define INITRD_START 0x10408UL
|
|
+#define INITRD_SIZE 0x10410UL
|
|
+#define OLDMEM_BASE 0x10418UL
|
|
+#define OLDMEM_SIZE 0x10420UL
|
|
+#define COMMAND_LINE 0x10480UL
|
|
#define COMMAND_LINE_SIZE 896
|
|
#define COMMAND_LINE_EXTRA 0xE000
|
|
|
|
@@ -30,11 +30,11 @@
|
|
#define IPL_FLAG_SECURE 0x40
|
|
|
|
#define DEFAULT_IMAGE_ADDR 0x10000
|
|
-#define DEFAULT_PSW_LOAD 0x0008000080010000L
|
|
-#define PSW_ADDR_MASK 0x000000007FFFFFFFL
|
|
+#define DEFAULT_PSW_LOAD 0x0008000080010000UL
|
|
+#define PSW_ADDR_MASK 0x000000007FFFFFFFUL
|
|
#define KERNEL_HEADER_SIZE 65536
|
|
|
|
-#define UNSPECIFIED_ADDRESS -1ULL
|
|
+#define UNSPECIFIED_ADDRESS -1UL
|
|
|
|
|
|
/* IPL Parameter List header */
|
|
--- a/zipl/include/zipl.h
|
|
+++ b/zipl/include/zipl.h
|
|
@@ -19,27 +19,27 @@
|
|
#define ZIPL_MAGIC_SIZE 4
|
|
#define DISK_LAYOUT_ID 0x00000001
|
|
|
|
-#define ZIPL_STAGE2_LOAD_ADDRESS 0x2000
|
|
-#define ZIPL_STAGE3_ENTRY_ADDRESS 0xa000LL
|
|
-#define DEFAULT_IMAGE_ADDRESS 0x10000LL
|
|
-#define KDUMP_IMAGE_ADDRESS 0x10010LL
|
|
-#define DEFAULT_STAGE3_ADDRESS 0xa000LL
|
|
-#define DEFAULT_STAGE3_PARAMS_ADDRESS 0x9000LL
|
|
-#define MINIMUM_ADDRESS 0x10000LL
|
|
-#define ADDRESS_LIMIT 0x80000000LL
|
|
+#define ZIPL_STAGE2_LOAD_ADDRESS 0x2000UL
|
|
+#define ZIPL_STAGE3_ENTRY_ADDRESS 0xa000UL
|
|
+#define DEFAULT_IMAGE_ADDRESS 0x10000UL
|
|
+#define KDUMP_IMAGE_ADDRESS 0x10010UL
|
|
+#define DEFAULT_STAGE3_ADDRESS 0xa000UL
|
|
+#define DEFAULT_STAGE3_PARAMS_ADDRESS 0x9000UL
|
|
+#define MINIMUM_ADDRESS 0x10000UL
|
|
+#define ADDRESS_LIMIT 0x80000000UL
|
|
#define ADDRESS_LIMIT_KDUMP 0x2000000UL /* HSA size: 32 MiB */
|
|
-#define UNSPECIFIED_ADDRESS -1ULL
|
|
-#define MAXIMUM_PARMLINE_SIZE 0x380
|
|
-#define MAXIMUM_PHYSICAL_BLOCKSIZE 0x1000
|
|
+#define UNSPECIFIED_ADDRESS -1UL
|
|
+#define MAXIMUM_PARMLINE_SIZE 0x380UL
|
|
+#define MAXIMUM_PHYSICAL_BLOCKSIZE 0x1000UL
|
|
|
|
-#define STAGE3_HEAP_SIZE 0x4000
|
|
-#define STAGE3_HEAP_ADDRESS 0x2000
|
|
-#define STAGE3_STACK_SIZE 0x1000
|
|
-#define STAGE3_STACK_ADDRESS 0xF000
|
|
+#define STAGE3_HEAP_SIZE 0x4000UL
|
|
+#define STAGE3_HEAP_ADDRESS 0x2000UL
|
|
+#define STAGE3_STACK_SIZE 0x1000UL
|
|
+#define STAGE3_STACK_ADDRESS 0xF000UL
|
|
|
|
-#define PSW_ADDRESS_MASK 0x000000007fffffffLL
|
|
-#define PSW_LOAD 0x0008000080000000LL
|
|
-#define PSW_DISABLED_WAIT 0x000a000000000000LL
|
|
+#define PSW_ADDRESS_MASK 0x000000007fffffffUL
|
|
+#define PSW_LOAD 0x0008000080000000UL
|
|
+#define PSW_DISABLED_WAIT 0x000a000000000000UL
|
|
|
|
#define BOOTMAP_FILENAME "bootmap"
|
|
#define BOOTMAP_TEMPLATE_FILENAME "bootmap_temp.XXXXXX"
|