render / rpms / libvirt

Forked from rpms/libvirt 9 months ago
Clone
587702
From e37daa747c6615da25a9285be580a05081b14993 Mon Sep 17 00:00:00 2001
587702
Message-Id: <e37daa747c6615da25a9285be580a05081b14993@dist-git>
587702
From: Michal Privoznik <mprivozn@redhat.com>
587702
Date: Fri, 8 Jul 2022 14:29:32 +0200
587702
Subject: [PATCH] vircpi: Add PCIe 5.0 and 6.0 link speeds
587702
MIME-Version: 1.0
587702
Content-Type: text/plain; charset=UTF-8
587702
Content-Transfer-Encoding: 8bit
587702
587702
The PCIe 5.0 and PCIe 6.0 standards define new link speeds:
587702
32GT/s and 64GT/s, respectively. Update our internal enum to
587702
include these new speeds. Otherwise we format incorrect XML:
587702
587702
  <pci-express>
587702
    <link validity='cap' port='0' speed='(null)' width='16'/>
587702
    <link validity='sta' speed='16' width='16'/>
587702
  </pci-express>
587702
587702
Like all "good" specifications, these are also locked behind a
587702
login portal. But we can look at pciutils' source code: [1] and
587702
[2].
587702
587702
1: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=caca31a0eea41c7b051705704c1158fddc02fbd2
587702
2: https://git.kernel.org/pub/scm/utils/pciutils/pciutils.git/commit/ls-caps.c?id=5bdf63b6b1bc35b59c4b3f47f7ca83ca1868155b
587702
587702
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2105231
587702
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
587702
Reviewed-by: Ján Tomko <jtomko@redhat.com>
587702
(cherry picked from commit d33c2a9e2f933b31f8e96e9938c237bdffe27f84)
587702
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2170233
587702
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
587702
---
587702
 src/util/virpci.c | 2 +-
587702
 src/util/virpci.h | 2 ++
587702
 2 files changed, 3 insertions(+), 1 deletion(-)
587702
587702
diff --git a/src/util/virpci.c b/src/util/virpci.c
587702
index 0d476cd8b4..4949d1a3d4 100644
587702
--- a/src/util/virpci.c
587702
+++ b/src/util/virpci.c
587702
@@ -46,7 +46,7 @@ VIR_LOG_INIT("util.pci");
587702
 
587702
 VIR_ENUM_IMPL(virPCIELinkSpeed,
587702
               VIR_PCIE_LINK_SPEED_LAST,
587702
-              "", "2.5", "5", "8", "16",
587702
+              "", "2.5", "5", "8", "16", "32", "64"
587702
 );
587702
 
587702
 VIR_ENUM_IMPL(virPCIStubDriver,
587702
diff --git a/src/util/virpci.h b/src/util/virpci.h
587702
index b9b9cd7b34..4d9193f24e 100644
587702
--- a/src/util/virpci.h
587702
+++ b/src/util/virpci.h
587702
@@ -83,6 +83,8 @@ typedef enum {
587702
     VIR_PCIE_LINK_SPEED_5,
587702
     VIR_PCIE_LINK_SPEED_8,
587702
     VIR_PCIE_LINK_SPEED_16,
587702
+    VIR_PCIE_LINK_SPEED_32,
587702
+    VIR_PCIE_LINK_SPEED_64,
587702
     VIR_PCIE_LINK_SPEED_LAST
587702
 } virPCIELinkSpeed;
587702
 
587702
-- 
587702
2.39.1
587702