From: Jon Derrick <jonathan.derrick@intel.com>
To: Keith Busch <keith.busch@intel.com>
Cc: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>
Subject: Re: [PATCH 1/2] x86/vmd: Select device dma ops to override
Date: Tue, 17 May 2016 13:00:31 -0600 [thread overview]
Message-ID: <20160517190030.GA2126@localhost.localdomain> (raw)
In-Reply-To: <1463505205-30431-1-git-send-email-keith.busch@intel.com>
Looks fine
Acked-by Jon Derrick: <jonathan.derrick@intel.com>
On Tue, May 17, 2016 at 11:13:24AM -0600, Keith Busch wrote:
> VMD device doesn't usually have device archdata specific dma_ops, so we
> need to override the default ops for VMD devices.
>
> Signed-off-by: Keith Busch <keith.busch@intel.com>
> ---
> arch/x86/pci/vmd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
> index 7792aba..b1662bf 100644
> --- a/arch/x86/pci/vmd.c
> +++ b/arch/x86/pci/vmd.c
> @@ -261,7 +261,7 @@ static struct device *to_vmd_dev(struct device *dev)
>
> static struct dma_map_ops *vmd_dma_ops(struct device *dev)
> {
> - return to_vmd_dev(dev)->archdata.dma_ops;
> + return get_dma_ops(to_vmd_dev(dev));
> }
>
> static void *vmd_alloc(struct device *dev, size_t size, dma_addr_t *addr,
> @@ -367,7 +367,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
> {
> struct dma_domain *domain = &vmd->dma_domain;
>
> - if (vmd->dev->dev.archdata.dma_ops)
> + if (get_dma_ops(&vmd->dev->dev))
> del_dma_domain(domain);
> }
>
> @@ -379,7 +379,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
>
> static void vmd_setup_dma_ops(struct vmd_dev *vmd)
> {
> - const struct dma_map_ops *source = vmd->dev->dev.archdata.dma_ops;
> + const struct dma_map_ops *source = get_dma_ops(&vmd->dev->dev);
> struct dma_map_ops *dest = &vmd->dma_ops;
> struct dma_domain *domain = &vmd->dma_domain;
>
> --
> 2.7.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-05-17 19:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 17:13 [PATCH 1/2] x86/vmd: Select device dma ops to override Keith Busch
2016-05-17 17:13 ` [PATCH 2/2] x86/vmd: Initialize list item in irq disable Keith Busch
2016-05-17 17:25 ` Keith Busch
2016-05-17 19:00 ` Jon Derrick [this message]
2016-06-13 21:04 ` [PATCH 1/2] x86/vmd: Select device dma ops to override Bjorn Helgaas
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=20160517190030.GA2126@localhost.localdomain \
--to=jonathan.derrick@intel.com \
--cc=bhelgaas@google.com \
--cc=keith.busch@intel.com \
--cc=linux-pci@vger.kernel.org \
/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).