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 12/13] x86: add pci-nommu implementation of map_peer_resource
Date: Tue, 18 Aug 2015 14:04:08 -0500 [thread overview]
Message-ID: <1439924649-29698-13-git-send-email-wdavis@nvidia.com> (raw)
In-Reply-To: <1439924649-29698-1-git-send-email-wdavis@nvidia.com>
Add Intel nommu implementation of 'map_peer_resource', which simply checks
whether peer traffic should be allowed and converts the resource to a bus
address.
Add behind CONFIG_HAS_DMA_P2P guards, since the dma_map_ops members are
behind them as well.
Signed-off-by: Will Davis <wdavis@nvidia.com>
---
arch/x86/kernel/pci-nommu.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index da15918..4b45cc6 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -38,6 +38,39 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page,
return bus;
}
+#ifdef CONFIG_HAS_DMA_P2P
+static dma_peer_addr_t nommu_map_peer_resource(struct device *dev,
+ struct device *peer,
+ struct resource *res,
+ unsigned long offset,
+ size_t size,
+ enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ struct pci_dev *pdev;
+ struct pci_dev *ppeer;
+ struct pci_bus_region region;
+ dma_peer_addr_t dma_address;
+
+ if (!dev_is_pci(dev) || !dev_is_pci(peer))
+ return DMA_ERROR_CODE;
+
+ pdev = to_pci_dev(dev);
+ ppeer = to_pci_dev(peer);
+
+ if (!pci_peer_traffic_supported(pdev, ppeer))
+ return DMA_ERROR_CODE;
+
+ pcibios_resource_to_bus(pdev->bus, ®ion, res);
+ dma_address = region.start + offset;
+ WARN_ON(size == 0);
+ if (!check_addr("map_peer_resource", dev, dma_address, size))
+ return DMA_ERROR_CODE;
+ flush_write_buffers();
+ return dma_address;
+}
+#endif
+
/* Map a set of buffers described by scatterlist in streaming
* mode for DMA. This is the scatter-gather version of the
* above pci_map_single interface. Here the scatter gather list
@@ -93,6 +126,9 @@ struct dma_map_ops nommu_dma_ops = {
.free = dma_generic_free_coherent,
.map_sg = nommu_map_sg,
.map_page = nommu_map_page,
+#ifdef CONFIG_HAS_DMA_P2P
+ .map_peer_resource = nommu_map_peer_resource,
+#endif
.sync_single_for_device = nommu_sync_single_for_device,
.sync_sg_for_device = nommu_sync_sg_for_device,
.is_phys = 1,
--
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 ` [PATCH v5 05/13] dma-mapping: pci: add pci_(un)map_peer_resource Will Davis
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 ` Will Davis [this message]
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-13-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).