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

[Bjorn Helgaas <helgaas@kernel.org>]

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
>