Commit cc1d5e74 authored May 10, 2018 by Keith Busch

nvme/pci: Sync controller reset for AER slot_reset

AER handling expects a successful return from slot_reset means the
driver made the device functional again. The nvme driver had been using
an asynchronous reset to recover the device, so the device
may still be initializing after control is returned to the
AER handler. This creates problems for subsequent event handling,
causing the initializion to fail.

This patch fixes that by syncing the controller reset before returning
to the AER driver, and reporting the true state of the reset.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=199657


Reported-by: Alex Gagniuc <mr.nuke.me@gmail.com>
Cc: Sinan Kaya <okaya@codeaurora.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: stable@vger.kernel.org
Tested-by: Alex Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Keith Busch <keith.busch@intel.com>

parent 80f513b5

drivers/nvme/host/pci.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -2681,8 +2681,15 @@ static pci_ers_result_t nvme_slot_reset(struct pci_dev *pdev)

		dev_info(dev->ctrl.device, "restart after slot reset\n");
		pci_restore_state(pdev);
		nvme_reset_ctrl(&dev->ctrl);
		nvme_reset_ctrl_sync(&dev->ctrl);

		switch (dev->ctrl.state) {
		case NVME_CTRL_LIVE:
		case NVME_CTRL_ADMIN_ONLY:
		return PCI_ERS_RESULT_RECOVERED;
		default:
		return PCI_ERS_RESULT_DISCONNECT;
		}
		}

		static void nvme_error_resume(struct pci_dev *pdev)

Admin message