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

Commit 35ff96df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-20161008' of git://git.infradead.org/linux-mtd 

Pull MTD updates from Brian Norris:
 "I've not been very active this cycle, so these are mostly from Boris,
  for the NAND flash subsystem.

  NAND:

   - Add the infrastructure to automate NAND timings configuration

   - Provide a generic DT property to maximize ECC strength

   - Some refactoring in the core bad block table handling, to help with
     improving some of the logic in error cases.

   - Minor cleanups and fixes

  MTD:

   - Add APIs for handling page pairing; this is necessary for reliably
     supporting MLC and TLC NAND flash, where paired-page disturbance
     affects reliability. Upper layers (e.g., UBI) should make use of
     these in the near future"

* tag 'for-linus-20161008' of git://git.infradead.org/linux-mtd: (35 commits)
  mtd: nand: fix trivial spelling error
  mtdpart: Propagate _get/put_device()
  mtd: nand: Provide nand_cleanup() function to free NAND related resources
  mtd: Kill the OF_MTD Kconfig option
  mtd: nand: mxc: Test CONFIG_OF instead of CONFIG_OF_MTD
  mtd: nand: Fix nand_command_lp() for 8bits opcodes
  mtd: nand: sunxi: Support ECC maximization
  mtd: nand: Support maximizing ECC when using software BCH
  mtd: nand: Add an option to maximize the ECC strength
  mtd: nand: mxc: Add timing setup for v2 controllers
  mtd: nand: mxc: implement onfi get/set features
  mtd: nand: sunxi: switch from manual to automated timing config
  mtd: nand: automate NAND timings selection
  mtd: nand: Expose data interface for ONFI mode 0
  mtd: nand: Add function to convert ONFI mode to data_interface
  mtd: nand: convert ONFI mode into data interface
  mtd: nand: Introduce nand_data_interface
  mtd: nand: Create a NAND reset function
  mtd: nand: remove unnecessary 'extern' from function declarations
  MAINTAINERS: Add maintainer entry for Ingenic JZ4780 NAND driver
  ...
parents 97d21167 69db4aa4

Documentation/devicetree/bindings/mtd/nand.txt

+9 −0
Original line number Diff line number Diff line
@@ -35,6 +35,15 @@ Optional NAND chip properties: 
- nand-ecc-step-size: integer representing the number of data bytes

		      that are covered by a single ECC step.



- nand-ecc-maximize: boolean used to specify that you want to maximize ECC

		     strength. The maximum ECC strength is both controller and

		     chip dependent. The controller side has to select the ECC

		     config providing the best strength and taking the OOB area

		     size constraint into account.

		     This is particularly useful when only the in-band area is

		     used by the upper layers, and you want to make your NAND

		     as reliable as possible.



The ECC strength and ECC step size properties define the correction capability

of a controller. Together, they say a controller can correct "{strength} bit

errors per {size} bytes".

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6142,6 +6142,12 @@ M: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> 
S:	Maintained

F:	drivers/dma/dma-jz4780.c



INGENIC JZ4780 NAND DRIVER

M:	Harvey Hunt <harveyhuntnexus@gmail.com>

L:	linux-mtd@lists.infradead.org

S:	Maintained

F:	drivers/mtd/nand/jz4780_*



INTEGRITY MEASUREMENT ARCHITECTURE (IMA)

M:	Mimi Zohar <zohar@linux.vnet.ibm.com>

M:	Dmitry Kasatkin <dmitry.kasatkin@gmail.com>

drivers/mtd/mtdcore.c

+104 −0
Original line number Diff line number Diff line
@@ -375,6 +375,110 @@ static int mtd_reboot_notifier(struct notifier_block *n, unsigned long state, 
	return NOTIFY_DONE;

}



/**

 * mtd_wunit_to_pairing_info - get pairing information of a wunit

 * @mtd: pointer to new MTD device info structure

 * @wunit: write unit we are interested in

 * @info: returned pairing information

 *

 * Retrieve pairing information associated to the wunit.

 * This is mainly useful when dealing with MLC/TLC NANDs where pages can be

 * paired together, and where programming a page may influence the page it is

 * paired with.

 * The notion of page is replaced by the term wunit (write-unit) to stay

 * consistent with the ->writesize field.

 *

 * The @wunit argument can be extracted from an absolute offset using

 * mtd_offset_to_wunit(). @info is filled with the pairing information attached

 * to @wunit.

 *

 * From the pairing info the MTD user can find all the wunits paired with

 * @wunit using the following loop:

 *

 * for (i = 0; i < mtd_pairing_groups(mtd); i++) {

 *	info.pair = i;

 *	mtd_pairing_info_to_wunit(mtd, &info);

 *	...

 * }

 */

int mtd_wunit_to_pairing_info(struct mtd_info *mtd, int wunit,

			      struct mtd_pairing_info *info)

{

	int npairs = mtd_wunit_per_eb(mtd) / mtd_pairing_groups(mtd);



	if (wunit < 0 || wunit >= npairs)

		return -EINVAL;



	if (mtd->pairing && mtd->pairing->get_info)

		return mtd->pairing->get_info(mtd, wunit, info);



	info->group = 0;

	info->pair = wunit;



	return 0;

}

EXPORT_SYMBOL_GPL(mtd_wunit_to_pairing_info);



