From: Christoph Hellwig <hch@lst.de>
To: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Cc: Rich Felker <dalias@libc.org>,
"open list:SUPERH" <linux-sh@vger.kernel.org>,
David Airlie <airlied@linux.ie>,
"open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS"
<linux-pci@vger.kernel.org>, Hanjun Guo <guohanjun@huawei.com>,
"open list:REMOTE PROCESSOR REMOTEPROC SUBSYSTEM"
<linux-remoteproc@vger.kernel.org>,
"open list:DRM DRIVERS FOR ALLWINNER A10"
<dri-devel@lists.freedesktop.org>,
Julien Grall <julien.grall@arm.com>,
"H. Peter Anvin" <hpa@zytor.com>, Will Deacon <will@kernel.org>,
Christoph Hellwig <hch@lst.de>,
"open list:STAGING SUBSYSTEM" <devel@driverdev.osuosl.org>,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
Florian Fainelli <f.fainelli@gmail.com>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Frank Rowand <frowand.list@gmail.com>,
"maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT" <x86@kernel.org>,
Russell King <linux@armlinux.org.uk>,
"open list:ACPI FOR ARM64 ACPI/arm64"
<linux-acpi@vger.kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Ingo Molnar <mingo@redhat.com>,
"maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE"
<bcm-kernel-feedback-list@broadcom.com>,
Alan Stern <stern@rowland.harvard.edu>,
Len Brown <lenb@kernel.org>, Ohad Ben-Cohen <ohad@wizery.com>,
"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE"
<devicetree@vger.kernel.org>, Daniel Vetter <daniel@ffwll.ch>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Dan Williams <dan.j.williams@intel.com>,
Maxime Ripard <mripard@kernel.org>,
Rob Herring <robh+dt@kernel.org>, Borislav Petkov <bp@alien8.de>,
Yong Deng <yong.deng@magewell.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Nathan Chancellor <natechancellor@gmail.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
"moderated list:ARM PORT" <linux-arm-kernel@lists.infradead.org>,
Felipe Balbi <balbi@kernel.org>,
Saravana Kannan <saravanak@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"open list:USB SUBSYSTEM" <linux-usb@vger.kernel.org>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
open list <linux-kernel@vger.kernel.org>,
Paul Kocialkowski <paul.kocialkowski@bootlin.com>,
"open list:IOMMU DRIVERS" <iommu@lists.linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Stefano Stabellini <sstabellini@kernel.org>,
Jim Quinlan <james.quinlan@broadcom.com>,
Sudeep Holla <sudeep.holla@arm.com>,
"open list:ALLWINNER A10 CSI DRIVER"
<linux-media@vger.kernel.org>,
Robin Murphy <robin.murphy@arm.com>
Subject: Re: [PATCH v11 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset
Date: Tue, 8 Sep 2020 09:29:35 +0200 [thread overview]
Message-ID: <20200908072935.GA15119@lst.de> (raw)
In-Reply-To: <b4761ade39af346eebec917ca2a415c09681542a.camel@suse.de>
FYI, this is what I'd do relative to the patch on the dma-ranges
branch. In fact realizing this makes me want to refactor things a bit
so that the new code can entirely live in the dma-direct code, but please
test this first:
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index c21893f683b585..072fc42349874d 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -35,21 +35,16 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
#ifndef __arch_pfn_to_dma
static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
{
- if (dev) {
- phys_addr_t paddr = PFN_PHYS(pfn);
-
- pfn -= PFN_DOWN(dma_offset_from_phys_addr(dev, paddr));
- }
- return (dma_addr_t)__pfn_to_bus(pfn);
+ if (!dev)
+ return (dma_addr_t)__pfn_to_bus(pfn);
+ return translate_phys_to_dma(dev, PFN_PHYS(pfn));
}
static inline unsigned long dma_to_pfn(struct device *dev, dma_addr_t addr)
{
- unsigned long pfn = __bus_to_pfn(addr);
-
- if (dev)
- pfn += PFN_DOWN(dma_offset_from_dma_addr(dev, addr));
- return pfn;
+ if (!dev)
+ return __bus_to_pfn(addr);
+ return PFN_DOWN(translate_dma_to_phys(dev, addr));
}
static inline void *dma_to_virt(struct device *dev, dma_addr_t addr)
diff --git a/include/linux/dma-direct.h b/include/linux/dma-direct.h
index 7831ca5b1b5dd6..e624171c4962ad 100644
--- a/include/linux/dma-direct.h
+++ b/include/linux/dma-direct.h
@@ -19,12 +19,16 @@ extern unsigned int zone_dma_bits;
#else
static inline dma_addr_t __phys_to_dma(struct device *dev, phys_addr_t paddr)
{
- return (dma_addr_t)paddr - dma_offset_from_phys_addr(dev, paddr);
+ if (dev->dma_range_map)
+ return (dma_addr_t)paddr - translate_phys_to_dma(dev, paddr);
+ return (dma_addr_t)paddr;
}
-static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dev_addr)
+static inline phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr)
{
- return (phys_addr_t)dev_addr + dma_offset_from_dma_addr(dev, dev_addr);
+ if (dev->dma_range_map)
+ return translate_dma_to_phys(dev, dma_addr);
+ return (phys_addr_t)dma_addr;
}
#endif /* !CONFIG_ARCH_HAS_PHYS_TO_DMA */
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 4c4646761afee4..3b1ceebb6f2ad5 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -199,29 +199,28 @@ struct bus_dma_region {
};
#ifdef CONFIG_HAS_DMA
-static inline u64 dma_offset_from_dma_addr(struct device *dev,
- dma_addr_t dma_addr)
+static inline dma_addr_t translate_phys_to_dma(struct device *dev,
+ phys_addr_t paddr)
{
- const struct bus_dma_region *m = dev->dma_range_map;
+ const struct bus_dma_region *m;
- if (m)
- for (; m->size; m++)
- if (dma_addr >= m->dma_start &&
- dma_addr - m->dma_start < m->size)
- return m->offset;
- return 0;
+ for (m = dev->dma_range_map; m->size; m++)
+ if (paddr >= m->cpu_start && paddr - m->cpu_start < m->size)
+ return (dma_addr_t)paddr - m->offset;
+
+ /* make sure dma_capable fails when no translation is available */
+ return DMA_MAPPING_ERROR;
}
-static inline u64 dma_offset_from_phys_addr(struct device *dev,
- phys_addr_t paddr)
+static inline phys_addr_t translate_dma_to_phys(struct device *dev,
+ dma_addr_t dma_addr)
{
- const struct bus_dma_region *m = dev->dma_range_map;
+ const struct bus_dma_region *m;
+
+ for (m = dev->dma_range_map; m->size; m++)
+ if (dma_addr >= m->dma_start && dma_addr - m->dma_start < m->size)
+ return (phys_addr_t)dma_addr + m->offset;
- if (m)
- for (; m->size; m++)
- if (paddr >= m->cpu_start &&
- paddr - m->cpu_start < m->size)
- return m->offset;
return 0;
}
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-09-08 7:29 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-24 19:30 [PATCH v11 00/11] PCI: brcmstb: enable PCIe for STB chips Jim Quinlan via iommu
2020-08-24 19:30 ` [PATCH v11 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset Jim Quinlan via iommu
2020-08-25 9:45 ` Andy Shevchenko
2020-08-25 15:37 ` Jim Quinlan via iommu
2020-09-01 8:24 ` Christoph Hellwig
2020-09-02 15:02 ` Jim Quinlan via iommu
2020-09-03 16:06 ` Christoph Hellwig
2020-09-07 15:18 ` Nicolas Saenz Julienne
2020-09-08 6:54 ` Christoph Hellwig
2020-09-02 21:53 ` Nathan Chancellor
2020-09-02 22:11 ` Jim Quinlan via iommu
2020-09-02 22:38 ` Nathan Chancellor
2020-09-03 0:36 ` Florian Fainelli
2020-09-03 0:52 ` Nathan Chancellor
2020-09-03 17:32 ` Jim Quinlan via iommu
2020-09-07 15:01 ` Nicolas Saenz Julienne
2020-09-07 17:40 ` Jim Quinlan via iommu
2020-09-07 18:19 ` Nicolas Saenz Julienne
2020-09-08 6:59 ` Christoph Hellwig
2020-09-08 7:29 ` Christoph Hellwig [this message]
2020-09-08 7:32 ` Christoph Hellwig
2020-09-08 9:43 ` Christoph Hellwig
2020-09-08 11:20 ` Nicolas Saenz Julienne
2020-09-08 12:41 ` Christoph Hellwig
2020-09-08 15:59 ` Jim Quinlan via iommu
2020-09-09 6:21 ` Nathan Chancellor
2020-09-08 6:58 ` Christoph Hellwig
2020-08-25 17:40 ` [PATCH v11 00/11] PCI: brcmstb: enable PCIe for STB chips Florian Fainelli
2020-08-27 6:35 ` Christoph Hellwig
2020-08-27 13:29 ` Jim Quinlan via iommu
2020-09-07 9:16 ` Lorenzo Pieralisi
2020-09-07 17:43 ` Jim Quinlan via iommu
2020-09-07 18:29 ` Florian Fainelli
2020-09-08 10:42 ` Lorenzo Pieralisi
2020-09-08 12:20 ` Christoph Hellwig
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=20200908072935.GA15119@lst.de \
--to=hch@lst.de \
--cc=airlied@linux.ie \
--cc=andriy.shevchenko@linux.intel.com \
--cc=balbi@kernel.org \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bgolaszewski@baylibre.com \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=dalias@libc.org \
--cc=dan.j.williams@intel.com \
--cc=daniel@ffwll.ch \
--cc=devel@driverdev.osuosl.org \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=f.fainelli@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=guohanjun@huawei.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=james.quinlan@broadcom.com \
--cc=jean-philippe@linaro.org \
--cc=julien.grall@arm.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=mchehab@kernel.org \
--cc=mingo@redhat.com \
--cc=mripard@kernel.org \
--cc=natechancellor@gmail.com \
--cc=nsaenzjulienne@suse.de \
--cc=ohad@wizery.com \
--cc=paul.kocialkowski@bootlin.com \
--cc=rjw@rjwysocki.net \
--cc=robh+dt@kernel.org \
--cc=robin.murphy@arm.com \
--cc=saravanak@google.com \
--cc=ssantosh@kernel.org \
--cc=sstabellini@kernel.org \
--cc=stern@rowland.harvard.edu \
--cc=sudeep.holla@arm.com \
--cc=tglx@linutronix.de \
--cc=wens@csie.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=yong.deng@magewell.com \
--cc=ysato@users.sourceforge.jp \
/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).