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

This reverts commit 57dacad5f2288e3de91f99b29f07b4a2793446d2. We need to
cherry-pick many commits before merging this commit. Hence this commit
is reverted to cherry-pick the commits from upstream.

Orabug: 25130845
Conflicts:
        drivers/nvme/host/Kconfig

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 3d38445f5b6430889ea7a3ca0a87378b03baa20f..2bc43f88b6058174475d55051e92cffd2d44f306 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7079,7 +7079,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/nvme/host/
+F:     drivers/block/nvme*
 F:     include/linux/nvme.h
 
 NXP-NCI NFC DRIVER

diff --git a/drivers/Kconfig b/drivers/Kconfig
index be47f626d57a77094f32d8a92cf20cc3952f0007..6e973b8e3a3beddbde495046088ba150240d3a94 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -18,8 +18,6 @@ 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"

diff --git a/drivers/Makefile b/drivers/Makefile
index 1f42bf4a4555a1b564a1b9c153a2a68e05f0847b..692adf6590281d7dcd3d875d2986c3b09514f9b7 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -70,7 +70,6 @@ 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/

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index cbe0595dc5fb5d0e6967978771b2b648adc0b5c3..a7d77bf6328adde51949d265c0470f1df509ea40 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -310,6 +310,17 @@ 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

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a278c2cfdab730098c515da1a69e62437ca9b02d..dcb2c795d9c4b5a258bb39703a58f91a3aac4d92 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -22,6 +22,7 @@ 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
 obj-$(CONFIG_VDS)              += vds/
@@ -44,6 +45,7 @@ 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
 

diff --git a/drivers/nvme/host/pci.c b/drivers/block/nvme-core.c
similarity index 100%
rename from drivers/nvme/host/pci.c
rename to drivers/block/nvme-core.c

diff --git a/drivers/nvme/host/scsi.c b/drivers/block/nvme-scsi.c
similarity index 100%
rename from drivers/nvme/host/scsi.c
rename to drivers/block/nvme-scsi.c

diff --git a/drivers/nvme/host/nvme.h b/drivers/block/nvme.h
similarity index 100%
rename from drivers/nvme/host/nvme.h
rename to drivers/block/nvme.h

diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig
deleted file mode 100644 (file)
index a39d943..0000000
--- a/drivers/nvme/Kconfig
+++ /dev/null
@@ -1 +0,0 @@
-source "drivers/nvme/host/Kconfig"

diff --git a/drivers/nvme/Makefile b/drivers/nvme/Makefile
deleted file mode 100644 (file)
index 9421e82..0000000
--- a/drivers/nvme/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-
-obj-y          += host/

diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig
deleted file mode 100644 (file)
index 002a94a..0000000
--- a/drivers/nvme/host/Kconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-config BLK_DEV_NVME
-       tristate "NVM Express block device"
-       depends on PCI && BLOCK
-       ---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.

diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
deleted file mode 100644 (file)
index cfb6679..0000000
--- a/drivers/nvme/host/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-
-obj-$(CONFIG_BLK_DEV_NVME)     += nvme.o
-
-nvme-y         += pci.o scsi.o