diff --git a/.gitignore b/.gitignore index fb19af8..e18c389 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/powerpc-utils-1.3.9.tar.gz +SOURCES/powerpc-utils-1.3.10.tar.gz diff --git a/.powerpc-utils.metadata b/.powerpc-utils.metadata index 1fe2a38..afcb951 100644 --- a/.powerpc-utils.metadata +++ b/.powerpc-utils.metadata @@ -1 +1 @@ -03cfcd5c6dffe94409e501d4e603a3fd5de69739 SOURCES/powerpc-utils-1.3.9.tar.gz +4596fced545f3c751ff2665663baaed0db7ab7ce SOURCES/powerpc-utils-1.3.10.tar.gz diff --git a/SOURCES/powerpc-utils-1.3.10-distro.patch b/SOURCES/powerpc-utils-1.3.10-distro.patch new file mode 100644 index 0000000..84f8aa8 --- /dev/null +++ b/SOURCES/powerpc-utils-1.3.10-distro.patch @@ -0,0 +1,11 @@ +diff -up powerpc-utils-1.3.10/Makefile.am.me powerpc-utils-1.3.10/Makefile.am +--- powerpc-utils-1.3.10/Makefile.am.me 2022-06-03 12:35:01.335312481 +0200 ++++ powerpc-utils-1.3.10/Makefile.am 2022-06-03 14:11:58.453820076 +0200 +@@ -229,7 +229,6 @@ install-data-hook: + $(INSTALL_DATA) systemd/smtstate.service $(DESTDIR)${systemd_unit_dir}/ + $(INSTALL_DATA) systemd/hcn-init.service $(DESTDIR)${systemd_unit_dir}/ + $(INSTALL_DATA) var/lib/powerpc-utils/smt.state $(DESTDIR)/var/lib/@PACKAGE@/ +- $(INSTALL_SCRIPT) scripts/functions.suse $(DESTDIR)/usr/lib/@PACKAGE@/ + $(INSTALL_SCRIPT) scripts/smtstate $(DESTDIR)@sbindir@ + sed -i -e 's,$${exec_prefix},@prefix@,g' $(DESTDIR)${systemd_unit_dir}/smt_off.service + sed -i -e 's,$${exec_prefix},@prefix@,g' $(DESTDIR)${systemd_unit_dir}/smtstate.service diff --git a/SOURCES/powerpc-utils-1.3.8-man.patch b/SOURCES/powerpc-utils-1.3.10-manpages.patch similarity index 65% rename from SOURCES/powerpc-utils-1.3.8-man.patch rename to SOURCES/powerpc-utils-1.3.10-manpages.patch index a2279b4..29dba7e 100644 --- a/SOURCES/powerpc-utils-1.3.8-man.patch +++ b/SOURCES/powerpc-utils-1.3.10-manpages.patch @@ -1,3 +1,18 @@ +diff -up powerpc-utils-1.3.5/man/pseries_platform.8.me powerpc-utils-1.3.5/man/pseries_platform.8 +--- powerpc-utils-1.3.5/man/pseries_platform.8.me 2018-11-29 16:50:07.601034729 +0100 ++++ powerpc-utils-1.3.5/man/pseries_platform.8 2018-11-29 16:50:07.601034729 +0100 +@@ -0,0 +1,11 @@ ++.\" ++.\" Copyright (C) 2015 International Business Machines ++.\" ++.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" ++.SH NAME ++pseries_platform \- identify the platform and display the name of platform ++.SH SYNOPSIS ++.B /usr/bin/pseries_platform ++ ++.SH DESCRIPTION ++The \fIpseries_platform\fR tool can identify the platform and display the name of platform. diff -up powerpc-utils-1.2.15/man/lsdevinfo.8.man powerpc-utils-1.2.15/man/lsdevinfo.8 --- powerpc-utils-1.2.15/man/lsdevinfo.8.man 2013-01-16 15:31:13.886591137 +0100 +++ powerpc-utils-1.2.15/man/lsdevinfo.8 2013-01-16 15:31:13.886591137 +0100 @@ -242,3 +257,95 @@ diff -up powerpc-utils-1.2.15/man/rtas_event_decode.8.man powerpc-utils-1.2.15/m +.BI \-w " width" +limit the output to the specified width, default width is 80 characters. The width must be > 0 and < 1024. + +diff -up powerpc-utils-1.3.8/man/hcnmgr.8.me powerpc-utils-1.3.8/man/hcnmgr.8 +--- powerpc-utils-1.3.8/man/hcnmgr.8.me 2021-02-08 13:18:50.115407652 +0100 ++++ powerpc-utils-1.3.8/man/hcnmgr.8 2021-02-08 13:18:43.734322981 +0100 +@@ -0,0 +1,47 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. ++.TH HCNMGR "1" "hcnmgr contains a set of commands to support migratable SR_IOV logical port." "hcnmgr" ++.SH NAME ++hcnmgr \- hcnmgr contains a set of commands to support migratable SR_IOV logical port. ++.SH SYNOPSIS ++.B hcnmgr|hcnrmhcn|hcnrmdev|hcnqrydev|hcnversion ++[options] ++.SH DESCRIPTION ++hcnmgr contains a set of commands to support migratable SR_IOV logical port. ++The new commands configure/query/remove network devices. New commands should ++be called from the HMC, rather than directly from linux LPAR ++.PP ++Usage: hcncfgdrc DRC_INDEX= [STAKE_TOKEN=NULL] [-d] ++.IP ++Configure a device to hybrid network HCN ++.PP ++Usage: hcnrmhcn HCN_ID= ++.IP ++Remove a hybrid network HCN given an HCN ID ++.PP ++Usage: hcnrmdev DRC_INDEX= HCN_ID= ++.IP ++Unconfigure device from HCN ++.PP ++Usage: hcnqrydev DRC_INDEX= HCN_ID= ++.IP ++Query a device given a DRC_INDEX or HCN ID ++.PP ++Usage: hcnversion ++.IP ++get the current version of the HCN support ++.PP ++Optional arguments. ++.TP ++\fB\-s\fR ++scan device\-tree and configure HCN ++.TP ++\fB\-V\fR ++Display version information and exit ++.TP ++\fB\-h\fR ++Display this help information and exit ++.SH AUTHOR ++.B hcnmgr ++was written by Mingming Cao . ++.PP ++This manual page was written by Than Ngo . +diff -up powerpc-utils-1.3.5/man/update_flash_nv.8.me powerpc-utils-1.3.5/man/update_flash_nv.8 +--- powerpc-utils-1.3.5/man/update_flash_nv.8.me 2018-11-29 16:49:51.344987106 +0100 ++++ powerpc-utils-1.3.5/man/update_flash_nv.8 2018-11-29 16:49:42.589961458 +0100 +@@ -0,0 +1,15 @@ ++.\" ++.\" Copyright (C) 2015 International Business Machines ++.\" ++.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" ++.SH NAME ++update_flash_nv \- is a simple wrapper script (update_flash) to pass the image. ++.SH SYNOPSIS ++.B /usr/bin/update_flash_nv ++ ++.SH DESCRIPTION ++The \fIupdate_flash_nv\fR tool is simple wrapper script (update_flash) to pass the image. ++ ++.SH SEE ALSO ++update_flash(8). ++ +diff -up powerpc-utils-1.3.10/Makefile.am.me powerpc-utils-1.3.10/Makefile.am +--- powerpc-utils-1.3.10/Makefile.am.me 2022-06-03 12:35:01.335312481 +0200 ++++ powerpc-utils-1.3.10/Makefile.am 2022-06-03 12:46:42.460763120 +0200 +@@ -48,7 +48,17 @@ man_MANS = \ + man/vcpustat.8 \ + man/rtas_dbg.8 \ + man/drmgr.8 \ +- man/lparnumascore.8 ++ man/lparnumascore.8 \ ++ man/lsdevinfo.8 \ ++ man/rtas_event_decode.8 \ ++ man/ls-vdev.8 \ ++ man/lsprop.8 \ ++ man/ls-veth.8 \ ++ man/nvsetenv.8 \ ++ man/ls-vscsi.8 \ ++ man/pseries_platform.8 \ ++ man/update_flash_nv.8 \ ++ man/hcnmgr.8 + + EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) + diff --git a/SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch b/SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch deleted file mode 100644 index cd01843..0000000 --- a/SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up powerpc-utils-1.3.5/man/pseries_platform.8.me powerpc-utils-1.3.5/man/pseries_platform.8 ---- powerpc-utils-1.3.5/man/pseries_platform.8.me 2018-11-29 16:50:07.601034729 +0100 -+++ powerpc-utils-1.3.5/man/pseries_platform.8 2018-11-29 16:50:07.601034729 +0100 -@@ -0,0 +1,11 @@ -+.\" -+.\" Copyright (C) 2015 International Business Machines -+.\" -+.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" -+.SH NAME -+pseries_platform \- identify the platform and display the name of platform -+.SH SYNOPSIS -+.B /usr/bin/pseries_platform -+ -+.SH DESCRIPTION -+The \fIpseries_platform\fR tool can identify the platform and display the name of platform. diff --git a/SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch b/SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch deleted file mode 100644 index 273b418..0000000 --- a/SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up powerpc-utils-1.3.5/man/update_flash_nv.8.me powerpc-utils-1.3.5/man/update_flash_nv.8 ---- powerpc-utils-1.3.5/man/update_flash_nv.8.me 2018-11-29 16:49:51.344987106 +0100 -+++ powerpc-utils-1.3.5/man/update_flash_nv.8 2018-11-29 16:49:42.589961458 +0100 -@@ -0,0 +1,15 @@ -+.\" -+.\" Copyright (C) 2015 International Business Machines -+.\" -+.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" -+.SH NAME -+update_flash_nv \- is a simple wrapper script (update_flash) to pass the image. -+.SH SYNOPSIS -+.B /usr/bin/update_flash_nv -+ -+.SH DESCRIPTION -+The \fIupdate_flash_nv\fR tool is simple wrapper script (update_flash) to pass the image. -+ -+.SH SEE ALSO -+update_flash(8). -+ diff --git a/SOURCES/powerpc-utils-1.3.8-hcnmgr.patch b/SOURCES/powerpc-utils-1.3.8-hcnmgr.patch deleted file mode 100644 index deffa8d..0000000 --- a/SOURCES/powerpc-utils-1.3.8-hcnmgr.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up powerpc-utils-1.3.8/Makefile.am.me powerpc-utils-1.3.8/Makefile.am ---- powerpc-utils-1.3.8/Makefile.am.me 2020-10-01 13:33:29.444024403 +0200 -+++ powerpc-utils-1.3.8/Makefile.am 2020-10-01 13:34:08.284854506 +0200 -@@ -56,7 +56,8 @@ man_MANS = \ - man/nvsetenv.8 \ - man/ls-vscsi.8 \ - man/pseries_platform.8 \ -- man/update_flash_nv.8 -+ man/update_flash_nv.8 \ -+ man/hcnmgr.8 - - EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) - -diff -up powerpc-utils-1.3.8/man/hcnmgr.8.me powerpc-utils-1.3.8/man/hcnmgr.8 ---- powerpc-utils-1.3.8/man/hcnmgr.8.me 2021-02-08 13:18:50.115407652 +0100 -+++ powerpc-utils-1.3.8/man/hcnmgr.8 2021-02-08 13:18:43.734322981 +0100 -@@ -0,0 +1,47 @@ -+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -+.TH HCNMGR "1" "hcnmgr contains a set of commands to support migratable SR_IOV logical port." "hcnmgr" -+.SH NAME -+hcnmgr \- hcnmgr contains a set of commands to support migratable SR_IOV logical port. -+.SH SYNOPSIS -+.B hcnmgr|hcnrmhcn|hcnrmdev|hcnqrydev|hcnversion -+[options] -+.SH DESCRIPTION -+hcnmgr contains a set of commands to support migratable SR_IOV logical port. -+The new commands configure/query/remove network devices. New commands should -+be called from the HMC, rather than directly from linux LPAR -+.PP -+Usage: hcncfgdrc DRC_INDEX= [STAKE_TOKEN=NULL] [-d] -+.IP -+Configure a device to hybrid network HCN -+.PP -+Usage: hcnrmhcn HCN_ID= -+.IP -+Remove a hybrid network HCN given an HCN ID -+.PP -+Usage: hcnrmdev DRC_INDEX= HCN_ID= -+.IP -+Unconfigure device from HCN -+.PP -+Usage: hcnqrydev DRC_INDEX= HCN_ID= -+.IP -+Query a device given a DRC_INDEX or HCN ID -+.PP -+Usage: hcnversion -+.IP -+get the current version of the HCN support -+.PP -+Optional arguments. -+.TP -+\fB\-s\fR -+scan device\-tree and configure HCN -+.TP -+\fB\-V\fR -+Display version information and exit -+.TP -+\fB\-h\fR -+Display this help information and exit -+.SH AUTHOR -+.B hcnmgr -+was written by Mingming Cao . -+.PP -+This manual page was written by Than Ngo . diff --git a/SOURCES/powerpc-utils-1.3.8-install-man.patch b/SOURCES/powerpc-utils-1.3.8-install-man.patch deleted file mode 100644 index e7ff074..0000000 --- a/SOURCES/powerpc-utils-1.3.8-install-man.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up powerpc-utils-1.3.8/Makefile.am.me powerpc-utils-1.3.8/Makefile.am ---- powerpc-utils-1.3.8/Makefile.am.me 2020-09-04 11:37:54.042763518 +0200 -+++ powerpc-utils-1.3.8/Makefile.am 2020-09-04 11:39:06.262151924 +0200 -@@ -54,7 +54,9 @@ man_MANS = \ - man/lsprop.8 \ - man/ls-veth.8 \ - man/nvsetenv.8 \ -- man/ls-vscsi.8 -+ man/ls-vscsi.8 \ -+ man/pseries_platform.8 \ -+ man/update_flash_nv.8 - - EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) - diff --git a/SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch b/SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch deleted file mode 100644 index c684057..0000000 --- a/SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 5c2d5e838e8a9e2e744b89fa42724118e1cccded -Author: Mingming Cao -Date: Thu Feb 24 09:02:05 2022 -0800 - - hcnmgr: Fix NM HNV setting primary slave - - Fix incorrect usage active_slave attribute instead of primary. - - Signed-off-by: Mingming Cao - Signed-off-by: Tyrel Datwyler - -diff --git a/scripts/hcnmgr b/scripts/hcnmgr -index fdb6eaa..3dc1ad2 100644 ---- a/scripts/hcnmgr -+++ b/scripts/hcnmgr -@@ -375,7 +375,7 @@ do_config_vdevice_nm() { - # if the device is primary, and link is up, force it as primary se - if [[ $MODE == "primary" ]]; then - hcnlog INFO "Change bonding primary slave to $DEVNAME" -- echo "$DEVNAME" >"$BOND_PATH"/active_slave -+ echo "$DEVNAME" >"$BOND_PATH"/primary - fi - - hcnlog DEBUG "do_config_vdevice: exit" diff --git a/SOURCES/powerpc-utils-1.3.9-bootlist-fix-nvme-support-in-ANA-mode.patch b/SOURCES/powerpc-utils-1.3.9-bootlist-fix-nvme-support-in-ANA-mode.patch deleted file mode 100644 index 699a6af..0000000 --- a/SOURCES/powerpc-utils-1.3.9-bootlist-fix-nvme-support-in-ANA-mode.patch +++ /dev/null @@ -1,78 +0,0 @@ -commit 98c8519b832ddb93021c3eeb8eee0f5e51c49197 -Author: Wen Xiong -Date: Thu Sep 30 08:53:13 2021 -0500 - - ofpathname: Fix nvme support in ANA mode - - nvme_core.multipath is Y by defaut in the latest rhel - and sles linux release. The patch fixes the issue when - nvme_core.multipath=Y - - Signed-off-by: Wen Xiong - Signed-off-by: Tyrel Datwyler - -diff --git a/scripts/ofpathname b/scripts/ofpathname -index c4d81f2..310ee3e 100755 ---- a/scripts/ofpathname -+++ b/scripts/ofpathname -@@ -640,6 +640,7 @@ l2of_nvme() - # disk: nvmeX, nvmeXnY; not nvmeXnYpZ - local devdisk="${DEVICE%p[0-9]*}" - -+ local dev_ctrl=${devdisk%n[0-9]*} - # namespace id: Y in nvmeXnY, nvmeXnYpZ - local devnsid="${devdisk#nvme[0-9]*n}" - if [[ $devnsid = $devdisk ]]; then -@@ -656,7 +657,7 @@ l2of_nvme() - local dir - local found=0 - -- for dir in `$FIND /sys/devices -name "$DEVICE"`; do -+ for dir in `$FIND /sys/devices -name "$dev_ctrl"`; do - cd $dir - - goto_dir $PWD "device/devspec" -@@ -666,8 +667,10 @@ l2of_nvme() - found=1 - if [[ -n $devnsid ]]; then - # Linux logical nsid might not match nvme controller nsid -- goto_dir $dir "nsid" -- devnsid=`$CAT $PWD/nsid | tr -d '\000'` -+ for nsid_dir in `$FIND /sys/devices -name "DEVICE"`; do -+ goto_dir $dir_dir "nsid" -+ devnsid=`$CAT $PWD/nsid | tr -d '\000'` -+ done - fi - break - fi -@@ -1056,7 +1059,8 @@ ofpathname_to_logical() - - # Remove any possible partition reference - PART=$(expr "$DEVICE" : '.*\(:[0-9]\)') -- if [[ -n $PART ]] ; then -+ if [[ -n $PART ]] && \ -+ [[ $DEVTYPE != "nvme" ]]; then - PART=${PART:1} - DEVICE=${DEVICE%:[0-9]} - fi -@@ -1083,7 +1087,8 @@ ofpathname_to_logical() - fi - - # Add any previously stripped partition reference -- if [[ -n $PART ]] ; then -+ if [[ -n $PART ]] && \ -+ [[ $DEVTYPE != "nvme" ]]; then - LOGICAL_DEVNAME=$LOGICAL_DEVNAME$PART - fi - -@@ -1650,6 +1655,10 @@ of2l_nvme() - continue - fi - -+ if [[ "$PWD" == *"nvme-fabrics"* ]]; then -+ continue -+ fi -+ - goto_dir $PWD "devspec" - local devspec=`$CAT ./devspec 2>/dev/null` - diff --git a/SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch b/SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch deleted file mode 100644 index 9b7b2bb..0000000 --- a/SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up powerpc-utils-1.3.9/scripts/hcnmgr.me powerpc-utils-1.3.9/scripts/hcnmgr ---- powerpc-utils-1.3.9/scripts/hcnmgr.me 2021-11-11 11:38:33.293898966 +0100 -+++ powerpc-utils-1.3.9/scripts/hcnmgr 2021-11-11 11:39:19.302587637 +0100 -@@ -168,7 +168,7 @@ search_dev() { - # Look at pci ethernet devices - for pci_dev in "$DT_PATH"/pci*; do - [ -d "$pci_dev" ] || continue -- index=$(hexdump -n 4 -e '/1 "%02x"' "$pci_dev"/ibm,my-drc-index) -+ index=$(hexdump -n 4 -ve '/1 "%02x"' "$pci_dev"/ibm,my-drc-index) - if [[ $index != "$1" ]]; then - continue - fi -@@ -189,7 +189,7 @@ search_dev() { - hcnlog DEBUG "search vnic device with drc_index $1" - for dev in "$DT_PATH"/vdevice/vnic*; do - [ -d "$dev" ] || continue -- index=$(hexdump -n 4 -e '/1 "%02x"' "$dev"/ibm,my-drc-index) -+ index=$(hexdump -n 4 -ve '/1 "%02x"' "$dev"/ibm,my-drc-index) - if [[ $index == "$1" ]]; then - hcnlog DEBUG "found matching drc_index $index in $dev" - if [ -e "$dev"/ibm,hcn-id ] && get_dev_hcn "$dev"; then -@@ -205,7 +205,7 @@ search_dev() { - hcnlog DEBUG "search ibmveth device with drc_index $1" - for dev in "$DT_PATH"/vdevice/l-lan*; do - [ -d "$dev" ] || continue -- index=$(hexdump -n 4 -e '/1 "%02x"' "$dev"/ibm,my-drc-index) -+ index=$(hexdump -n 4 -ve '/1 "%02x"' "$dev"/ibm,my-drc-index) - if [[ $index == "$1" ]]; then - hcnlog DEBUG "found matching drc_index $index in $dev" - if [ -e "$dev"/ibm,hcn-id ] && get_dev_hcn "$dev"; then -@@ -233,7 +233,7 @@ get_dev_hcn() { - local dev=$1 - - hcnlog DEBUG "get_dev_hcn: enter $1" -- HCNID=$(hexdump -n 4 -e '/1 "%02x"' "$dev"/ibm,hcn-id) -+ HCNID=$(hexdump -n 4 -ve '/1 "%02x"' "$dev"/ibm,hcn-id) - MODE=$(tr -d '\0' <"$dev"/ibm,hcn-mode) - PHYSLOC=$(tr -d '\0' <"$dev"/ibm,loc-code) - DEVPATH=$1 diff --git a/SOURCES/powerpc-utils-1.3.9-makefile.patch b/SOURCES/powerpc-utils-1.3.9-makefile.patch deleted file mode 100644 index 80b72ae..0000000 --- a/SOURCES/powerpc-utils-1.3.9-makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up powerpc-utils-1.3.9/Makefile.am.me powerpc-utils-1.3.9/Makefile.am ---- powerpc-utils-1.3.9/Makefile.am.me 2021-07-19 12:30:46.169839551 +0200 -+++ powerpc-utils-1.3.9/Makefile.am 2021-07-19 12:33:10.336034675 +0200 -@@ -48,7 +48,14 @@ man_MANS = \ - man/vcpustat.8 \ - man/rtas_dbg.8 \ - man/drmgr.8 \ -- man/lparnumascore.8 -+ man/lparnumascore.8 \ -+ man/lsdevinfo.8 \ -+ man/rtas_event_decode.8 \ -+ man/ls-vdev.8 \ -+ man/lsprop.8 \ -+ man/ls-veth.8 \ -+ man/nvsetenv.8 \ -+ man/ls-vscsi.8 - - EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) - diff --git a/SOURCES/powerpc-utils-1.3.9-sanitize-devspec-output.patch b/SOURCES/powerpc-utils-1.3.9-sanitize-devspec-output.patch deleted file mode 100644 index e8d1f39..0000000 --- a/SOURCES/powerpc-utils-1.3.9-sanitize-devspec-output.patch +++ /dev/null @@ -1,62 +0,0 @@ -commit d8408b429ff022ff446ac2607bc26eaf60627658 -Author: Tyrel Datwyler -Date: Mon Jan 10 16:55:58 2022 -0500 - - errinjct: sanitize devspec output of a newline if one is present - - Linux Kernel Commit: 14c19b2a40b6 ("PCI/sysfs: Add 'devspec' newline") - introduced a newline character at the end of the devspec result which - historically did not have one before. When a newline is present the - errinjct utility constructs an invalid pathname for a PCI devices /reg - property in the device tree. As a result the tool fails to provide a - valid config address to RTAS resulting in a (-3) Parameter Error. - - errinjct eeh -v -f 6 -s net/eth1 -a 0xe0800000 -m 0xff800000 - errinjct: Could not open file /proc/device-tree//pci@800000020000154/ethernet@0,1 - /reg, No such file or directory - - Injecting an ioa-bus-error with the following data: - - BUS ADDR: e0800000 - ADDR MASK: ff800000 - CONFIG ADDR: 1 - PHB UNIT_ID: 800000020000154 - FUNCTION: 6 - Store to PCI Memory Address Space - inject an Address Parity Error - errinjct: RTAS error injection failed! - - errinjct: RTAS: ioa-bus-error: Argument error (-3) - - Fix this issue by nul terminating the devspec output string at the newline - if present. - - Signed-off-by: Tyrel Datwyler - -diff --git a/src/errinjct/ioa_bus_error.c b/src/errinjct/ioa_bus_error.c -index 281b56b..fc38037 100644 ---- a/src/errinjct/ioa_bus_error.c -+++ b/src/errinjct/ioa_bus_error.c -@@ -232,7 +232,7 @@ static int parse_sysfsname(void) - { - char path[BUFSZ]; - char *devspec; -- char *at; -+ char *at, *nl; - uint32_t addr; - uint64_t phb_id; - -@@ -247,6 +247,14 @@ static int parse_sysfsname(void) - if (!devspec) - return 1; - -+ /* Linux Kernel Commit: 14c19b2a40b6 ("PCI/sysfs: Add 'devspec' newline") -+ * began reporting the devspec value for pci devices with a trailing newline. -+ * Remove the newline if present to ensure our built pathname for obtaining -+ * the config address is valid. */ -+ nl = strchr(devspec, '\n'); -+ if (nl) -+ *nl = '\0'; -+ - /* Now we parse something like /pci@400000000112/pci@2/ethernet@1 for - * BUID HI =4000 and LOW 00000112 */ - at = strchr(devspec, '@'); diff --git a/SOURCES/powerpc-utils-c44313686e69123c00406727ea44e52873a1e2c4.patch b/SOURCES/powerpc-utils-c44313686e69123c00406727ea44e52873a1e2c4.patch deleted file mode 100644 index 6909b3a..0000000 --- a/SOURCES/powerpc-utils-c44313686e69123c00406727ea44e52873a1e2c4.patch +++ /dev/null @@ -1,41 +0,0 @@ -commit c44313686e69123c00406727ea44e52873a1e2c4 -Author: Tyrel Datwyler -Date: Sat Mar 5 15:31:25 2022 -0600 - - bootlist: fix passing -l flag to kpartx as -p delimiter value - - When $delim is empty in dm_to_part() the kpartx command will wrongly use - the -l option flag as the delimiter input for the -p flag. Fix this be - quoting $delim. - - The variable delim is NULL (empty) in this case and it shows wrong - partitions. - - kpartx -p -l /dev/mapper/mpatha - mpatha-l1 : 0 8192 /dev/mapper/mpatha 8192 - mpatha-l2 : 0 2097152 /dev/mapper/mpatha 16384 - mpatha-l3 : 0 14663680 /dev/mapper/mpatha 2113536 - - With quotation it shows correct correct. - - kpartx -p "" -l /dev/mapper/mpatha - mpatha1 : 0 8192 /dev/mapper/mpatha 8192 - mpatha2 : 0 2097152 /dev/mapper/mpatha 16384 - mpatha3 : 0 14663680 /dev/mapper/mpatha 2113536 - - Suggested-by: Than Ngo - Signed-off-by: Tyrel Datwyler - -diff --git a/scripts/bootlist b/scripts/bootlist -index e36f062..6187d6f 100755 ---- a/scripts/bootlist -+++ b/scripts/bootlist -@@ -270,7 +270,7 @@ dm_to_part() - done - - -- kpartx -p $delim -l $dmmapper | while read kp ; do -+ kpartx -p "$delim" -l "$dmmapper" | while read kp ; do - kpname=${kp%% *} - tmajor=$(stat -L --format="%t" /dev/mapper/$kpname 2>/dev/null) - tminor=$(stat -L --format="%T" /dev/mapper/$kpname 2>/dev/null) diff --git a/SOURCES/powerpc-utils-d512169a87cc146bcd3844f266abef903d8d3c54.patch b/SOURCES/powerpc-utils-d512169a87cc146bcd3844f266abef903d8d3c54.patch deleted file mode 100644 index 875fab4..0000000 --- a/SOURCES/powerpc-utils-d512169a87cc146bcd3844f266abef903d8d3c54.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit d512169a87cc146bcd3844f266abef903d8d3c54 -Author: Tyrel Datwyler -Date: Sat Mar 5 15:34:06 2022 -0600 - - bootlist: fix invalid hex number message - - In dm_to_part() when kpartx returns no partitions tmajor and tminor are - empty. As a result the $(printf %d:%d 0x$tmajor 0x$tminor) command - subsititution reports the following error: - - /usr/sbin/bootlist: line 277: printf: 0x: invalid hex number - - Fix this by redirecting stderr to /dev/null. - - Suggested-by: Than Ngo - Signed-off-by: Tyrel Datwyler - -diff --git a/scripts/bootlist b/scripts/bootlist -index 6187d6f..b5cfbd9 100755 ---- a/scripts/bootlist -+++ b/scripts/bootlist -@@ -277,7 +277,7 @@ dm_to_part() - tmajmin=$(printf "%d:%d" 0x$tmajor 0x$tminor) - if [[ "$tmajmin" = "$dmpmajmin" ]]; then - partstart=${kp##* } -- for part in `ls -1d /sys/block/$sddev/$sddev*`; do -+ for part in `ls -1d /sys/block/$sddev/$sddev* 2>/dev/null`; do - pstart=$(cat $part/start 2>/dev/null) - if [[ "$pstart" -eq "$partstart" ]] ; then - echo "${part##*/}" diff --git a/SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch b/SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch deleted file mode 100644 index f93d611..0000000 --- a/SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up powerpc-utils-1.3.8/scripts/hcnmgr.me powerpc-utils-1.3.8/scripts/hcnmgr ---- powerpc-utils-1.3.8/scripts/hcnmgr.me 2021-11-11 11:10:37.800910318 +0100 -+++ powerpc-utils-1.3.8/scripts/hcnmgr 2021-11-11 11:12:10.597104063 +0100 -@@ -21,7 +21,7 @@ - # support live partition migration with SR_IOV - # - --VERSION="1.0" -+VERSION="1.1" - PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin - BOND_BASEPATH="/sys/class/net" - BONDOPTIONS="mode=1,miimon=100,fail_over_mac=2" -@@ -630,6 +630,9 @@ fi - if ! nmcli --version >/dev/null 2>&1; then - err $E_ENETUNREACH - fi -+# HNV can support VNIC or Veth as backup device. -+# In the first HNV version 1.0, the vNIC as backup support was turned off -+# HNV VERSION greater than 1.0 starts to support vNIC as the backup device - if [[ $VERSION == "1.0" ]]; then - VNIC_SPT="OFF" - fi diff --git a/SPECS/powerpc-utils.spec b/SPECS/powerpc-utils.spec index c9798ce..34f8501 100644 --- a/SPECS/powerpc-utils.spec +++ b/SPECS/powerpc-utils.spec @@ -1,12 +1,14 @@ Name: powerpc-utils -Version: 1.3.9 -Release: 8%{?dist} +Version: 1.3.10 +Release: 2%{?dist} Summary: PERL-based scripts for maintaining and servicing PowerPC systems License: GPLv2 URL: https://github.com/ibm-power-utilities/powerpc-utils Source0: https://github.com/ibm-power-utilities/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: nvsetenv +Patch0: powerpc-utils-1.3.10-manpages.patch +Patch1: powerpc-utils-1.3.10-distro.patch ExclusiveArch: ppc %{power64} @@ -25,23 +27,6 @@ BuildRequires: numactl-devel Requires: perl(Data::Dumper) Requires: %{name}-core = %{version}-%{release} -Patch1: powerpc-utils-1.3.8-man.patch -Patch2: powerpc-utils-1.3.9-makefile.patch -Patch3: powerpc-utils-1.3.5-pseries_platform-man.patch -Patch4: powerpc-utils-1.3.5-update_flash_nv.patch -Patch5: powerpc-utils-1.3.8-install-man.patch -Patch7: powerpc-utils-1.3.8-hcnmgr.patch -# enable support for vnic as backup device -Patch8: powerpc-utils-support-vnic-as-backup-device-for-HNV.patch -# fixed hexdump format -Patch9: powerpc-utils-1.3.9-fix-hexdump-format.patch -Patch10: powerpc-utils-1.3.9-sanitize-devspec-output.patch -# bootlist fix -Patch11: powerpc-utils-1.3.9-bootlist-fix-nvme-support-in-ANA-mode.patch -Patch12: powerpc-utils-c44313686e69123c00406727ea44e52873a1e2c4.patch -Patch13: powerpc-utils-d512169a87cc146bcd3844f266abef903d8d3c54.patch -Patch14: powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch - %description PERL-based scripts for maintaining and servicing PowerPC systems. @@ -134,8 +119,8 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || : %files core %license COPYING -%dir /var/lib/powerpc-utils -%ghost %config(missingok,noreplace) /var/lib/powerpc-utils/smt.state +%dir %{_localstatedir}/lib/powerpc-utils +%config(noreplace) %{_localstatedir}/lib/powerpc-utils/smt.state %{_unitdir}/smtstate.service %{_unitdir}/smt_off.service %{_unitdir}/hcn-init.service @@ -210,13 +195,15 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || : %changelog -* Tue Apr 26 2022 Than Ngo - 1.3.9-8 -- Resolves: #2078532, hcnmgr: Fix NM HNV setting primary slave +* Mon Jun 06 2022 Than Ngo - 1.3.10-2 +- Related: #2089106, install smt.state as config file -* Thu Mar 17 2022 Than Ngo - 1.3.9-7 -- fix invalid hex number message -- ofpathname: Fix nvme support in ANA mode - Resolves: #2017652 +* Mon Jun 06 2022 Than Ngo - 1.3.10-1 +- Resolves: #1920964, P10 Power Mode Reporting +- Resolves: #2050893, Linux Hybrid Network Virtualizatio +- Resolves: #2065169, bootloader fails to update boot order after OS install +- Resolves: #2071862, Fix NM HNV setting primary slave +- Resolves: #2089106, smtstate --save command failed * Fri Jan 14 2022 Than Ngo - 1.3.9-6 - Resolves: #2039201, santize devspec output of a newline if one is present