Re: [PATCH 3/5] PCI/p2p: remove the DMA_VIRT_OPS hacks

[Logan Gunthorpe]

On 2020-11-04 2:50 a.m., Christoph Hellwig wrote:
> Now that all users of dma_virt_ops are gone we can remove the workaround
> for it in the PCIe peer to peer code.
> 
> Signed-off-by: Christoph Hellwig 

The two P2PDMA patches look fine to me. Nice to get rid of that hack.

Reviewed-by: Logan Gunthorpe 

Thanks,

Logan
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Re: [PATCH 3/5] PCI/p2p: remove the DMA_VIRT_OPS hacks

[Bjorn Helgaas]

s|PCI/p2p: remove|PCI/P2PDMA: Remove/
to match history.

On Wed, Nov 04, 2020 at 10:50:50AM +0100, Christoph Hellwig wrote:
> Now that all users of dma_virt_ops are gone we can remove the workaround
> for it in the PCIe peer to peer code.

s/PCIe/PCI/
We went to some trouble to make P2PDMA work on conventional PCI as
well as PCIe.

> Signed-off-by: Christoph Hellwig 

Acked-by: Bjorn Helgaas 

> ---
>  drivers/pci/p2pdma.c | 20 
>  1 file changed, 20 deletions(-)
> 
> diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
> index de1c331dbed43f..b07018af53876c 100644
> --- a/drivers/pci/p2pdma.c
> +++ b/drivers/pci/p2pdma.c
> @@ -556,15 +556,6 @@ int pci_p2pdma_distance_many(struct pci_dev *provider, 
> struct device **clients,
>   return -1;
>  
>   for (i = 0; i < num_clients; i++) {
> -#ifdef CONFIG_DMA_VIRT_OPS
> - if (clients[i]->dma_ops == _virt_ops) {
> - if (verbose)
> - dev_warn(clients[i],
> -  "cannot be used for peer-to-peer DMA 
> because the driver makes use of dma_virt_ops\n");
> - return -1;
> - }
> -#endif
> -
>   pci_client = find_parent_pci_dev(clients[i]);
>   if (!pci_client) {
>   if (verbose)
> @@ -837,17 +828,6 @@ static int __pci_p2pdma_map_sg(struct pci_p2pdma_pagemap 
> *p2p_pgmap,
>   phys_addr_t paddr;
>   int i;
>  
> - /*
> -  * p2pdma mappings are not compatible with devices that use
> -  * dma_virt_ops. If the upper layers do the right thing
> -  * this should never happen because it will be prevented
> -  * by the check in pci_p2pdma_distance_many()
> -  */
> -#ifdef CONFIG_DMA_VIRT_OPS
> - if (WARN_ON_ONCE(dev->dma_ops == _virt_ops))
> - return 0;
> -#endif
> -
>   for_each_sg(sg, s, nents, i) {
>   paddr = sg_phys(s);
>  
> -- 
> 2.28.0
> 
___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

[PATCH 3/5] PCI/p2p: remove the DMA_VIRT_OPS hacks

[Christoph Hellwig]

Now that all users of dma_virt_ops are gone we can remove the workaround
for it in the PCIe peer to peer code.

Signed-off-by: Christoph Hellwig 
---
 drivers/pci/p2pdma.c | 20 
 1 file changed, 20 deletions(-)

diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index de1c331dbed43f..b07018af53876c 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -556,15 +556,6 @@ int pci_p2pdma_distance_many(struct pci_dev *provider, 
struct device **clients,
return -1;
 
for (i = 0; i < num_clients; i++) {
-#ifdef CONFIG_DMA_VIRT_OPS
-   if (clients[i]->dma_ops == _virt_ops) {
-   if (verbose)
-   dev_warn(clients[i],
-"cannot be used for peer-to-peer DMA 
because the driver makes use of dma_virt_ops\n");
-   return -1;
-   }
-#endif
-
pci_client = find_parent_pci_dev(clients[i]);
if (!pci_client) {
if (verbose)
@@ -837,17 +828,6 @@ static int __pci_p2pdma_map_sg(struct pci_p2pdma_pagemap 
*p2p_pgmap,
phys_addr_t paddr;
int i;
 
-   /*
-* p2pdma mappings are not compatible with devices that use
-* dma_virt_ops. If the upper layers do the right thing
-* this should never happen because it will be prevented
-* by the check in pci_p2pdma_distance_many()
-*/
-#ifdef CONFIG_DMA_VIRT_OPS
-   if (WARN_ON_ONCE(dev->dma_ops == _virt_ops))
-   return 0;
-#endif
-
for_each_sg(sg, s, nents, i) {
paddr = sg_phys(s);
 
-- 
2.28.0

___
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu