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

PCI/P2PDMA: Whitelist Intel Skylake-E Root Ports at any devfn

In 7b94b53db34f ("PCI/P2PDMA: Add Intel Sky Lake-E Root Ports B, C, D to
the whitelist"), Andrew Maier added Skylake-E 2031, 2032, and 2033 Root
Ports to the pci_p2pdma_whitelist[], so we assume P2PDMA between devices
below these ports works.

Previously we only checked the whitelist for a device at devfn 00.0 on the
root bus, which is often a "host bridge". But these Skylake Root Ports may
be at any devfn and there may be no "host bridge" device.

Generalize pci_host_bridge_dev() so we check the first device on the root
bus, whether it is devfn 00.0 or a PCIe Root Port, against the whitelist.

[bhelgaas: commit log, comment]
Link: https://lore.kernel.org/r/20220410105213.690-2-shlomop@pliops.com
Tested-by: Maor Gottlieb <maorg@nvidia.com>
Signed-off-by: Shlomo Pongratz <shlomop@pliops.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Andrew Maier <andrew.maier@eideticom.com>

authored by

Shlomo Pongratz and committed by
Bjorn Helgaas
1af7c26c 31231092

+15 -10
+15 -10
drivers/pci/p2pdma.c
··· 326 326 }; 327 327 328 328 /* 329 - * This lookup function tries to find the PCI device corresponding to a given 330 - * host bridge. 329 + * If the first device on host's root bus is either devfn 00.0 or a PCIe 330 + * Root Port, return it. Otherwise return NULL. 331 331 * 332 - * It assumes the host bridge device is the first PCI device in the 333 - * bus->devices list and that the devfn is 00.0. These assumptions should hold 334 - * for all the devices in the whitelist above. 332 + * We often use a devfn 00.0 "host bridge" in the pci_p2pdma_whitelist[] 333 + * (though there is no PCI/PCIe requirement for such a device). On some 334 + * platforms, e.g., Intel Skylake, there is no such host bridge device, and 335 + * pci_p2pdma_whitelist[] may contain a Root Port at any devfn. 335 336 * 336 - * This function is equivalent to pci_get_slot(host->bus, 0), however it does 337 - * not take the pci_bus_sem lock seeing __host_bridge_whitelist() must not 337 + * This function is similar to pci_get_slot(host->bus, 0), but it does 338 + * not take the pci_bus_sem lock since __host_bridge_whitelist() must not 338 339 * sleep. 339 340 * 340 341 * For this to be safe, the caller should hold a reference to a device on the ··· 351 350 352 351 if (!root) 353 352 return NULL; 354 - if (root->devfn != PCI_DEVFN(0, 0)) 355 - return NULL; 356 353 357 - return root; 354 + if (root->devfn == PCI_DEVFN(0, 0)) 355 + return root; 356 + 357 + if (pci_pcie_type(root) == PCI_EXP_TYPE_ROOT_PORT) 358 + return root; 359 + 360 + return NULL; 358 361 } 359 362 360 363 static bool __host_bridge_whitelist(struct pci_host_bridge *host,