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

PATCH New Christoph Hellwig 4 participants 4 messages Oct 9, 2015

Subsystems (2)

Block layer NVMe

lore

Share & tools

lore

Christoph Hellwig

author maintainer

2015-10-09 16:17 UTC #0 lore raw

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

From: Jay Sternberg <[email protected]>

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 <jay.e.sternberg at intel.com>

[hch: rebased, renamed core.c to pci.c, slight tweaks]

Signed-off-by Christoph Hellwig <hch at lst.de>

---
 MAINTAINERS                |    2 +-
 drivers/Kconfig            |    2 +
 drivers/Makefile           |    1 +
 drivers/block/Kconfig      |   11 -
 drivers/block/Makefile     |    2 -
 drivers/block/nvme-core.c  | 3354 --------------------------------------------
 drivers/block/nvme-scsi.c  | 2556 ---------------------------------
 drivers/block/nvme.h       |  133 --
 drivers/nvme/Kconfig       |    1 +
 drivers/nvme/Makefile      |    2 +
 drivers/nvme/host/Kconfig  |   10 +
 drivers/nvme/host/Makefile |    4 +
 drivers/nvme/host/nvme.h   |  133 ++
 drivers/nvme/host/pci.c    | 3354 ++++++++++++++++++++++++++++++++++++++++++++
 drivers/nvme/host/scsi.c   | 2556 +++++++++++++++++++++++++++++++++
 15 files changed, 6064 insertions(+), 6057 deletions(-)
 delete mode 100644 drivers/block/nvme-core.c
 delete mode 100644 drivers/block/nvme-scsi.c
 delete mode 100644 drivers/block/nvme.h
 create mode 100644 drivers/nvme/Kconfig
 create mode 100644 drivers/nvme/Makefile
 create mode 100644 drivers/nvme/host/Kconfig
 create mode 100644 drivers/nvme/host/Makefile
 create mode 100644 drivers/nvme/host/nvme.h
 create mode 100644 drivers/nvme/host/pci.c
 create mode 100644 drivers/nvme/host/scsi.c

MAINTAINERS +1 -1

index 797236b..d104ec9 100644
@@ -7448,7 +7448,7 @@ M:	Matthew Wilcox <willy at linux.intel.com>
 L:	linux-nvme at lists.infradead.org
 T:	git git://git.infradead.org/users/willy/linux-nvme.git
 S:	Supported
-F:	drivers/block/nvme*
+F:	drivers/nvme/host/
 F:	include/linux/nvme.h
 
 NVMEM FRAMEWORK

drivers/Kconfig +2 -0

index 46b4a8e..e69ec82 100644
@@ -18,6 +18,8 @@ source "drivers/pnp/Kconfig"
 
 source "drivers/block/Kconfig"
 
+source "drivers/nvme/Kconfig"
+
 # misc before ide - BLK_DEV_SGIIOC4 depends on SGI_IOC4
 
 source "drivers/misc/Kconfig"

drivers/Makefile +1 -0

index b250b36..42f9dd5 100644
@@ -70,6 +70,7 @@ obj-$(CONFIG_NUBUS)		+= nubus/
 obj-y				+= macintosh/
 obj-$(CONFIG_IDE)		+= ide/
 obj-$(CONFIG_SCSI)		+= scsi/
+obj-y				+= nvme/
 obj-$(CONFIG_ATA)		+= ata/
 obj-$(CONFIG_TARGET_CORE)	+= target/
 obj-$(CONFIG_MTD)		+= mtd/

drivers/block/Kconfig +0 ~~-11~~

index 1b8094d..29819e7 100644
@@ -310,17 +310,6 @@ config BLK_DEV_NBD
 
 	  If unsure, say N.
 
-config BLK_DEV_NVME
-	tristate "NVM Express block device"
-	depends on PCI
-	---help---
-	  The NVM Express driver is for solid state drives directly
-	  connected to the PCI or PCI Express bus.  If you know you
-	  don't have one of these, it is safe to answer N.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called nvme.
-
 config BLK_DEV_SKD
 	tristate "STEC S1120 Block Driver"
 	depends on PCI

