Merge branch 'samsung/defconfig' into next/defconfig (2d05bf6e) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/ABI/testing/sysfs-block-rssd

+0 −21

Original line number	Original line	Diff line number	Diff line
	What: /sys/block/rssd*/registers
	Date: March 2012
	KernelVersion: 3.3
	Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Dumps below driver information and
	hardware registers.
	- S ACTive
	- Command Issue
	- Completed
	- PORT IRQ STAT
	- HOST IRQ STAT
	- Allocated
	- Commands in Q

	What: /sys/block/rssd*/status		What: /sys/block/rssd*/status
	Date: April 2012		Date: April 2012
	KernelVersion: 3.4		KernelVersion: 3.4
	Contact: Asai Thambi S P <asamymuthupa@micron.com>		Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Indicates the status of the device.		Description: This is a read-only file. Indicates the status of the device.

	What: /sys/block/rssd*/flags
	Date: May 2012
	KernelVersion: 3.5
	Contact: Asai Thambi S P <asamymuthupa@micron.com>
	Description: This is a read-only file. Dumps the flags in port and driver
	data structure

Documentation/ABI/testing/sysfs-class-mtd

+9 −8

Documentation/DocBook/media/v4l/controls.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3988,7 +3988,7 @@ interface and may change in the future.</para>
	from RGB to Y'CbCr color space.		from RGB to Y'CbCr color space.
	</entry>		</entry>
	</row>		</row>
	<row id = "v4l2-jpeg-chroma-subsampling">		<row>
	<entrytbl spanname="descr" cols="2">		<entrytbl spanname="descr" cols="2">
	<tbody valign="top">		<tbody valign="top">
	<row>		<row>

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -284,13 +284,6 @@ These controls are described in <xref
	processing controls. These controls are described in <xref		processing controls. These controls are described in <xref
	linkend="image-process-controls" />.</entry>		linkend="image-process-controls" />.</entry>
	</row>		</row>
	<row>
	<entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>
	<entry>0x9d0000</entry>
	<entry>The class containing JPEG compression controls.
	These controls are described in <xref
	linkend="jpeg-controls" />.</entry>
	</row>
	</tbody>		</tbody>
	</tgroup>		</tgroup>
	</table>		</table>

Documentation/device-mapper/verity.txt

+46 −85

