PCI/P2PDMA: Allow wildcard device IDs in host bridge list
Subsystems (2)
PATCH 1/2 PCI/P2PDMA: Allow wildcard device IDs in host bridge list
Currently, the pci_p2pdma_whitelist array requires an exact match for both vendor and device ID. Some hardware vendors support cross bridge p2p across their entire silicon lineup, so add support for wildcard device IDs to avoid the need to continuously update this array.
--- drivers/pci/p2pdma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/pci/p2pdma.c +6 -2
@@ -530,7 +530,7 @@ static bool cpu_supports_p2pdma(void) static const struct pci_p2pdma_whitelist_entry { unsigned short vendor; - unsigned short device; + int device; enum { REQ_SAME_HOST_BRIDGE = 1 << 0, } flags;
@@ -601,8 +601,12 @@ static bool __host_bridge_whitelist(struct pci_host_bridge *host, device = root->device;for (entry = pci_p2pdma_whitelist; entry->vendor; entry++) { -if (vendor != entry->vendor || device != entry->device) +if (vendor != entry->vendor)continue ; + +if (entry->device !=PCI_ANY_ID && device != entry->device) +continue ; +if (entry->flags &REQ_SAME_HOST_BRIDGE && !same_host_bridge)return false;
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
PATCH 2/2 PCI/P2PDMA: Add Google SoCs to the P2P DMA host bridge list
All Google SoCs support p2p between root ports, so add a wildcard rule to the host bridge list.
--- drivers/pci/p2pdma.c | 2 ++ include/linux/pci_ids.h | 2 ++ 2 files changed, 4 insertions(+)
drivers/pci/p2pdma.c +2 -0
@@ -548,6 +548,8 @@ static const struct pci_p2pdma_whitelist_entry { {PCI_VENDOR_ID_INTEL, 0x2033, 0}, {PCI_VENDOR_ID_INTEL, 0x2020, 0}, {PCI_VENDOR_ID_INTEL, 0x09a2, 0}, +/* Google SoCs. */ + {PCI_VENDOR_ID_GOOGLE, PCI_ANY_ID, 0}, {} };
include/linux/pci_ids.h +2 -0
@@ -2586,6 +2586,8 @@#define PCI_VENDOR_ID_AZWAVE 0x1a3b +#define PCI_VENDOR_ID_GOOGLE 0x1ae0 +#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4#define PCI_SUBVENDOR_ID_REDHAT_QUMRANET 0x1af4#define PCI_SUBDEVICE_ID_QEMU 0x1100
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
Re: [PATCH 2/2] PCI/P2PDMA: Add Google SoCs to the P2P DMA host bridge list
Quoted 5 lines · Jacob Moroni
All Google SoCs support p2p between root ports, so add a wildcard rule to the host bridge list.
Tested-by David Hu <[email protected]>Signed-off-by Jacob Moroni <[email protected]>
Looks good.
Quoted 7 lines · Jacob Moroni
Currently, the
pci_p2pdma_whitelistarray requires an exact match for both vendor and device ID. Some hardware vendors support cross bridge p2p across their entire silicon lineup, so add support for wildcard device IDs to avoid the need to continuously update this array.Signed-off-by Jacob Moroni <[email protected]>
This looks good to me thanks!
Quoted 7 lines · Jacob Moroni
Currently, the
pci_p2pdma_whitelistarray requires an exact match for both vendor and device ID. Some hardware vendors support cross bridge p2p across their entire silicon lineup, so add support for wildcard device IDs to avoid the need to continuously update this array.Signed-off-by Jacob Moroni <[email protected]>
Both applied to pci/p2pdma for v7.1, thanks!
Quoted 34 lines
--- drivers/pci/p2pdma.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)drivers/pci/p2pdma.c +6
-2@@ -530,7 +530,7 @@ static bool cpu_supports_p2pdma(void) static const struct pci_p2pdma_whitelist_entry { unsigned short vendor; - unsigned short device; + int device; enum { REQ_SAME_HOST_BRIDGE = 1 << 0, } flags;@@ -601,8 +601,12 @@ static bool __host_bridge_whitelist(struct pci_host_bridge *host, device = root->device;for (entry = pci_p2pdma_whitelist; entry->vendor; entry++) { -if (vendor != entry->vendor || device != entry->device) +if (vendor != entry->vendor)continue ; + +if (entry->device !=PCI_ANY_ID && device != entry->device) +continue ; +if (entry->flags &REQ_SAME_HOST_BRIDGE && !same_host_bridge)return false;Signature · 1 line
2.53.0.1213.gd9a14994de-goog