From f42b31abce334842b5c749e644e3f277d0eaa9d5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 28 Apr 2020 05:35:10 -0400 Subject: [PATCH] import lshw-B.02.18-23.el8 --- ...roper-logical-name-of-network-device.patch | 49 +++++++++++++++ ...how-modified-time-with-notime-option.patch | 42 +++++++++++++ ...0001-spd-Print-dimm-rank-information.patch | 62 +++++++++++++++++++ .../0002-devtree-Add-DIMM-running-speed.patch | 43 +++++++++++++ SPECS/lshw.spec | 28 +++++++-- 5 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 SOURCES/0001-Display-proper-logical-name-of-network-device.patch create mode 100644 SOURCES/0001-Do-not-show-modified-time-with-notime-option.patch create mode 100644 SOURCES/0001-spd-Print-dimm-rank-information.patch create mode 100644 SOURCES/0002-devtree-Add-DIMM-running-speed.patch diff --git a/SOURCES/0001-Display-proper-logical-name-of-network-device.patch b/SOURCES/0001-Display-proper-logical-name-of-network-device.patch new file mode 100644 index 0000000..9e9ad45 --- /dev/null +++ b/SOURCES/0001-Display-proper-logical-name-of-network-device.patch @@ -0,0 +1,49 @@ +From 85edb6a1a5734078a58bad21a5e6918e07f360bc Mon Sep 17 00:00:00 2001 +From: Mamatha Inamdar +Date: Tue, 30 Apr 2019 17:24:50 +0530 +Subject: [PATCH] Display proper logical name of network device + +This patch adds support to display proper logical name of +network devices. + +Test results: + + *-l-lan + description: Ethernet interface + physical id: 2 + bus info: vio@30000002 + logical name: /proc/device-tree/vdevice/l-lan@30000002 + +With patch: + + *-l-lan + description: Ethernet interface + physical id: 2 + bus info: vio@30000002 + logical name: /proc/device-tree/vdevice/l-lan@30000002 + logical name: eth0 + +Signed-off-by: Mamatha Inamdar +Signed-off-by: Shivaprasad G Bhat +--- + src/core/hw.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/hw.cc b/src/core/hw.cc +index f136383e99fb..4522c1af0fc3 100644 +--- a/src/core/hw.cc ++++ b/src/core/hw.cc +@@ -1284,8 +1284,8 @@ void hwNode::merge(const hwNode & node) + This->handle = node.getHandle(); + if (This->description == "") + This->description = node.getDescription(); +- if (This->logicalnames.size() == 0) +- This->logicalnames = node.getLogicalNames(); ++ for (unsigned int i = 0; i < node.This->logicalnames.size(); i++) ++ setLogicalName(node.This->logicalnames[i]); + if (This->businfo == "") + This->businfo = node.getBusInfo(); + if (This->physid == "") +-- +2.17.1 + diff --git a/SOURCES/0001-Do-not-show-modified-time-with-notime-option.patch b/SOURCES/0001-Do-not-show-modified-time-with-notime-option.patch new file mode 100644 index 0000000..4284f80 --- /dev/null +++ b/SOURCES/0001-Do-not-show-modified-time-with-notime-option.patch @@ -0,0 +1,42 @@ +From 1553540346701a501f77e73ba45b24e586013584 Mon Sep 17 00:00:00 2001 +From: Seeteena Thoufeek +Date: Thu, 13 Jul 2017 14:18:08 +0530 +Subject: [PATCH] Do not show modified time with -notime option + +Exclude volatile attributes (timestamps) from lshw -notime output. + +Signed-off-by: Seeteena Thoufeek +[Updated description and fixed detect_hfsx() - Vasant] +Signed-off-by: Vasant Hegde +--- + src/core/volumes.cc | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/core/volumes.cc b/src/core/volumes.cc +index 07a253bddbf1..456809a37ae2 100644 +--- a/src/core/volumes.cc ++++ b/src/core/volumes.cc +@@ -651,8 +651,10 @@ static bool detect_hfsx(hwNode & n, source & s) + wtime = (time_t)(be_long(&vol->modifyDate) - HFSTIMEOFFSET); + n.setConfig("created", datetime(mkfstime, false)); // creation time uses local time + if (enabled("output:time")) ++ { + n.setConfig("checked", datetime(fscktime)); +- n.setConfig("modified", datetime(wtime)); ++ n.setConfig("modified", datetime(wtime)); ++ } + + return true; + } +@@ -742,7 +744,7 @@ static bool detect_hfs(hwNode & n, source & s) + n.setConfig("created", datetime(mkfstime - HFSTIMEOFFSET, false)); // all dates use local time + if(dumptime) + n.setConfig("backup", datetime(dumptime - HFSTIMEOFFSET, false)); +- if(wtime) ++ if(wtime && enabled("output:time")) + n.setConfig("modified", datetime(wtime - HFSTIMEOFFSET, false)); + + return true; +-- +2.17.1 + diff --git a/SOURCES/0001-spd-Print-dimm-rank-information.patch b/SOURCES/0001-spd-Print-dimm-rank-information.patch new file mode 100644 index 0000000..420fb46 --- /dev/null +++ b/SOURCES/0001-spd-Print-dimm-rank-information.patch @@ -0,0 +1,62 @@ +From 881075c79be4706a2b3bcd5a75eb659b0e394fce Mon Sep 17 00:00:00 2001 +From: Vasant Hegde +Date: Mon, 23 Apr 2018 16:41:40 +0530 +Subject: [PATCH] spd: Print dimm rank information + +Print DIMM rank information under configuration. Supported for +DDR3 and DDR4. + +Sample output: + *-bank:1 + description: RDIMM DDR4 2666 MHz (0.4ns) + product: M393A2G40EB2-CTD + ...... + configuration: errordetection=ecc rank=1 + +Signed-off-by: Vasant Hegde +Signed-off-by: Lianbo Jiang +--- + src/core/device-tree.cc | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc +index 642b3c54ece1..a510e4bea726 100644 +--- a/src/core/device-tree.cc ++++ b/src/core/device-tree.cc +@@ -862,6 +862,7 @@ static void add_memory_bank_spd(string path, hwNode & bank) + close(fd); + + if (dimminfo[2] >= 9) { ++ int rank_offset; + double ns; + char vendor[5]; + const char *type, *mod_type; +@@ -878,6 +879,7 @@ static void add_memory_bank_spd(string path, hwNode & bank) + partno_offset = 0x149; + bus_width_offset = 0x0d; + serial_offset = 0x145; ++ rank_offset = 0xc; + + /* + * There is no other valid values for the medium- and fine- timebase +@@ -896,6 +898,7 @@ static void add_memory_bank_spd(string path, hwNode & bank) + partno_offset = 0x80; + serial_offset = 0x7a; + bus_width_offset = 0x08; ++ rank_offset = 0x7; + + ns = (dimminfo[0xc] / 2) * (dimminfo[0xa] / (float) dimminfo[0xb]); + snprintf(vendor, sizeof(vendor), "%x%x", dimminfo[0x76], dimminfo[0x75]); +@@ -913,6 +916,9 @@ static void add_memory_bank_spd(string path, hwNode & bank) + break; + } + ++ // Add DIMM rank ++ bank.setConfig("rank", ((dimminfo[rank_offset] >> 3) & 0x7) + 1); ++ + bank.setClock(1000000000 / ns); + bank.setVendor(jedec_resolve(vendor)); + +-- +2.17.1 + diff --git a/SOURCES/0002-devtree-Add-DIMM-running-speed.patch b/SOURCES/0002-devtree-Add-DIMM-running-speed.patch new file mode 100644 index 0000000..36544af --- /dev/null +++ b/SOURCES/0002-devtree-Add-DIMM-running-speed.patch @@ -0,0 +1,43 @@ +From 8d03e1e101c92a8c30103e4fcf3b930d37202e86 Mon Sep 17 00:00:00 2001 +From: Vasant Hegde +Date: Mon, 23 Apr 2018 23:37:33 +0530 +Subject: [PATCH] devtree: Add DIMM running speed + +We parse 'spd' data to get max speed. But actual running speed may be +lesser than max speed. On recent Power System we have 'frequency' +property inside memory node in device tree. Lets add support in lshw +to display this information. + +Sample output: + *-bank:1 + description: RDIMM DDR4 2666 MHz (0.4ns) + product: HMAA8GR7A2R4N-VN + physical id: 0 + .... + .... + clock: 2666MHz (0.4ns) + +Signed-off-by: Vasant Hegde +Signed-off-by: Lianbo Jiang +--- + src/core/device-tree.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/core/device-tree.cc b/src/core/device-tree.cc +index dea4140b3a96..c53558d08f3d 100644 +--- a/src/core/device-tree.cc ++++ b/src/core/device-tree.cc +@@ -1038,6 +1038,10 @@ static void add_memory_bank(string name, string path, hwNode & core) + if (exists("spd")) + add_memory_bank_spd(path + "/" + name + "/spd", bank); + ++ // Parse Memory SPD data ++ if (exists("frequency")) ++ bank.setClock(get_u32("frequency")); ++ + memory->addChild(bank); + } else if(name.substr(0, 4) == "dimm") { + hwNode bank("bank", hw::memory); +-- +2.17.1 + diff --git a/SPECS/lshw.spec b/SPECS/lshw.spec index 53eea17..b13940a 100644 --- a/SPECS/lshw.spec +++ b/SPECS/lshw.spec @@ -1,7 +1,7 @@ Summary: Hardware lister Name: lshw Version: B.02.18 -Release: 21%{?dist} +Release: 23%{?dist} License: GPLv2 Group: Applications/System URL: http://ezix.org/project/wiki/HardwareLiSter @@ -15,10 +15,14 @@ Patch6: 0001-merge-Github-PR-40-and-41.patch Patch7: 0002-Avoid-very-long-IDE-programming-interface-names-as-c.patch Patch8: 0003-Set-powerpc-logo-hint.patch Patch9: 0004-Fix-DIMM-info-for-older-IBM-POWER-systems.patch -Patch10: 0005-apply-Github-PR42.patch -Patch11: 0006-add-Hygon-company-description-for-Hygon-CPU-VendorID.patch -Patch12: 0007-update-id-files.patch -Patch13: 0008-merge-Github-PR44.patch +Patch10: 0005-apply-Github-PR42.patch +Patch11: 0006-add-Hygon-company-description-for-Hygon-CPU-VendorID.patch +Patch12: 0007-update-id-files.patch +Patch13: 0008-merge-Github-PR44.patch +Patch14: 0001-Display-proper-logical-name-of-network-device.patch +Patch15: 0001-spd-Print-dimm-rank-information.patch +Patch16: 0002-devtree-Add-DIMM-running-speed.patch +Patch17: 0001-Do-not-show-modified-time-with-notime-option.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -66,6 +70,10 @@ format. %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 %build mkdir build && pushd build @@ -113,6 +121,16 @@ src/lshw -json \ %{_datadir}/polkit-1/actions/org.ezix.lshw.gui.policy %changelog +* Mon Feb 10 2020 Lianbo Jiang - B.02.18-23 +- Do not show modified time with -notime option +- Resolves: rhbz#1733126 + +* Thu Nov 21 2019 Lianbo Jiang - B.02.18-22 +- Display proper logical name of network device +- Resolves: rhbz#1724087 +- Add DIMM running speed and Print dimm rank information +- Resolves: rhbz#1725199 + * Mon May 13 2019 Lianbo Jiang - B.02.18-21 - Update to upstream master 6cc0581bc805. - Resolves: rhbz#1664092