Commit dff645f5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

- Fix documentation typos (Shawn Lin)

- Add struct p2pdma_provider kernel doc (Leon Romanovsky)

- Remove useless devres WARN_ON() (Philipp Stanner)

* pci/misc:
  PCI: Remove useless WARN_ON() from devres
  PCI/P2PDMA: Add missing struct p2pdma_provider documentation
  Documentation: PCI: Fix typos in msi-howto.rst
parents 522a46af 94cf23f6

Documentation/PCI/msi-howto.rst

+3 −3
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ function:: 


which allocates up to max_vecs interrupt vectors for a PCI device.  It

returns the number of vectors allocated or a negative error.  If the device

has a requirements for a minimum number of vectors the driver can pass a

has a requirement 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

if it can't meet the minimum number of vectors.
@@ -127,7 +127,7 @@ not be able to allocate as many vectors for MSI as it could for MSI-X. On 
some platforms, MSI interrupts must all be targeted at the same set of CPUs

whereas MSI-X interrupts can all be targeted at different CPUs.



If a device supports neither MSI-X or MSI it will fall back to a single

If a device supports neither MSI-X nor MSI it will fall back to a single

legacy IRQ vector.



The typical usage of MSI or MSI-X interrupts is to allocate as many vectors
@@ -203,7 +203,7 @@ How to tell whether MSI/MSI-X is enabled on a device 
----------------------------------------------------



Using 'lspci -v' (as root) may show some devices with "MSI", "Message

Signalled Interrupts" or "MSI-X" capabilities.  Each of these capabilities

Signaled Interrupts" or "MSI-X" capabilities.  Each of these capabilities

has an 'Enable' flag which is followed with either "+" (enabled)

or "-" (disabled).

drivers/pci/devres.c

+0 −3
Original line number Diff line number Diff line
@@ -469,9 +469,6 @@ static int pcim_add_mapping_to_legacy_table(struct pci_dev *pdev, 
	if (!legacy_iomap_table)

		return -ENOMEM;



	/* The legacy mechanism doesn't allow for duplicate mappings. */

	WARN_ON(legacy_iomap_table[bar]);



	legacy_iomap_table[bar] = mapping;



	return 0;

include/linux/pci-p2pdma.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ struct scatterlist; 
 * struct p2pdma_provider

 *

 * A p2pdma provider is a range of MMIO address space available to the CPU.

 * @owner: Device to which this provider belongs.

 * @bus_offset: Bus offset for p2p communication.

 */

struct p2pdma_provider {

	struct device *owner;