From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 993FCC432C0 for ; Mon, 18 Nov 2019 15:23:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B0B620722 for ; Mon, 18 Nov 2019 15:23:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574090638; bh=vLyFWYFGB6nPMUlZwvF8jpIcDp9NG9Us71tS0si07Nk=; h=Subject:To:Cc:From:Date:List-ID:From; b=RPTwpDRq/1f7RcPnl6k8O0WCHakx6+zKvNK23epzrsuMRW+b9ODjB8AqE/BQj+xAk g5i1uxT+CrDPTXOi1monsJ6vWReDG7t1MqjmZr5g29P4+KIruiICTQqCVsq9363I6r ihQMKfgS1yS63dtUqCr4woqsqySPPJdcrirCXmdk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727007AbfKRPX6 (ORCPT ); Mon, 18 Nov 2019 10:23:58 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53773 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726654AbfKRPX5 (ORCPT ); Mon, 18 Nov 2019 10:23:57 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 807DD22691; Mon, 18 Nov 2019 10:23:56 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Mon, 18 Nov 2019 10:23:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:message-id:mime-version:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=y29Gb7 inFK6Ez7AQf6G35OR7Ig2mnfgFBs8gwOOma8s=; b=YBMv3E9u7JxDuIdiPhdfeA 3DGi/Y6h2/4iXFE0wq0P+wWloBe8uQlxTkM2Pi+Ov+6Y1PjM+nkTDY4i5UEBrLqz bHwWjvqpXljKStCvBBvMWnU+m7dOem1z5XCkPUw3p1BUK7SBDVf7SV0W9UbpgcMX S8JKhZMkUKicA2JRrVfk/XuIbm7jc2+NmAsViO8TDG7SpkgDByLU7DO9fkfcvu0/ 2/JzgeY86znteFO2dgtA2eH6oUmbwwMeXht75OLGGys1+C7VpJVWOgKX2y80QkcK XuvO/vaRoleOQGEh3yREqKJXmOj2ngOD2eDZWXRDJlN2hqFzqb5+6+qPh2XstP8w == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrudegiedgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefuvffhfffkgggtgfesthekredttd dtlfenucfhrhhomhepoehgrhgvghhkhheslhhinhhugihfohhunhgurghtihhonhdrohhr gheqnecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucfkphepkeefrdekiedrkeelrd dutdejnecurfgrrhgrmhepmhgrihhlfhhrohhmpehgrhgvgheskhhrohgrhhdrtghomhen ucevlhhushhtvghrufhiiigvpeef X-ME-Proxy: Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) by mail.messagingengine.com (Postfix) with ESMTPA id D0A7A80061; Mon, 18 Nov 2019 10:23:55 -0500 (EST) Subject: FAILED: patch "[PATCH] IB/hfi1: Ensure full Gen3 speed in a Gen4 system" failed to apply to 4.4-stable tree To: james.erwin@intel.com, dennis.dalessandro@intel.com, jgg@mellanox.com, kaike.wan@intel.com, mike.marciniszyn@intel.com, stable@vger.kernel.org Cc: From: Date: Mon, 18 Nov 2019 16:23:54 +0100 Message-ID: <157409063466132@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 . thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From a9c3c4c597704b3a1a2b9bef990e7d8a881f6533 Mon Sep 17 00:00:00 2001 From: James Erwin 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/20191101192059.106248.1699.stgit@awfm-01.aw.intel.com Cc: Reviewed-by: Dennis Dalessandro Reviewed-by: Kaike Wan Signed-off-by: James Erwin Signed-off-by: Mike Marciniszyn Signed-off-by: Dennis Dalessandro Signed-off-by: Jason Gunthorpe diff --git a/drivers/infiniband/hw/hfi1/pcie.c b/drivers/infiniband/hw/hfi1/pcie.c index 61aa5504d7c3..61362bd6d3ce 100644 --- a/drivers/infiniband/hw/hfi1/pcie.c +++ b/drivers/infiniband/hw/hfi1/pcie.c @@ -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; }