x86/pci: Clean up usage of X86_DEV_DMA_OPS
We have supported per-device dma_map_ops in generic code for a long time, and this symbol just guards the inclusion of the dma_map_ops registry used for vmd. Stop enabling it for anything but vmd. No change in functionality intended. Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20190410080220.21705-3-hch@lst.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:

committed by
Ingo Molnar

parent
a5881bea88
commit
15854edd19
@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759
|
||||
|
||||
config VMD
|
||||
depends on PCI_MSI && X86_64 && SRCU
|
||||
select X86_DEV_DMA_OPS
|
||||
tristate "Intel Volume Management Device Driver"
|
||||
---help---
|
||||
Adds support for the Intel Volume Management Device (VMD). VMD is a
|
||||
|
@@ -95,10 +95,8 @@ struct vmd_dev {
|
||||
struct irq_domain *irq_domain;
|
||||
struct pci_bus *bus;
|
||||
|
||||
#ifdef CONFIG_X86_DEV_DMA_OPS
|
||||
struct dma_map_ops dma_ops;
|
||||
struct dma_domain dma_domain;
|
||||
#endif
|
||||
};
|
||||
|
||||
static inline struct vmd_dev *vmd_from_bus(struct pci_bus *bus)
|
||||
@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = {
|
||||
.chip = &vmd_msi_controller,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_X86_DEV_DMA_OPS
|
||||
/*
|
||||
* VMD replaces the requester ID with its own. DMA mappings for devices in a
|
||||
* VMD domain need to be mapped for the VMD, not the device requiring
|
||||
@@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)
|
||||
add_dma_domain(domain);
|
||||
}
|
||||
#undef ASSIGN_VMD_DMA_OPS
|
||||
#else
|
||||
static void vmd_teardown_dma_ops(struct vmd_dev *vmd) {}
|
||||
static void vmd_setup_dma_ops(struct vmd_dev *vmd) {}
|
||||
#endif
|
||||
|
||||
static char __iomem *vmd_cfg_addr(struct vmd_dev *vmd, struct pci_bus *bus,
|
||||
unsigned int devfn, int reg, int len)
|
||||
|
Reference in New Issue
Block a user