From a66f6bb0756ba63d3cf6db17bbc4a02fa95fb8d7 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Wed, 18 Aug 2021 19:16:09 +0200 Subject: [PATCH] zipl: Adapt man pages for NVMe stand-alone dump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From user perspective, there is no difference between SCSI stand-alone dump and NVMe one. Signed-off-by: Alexander Egorenkov Reviewed-by: Alexander Gordeev Signed-off-by: Jan Höppner --- README.md | 13 +++++++------ zipl/man/zipl.8.in | 18 ++++++++++++------ zipl/man/zipl.conf.5.in | 8 +++++--- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 4b6c0c16..3a7cc863 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ Package contents - ttyrun-getty@.service: Instance unit to manage ttyrun * zipl: - Make DASDs or tapes bootable for system IPL or system dump. + Make DASDs, SCSIs, NVMes or tapes bootable for system IPL or system dump. * zgetdump: Retrieve system dumps from either tapes or DASDs. @@ -319,11 +319,12 @@ build options: This table lists additional build or install options: -| __COMPONENT__ | __OPTION__ | __TOOLS__ | -|------------------|:----------------------------:|:-----------------------:| -| dracut | `HAVE_DRACUT` | zdev, chreipl-fcp-mpath | -| initramfs-tools | `HAVE_INITRAMFS` | zdev | -| | `ZDEV_ALWAYS_UPDATE_INITRD` | zdev | +| __COMPONENT__ | __OPTION__ | __TOOLS__ | +|------------------|:----------------------------:|:------------------------:| +| dracut | `HAVE_DRACUT` | zdev, chreipl-fcp-mpath, | +| | | zipl | +| initramfs-tools | `HAVE_INITRAMFS` | zdev, zipl | +| | `ZDEV_ALWAYS_UPDATE_INITRD` | zdev | The s390-tools build process uses "pkg-config" if available and hard-coded compiler and linker options otherwise. diff --git a/zipl/man/zipl.8.in b/zipl/man/zipl.8.in index df57a736..0fa75375 100644 --- a/zipl/man/zipl.8.in +++ b/zipl/man/zipl.8.in @@ -75,7 +75,7 @@ for booting when the following requirements are met by the logical device setup: .IP " -" all boot relevant files (i.e. kernel, ramdisk and parameter files) must be located on a logical device which is mapped to a single physical disk of a type -supported by zipl (i.e. DASD or SCSI disk) +supported by zipl (i.e. DASD, SCSI or NVMe disk) .IP " -" adjacent data blocks on the logical device must correspond to adjacent blocks on the physical device @@ -133,7 +133,7 @@ Use the specified . .B zipl uses this directory to store the bootmap, i.e. a file containing boot data. The actual boot loader is installed onto the device containing -the target directory. Supported devices are DASD and SCSI disks. +the target directory. Supported devices are DASD, SCSI and NVMe disks. It is not possible to specify both this parameter and the name of a menu or configuration section on the command line at the same time. @@ -160,7 +160,7 @@ LDL: DASD disk with ECKD/linux disk layout .IP " -" 12 FBA: FBA disk DASD .IP " -" 12 -SCSI: SCSI disk +SCSI: SCSI or NVMe disk .PP .IP " " 8 This option is required when working with logical devices (see section @@ -257,10 +257,10 @@ or configuration section on the command line at the same time. .BR "\-d " " or " "--dumpto=" Install a system dump record on the device identified by DEVNODE. Supported devices are DASD ECKD or FBA disk partitions, -device mapper multipath partitions of FCP attached SCSI disks and IBM -3480/3490/3590/3592 tape devices. +device mapper multipath partitions of FCP attached SCSI disks, +partitions of NVMe disks and IBM 3480/3490/3590/3592 tape devices. -With the exception of SCSI, an optional decimal SIZE parameter may be +With the exception of SCSI/NVMe, an optional decimal SIZE parameter may be specified to determine the maximum dump size in bytes. SIZE can be suffixed by either of the letters K, M or G to signify that the decimal number be interpreted as kilobytes, megabytes or gigabytes respectively. SIZE will be @@ -407,6 +407,12 @@ While it is not recommended for reasons of recovery and redundancy, FCP. attached SCSI disks can also be accessed directly without multipathing,. for example via the "/dev/disk/by-path/" device nodes. +The NVMe stand-alone dump can be used only on IBM z15 or newer +machine generations because it requires larger amount of HSA memory offered +by firmware only on IBM z15 machines. Whereas the SCSI stand-alone dump is able +to work with HSA memory of 32M, the NVMe stand-alone dump requires 512M HSA +memory. + .SH SEE ALSO .BR zipl.conf (5), .BR zipl-editenv (8), diff --git a/zipl/man/zipl.conf.5.in b/zipl/man/zipl.conf.5.in index e9e66694..efce34af 100644 --- a/zipl/man/zipl.conf.5.in +++ b/zipl/man/zipl.conf.5.in @@ -43,6 +43,8 @@ create a system dump on a DASD disk partition or tape device .IP " -" create a system dump on a device mapper multipath partition device node of a SCSI disk +.IP " -" +create a system dump on a NVMe disk partition .PP To be able to specify more than one boot configuration, the @@ -370,7 +372,7 @@ indicates the menu name. .B Configuration section: .br Specify a DASD partition, device mapper multipath partition device node of a -SCSI disk or an IBM 3480/3490/3590 tape device on which to +SCSI disk, a NVMe partition or an IBM 3480/3490/3590 tape device on which to install a system dump record. Once a device prepared in such a way is booted, the current system status is written in a raw format to that device and can later be retrieved using the @@ -384,8 +386,8 @@ K, M or G to signify that the decimal number be interpreted as kilobytes, megabytes or gigabytes respectively. SIZE will be rounded up to the next megabyte boundary. Note that when you specify a SIZE lower than the actual memory size used by linux (see kernel parameter mem=), the resulting dump -will be incomplete. Also note that for SCSI dump the SIZE parameter is not -supported. +will be incomplete. Also note that for SCSI/NVMe dump the SIZE parameter +is not supported. .PP .B dumptofs