Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux (fd9879b9) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

+3 −3

Original line number	Original line	Diff line number	Diff line
	What: /sys/bus/event_source/devices/hv_24x7/interface/catalog		What: /sys/bus/event_source/devices/hv_24x7/interface/catalog
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	Provides access to the binary "24x7 catalog" provided by the		Provides access to the binary "24x7 catalog" provided by the
	hypervisor on POWER7 and 8 systems. This catalog lists events		hypervisor on POWER7 and 8 systems. This catalog lists events
	@@ -10,14 +10,14 @@ Description:

	What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_length		What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_length
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	A number equal to the length in bytes of the catalog. This is		A number equal to the length in bytes of the catalog. This is
	also extractable from the provided binary "catalog" sysfs entry.		also extractable from the provided binary "catalog" sysfs entry.

	What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_version		What: /sys/bus/event_source/devices/hv_24x7/interface/catalog_version
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	Exposes the "version" field of the 24x7 catalog. This is also		Exposes the "version" field of the 24x7 catalog. This is also
	extractable from the provided binary "catalog" sysfs entry.		extractable from the provided binary "catalog" sysfs entry.

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_gpci

+6 −6

Original line number	Original line	Diff line number	Diff line
	What: /sys/bus/event_source/devices/hv_gpci/interface/collect_privileged		What: /sys/bus/event_source/devices/hv_gpci/interface/collect_privileged
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	'0' if the hypervisor is configured to forbid access to event		'0' if the hypervisor is configured to forbid access to event
	counters being accumulated by other guests and to physical		counters being accumulated by other guests and to physical
	@@ -9,35 +9,35 @@ Description:

	What: /sys/bus/event_source/devices/hv_gpci/interface/ga		What: /sys/bus/event_source/devices/hv_gpci/interface/ga
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	0 or 1. Indicates whether we have access to "GA" events (listed		0 or 1. Indicates whether we have access to "GA" events (listed
	in arch/powerpc/perf/hv-gpci.h).		in arch/powerpc/perf/hv-gpci.h).

	What: /sys/bus/event_source/devices/hv_gpci/interface/expanded		What: /sys/bus/event_source/devices/hv_gpci/interface/expanded
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	0 or 1. Indicates whether we have access to "EXPANDED" events (listed		0 or 1. Indicates whether we have access to "EXPANDED" events (listed
	in arch/powerpc/perf/hv-gpci.h).		in arch/powerpc/perf/hv-gpci.h).

	What: /sys/bus/event_source/devices/hv_gpci/interface/lab		What: /sys/bus/event_source/devices/hv_gpci/interface/lab
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	0 or 1. Indicates whether we have access to "LAB" events (listed		0 or 1. Indicates whether we have access to "LAB" events (listed
	in arch/powerpc/perf/hv-gpci.h).		in arch/powerpc/perf/hv-gpci.h).

	What: /sys/bus/event_source/devices/hv_gpci/interface/version		What: /sys/bus/event_source/devices/hv_gpci/interface/version
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	A number indicating the version of the gpci interface that the		A number indicating the version of the gpci interface that the
	hypervisor reports supporting.		hypervisor reports supporting.

	What: /sys/bus/event_source/devices/hv_gpci/interface/kernel_version		What: /sys/bus/event_source/devices/hv_gpci/interface/kernel_version
	Date: February 2014		Date: February 2014
	Contact: Cody P Schafer <cody@linux.vnet.ibm.com>		Contact: Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>
	Description:		Description:
	A number indicating the latest version of the gpci interface		A number indicating the latest version of the gpci interface
	that the kernel is aware of.		that the kernel is aware of.

Documentation/ABI/testing/sysfs-class-cxl

0 → 100644

+129 −0

