revert two stable patches that have reports about regressions

[pve-kernel.git] / patches / kernel / 0016-Revert-RDMA-irdma-Report-the-correct-link-speed.patch

diff --git a/patches/kernel/0016-Revert-RDMA-irdma-Report-the-correct-link-speed.patch b/patches/kernel/0016-Revert-RDMA-irdma-Report-the-correct-link-speed.patch
new file mode 100644 (file)
index 0000000..accfb6c
--- /dev/null
+++ b/patches/kernel/0016-Revert-RDMA-irdma-Report-the-correct-link-speed.patch
@@ -0,0 +1,68 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Sat, 7 Jan 2023 13:48:41 +0100
+Subject: [PATCH] Revert "RDMA/irdma: Report the correct link speed"
+
+seem to cause a regression with some NICs:
+https://lore.kernel.org/netdev/CAK8fFZ6A_Gphw_3-QMGKEFQk=sfCw1Qmq0TVZK3rtAi7vb621A@mail.gmail.com/
+
+This reverts commit e8553504e366c8a47d1f6156c30d6eb9778cda13.
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+---
+ drivers/infiniband/hw/irdma/verbs.c | 35 ++++++++++++++++++++++++++---
+ 1 file changed, 32 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c
+index f6973ea55eda..132fe91bb799 100644
+--- a/drivers/infiniband/hw/irdma/verbs.c
++++ b/drivers/infiniband/hw/irdma/verbs.c
+@@ -63,6 +63,36 @@ static int irdma_query_device(struct ib_device *ibdev,
+       return 0;
+ }
+ 
++/**
++ * irdma_get_eth_speed_and_width - Get IB port speed and width from netdev speed
++ * @link_speed: netdev phy link speed
++ * @active_speed: IB port speed
++ * @active_width: IB port width
++ */
++static void irdma_get_eth_speed_and_width(u32 link_speed, u16 *active_speed,
++                                        u8 *active_width)
++{
++      if (link_speed <= SPEED_1000) {
++              *active_width = IB_WIDTH_1X;
++              *active_speed = IB_SPEED_SDR;
++      } else if (link_speed <= SPEED_10000) {
++              *active_width = IB_WIDTH_1X;
++              *active_speed = IB_SPEED_FDR10;
++      } else if (link_speed <= SPEED_20000) {
++              *active_width = IB_WIDTH_4X;
++              *active_speed = IB_SPEED_DDR;
++      } else if (link_speed <= SPEED_25000) {
++              *active_width = IB_WIDTH_1X;
++              *active_speed = IB_SPEED_EDR;
++      } else if (link_speed <= SPEED_40000) {
++              *active_width = IB_WIDTH_4X;
++              *active_speed = IB_SPEED_FDR10;
++      } else {
++              *active_width = IB_WIDTH_4X;
++              *active_speed = IB_SPEED_EDR;
++      }
++}
++
+ /**
+  * irdma_query_port - get port attributes
+  * @ibdev: device pointer from stack
+@@ -90,9 +120,8 @@ static int irdma_query_port(struct ib_device *ibdev, u32 port,
+               props->state = IB_PORT_DOWN;
+               props->phys_state = IB_PORT_PHYS_STATE_DISABLED;
+       }
+-
+-      ib_get_eth_speed(ibdev, port, &props->active_speed,
+-                       &props->active_width);
++      irdma_get_eth_speed_and_width(SPEED_100000, &props->active_speed,
++                                    &props->active_width);
+ 
+       if (rdma_protocol_roce(ibdev, 1)) {
+               props->gid_tbl_len = 32;