From: Will Deacon <will@kernel.org>
To: Lu Baolu <baolu.lu@linux.intel.com>
Cc: Christoph Hellwig <hch@infradead.org>,
Joerg Roedel <joro@8bytes.org>, Tom Murphy <murphyt7@tcd.ie>,
David Woodhouse <dwmw2@infradead.org>,
Ashok Raj <ashok.raj@intel.com>,
Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org,
Logan Gunthorpe <logang@deltatee.com>
Subject: Re: [PATCH v5 3/7] iommu: Allow the dma-iommu api to use bounce buffers
Date: Mon, 23 Nov 2020 11:47:06 +0000 [thread overview]
Message-ID: <20201123114705.GA10233@willie-the-truck> (raw)
In-Reply-To: <73ac6a6b-ede9-b306-6d8f-c73f22e1e8e3@linux.intel.com>
On Mon, Nov 23, 2020 at 07:40:57PM +0800, Lu Baolu wrote:
> On 2020/11/23 18:08, Christoph Hellwig wrote:
> > > + /*
> > > + * If both the physical buffer start address and size are
> > > + * page aligned, we don't need to use a bounce page.
> > > + */
> > > + if (IS_ENABLED(CONFIG_SWIOTLB) && dev_is_untrusted(dev) &&
> > > + iova_offset(iovad, phys | org_size)) {
> > > + aligned_size = iova_align(iovad, org_size);
> > > + phys = swiotlb_tbl_map_single(dev,
> > > + phys_to_dma(dev, io_tlb_start),
> > > + phys, org_size, aligned_size, dir, attrs);
> >
> > swiotlb_tbl_map_single takes one less argument in 5.10-rc now.
> >
>
> Yes. But Will's iommu/next branch is based on 5.10-rc3. I synced with
> him, we agreed to keep it 5.10-rc3 and resolve this conflict when
> merging it.
That's right, although I failed to appreciate the conflict was due to a
change in function prototype rather than just a context collision. So
I've updated the vt-d branch to contain the stuff fron Konrad:
https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git/log/?h=for-next/iommu/vt-d
Sorry for messing you around!
Will
next prev parent reply other threads:[~2020-11-23 11:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-20 10:17 [PATCH v5 0/7] Convert the intel iommu driver to the dma-iommu api Lu Baolu
2020-11-20 10:17 ` [PATCH v5 1/7] iommu: Handle freelists when using deferred flushing in iommu drivers Lu Baolu
2020-11-20 10:17 ` [PATCH v5 2/7] iommu: Add iommu_dma_free_cpu_cached_iovas() Lu Baolu
2020-11-20 10:17 ` [PATCH v5 3/7] iommu: Allow the dma-iommu api to use bounce buffers Lu Baolu
2020-11-23 10:08 ` Christoph Hellwig
2020-11-23 11:40 ` Lu Baolu
2020-11-23 11:47 ` Will Deacon [this message]
2020-11-23 11:56 ` Lu Baolu
2020-11-20 10:17 ` [PATCH v5 4/7] iommu: Add quirk for Intel graphic devices in map_sg Lu Baolu
2020-11-20 10:17 ` [PATCH v5 5/7] iommu/vt-d: Update domain geometry in iommu_ops.at(de)tach_dev Lu Baolu
2020-11-20 10:17 ` [PATCH v5 6/7] iommu/vt-d: Convert intel iommu driver to the iommu ops Lu Baolu
2020-11-20 10:17 ` [PATCH v5 7/7] iommu/vt-d: Cleanup after converting to dma-iommu ops Lu Baolu
2020-11-20 12:24 ` [PATCH v5 0/7] Convert the intel iommu driver to the dma-iommu api Chris Wilson
2020-11-20 13:39 ` Lu Baolu
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=20201123114705.GA10233@willie-the-truck \
--to=will@kernel.org \
--cc=ashok.raj@intel.com \
--cc=baolu.lu@linux.intel.com \
--cc=dwmw2@infradead.org \
--cc=hch@infradead.org \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=murphyt7@tcd.ie \
--cc=tvrtko.ursulin@linux.intel.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).