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 798E119993B; Sun, 26 Jan 2025 16:46:12 +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=1737909972; cv=none; b=mWngmtBuXYWc0oTBjG08QEvOBTYad0EZqmPFqU8K/3oH7unF2HXngCXJg8c2gpvx11houbW3cRq56uaxPkrkIs5cyfF3PsPrNivi7gnU5o/s2KNhGuk0g2k9veoPfRURnoJ2wD5d32aQb11N2BRjmtt49heQHJziVWbPL1vZEmY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737909972; c=relaxed/simple; bh=c/z8Fqyndj1hHrx1Q0bB/JSDepO/52l2S2hAJuhZz64=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=cnFnJ+AGEbk2/3KqdQAOYLzmMZkGBnwFP6fcbG64Do1x0OhS9fUoACOULlwsfyj8ENchCUshMTV7YHHAzkbVAqHr86q5tm0M+GD+afr8fTbrVgi2fk8lIgC6Ycd6eDBQ9+CAaCdIcLAL6/FNOXzVNSHe7j8kWE2P/AZbwUDmvm0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Cz/jJXkj; 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="Cz/jJXkj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D08AC4CEE9; Sun, 26 Jan 2025 16:46:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1737909972; bh=c/z8Fqyndj1hHrx1Q0bB/JSDepO/52l2S2hAJuhZz64=; h=From:To:Cc:Subject:Date:From; b=Cz/jJXkjP2X/VLB7D6MSNXg95iBAy9g+Hy6Zm8uu7IS88xH2YH06zPJGIwe0Zm2ws 1o1Uqa9z0XnZ/EBpRUP11lrx4WrQA7fM1rbyCaNiPMEaYbmzZaLkPcF468/9pdAAv3 OLFraMA+GM9ihIKrqPJgzcyq6ccIQlVqnu06FB4znyvhfZy9/EluToQwa4rxszchyY EgAOOG9/rthAX0hFGOn8/jmkg/Nm/DvfHb3JWcOhlKJtLHj/3fXRrHWtvYAz3Qs5Pp vA4ONS3mPsyY/KLmLC9QhJzJ9mSVrXJuQokJBZ7mIy7jTjtstWbiaFsfqDGEjuxqXs zuq96+OEqNnqg== 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.6 1/3] RDMA/efa: Reset device on probe failure Date: Sun, 26 Jan 2025 11:46:07 -0500 Message-Id: <20250126164609.964170-1-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 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.6.74 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 15ee920811187..924940ca9de0a 100644 --- a/drivers/infiniband/hw/efa/efa_main.c +++ b/drivers/infiniband/hw/efa/efa_main.c @@ -452,7 +452,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); } @@ -623,12 +622,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); @@ -656,7 +657,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; } @@ -665,7 +666,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 struct pci_driver efa_pci_driver = { -- 2.39.5