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 B45241946B8; Sun, 26 Jan 2025 16:45:53 +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=1737909953; cv=none; b=PIu8szmS0x1DqyewPTqxHYBSzt1Y5RbfZj3YJxIJ32i0slmc8VBk+94NEv0NCPtdVoZzTaQVZ8r5df5SfmjMwyEa+g2/euJht3EBzMcA51qUpwGZsWKEefAU0QwSqKAREZ+TmDXAeIXJwRb2Nz6B1zfXVHemmVrcc7PHv1LgCDw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737909953; c=relaxed/simple; bh=Fvbo3UwreLlL541vKtBHY27Zn1LjVTBWmk37IrD4u1k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Sa2xf1xH6LZ/BZgIJft2OawRxRjhmu0azlolbGHn3FzsfdcdvwtNo4s67r3URi5XGbhDrzdbWkozrW7DdpSVd/0NqFEpAstBeOZM3bmDFNUDBz/Tlg9RmjdDwZtFhzxYD3ZA34PVybFg8ZQOQMeTEUXBt/x7IZMUc9VkkJfSlKE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=s6+UmJXC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="s6+UmJXC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33C55C4CEE3; Sun, 26 Jan 2025 16:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737909953; bh=Fvbo3UwreLlL541vKtBHY27Zn1LjVTBWmk37IrD4u1k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s6+UmJXCDk6KbjAs9UkwOLY5KLSEuO/FBiEZaVMawwvii++LpyVlQ+NGqTrTooLv6 NGbnLQgo3ELjEPxFE9Aq+TpPyuOIxzTo6xEPznpV4nWdz3l9QZD8A5WZZVKtP1OOAI YFmJZY6/qHT7ljkth7DexJ1aMyFC13wGnrjOlLM2D+E5cdv5FTjVdhYEGPvZsqrvcS Lf+fjbwNw950SSiAng4W93TM3mhnKbaCke7yu8MQW05R4n/B6Xu/2npL5cXDHS9hUi 6Q8+CFs5lmG7ByVz5OMVBpwpJFKFlMgl5Am+vQD3/MzEDB3se2aimB7+OfLC972EPj OSYhbb8IcbDSw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Margolin , Firas Jahjah , Yonatan Nachum , Gal Pressman , Leon Romanovsky , Sasha Levin , linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 6.12 2/7] RDMA/efa: Reset device on probe failure Date: Sun, 26 Jan 2025 11:45:44 -0500 Message-Id: <20250126164549.964058-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250126164549.964058-1-sashal@kernel.org> References: <20250126164549.964058-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.11 Content-Transfer-Encoding: 8bit From: Michael Margolin [ Upstream commit 123c13f10ed3627ba112172d8bd122a72cae226d ] Make sure the device is being reset on driver exit whatever the reason is, to keep the device aligned and allow it to close shared resources (e.g. admin queue). Reviewed-by: Firas Jahjah Reviewed-by: Yonatan Nachum Signed-off-by: Michael Margolin Link: https://patch.msgid.link/20241225131548.15155-1-mrgolin@amazon.com Reviewed-by: Gal Pressman Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/efa/efa_main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/infiniband/hw/efa/efa_main.c b/drivers/infiniband/hw/efa/efa_main.c index ad225823e6f2f..45a4564c670c0 100644 --- a/drivers/infiniband/hw/efa/efa_main.c +++ b/drivers/infiniband/hw/efa/efa_main.c @@ -470,7 +470,6 @@ static void efa_ib_device_remove(struct efa_dev *dev) ibdev_info(&dev->ibdev, "Unregister ib device\n"); ib_unregister_device(&dev->ibdev); efa_destroy_eqs(dev); - efa_com_dev_reset(&dev->edev, EFA_REGS_RESET_NORMAL); efa_release_doorbell_bar(dev); } @@ -643,12 +642,14 @@ static struct efa_dev *efa_probe_device(struct pci_dev *pdev) return ERR_PTR(err); } -static void efa_remove_device(struct pci_dev *pdev) +static void efa_remove_device(struct pci_dev *pdev, + enum efa_regs_reset_reason_types reset_reason) { struct efa_dev *dev = pci_get_drvdata(pdev); struct efa_com_dev *edev; edev = &dev->edev; + efa_com_dev_reset(edev, reset_reason); efa_com_admin_destroy(edev); efa_free_irq(dev, &dev->admin_irq); efa_disable_msix(dev); @@ -676,7 +677,7 @@ static int efa_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; err_remove_device: - efa_remove_device(pdev); + efa_remove_device(pdev, EFA_REGS_RESET_INIT_ERR); return err; } @@ -685,7 +686,7 @@ static void efa_remove(struct pci_dev *pdev) struct efa_dev *dev = pci_get_drvdata(pdev); efa_ib_device_remove(dev); - efa_remove_device(pdev); + efa_remove_device(pdev, EFA_REGS_RESET_NORMAL); } static void efa_shutdown(struct pci_dev *pdev) -- 2.39.5