Original line number	Original line	Diff line number	Diff line
	@@ -7,13 +7,13 @@ This target is read-only.

	Construction Parameters		Construction Parameters
	=======================		=======================
	<version> <dev> <hash_dev> <hash_start>		<version> <dev> <hash_dev>
	<data_block_size> <hash_block_size>		<data_block_size> <hash_block_size>
	<num_data_blocks> <hash_start_block>		<num_data_blocks> <hash_start_block>
	<algorithm> <digest> <salt>		<algorithm> <digest> <salt>

	<version>		<version>
	This is the version number of the on-disk format.		This is the type of the on-disk hash format.

	0 is the original format used in the Chromium OS.		0 is the original format used in the Chromium OS.
	The salt is appended when hashing, digests are stored continuously and		The salt is appended when hashing, digests are stored continuously and
	@@ -24,22 +24,22 @@ Construction Parameters
	padded with zeros to the power of two.		padded with zeros to the power of two.

	<dev>		<dev>
	This is the device containing the data the integrity of which needs to be		This is the device containing data, the integrity of which needs to be
	checked. It may be specified as a path, like /dev/sdaX, or a device number,		checked. It may be specified as a path, like /dev/sdaX, or a device number,
	<major>:<minor>.		<major>:<minor>.

	<hash_dev>		<hash_dev>
	This is the device that that supplies the hash tree data. It may be		This is the device that supplies the hash tree data. It may be
	specified similarly to the device path and may be the same device. If the		specified similarly to the device path and may be the same device. If the
	same device is used, the hash_start should be outside of the dm-verity		same device is used, the hash_start should be outside the configured
	configured device size.		dm-verity device.

	<data_block_size>		<data_block_size>
	The block size on a data device. Each block corresponds to one digest on		The block size on a data device in bytes.
	the hash device.		Each block corresponds to one digest on the hash device.

	<hash_block_size>		<hash_block_size>
	The size of a hash block.		The size of a hash block in bytes.

	<num_data_blocks>		<num_data_blocks>
	The number of data blocks on the data device. Additional blocks are		The number of data blocks on the data device. Additional blocks are
	@@ -73,20 +73,20 @@ When a dm-verity device is configured, it is expected that the caller
	has been authenticated in some way (cryptographic signatures, etc).		has been authenticated in some way (cryptographic signatures, etc).
	After instantiation, all hashes will be verified on-demand during		After instantiation, all hashes will be verified on-demand during
	disk access. If they cannot be verified up to the root node of the		disk access. If they cannot be verified up to the root node of the
	tree, the root hash, then the I/O will fail. This should identify		tree, the root hash, then the I/O will fail. This should detect
	tampering with any data on the device and the hash data.		tampering with any data on the device and the hash data.

	Cryptographic hashes are used to assert the integrity of the device on a		Cryptographic hashes are used to assert the integrity of the device on a
	per-block basis. This allows for a lightweight hash computation on first read		per-block basis. This allows for a lightweight hash computation on first read
	into the page cache. Block hashes are stored linearly-aligned to the nearest		into the page cache. Block hashes are stored linearly, aligned to the nearest
	block the size of a page.		block size.

	Hash Tree		Hash Tree
	---------		---------

	Each node in the tree is a cryptographic hash. If it is a leaf node, the hash		Each node in the tree is a cryptographic hash. If it is a leaf node, the hash
	is of some block data on disk. If it is an intermediary node, then the hash is		of some data block on disk is calculated. If it is an intermediary node,
	of a number of child nodes.		the hash of a number of child nodes is calculated.

	Each entry in the tree is a collection of neighboring nodes that fit in one		Each entry in the tree is a collection of neighboring nodes that fit in one
	block. The number is determined based on block_size and the size of the		block. The number is determined based on block_size and the size of the
	@@ -110,63 +110,23 @@ alg = sha256, num_blocks = 32768, block_size = 4096
	On-disk format		On-disk format
	==============		==============

	Below is the recommended on-disk format. The verity kernel code does not		The verity kernel code does not read the verity metadata on-disk header.
	read the on-disk header. It only reads the hash blocks which directly		It only reads the hash blocks which directly follow the header.
	follow the header. It is expected that a user-space tool will verify the		It is expected that a user-space tool will verify the integrity of the
	integrity of the verity_header and then call dmsetup with the correct		verity header.
	parameters. Alternatively, the header can be omitted and the dmsetup
	parameters can be passed via the kernel command-line in a rooted chain
	of trust where the command-line is verified.

	The on-disk format is especially useful in cases where the hash blocks		Alternatively, the header can be omitted and the dmsetup parameters can
	are on a separate partition. The magic number allows easy identification		be passed via the kernel command-line in a rooted chain of trust where
	of the partition contents. Alternatively, the hash blocks can be stored		the command-line is verified.
	in the same partition as the data to be verified. In such a configuration
	the filesystem on the partition would be sized a little smaller than
	the full-partition, leaving room for the hash blocks.

	struct superblock {
	uint8_t signature[8]
	"verity\0\0";

	uint8_t version;
	1 - current format

	uint8_t data_block_bits;
	log2(data block size)

	uint8_t hash_block_bits;
	log2(hash block size)

	uint8_t pad1[1];
	zero padding

	uint16_t salt_size;
	big-endian salt size

	uint8_t pad2[2];
	zero padding

	uint32_t data_blocks_hi;
	big-endian high 32 bits of the 64-bit number of data blocks

	uint32_t data_blocks_lo;
	big-endian low 32 bits of the 64-bit number of data blocks

	uint8_t algorithm[16];
	cryptographic algorithm

	uint8_t salt[384];
	salt (the salt size is specified above)

	uint8_t pad3[88];
	zero padding to 512-byte boundary
	}

	Directly following the header (and with sector number padded to the next hash		Directly following the header (and with sector number padded to the next hash
	block boundary) are the hash blocks which are stored a depth at a time		block boundary) are the hash blocks which are stored a depth at a time
	(starting from the root), sorted in order of increasing index.		(starting from the root), sorted in order of increasing index.

			The full specification of kernel parameters and on-disk metadata format
			is available at the cryptsetup project's wiki page
			http://code.google.com/p/cryptsetup/wiki/DMVerity

	Status		Status
	======		======
	V (for Valid) is returned if every check performed so far was valid.		V (for Valid) is returned if every check performed so far was valid.
	@@ -174,21 +134,22 @@ If any check failed, C (for Corruption) is returned.

	Example		Example
	=======		=======

	Set up a device:		Set up a device:
	dmsetup create vroot --table \		# dmsetup create vroot --readonly --table \
	"0 2097152 "\		"0 2097152 verity 1 /dev/sda1 /dev/sda2 4096 4096 262144 1 sha256 "\
	"verity 1 /dev/sda1 /dev/sda2 4096 4096 2097152 1 "\
	"4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076 "\		"4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076 "\
	"1234000000000000000000000000000000000000000000000000000000000000"		"1234000000000000000000000000000000000000000000000000000000000000"

	A command line tool veritysetup is available to compute or verify		A command line tool veritysetup is available to compute or verify
	the hash tree or activate the kernel driver. This is available from		the hash tree or activate the kernel device. This is available from
	the LVM2 upstream repository and may be supplied as a package called		the cryptsetup upstream repository http://code.google.com/p/cryptsetup/
	device-mapper-verity-tools:		(as a libcryptsetup extension).
	git://sources.redhat.com/git/lvm2
	http://sourceware.org/git/?p=lvm2.git		Create hash on the device:
	http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/verity?cvsroot=lvm2		# veritysetup format /dev/sda1 /dev/sda2
			...
	veritysetup -a vroot /dev/sda1 /dev/sda2 \		Root hash: 4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076

			Activate the device:
			# veritysetup create vroot /dev/sda1 /dev/sda2 \
	4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076		4392712ba01368efdf14b05c76f9e4df0d53664630b5d48632ed17a137f39076

