diff options
| author | Wen Xiong <wenxiong@linux.vnet.ibm.com> | 2018-02-15 14:05:10 -0600 |
|---|---|---|
| committer | Keith Busch <keith.busch@intel.com> | 2018-03-01 09:34:14 -0700 |
| commit | 651438bb0af5213f1f70d66e75bf11d08cb5537a (patch) | |
| tree | 775c5d3742d78fcbcd51e2ee82137cddf21ee017 /drivers | |
| parent | 468f098734ab095b72d8af26bcd4bcb2ed31a3be (diff) | |
| download | linux-stable-651438bb0af5213f1f70d66e75bf11d08cb5537a.tar.gz linux-stable-651438bb0af5213f1f70d66e75bf11d08cb5537a.tar.bz2 linux-stable-651438bb0af5213f1f70d66e75bf11d08cb5537a.zip | |
nvme-pci: Fix EEH failure on ppc
Triggering PPC EEH detection and handling requires a memory mapped read
failure. The NVMe driver removed the periodic health check MMIO, so
there's no early detection mechanism to trigger the recovery. Instead,
the detection now happens when the nvme driver handles an IO timeout
event. This takes the pci channel offline, so we do not want the driver
to proceed with escalating its own recovery efforts that may conflict
with the EEH handler.
This patch ensures the driver will observe the channel was set to offline
after a failed MMIO read and resets the IO timer so the EEH handler has
a chance to recover the device.
Signed-off-by: Wen Xiong <wenxiong@linux.vnet.ibm.com>
[updated change log]
Signed-off-by: Keith Busch <keith.busch@intel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/pci.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 5933a5c732e8..e5ce07f4966f 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1153,12 +1153,6 @@ static bool nvme_should_reset(struct nvme_dev *dev, u32 csts) if (!(csts & NVME_CSTS_CFS) && !nssro) return false; - /* If PCI error recovery process is happening, we cannot reset or - * the recovery mechanism will surely fail. - */ - if (pci_channel_offline(to_pci_dev(dev->dev))) - return false; - return true; } @@ -1189,6 +1183,13 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) struct nvme_command cmd; u32 csts = readl(dev->bar + NVME_REG_CSTS); + /* If PCI error recovery process is happening, we cannot reset or + * the recovery mechanism will surely fail. + */ + mb(); + if (pci_channel_offline(to_pci_dev(dev->dev))) + return BLK_EH_RESET_TIMER; + /* * Reset immediately if the controller is failed */ |