diff --git a/pciutils-3.7.0-pcie6datarate1of2.patch b/pciutils-3.7.0-pcie6datarate1of2.patch new file mode 100644 index 0000000..38ad20a --- /dev/null +++ b/pciutils-3.7.0-pcie6datarate1of2.patch @@ -0,0 +1,22 @@ +diff --git a/ls-caps.c b/ls-caps.c +index b616a4be..db565569 100644 +--- a/ls-caps.c ++++ b/ls-caps.c +@@ -751,6 +751,8 @@ static char *link_speed(int speed) + return "16GT/s"; + case 5: + return "32GT/s"; ++ case 6: ++ return "64GT/s"; + default: + return "unknown"; + } +@@ -1197,6 +1199,8 @@ static const char *cap_express_link2_speed(int type) + return "16GT/s"; + case 5: + return "32GT/s"; ++ case 6: ++ return "64GT/s"; + default: + return "Unknown"; + } diff --git a/pciutils-3.7.0-pcie6datarate2of2.patch b/pciutils-3.7.0-pcie6datarate2of2.patch new file mode 100644 index 0000000..105a789 --- /dev/null +++ b/pciutils-3.7.0-pcie6datarate2of2.patch @@ -0,0 +1,16 @@ +diff --git a/ls-caps.c b/ls-caps.c +index fce9502b..2c99812c 100644 +--- a/ls-caps.c ++++ b/ls-caps.c +@@ -1191,8 +1191,10 @@ static const char *cap_express_link2_speed_cap(int vector) + * permitted to skip support for any data rates between 2.5GT/s and the + * highest supported rate. + */ +- if (vector & 0x60) ++ if (vector & 0x40) + return "RsvdP"; ++ if (vector & 0x20) ++ return "2.5-64GT/s"; + if (vector & 0x10) + return "2.5-32GT/s"; + if (vector & 0x08) diff --git a/pciutils.spec b/pciutils.spec index 032d073..2177fa2 100644 --- a/pciutils.spec +++ b/pciutils.spec @@ -1,6 +1,6 @@ Name: pciutils Version: 3.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: PCI bus related utilities License: GPLv2+ URL: https://mj.ucw.cz/sw/pciutils/ @@ -15,6 +15,12 @@ Patch1: pciutils-2.2.1-idpath.patch Patch2: pciutils-dir-d.patch Patch3: pciutils-3.7.0-decodercec.patch +# pcie6 data rate support, from upstream, for <= 3.11, #RHEL-61959 +# https://github.com/pciutils/pciutils/commit/5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b +# https://github.com/pciutils/pciutils/commit/90d270fa720862ee357735b494a0b58643a27061 +Patch4: pciutils-3.7.0-pcie6datarate1of2.patch +Patch5: pciutils-3.7.0-pcie6datarate2of2.patch + Requires: hwdata Requires: %{name}-libs = %{version}-%{release} BuildRequires: gcc make sed kmod-devel @@ -100,6 +106,9 @@ install -p -m 644 lib/libpci.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig %{_mandir}/man7/* %changelog +* Thu Oct 31 2024 Michal Hlavinka - 3.7.0-6 +- add PCIe 6.0 data rate (64 GT/s) support (#RHEL-61959) + * Mon Aug 09 2021 Mohan Boddu - 3.7.0-5 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688