Commit 6d4121f6 authored by Pekka Enberg's avatar Pekka Enberg
Browse files

Merge branch 'master' into for-linus 

Conflicts:
	include/linux/percpu.h
	mm/percpu.c
parents 92a5bbc1 35da7a30

CREDITS

+4 −4
Original line number Diff line number Diff line
@@ -3554,12 +3554,12 @@ E: cvance@nai.com 
D: portions of the Linux Security Module (LSM) framework and security modules



N: Petr Vandrovec

E: vandrove@vc.cvut.cz

E: petr@vandrovec.name

D: Small contributions to ncpfs

D: Matrox framebuffer driver

S: Chudenicka 8

S: 10200 Prague 10, Hostivar

S: Czech Republic

S: 21513 Conradia Ct

S: Cupertino, CA 95014

S: USA



N: Thibaut Varene

E: T-Bone@parisc-linux.org

Documentation/ABI/testing/sysfs-ata

0 → 100644
+99 −0
Original line number Diff line number Diff line 
What:		/sys/class/ata_...

Date:		August 2008

Contact:	Gwendal Grignou<gwendal@google.com>

Description:



Provide a place in sysfs for storing the ATA topology of the system.  This allows

retrieving various information about ATA objects.



Files under /sys/class/ata_port

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



	For each port, a directory ataX is created where X is the ata_port_id of

	the port. The device parent is the ata host device.



idle_irq (read)



	Number of IRQ received by the port while idle [some ata HBA only].



nr_pmp_links (read)



	If a SATA Port Multiplier (PM) is connected, number of link behind it.



Files under /sys/class/ata_link

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



	Behind each port, there is a ata_link. If there is a SATA PM in the

	topology, 15 ata_link objects are created.



	If a link is behind a port, the directory name is linkX, where X is

	ata_port_id of the port.

	If a link is behind a PM, its name is linkX.Y where X is ata_port_id

	of the parent port and Y the PM port.



hw_sata_spd_limit



	Maximum speed supported by the connected SATA device.



sata_spd_limit



	Maximum speed imposed by libata.



sata_spd



	Current speed of the link [1.5, 3Gps,...].



Files under /sys/class/ata_device

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



	Behind each link, up to two ata device are created.

	The name of the directory is devX[.Y].Z where:

	- X is ata_port_id of the port where the device is connected,

	- Y the port of the PM if any, and

	- Z the device id: for PATA, there is usually 2 devices [0,1],

	only 1 for SATA.



class

	Device class. Can be "ata" for disk, "atapi" for packet device,

	"pmp" for PM, or "none" if no device was found behind the link.



dma_mode



	Transfer modes supported by the device when in DMA mode.

	Mostly used by PATA device.



pio_mode



	Transfer modes supported by the device when in PIO mode.

	Mostly used by PATA device.



xfer_mode



	Current transfer mode.



id



	Cached result of IDENTIFY command, as described in ATA8 7.16 and 7.17.

	Only valid if the device is not a PM.



gscr



	Cached result of the dump of PM GSCR register.

	Valid registers are:

	0: 	SATA_PMP_GSCR_PROD_ID,

	1: 	SATA_PMP_GSCR_REV,

	2: 	SATA_PMP_GSCR_PORT_INFO,

	32:	SATA_PMP_GSCR_ERROR,

	33:	SATA_PMP_GSCR_ERROR_EN,

	64:	SATA_PMP_GSCR_FEAT,

	96:	SATA_PMP_GSCR_FEAT_EN,

	130:	SATA_PMP_GSCR_SII_GPIO

	Only valid if the device is a PM.



spdn_cnt



	Number of time libata decided to lower the speed of link due to errors.



ering



	Formatted output of the error ring of the device.

Documentation/ABI/testing/sysfs-devices-power

+88 −0
Original line number Diff line number Diff line
@@ -77,3 +77,91 @@ Description: 
		devices this attribute is set to "enabled" by bus type code or

		device drivers and in that cases it should be safe to leave the

		default value.



