From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AB8JxZraWDW80ws2bRpMnveJT9wfUgMalC+wBIWbuxdTf/c+c5ua3MORhJBwkgRSNfJp9zp90Q0e ARC-Seal: i=1; a=rsa-sha256; t=1526280698; cv=none; d=google.com; s=arc-20160816; b=hvAowXhxB+NoO/7IHZPVg62r0K+4BZfz2ofRc032AjEBlfAEpsg1HGn4vWxKJz3uS8 zqQQKZR5ZZdhHAdgVyjiUZlkHHMWbEPBiA5eCNOMQM/W1E973H5VW9Wj6SDt0FDdnPX+ GqapBUgn9zIKJ5ilpvIjc65UYheWfsx1n/ELNCQxrjLOIQRla4gS0QNSriu77W1zNsbI Q+U87zlYTi0OwhsksjSXIY88g3PuUIGiZaJwXXQGVjMhzyaeQNkrA/fkIJo7RF6vUjKs vfBJrpE2+ftHGlojrk5ft8o7penezS6hwf7WABfyTkC3NPWoQntXGWDB9QdXkmjOG701 k7cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=UV/1CUvJvMfnmgt7oFns/x94mOPPipHoc9WKAtuob0A=; b=xiGKCRInqk/66bAPUBrhjAlbJr5mjl5RgxRf5JcVYuuXaZJtf5tzTHMdIljNUAfinc aVFxvFsEwr58MCXXMaBxX/2MHtjOIGuMOCCmUHVxy2k46ItiFZmYIAiz8HFMqPmOLIWP 37x+oXEBxqHp8Gyj5UyK66GaXHcY0ARWV4EwFvKKkwVNsvsCIpKr3Z3YX0Ta4a9ciyTt ljU5PCgtHn2pzFbS0opPYUYxou0YjaYUdEPfNhymUX6FdVfICIEJ4llCK80ftMF3PWMS 4cKwPFQrve7V1FZ8DNbWNV5vlo58bP03+mYT3smXCePJmnNVLbjE1nK0pRQDvPRpYXCh +qjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EOcvXf7e; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=EOcvXf7e; spf=pass (google.com: domain of srs0=ywzk=ib=linuxfoundation.org=gregkh@kernel.org designates 198.145.29.99 as permitted sender) smtp.mailfrom=SRS0=ywzk=IB=linuxfoundation.org=gregkh@kernel.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Majd Dibbiny , Danit Goldberg , Leon Romanovsky , Doug Ledford Subject: [PATCH 4.4 23/56] IB/mlx5: Use unlimited rate when static rate is not supported Date: Mon, 14 May 2018 08:48:28 +0200 Message-Id: <20180514064757.125686335@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514064754.853201981@linuxfoundation.org> References: <20180514064754.853201981@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1600421309673322005?= X-GMAIL-MSGID: =?utf-8?q?1600421309673322005?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Danit Goldberg commit 4f32ac2e452c2180cd2df581cbadac183e27ecd0 upstream. Before the change, if the user passed a static rate value different than zero and the FW doesn't support static rate, it would end up configuring rate of 2.5 GBps. Fix this by using rate 0; unlimited, in cases where FW doesn't support static rate configuration. Cc: # 3.10 Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters") Reviewed-by: Majd Dibbiny Signed-off-by: Danit Goldberg Signed-off-by: Leon Romanovsky Signed-off-by: Doug Ledford Signed-off-by: Greg Kroah-Hartman --- drivers/infiniband/hw/mlx5/qp.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c @@ -1352,18 +1352,18 @@ enum { static int ib_rate_to_mlx5(struct mlx5_ib_dev *dev, u8 rate) { - if (rate == IB_RATE_PORT_CURRENT) { + if (rate == IB_RATE_PORT_CURRENT) return 0; - } else if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_300_GBPS) { + + if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_300_GBPS) return -EINVAL; - } else { - while (rate != IB_RATE_2_5_GBPS && - !(1 << (rate + MLX5_STAT_RATE_OFFSET) & - MLX5_CAP_GEN(dev->mdev, stat_rate_support))) - --rate; - } - return rate + MLX5_STAT_RATE_OFFSET; + while (rate != IB_RATE_PORT_CURRENT && + !(1 << (rate + MLX5_STAT_RATE_OFFSET) & + MLX5_CAP_GEN(dev->mdev, stat_rate_support))) + --rate; + + return rate ? rate + MLX5_STAT_RATE_OFFSET : rate; } static int mlx5_set_path(struct mlx5_ib_dev *dev, const struct ib_ah_attr *ah,