From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Jim Quinlan <james.quinlan@broadcom.com>
Cc: Rich Felker <dalias@libc.org>,
"open list:SUPERH" <linux-sh@vger.kernel.org>,
David Airlie <airlied@linux.ie>,
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>,
Yoshinori Sato <ysato@users.sourceforge.jp>,
"open list:ACPI FOR ARM64 \(ACPI/arm64\)"
<linux-acpi@vger.kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
"maintainer:X86 ARCHITECTURE \(32-BIT AND 64-BIT\)"
<x86@kernel.org>, Russell King <linux@armlinux.org.uk>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Chen-Yu Tsai <wens@csie.org>, Ingo Molnar <mingo@redhat.com>,
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>,
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>,
Thomas Gleixner <tglx@linutronix.de>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
"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>,
Stefano Stabellini <sstabellini@kernel.org>,
Daniel Vetter <daniel@ffwll.ch>,
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, 25 Aug 2020 12:45:06 +0300 [thread overview]
Message-ID: <20200825094506.GR1891694@smile.fi.intel.com> (raw)
In-Reply-To: <20200824193036.6033-8-james.quinlan@broadcom.com>
On Mon, Aug 24, 2020 at 03:30:20PM -0400, Jim Quinlan wrote:
> The new field 'dma_range_map' in struct device is used to facilitate the
> use of single or multiple offsets between mapping regions of cpu addrs and
> dma addrs. It subsumes the role of "dev->dma_pfn_offset" which was only
> capable of holding a single uniform offset and had no region bounds
> checking.
>
> The function of_dma_get_range() has been modified so that it takes a single
> argument -- the device node -- and returns a map, NULL, or an error code.
> The map is an array that holds the information regarding the DMA regions.
> Each range entry contains the address offset, the cpu_start address, the
> dma_start address, and the size of the region.
>
> of_dma_configure() is the typical manner to set range offsets but there are
> a number of ad hoc assignments to "dev->dma_pfn_offset" in the kernel
> driver code. These cases now invoke the function
> dma_attach_offset_range(dev, cpu_addr, dma_addr, size).
...
> + /*
> + * Record all info in the generic DMA ranges array for struct device.
> + */
> + *map = r;
> + for_each_of_range(&parser, &range) {
> + pr_debug("dma_addr(%llx) cpu_addr(%llx) size(%llx)\n",
> + range.bus_addr, range.cpu_addr, range.size);
> + r->cpu_start = range.cpu_addr;
> + r->dma_start = range.bus_addr;
> + r->size = range.size;
> + r->offset = (u64)range.cpu_addr - (u64)range.bus_addr;
What's the point in explicit castings to the same type?
> + r++;
> + }
...
> + phys_addr_t paddr;
> + dma_addr_t dma_addr;
> + struct device dev_bogus;
> unittest(paddr == expect_paddr,
> - "of_dma_get_range wrong phys addr (%llx) on node %pOF", paddr, np);
> + "of_dma_get_range: wrong phys addr %llx (expecting %llx) on node %pOF\n",
> + (u64)paddr, expect_paddr, np);
%llx -> %pap
> unittest(dma_addr == expect_dma_addr,
> - "of_dma_get_range wrong DMA addr (%llx) on node %pOF", dma_addr, np);
> + "of_dma_get_range: wrong DMA addr %llx (expecting %llx) on node %pOF\n",
> + (u64)dma_addr, expect_dma_addr, np);
%llx -> %pad
...
> + if (mem->use_dev_dma_pfn_offset) {
> + u64 base_addr = PFN_PHYS((u64)mem->pfn_base);
Do we need explicit casting here?
> +
> + return base_addr - dma_offset_from_phys_addr(dev, base_addr);
> + }
...
> +int dma_set_offset_range(struct device *dev, phys_addr_t cpu_start,
> + dma_addr_t dma_start, u64 size)
> +{
> + struct bus_dma_region *map;
> + u64 offset = (u64)cpu_start - (u64)dma_start;
> +
> + if (dev->dma_range_map) {
> + dev_err(dev, "attempt to add DMA range to existing map\n");
> + return -EINVAL;
> + }
Wouldn't be better to do an assignment of offset here?
> + if (!offset)
> + return 0;
> +
> + map = kcalloc(2, sizeof(*map), GFP_KERNEL);
> + if (!map)
> + return -ENOMEM;
> + map[0].cpu_start = cpu_start;
> + map[0].dma_start = dma_start;
> + map[0].offset = offset;
> + map[0].size = size;
> + dev->dma_range_map = map;
> +
> + return 0;
> +}
--
With Best Regards,
Andy Shevchenko
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-08-25 9:54 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 [this message]
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
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=20200825094506.GR1891694@smile.fi.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=airlied@linux.ie \
--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=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=guohanjun@huawei.com \
--cc=hch@lst.de \
--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=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).