From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E39449443 for ; Sun, 13 Aug 2023 21:31:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 696E8C433C7; Sun, 13 Aug 2023 21:31:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1691962269; bh=NoUPcJ4FOvoxtzYCXNMFtSK+3nWoNyjlq+PvalwjL8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l39Mx9sMq2kuE1p7ERl2N/TPxWMj5k7Ty2CoDPowpIQsWy09ca5tUswYMn5zxw0+j jONIx8t2+k97MF0EXzDTc2k2QZI8oCt9Gd3O0cFfF/YQbV8y3lK4WopHka0J5bNzT5 ObYPSOjuPf3a0Z7lHh3QyuQbjjzPWHpD4QExFBrI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Moshe Shemesh , Saeed Mahameed Subject: [PATCH 6.4 174/206] net/mlx5: Reload auxiliary devices in pci error handlers Date: Sun, 13 Aug 2023 23:19:04 +0200 Message-ID: <20230813211730.003796740@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230813211724.969019629@linuxfoundation.org> References: <20230813211724.969019629@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Moshe Shemesh commit aab8e1a200b926147db51e3f82fd07bb9edf6a98 upstream. Handling pci errors should fully teardown and load back auxiliary devices, same as done through mlx5 health recovery flow. Fixes: 72ed5d5624af ("net/mlx5: Suspend auxiliary devices only in case of PCI device suspend") Signed-off-by: Moshe Shemesh Signed-off-by: Saeed Mahameed Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1845,7 +1845,7 @@ static pci_ers_result_t mlx5_pci_err_det mlx5_enter_error_state(dev, false); mlx5_error_sw_reset(dev); - mlx5_unload_one(dev, true); + mlx5_unload_one(dev, false); mlx5_drain_health_wq(dev); mlx5_pci_disable_device(dev);