Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57dacad5 authored by Jay Sternberg's avatar Jay Sternberg Committed by Jens Axboe
Browse files

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



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: default avatarJay Sternberg <jay.e.sternberg@intel.com>
[hch: rebased, renamed core.c to pci.c, slight tweaks]
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 08c69640

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7448,7 +7448,7 @@ M: Matthew Wilcox <willy@linux.intel.com> 
L:	linux-nvme@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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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