Commit 7e97b283 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6: (82 commits)
  [MTD] m25p80: Add Support for ATMEL AT25DF641 64-Megabit SPI Flash
  [MTD] m25p80: add FAST_READ access support to M25Pxx
  [MTD] [NAND] bf5xx_nand: Avoid crash if bfin_mac is installed.
  [MTD] [NAND] at91_nand: control NCE signal
  [MTD] [NAND] AT91 hardware ECC compile fix for at91sam9263 / at91sam9260
  [MTD] [NAND] Hardware ECC controller on at91sam9263 / at91sam9260
  [JFFS2] Introduce dbg_readinode2 log level, use it to shut read_dnode() up
  [JFFS2] Fix jffs2_reserve_space() when all blocks are pending erasure.
  [JFFS2] Add erase_checking_list to hold blocks being marked.
  UBI: add a message
  [JFFS2] Return values of jffs2_block_check_erase error paths
  [MTD] Clean up AR7 partition map support
  [MTD] [NOR] Fix Intel CFI driver for collie flash
  [JFFS2] Finally remove redundant ref->__totlen field.
  [JFFS2] Honour TEST_TOTLEN macro in debugging code. ref->__totlen is going!
  [JFFS2] Add paranoia debugging for superblock counts
  [JFFS2] Fix free space leak with in-band cleanmarkers
  [JFFS2] Self-sufficient #includes in jffs2_fs_i.h: include <linux/mutex.h>
  [MTD] [NAND] Verify probe by retrying to checking the results match
  [MTD] [NAND] S3C2410 Allow ECC disable to be specified by the board
  ...
parents 5421d059 3887ed52

Documentation/ABI/stable/sysfs-class-ubi

0 → 100644
+212 −0
Original line number Diff line number Diff line 
What:		/sys/class/ubi/

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		The ubi/ class sub-directory belongs to the UBI subsystem and

		provides general UBI information, per-UBI device information

		and per-UBI volume information.



What:		/sys/class/ubi/version

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		This file contains version of the latest supported UBI on-media

		format. Currently it is 1, and there is no plan to change this.

		However, if in the future UBI needs on-flash format changes

		which cannot be done in a compatible manner, a new format

		version will be added. So this is a mechanism for possible

		future backward-compatible (but forward-incompatible)

		improvements.



What:		/sys/class/ubiX/

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		The /sys/class/ubi0, /sys/class/ubi1, etc directories describe

		UBI devices (UBI device 0, 1, etc). They contain general UBI

		device information and per UBI volume information (each UBI

		device may have many UBI volumes)



What:		/sys/class/ubi/ubiX/avail_eraseblocks

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Amount of available logical eraseblock. For example, one may

		create a new UBI volume which has this amount of logical

		eraseblocks.



What:		/sys/class/ubi/ubiX/bad_peb_count

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Count of bad physical eraseblocks on the underlying MTD device.



What:		/sys/class/ubi/ubiX/bgt_enabled

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Contains ASCII "0\n" if the UBI background thread is disabled,

		and ASCII "1\n" if it is enabled.



What:		/sys/class/ubi/ubiX/dev

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Major and minor numbers of the character device corresponding

		to this UBI device (in <major>:<minor> format).



What:		/sys/class/ubi/ubiX/eraseblock_size

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Maximum logical eraseblock size this UBI device may provide. UBI

		volumes may have smaller logical eraseblock size because of their

		alignment.



What:		/sys/class/ubi/ubiX/max_ec

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Maximum physical eraseblock erase counter value.



What:		/sys/class/ubi/ubiX/max_vol_count

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Maximum number of volumes which this UBI device may have.



What:		/sys/class/ubi/ubiX/min_io_size

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Minimum input/output unit size. All the I/O may only be done

		in fractions of the contained number.



What:		/sys/class/ubi/ubiX/mtd_num

Date:		January 2008

KernelVersion:	2.6.25

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Number of the underlying MTD device.



What:		/sys/class/ubi/ubiX/reserved_for_bad

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Number of physical eraseblocks reserved for bad block handling.



What:		/sys/class/ubi/ubiX/total_eraseblocks

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Total number of good (not marked as bad) physical eraseblocks on

		the underlying MTD device.



What:		/sys/class/ubi/ubiX/volumes_count

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Count of volumes on this UBI device.



