Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lsvpd for openSUSE:Factory checked in at 2021-01-26 14:48:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lsvpd (Old) and /work/SRC/openSUSE:Factory/.lsvpd.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lsvpd" Tue Jan 26 14:48:03 2021 rev:55 rq:866823 version:1.7.11 Changes: -------- --- /work/SRC/openSUSE:Factory/lsvpd/lsvpd.changes 2020-11-11 20:48:28.991764800 +0100 +++ /work/SRC/openSUSE:Factory/.lsvpd.new.28504/lsvpd.changes 2021-01-26 14:51:49.275847024 +0100 @@ -1,0 +2,8 @@ +Tue Jan 26 11:58:25 UTC 2021 - Michal Suchanek <msucha...@suse.de> + +- Fix display of NVME adapter firmware version (bsc#1181336 ltc#190621). + + lsvpd-nvme-Populate-NVMe-firmware-version.patch + + lsvpd-sysvpd-Add-UUID-property.patch + + lsvpd-sysfs-Fix-PCI-device-manufacturer-parsing-logic.patch + +------------------------------------------------------------------- New: ---- lsvpd-nvme-Populate-NVMe-firmware-version.patch lsvpd-sysfs-Fix-PCI-device-manufacturer-parsing-logic.patch lsvpd-sysvpd-Add-UUID-property.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsvpd.spec ++++++ --- /var/tmp/diff_new_pack.Ml2EfT/_old 2021-01-26 14:51:49.779847711 +0100 +++ /var/tmp/diff_new_pack.Ml2EfT/_new 2021-01-26 14:51:49.779847711 +0100 @@ -1,7 +1,7 @@ # # spec file for package lsvpd # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,10 @@ License: GPL-2.0-or-later Group: System/Monitoring URL: https://github.com/power-ras/lsvpd -Source0: https://github.com/power-ras/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://github.com/power-ras/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch1: lsvpd-sysvpd-Add-UUID-property.patch +Patch2: lsvpd-nvme-Populate-NVMe-firmware-version.patch +Patch3: lsvpd-sysfs-Fix-PCI-device-manufacturer-parsing-logic.patch BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: librtas-devel @@ -48,6 +51,7 @@ %prep %setup -q +%autopatch -p1 %build export CFLAGS="%{optflags} -UPCI_IDS -DPCI_IDS='\"%{_datadir}/pci.ids\"' -UUSB_IDS -DUSB_IDS='\"%{_datadir}/usb.ids\"'" ++++++ lsvpd-nvme-Populate-NVMe-firmware-version.patch ++++++ >From cc99870797f732129b4d2703a37461dac7c27098 Mon Sep 17 00:00:00 2001 From: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> Date: Fri, 22 Jan 2021 18:41:44 +0530 Subject: [PATCH 2/3] nvme: Populate NVMe firmware version Upstream: accepted - expected v1.7.12 Git-commit: cc99870797f732129b4d2703a37461dac7c27098 Looks like NVMe firmware version is added as `firmware_rev` property in sysfs. Also its not available in `vpd` blob. Hence add explicit logic to parse sysfs property. Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> --- src/internal/sys_interface/sysfstreecollector.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/internal/sys_interface/sysfstreecollector.cpp b/src/internal/sys_interface/sysfstreecollector.cpp index 4404013c3317..70fcc1bd52d8 100644 --- a/src/internal/sys_interface/sysfstreecollector.cpp +++ b/src/internal/sys_interface/sysfstreecollector.cpp @@ -1794,6 +1794,9 @@ ERROR: fillMe->mFirmwareLevel.setValue( getAttrValue( classNode, "fwrev" ), 30, __FILE__, __LINE__ ); + + fillMe->mFirmwareVersion.setValue( getAttrValue( classNode, + "firmware_rev" ), 30, __FILE__, __LINE__ ); } } -- 2.26.2 ++++++ lsvpd-sysfs-Fix-PCI-device-manufacturer-parsing-logic.patch ++++++ >From 0359436fdd467acd70c9fefa471570681d31e619 Mon Sep 17 00:00:00 2001 From: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> Date: Sun, 24 Jan 2021 22:37:38 +0530 Subject: [PATCH 3/3] sysfs: Fix PCI device manufacturer parsing logic Upstream: accepted - expected v1.7.12 Git-commit: 0359436fdd467acd70c9fefa471570681d31e619 If we fail to get manufacturer name using subsystem vendor ID then use vendor ID to get manufacturer name. Sample output diff with the this fix: ------------------------------------ *AX 0032:00 *YL 0032:00 *FC -*DS usb-xhci (00008241) +*DS usb-xhci (104c8241) *AX 0005:01:00.0 *AX wakeup0 *AX usbmon1 *AX usbmon2 *AX usb-xhci -*MF Unknown +*MF Texas Instruments *TM TUSB73x0 SuperSpeed USB 3.0 xHCI Host Controller -*CD 00008241 +*CD 104c8241 Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> --- src/internal/sys_interface/sysfstreecollector.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/internal/sys_interface/sysfstreecollector.cpp b/src/internal/sys_interface/sysfstreecollector.cpp index 70fcc1bd52d8..9e808de395bf 100644 --- a/src/internal/sys_interface/sysfstreecollector.cpp +++ b/src/internal/sys_interface/sysfstreecollector.cpp @@ -1434,7 +1434,8 @@ ERROR: if( mPciTable != NULL ) { // Fill Manufacturer Name - if( subMan == UNKNOWN_ID ) + if( subMan == UNKNOWN_ID || + (mPciTable->getName( subMan ) == "Unknown") ) { if( manID != UNKNOWN_ID ) { -- 2.26.2 ++++++ lsvpd-sysvpd-Add-UUID-property.patch ++++++ >From fa1638452b8299f1a7f8e9a94259b25218a92acc Mon Sep 17 00:00:00 2001 From: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> Date: Wed, 20 Jan 2021 12:30:51 +0530 Subject: [PATCH 1/3] sysvpd: Add UUID property Upstream: accepted - expected v1.7.12 Git-commit: fa1638452b8299f1a7f8e9a94259b25218a92acc Recent LPARs contains "ibm,partition-uuid" device tree property.. which is unique UUID for each LPAR. This is represented by `MU` keyword. Lets add support to parse this property and populate vpddb. Ideally we should enhance libvpd to support new keyword. But that will add depedency on libvpd version. Hence adding this new keyword (MU) as DeviceSpecific keyword. Signed-off-by: Vasant Hegde <hegdevas...@linux.vnet.ibm.com> --- src/internal/sys_interface/devicetreecollector.cpp | 6 ++++++ src/internal/sys_interface/icollector.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/internal/sys_interface/devicetreecollector.cpp b/src/internal/sys_interface/devicetreecollector.cpp index 6afbe85dfcb7..db4e8b5ad548 100644 --- a/src/internal/sys_interface/devicetreecollector.cpp +++ b/src/internal/sys_interface/devicetreecollector.cpp @@ -1215,6 +1215,12 @@ ERROR: sys->mSerialNum2.setValue( val, 80 , __FILE__, __LINE__ ); } + val = getAttrValue("/proc/device-tree", "ibm,partition-uuid" ); + if( val != "" ) + { + setVPDField( sys, string("MU"), val, __FILE__, __LINE__ ); + } + getSystemVPD(sys); } diff --git a/src/internal/sys_interface/icollector.cpp b/src/internal/sys_interface/icollector.cpp index ffa246650e3f..5c4dcccb5100 100644 --- a/src/internal/sys_interface/icollector.cpp +++ b/src/internal/sys_interface/icollector.cpp @@ -313,6 +313,8 @@ namespace lsvpd else if( key == "SE" ) { sys->mSerialNum1.setValue( val, 70, file, lineNum ); sys->mProcessorID.setValue( val, 70, file, lineNum ); + } else if ( key == "MU" ) { + sys->addDeviceSpecific( key, "UUID", val, 90 ); } else /* XXX: Un-recognized key */ sys->addDeviceSpecific( key, "System Specific", val, 90 ); -- 2.26.2
