From: <wdavis@nvidia.com>
To: <joro@8bytes.org>, <bhelgaas@google.com>
Cc: <iommu@lists.linux-foundation.org>, <linux-pci@vger.kernel.org>,
<tripperda@nvidia.com>, <jhubbard@nvidia.com>,
<jglisse@redhat.com>, <konrad.wilk@oracle.com>,
Will Davis <wdavis@nvidia.com>
Subject: [PATCH v2 7/7] x86: add pci-nommu implementation of map_resource
Date: Mon, 18 May 2015 13:25:04 -0500 [thread overview]
Message-ID: <1431973504-5903-8-git-send-email-wdavis@nvidia.com> (raw)
In-Reply-To: <1431973504-5903-1-git-send-email-wdavis@nvidia.com>
From: Will Davis <wdavis@nvidia.com>
Lookup the bus address of the resource by finding the parent host bridge,
which may be different than the parent host bridge of the target device.
Signed-off-by: Will Davis <wdavis@nvidia.com>
---
arch/x86/kernel/pci-nommu.c | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index da15918..6384482 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -38,6 +38,37 @@ static dma_addr_t nommu_map_page(struct device *dev, struct page *page,
return bus;
}
+static dma_addr_t nommu_map_resource(struct device *dev, struct resource *res,
+ unsigned long offset, size_t size,
+ enum dma_data_direction dir,
+ struct dma_attrs *attrs)
+{
+ struct pci_bus *bus;
+ struct pci_host_bridge *bridge;
+ struct resource_entry *window;
+ resource_size_t bus_offset = 0;
+ dma_addr_t dma_address;
+
+ /* Find the parent host bridge of the resource, and determine the
+ * relative offset.
+ */
+ list_for_each_entry(bus, &pci_root_buses, node) {
+ bridge = to_pci_host_bridge(bus->bridge);
+ resource_list_for_each_entry(window, &bridge->windows) {
+ if (resource_contains(window->res, res))
+ bus_offset = window->offset;
+ }
+ }
+
+ dma_address = (res->start - bus_offset) + offset;
+ WARN_ON(size == 0);
+ if (!check_addr("map_resource", dev, dma_address, size))
+ return DMA_ERROR_CODE;
+ flush_write_buffers();
+ return dma_address;
+}
+
+
/* 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 +124,7 @@ struct dma_map_ops nommu_dma_ops = {
.free = dma_generic_free_coherent,
.map_sg = nommu_map_sg,
.map_page = nommu_map_page,
+ .map_resource = nommu_map_resource,
.sync_single_for_device = nommu_sync_single_for_device,
.sync_sg_for_device = nommu_sync_sg_for_device,
.is_phys = 1,
--
2.4.0
prev parent reply other threads:[~2015-05-18 18:38 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 18:24 [PATCH v2 0/7] IOMMU/DMA map_resource support for peer-to-peer wdavis
2015-05-18 18:24 ` [PATCH v2 1/7] dma-debug: add checking for map/unmap_resource wdavis
2015-05-18 18:24 ` [PATCH v2 2/7] DMA-API: Introduce dma_(un)map_resource wdavis
2015-05-29 8:16 ` Joerg Roedel
2015-05-18 18:25 ` [PATCH v2 3/7] dma-mapping: pci: add pci_(un)map_resource wdavis
2015-05-18 18:25 ` [PATCH v2 4/7] DMA-API: Add dma_(un)map_resource() documentation wdavis
2015-05-19 23:43 ` Bjorn Helgaas
2015-05-20 12:11 ` Mark Hounschell
2015-05-20 17:30 ` William Davis
2015-05-20 19:15 ` Mark Hounschell
2015-05-20 19:51 ` William Davis
2015-05-20 20:07 ` Mark Hounschell
2015-05-27 18:31 ` William Davis
2015-05-29 8:24 ` joro
2015-07-07 15:15 ` Bjorn Helgaas
2015-07-07 15:41 ` Alex Williamson
2015-07-07 16:16 ` Bjorn Helgaas
2015-07-07 16:41 ` Alex Williamson
2015-07-07 17:14 ` Mark Hounschell
2015-07-07 17:28 ` Alex Williamson
2015-07-07 19:17 ` Mark Hounschell
2015-07-07 19:54 ` Alex Williamson
2015-07-08 15:11 ` Bjorn Helgaas
2015-07-08 16:40 ` Mark Hounschell
2015-07-09 0:50 ` Rafael J. Wysocki
2015-06-01 21:25 ` Konrad Rzeszutek Wilk
2015-06-02 14:27 ` William Davis
2015-05-18 18:25 ` [PATCH v2 5/7] iommu/amd: Implement (un)map_resource wdavis
2015-05-18 18:25 ` [PATCH v2 6/7] iommu/vt-d: implement (un)map_resource wdavis
2015-05-18 18:25 ` wdavis [this message]
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=1431973504-5903-8-git-send-email-wdavis@nvidia.com \
--to=wdavis@nvidia.com \
--cc=bhelgaas@google.com \
--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=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).