github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nvme-pci: try function level reset on init failure

Browse Source 
NVMe devices from multiple vendors appear to get stuck in a reset state
that we can't get out of with an NVMe level Controller Reset. The kernel
would report these with messages that look like:

  Device not ready; aborting reset, CSTS=0x1

These have historically required a power cycle to make them usable
again, but in many cases, a PCIe FLR is sufficient to restart operation
without a power cycle. Try it if the initial controller reset fails
during any nvme reset attempt.

Signed-off-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Nitesh Shetty <nj.shetty@samsung.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Keith Busch 2025-07-15 12:16:27 -07:00 committed by Christoph Hellwig
parent 746d0ac5a0
commit 5b2c214a95
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/nvme/host/pci.c
View File

@ -2064,8 +2064,28 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)
* might be pointing at!
*/
result = nvme_disable_ctrl(&dev->ctrl, false);
if (result < 0)
return result;
if (result < 0) {
struct pci_dev *pdev = to_pci_dev(dev->dev);
/*
* The NVMe Controller Reset method did not get an expected
* CSTS.RDY transition, so something with the device appears to
* be stuck. Use the lower level and bigger hammer PCIe
* Function Level Reset to attempt restoring the device to its
* initial state, and try again.
*/
result = pcie_reset_flr(pdev, false);
if (result < 0)
return result;
pci_restore_state(pdev);
result = nvme_disable_ctrl(&dev->ctrl, false);
if (result < 0)
return result;
dev_info(dev->ctrl.device,
"controller reset completed after pcie flr\n");
}
result = nvme_alloc_queue(dev, 0, NVME_AQ_DEPTH);
if (result)