diff options
| author | Jon Derrick <jonathan.derrick@intel.com> | 2015-08-10 15:20:41 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-08-18 11:56:13 -0600 |
| commit | 81f03fedcce7ee7e83c37237ecaa2f68aad236fd (patch) | |
| tree | 1ed0c5082931cebb9a0624fbec86f8bd1dfb5e38 /drivers/block/nvme-core.c | |
| parent | dfbac8c7ac5f58448b2216fe42ff52aaf175421d (diff) | |
| download | linux-81f03fedcce7ee7e83c37237ecaa2f68aad236fd.tar.bz2 | |
NVMe: Add nvme subsystem reset IOCTL
Controllers can perform optional subsystem resets as introduced in NVMe
1.1. This patch adds an IOCTL to trigger the subsystem reset by writing
"NVMe" to the NSSR register.
Signed-off-by: Jon Derrick <jonathan.derrick@intel.com>
Acked-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/nvme-core.c')
| -rw-r--r-- | drivers/block/nvme-core.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index e318a992e2e6..3a35c5807bb7 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1901,6 +1901,15 @@ static int nvme_user_cmd(struct nvme_dev *dev, struct nvme_ns *ns, return status; } +static int nvme_subsys_reset(struct nvme_dev *dev) +{ + if (!dev->subsystem) + return -ENOTTY; + + writel(0x4E564D65, &dev->bar->nssr); /* "NVMe" */ + return 0; +} + static int nvme_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd, unsigned long arg) { @@ -2932,6 +2941,8 @@ static long nvme_dev_ioctl(struct file *f, unsigned int cmd, unsigned long arg) case NVME_IOCTL_RESET: dev_warn(dev->dev, "resetting controller\n"); return nvme_reset(dev); + case NVME_IOCTL_SUBSYS_RESET: + return nvme_subsys_reset(dev); default: return -ENOTTY; } |