tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Bjorn Helgaas dff645f5 522a46af

+5 -6
+3 -3
Documentation/PCI/msi-howto.rst
··· 98 98 99 99 which allocates up to max_vecs interrupt vectors for a PCI device. It 100 100 returns the number of vectors allocated or a negative error. If the device 101 - has a requirements for a minimum number of vectors the driver can pass a 101 + has a requirement for a minimum number of vectors the driver can pass a 102 102 min_vecs argument set to this limit, and the PCI core will return -ENOSPC 103 103 if it can't meet the minimum number of vectors. 104 104 ··· 127 127 some platforms, MSI interrupts must all be targeted at the same set of CPUs 128 128 whereas MSI-X interrupts can all be targeted at different CPUs. 129 129 130 - If a device supports neither MSI-X or MSI it will fall back to a single 130 + If a device supports neither MSI-X nor MSI it will fall back to a single 131 131 legacy IRQ vector. 132 132 133 133 The typical usage of MSI or MSI-X interrupts is to allocate as many vectors ··· 203 203 ---------------------------------------------------- 204 204 205 205 Using 'lspci -v' (as root) may show some devices with "MSI", "Message 206 - Signalled Interrupts" or "MSI-X" capabilities. Each of these capabilities 206 + Signaled Interrupts" or "MSI-X" capabilities. Each of these capabilities 207 207 has an 'Enable' flag which is followed with either "+" (enabled) 208 208 or "-" (disabled). 209 209
-3
drivers/pci/devres.c
··· 469 469 if (!legacy_iomap_table) 470 470 return -ENOMEM; 471 471 472 - /* The legacy mechanism doesn't allow for duplicate mappings. */ 473 - WARN_ON(legacy_iomap_table[bar]); 474 - 475 472 legacy_iomap_table[bar] = mapping; 476 473 477 474 return 0;
+2
include/linux/pci-p2pdma.h
··· 20 20 * struct p2pdma_provider 21 21 * 22 22 * A p2pdma provider is a range of MMIO address space available to the CPU. 23 + * @owner: Device to which this provider belongs. 24 + * @bus_offset: Bus offset for p2p communication. 23 25 */ 24 26 struct p2pdma_provider { 25 27 struct device *owner;