What:		/sys/class/ubi/ubiX/ubiX_Y/

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		The /sys/class/ubi/ubiX/ubiX_0/, /sys/class/ubi/ubiX/ubiX_1/,

		etc directories describe UBI volumes on UBI device X (volumes

		0, 1, etc).



What:		/sys/class/ubi/ubiX/ubiX_Y/alignment

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Volume alignment - the value the logical eraseblock size of

		this volume has to be aligned on. For example, 2048 means that

		logical eraseblock size is multiple of 2048. In other words,

		volume logical eraseblock size is UBI device logical eraseblock

		size aligned to the alignment value.



What:		/sys/class/ubi/ubiX/ubiX_Y/corrupted

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Contains ASCII "0\n" if the UBI volume is OK, and ASCII "1\n"

		if it is corrupted (e.g., due to an interrupted volume update).



What:		/sys/class/ubi/ubiX/ubiX_Y/data_bytes

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		The amount of data this volume contains. This value makes sense

		only for static volumes, and for dynamic volume it equivalent

		to the total volume size in bytes.



What:		/sys/class/ubi/ubiX/ubiX_Y/dev

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Major and minor numbers of the character device corresponding

		to this UBI volume (in <major>:<minor> format).



What:		/sys/class/ubi/ubiX/ubiX_Y/name

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Volume name.



What:		/sys/class/ubi/ubiX/ubiX_Y/reserved_ebs

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Count of physical eraseblock reserved for this volume.

		Equivalent to the volume size in logical eraseblocks.



What:		/sys/class/ubi/ubiX/ubiX_Y/type

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Volume type. Contains ASCII "dynamic\n" for dynamic volumes and

		"static\n" for static volumes.



What:		/sys/class/ubi/ubiX/ubiX_Y/upd_marker

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Contains ASCII "0\n" if the update marker is not set for this

		volume, and "1\n" if it is set. The update marker is set when

		volume update starts, and cleaned when it ends. So the presence

		of the update marker indicates that the volume is being updated

		at the moment of the update was interrupted. The later may be

		checked using the "corrupted" sysfs file.



What:		/sys/class/ubi/ubiX/ubiX_Y/usable_eb_size

Date:		July 2006

KernelVersion:	2.6.22

Contact:	Artem Bityutskiy <dedekind@infradead.org>

Description:

		Logical eraseblock size of this volume. Equivalent to logical

		eraseblock size of the device aligned on the volume alignment

		value.

Documentation/arm/Samsung-S3C24XX/NAND.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
			S3C24XX NAND Support

			====================



Introduction

------------



Small Page NAND

---------------



The driver uses a 512 byte (1 page) ECC code for this setup. The

ECC code is not directly compatible with the default kernel ECC

code, so the driver enforces its own OOB layout and ECC parameters



Large Page NAND

---------------



The driver is capable of handling NAND flash with a 2KiB page

size, with support for hardware ECC generation and correction.



Unlike the 512byte page mode, the driver generates ECC data for

each 256 byte block in an 2KiB page. This means that more than

one error in a page can be rectified. It also means that the

OOB layout remains the default kernel layout for these flashes.





Document Author

---------------



Ben Dooks, Copyright 2007 Simtec Electronics

Documentation/arm/Samsung-S3C24XX/Overview.txt

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,8 @@ NAND 
  controller. If there are any problems the latest linux-mtd

  code can be found from http://www.linux-mtd.infradead.org/



  For more information see Documentation/arm/Samsung-S3C24XX/NAND.txt





Serial

------

drivers/mtd/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,12 @@ config MTD_OF_PARTS 
	  the partition map from the children of the flash node,

	  as described in Documentation/powerpc/booting-without-of.txt.



config MTD_AR7_PARTS

	tristate "TI AR7 partitioning support"

	depends on MTD_PARTITIONS

	---help---

	  TI AR7 partitioning support



comment "User Modules And Translation Layers"



config MTD_CHAR

drivers/mtd/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o 
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o

obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o

obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o

obj-$(CONFIG_MTD_AR7_PARTS)	+= ar7part.o

obj-$(CONFIG_MTD_OF_PARTS)      += ofpart.o



# 'Users' - code which presents functionality to userspace.

CRA Git | Maintained and supported by SUSTech CRA and CCSE