From: keith.busch@intel.com (Keith Busch)
Subject: [PATCH 2/2] NVMe: User initiated controller reset
Date: Wed, 7 Aug 2013 14:44:47 -0600 [thread overview]
Message-ID: <1375908287-18884-3-git-send-email-keith.busch@intel.com> (raw)
In-Reply-To: <1375908287-18884-1-git-send-email-keith.busch@intel.com>
Creates a sysfs entry for each nvme controller that when written to
initiates a controller reset. This may be done by a user if they need
to reset the controller for any reason. For example, it may be required
as part of an firmware activate procedure.
Signed-off-by: Keith Busch <keith.busch at intel.com>
---
drivers/block/nvme-core.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index f401e2b..ee29e2e 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2171,6 +2171,17 @@ static void nvme_reset_failed_dev(struct work_struct *ws)
nvme_dev_reset(dev);
}
+static ssize_t nvme_reset(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ struct pci_dev *pdev = container_of(dev, struct pci_dev, dev);
+ struct nvme_dev *ndev = pci_get_drvdata(pdev);
+
+ nvme_dev_reset(ndev);
+ return count;
+}
+static DEVICE_ATTR(reset_controller, S_IWUSR, NULL, nvme_reset);
+
static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{
int result = -ENOMEM;
@@ -2217,6 +2228,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto remove;
kref_init(&dev->kref);
+ device_create_file(&pdev->dev, &dev_attr_reset_controller);
return 0;
remove:
@@ -2238,6 +2250,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void nvme_remove(struct pci_dev *pdev)
{
struct nvme_dev *dev = pci_get_drvdata(pdev);
+ device_remove_file(&pdev->dev, &dev_attr_reset_controller);
misc_deregister(&dev->miscdev);
kref_put(&dev->kref, nvme_free_dev);
}
--
1.7.10.4
prev parent reply other threads:[~2013-08-07 20:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 20:44 [PATCH 0/2] NVMe: Controller resets Keith Busch
2013-08-07 20:44 ` [PATCH 1/2] NVMe: Reset failed controller Keith Busch
2013-08-07 20:44 ` Keith Busch [this message]
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=1375908287-18884-3-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;
as well as URLs for NNTP newsgroup(s).