linux-stable.git/drivers/block/nvme-core.c, branch master

nvme: move to a new drivers/nvme/host directory

2015-10-09T16:40:37+00:00

This patch moves the NVMe driver from drivers/block/ to its own new
drivers/nvme/host/ directory.  This is in preparation of splitting the
current monolithic driver up and add support for the upcoming NVMe
over Fabrics standard.  The drivers/nvme/host/ is chose to leave space
for a NVMe target implementation in addition to this host side driver.

Signed-off-by: Jay Sternberg 
[hch: rebased, renamed core.c to pci.c, slight tweaks]
Signed-off-by: Christoph Hellwig 
Acked-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: move hardware structures out of the uapi version of nvme.h

2015-10-09T16:40:37+00:00

Currently all NVMe command and completion structures are exposed to userspace
through the uapi version of nvme.h.  They are not an ABI between the kernel
and userspace, and will change in C-incompatible way for future versions of
the spec.  Move them to the kernel version of the file and rename the uapi
header to nvme_ioctl.h so that userspace can easily detect the presence of
the new clean header.  Nvme-cli already carries a local copy of the header,
so it won't be affected by this move.

Signed-off-by: Christoph Hellwig 
Acked-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: add a local nvme.h header

2015-10-09T16:40:37+00:00

Add a new drivers/block/nvme.h which contains all the driver internal
interface.

Signed-off-by: Christoph Hellwig 
Acked-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: properly handle partially initialized queues in nvme_create_io_queues

2015-10-09T16:40:37+00:00

This avoids having to clean up later in a seemingly unrelated place.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: merge nvme_dev_start, nvme_dev_resume and nvme_async_probe

2015-10-09T16:40:36+00:00

And give the resulting function a sensible name.  This keeps all the
error handling in a single place and will allow for further improvements
to it.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: factor reset code into a common helper

2015-10-09T16:40:36+00:00

Signed-off-by: Christoph Hellwig 
Reviewed-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: merge nvme_dev_reset into nvme_reset_failed_dev

2015-10-09T16:40:36+00:00

And give the resulting function a more descriptive name.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Keith Busch 
Signed-off-by: Jens Axboe

nvme: delete dev from dev_list in nvme_reset

2015-10-09T16:40:36+00:00

Device resets need to delete the device from the device list before
kicking of the reset an re-probe, otherwise we get the device added
to the list twice.  nvme_reset is the only side missing this deletion
at the moment, and this patch adds it.

Signed-off-by: Christoph Hellwig 
Reviewed-by: Keith Busch 
Signed-off-by: Jens Axboe

NVMe: Simplify device resume on io queue failure

2015-10-09T16:40:36+00:00

Releasing IO queues and disks was done in a work queue outside the
controller resume context to delete namespaces if the controller failed
after a resume from suspend. This is unnecessary since we can resume
a device asynchronously.

This patch makes resume use probe_work so it can directly remove
namespaces if the device is manageable but not IO capable. Since the
deleting disks was the only reason we had the convoluted "reset_workfn",
this patch removes that unnecessary indirection.

Signed-off-by: Keith Busch 
Reviewed-by: Christoph Hellwig 
Signed-off-by: Jens Axboe

NVMe: Namespace removal simplifications

2015-10-09T16:40:36+00:00

This liberates namespace removal from the device, allowing gendisk
references to be closed independent of the nvme controller reference
count.

Signed-off-by: Keith Busch 
Reviewed-by: Christoph Hellwig 
Signed-off-by: Jens Axboe