Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek',... (13a08259) · Commits · e / devices / android_kernel_teracube_2e

.mailmap

+3 −0

Documentation/ABI/stable/sysfs-devices

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Note: This documents additional properties of any device beyond what		# Note: This documents additional properties of any device beyond what
	# is documented in Documentation/sysfs-rules.txt		# is documented in Documentation/sysfs-rules.txt

	What: /sys/devices/*/of_path		What: /sys/devices/*/of_node
	Date: February 2015		Date: February 2015
	Contact: Device Tree mailing list <devicetree@vger.kernel.org>		Contact: Device Tree mailing list <devicetree@vger.kernel.org>
	Description:		Description:

Documentation/PCI/MSI-HOWTO.txt

+10 −14

Original line number	Original line	Diff line number	Diff line
	@@ -94,14 +94,11 @@ has a requirements for a minimum number of vectors the driver can pass a
	min_vecs argument set to this limit, and the PCI core will return -ENOSPC		min_vecs argument set to this limit, and the PCI core will return -ENOSPC
	if it can't meet the minimum number of vectors.		if it can't meet the minimum number of vectors.

	The flags argument should normally be set to 0, but can be used to pass the		The flags argument is used to specify which type of interrupt can be used
	PCI_IRQ_NOMSI and PCI_IRQ_NOMSIX flag in case a device claims to support		by the device and the driver (PCI_IRQ_LEGACY, PCI_IRQ_MSI, PCI_IRQ_MSIX).
	MSI or MSI-X, but the support is broken, or to pass PCI_IRQ_NOLEGACY in		A convenient short-hand (PCI_IRQ_ALL_TYPES) is also available to ask for
	case the device does not support legacy interrupt lines.		any possible kind of interrupt. If the PCI_IRQ_AFFINITY flag is set,
			pci_alloc_irq_vectors() will spread the interrupts around the available CPUs.
	By default this function will spread the interrupts around the available
	CPUs, but this feature can be disabled by passing the PCI_IRQ_NOAFFINITY
	flag.

	To get the Linux IRQ numbers passed to request_irq() and free_irq() and the		To get the Linux IRQ numbers passed to request_irq() and free_irq() and the
	vectors, use the following function:		vectors, use the following function:
	@@ -131,7 +128,7 @@ larger than the number supported by the device it will automatically be
	capped to the supported limit, so there is no need to query the number of		capped to the supported limit, so there is no need to query the number of
	vectors supported beforehand:		vectors supported beforehand:

	nvec = pci_alloc_irq_vectors(pdev, 1, nvec, 0);		nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_ALL_TYPES)
	if (nvec < 0)		if (nvec < 0)
	goto out_err;		goto out_err;

	@@ -140,7 +137,7 @@ interrupts it can request a particular number of interrupts by passing that
	number to pci_alloc_irq_vectors() function as both 'min_vecs' and		number to pci_alloc_irq_vectors() function as both 'min_vecs' and
	'max_vecs' parameters:		'max_vecs' parameters:

	ret = pci_alloc_irq_vectors(pdev, nvec, nvec, 0);		ret = pci_alloc_irq_vectors(pdev, nvec, nvec, PCI_IRQ_ALL_TYPES);
	if (ret < 0)		if (ret < 0)
	goto out_err;		goto out_err;

	@@ -148,15 +145,14 @@ The most notorious example of the request type described above is enabling
	the single MSI mode for a device. It could be done by passing two 1s as		the single MSI mode for a device. It could be done by passing two 1s as
	'min_vecs' and 'max_vecs':		'min_vecs' and 'max_vecs':

	ret = pci_alloc_irq_vectors(pdev, 1, 1, 0);		ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES);
	if (ret < 0)		if (ret < 0)
	goto out_err;		goto out_err;

	Some devices might not support using legacy line interrupts, in which case		Some devices might not support using legacy line interrupts, in which case
	the PCI_IRQ_NOLEGACY flag can be used to fail the request if the platform		the driver can specify that only MSI or MSI-X is acceptable:
	can't provide MSI or MSI-X interrupts:

	nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_NOLEGACY);		nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_MSI \| PCI_IRQ_MSIX);
	if (nvec < 0)		if (nvec < 0)
	goto out_err;		goto out_err;

Documentation/PCI/pci.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver

	The ID table is an array of struct pci_device_id entries ending with an		The ID table is an array of struct pci_device_id entries ending with an
	all-zero entry. Definitions with static const are generally preferred.		all-zero entry. Definitions with static const are generally preferred.
	Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided.

	Each entry consists of:		Each entry consists of:

Documentation/arm/CCN.txt

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events"
	directory provides configuration templates for all documented		directory provides configuration templates for all documented
	events, that can be used with perf tool. For example "xp_valid_flit"		events, that can be used with perf tool. For example "xp_valid_flit"
	is an equivalent of "type=0x8,event=0x4". Other parameters must be		is an equivalent of "type=0x8,event=0x4". Other parameters must be
	explicitly specified. For events originating from device, "node"		explicitly specified.
	defines its index. All crosspoint events require "xp" (index),
	"port" (device port number) and "vc" (virtual channel ID) and
	"dir" (direction). Watchpoints (special "event" value 0xfe) also
	require comparator values ("cmp_l" and "cmp_h") and "mask", being
	index of the comparator mask.

			For events originating from device, "node" defines its index.

			Crosspoint PMU events require "xp" (index), "bus" (bus number)
			and "vc" (virtual channel ID).

			Crosspoint watchpoint-based events (special "event" value 0xfe)
			require "xp" and "vc" as as above plus "port" (device port index),
			"dir" (transmit/receive direction), comparator values ("cmp_l"
			and "cmp_h") and "mask", being index of the comparator mask.
	Masks are defined separately from the event description		Masks are defined separately from the event description
	(due to limited number of the config values) in the "cmp_mask"		(due to limited number of the config values) in the "cmp_mask"
	directory, with first 8 configurable by user and additional		directory, with first 8 configurable by user and additional

Original line number	Original line	Diff line number	Diff line
	@@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org>
	Kenneth W Chen <kenneth.w.chen@intel.com>		Kenneth W Chen <kenneth.w.chen@intel.com>
	Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>		Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
	Koushik <raghavendra.koushik@neterion.com>		Koushik <raghavendra.koushik@neterion.com>
			Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
	Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>		Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
	Leonid I Ananiev <leonid.i.ananiev@intel.com>		Leonid I Ananiev <leonid.i.ananiev@intel.com>
	@@ -158,6 +159,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>		Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
	Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>		Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
			Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
			Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
	Takashi YOSHII <takashi.yoshii.zj@renesas.com>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
	Yusuke Goda <goda.yusuke@renesas.com>		Yusuke Goda <goda.yusuke@renesas.com>
	Gustavo Padovan <gustavo@las.ic.unicamp.br>		Gustavo Padovan <gustavo@las.ic.unicamp.br>