redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

x86/PCI: VMD: Select device dma ops to override

Browse source 
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>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by Jon Derrick: <jonathan.derrick@intel.com>
This commit is contained in:
Keith Busch 2016-05-17 11:13:24 -06:00 committed by Bjorn Helgaas
parent af8c34ce6a
commit ca8a8fabb1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/pci/vmd.c
View file

@ -261,7 +261,7 @@ static struct device *to_vmd_dev(struct device *dev)
static struct dma_map_ops *vmd_dma_ops(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, 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; 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); 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) 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_map_ops *dest = &vmd->dma_ops;
struct dma_domain *domain = &vmd->dma_domain; struct dma_domain *domain = &vmd->dma_domain;