On Fri, May 29, 2015 at 12:14:42PM -0500, wda...@nvidia.com wrote:
> From: Will Davis <wda...@nvidia.com>
> 
> Simply route these through to the new dma_(un)map_resource APIs.
> 
> Signed-off-by: Will Davis <wda...@nvidia.com>
> Reviewed-by: Terence Ripperda <trippe...@nvidia.com>
> Reviewed-by: John Hubbard <jhubb...@nvidia.com>
> ---
>  include/asm-generic/pci-dma-compat.h | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/include/asm-generic/pci-dma-compat.h 
> b/include/asm-generic/pci-dma-compat.h
> index c110843..ac4a4ad 100644
> --- a/include/asm-generic/pci-dma-compat.h
> +++ b/include/asm-generic/pci-dma-compat.h
> @@ -61,6 +61,20 @@ pci_unmap_page(struct pci_dev *hwdev, dma_addr_t 
> dma_address,
>       dma_unmap_page(hwdev == NULL ? NULL : &hwdev->dev, dma_address, size, 
> (enum dma_data_direction)direction);
>  }
>  
> +static inline dma_addr_t
> +pci_map_resource(struct pci_dev *hwdev, struct resource *resource,
> +              unsigned long offset, size_t size, int direction)

After 3a9ad0b4fdcd ("PCI: Add pci_bus_addr_t"), which will appear in
v4.2-rc1, there is a pci_bus_addr_t, and I think you need that instead
of dma_addr_t.

http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=3a9ad0b4fdcd

> +{
> +     return dma_map_resource(hwdev == NULL ? NULL : &hwdev->dev, resource, 
> offset, size, (enum dma_data_direction)direction);
> +}
> +
> +static inline void
> +pci_unmap_resource(struct pci_dev *hwdev, dma_addr_t dma_address, size_t 
> size,
> +                int direction)
> +{
> +     dma_unmap_resource(hwdev == NULL ? NULL : &hwdev->dev, dma_address, 
> size, (enum dma_data_direction)direction);
> +}
> +
>  static inline int
>  pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
>          int nents, int direction)
> -- 
> 2.4.0
> 
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to