drivers/block/Makefile +0 -2

index 02b688d..6713290 100644
@@ -22,7 +22,6 @@ obj-$(CONFIG_XILINX_SYSACE)	+= xsysace.o
 obj-$(CONFIG_CDROM_PKTCDVD)	+= pktcdvd.o
 obj-$(CONFIG_MG_DISK)		+= mg_disk.o
 obj-$(CONFIG_SUNVDC)		+= sunvdc.o
-obj-$(CONFIG_BLK_DEV_NVME)	+= nvme.o
 obj-$(CONFIG_BLK_DEV_SKD)	+= skd.o
 obj-$(CONFIG_BLK_DEV_OSD)	+= osdblk.o

@@ -44,6 +43,5 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o
 obj-$(CONFIG_ZRAM) += zram/
 
-nvme-y		:= nvme-core.o nvme-scsi.o
 skd-y		:= skd_main.o
 swim_mod-y	:= swim.o swim_asm.o

drivers/block/nvme-core.c deleted +0 ~~-3354~~

2,947 lines not on this page · raw message

drivers/block/nvme-scsi.c deleted +0 ~~-2556~~

2,556 lines not on this page · raw message

drivers/block/nvme.h deleted +0 ~~-133~~

133 lines not on this page · raw message

drivers/nvme/Kconfig new file +1 -0

new file mode 100644
index 0000000..a39d943

Lines of this file are not shown. View the raw message.

drivers/nvme/Makefile new file +2 -0

new file mode 100644
index 0000000..9421e82

Lines of this file are not shown. View the raw message.

drivers/nvme/host/Kconfig new file +10 -0

new file mode 100644
index 0000000..0089f78

Lines of this file are not shown. View the raw message.

drivers/nvme/host/Makefile new file +4 -0

new file mode 100644
index 0000000..cfb6679

Lines of this file are not shown. View the raw message.

drivers/nvme/host/nvme.h new file +133 -0

133 lines not on this page · raw message

drivers/nvme/host/pci.c new file +3354 -0

3,354 lines not on this page · raw message

drivers/nvme/host/scsi.c new file +2556 -0

2,556 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line

1.9.1

Part of the diff is not shown here. View the raw message.

Keith Busch

2015-10-09 16:30 UTC #1 lore raw

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

Quoted 11 lines · Christoph Hellwig

From: Jay Sternberg <jay.e.sternberg at intel.com>
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 <jay.e.sternberg at intel.com>
[hch: rebased, renamed core.c to pci.c, slight tweaks]
Signed-off-by Christoph Hellwig <hch at lst.de>

Looks good to me!

Acked-by Keith Busch <keith.busch at intel.com>

J Freyensee

2015-10-09 16:57 UTC #2 lore raw

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

Quoted 12 lines · Keith Busch

Quoted 11 lines · Christoph Hellwig
From: Jay Sternberg <jay.e.sternberg at intel.com>
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.

Quoted 7 lines

Quoted 3 lines
Signed-off-by Jay Sternberg <jay.e.sternberg at intel.com>
[hch: rebased, renamed core.c to pci.c, slight tweaks]
Signed-off-by Christoph Hellwig <hch at lst.de>
Looks good to me!
Acked-by Keith Busch <keith.busch at intel.com>

Dido.

Acked-by James Freyensee <james_p_freyensee at linux.intel.com>

Quoted 5 lines

_______________________________________________
Linux-nvme mailing list
Linux-nvme at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme

Jens Axboe

2015-10-09 16:30 UTC #3 lore raw

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

In reply to Christoph Hellwig

Quoted 11 lines · Christoph Hellwig

From: Jay Sternberg <jay.e.sternberg at intel.com>
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 <jay.e.sternberg at intel.com>
[hch: rebased, renamed core.c to pci.c, slight tweaks]
Signed-off-by Christoph Hellwig <hch at lst.de>

Looks fine to me, I'll await a response from Keith before shoving this in.

Signature · 1 line

Jens Axboe