/**

 * mtd_wunit_to_pairing_info - get wunit from pairing information

 * @mtd: pointer to new MTD device info structure

 * @info: pairing information struct

 *

 * Returns a positive number representing the wunit associated to the info

 * struct, or a negative error code.

 *

 * This is the reverse of mtd_wunit_to_pairing_info(), and can help one to

 * iterate over all wunits of a given pair (see mtd_wunit_to_pairing_info()

 * doc).

 *

 * It can also be used to only program the first page of each pair (i.e.

 * page attached to group 0), which allows one to use an MLC NAND in

 * software-emulated SLC mode:

 *

 * info.group = 0;

 * npairs = mtd_wunit_per_eb(mtd) / mtd_pairing_groups(mtd);

 * for (info.pair = 0; info.pair < npairs; info.pair++) {

 *	wunit = mtd_pairing_info_to_wunit(mtd, &info);

 *	mtd_write(mtd, mtd_wunit_to_offset(mtd, blkoffs, wunit),

 *		  mtd->writesize, &retlen, buf + (i * mtd->writesize));

 * }

 */

int mtd_pairing_info_to_wunit(struct mtd_info *mtd,

			      const struct mtd_pairing_info *info)

{

	int ngroups = mtd_pairing_groups(mtd);

	int npairs = mtd_wunit_per_eb(mtd) / ngroups;



	if (!info || info->pair < 0 || info->pair >= npairs ||

	    info->group < 0 || info->group >= ngroups)

		return -EINVAL;



	if (mtd->pairing && mtd->pairing->get_wunit)

		return mtd->pairing->get_wunit(mtd, info);



	return info->pair;

}

EXPORT_SYMBOL_GPL(mtd_pairing_info_to_wunit);



/**

 * mtd_pairing_groups - get the number of pairing groups

 * @mtd: pointer to new MTD device info structure

 *

 * Returns the number of pairing groups.

 *

 * This number is usually equal to the number of bits exposed by a single

 * cell, and can be used in conjunction with mtd_pairing_info_to_wunit()

 * to iterate over all pages of a given pair.

 */

int mtd_pairing_groups(struct mtd_info *mtd)

{

	if (!mtd->pairing || !mtd->pairing->ngroups)

		return 1;



	return mtd->pairing->ngroups;

}

EXPORT_SYMBOL_GPL(mtd_pairing_groups);



/**

 *	add_mtd_device - register an MTD device

 *	@mtd: pointer to new MTD device info structure

drivers/mtd/mtdpart.c

+19 −0
Original line number Diff line number Diff line
@@ -317,6 +317,18 @@ static int part_block_markbad(struct mtd_info *mtd, loff_t ofs) 
	return res;

}



static int part_get_device(struct mtd_info *mtd)

{

	struct mtd_part *part = mtd_to_part(mtd);

	return part->master->_get_device(part->master);

}



static void part_put_device(struct mtd_info *mtd)

{

	struct mtd_part *part = mtd_to_part(mtd);

	part->master->_put_device(part->master);

}



static int part_ooblayout_ecc(struct mtd_info *mtd, int section,

			      struct mtd_oob_region *oobregion)

{
@@ -397,6 +409,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *master, 
	slave->mtd.oobsize = master->oobsize;

	slave->mtd.oobavail = master->oobavail;

	slave->mtd.subpage_sft = master->subpage_sft;

	slave->mtd.pairing = master->pairing;



	slave->mtd.name = name;

	slave->mtd.owner = master->owner;
@@ -463,6 +476,12 @@ static struct mtd_part *allocate_partition(struct mtd_info *master, 
		slave->mtd._block_isbad = part_block_isbad;

	if (master->_block_markbad)

		slave->mtd._block_markbad = part_block_markbad;



	if (master->_get_device)

		slave->mtd._get_device = part_get_device;

	if (master->_put_device)

		slave->mtd._put_device = part_put_device;



	slave->mtd._erase = part_erase;

	slave->master = master;

	slave->offset = part->offset;

drivers/mtd/nand/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ config MTD_NAND_AMS_DELTA 
	  Support for NAND flash on Amstrad E3 (Delta).



config MTD_NAND_OMAP2

	tristate "NAND Flash device on OMAP2, OMAP3 and OMAP4"

	depends on ARCH_OMAP2PLUS

	tristate "NAND Flash device on OMAP2, OMAP3, OMAP4 and Keystone"

	depends on (ARCH_OMAP2PLUS || ARCH_KEYSTONE)

	help

          Support for NAND flash on Texas Instruments OMAP2, OMAP3 and OMAP4

	  platforms.

          Support for NAND flash on Texas Instruments OMAP2, OMAP3, OMAP4

	  and Keystone platforms.



config MTD_NAND_OMAP_BCH

	depends on MTD_NAND_OMAP2
@@ -428,7 +428,7 @@ config MTD_NAND_ORION 


config MTD_NAND_FSL_ELBC

	tristate "NAND support for Freescale eLBC controllers"

	depends on PPC

	depends on FSL_SOC

	select FSL_LBC

	help

	  Various Freescale chips, including the 8313, include a NAND Flash
@@ -438,7 +438,7 @@ config MTD_NAND_FSL_ELBC 


config MTD_NAND_FSL_IFC

	tristate "NAND support for Freescale IFC controller"

	depends on MTD_NAND && (FSL_SOC || ARCH_LAYERSCAPE)

	depends on FSL_SOC || ARCH_LAYERSCAPE

	select FSL_IFC

	select MEMORY

	help