From: Will Davis <wdavis@nvidia.com>
To: Bjorn Helgaas <bhelgaas@google.com>
Cc: Alex Williamson <alex.williamson@redhat.com>,
Joerg Roedel <joro@8bytes.org>,
<iommu@lists.linux-foundation.org>, <linux-pci@vger.kernel.org>,
Konrad Wilk <konrad.wilk@oracle.com>,
"Mark Hounschell" <markh@compro.net>,
"David S. Miller" <davem@davemloft.net>,
Jonathan Corbet <corbet@lwn.net>,
Terence Ripperda <tripperda@nvidia.com>,
John Hubbard <jhubbard@nvidia.com>,
Jerome Glisse <jglisse@redhat.com>,
"Will Davis" <wdavis@nvidia.com>
Subject: [PATCH v5 05/13] dma-mapping: pci: add pci_(un)map_peer_resource
Date: Tue, 18 Aug 2015 14:04:01 -0500 [thread overview]
Message-ID: <1439924649-29698-6-git-send-email-wdavis@nvidia.com> (raw)
In-Reply-To: <1439924649-29698-1-git-send-email-wdavis@nvidia.com>
Simply route these through to the new dma_(un)map_peer_resource APIs.
Also route pci_peer_mapping_error through to the new dma_peer_mapping_error
API.
Guard these new functions behind CONFIG_HAS_DMA_P2P.
Signed-off-by: Will Davis <wdavis@nvidia.com>
Reviewed-by: Terence Ripperda <tripperda@nvidia.com>
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
---
include/asm-generic/pci-dma-compat.h | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/include/asm-generic/pci-dma-compat.h b/include/asm-generic/pci-dma-compat.h
index c110843..7baf09e 100644
--- a/include/asm-generic/pci-dma-compat.h
+++ b/include/asm-generic/pci-dma-compat.h
@@ -61,6 +61,29 @@ 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);
}
+#ifdef CONFIG_HAS_DMA_P2P
+static inline dma_peer_addr_t
+pci_map_peer_resource(struct pci_dev *hwdev, struct pci_dev *peer,
+ int res, unsigned long offset, size_t size,
+ int direction)
+{
+ return dma_map_peer_resource(hwdev == NULL ? NULL : &hwdev->dev, peer == NULL ? NULL : &peer->dev, peer == NULL ? NULL : &peer->resource[res], offset, size, (enum dma_data_direction)direction);
+}
+
+static inline int
+pci_dma_peer_mapping_error(struct pci_dev *pdev, dma_peer_addr_t dma_addr)
+{
+ return dma_peer_mapping_error(&pdev->dev, dma_addr);
+}
+
+static inline void
+pci_unmap_peer_resource(struct pci_dev *hwdev, dma_peer_addr_t dma_address,
+ size_t size, int direction)
+{
+ dma_unmap_peer_resource(hwdev == NULL ? NULL : &hwdev->dev, dma_address, size, (enum dma_data_direction)direction);
+}
+#endif
+
static inline int
pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
int nents, int direction)
--
2.5.0
next prev parent reply other threads:[~2015-08-18 19:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-18 19:03 [PATCH v5 00/13] DMA-API/PCI map_peer_resource support for peer-to-peer Will Davis
2015-08-18 19:03 ` [PATCH v5 01/13] lib/Kconfig: add HAS_DMA_P2P for peer-to-peer support Will Davis
2015-08-18 19:03 ` [PATCH v5 02/13] linux/types.h: Add dma_peer_addr_t type Will Davis
2015-08-18 19:03 ` [PATCH v5 03/13] dma-debug: add checking for map/unmap_peer_resource Will Davis
2015-08-18 19:04 ` [PATCH v5 04/13] DMA-API: Introduce dma_(un)map_peer_resource Will Davis
2015-08-18 19:04 ` Will Davis [this message]
2015-08-18 19:04 ` [PATCH v5 06/13] DMA-API: Add peer resource mapping documentation Will Davis
2015-08-18 19:04 ` [PATCH v5 07/13] PCI: Export pci_find_host_bridge() Will Davis
2015-08-18 19:04 ` [PATCH v5 08/13] PCI: Add pci_find_common_upstream_dev() Will Davis
2015-08-18 19:04 ` [PATCH v5 10/13] iommu/amd: Implement (un)map_peer_resource Will Davis
2015-08-18 19:04 ` [PATCH v5 11/13] iommu/vt-d: implement (un)map_peer_resource Will Davis
2015-08-18 19:04 ` [PATCH v5 12/13] x86: add pci-nommu implementation of map_peer_resource Will Davis
2015-08-18 19:04 ` [PATCH v5 13/13] x86: declare support for DMA P2P Will Davis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439924649-29698-6-git-send-email-wdavis@nvidia.com \
--to=wdavis@nvidia.com \
--cc=alex.williamson@redhat.com \
--cc=bhelgaas@google.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=iommu@lists.linux-foundation.org \
--cc=jglisse@redhat.com \
--cc=jhubbard@nvidia.com \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-pci@vger.kernel.org \
--cc=markh@compro.net \
--cc=tripperda@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).