Skip to contentSkip to conversation

FAILED: patch "[PATCH] IB/hfi1: Ensure full Gen3 speed in a Gen4 system" failed to apply to 4.4-stable tree

PATCH [email protected] 2 participants 3 messages Nov 18, 2019 – Nov 25, 2019

Subsystems (3)
Stable branch InfiniBand HFI1 driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a9c3c4c597704b3a1a2b9bef990e7d8a881f6533 Mon Sep 17 00:00:00 2001
From: James Erwin <[email protected]>
Date: Fri, 1 Nov 2019 15:20:59 -0400
Subject: [PATCH] IB/hfi1: Ensure full Gen3 speed in a Gen4 system

If an hfi1 card is inserted in a Gen4 systems, the driver will avoid the gen3 speed bump and the card will operate at half speed.

This is because the driver avoids the gen3 speed bump when the parent bus speed isn't identical to gen3, 8.0GT/s. This is not compatible with gen4 and newer speeds.

Fix by relaxing the test to explicitly look for the lower capability speeds which inherently allows for gen4 and all future speeds.

Fixes 7724105686e7 ("IB/hfi1: add driver files")
Link https://lore.kernel.org/r/[email protected] open here
Cc <[email protected]>
Reviewed-by Dennis Dalessandro <[email protected]>
Reviewed-by Kaike Wan <[email protected]>
Signed-off-by James Erwin <[email protected]>
Signed-off-by Mike Marciniszyn <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>
Signed-off-by Jason Gunthorpe <[email protected]>
drivers/infiniband/hw/hfi1/pcie.c +3 -1
index 61aa5504d7c3..61362bd6d3ce 100644
@@ -319,7 +319,9 @@ int pcie_speeds(struct hfi1_devdata *dd)
 	/*
 	 * bus->max_bus_speed is set from the bridge's linkcap Max Link Speed
 	 */
-	if (parent && dd->pcidev->bus->max_bus_speed != PCIE_SPEED_8_0GT) {
+	if (parent &&
+	    (dd->pcidev->bus->max_bus_speed == PCIE_SPEED_2_5GT ||
+	     dd->pcidev->bus->max_bus_speed == PCIE_SPEED_5_0GT)) {
 		dd_dev_info(dd, "Parent PCIe bridge does not support Gen3\n");
 		dd->link_gen3_capable = 0;
 	}
maintainer
#1 lore raw
Quoted 27 lines · On Mon, Nov 18, 2019 at 04:23:54PM +0100, [email protected] wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From a9c3c4c597704b3a1a2b9bef990e7d8a881f6533 Mon Sep 17 00:00:00 2001
From: James Erwin <[email protected]>
Date: Fri, 1 Nov 2019 15:20:59 -0400
Subject: [PATCH] IB/hfi1: Ensure full Gen3 speed in a Gen4 system

If an hfi1 card is inserted in a Gen4 systems, the driver will avoid the gen3 speed bump and the card will operate at half speed.

This is because the driver avoids the gen3 speed bump when the parent bus speed isn't identical to gen3, 8.0GT/s. This is not compatible with gen4 and newer speeds.

Fix by relaxing the test to explicitly look for the lower capability speeds which inherently allows for gen4 and all future speeds.

Quoted 9 lines
Fixes 7724105686e7 ("IB/hfi1: add driver files")
Link https://lore.kernel.org/r/[email protected] open here
Cc <[email protected]>
Reviewed-by Dennis Dalessandro <[email protected]>
Reviewed-by Kaike Wan <[email protected]>
Signed-off-by James Erwin <[email protected]>
Signed-off-by Mike Marciniszyn <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>
Signed-off-by Jason Gunthorpe <[email protected]>

I've fixed it up and queued for 4.4 (missing bf400235f392 ("staging/rdma/hfi1: Avoid using upstream component if it is not accessible") ).

Signature · 2 lines
Thanks,
Sasha
author maintainer
#2 lore raw
Quoted 38 lines · Sasha Levin
Quoted 27 lines · On Mon, Nov 18, 2019 at 04:23:54PM +0100, [email protected] wrote:

The patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From a9c3c4c597704b3a1a2b9bef990e7d8a881f6533 Mon Sep 17 00:00:00 2001

From: James Erwin <[email protected]>
Date: Fri, 1 Nov 2019 15:20:59 -0400
Subject: [PATCH] IB/hfi1: Ensure full Gen3 speed in a Gen4 system

If an hfi1 card is inserted in a Gen4 systems, the driver will avoid the gen3 speed bump and the card will operate at half speed.

This is because the driver avoids the gen3 speed bump when the parent bus speed isn't identical to gen3, 8.0GT/s. This is not compatible with gen4 and newer speeds.

Fix by relaxing the test to explicitly look for the lower capability speeds which inherently allows for gen4 and all future speeds.

Quoted 9 lines
Fixes 7724105686e7 ("IB/hfi1: add driver files")
Link https://lore.kernel.org/r/[email protected] open here
Cc <[email protected]>
Reviewed-by Dennis Dalessandro <[email protected]>
Reviewed-by Kaike Wan <[email protected]>
Signed-off-by James Erwin <[email protected]>
Signed-off-by Mike Marciniszyn <[email protected]>
Signed-off-by Dennis Dalessandro <[email protected]>
Signed-off-by Jason Gunthorpe <[email protected]>
Quoted 3 lines

I've fixed it up and queued for 4.4 (missing bf400235f392 ("staging/rdma/hfi1: Avoid using upstream component if it is not accessible") ).

Great, thanks for doing that.

greg k-h