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 B3C0F1F472A; Tue, 3 Dec 2024 15:22:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239352; cv=none; b=DZOTFgB/+n1HbAsGe0tuTuH0/ywhD+FPTH24jwHDfP3MP2nY1eFTKl1m1uHKaM/vX9hIvyYVwK3Y/rq7WOt++buuU9qpbQcboNoPJ1k8B99oZ6eSPvlVT9SRLRy58d79Sbxsbza9wOvHVFeZMmEDG+exsSL0x+o0SFTz6nauMtg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239352; c=relaxed/simple; bh=7zR5pL9dfzETqB6YOBwkQj6KUYcN4gIjKjAVzAScQ+g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NWp6eDb7aFEgrutw51i/eIp5IzD5oqbwI1mYOeLY3Cnw5PkjlKITaiBnewYmCAh/oY9zC2syd1+OfVeQpIFpE5eS9aDoZuzNwdAav6FAUD4O4GM45B0v+QNfccTldIV8J6BsfiBjkzAk6UmypODLVz9waWP0aUSapQUBHnOdQnY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=m3M4Ti2B; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="m3M4Ti2B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D6C4C4CECF; Tue, 3 Dec 2024 15:22:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733239352; bh=7zR5pL9dfzETqB6YOBwkQj6KUYcN4gIjKjAVzAScQ+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m3M4Ti2B65I0XJzN3WsuZp4ubxhrlHlTsy1YdjrSlHR/MT4V+fii5PdVoJupxcriK mNzbDJ4A0Seoq6DoBQqvIzZI+KkpinHAkFtySwc2vzK7PJDQCdebN41UgLUsmpHFF+ WfZLqv5y5xdTi9golJGHVGfGfEhBb6MhVhMjWMi0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Somnath Kotur , Pavan Chebbi , Kashyap Desai , Saravanan Vajravel , Michael Chan , Paolo Abeni , Sasha Levin Subject: [PATCH 6.11 585/817] bnxt_en: Reserve rings after PCIe AER recovery if NIC interface is down Date: Tue, 3 Dec 2024 15:42:37 +0100 Message-ID: <20241203144018.756165838@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Saravanan Vajravel [ Upstream commit 5311598f7f3293683cdc761df71ae3469327332c ] After successful PCIe AER recovery, FW will reset all resource reservations. If it is IF_UP, the driver will call bnxt_open() and all resources will be reserved again. It it is IF_DOWN, we should call bnxt_reserve_rings() so that we can reserve resources including RoCE resources to allow RoCE to resume after AER. Without this patch, RoCE fails to resume in this IF_DOWN scenario. Later, if it becomes IF_UP, bnxt_open() will see that resources have been reserved and will not reserve again. Fixes: fb1e6e562b37 ("bnxt_en: Fix AER recovery.") Reviewed-by: Somnath Kotur Reviewed-by: Pavan Chebbi Reviewed-by: Kashyap Desai Signed-off-by: Saravanan Vajravel Signed-off-by: Michael Chan Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 103e6aa604c33..4facf0368564b 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -16171,8 +16171,12 @@ static void bnxt_io_resume(struct pci_dev *pdev) rtnl_lock(); err = bnxt_hwrm_func_qcaps(bp); - if (!err && netif_running(netdev)) - err = bnxt_open(netdev); + if (!err) { + if (netif_running(netdev)) + err = bnxt_open(netdev); + else + err = bnxt_reserve_rings(bp, true); + } if (!err) netif_device_attach(netdev); -- 2.43.0