Original line number	Original line	Diff line number	Diff line
			Slave contexts (eg. /sys/class/cxl/afu0.0s):

			What: /sys/class/cxl/<afu>/irqs_max
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read/write
			Decimal value of maximum number of interrupts that can be
			requested by userspace. The default on probe is the maximum
			that hardware can support (eg. 2037). Write values will limit
			userspace applications to that many userspace interrupts. Must
			be >= irqs_min.

			What: /sys/class/cxl/<afu>/irqs_min
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the minimum number of interrupts that
			userspace must request on a CXL_START_WORK ioctl. Userspace may
			omit the num_interrupts field in the START_WORK IOCTL to get
			this minimum automatically.

			What: /sys/class/cxl/<afu>/mmio_size
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the size of the MMIO space that may be mmaped
			by userspace.

			What: /sys/class/cxl/<afu>/modes_supported
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			List of the modes this AFU supports. One per line.
			Valid entries are: "dedicated_process" and "afu_directed"

			What: /sys/class/cxl/<afu>/mode
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read/write
			The current mode the AFU is using. Will be one of the modes
			given in modes_supported. Writing will change the mode
			provided that no user contexts are attached.


			What: /sys/class/cxl/<afu>/prefault_mode
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read/write
			Set the mode for prefaulting in segments into the segment table
			when performing the START_WORK ioctl. Possible values:
			none: No prefaulting (default)
			work_element_descriptor: Treat the work element
			descriptor as an effective address and
			prefault what it points to.
			all: all segments process calling START_WORK maps.

			What: /sys/class/cxl/<afu>/reset
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: write only
			Writing 1 here will reset the AFU provided there are not
			contexts active on the AFU.

			What: /sys/class/cxl/<afu>/api_version
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the current version of the kernel/user API.

			What: /sys/class/cxl/<afu>/api_version_com
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the the lowest version of the userspace API
			this this kernel supports.



			Master contexts (eg. /sys/class/cxl/afu0.0m)

			What: /sys/class/cxl/<afu>m/mmio_size
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the size of the MMIO space that may be mmaped
			by userspace. This includes all slave contexts space also.

			What: /sys/class/cxl/<afu>m/pp_mmio_len
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the Per Process MMIO space length.

			What: /sys/class/cxl/<afu>m/pp_mmio_off
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Decimal value of the Per Process MMIO space offset.


			Card info (eg. /sys/class/cxl/card0)

			What: /sys/class/cxl/<card>/caia_version
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Identifies the CAIA Version the card implements.

			What: /sys/class/cxl/<card>/psl_version
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Identifies the revision level of the PSL.

			What: /sys/class/cxl/<card>/base_image
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Identifies the revision level of the base image for devices
			that support loadable PSLs. For FPGAs this field identifies
			the image contained in the on-adapter flash which is loaded
			during the initial program load.

			What: /sys/class/cxl/<card>/image_loaded
			Date: September 2014
			Contact: linuxppc-dev@lists.ozlabs.org
			Description: read only
			Will return "user" or "factory" depending on the image loaded
			onto the card.

Documentation/devicetree/bindings/pci/fsl,pci.txt

0 → 100644

+27 −0

Original line number	Original line	Diff line number	Diff line
			* Bus Enumeration by Freescale PCI-X Agent

			Typically any Freescale PCI-X bridge hardware strapped into Agent mode
			is prevented from enumerating the bus. The PrPMC form-factor requires
			all mezzanines to be PCI-X Agents, but one per system may still
			enumerate the bus.

			The property defined below will allow a PCI-X bridge to be used for bus
			enumeration despite being strapped into Agent mode.

			Required properties:
			- fsl,pci-agent-force-enum : There is no value associated with this
			property. The property itself is treated as a boolean.

			Example:

			/* PCI-X bridge known to be PrPMC Monarch */
			pci0: pci@ef008000 {
			fsl,pci-agent-force-enum;
			#interrupt-cells = <1>;
			#size-cells = <2>;
			#address-cells = <3>;
			compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
			device_type = "pci";
			...
			...
			};

Documentation/ioctl/ioctl-number.txt

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -313,6 +313,7 @@ Code Seq#(hex) Include File Comments
	0xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca>		0xB1 00-1F PPPoX <mailto:mostrows@styx.uwaterloo.ca>
	0xB3 00 linux/mmc/ioctl.h		0xB3 00 linux/mmc/ioctl.h
	0xC0 00-0F linux/usb/iowarrior.h		0xC0 00-0F linux/usb/iowarrior.h
			0xCA 00-0F uapi/misc/cxl.h
	0xCB 00-1F CBM serial IEC bus in development:		0xCB 00-1F CBM serial IEC bus in development:
	<mailto:michael.klein@puffin.lb.shuttle.de>		<mailto:michael.klein@puffin.lb.shuttle.de>
	0xCD 01 linux/reiserfs_fs.h		0xCD 01 linux/reiserfs_fs.h