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

Commit effa04cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.4/lightnvm' of git://git.kernel.dk/linux-block 

Pull lightnvm support from Jens Axboe:
 "This adds support for lightnvm, and adds support to NVMe as well.
  This is pretty exciting, in that it enables new and interesting use
  cases for compatible flash devices.  There's a LWN writeup about an
  earlier posting here:

      https://lwn.net/Articles/641247/

  This has been underway for a while, and should be ready for merging at
  this point"

* 'for-4.4/lightnvm' of git://git.kernel.dk/linux-block:
  nvme: lightnvm: clean up a data type
  lightnvm: refactor phys addrs type to u64
  nvme: LightNVM support
  rrpc: Round-robin sector target with cost-based gc
  gennvm: Generic NVM manager
  lightnvm: Support for Open-Channel SSDs
parents a9aa31cd 5f436e5e

Documentation/ioctl/ioctl-number.txt

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ Code Seq#(hex) Include File Comments 
'K'	all	linux/kd.h

'L'	00-1F	linux/loop.h		conflict!

'L'	10-1F	drivers/scsi/mpt2sas/mpt2sas_ctl.h	conflict!

'L'	20-2F	linux/lightnvm.h

'L'	E0-FF	linux/ppdd.h		encrypted disk device driver

					<http://linux01.gwdg.de/~alatham/ppdd.html>

'M'	all	linux/soundcard.h	conflict!

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6279,6 +6279,14 @@ F: drivers/nvdimm/pmem.c 
F:	include/linux/pmem.h

F:	arch/*/include/asm/pmem.h



LIGHTNVM PLATFORM SUPPORT

M:	Matias Bjorling <mb@lightnvm.io>

W:	http://github/OpenChannelSSD

S:	Maintained

F:	drivers/lightnvm/

F:	include/linux/lightnvm.h

F:	include/uapi/linux/lightnvm.h



LINUX FOR IBM pSERIES (RS/6000)

M:	Paul Mackerras <paulus@au.ibm.com>

W:	http://www.ibm.com/linux/ltc/projects/ppc

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ source "drivers/net/Kconfig" 


source "drivers/isdn/Kconfig"



source "drivers/lightnvm/Kconfig"



# input before char - char/joystick depends on it. As does USB.



source "drivers/input/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-$(CONFIG_NVM)		+= lightnvm/

obj-y				+= nvme/

obj-$(CONFIG_ATA)		+= ata/

obj-$(CONFIG_TARGET_CORE)	+= target/

drivers/lightnvm/Kconfig

0 → 100644
+42 −0
Original line number Diff line number Diff line 
#

# Open-Channel SSD NVM configuration

#



menuconfig NVM

	bool "Open-Channel SSD target support"

	depends on BLOCK

	help

	  Say Y here to get to enable Open-channel SSDs.



	  Open-Channel SSDs implement a set of extension to SSDs, that

	  exposes direct access to the underlying non-volatile memory.



	  If you say N, all options in this submenu will be skipped and disabled

	  only do this if you know what you are doing.



if NVM



config NVM_DEBUG

	bool "Open-Channel SSD debugging support"

	---help---

	Exposes a debug management interface to create/remove targets at:



	  /sys/module/lnvm/parameters/configure_debug



	It is required to create/remove targets without IOCTLs.



config NVM_GENNVM

	tristate "Generic NVM manager for Open-Channel SSDs"

	---help---

	NVM media manager for Open-Channel SSDs that offload management

	functionality to device, while keeping data placement and garbage

	collection decisions on the host.



config NVM_RRPC

	tristate "Round-robin Hybrid Open-Channel SSD target"

	---help---

	Allows an open-channel SSD to be exposed as a block device to the

	host. The target is implemented using a linear mapping table and

	cost-based garbage collection. It is optimized for 4K IO sizes.



endif # NVM