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

Commit 18da2c9e authored by Dan Williams's avatar Dan Williams
Browse files

libnvdimm, pmem: move pmem to drivers/nvdimm/ 



Prepare the pmem driver to consume PMEM namespaces emitted by regions of
an nvdimm_bus instance.  No functional change.

Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarToshi Kani <toshi.kani@hp.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 3d88002e

drivers/block/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -404,17 +404,6 @@ config BLK_DEV_RAM_DAX 
	  and will prevent RAM block device backing store memory from being

	  allocated from highmem (only a problem for highmem systems).



config BLK_DEV_PMEM

	tristate "Persistent memory block device support"

	help

	  Saying Y here will allow you to use a contiguous range of reserved

	  memory as one or more persistent block devices.



	  To compile this driver as a module, choose M here: the module will be

	  called 'pmem'.



	  If unsure, say N.



config CDROM_PKTCDVD

	tristate "Packet writing on CD/DVD media"

	depends on !UML

drivers/block/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ obj-$(CONFIG_PS3_VRAM) += ps3vram.o 
obj-$(CONFIG_ATARI_FLOPPY)	+= ataflop.o

obj-$(CONFIG_AMIGA_Z2RAM)	+= z2ram.o

obj-$(CONFIG_BLK_DEV_RAM)	+= brd.o

obj-$(CONFIG_BLK_DEV_PMEM)	+= pmem.o

obj-$(CONFIG_BLK_DEV_LOOP)	+= loop.o

obj-$(CONFIG_BLK_CPQ_DA)	+= cpqarray.o

obj-$(CONFIG_BLK_CPQ_CISS_DA)  += cciss.o

drivers/nvdimm/Kconfig

+22 −1
Original line number Diff line number Diff line 
config LIBNVDIMM

menuconfig LIBNVDIMM

	tristate "NVDIMM (Non-Volatile Memory Device) Support"

	depends on PHYS_ADDR_T_64BIT

	depends on BLK_DEV
@@ -13,3 +13,24 @@ config LIBNVDIMM 
	  CONFIG_DAX).  A BLK namespace refers to an NVDIMM control

	  region which exposes an mmio register set for windowed

	  access mode to non-volatile memory.



if LIBNVDIMM



config BLK_DEV_PMEM

	tristate "PMEM: Persistent memory block device support"

	default LIBNVDIMM

	depends on HAS_IOMEM

	help

	  Memory ranges for PMEM are described by either an NFIT

	  (NVDIMM Firmware Interface Table, see CONFIG_NFIT_ACPI), a

	  non-standard OEM-specific E820 memory type (type-12, see

	  CONFIG_X86_PMEM_LEGACY), or it is manually specified by the

	  'memmap=nn[KMG]!ss[KMG]' kernel command line (see

	  Documentation/kernel-parameters.txt).  This driver converts

	  these persistent memory ranges into block devices that are

	  capable of DAX (direct-access) file system mappings.  See

	  Documentation/nvdimm/nvdimm.txt for more details.



	  Say Y if you want to use an NVDIMM



endif

drivers/nvdimm/Makefile

+3 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_LIBNVDIMM) += libnvdimm.o

obj-$(CONFIG_BLK_DEV_PMEM) += nd_pmem.o



nd_pmem-y := pmem.o



libnvdimm-y := core.o

libnvdimm-y += bus.o

drivers/block/pmem.c→drivers/nvdimm/pmem.c

+0 −0

File moved.

View file