Linux-NVME Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: keith.busch@intel.com (Keith Busch)
Subject: [PATCH nvme-4.13] nvme/pci: Use saved CSTS value
Date: Wed, 14 Jun 2017 12:13:58 -0400	[thread overview]
Message-ID: <1497456838-11593-1-git-send-email-keith.busch@intel.com> (raw)

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

             reply	other threads:[~2017-06-14 16:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-14 16:13 Keith Busch [this message]
2017-06-14 16:10 ` [PATCH nvme-4.13] nvme/pci: Use saved CSTS value Martin K. Petersen
2017-06-14 16:27 ` Christoph Hellwig
2017-06-15 10:07 ` Sagi Grimberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1497456838-11593-1-git-send-email-keith.busch@intel.com \
    --to=keith.busch@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox