[PATCH nvme-4.13] nvme/pci: Use saved CSTS value

[PATCH nvme-4.13] nvme/pci: Use saved CSTS value

[Martin K. Petersen]

Keith,

> Don't re-read controller status when checking controller health on an
> IO timeout.

Reviewed-by: Martin K. Petersen <martin.petersen at oracle.com>

-- 
Martin K. Petersen	Oracle Linux Engineering

[PATCH nvme-4.13] nvme/pci: Use saved CSTS value

[Keith Busch]

Don't re-read controller status when checking controller health on an
IO timeout.

Signed-off-by: Keith Busch <keith.busch at intel.com>
---
Note for Christoph: I planned to fold this into a v2 of the watchdog
timer removal, but I see that was added in commit afd83d84461808, but
under the wrong author. :)

 drivers/nvme/host/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 788bb2c..85f9739 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1003,7 +1003,7 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved)
 	/*
 	 * Reset immediately if the controller is failed
 	 */
-	if (nvme_should_reset(dev, readl(dev->bar + NVME_REG_CSTS))) {
+	if (nvme_should_reset(dev, csts)) {
 		nvme_warn_reset(dev, csts);
 		nvme_dev_disable(dev, false);
 		nvme_reset(dev);
-- 
2.5.5

[PATCH nvme-4.13] nvme/pci: Use saved CSTS value

[Christoph Hellwig]

On Wed, Jun 14, 2017@12:13:58PM -0400, Keith Busch wrote:
> Don't re-read controller status when checking controller health on an
> IO timeout.
> 
> Signed-off-by: Keith Busch <keith.busch at intel.com>
> ---
> Note for Christoph: I planned to fold this into a v2 of the watchdog
> timer removal, but I see that was added in commit afd83d84461808, but
> under the wrong author. :)

Meh, damn git rebase messing up the author on conlicts one again.
I'll fold the patch and will fix the author when doing the next
rebase.

I still need a review for my 64-bit division fix before doing that
rebase, though.

[PATCH nvme-4.13] nvme/pci: Use saved CSTS value

[Sagi Grimberg]

Reviewed-by: Sagi Grimberg <sagi at grimberg.me>