[PATCH 1/2] PCI/P2PDMA: Allow wildcard device IDs in host bridge list

[PATCH 1/2] PCI/P2PDMA: Allow wildcard device IDs in host bridge list

[Jacob Moroni]

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.

Signed-off-by: Jacob Moroni <jmoroni@google.com>
---
 drivers/pci/p2pdma.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index e0f546166..25e9358d0 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -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;
 
-- 
2.53.0.1213.gd9a14994de-goog

[PATCH 2/2] PCI/P2PDMA: Add Google SoCs to the P2P DMA host bridge list

[Jacob Moroni]

All Google SoCs support p2p between root ports, so add a wildcard
rule to the host bridge list.

Tested-by: David Hu <xuehaohu@google.com>
Signed-off-by: Jacob Moroni <jmoroni@google.com>
---
 drivers/pci/p2pdma.c    | 2 ++
 include/linux/pci_ids.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 25e9358d0..7c898542a 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -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},
 	{}
 };
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 406abf629..24cb42f66 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -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
-- 
2.53.0.1213.gd9a14994de-goog

Re: [PATCH 2/2] PCI/P2PDMA: Add Google SoCs to the P2P DMA host bridge list

[Logan Gunthorpe]

On 2026-04-09 9:01 a.m., Jacob Moroni wrote:
> All Google SoCs support p2p between root ports, so add a wildcard
> rule to the host bridge list.
> 
> Tested-by: David Hu <xuehaohu@google.com>
> Signed-off-by: Jacob Moroni <jmoroni@google.com>
Looks good.

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

Re: [PATCH 1/2] PCI/P2PDMA: Allow wildcard device IDs in host bridge list

[Logan Gunthorpe]

On 2026-04-09 9:01 a.m., Jacob Moroni wrote:
> 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.
> 
> Signed-off-by: Jacob Moroni <jmoroni@google.com>

This looks good to me thanks!

Reviewed-by: Logan Gunthorpe <logang@deltatee.com>

Re: [PATCH 1/2] PCI/P2PDMA: Allow wildcard device IDs in host bridge list

[Bjorn Helgaas]

On Thu, Apr 09, 2026 at 03:01:22PM +0000, Jacob Moroni wrote:
> 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.
> 
> Signed-off-by: Jacob Moroni <jmoroni@google.com>

Both applied to pci/p2pdma for v7.1, thanks!

> ---
>  drivers/pci/p2pdma.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
> index e0f546166..25e9358d0 100644
> --- a/drivers/pci/p2pdma.c
> +++ b/drivers/pci/p2pdma.c
> @@ -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;
>  
> -- 
> 2.53.0.1213.gd9a14994de-goog
>