Message ID | 20200420121509.188216905@linuxfoundation.org |
---|---|
State | New |
Headers | show
Return-Path: <SRS0=w1qd=6E=vger.kernel.org=stable-owner@kernel.org> 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, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 0EC1CC54FD0 for <stable@archiver.kernel.org>; Mon, 20 Apr 2020 12:40:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E10C22075A for <stable@archiver.kernel.org>; Mon, 20 Apr 2020 12:40:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386414; bh=9cG006k3LbqtUOh3C3GQ/cY8hx5/Uc58zO0Ys8/zvsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I55lTn176R7x+VC6sbUXqGRJ5ZAHnpsGHT34La6c8BkMuO/w0RQXWooI0XfZICd24 er/F/27seWGMFART7vyrpE9dXH1og/z2W8AgW99zUBxbbdmvDXfHFvcOXYXYDaN4hw z7QQz4sNZ0wClQo2oVwhQrEpmvevr/feri7yZm5A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726981AbgDTMkO (ORCPT <rfc822;stable@archiver.kernel.org>); Mon, 20 Apr 2020 08:40:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:60480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727007AbgDTMkN (ORCPT <rfc822;stable@vger.kernel.org>); Mon, 20 Apr 2020 08:40:13 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3DC96206D4; Mon, 20 Apr 2020 12:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386412; bh=9cG006k3LbqtUOh3C3GQ/cY8hx5/Uc58zO0Ys8/zvsc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nrLiEjw7FRBXowl2zyeoDTC6f0sXnKLOJCtcDTAQv1kGMqhr7nPuJvEZEWfqs+Duy iDPPdF68SD8jPa7QTIheUZIUTZk/PwPX++vFljbbC2ytLqu5PhWq+3P1/zZ7bZq3RK hL7eU3CgfPBT2pMAj3rDALsP/vnnJWJ2WA4NZMFc= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Moshe Shemesh <moshe@mellanox.com>, Feras Daoud <ferasda@mellanox.com>, Saeed Mahameed <saeedm@mellanox.com> Subject: [PATCH 5.5 13/65] net/mlx5: Fix frequent ioread PCI access during recovery Date: Mon, 20 Apr 2020 14:38:17 +0200 Message-Id: <20200420121509.188216905@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121505.909671922@linuxfoundation.org> References: <20200420121505.909671922@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/health.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/health.c @@ -243,7 +243,7 @@ recover_from_sw_reset: if (mlx5_get_nic_state(dev) == MLX5_NIC_IFC_DISABLED) break; - cond_resched(); + msleep(20); } while (!time_after(jiffies, end)); if (mlx5_get_nic_state(dev) != MLX5_NIC_IFC_DISABLED) {