What:		/sys/devices/.../power/wakeup_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_count attribute contains the number

		of signaled wakeup events associated with the device.  This

		attribute is read-only.  If the device is not enabled to wake up

		the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_active_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_active_count attribute contains the

		number of times the processing of wakeup events associated with

		the device was completed (at the kernel level).  This attribute

		is read-only.  If the device is not enabled to wake up the

		system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_hit_count

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_hit_count attribute contains the

		number of times the processing of a wakeup event associated with

		the device might prevent the system from entering a sleep state.

		This attribute is read-only.  If the device is not enabled to

		wake up the system from sleep states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_active

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_active attribute contains either 1,

		or 0, depending on whether or not a wakeup event associated with

		the device is being processed (1).  This attribute is read-only.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_total_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_total_time_ms attribute contains

		the total time of processing wakeup events associated with the

		device, in milliseconds.  This attribute is read-only.  If the

		device is not enabled to wake up the system from sleep states,

		this attribute is empty.



What:		/sys/devices/.../power/wakeup_max_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_max_time_ms attribute contains

		the maximum time of processing a single wakeup event associated

		with the device, in milliseconds.  This attribute is read-only.

		If the device is not enabled to wake up the system from sleep

		states, this attribute is empty.



What:		/sys/devices/.../power/wakeup_last_time_ms

Date:		September 2010

Contact:	Rafael J. Wysocki <rjw@sisk.pl>

Description:

		The /sys/devices/.../wakeup_last_time_ms attribute contains

		the value of the monotonic clock corresponding to the time of

		signaling the last wakeup event associated with the device, in

		milliseconds.  This attribute is read-only.  If the device is

		not enabled to wake up the system from sleep states, this

		attribute is empty.



What:		/sys/devices/.../power/autosuspend_delay_ms

Date:		September 2010

Contact:	Alan Stern <stern@rowland.harvard.edu>

Description:

		The /sys/devices/.../power/autosuspend_delay_ms attribute

		contains the autosuspend delay value (in milliseconds).  Some

		drivers do not want their device to suspend as soon as it

		becomes idle at run time; they want the device to remain

		inactive for a certain minimum period of time first.  That

		period is called the autosuspend delay.  Negative values will

		prevent the device from being suspended at run time (similar

		to writing "on" to the power/control attribute).  Values >=

		1000 will cause the autosuspend timer expiration to be rounded

		up to the nearest second.



		Not all drivers support this attribute.  If it isn't supported,

		attempts to read or write it will yield I/O errors.

Documentation/ABI/testing/sysfs-module

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/sys/module/pch_phub/drivers/.../pch_mac

Date:		August 2010

KernelVersion:	2.6.35

Contact:	masa-korg@dsn.okisemi.com

Description:	Write/read GbE MAC address.



What:		/sys/module/pch_phub/drivers/.../pch_firmware

Date:		August 2010

KernelVersion:	2.6.35

Contact:	masa-korg@dsn.okisemi.com

Description:	Write/read Option ROM data.

Documentation/ABI/testing/sysfs-power

+29 −0
Original line number Diff line number Diff line
@@ -99,9 +99,38 @@ Description: 


		dmesg -s 1000000 | grep 'hash matches'



		If you do not get any matches (or they appear to be false

		positives), it is possible that the last PM event point

		referred to a device created by a loadable kernel module.  In

		this case cat /sys/power/pm_trace_dev_match (see below) after

		your system is started up and the kernel modules are loaded.



		CAUTION: Using it will cause your machine's real-time (CMOS)

		clock to be set to a random invalid time after a resume.



What;		/sys/power/pm_trace_dev_match

Date:		October 2010

Contact:	James Hogan <james@albanarts.com>

Description:

		The /sys/power/pm_trace_dev_match file contains the name of the

		device associated with the last PM event point saved in the RTC

		across reboots when pm_trace has been used.  More precisely it

		contains the list of current devices (including those

		registered by loadable kernel modules since boot) which match

		the device hash in the RTC at boot, with a newline after each

		one.



		The advantage of this file over the hash matches printed to the

		kernel log (see /sys/power/pm_trace), is that it includes

		devices created after boot by loadable kernel modules.



		Due to the small hash size necessary to fit in the RTC, it is

		possible that more than one device matches the hash, in which

		case further investigation is required to determine which

		device is causing the problem.  Note that genuine RTC clock

		values (such as when pm_trace has not been used), can still

		match a device and output it's name here.



What:		/sys/power/pm_async

Date:		January 2009

Contact:	Rafael J. Wysocki <rjw@sisk.pl>