Original line number	Original line	Diff line number	Diff line
	@@ -142,13 +142,14 @@ KernelVersion: 3.4
	Contact: linux-mtd@lists.infradead.org		Contact: linux-mtd@lists.infradead.org
	Description:		Description:
	This allows the user to examine and adjust the criteria by which		This allows the user to examine and adjust the criteria by which
	mtd returns -EUCLEAN from mtd_read(). If the maximum number of		mtd returns -EUCLEAN from mtd_read() and mtd_read_oob(). If the
	bit errors that were corrected on any single region comprising		maximum number of bit errors that were corrected on any single
	an ecc step (as reported by the driver) equals or exceeds this		region comprising an ecc step (as reported by the driver) equals
	value, -EUCLEAN is returned. Otherwise, absent an error, 0 is		or exceeds this value, -EUCLEAN is returned. Otherwise, absent
	returned. Higher layers (e.g., UBI) use this return code as an		an error, 0 is returned. Higher layers (e.g., UBI) use this
	indication that an erase block may be degrading and should be		return code as an indication that an erase block may be
	scrutinized as a candidate for being marked as bad.		degrading and should be scrutinized as a candidate for being
			marked as bad.

	The initial value may be specified by the flash device driver.		The initial value may be specified by the flash device driver.
	If not, then the default value is ecc_strength.		If not, then the default value is ecc_strength.
	@@ -167,7 +168,7 @@ Description:
	block degradation, but high enough to avoid the consequences of		block degradation, but high enough to avoid the consequences of
	a persistent return value of -EUCLEAN on devices where sticky		a persistent return value of -EUCLEAN on devices where sticky
	bitflips occur. Note that if bitflip_threshold exceeds		bitflips occur. Note that if bitflip_threshold exceeds
	ecc_strength, -EUCLEAN is never returned by mtd_read().		ecc_strength, -EUCLEAN is never returned by the read operations.
	Conversely, if bitflip_threshold is zero, -EUCLEAN is always		Conversely, if bitflip_threshold is zero, -EUCLEAN is always
	returned, absent a hard error.		returned, absent a hard error.